Fix wrong use of -z parameter when linking DuSE-MT on Mac

Change-Id: Ic4fb3af1cc16414f65f460a46a94dd4242368ad9
Reviewed-by: Sandro S. Andrade <sandroandrade@kde.org>

8 files changed, 36 insertions, 25 deletions

diff --git a/examples/uml/duse-mt/src/app/aboutdusemt.ui b/examples/uml/duse-mt/src/app/aboutdusemt.ui
index c8b5a05e..7ad998a3 100644
--- a/examples/uml/duse-mt/src/app/aboutdusemt.ui
+++ b/examples/uml/duse-mt/src/app/aboutdusemt.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>AboutDuSEMT</class>
- <widget class="QDialog" name="AboutDuSEMT">
+ <class>DuSE::AboutDuSEMT</class>
+ <widget class="QDialog" name="DuSE::AboutDuSEMT">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -142,7 +142,7 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>accepted()</signal>
-   <receiver>AboutDuSEMT</receiver>
+   <receiver>DuSE::AboutDuSEMT</receiver>
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
@@ -158,7 +158,7 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>rejected()</signal>
-   <receiver>AboutDuSEMT</receiver>
+   <receiver>DuSE::AboutDuSEMT</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
diff --git a/examples/uml/duse-mt/src/app/aboutplugins.ui b/examples/uml/duse-mt/src/app/aboutplugins.ui
index b3fdd1c8..1afaaed9 100644
--- a/examples/uml/duse-mt/src/app/aboutplugins.ui
+++ b/examples/uml/duse-mt/src/app/aboutplugins.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>AboutPlugins</class>
- <widget class="QDialog" name="AboutPlugins">
+ <class>DuSE::AboutPlugins</class>
+ <widget class="QDialog" name="DuSE::AboutPlugins">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -67,7 +67,7 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>accepted()</signal>
-   <receiver>AboutPlugins</receiver>
+   <receiver>DuSE::AboutPlugins</receiver>
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
@@ -83,7 +83,7 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>rejected()</signal>
-   <receiver>AboutPlugins</receiver>
+   <receiver>DuSE::AboutPlugins</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
diff --git a/examples/uml/duse-mt/src/app/mainwindow.ui b/examples/uml/duse-mt/src/app/mainwindow.ui
index 5753274d..a7a34325 100644
--- a/examples/uml/duse-mt/src/app/mainwindow.ui
+++ b/examples/uml/duse-mt/src/app/mainwindow.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>MainWindow</class>
- <widget class="QMainWindow" name="MainWindow">
+ <class>DuSE::MainWindow</class>
+ <widget class="QMainWindow" name="DuSE::MainWindow">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -208,7 +208,7 @@
   <connection>
    <sender>actionFileQuit</sender>
    <signal>triggered()</signal>
-   <receiver>MainWindow</receiver>
+   <receiver>DuSE::MainWindow</receiver>
    <slot>close()</slot>
    <hints>
     <hint type="sourcelabel">
diff --git a/examples/uml/duse-mt/src/app/newmodel.ui b/examples/uml/duse-mt/src/app/newmodel.ui
index 7e681f2f..e2637dae 100644
--- a/examples/uml/duse-mt/src/app/newmodel.ui
+++ b/examples/uml/duse-mt/src/app/newmodel.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>NewModel</class>
- <widget class="QDialog" name="NewModel">
+ <class>DuSE::NewModel</class>
+ <widget class="QDialog" name="DuSE::NewModel">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -65,7 +65,7 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>accepted()</signal>
-   <receiver>NewModel</receiver>
+   <receiver>DuSE::NewModel</receiver>
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
@@ -81,7 +81,7 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>rejected()</signal>
-   <receiver>NewModel</receiver>
+   <receiver>DuSE::NewModel</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
diff --git a/examples/uml/duse-mt/src/app/shell/mainwindow.cpp b/examples/uml/duse-mt/src/app/shell/mainwindow.cpp
index 76e06eda..19205793 100644
--- a/examples/uml/duse-mt/src/app/shell/mainwindow.cpp
+++ b/examples/uml/duse-mt/src/app/shell/mainwindow.cpp
@@ -45,6 +45,7 @@
 #include "ui_newmodel.h"
 
 #include <QtCore/QTimer>
+#include <QtCore/QDebug>
 #include <QtCore/QSettings>
 #include <QtCore/QJsonArray>
 #include <QtCore/QJsonObject>
@@ -140,7 +141,7 @@ void MainWindow::on_actionFileOpenModel_triggered()
             QMessageBox::critical(this, tr("Open model"), ICore::self()->projectController()->errorStrings().first());
             return;
         }
-        setWindowTitle(QFileInfo(QFile(fileName)).fileName() + " - DuSE-MT");
+        setWindowTitle(QFileInfo(fileName).fileName() + " - DuSE-MT");
 
 //        _currentFileName = fileName;
 ////        foreach (QWrappedObject *object, _inputModel)
diff --git a/examples/uml/duse-mt/src/app/shell/mainwindow.h b/examples/uml/duse-mt/src/app/shell/mainwindow.h
index 7c0f03f1..c865c72c 100644
--- a/examples/uml/duse-mt/src/app/shell/mainwindow.h
+++ b/examples/uml/duse-mt/src/app/shell/mainwindow.h
@@ -43,28 +43,30 @@
 
 #include <QtWidgets/QMainWindow>
 
+QT_BEGIN_NAMESPACE
 class QQuickItem;
 class QQmlComponent;
 class QTreeWidgetItem;
 
-namespace Ui {
-    class MainWindow;
-    class AboutPlugins;
-    class AboutDuSEMT;
-    class NewModel;
-}
-
 class QModelingElement;
 //class QModelingObject;
 class QMetaModelPlugin;
 class QModelingObjectModel;
 class QProgressDialog;
+QT_END_NAMESPACE
 
 class NewDuseDesignDialog;
 
 namespace DuSE
 {
 
+namespace Ui {
+    class MainWindow;
+    class AboutPlugins;
+    class AboutDuSEMT;
+    class NewModel;
+}
+
 class IPlugin;
 
 class MainWindow : public QMainWindow
diff --git a/examples/uml/duse-mt/src/app/shell/plugincontroller.h b/examples/uml/duse-mt/src/app/shell/plugincontroller.h
index 5e275d8f..acaab850 100644
--- a/examples/uml/duse-mt/src/app/shell/plugincontroller.h
+++ b/examples/uml/duse-mt/src/app/shell/plugincontroller.h
@@ -46,10 +46,12 @@
 #include <QtCore/QHash>
 #include <QtCore/QStringList>
 
-class QMetaModelPlugin;
-
+QT_BEGIN_NAMESPACE
 class QTreeWidgetItem;
 
+class QMetaModelPlugin;
+QT_END_NAMESPACE
+
 namespace DuSE
 {
 
diff --git a/examples/uml/duse-mt/src/app/shell/projectcontroller.h b/examples/uml/duse-mt/src/app/shell/projectcontroller.h
index 5534d7a0..12536525 100644
--- a/examples/uml/duse-mt/src/app/shell/projectcontroller.h
+++ b/examples/uml/duse-mt/src/app/shell/projectcontroller.h
@@ -45,6 +45,12 @@
 
 #include "mainwindow.h"
 
+QT_BEGIN_NAMESPACE
+class QModelingObject;
+class QModelingElement;
+class QMetaModelPlugin;
+QT_END_NAMESPACE
+
 namespace DuSE
 {