aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@digia.com>2014-08-07 18:26:47 +0200
committerChristian Kandeler <christian.kandeler@digia.com>2014-08-08 10:06:55 +0200
commit2d84065548ad10b25b3650eb7c6295372612d8bf (patch)
tree51fd9536916399665765adb1b79f109f455fd6b4
parent7e0783befbbdbe95f1b6fc43b80e82e394ef4875 (diff)
do not depend on CONFIG+=ordered
Use correct dependencies instead. Change-Id: I894a5b4f5bb5fe7ed57a18433c14b7fbb8a33e36 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
-rw-r--r--qbs.pro5
-rw-r--r--tests/auto/auto.pro1
2 files changed, 3 insertions, 3 deletions
diff --git a/qbs.pro b/qbs.pro
index 414bc6033..e78772894 100644
--- a/qbs.pro
+++ b/qbs.pro
@@ -27,17 +27,18 @@ defineTest(minQtVersion) {
}
TEMPLATE = subdirs
-CONFIG += ordered
corelib.file = src/lib/corelib/corelib.pro
setupqtprofilelib.subdir = src/lib/qtprofilesetup
setupqtprofilelib.depends = corelib
src_app.subdir = src/app
src_app.depends = setupqtprofilelib
+src_plugins.subdir = src/plugins
+tests.depends = corelib src_plugins
SUBDIRS += \
corelib\
setupqtprofilelib\
src_app\
- src/plugins\
+ src_plugins\
static.pro\
tests
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 823bd3e49..394e9e6af 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -1,5 +1,4 @@
TEMPLATE=subdirs
-CONFIG += ordered
all_tests {
SUBDIRS += \