diff options
author | Lars Knoll <lars.knoll@qt.io> | 2016-08-05 13:35:39 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2016-08-19 04:28:05 +0000 |
commit | 60985aa42b37217fb4c01ed85bbf6f14410c3491 (patch) | |
tree | 710cf1c2457a9e0135d3a2cddf3bf17d2a622378 /tests/benchmarks | |
parent | 792a99438707c78ed96a1b066489f9100c24a922 (diff) |
Use qtConfig throughout in qtbase
Use the new qtConfig macro in all pro/pri files.
This required adding some feature entries, and adding
{private,public}Feature to every referenced already existing entry.
Change-Id: I164214dad1154df6ad84e86d99ed14994ef97cf4
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'tests/benchmarks')
5 files changed, 8 insertions, 8 deletions
diff --git a/tests/benchmarks/dbus/qdbustype/qdbustype.pro b/tests/benchmarks/dbus/qdbustype/qdbustype.pro index dd97169551..70f803f56f 100644 --- a/tests/benchmarks/dbus/qdbustype/qdbustype.pro +++ b/tests/benchmarks/dbus/qdbustype/qdbustype.pro @@ -1,7 +1,7 @@ TARGET = tst_bench_qdbustype QT -= gui QT += core-private dbus-private testlib -contains(QT_CONFIG, dbus-linked) { +qtConfig(dbus-linked) { DEFINES += QT_LINKED_LIBDBUS QMAKE_USE += dbus } else { diff --git a/tests/benchmarks/gui/image/qimageconversion/qimageconversion.pro b/tests/benchmarks/gui/image/qimageconversion/qimageconversion.pro index 7da38e8e60..828f36348d 100644 --- a/tests/benchmarks/gui/image/qimageconversion/qimageconversion.pro +++ b/tests/benchmarks/gui/image/qimageconversion/qimageconversion.pro @@ -3,6 +3,6 @@ TARGET = tst_bench_imageConversion QT += testlib SOURCES += tst_qimageconversion.cpp -contains(QT_CONFIG, gif):DEFINES += QTEST_HAVE_GIF -contains(QT_CONFIG, jpeg):DEFINES += QTEST_HAVE_JPEG -contains(QT_CONFIG, c++11): CONFIG += c++11 +qtConfig(gif): DEFINES += QTEST_HAVE_GIF +qtConfig(jpeg): DEFINES += QTEST_HAVE_JPEG +qtConfig(c++11): CONFIG += c++11 diff --git a/tests/benchmarks/gui/image/qimagereader/qimagereader.pro b/tests/benchmarks/gui/image/qimagereader/qimagereader.pro index b60618d7ec..7de1eedbdf 100644 --- a/tests/benchmarks/gui/image/qimagereader/qimagereader.pro +++ b/tests/benchmarks/gui/image/qimagereader/qimagereader.pro @@ -5,6 +5,6 @@ TARGET = tst_bench_qimagereader SOURCES += tst_qimagereader.cpp -contains(QT_CONFIG, gif):DEFINES += QTEST_HAVE_GIF -contains(QT_CONFIG, jpeg):DEFINES += QTEST_HAVE_JPEG +qtConfig(gif): DEFINES += QTEST_HAVE_GIF +qtConfig(jpeg): DEFINES += QTEST_HAVE_JPEG QT += network diff --git a/tests/benchmarks/network/kernel/kernel.pro b/tests/benchmarks/network/kernel/kernel.pro index 53ec370d60..7b18eefda2 100644 --- a/tests/benchmarks/network/kernel/kernel.pro +++ b/tests/benchmarks/network/kernel/kernel.pro @@ -1,4 +1,4 @@ TEMPLATE = subdirs -contains(QT_CONFIG,private_tests):SUBDIRS += \ +qtConfig(private_tests): SUBDIRS += \ qhostinfo diff --git a/tests/benchmarks/network/network.pro b/tests/benchmarks/network/network.pro index ec812407f7..01b3b80ef4 100644 --- a/tests/benchmarks/network/network.pro +++ b/tests/benchmarks/network/network.pro @@ -8,7 +8,7 @@ TRUSTED_BENCHMARKS += \ kernel/qhostinfo \ socket/qtcpserver -contains(QT_CONFIG, openssl) { +qtConfig(openssl) { SUBDIRS += ssl TRUSTED_BENCHMARKS += ssl/qsslsocket } |