From 0b7bb2bd2d7404c42dd782975b665c9415409e0c Mon Sep 17 00:00:00 2001 From: Gunnar Sletta Date: Tue, 28 May 2013 09:11:28 +0200 Subject: Disable compilation of framebufferobject example for OpenGL ES 2.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTBUG-31345 Change-Id: Ic2659fa90c3928ed75d5768dfb386184b523c8cd Reviewed-by: Samuel Rødal --- examples/svg/opengl/framebufferobject/framebufferobject.pro | 2 ++ examples/svg/opengl/opengl.pro | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) 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 -- cgit v1.2.1