summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorRohan McGovern <rohan.mcgovern@nokia.com>2011-12-30 10:43:00 +1000
committerQt by Nokia <qt-info@nokia.com>2011-12-30 04:55:08 +0100
commit536c94b049cd94ba5abcfa47b95c2ebc7e530e6c (patch)
tree5c39f407877b30b9ad1c8d5dc58d7be095f5f459 /examples
parent063ad3b2d98d8976ac4ca7f81bd183dcac69dcaa (diff)
Fixed compile with OpenGL ES
The OpenGL example here uses display lists, which is not implemented in OpenGL ES. Therefore, disable it when OpenGL ES is used. Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com> Change-Id: Id8149b9bfa991711461895bac6559ab368b8138d Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Diffstat (limited to 'examples')
-rw-r--r--examples/examples.pro2
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/examples.pro b/examples/examples.pro
index aa9351d..ba15860 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -1,5 +1,5 @@
TEMPLATE = subdirs
SUBDIRS += embedded richtext draganddrop painting network desktop
-contains(QT_CONFIG,opengl):SUBDIRS += opengl
+contains(QT_CONFIG,opengl):!contains(QT_CONFIG,opengles2):SUBDIRS += opengl
QT+=widgets