diff options
Diffstat (limited to 'examples')
-rw-r--r-- | examples/examples.pro | 4 | ||||
-rw-r--r-- | examples/uml/duse-mt/src/app/shell/mainwindow.cpp | 14 | ||||
-rw-r--r-- | examples/uml/duse-mt/src/app/shell/mainwindow.h | 2 | ||||
-rw-r--r-- | examples/uml/duse-mt/src/plugins/plugins.pro | 19 | ||||
-rw-r--r-- | examples/uml/uml.pro | 2 |
5 files changed, 18 insertions, 23 deletions
diff --git a/examples/examples.pro b/examples/examples.pro index 1f7b5316..dbb3c4b9 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -1,5 +1,3 @@ TEMPLATE = subdirs -SUBDIRS = -qtHaveModule(mof): SUBDIRS += mof -qtHaveModule(uml): SUBDIRS += uml +SUBDIRS = mof uml diff --git a/examples/uml/duse-mt/src/app/shell/mainwindow.cpp b/examples/uml/duse-mt/src/app/shell/mainwindow.cpp index e3af11d9..71631a9d 100644 --- a/examples/uml/duse-mt/src/app/shell/mainwindow.cpp +++ b/examples/uml/duse-mt/src/app/shell/mainwindow.cpp @@ -67,14 +67,6 @@ #include <QtModelingWidgets/QModelingObjectView> #include <QtModelingWidgets/QModelingObjectPropertyModel> -#include <QtQml/QQmlEngine> -#include <QtQml/QQmlContext> -#include <QtQml/QQmlComponent> - -#include <QtQuick/QQuickView> -#include <QtQuick/QQuickItem> -//#include "QtQuick/private/qquickflickable_p.h" - #include <duseinterfaces/icore.h> #include <duseinterfaces/iplugin.h> #include <duseinterfaces/iplugincontroller.h> @@ -297,8 +289,8 @@ void MainWindow::metaModelChanged(QString newMetaModel) _newModel->lstTopLevelContainers->setCurrentRow(0); } -void MainWindow::addToDesignSpaceView(QModelingElement *modelingObject, QQuickItem *parent) -{ +//void MainWindow::addToDesignSpaceView(QModelingElement *modelingObject, QQuickItem *parent) +//{ // QQmlContext *context = new QQmlContext(_designSpaceQuickView->engine()->rootContext()); // //modelingObject->setQmlContextProperties(context); // _qmlComponent = new QQmlComponent(_designSpaceQuickView->engine()); @@ -320,7 +312,7 @@ void MainWindow::addToDesignSpaceView(QModelingElement *modelingObject, QQuickIt // addToDesignSpaceView(dynamic_cast<QModelingElement *>(qModelingElement(child))); // _qmlComponent->deleteLater(); -} +//} void MainWindow::addToPareto(QModelingElement *modelingObject, int pos) { diff --git a/examples/uml/duse-mt/src/app/shell/mainwindow.h b/examples/uml/duse-mt/src/app/shell/mainwindow.h index 775855d3..9e36cba9 100644 --- a/examples/uml/duse-mt/src/app/shell/mainwindow.h +++ b/examples/uml/duse-mt/src/app/shell/mainwindow.h @@ -94,7 +94,7 @@ private Q_SLOTS: void evaluateQualityMetrics(); void metaModelChanged(QString newMetaModel); - void addToDesignSpaceView(QModelingElement *modelingObject, QQuickItem *parent = 0); +// void addToDesignSpaceView(QModelingElement *modelingObject, QQuickItem *parent = 0); void addToPareto(QModelingElement *modelingObject, int pos); void designSpaceChanged(); diff --git a/examples/uml/duse-mt/src/plugins/plugins.pro b/examples/uml/duse-mt/src/plugins/plugins.pro index b29bc388..30dd3e60 100644 --- a/examples/uml/duse-mt/src/plugins/plugins.pro +++ b/examples/uml/duse-mt/src/plugins/plugins.pro @@ -3,11 +3,16 @@ CONFIG += ordered SUBDIRS = \ modelinspector \ - javascriptconsole \ - welcomedashboard \ - designspaceexplorer \ - designoptimizer \ - concretesyntaxview \ - umlconcretesyntax \ - architecturerecoverycore \ + +qtHaveModule(script): SUBDIRS += javascriptconsole + +qtHaveModule(quick): SUBDIRS += welcomedashboard \ + designoptimizer + +qtHaveModule(script):qtHaveModule(quick): SUBDIRS += designspaceexplorer + +qtHaveModule(quick-private): SUBDIRS += concretesyntaxview \ + umlconcretesyntax + +SUBDIRS += architecturerecoverycore \ gccxmlarchitecturerecoverybackend diff --git a/examples/uml/uml.pro b/examples/uml/uml.pro index ca19f79b..bfa3901a 100644 --- a/examples/uml/uml.pro +++ b/examples/uml/uml.pro @@ -1,4 +1,4 @@ TEMPLATE = subdirs SUBDIRS = nested-packages profile-definition xmi-write xmi-read -qtHaveModule(widgets):qtHaveModule(quick):qtHaveModule(qml): SUBDIRS += duse-mt +qtHaveModule(widgets): SUBDIRS += duse-mt |