1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use dependencies instead of CONFIG+=ordered

Browse Source 
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>
This commit is contained in:
Allan Sandfeld Jensen 2017-11-20 12:29:03 +01:00
parent beb9ca92df
commit 2c25a431d0
17 changed files with 39 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
examples/corelib/tools/tools.pro
View File

@ -1,7 +1,6 @@
requires(qtHaveModule(widgets)) requires(qtHaveModule(widgets))
TEMPLATE = subdirs TEMPLATE = subdirs
CONFIG += ordered
SUBDIRS = contiguouscache \ SUBDIRS = contiguouscache \
customtype \ customtype \
customtypesending customtypesending

1
examples/dbus/complexpingpong/complexpingpong.pro
View File

@ -1,4 +1,3 @@
TEMPLATE = subdirs TEMPLATE = subdirs
CONFIG += ordered
win32:CONFIG += console win32:CONFIG += console
SUBDIRS = complexping.pro complexpong.pro SUBDIRS = complexping.pro complexpong.pro

1
examples/dbus/pingpong/pingpong.pro
View File

@ -1,4 +1,3 @@
TEMPLATE = subdirs TEMPLATE = subdirs
CONFIG += ordered
win32:CONFIG += console win32:CONFIG += console
SUBDIRS = ping.pro pong.pro SUBDIRS = ping.pro pong.pro

1
examples/widgets/desktop/desktop.pro
View File

@ -1,3 +1,2 @@
TEMPLATE = subdirs TEMPLATE = subdirs
CONFIG += ordered
SUBDIRS = screenshot systray SUBDIRS = screenshot systray

6
tests/auto/corelib/global/qlogging/qlogging.pro
View File

@ -1,6 +1,8 @@
TEMPLATE = subdirs TEMPLATE = subdirs
CONFIG += ordered
!winrt: SUBDIRS += app !winrt {
test.depends = app
SUBDIRS += app
}
SUBDIRS += test SUBDIRS += test

6
tests/auto/corelib/kernel/qobject/qobject.pro
View File

@ -1,6 +1,8 @@
TEMPLATE = subdirs TEMPLATE = subdirs
CONFIG += ordered
!winrt: SUBDIRS+= signalbug !winrt {
test.depends = signalbug
SUBDIRS += signalbug
}
SUBDIRS += test SUBDIRS += test

3
tests/auto/corelib/plugin/qfactoryloader/qfactoryloader.pro
View File

@ -1,6 +1,7 @@
QT = core-private QT = core-private
TEMPLATE = subdirs TEMPLATE = subdirs
CONFIG += ordered
test.depends = plugin1 plugin2
SUBDIRS = \ SUBDIRS = \
plugin1 \ plugin1 \
plugin2 \ plugin2 \

3
tests/auto/corelib/plugin/qlibrary/qlibrary.pro
View File

@ -1,6 +1,7 @@
QT = core QT = core
TEMPLATE = subdirs TEMPLATE = subdirs
CONFIG += ordered
tst.depends = lib lib2
SUBDIRS = lib \ SUBDIRS = lib \
lib2 \ lib2 \

22
tests/auto/corelib/plugin/qpluginloader/qpluginloader.pro
View File

@ -1,12 +1,18 @@
QT = core QT = core
TEMPLATE = subdirs TEMPLATE = subdirs
CONFIG += ordered
SUBDIRS = lib \ tst.depends = lib theplugin
theplugin \ SUBDIRS = lib \
tst theplugin \
!android: !win32: !mac: SUBDIRS += almostplugin tst
macx-*: qtConfig(private_tests): SUBDIRS += machtest !android:!win32:!darwin {
TARGET = tst_qpluginloader tst.depends += almostplugin
SUBDIRS += almostplugin
}
macos:qtConfig(private_tests) {
tst.depends += machtest
SUBDIRS += machtest
}
# no special install rule for subdir # no special install rule for subdir
INSTALLS = INSTALLS =

9
tests/auto/corelib/thread/qthreadstorage/qthreadstorage.pro
View File

@ -1,7 +1,8 @@
TEMPLATE = subdirs TEMPLATE = subdirs
SUBDIRS = \
test
!winrt: SUBDIRS += crashonexit !winrt {
test.depends = crashonexit
SUBDIRS += crashonexit
}
CONFIG += ordered SUBDIRS += test

3
tests/auto/dbus/qdbusabstractadaptor/qdbusabstractadaptor.pro
View File

@ -2,5 +2,6 @@ CONFIG += testcase
TARGET = tst_qdbusabstractadaptor TARGET = tst_qdbusabstractadaptor
QT = core core-private testlib QT = core core-private testlib
TEMPLATE = subdirs TEMPLATE = subdirs
CONFIG += ordered
qdbusabstractadaptor.depends = qmyserver
SUBDIRS = qmyserver qdbusabstractadaptor SUBDIRS = qmyserver qdbusabstractadaptor

2
tests/auto/dbus/qdbusabstractinterface/qdbusabstractinterface.pro
View File

@ -1,6 +1,6 @@
CONFIG += testcase CONFIG += testcase
TARGET = tst_qdbusabstractinterface TARGET = tst_qdbusabstractinterface
TEMPLATE = subdirs TEMPLATE = subdirs
CONFIG += ordered qdbusabstractinterface.depends = qpinger
SUBDIRS = qpinger qdbusabstractinterface SUBDIRS = qpinger qdbusabstractinterface
OTHER_FILES += org.qtproject.QtDBus.Pinger.xml OTHER_FILES += org.qtproject.QtDBus.Pinger.xml

2
tests/auto/dbus/qdbusinterface/qdbusinterface.pro
View File

@ -2,5 +2,5 @@ CONFIG += testcase
TARGET = tst_qdbusinterface TARGET = tst_qdbusinterface
QT = core testlib QT = core testlib
TEMPLATE = subdirs TEMPLATE = subdirs
CONFIG += ordered qdbusinterface.depends = qmyserver
SUBDIRS = qmyserver qdbusinterface SUBDIRS = qmyserver qdbusinterface

2
tests/auto/dbus/qdbusmarshall/qdbusmarshall.pro
View File

@ -1,7 +1,7 @@
CONFIG += testcase CONFIG += testcase
TARGET = tst_qdbusmarshall TARGET = tst_qdbusmarshall
TEMPLATE = subdirs TEMPLATE = subdirs
CONFIG += ordered qdbusmarshall.depends = qpong
SUBDIRS = qpong qdbusmarshall SUBDIRS = qpong qdbusmarshall
QT = core-private testlib QT = core-private testlib

2
tests/auto/other/macplist/macplist.pro
View File

@ -1,7 +1,7 @@
TEMPLATE = subdirs TEMPLATE = subdirs
test.depends = app
SUBDIRS = app test SUBDIRS = app test
CONFIG += ordered

2
tests/benchmarks/corelib/io/qprocess/qprocess.pro
View File

@ -1,3 +1,3 @@
TEMPLATE = subdirs TEMPLATE = subdirs
CONFIG += ordered test.depends = testProcessLoopback
SUBDIRS = testProcessLoopback test SUBDIRS = testProcessLoopback test

2
tests/benchmarks/dbus/qdbusperformance/qdbusperformance.pro
View File

@ -1,3 +1,3 @@
TEMPLATE = subdirs TEMPLATE = subdirs
CONFIG += ordered test.depends = server
SUBDIRS = server test SUBDIRS = server test