diff options
-rw-r--r-- | src/assistant/assistant.pro | 6 | ||||
-rw-r--r-- | src/designer/src/components/components.pro | 1 | ||||
-rw-r--r-- | src/designer/src/plugins/plugins.pro | 1 | ||||
-rw-r--r-- | src/designer/src/src.pro | 5 | ||||
-rw-r--r-- | src/src.pro | 3 |
5 files changed, 11 insertions, 5 deletions
diff --git a/src/assistant/assistant.pro b/src/assistant/assistant.pro index b16a1892b..390c9ecd0 100644 --- 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 97d79b4bb..dac34e57f 100644 --- 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 22de8c957..b7ee66193 100644 --- 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 64d1c3708..137a73c88 100644 --- 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 6891b1765..af3383068 100644 --- 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 } } |