From 2c25a431d08ad7cd00293be1872d744c1e11fbaa Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 20 Nov 2017 12:29:03 +0100 Subject: 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 --- tests/auto/dbus/qdbusabstractadaptor/qdbusabstractadaptor.pro | 3 ++- tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface.pro | 2 +- tests/auto/dbus/qdbusinterface/qdbusinterface.pro | 2 +- tests/auto/dbus/qdbusmarshall/qdbusmarshall.pro | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) (limited to 'tests/auto/dbus') 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 -- cgit v1.2.3