summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@digia.com>2012-11-06 21:40:37 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-11-07 08:24:33 +0100
commit435fac3bc7d12771a3c80556e748a2388e914cf7 (patch)
tree28b72ef24c0e7ee754448d88405ed620f88c7453
parent964a0068ee076f2a766f57aa86a2e7f804c99283 (diff)
Fix build when Qt is configured with Angle supportv5.0.0-beta2
Don't try to compile the opengl example that relies on Desktop GL. Change-Id: I63e1087fdd0c581389dd848926c663d87e173eff Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
-rw-r--r--examples/activeqt/activeqt.pro2
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/activeqt/activeqt.pro b/examples/activeqt/activeqt.pro
index 9acb71b..5d47940 100644
--- a/examples/activeqt/activeqt.pro
+++ b/examples/activeqt/activeqt.pro
@@ -7,7 +7,7 @@ SUBDIRS += comapp \
wrapper
contains(QT_CONFIG, shared):SUBDIRS += webbrowser
-contains(QT_CONFIG, opengl):SUBDIRS += opengl
+contains(QT_CONFIG, opengl):!contains(QT_CONFIG, opengles2):SUBDIRS += opengl
# For now only the contain examples with mingw, for the others you need
# an IDL compiler