diff options
17 files changed, 39 insertions, 29 deletions
diff --git a/examples/corelib/tools/tools.pro b/examples/corelib/tools/tools.pro index 36fa776980..6fb4a1214f 100644 --- a/examples/corelib/tools/tools.pro +++ b/examples/corelib/tools/tools.pro @@ -1,7 +1,6 @@ requires(qtHaveModule(widgets)) TEMPLATE = subdirs -CONFIG += ordered SUBDIRS = contiguouscache \ customtype \ customtypesending diff --git a/examples/dbus/complexpingpong/complexpingpong.pro b/examples/dbus/complexpingpong/complexpingpong.pro index cd618d549d..c30286b732 100644 --- a/examples/dbus/complexpingpong/complexpingpong.pro +++ b/examples/dbus/complexpingpong/complexpingpong.pro @@ -1,4 +1,3 @@ TEMPLATE = subdirs -CONFIG += ordered win32:CONFIG += console SUBDIRS = complexping.pro complexpong.pro diff --git a/examples/dbus/pingpong/pingpong.pro b/examples/dbus/pingpong/pingpong.pro index 07fca74c9a..654574c76d 100644 --- a/examples/dbus/pingpong/pingpong.pro +++ b/examples/dbus/pingpong/pingpong.pro @@ -1,4 +1,3 @@ TEMPLATE = subdirs -CONFIG += ordered win32:CONFIG += console SUBDIRS = ping.pro pong.pro diff --git a/examples/widgets/desktop/desktop.pro b/examples/widgets/desktop/desktop.pro index db518c1c7a..4c9d0e2cec 100644 --- a/examples/widgets/desktop/desktop.pro +++ b/examples/widgets/desktop/desktop.pro @@ -1,3 +1,2 @@ TEMPLATE = subdirs -CONFIG += ordered SUBDIRS = screenshot systray diff --git a/tests/auto/corelib/global/qlogging/qlogging.pro b/tests/auto/corelib/global/qlogging/qlogging.pro index f1ca6570a0..bbe75297d5 100644 --- a/tests/auto/corelib/global/qlogging/qlogging.pro +++ b/tests/auto/corelib/global/qlogging/qlogging.pro @@ -1,6 +1,8 @@ TEMPLATE = subdirs -CONFIG += ordered -!winrt: SUBDIRS += app +!winrt { + test.depends = app + SUBDIRS += app +} SUBDIRS += test diff --git a/tests/auto/corelib/kernel/qobject/qobject.pro b/tests/auto/corelib/kernel/qobject/qobject.pro index bd83396ca0..978aab86c1 100644 --- a/tests/auto/corelib/kernel/qobject/qobject.pro +++ b/tests/auto/corelib/kernel/qobject/qobject.pro @@ -1,6 +1,8 @@ TEMPLATE = subdirs -CONFIG += ordered -!winrt: SUBDIRS+= signalbug +!winrt { + test.depends = signalbug + SUBDIRS += signalbug +} SUBDIRS += test diff --git a/tests/auto/corelib/plugin/qfactoryloader/qfactoryloader.pro b/tests/auto/corelib/plugin/qfactoryloader/qfactoryloader.pro index ace9fe8fd0..f0430d55e6 100644 --- a/tests/auto/corelib/plugin/qfactoryloader/qfactoryloader.pro +++ b/tests/auto/corelib/plugin/qfactoryloader/qfactoryloader.pro @@ -1,6 +1,7 @@ QT = core-private TEMPLATE = subdirs -CONFIG += ordered + +test.depends = plugin1 plugin2 SUBDIRS = \ plugin1 \ plugin2 \ diff --git a/tests/auto/corelib/plugin/qlibrary/qlibrary.pro b/tests/auto/corelib/plugin/qlibrary/qlibrary.pro index ec58838e71..44f791f582 100644 --- a/tests/auto/corelib/plugin/qlibrary/qlibrary.pro +++ b/tests/auto/corelib/plugin/qlibrary/qlibrary.pro @@ -1,6 +1,7 @@ QT = core TEMPLATE = subdirs -CONFIG += ordered + +tst.depends = lib lib2 SUBDIRS = lib \ lib2 \ diff --git a/tests/auto/corelib/plugin/qpluginloader/qpluginloader.pro b/tests/auto/corelib/plugin/qpluginloader/qpluginloader.pro index c681f5585c..541e73636c 100644 --- a/tests/auto/corelib/plugin/qpluginloader/qpluginloader.pro +++ b/tests/auto/corelib/plugin/qpluginloader/qpluginloader.pro @@ -1,12 +1,18 @@ QT = core -TEMPLATE = subdirs -CONFIG += ordered -SUBDIRS = lib \ - theplugin \ - tst -!android: !win32: !mac: SUBDIRS += almostplugin -macx-*: qtConfig(private_tests): SUBDIRS += machtest -TARGET = tst_qpluginloader +TEMPLATE = subdirs + +tst.depends = lib theplugin +SUBDIRS = lib \ + theplugin \ + tst +!android:!win32:!darwin { + tst.depends += almostplugin + SUBDIRS += almostplugin +} +macos:qtConfig(private_tests) { + tst.depends += machtest + SUBDIRS += machtest +} # no special install rule for subdir INSTALLS = diff --git a/tests/auto/corelib/thread/qthreadstorage/qthreadstorage.pro b/tests/auto/corelib/thread/qthreadstorage/qthreadstorage.pro index b9bc456dcf..75898f6add 100644 --- a/tests/auto/corelib/thread/qthreadstorage/qthreadstorage.pro +++ b/tests/auto/corelib/thread/qthreadstorage/qthreadstorage.pro @@ -1,7 +1,8 @@ TEMPLATE = subdirs -SUBDIRS = \ - test -!winrt: SUBDIRS += crashonexit +!winrt { + test.depends = crashonexit + SUBDIRS += crashonexit +} -CONFIG += ordered +SUBDIRS += test diff --git a/tests/auto/dbus/qdbusabstractadaptor/qdbusabstractadaptor.pro b/tests/auto/dbus/qdbusabstractadaptor/qdbusabstractadaptor.pro index 1b35019f94..9b63dab068 100644 --- a/tests/auto/dbus/qdbusabstractadaptor/qdbusabstractadaptor.pro +++ b/tests/auto/dbus/qdbusabstractadaptor/qdbusabstractadaptor.pro @@ -2,5 +2,6 @@ CONFIG += testcase TARGET = tst_qdbusabstractadaptor QT = core core-private testlib TEMPLATE = subdirs -CONFIG += ordered + +qdbusabstractadaptor.depends = qmyserver SUBDIRS = qmyserver qdbusabstractadaptor diff --git a/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface.pro b/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface.pro index 99462b1b36..26991e2514 100644 --- a/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface.pro +++ b/tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface.pro @@ -1,6 +1,6 @@ CONFIG += testcase TARGET = tst_qdbusabstractinterface TEMPLATE = subdirs -CONFIG += ordered +qdbusabstractinterface.depends = qpinger SUBDIRS = qpinger qdbusabstractinterface OTHER_FILES += org.qtproject.QtDBus.Pinger.xml diff --git a/tests/auto/dbus/qdbusinterface/qdbusinterface.pro b/tests/auto/dbus/qdbusinterface/qdbusinterface.pro index c8861cb2a4..bc9cf5ffaf 100644 --- a/tests/auto/dbus/qdbusinterface/qdbusinterface.pro +++ b/tests/auto/dbus/qdbusinterface/qdbusinterface.pro @@ -2,5 +2,5 @@ CONFIG += testcase TARGET = tst_qdbusinterface QT = core testlib TEMPLATE = subdirs -CONFIG += ordered +qdbusinterface.depends = qmyserver SUBDIRS = qmyserver qdbusinterface diff --git a/tests/auto/dbus/qdbusmarshall/qdbusmarshall.pro b/tests/auto/dbus/qdbusmarshall/qdbusmarshall.pro index caedb5a0f2..033602d4e4 100644 --- a/tests/auto/dbus/qdbusmarshall/qdbusmarshall.pro +++ b/tests/auto/dbus/qdbusmarshall/qdbusmarshall.pro @@ -1,7 +1,7 @@ CONFIG += testcase TARGET = tst_qdbusmarshall TEMPLATE = subdirs -CONFIG += ordered +qdbusmarshall.depends = qpong SUBDIRS = qpong qdbusmarshall QT = core-private testlib diff --git a/tests/auto/other/macplist/macplist.pro b/tests/auto/other/macplist/macplist.pro index 3a0e2d43d3..5820793cbc 100644 --- a/tests/auto/other/macplist/macplist.pro +++ b/tests/auto/other/macplist/macplist.pro @@ -1,7 +1,7 @@ TEMPLATE = subdirs +test.depends = app SUBDIRS = app test -CONFIG += ordered diff --git a/tests/benchmarks/corelib/io/qprocess/qprocess.pro b/tests/benchmarks/corelib/io/qprocess/qprocess.pro index c49542f616..839b4f7ecd 100644 --- a/tests/benchmarks/corelib/io/qprocess/qprocess.pro +++ b/tests/benchmarks/corelib/io/qprocess/qprocess.pro @@ -1,3 +1,3 @@ TEMPLATE = subdirs -CONFIG += ordered +test.depends = testProcessLoopback SUBDIRS = testProcessLoopback test diff --git a/tests/benchmarks/dbus/qdbusperformance/qdbusperformance.pro b/tests/benchmarks/dbus/qdbusperformance/qdbusperformance.pro index e90d38a55c..94cb8e41c7 100644 --- a/tests/benchmarks/dbus/qdbusperformance/qdbusperformance.pro +++ b/tests/benchmarks/dbus/qdbusperformance/qdbusperformance.pro @@ -1,3 +1,3 @@ TEMPLATE = subdirs -CONFIG += ordered +test.depends = server SUBDIRS = server test |