summaryrefslogtreecommitdiffstats
path: root/examples/opengl/opengl.pro
diff options
context:
space:
mode:
authorWarwick Allison <warwick.allison@nokia.com>2009-09-09 04:13:32 (GMT)
committerWarwick Allison <warwick.allison@nokia.com>2009-09-09 04:13:32 (GMT)
commit5ad67ddc40263cabd3fd99fb57c8f095403bcbbe (patch)
treea06b3640b8e3d6fe431acba0ba42a27ffbae0d87 /examples/opengl/opengl.pro
parent14e787b7e5abc1d665ba0e0229f60525283b1e38 (diff)
parenta57af1d6856ffa3a50eb1e0cdd1653b7b4ebdb41 (diff)
downloadQt-5ad67ddc40263cabd3fd99fb57c8f095403bcbbe.zip
Qt-5ad67ddc40263cabd3fd99fb57c8f095403bcbbe.tar.gz
Qt-5ad67ddc40263cabd3fd99fb57c8f095403bcbbe.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'examples/opengl/opengl.pro')
-rw-r--r--examples/opengl/opengl.pro3
1 files changed, 3 insertions, 0 deletions
diff --git a/examples/opengl/opengl.pro b/examples/opengl/opengl.pro
index 567eb7b..b86e0ba 100644
--- a/examples/opengl/opengl.pro
+++ b/examples/opengl/opengl.pro
@@ -5,6 +5,9 @@ contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles1cl)|contains(QT_CONF
SUBDIRS = hellogl_es2
} else {
SUBDIRS = hellogl_es
+ !contains(QT_CONFIG, opengles1cl) {
+ SUBDIRS += textures
+ }
}
} else {
SUBDIRS = 2dpainting \