Fix .pro files for insource building

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

9 files changed, 51 insertions, 96 deletions

diff --git a/INSOURCE-BUILDING b/INSOURCE-BUILDING
index 40d82056..3ca03370 100644
--- a/INSOURCE-BUILDING
+++ b/INSOURCE-BUILDING
@@ -1,76 +1,38 @@
-In order to build the QtMof add-on inside Qt official repository the following
+In order to build the QtModeling add-on inside Qt official repository the following
 steps should be applied. Apparently a complete clean, init-repository, configure
 and make is needed.
 
 1) Build
 
-1.1) Apply the following patch
-
-diff --git a/.gitmodules b/.gitmodules
-index ba2aa2e..2483813 100644
---- a/.gitmodules
-+++ b/.gitmodules
-@@ -79,3 +79,6 @@
- [submodule "qtgraphicaleffects"]
-        path = qtgraphicaleffects
-        url = git://gitorious.org/qt/qtgraphicaleffects.git
-+[submodule "qtmof"]
-+       path = qtmof
-+       url = git://gitorious.org/qtplayground/qtmof.git
-diff --git a/qtmof b/qtmof
-new file mode 160000
-index 0000000..1199941
---- /dev/null
-+++ b/qtmof
-@@ -0,0 +1 @@
-+Subproject commit 119994178d59af28b850615968a64897ad8a7026
-
-1.2) Apply the following patch
-
-diff --git a/build.dependencies b/build.dependencies
-index a979bf0..fba4688 100644
---- a/build.dependencies
-+++ b/build.dependencies
-@@ -31,6 +31,7 @@ use Config;
-     "qtwebkit" => "qtbase,qtscript,qtdeclarative,qtquick1,qtlocation",
-     "qtwebkit-examples-and-demos" => "qtwebkit",
-     "qtxmlpatterns" => "qtbase",
-+    "qtmof" => "qtbase",
- );
-
- @nondefault_modules = (
-diff --git a/init-repository b/init-repository
-index b63cf86..70f2391 100755
---- a/init-repository
-+++ b/init-repository
-@@ -245,6 +245,7 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw(
-     qtwayland
-     qtwebkit-examples-and-demos
-     qtxmlpatterns
-+    qtmof
- );
-
- my $GERRIT_SSH_BASE
-diff --git a/qt.pro b/qt.pro
-index 63d31f2..8bde12f 100644
---- a/qt.pro
-+++ b/qt.pro
-@@ -113,6 +113,10 @@ module_qtgraphicaleffects.subdir = qtgraphicaleffects
- module_qtgraphicaleffects.target = module-qtgraphicaleffects
- module_qtgraphicaleffects.depends = module_qtbase module_qtdeclarative
-
-+module_qtmof.subdir = qtmof
-+module_qtmof.target = module-qtmof
-+module_qtmof.depends = module_qtbase
-+
- # only qtbase is required to exist. The others may not - but it is the
- # users responsibility to ensure that all needed dependencies exist, or
- # it may not build.
-@@ -194,3 +198,4 @@ exists(qttranslations/qttranslations.pro): SUBDIRS += module_qttranslations
- exists(qtdoc/qtdoc.pro): SUBDIRS += module_qtdoc
- exists(qtqa/qtqa.pro): SUBDIRS += module_qtqa
- exists(qlalr/qlalr.pro): SUBDIRS += module_qlalr
-+exists(qtmof/qtmof.pro): SUBDIRS += module_qtmof
+1.1) Clone qt5 repository
+
+1.2) In qt5 root directory add qtmodeling as a submodule:
+
+git submodule add ../qtmodeling.git
+
+1.3) Remove all contents in qtmodeling directory
+
+1.4) Add 'qtmodeling' in %GERRIT_REPOS and @DEFAULT_REPOS
+     sections in init-repository script
+
+1.5) Add the following line in qt.pro:
+
+addModule(qtmodeling, qtbase, qtdeclarative, qtscript)
+
+1.6) The previous files (.gitmodules, init-repository, and qt.pro) should be committed in
+     qt5 super-repository when qtmodeling is ready to be released
+
+1.7) Init the repository:
+
+perl init-repository --module-subset=qtbase,qtdeclarative,qtscript,qtmodeling
+
+1.8) Configure Qt5:
+
+./configure -developer-build -opensource -nomake examples -nomake tests -confirm-license
+
+1.9) Build Qt5:
+
+make -j <#core+1>
 
 2) Documentation
 
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
diff --git a/qtmodeling.pro b/qtmodeling.pro
index 58c33f27..25ccfbc0 100644
--- a/qtmodeling.pro
+++ b/qtmodeling.pro
@@ -1 +1,2 @@
 load(qt_parts)
+SUBDIRS += examples
diff --git a/sync.profile b/sync.profile
index 66b498d7..d260553f 100644
--- a/sync.profile
+++ b/sync.profile
@@ -42,4 +42,5 @@
 %dependencies = (
     "qtbase" => "refs/heads/stable",
     "qtscript" => "refs/heads/stable",
+    "qtdeclarative" => "refs/heads/stable",
 );
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index a3290967..d33bf4c7 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -1,6 +1,2 @@
 TEMPLATE=subdirs
-qtHaveModule(mof): SUBDIRS += qtmofcontainment
-qtHaveModule(uml): SUBDIRS += \
-    qtumlcontainment \
-    qtumlprovidedrequiredinterfaces \
-    qtumlconnectortypeandcomponentparts
+SUBDIRS = qtmofcontainment qtumlcontainment qtumlprovidedrequiredinterfaces qtumlconnectortypeandcomponentparts