summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar.sletta@digia.com>2013-05-28 09:11:28 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-05-28 09:37:22 +0200
commit0b7bb2bd2d7404c42dd782975b665c9415409e0c (patch)
treebbc597cad52f1fd14168bbd22aee9157e5c0a60a
parentb7c3b465c5074e73fa07ea15642fb0e3af67880a (diff)
downloadqtsvg-0b7bb2bd2d7404c42dd782975b665c9415409e0c.tar.gz
Disable compilation of framebufferobject example for OpenGL ES 2.0v5.1.0-rc2v5.1.0-rc1v5.1.0
Task-number: QTBUG-31345 Change-Id: Ic2659fa90c3928ed75d5768dfb386184b523c8cd Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
-rw-r--r--examples/svg/opengl/framebufferobject/framebufferobject.pro2
-rw-r--r--examples/svg/opengl/opengl.pro2
2 files changed, 3 insertions, 1 deletions
diff --git a/examples/svg/opengl/framebufferobject/framebufferobject.pro b/examples/svg/opengl/framebufferobject/framebufferobject.pro
index 45f3f19..dd3211f 100644
--- a/examples/svg/opengl/framebufferobject/framebufferobject.pro
+++ b/examples/svg/opengl/framebufferobject/framebufferobject.pro
@@ -1,3 +1,5 @@
+contains(QT_CONFIG, opengles2):error("This example is written for OpenGL 1.x")
+
QT += widgets opengl svg
HEADERS += glwidget.h
diff --git a/examples/svg/opengl/opengl.pro b/examples/svg/opengl/opengl.pro
index 9ebf5ed..723efad 100644
--- a/examples/svg/opengl/opengl.pro
+++ b/examples/svg/opengl/opengl.pro
@@ -1,2 +1,2 @@
TEMPLATE = subdirs
-qtHaveModule(widgets): SUBDIRS += framebufferobject
+qtHaveModule(widgets):!contains(QT_CONFIG, opengles2): SUBDIRS += framebufferobject