parallelize SUBDIRS

Change-Id: Ie1c6e8e479c8f2e758b03175d9250a71e52ce3ce
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

diff --git a/src/assistant/assistant.pro b/src/assistant/assistant.pro
index b16a189..390c9ec 100644 (file)
--- a/src/assistant/assistant.pro
+++ b/src/assistant/assistant.pro
@@ -1,5 +1,4 @@
 TEMPLATE = subdirs
-CONFIG  += ordered
 
 SUBDIRS += clucene \
           help \
@@ -8,3 +7,8 @@ SUBDIRS += clucene \
            qcollectiongenerator \
            qhelpconverter
 
+help.depends = clucene
+assistant.depends = help
+qhelpgenerator.depends = help
+qcollectiongenerator.depends = help
+qhelpconverter.depends = help

diff --git a/src/designer/src/components/components.pro b/src/designer/src/components/components.pro
index 97d79b4..dac34e5 100644 (file)
--- a/src/designer/src/components/components.pro
+++ b/src/designer/src/components/components.pro
@@ -1,3 +1,2 @@
 TEMPLATE = subdirs
-CONFIG += ordered
 SUBDIRS = lib

diff --git a/src/designer/src/plugins/plugins.pro b/src/designer/src/plugins/plugins.pro
index 22de8c9..b7ee661 100644 (file)
--- a/src/designer/src/plugins/plugins.pro
+++ b/src/designer/src/plugins/plugins.pro
@@ -1,5 +1,4 @@
 TEMPLATE = subdirs
-CONFIG += ordered
 
 # qtHaveModule(opengl): SUBDIRS += tools/view3d
 qtHaveModule(webkitwidgets): SUBDIRS += qwebview

diff --git a/src/designer/src/src.pro b/src/designer/src/src.pro
index 64d1c37..137a73c 100644 (file)
--- a/src/designer/src/src.pro
+++ b/src/designer/src/src.pro
@@ -1,5 +1,4 @@
 TEMPLATE = subdirs
-CONFIG += ordered
 
 SUBDIRS = \
     uitools \
@@ -8,3 +7,7 @@ SUBDIRS = \
     designer
 
 contains(QT_CONFIG, shared): SUBDIRS += plugins
+
+components.depends = lib
+designer.depends = components
+plugins.depends = lib

diff --git a/src/src.pro b/src/src.pro
index 6891b17..af33830 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -1,5 +1,4 @@
 TEMPLATE = subdirs
-CONFIG += ordered
 
 qtHaveModule(widgets) {
     no-png {
@@ -10,6 +9,8 @@ qtHaveModule(widgets) {
                   qtestlib \
                   designer
 #    unix:!mac:!embedded:!qpa:SUBDIRS += qtconfig
+
+        linguist.depends = designer
     }
 }