From b44c415afa3f4ec40256d0ba6817af1f213a8250 2017-09-06 08:04:07
From: leroux <aleroux@itlink.fr>
Date: 2017-09-06 08:04:07
Subject: [PATCH] Merge pull request #260 from SciQLop-fork meson

 update meson

---

diff --git a/build_cfg/mac/install_script.sh b/build_cfg/mac/install_script.sh
index cdd2cbc..ecbc9d9 100755
--- a/build_cfg/mac/install_script.sh
+++ b/build_cfg/mac/install_script.sh
@@ -8,4 +8,5 @@ install_name_tool -change @rpath/QtPrintSupport.framework/Versions/5/QtPrintSupp
 install_name_tool -change @rpath/QtGui.framework/Versions/5/QtGui @executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui /tmp/SciQLOP.app/Contents/MacOS/sciqlop
 install_name_tool -change @rpath/QtWidgets.framework/Versions/5/QtWidgets @executable_path/../Frameworks/QtWidgets.framework/Versions/5/QtWidgets /tmp/SciQLOP.app/Contents/MacOS/sciqlop
 install_name_tool -change @rpath/QtNetwork.framework/Versions/5/QtNetwork @executable_path/../Frameworks/QtNetwork.framework/Versions/5/QtNetwork /tmp/SciQLOP.app/Contents/MacOS/sciqlop
+install_name_tool -change @rpath/QtSvg.framework/Versions/5/QtSvg @executable_path/../Frameworks/QtSvg.framework/Versions/5/QtSvg /tmp/SciQLOP.app/Contents/MacOS/sciqlop
 
diff --git a/core/meson.build b/core/meson.build
index bb77c2e..0a82ca3 100644
--- a/core/meson.build
+++ b/core/meson.build
@@ -1,6 +1,7 @@
 
 core_moc_headers = [
   'include/Data/IDataProvider.h',
+  'include/Data/DataSeriesMergeHelper.h',
   'include/DataSource/DataSourceController.h',
   'include/DataSource/DataSourceItemAction.h',
   'include/Network/NetworkController.h',
diff --git a/core/tests/meson.build b/core/tests/meson.build
index 7f15f45..53cab19 100644
--- a/core/tests/meson.build
+++ b/core/tests/meson.build
@@ -6,6 +6,7 @@ tests = [
   [['Data/TestTwoDimArrayData.cpp'],'test_2d','Two Dim Array test'],
   [['DataSource/TestDataSourceController.cpp'],'test_data_source','DataSourceController test'],
   [['Variable/TestVariableCacheController.cpp'],'test_variable_cache','VariableCacheController test'],
+  [['Variable/TestVariableController.cpp'],'test_variable_controler','VariableController test'],
   [['Variable/TestVariable.cpp'],'test_variable','Variable test']
 ]
 
diff --git a/gui/include/Variable/RenameVariableDialog.h b/gui/include/Variable/RenameVariableDialog.h
index e3f503c..5098cd6 100644
--- a/gui/include/Variable/RenameVariableDialog.h
+++ b/gui/include/Variable/RenameVariableDialog.h
@@ -11,6 +11,7 @@ class RenameVariableDialog;
  * @brief The RenameVariableDialog class represents the dialog to rename a variable
  */
 class RenameVariableDialog : public QDialog {
+    Q_OBJECT
 public:
     explicit RenameVariableDialog(const QString &defaultName,
                                   const QVector<QString> &forbiddenNames,
diff --git a/gui/meson.build b/gui/meson.build
index db498e7..8fe81c1 100644
--- a/gui/meson.build
+++ b/gui/meson.build
@@ -7,6 +7,7 @@ gui_moc_headers = [
   'include/SqpApplication.h',
   'include/TimeWidget/TimeWidget.h',
   'include/Variable/VariableInspectorWidget.h',
+  'include/Variable/RenameVariableDialog.h',
   'include/Visualization/qcustomplot.h',
   'include/Visualization/VisualizationGraphWidget.h',
   'include/Visualization/VisualizationTabWidget.h',
@@ -22,6 +23,7 @@ gui_ui_files = [
   'ui/TimeWidget/TimeWidget.ui',
   'ui/Variable/VariableInspectorWidget.ui',
   'ui/Variable/VariableMenuHeaderWidget.ui',
+  'ui/Variable/RenameVariableDialog.ui',
   'ui/Visualization/VisualizationGraphWidget.ui',
   'ui/Visualization/VisualizationTabWidget.ui',
   'ui/Visualization/VisualizationWidget.ui',
@@ -46,6 +48,7 @@ gui_sources = [
   'src/TimeWidget/TimeWidget.cpp',
   'src/Variable/VariableInspectorWidget.cpp',
   'src/Variable/VariableMenuHeaderWidget.cpp',
+  'src/Variable/RenamevariableDialog.cpp',
   'src/Visualization/VisualizationGraphHelper.cpp',
   'src/Visualization/VisualizationGraphRenderingDelegate.cpp',
   'src/Visualization/VisualizationGraphWidget.cpp',