summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/declarative/declarative.pro6
-rw-r--r--tests/auto/declarative/examples/examples.pro4
-rw-r--r--tests/manual/declarative/declarative.pro2
3 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/declarative/declarative.pro b/tests/auto/declarative/declarative.pro
index 1f442f30..27ae628d 100644
--- a/tests/auto/declarative/declarative.pro
+++ b/tests/auto/declarative/declarative.pro
@@ -75,12 +75,12 @@ contains(QT_CONFIG, private_tests) {
qpacketprotocol
# This test requires the xmlpatterns module
- !contains(QT_CONFIG,xmlpatterns): SUBDIRS -= qdeclarativexmllistmodel
+ !qtHaveModule(xmlpatterns): SUBDIRS -= qdeclarativexmllistmodel
}
-contains(QT_CONFIG, opengl): SUBDIRS += qmlshadersplugin
+qtHaveModule(opengl): SUBDIRS += qmlshadersplugin
-!isEmpty(QT.webkit.name): SUBDIRS += qdeclarativewebview
+qtHaveModule(webkit): SUBDIRS += qdeclarativewebview
# Tests which should run in Pulse
PULSE_TESTS = $$SUBDIRS
diff --git a/tests/auto/declarative/examples/examples.pro b/tests/auto/declarative/examples/examples.pro
index 8ff6b6ef..f20c3415 100644
--- a/tests/auto/declarative/examples/examples.pro
+++ b/tests/auto/declarative/examples/examples.pro
@@ -2,8 +2,8 @@ CONFIG += testcase
testcase.timeout = 400 # this test is slow
TARGET = tst_examples
-!contains(QT_CONFIG, webkit): DEFINES += QT_NO_WEBKIT
-!contains(QT_CONFIG, xmlpatterns): DEFINES += QT_NO_XMLPATTERNS
+!qtHaveModule(webkit): DEFINES += QT_NO_WEBKIT
+!qtHaveModule(xmlpatterns): DEFINES += QT_NO_XMLPATTERNS
QT += testlib
contains(QT_CONFIG,declarative): QT += declarative
diff --git a/tests/manual/declarative/declarative.pro b/tests/manual/declarative/declarative.pro
index 337db2f9..a7a8bfb0 100644
--- a/tests/manual/declarative/declarative.pro
+++ b/tests/manual/declarative/declarative.pro
@@ -1,3 +1,3 @@
TEMPLATE = subdirs
-contains(QT_CONFIG, opengl): SUBDIRS += qmlshadersplugin
+qtHaveModule(opengl): SUBDIRS += qmlshadersplugin