tests: fixed check for QtOpenGL
authorRohan McGovern <rohan.mcgovern@nokia.com>
Mon, 30 Jul 2012 03:45:51 +0000 (13:45 +1000)
committerQt by Nokia <qt-info@nokia.com>
Mon, 30 Jul 2012 04:06:12 +0000 (06:06 +0200)
contains(QT_CONFIG,opengl) tells whether Qt itself is able to use
OpenGL, which is not the same thing as whether the QtOpenGL API is
available. Make the check correct; fixes compilation when Qt is
configured with -no-widgets (which also disables QtOpenGL).

Change-Id: Iaa296c2b10650971ef4846f8bc6f44761fadcf7c
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
tests/auto/auto.pro

index c11a609..b3906cc 100644 (file)
@@ -18,7 +18,7 @@ SUBDIRS += \
 
 wince*:                                     SUBDIRS -= printsupport
 cross_compile:                              SUBDIRS -= tools
-!contains(QT_CONFIG, opengl):               SUBDIRS -= opengl
+isEmpty(QT.opengl.name):                    SUBDIRS -= opengl
 !unix|embedded|!contains(QT_CONFIG, dbus):  SUBDIRS -= dbus
 contains(QT_CONFIG, no-widgets):            SUBDIRS -= widgets printsupport
 !contains(QT_CONFIG, concurrent):           SUBDIRS -= concurrent