diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-01-25 09:34:28 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-28 13:39:58 +0100 |
| commit | 6d613d589135d43e77d2987aef4f773e9f23dc07 (patch) | |
| tree | 9a94d693f28c8e8e2b0b72e5bdaa57bfa93d1c61 /tests | |
| parent | 0cd72c52ca5e5b21adbd47d0f551535e727b80ee (diff) | |
make use of qtHaveModule()
Change-Id: I6482af592a564dbbbab28b3f425ab2886f6d1bea
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/declarative/declarative.pro | 6 | ||||
| -rw-r--r-- | tests/auto/declarative/examples/examples.pro | 4 | ||||
| -rw-r--r-- | tests/manual/declarative/declarative.pro | 2 |
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 |