Update .pro/.pri files for handling of plugins/libraries dependencies

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

53 files changed, 133 insertions, 50 deletions

diff --git a/.gitignore b/.gitignore
index 724480db..01dcced6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 .obj
 .moc
+*moc_*
 *.o
 mkspecs
 Makefile
diff --git a/examples/uml/duse-mt/duse-mt.pri b/examples/uml/duse-mt/duse-mt.pri
index 947ebbab..de1d45ee 100644
--- a/examples/uml/duse-mt/duse-mt.pri
+++ b/examples/uml/duse-mt/duse-mt.pri
@@ -4,8 +4,6 @@ isEmpty(DUSEMT_LIBRARY_BASENAME) {
 DUSEMT_SOURCE_TREE = $$PWD
 DUSEMT_LIBRARY_PATH = $$DUSEMT_SOURCE_TREE/$$DUSEMT_LIBRARY_BASENAME/duse-mt
 
-LIBS += -L$$DUSEMT_LIBRARY_PATH -lduseinterfaces
-
 INCLUDEPATH += \
     $$DUSEMT_SOURCE_TREE/src/libs \
     $$DUSEMT_SOURCE_TREE/src/plugins
@@ -13,3 +11,44 @@ INCLUDEPATH += \
 DUSEMT_APP_TARGET   = duse-mt
 DUSEMT_APP_PATH = $$DUSEMT_SOURCE_TREE/bin
 DUSEMT_PLUGIN_PATH  = $$DUSEMT_LIBRARY_PATH/plugins
+
+defineReplace(qtLibraryName) {
+   unset(LIBRARY_NAME)
+   LIBRARY_NAME = $$1
+   CONFIG(debug, debug|release) {
+      !debug_and_release|build_pass {
+          mac:RET = $$member(LIBRARY_NAME, 0)_debug
+              else:win32:RET = $$member(LIBRARY_NAME, 0)d
+      }
+   }
+   isEmpty(RET):RET = $$LIBRARY_NAME
+   return($$RET)
+}
+
+# recursively resolve plugin deps
+done_plugins =
+for(ever) {
+    isEmpty(DUSEMT_PLUGIN_DEPENDS): \
+        break()
+    done_plugins += $$DUSEMT_PLUGIN_DEPENDS
+    for(dep, DUSEMT_PLUGIN_DEPENDS) {
+        include($$PWD/src/plugins/$$dep/$${dep}_dependencies.pri)
+        LIBS += -l$$qtLibraryName($$DUSEMT_PLUGIN_NAME)
+    }
+    DUSEMT_PLUGIN_DEPENDS = $$unique(DUSEMT_PLUGIN_DEPENDS)
+    DUSEMT_PLUGIN_DEPENDS -= $$unique(done_plugins)
+}
+
+# recursively resolve library deps
+done_libs =
+for(ever) {
+    isEmpty(DUSEMT_LIB_DEPENDS): \
+        break()
+    done_libs += $$DUSEMT_LIB_DEPENDS
+    for(dep, DUSEMT_LIB_DEPENDS) {
+        include($$PWD/src/libs/$$dep/$${dep}_dependencies.pri)
+        LIBS += -l$$qtLibraryName($$DUSEMT_LIB_NAME)
+    }
+    DUSEMT_LIB_DEPENDS = $$unique(DUSEMT_LIB_DEPENDS)
+    DUSEMT_LIB_DEPENDS -= $$unique(done_libs)
+}
diff --git a/examples/uml/duse-mt/src/app/app.pro b/examples/uml/duse-mt/src/app/app.pro
index 20ed2ba7..e26910f1 100644
--- a/examples/uml/duse-mt/src/app/app.pro
+++ b/examples/uml/duse-mt/src/app/app.pro
@@ -6,16 +6,19 @@
 
 QT += widgets modeling
 
+DUSEMT_LIB_DEPENDS += \
+    duseinterfaces
+
 include(../../duse-mt.pri)
 
+LIBS += -L$$DUSEMT_LIBRARY_PATH
+
 TEMPLATE = app
 TARGET = $$DUSEMT_APP_TARGET
 DESTDIR = $$DUSEMT_APP_PATH
 
 include(../rpath.pri)
 
-LIBS *= -lduseinterfaces
-
 SOURCES += main.cpp \
     shell/core.cpp \
     shell/uicontroller.cpp \
diff --git a/examples/uml/duse-mt/src/app/shell/core.h b/examples/uml/duse-mt/src/app/shell/core.h
index 746f4a88..9c96c8c3 100644
--- a/examples/uml/duse-mt/src/app/shell/core.h
+++ b/examples/uml/duse-mt/src/app/shell/core.h
@@ -41,7 +41,7 @@
 #ifndef CORE_H
 #define CORE_H
 
-#include <interfaces/icore.h>
+#include <duseinterfaces/icore.h>
 
 namespace DuSE
 {
diff --git a/examples/uml/duse-mt/src/app/shell/mainwindow.cpp b/examples/uml/duse-mt/src/app/shell/mainwindow.cpp
index f46b97fc..d3f1dae3 100644
--- a/examples/uml/duse-mt/src/app/shell/mainwindow.cpp
+++ b/examples/uml/duse-mt/src/app/shell/mainwindow.cpp
@@ -75,10 +75,10 @@
 #include <QtQuick/QQuickItem>
 //#include "QtQuick/private/qquickflickable_p.h"
 
-#include <interfaces/icore.h>
-#include <interfaces/iplugin.h>
-#include <interfaces/iplugincontroller.h>
-#include <interfaces/iprojectcontroller.h>
+#include <duseinterfaces/icore.h>
+#include <duseinterfaces/iplugin.h>
+#include <duseinterfaces/iplugincontroller.h>
+#include <duseinterfaces/iprojectcontroller.h>
 
 namespace DuSE
 {
diff --git a/examples/uml/duse-mt/src/app/shell/plugincontroller.cpp b/examples/uml/duse-mt/src/app/shell/plugincontroller.cpp
index 0b47434c..315a0b19 100644
--- a/examples/uml/duse-mt/src/app/shell/plugincontroller.cpp
+++ b/examples/uml/duse-mt/src/app/shell/plugincontroller.cpp
@@ -40,8 +40,8 @@
 ****************************************************************************/
 #include "plugincontroller.h"
 
-#include <interfaces/icore.h>
-#include <interfaces/iplugin.h>
+#include <duseinterfaces/icore.h>
+#include <duseinterfaces/iplugin.h>
 
 #include <QtModeling/QMetaModelPlugin>
 
diff --git a/examples/uml/duse-mt/src/app/shell/plugincontroller.h b/examples/uml/duse-mt/src/app/shell/plugincontroller.h
index c23abaf0..c2ee2244 100644
--- a/examples/uml/duse-mt/src/app/shell/plugincontroller.h
+++ b/examples/uml/duse-mt/src/app/shell/plugincontroller.h
@@ -41,7 +41,7 @@
 #ifndef PLUGINCONTROLLER_H
 #define PLUGINCONTROLLER_H
 
-#include <interfaces/iplugincontroller.h>
+#include <duseinterfaces/iplugincontroller.h>
 
 #include <QtCore/QHash>
 #include <QtCore/QStringList>
diff --git a/examples/uml/duse-mt/src/app/shell/projectcontroller.h b/examples/uml/duse-mt/src/app/shell/projectcontroller.h
index 0ca86de3..4cd26549 100644
--- a/examples/uml/duse-mt/src/app/shell/projectcontroller.h
+++ b/examples/uml/duse-mt/src/app/shell/projectcontroller.h
@@ -41,7 +41,7 @@
 #ifndef PROJECTCONTROLLER_H
 #define PROJECTCONTROLLER_H
 
-#include <interfaces/iprojectcontroller.h>
+#include <duseinterfaces/iprojectcontroller.h>
 
 #include "mainwindow.h"
 
diff --git a/examples/uml/duse-mt/src/app/shell/uicontroller.h b/examples/uml/duse-mt/src/app/shell/uicontroller.h
index 19f5cc80..c7511517 100644
--- a/examples/uml/duse-mt/src/app/shell/uicontroller.h
+++ b/examples/uml/duse-mt/src/app/shell/uicontroller.h
@@ -41,7 +41,7 @@
 #ifndef UICONTROLLER_H
 #define UICONTROLLER_H
 
-#include <interfaces/iuicontroller.h>
+#include <duseinterfaces/iuicontroller.h>
 
 #include "mainwindow.h"
 
diff --git a/examples/uml/duse-mt/src/duse-mt-library.pri b/examples/uml/duse-mt/src/duse-mt-library.pri
index f29b5e23..173bdbd0 100644
--- a/examples/uml/duse-mt/src/duse-mt-library.pri
+++ b/examples/uml/duse-mt/src/duse-mt-library.pri
@@ -1,7 +1,11 @@
-QT       -= gui
+include($$replace(_PRO_FILE_PWD_, ([^/]+$), \\1/\\1_dependencies.pri))
+
+QT -= gui
 
 include(../duse-mt.pri)
 
+TARGET = $$qtLibraryName($$DUSEMT_LIB_NAME)
+
 DESTDIR = $$DUSEMT_LIBRARY_PATH
 
 include(rpath.pri)
diff --git a/examples/uml/duse-mt/src/duse-mt-plugin.pri b/examples/uml/duse-mt/src/duse-mt-plugin.pri
index 50e76593..370e73b7 100644
--- a/examples/uml/duse-mt/src/duse-mt-plugin.pri
+++ b/examples/uml/duse-mt/src/duse-mt-plugin.pri
@@ -1,5 +1,23 @@
+depfile = $$replace(_PRO_FILE_PWD_, ([^/]+$), \\1/\\1_dependencies.pri)
+exists($$depfile) {
+    include($$depfile)
+    isEmpty(DUSEMT_PLUGIN_NAME): \
+        error("$$basename(depfile) does not define DUSEMT_PLUGIN_NAME.")
+} else {
+    isEmpty(DUSEMT_PLUGIN_NAME): \
+        error("DUSEMT_PLUGIN_NAME is empty. Maybe you meant to create $$basename(depfile)?")
+}
+
+QT -= gui
+
+DUSEMT_LIB_DEPENDS += duseinterfaces
+
 include(../duse-mt.pri)
 
+TARGET = $$qtLibraryName($$DUSEMT_PLUGIN_NAME)
+
+LIBS += -L$$DUSEMT_LIBRARY_PATH
+
 isEmpty(PROVIDER) {
     PROVIDER = QtProject
 } else {
diff --git a/examples/uml/duse-mt/src/libs/interfaces/interfaces.pro b/examples/uml/duse-mt/src/libs/duseinterfaces/duseinterfaces.pro
index d3d6f40a..b1e06eb6 100644
--- a/examples/uml/duse-mt/src/libs/interfaces/interfaces.pro
+++ b/examples/uml/duse-mt/src/libs/duseinterfaces/duseinterfaces.pro
@@ -1,18 +1,18 @@
-TARGET = duseinterfaces
-
 include(../../duse-mt-library.pri)
 
-DEFINES += DUSEINTERFACES_LIBRARY
+HEADERS += \
+    duseinterfaces_global.h \
+    icore.h\
+    iuicontroller.h \
+    iprojectcontroller.h \
+    iplugincontroller.h \
+    iplugin.h
 
-SOURCES += icore.cpp \
+SOURCES += \
+    icore.cpp \
     iuicontroller.cpp \
     iprojectcontroller.cpp \
     iplugincontroller.cpp \
     iplugin.cpp
 
-HEADERS += icore.h\
-        duseinterfaces_global.h \
-    iuicontroller.h \
-    iprojectcontroller.h \
-    iplugincontroller.h \
-    iplugin.h
+DEFINES += DUSEINTERFACES_LIBRARY
diff --git a/examples/uml/duse-mt/src/libs/duseinterfaces/duseinterfaces_dependencies.pri b/examples/uml/duse-mt/src/libs/duseinterfaces/duseinterfaces_dependencies.pri
new file mode 100644
index 00000000..e56115da
--- /dev/null
+++ b/examples/uml/duse-mt/src/libs/duseinterfaces/duseinterfaces_dependencies.pri
@@ -0,0 +1 @@
+DUSEMT_LIB_NAME = DuseInterfaces
diff --git a/examples/uml/duse-mt/src/libs/interfaces/duseinterfaces_global.h b/examples/uml/duse-mt/src/libs/duseinterfaces/duseinterfaces_global.h
index 8f7c869a..df69b9ae 100644
--- a/examples/uml/duse-mt/src/libs/interfaces/duseinterfaces_global.h
+++ b/examples/uml/duse-mt/src/libs/duseinterfaces/duseinterfaces_global.h
@@ -50,3 +50,4 @@
 #endif
 
 #endif // DUSEINTERFACES_GLOBAL_H
+
diff --git a/examples/uml/duse-mt/src/libs/interfaces/icore.cpp b/examples/uml/duse-mt/src/libs/duseinterfaces/icore.cpp
index 5944cd06..3d62fe47 100644
--- a/examples/uml/duse-mt/src/libs/interfaces/icore.cpp
+++ b/examples/uml/duse-mt/src/libs/duseinterfaces/icore.cpp
@@ -62,3 +62,4 @@ ICore::ICore()
 }
 
 }
+
diff --git a/examples/uml/duse-mt/src/libs/interfaces/icore.h b/examples/uml/duse-mt/src/libs/duseinterfaces/icore.h
index d53ed4b6..704dd080 100644
--- a/examples/uml/duse-mt/src/libs/interfaces/icore.h
+++ b/examples/uml/duse-mt/src/libs/duseinterfaces/icore.h
@@ -68,3 +68,4 @@ protected:
 }
 
 #endif // ICORE_H
+
diff --git a/examples/uml/duse-mt/src/libs/interfaces/iplugin.cpp b/examples/uml/duse-mt/src/libs/duseinterfaces/iplugin.cpp
index 08c0499d..2e0a0ebf 100644
--- a/examples/uml/duse-mt/src/libs/interfaces/iplugin.cpp
+++ b/examples/uml/duse-mt/src/libs/duseinterfaces/iplugin.cpp
@@ -53,3 +53,4 @@ IPlugin::~IPlugin()
 }
 
 }
+
diff --git a/examples/uml/duse-mt/src/libs/interfaces/iplugin.h b/examples/uml/duse-mt/src/libs/duseinterfaces/iplugin.h
index 9a18c51d..b4fa794d 100644
--- a/examples/uml/duse-mt/src/libs/interfaces/iplugin.h
+++ b/examples/uml/duse-mt/src/libs/duseinterfaces/iplugin.h
@@ -64,3 +64,4 @@ public:
 }
 
 #endif // IPLUGIN_H
+
diff --git a/examples/uml/duse-mt/src/libs/interfaces/iplugincontroller.cpp b/examples/uml/duse-mt/src/libs/duseinterfaces/iplugincontroller.cpp
index 0fa0ddc0..cf886620 100644
--- a/examples/uml/duse-mt/src/libs/interfaces/iplugincontroller.cpp
+++ b/examples/uml/duse-mt/src/libs/duseinterfaces/iplugincontroller.cpp
@@ -52,3 +52,4 @@ IPluginController::IPluginController()
 }
 
 }
+
diff --git a/examples/uml/duse-mt/src/libs/interfaces/iplugincontroller.h b/examples/uml/duse-mt/src/libs/duseinterfaces/iplugincontroller.h
index 784ac582..1bdc074d 100644
--- a/examples/uml/duse-mt/src/libs/interfaces/iplugincontroller.h
+++ b/examples/uml/duse-mt/src/libs/duseinterfaces/iplugincontroller.h
@@ -70,3 +70,4 @@ protected:
 }
 
 #endif // IPLUGINCONTROLLER_H
+
diff --git a/examples/uml/duse-mt/src/libs/interfaces/iprojectcontroller.cpp b/examples/uml/duse-mt/src/libs/duseinterfaces/iprojectcontroller.cpp
index 1ea0a7df..d63ec0ed 100644
--- a/examples/uml/duse-mt/src/libs/interfaces/iprojectcontroller.cpp
+++ b/examples/uml/duse-mt/src/libs/duseinterfaces/iprojectcontroller.cpp
@@ -52,3 +52,4 @@ IProjectController::IProjectController()
 }
 
 }
+
diff --git a/examples/uml/duse-mt/src/libs/interfaces/iprojectcontroller.h b/examples/uml/duse-mt/src/libs/duseinterfaces/iprojectcontroller.h
index 66802006..7fb2b74c 100644
--- a/examples/uml/duse-mt/src/libs/interfaces/iprojectcontroller.h
+++ b/examples/uml/duse-mt/src/libs/duseinterfaces/iprojectcontroller.h
@@ -81,3 +81,4 @@ protected:
 }
 
 #endif // IPROJECTCONTROLLER_H
+
diff --git a/examples/uml/duse-mt/src/libs/interfaces/iuicontroller.cpp b/examples/uml/duse-mt/src/libs/duseinterfaces/iuicontroller.cpp
index ffea14ff..4f1e075e 100644
--- a/examples/uml/duse-mt/src/libs/interfaces/iuicontroller.cpp
+++ b/examples/uml/duse-mt/src/libs/duseinterfaces/iuicontroller.cpp
@@ -52,3 +52,4 @@ IUiController::IUiController()
 }
 
 }
+
diff --git a/examples/uml/duse-mt/src/libs/interfaces/iuicontroller.h b/examples/uml/duse-mt/src/libs/duseinterfaces/iuicontroller.h
index a542c240..080deb64 100644
--- a/examples/uml/duse-mt/src/libs/interfaces/iuicontroller.h
+++ b/examples/uml/duse-mt/src/libs/duseinterfaces/iuicontroller.h
@@ -86,3 +86,4 @@ protected:
 }
 
 #endif // IUICONTROLLER_H
+
diff --git a/examples/uml/duse-mt/src/libs/libs.pro b/examples/uml/duse-mt/src/libs/libs.pro
index 37a4b253..5a90806c 100644
--- a/examples/uml/duse-mt/src/libs/libs.pro
+++ b/examples/uml/duse-mt/src/libs/libs.pro
@@ -1,4 +1,4 @@
 TEMPLATE  = subdirs
 CONFIG   += ordered
 
-SUBDIRS = interfaces
+SUBDIRS = duseinterfaces
diff --git a/examples/uml/duse-mt/src/plugins/architecturerecoverycore/architecturerecoverycore_dependencies.pri b/examples/uml/duse-mt/src/plugins/architecturerecoverycore/architecturerecoverycore_dependencies.pri
new file mode 100644
index 00000000..02a1c417
--- /dev/null
+++ b/examples/uml/duse-mt/src/plugins/architecturerecoverycore/architecturerecoverycore_dependencies.pri
@@ -0,0 +1 @@
+DUSEMT_PLUGIN_NAME = ArchitectureRecoveryCore
diff --git a/examples/uml/duse-mt/src/plugins/architecturerecoverycore/architecturerecoverycoreplugin.h b/examples/uml/duse-mt/src/plugins/architecturerecoverycore/architecturerecoverycoreplugin.h
index 7f0ba1cf..141d45d8 100644
--- a/examples/uml/duse-mt/src/plugins/architecturerecoverycore/architecturerecoverycoreplugin.h
+++ b/examples/uml/duse-mt/src/plugins/architecturerecoverycore/architecturerecoverycoreplugin.h
@@ -41,7 +41,7 @@
 #ifndef ARCHITECTURERECOVERYCOREPLUGIN_H
 #define ARCHITECTURERECOVERYCOREPLUGIN_H
 
-#include <interfaces/iplugin.h>
+#include <duseinterfaces/iplugin.h>
 
 class ArchitectureRecoveryCorePlugin : public DuSE::IPlugin
 {
diff --git a/examples/uml/duse-mt/src/plugins/architecturerecoverycore/iarchitecturerecoveryalgorithm.h b/examples/uml/duse-mt/src/plugins/architecturerecoverycore/iarchitecturerecoveryalgorithm.h
index fe44d57d..71a13974 100644
--- a/examples/uml/duse-mt/src/plugins/architecturerecoverycore/iarchitecturerecoveryalgorithm.h
+++ b/examples/uml/duse-mt/src/plugins/architecturerecoverycore/iarchitecturerecoveryalgorithm.h
@@ -48,8 +48,6 @@ class IArchitectureRecoveryAlgorithm
 {
 
 public:
-    IArchitectureRecoveryAlgorithm();
-
     virtual void run() const = 0;
 
     virtual void setDevelopmentPlatform(IDevelopmentPlatform *m_developmentPlatform) = 0;
diff --git a/examples/uml/duse-mt/src/plugins/architecturerecoverycore/iarchitecturerecoverybackend.h b/examples/uml/duse-mt/src/plugins/architecturerecoverycore/iarchitecturerecoverybackend.h
index d7720a2e..b7f874bc 100644
--- a/examples/uml/duse-mt/src/plugins/architecturerecoverycore/iarchitecturerecoverybackend.h
+++ b/examples/uml/duse-mt/src/plugins/architecturerecoverycore/iarchitecturerecoverybackend.h
@@ -47,8 +47,6 @@ class IArchitectureRecoveryBackend
 {
 
 public:
-    IArchitectureRecoveryBackend();
-
     virtual QObjectList components() const = 0;
     virtual QObjectList connectors() const = 0;
 };
diff --git a/examples/uml/duse-mt/src/plugins/architecturerecoverycore/imodelingnotation.h b/examples/uml/duse-mt/src/plugins/architecturerecoverycore/imodelingnotation.h
index 18ba5606..493fe2df 100644
--- a/examples/uml/duse-mt/src/plugins/architecturerecoverycore/imodelingnotation.h
+++ b/examples/uml/duse-mt/src/plugins/architecturerecoverycore/imodelingnotation.h
@@ -47,8 +47,6 @@ class IModelingNotation
 {
 
 public:
-    IModelingNotation();
-
     virtual void generateDiagram(const QString &name) = 0;
 };
 
diff --git a/examples/uml/duse-mt/src/plugins/concretesyntaxview/concretesyntaxview_dependencies.pri b/examples/uml/duse-mt/src/plugins/concretesyntaxview/concretesyntaxview_dependencies.pri
new file mode 100644
index 00000000..0acc930e
--- /dev/null
+++ b/examples/uml/duse-mt/src/plugins/concretesyntaxview/concretesyntaxview_dependencies.pri
@@ -0,0 +1 @@
+DUSEMT_PLUGIN_NAME = ConcreteSyntaxView
diff --git a/examples/uml/duse-mt/src/plugins/concretesyntaxview/concretesyntaxviewplugin.cpp b/examples/uml/duse-mt/src/plugins/concretesyntaxview/concretesyntaxviewplugin.cpp
index e16f92ac..51576ad5 100644
--- a/examples/uml/duse-mt/src/plugins/concretesyntaxview/concretesyntaxviewplugin.cpp
+++ b/examples/uml/duse-mt/src/plugins/concretesyntaxview/concretesyntaxviewplugin.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 #include "concretesyntaxviewplugin.h"
 
-#include <interfaces/iuicontroller.h>
+#include <duseinterfaces/iuicontroller.h>
 
 #include <QtQuick/QQuickView>
 #include <QtQuick/QQuickItem>
diff --git a/examples/uml/duse-mt/src/plugins/concretesyntaxview/concretesyntaxviewplugin.h b/examples/uml/duse-mt/src/plugins/concretesyntaxview/concretesyntaxviewplugin.h
index 6f2a84d7..d4f27464 100644
--- a/examples/uml/duse-mt/src/plugins/concretesyntaxview/concretesyntaxviewplugin.h
+++ b/examples/uml/duse-mt/src/plugins/concretesyntaxview/concretesyntaxviewplugin.h
@@ -41,7 +41,7 @@
 #ifndef CONCRETESYNTAXVIEWPLUGIN_H
 #define CONCRETESYNTAXVIEWPLUGIN_H
 
-#include <interfaces/iplugin.h>
+#include <duseinterfaces/iplugin.h>
 
 class QQuickView;
 class QQuickItem;
diff --git a/examples/uml/duse-mt/src/plugins/designoptimizer/designoptimizer_dependencies.pri b/examples/uml/duse-mt/src/plugins/designoptimizer/designoptimizer_dependencies.pri
new file mode 100644
index 00000000..31b2e66b
--- /dev/null
+++ b/examples/uml/duse-mt/src/plugins/designoptimizer/designoptimizer_dependencies.pri
@@ -0,0 +1 @@
+DUSEMT_PLUGIN_NAME = DesignOptimizer
diff --git a/examples/uml/duse-mt/src/plugins/designoptimizer/designoptimizerplugin.cpp b/examples/uml/duse-mt/src/plugins/designoptimizer/designoptimizerplugin.cpp
index 4512abc4..abd0a803 100644
--- a/examples/uml/duse-mt/src/plugins/designoptimizer/designoptimizerplugin.cpp
+++ b/examples/uml/duse-mt/src/plugins/designoptimizer/designoptimizerplugin.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 #include "designoptimizerplugin.h"
 
-#include <interfaces/iuicontroller.h>
+#include <duseinterfaces/iuicontroller.h>
 
 #include <QtQuick/QQuickView>
 
diff --git a/examples/uml/duse-mt/src/plugins/designoptimizer/designoptimizerplugin.h b/examples/uml/duse-mt/src/plugins/designoptimizer/designoptimizerplugin.h
index d09f04d1..15053cf9 100644
--- a/examples/uml/duse-mt/src/plugins/designoptimizer/designoptimizerplugin.h
+++ b/examples/uml/duse-mt/src/plugins/designoptimizer/designoptimizerplugin.h
@@ -41,7 +41,7 @@
 #ifndef DESIGNOPTIMIZERPLUGIN_H
 #define DESIGNOPTIMIZERPLUGIN_H
 
-#include <interfaces/iplugin.h>
+#include <duseinterfaces/iplugin.h>
 
 class QQuickView;
 
diff --git a/examples/uml/duse-mt/src/plugins/designspaceexplorer/designspaceexplorer_dependencies.pri b/examples/uml/duse-mt/src/plugins/designspaceexplorer/designspaceexplorer_dependencies.pri
new file mode 100644
index 00000000..02490f2a
--- /dev/null
+++ b/examples/uml/duse-mt/src/plugins/designspaceexplorer/designspaceexplorer_dependencies.pri
@@ -0,0 +1 @@
+DUSEMT_PLUGIN_NAME = DesignSpaceExplorer
diff --git a/examples/uml/duse-mt/src/plugins/designspaceexplorer/designspaceexplorerplugin.cpp b/examples/uml/duse-mt/src/plugins/designspaceexplorer/designspaceexplorerplugin.cpp
index 2a3bb396..8d8619b7 100644
--- a/examples/uml/duse-mt/src/plugins/designspaceexplorer/designspaceexplorerplugin.cpp
+++ b/examples/uml/duse-mt/src/plugins/designspaceexplorer/designspaceexplorerplugin.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 #include "designspaceexplorerplugin.h"
 
-#include <interfaces/iuicontroller.h>
+#include <duseinterfaces/iuicontroller.h>
 
 #include <QtQuick/QQuickView>
 
diff --git a/examples/uml/duse-mt/src/plugins/designspaceexplorer/designspaceexplorerplugin.h b/examples/uml/duse-mt/src/plugins/designspaceexplorer/designspaceexplorerplugin.h
index 950edc54..8919830e 100644
--- a/examples/uml/duse-mt/src/plugins/designspaceexplorer/designspaceexplorerplugin.h
+++ b/examples/uml/duse-mt/src/plugins/designspaceexplorer/designspaceexplorerplugin.h
@@ -41,7 +41,7 @@
 #ifndef DESIGNSPACEEXPLORERPLUGIN_H
 #define DESIGNSPACEEXPLORERPLUGIN_H
 
-#include <interfaces/iplugin.h>
+#include <duseinterfaces/iplugin.h>
 
 class NewDuseDesignDialog;
 
diff --git a/examples/uml/duse-mt/src/plugins/gccxmlarchitecturerecoverybackend/gccxmlarchitecturerecoverybackend.h b/examples/uml/duse-mt/src/plugins/gccxmlarchitecturerecoverybackend/gccxmlarchitecturerecoverybackend.h
index 280d6c6a..4b635bb9 100644
--- a/examples/uml/duse-mt/src/plugins/gccxmlarchitecturerecoverybackend/gccxmlarchitecturerecoverybackend.h
+++ b/examples/uml/duse-mt/src/plugins/gccxmlarchitecturerecoverybackend/gccxmlarchitecturerecoverybackend.h
@@ -41,7 +41,7 @@
 #ifndef GCCXMLARCHITECTURERECOVERYBACKEND_H
 #define GCCXMLARCHITECTURERECOVERYBACKEND_H
 
-#include "../architecturerecoverycore/iarchitecturerecoverybackend.h"
+#include <architecturerecoverycore/iarchitecturerecoverybackend.h>
 
 #include <QDir>
 #include <QObjectList>
diff --git a/examples/uml/duse-mt/src/plugins/gccxmlarchitecturerecoverybackend/gccxmlarchitecturerecoverybackend_dependencies.pri b/examples/uml/duse-mt/src/plugins/gccxmlarchitecturerecoverybackend/gccxmlarchitecturerecoverybackend_dependencies.pri
new file mode 100644
index 00000000..2762fc82
--- /dev/null
+++ b/examples/uml/duse-mt/src/plugins/gccxmlarchitecturerecoverybackend/gccxmlarchitecturerecoverybackend_dependencies.pri
@@ -0,0 +1,4 @@
+DUSEMT_PLUGIN_NAME = GccXmlArchitectureRecoveryBackend
+
+DUSEMT_PLUGIN_DEPENDS += \
+    architecturerecoverycore
diff --git a/examples/uml/duse-mt/src/plugins/gccxmlarchitecturerecoverybackend/gccxmlarchitecturerecoverybackendplugin.h b/examples/uml/duse-mt/src/plugins/gccxmlarchitecturerecoverybackend/gccxmlarchitecturerecoverybackendplugin.h
index f951732d..f57e8c37 100644
--- a/examples/uml/duse-mt/src/plugins/gccxmlarchitecturerecoverybackend/gccxmlarchitecturerecoverybackendplugin.h
+++ b/examples/uml/duse-mt/src/plugins/gccxmlarchitecturerecoverybackend/gccxmlarchitecturerecoverybackendplugin.h
@@ -41,7 +41,7 @@
 #ifndef GCCXMLARCHITECTURERECOVERYBACKENDPLUGIN_H
 #define GCCXMLARCHITECTURERECOVERYBACKENDPLUGIN_H
 
-#include <interfaces/iplugin.h>
+#include <duseinterfaces/iplugin.h>
 
 class GccXmlArchitectureRecoveryBackendPlugin : public DuSE::IPlugin
 {
diff --git a/examples/uml/duse-mt/src/plugins/javascriptconsole/javascriptconsole_dependencies.pri b/examples/uml/duse-mt/src/plugins/javascriptconsole/javascriptconsole_dependencies.pri
new file mode 100644
index 00000000..a118d0f6
--- /dev/null
+++ b/examples/uml/duse-mt/src/plugins/javascriptconsole/javascriptconsole_dependencies.pri
@@ -0,0 +1 @@
+DUSEMT_PLUGIN_NAME = JavaScriptConsole
diff --git a/examples/uml/duse-mt/src/plugins/javascriptconsole/javascriptconsoleplugin.cpp b/examples/uml/duse-mt/src/plugins/javascriptconsole/javascriptconsoleplugin.cpp
index d93b3fea..84c89eab 100644
--- a/examples/uml/duse-mt/src/plugins/javascriptconsole/javascriptconsoleplugin.cpp
+++ b/examples/uml/duse-mt/src/plugins/javascriptconsole/javascriptconsoleplugin.cpp
@@ -42,8 +42,8 @@
 
 #include "ui_javascriptconsole.h"
 
-#include <interfaces/iuicontroller.h>
-#include <interfaces/iprojectcontroller.h>
+#include <duseinterfaces/iuicontroller.h>
+#include <duseinterfaces/iprojectcontroller.h>
 
 #include <QtModeling/QModelingObject>
 
diff --git a/examples/uml/duse-mt/src/plugins/javascriptconsole/javascriptconsoleplugin.h b/examples/uml/duse-mt/src/plugins/javascriptconsole/javascriptconsoleplugin.h
index 2cd77d83..ba78e456 100644
--- a/examples/uml/duse-mt/src/plugins/javascriptconsole/javascriptconsoleplugin.h
+++ b/examples/uml/duse-mt/src/plugins/javascriptconsole/javascriptconsoleplugin.h
@@ -41,7 +41,7 @@
 #ifndef JAVASCRIPTCONSOLEPLUGIN_H
 #define JAVASCRIPTCONSOLEPLUGIN_H
 
-#include <interfaces/iplugin.h>
+#include <duseinterfaces/iplugin.h>
 
 #include <QtScript/QScriptEngine>
 
diff --git a/examples/uml/duse-mt/src/plugins/modelinspector/modelinspector_dependencies.pri b/examples/uml/duse-mt/src/plugins/modelinspector/modelinspector_dependencies.pri
new file mode 100644
index 00000000..9e0b32df
--- /dev/null
+++ b/examples/uml/duse-mt/src/plugins/modelinspector/modelinspector_dependencies.pri
@@ -0,0 +1 @@
+DUSEMT_PLUGIN_NAME = ModelInspector
diff --git a/examples/uml/duse-mt/src/plugins/modelinspector/modelinspectorplugin.cpp b/examples/uml/duse-mt/src/plugins/modelinspector/modelinspectorplugin.cpp
index a29cc3ff..58ea358b 100644
--- a/examples/uml/duse-mt/src/plugins/modelinspector/modelinspectorplugin.cpp
+++ b/examples/uml/duse-mt/src/plugins/modelinspector/modelinspectorplugin.cpp
@@ -40,8 +40,8 @@
 ****************************************************************************/
 #include "modelinspectorplugin.h"
 
-#include <interfaces/iuicontroller.h>
-#include <interfaces/iprojectcontroller.h>
+#include <duseinterfaces/iuicontroller.h>
+#include <duseinterfaces/iprojectcontroller.h>
 
 #include <QtModelingWidgets/QModelingObjectView>
 #include <QtModelingWidgets/QModelingObjectModel>
diff --git a/examples/uml/duse-mt/src/plugins/modelinspector/modelinspectorplugin.h b/examples/uml/duse-mt/src/plugins/modelinspector/modelinspectorplugin.h
index 8a6149a6..7e4b5cff 100644
--- a/examples/uml/duse-mt/src/plugins/modelinspector/modelinspectorplugin.h
+++ b/examples/uml/duse-mt/src/plugins/modelinspector/modelinspectorplugin.h
@@ -41,7 +41,7 @@
 #ifndef MODELINSPECTORPLUGIN_H
 #define MODELINSPECTORPLUGIN_H
 
-#include <interfaces/iplugin.h>
+#include <duseinterfaces/iplugin.h>
 
 class QListView;
 
diff --git a/examples/uml/duse-mt/src/plugins/umlconcretesyntax/umlconcretesyntax_dependencies.pri b/examples/uml/duse-mt/src/plugins/umlconcretesyntax/umlconcretesyntax_dependencies.pri
new file mode 100644
index 00000000..21ac3ba6
--- /dev/null
+++ b/examples/uml/duse-mt/src/plugins/umlconcretesyntax/umlconcretesyntax_dependencies.pri
@@ -0,0 +1 @@
+DUSEMT_PLUGIN_NAME = UmlConcreteSyntax
diff --git a/examples/uml/duse-mt/src/plugins/umlconcretesyntax/umlconcretesyntaxplugin.h b/examples/uml/duse-mt/src/plugins/umlconcretesyntax/umlconcretesyntaxplugin.h
index 945a2426..21110950 100644
--- a/examples/uml/duse-mt/src/plugins/umlconcretesyntax/umlconcretesyntaxplugin.h
+++ b/examples/uml/duse-mt/src/plugins/umlconcretesyntax/umlconcretesyntaxplugin.h
@@ -41,7 +41,7 @@
 #ifndef UMLCONCRETESYNTAXPLUGIN_H
 #define UMLCONCRETESYNTAXPLUGIN_H
 
-#include <interfaces/iplugin.h>
+#include <duseinterfaces/iplugin.h>
 
 class QQuickView;
 class QQuickItem;
diff --git a/examples/uml/duse-mt/src/plugins/welcomedashboard/welcomedashboard_dependencies.pri b/examples/uml/duse-mt/src/plugins/welcomedashboard/welcomedashboard_dependencies.pri
new file mode 100644
index 00000000..3c4a11a1
--- /dev/null
+++ b/examples/uml/duse-mt/src/plugins/welcomedashboard/welcomedashboard_dependencies.pri
@@ -0,0 +1 @@
+DUSEMT_PLUGIN_NAME = WelcomeDashboard
diff --git a/examples/uml/duse-mt/src/plugins/welcomedashboard/welcomedashboardplugin.cpp b/examples/uml/duse-mt/src/plugins/welcomedashboard/welcomedashboardplugin.cpp
index b447d503..69a63575 100644
--- a/examples/uml/duse-mt/src/plugins/welcomedashboard/welcomedashboardplugin.cpp
+++ b/examples/uml/duse-mt/src/plugins/welcomedashboard/welcomedashboardplugin.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 #include "welcomedashboardplugin.h"
 
-#include <interfaces/iuicontroller.h>
+#include <duseinterfaces/iuicontroller.h>
 
 #include <QtQuick/QQuickView>
 
diff --git a/examples/uml/duse-mt/src/plugins/welcomedashboard/welcomedashboardplugin.h b/examples/uml/duse-mt/src/plugins/welcomedashboard/welcomedashboardplugin.h
index dba43103..96fb4a62 100644
--- a/examples/uml/duse-mt/src/plugins/welcomedashboard/welcomedashboardplugin.h
+++ b/examples/uml/duse-mt/src/plugins/welcomedashboard/welcomedashboardplugin.h
@@ -41,7 +41,7 @@
 #ifndef WELCOMEDASHBOARDPLUGIN_H
 #define WELCOMEDASHBOARDPLUGIN_H
 
-#include <interfaces/iplugin.h>
+#include <duseinterfaces/iplugin.h>
 
 class QQuickView;