diff --git a/src/assistant/assistant.pro b/src/assistant/assistant.pro index b16a1892bf653d7adf2d56d29b96ea785ff440af..390c9ecd0a7b34f9a9081d605c1d208aff596549 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 97d79b4bb42ab027ef7dd7499d215160385a8125..dac34e57f86c845d0eb37e37ded370a9d7370b3f 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 22de8c957488eceb124728cc7933fd5e827e4b5d..b7ee661931a514a8df6e3c019595f99b2870f546 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 64d1c37081f1e962e886a5b11bc5c0f9c7cd67af..137a73c8826c9ee69b76a7b488809aa673e83871 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 6891b1765000c6877237a3295eba49f9ec431304..af3383068ef29e96a0d650153ca4b57b8d72f24a 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 } }