summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorRohan McGovern <rohan.mcgovern@nokia.com>2009-06-10 02:47:15 (GMT)
committerRohan McGovern <rohan.mcgovern@nokia.com>2009-06-10 06:50:39 (GMT)
commitb2b0ac2f9abf58456e2dad2340c77c6004464a34 (patch)
tree9e9bcf6d02e2ddbe14d6ba47b809a482a18be673 /tests
parent141dccc381894b3a6f57b2a3a222f5c25eee9a5f (diff)
downloadQt-b2b0ac2f9abf58456e2dad2340c77c6004464a34.zip
Qt-b2b0ac2f9abf58456e2dad2340c77c6004464a34.tar.gz
Qt-b2b0ac2f9abf58456e2dad2340c77c6004464a34.tar.bz2
Fixed compile of arthur tests when Qt is configured without opengl or
qt3support.
Diffstat (limited to 'tests')
-rw-r--r--tests/arthur/common/common.pri2
-rw-r--r--tests/arthur/datagenerator/datagenerator.pro4
-rw-r--r--tests/arthur/htmlgenerator/htmlgenerator.pro4
-rw-r--r--tests/arthur/performancediff/performancediff.pro4
-rw-r--r--tests/arthur/shower/shower.pro4
5 files changed, 13 insertions, 5 deletions
diff --git a/tests/arthur/common/common.pri b/tests/arthur/common/common.pri
index 58cb636..1f84904 100644
--- a/tests/arthur/common/common.pri
+++ b/tests/arthur/common/common.pri
@@ -1,7 +1,7 @@
VPATH+=$$PWD
INCLUDEPATH += $$PWD
-contains(QT_CONFIG, opengl):DEFINES += BUILD_OPENGL
+contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2):DEFINES += BUILD_OPENGL
SOURCES += \
xmldata.cpp \
diff --git a/tests/arthur/datagenerator/datagenerator.pro b/tests/arthur/datagenerator/datagenerator.pro
index c302969..9da6fcd 100644
--- a/tests/arthur/datagenerator/datagenerator.pro
+++ b/tests/arthur/datagenerator/datagenerator.pro
@@ -8,7 +8,9 @@ DEPENDPATH += .
INCLUDEPATH += .
DESTDIR = ../bin
-QT += svg opengl xml qt3support
+QT += svg xml
+contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2):QT += opengl
+contains(QT_CONFIG, qt3support):QT += qt3support
# Input
HEADERS += datagenerator.h \
diff --git a/tests/arthur/htmlgenerator/htmlgenerator.pro b/tests/arthur/htmlgenerator/htmlgenerator.pro
index f74c460..4a1c8ba 100644
--- a/tests/arthur/htmlgenerator/htmlgenerator.pro
+++ b/tests/arthur/htmlgenerator/htmlgenerator.pro
@@ -9,7 +9,9 @@ DESTDIR = ../bin
CONFIG += console
-QT += svg opengl xml qt3support
+QT += svg xml
+contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2):QT += opengl
+contains(QT_CONFIG, qt3support):QT += qt3support
# Input
HEADERS += htmlgenerator.h
diff --git a/tests/arthur/performancediff/performancediff.pro b/tests/arthur/performancediff/performancediff.pro
index 1c9b9fe..15d5ec5 100644
--- a/tests/arthur/performancediff/performancediff.pro
+++ b/tests/arthur/performancediff/performancediff.pro
@@ -9,7 +9,9 @@ DESTDIR = ../bin
CONFIG += console
-QT += xml opengl svg qt3support
+QT += xml svg
+contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2):QT += opengl
+contains(QT_CONFIG, qt3support):QT += qt3support
# Input
HEADERS += performancediff.h
diff --git a/tests/arthur/shower/shower.pro b/tests/arthur/shower/shower.pro
index 000c6e4..c02ded0 100644
--- a/tests/arthur/shower/shower.pro
+++ b/tests/arthur/shower/shower.pro
@@ -7,7 +7,9 @@ DEPENDPATH += .
INCLUDEPATH += .
DESTDIR = ../bin
-QT += xml opengl svg qt3support
+QT += xml svg
+contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2):QT += opengl
+contains(QT_CONFIG, qt3support):QT += qt3support
# Input
HEADERS += shower.h