summaryrefslogtreecommitdiffstats
path: root/examples/opengl/opengl.pro
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2014-03-03 21:20:30 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-04-04 19:32:21 +0200
commita4ec90175c76ce35688acc06cdf93e9cab886223 (patch)
tree64d6a1424f5a18a0296f49849e35f600dbc9c275 /examples/opengl/opengl.pro
parent7d4bc536a27be540516a0403e114668f9eee65bb (diff)
purge vestiges of opengl es 1 support
amends 0d5170256c1. Change-Id: Ifa178d38f602bb7c66ef13334673ff47e332af5b Reviewed-by: Jørgen Lind <jorgen.lind@digia.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
Diffstat (limited to 'examples/opengl/opengl.pro')
-rw-r--r--examples/opengl/opengl.pro18
1 files changed, 5 insertions, 13 deletions
diff --git a/examples/opengl/opengl.pro b/examples/opengl/opengl.pro
index bcf62b6551..7bc96234df 100644
--- a/examples/opengl/opengl.pro
+++ b/examples/opengl/opengl.pro
@@ -2,16 +2,8 @@ requires(qtHaveModule(opengl))
TEMPLATE = subdirs
-contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2){
- contains(QT_CONFIG, opengles2) {
- SUBDIRS = hellogl_es2
- } else {
- SUBDIRS = hellogl_es
- }
- SUBDIRS += textures
- contains(QT_CONFIG, opengles1) {
- SUBDIRS += hellogl
- }
+contains(QT_CONFIG, opengles2) {
+ SUBDIRS = hellogl_es2
} else {
SUBDIRS = 2dpainting \
grabber \
@@ -19,13 +11,13 @@ contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2){
overpainting \
pbuffers \
framebufferobject2 \
- samplebuffers \
- textures
+ samplebuffers
}
SUBDIRS += hellowindow \
paintedwindow \
contextinfo \
- cube
+ cube \
+ textures
EXAMPLE_FILES = shared