diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-11-20 12:29:03 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-12-02 11:09:15 +0000 |
| commit | 2c25a431d08ad7cd00293be1872d744c1e11fbaa (patch) | |
| tree | e1e6a80138ce5baf2d662dca6f494fb2cbcb87ed /tests/auto/corelib | |
| parent | beb9ca92dff21b6aab6a4d8c6535119f5b3adf16 (diff) | |
Use dependencies instead of CONFIG+=ordered
Also drops a few instances where the dependency was purely runtime,
especially for examples.
Change-Id: I2a0476f79928143596bdb3b8f01193af90574ae8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'tests/auto/corelib')
6 files changed, 31 insertions, 18 deletions
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 |