summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2012-12-21 11:45:50 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-01-11 15:15:05 +0100
commit4760e1fb02aac87e4186fb1bedf0ba4a3845d7be (patch)
tree1c739ae11bfc573a79f8e37fded759f04c963a13 /tests
parent07efce437529c1d7e0d7dd15d201949b091b7b2a (diff)
make use of qtHaveModule()
Change-Id: I14da5455b7dd4681254e1652395df5f5c65746bd Reviewed-by: Tasuku Suzuki <stasuku@gmail.com> Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/unit/qpaintervideosurface/qpaintervideosurface.pro4
-rw-r--r--tests/auto/unit/unit.pro2
2 files changed, 2 insertions, 4 deletions
diff --git a/tests/auto/unit/qpaintervideosurface/qpaintervideosurface.pro b/tests/auto/unit/qpaintervideosurface/qpaintervideosurface.pro
index 4408c4f54..4f5120245 100644
--- a/tests/auto/unit/qpaintervideosurface/qpaintervideosurface.pro
+++ b/tests/auto/unit/qpaintervideosurface/qpaintervideosurface.pro
@@ -2,14 +2,12 @@ CONFIG += testcase
TARGET = tst_qpaintervideosurface
QT += multimedia-private multimediawidgets-private testlib
-contains(QT_CONFIG, opengl) | contains(QT_CONFIG, opengles2) {
+qtHaveModule(opengl) {
QT += opengl
} else {
DEFINES += QT_NO_OPENGL
}
-contains(QT_CONFIG, opengl): QT += opengl
-
SOURCES += tst_qpaintervideosurface.cpp
QT+=widgets
diff --git a/tests/auto/unit/unit.pro b/tests/auto/unit/unit.pro
index a79f7fa4d..96dbf0137 100644
--- a/tests/auto/unit/unit.pro
+++ b/tests/auto/unit/unit.pro
@@ -1,4 +1,4 @@
TEMPLATE = subdirs
SUBDIRS += multimedia.pro
-!isEmpty(QT.widgets.name): SUBDIRS += multimediawidgets.pro
+qtHaveModule(widgets): SUBDIRS += multimediawidgets.pro