diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2016-08-19 09:31:50 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2016-08-19 11:16:18 +0000 |
| commit | be846890f3b34343c139baa99e10d0f9a25fcea3 (patch) | |
| tree | c71938184d43e288064ebf07f485dc119f5e6ef8 /tests/auto/qmldevtools | |
| parent | 79cdb4bd45944cce9bb389bebf49917775898ca2 (diff) | |
Adjust decarative after qtConfig changes in qtbase
Most of the changes are optional, but cleanup our QT_CONFIG
usage.
Change-Id: I5253d53f72f6fb03c2cfedae1e17d94f424a6bbb
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'tests/auto/qmldevtools')
| -rw-r--r-- | tests/auto/qmldevtools/compile/compile.pro | 2 | ||||
| -rw-r--r-- | tests/auto/qmldevtools/qmldevtools.pro | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/tests/auto/qmldevtools/compile/compile.pro b/tests/auto/qmldevtools/compile/compile.pro index 54430eb668..832700698f 100644 --- a/tests/auto/qmldevtools/compile/compile.pro +++ b/tests/auto/qmldevtools/compile/compile.pro @@ -5,7 +5,7 @@ force_bootstrap { !build_pass: CONFIG += release } else { QT = core - !build_pass:contains(QT_CONFIG, debug_and_release): CONFIG += release + !build_pass:qtConfig(debug_and_release): CONFIG += release } QT += qmldevtools-private macx:CONFIG -= app_bundle diff --git a/tests/auto/qmldevtools/qmldevtools.pro b/tests/auto/qmldevtools/qmldevtools.pro index a0ca1bff87..a9352d4df3 100644 --- a/tests/auto/qmldevtools/qmldevtools.pro +++ b/tests/auto/qmldevtools/qmldevtools.pro @@ -1,6 +1,4 @@ TEMPLATE = subdirs -contains(QT_CONFIG, private_tests) { - SUBDIRS += \ - compile -} +qtConfig(private_tests): \ + SUBDIRS += compile |