summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-07-04 16:14:29 +1000
committerQt Continuous Integration System <qt-info@nokia.com>2011-07-04 16:14:29 +1000
commitf9d233b7fb413d1f242c8560b1ccb6e3b5766fdb (patch)
treee3a090a3f1133f97c7070002241b69f72042f020
parent0eebae5f2c1ff827ee5ce8748fa7cd677486d265 (diff)
parent9bda8745591b149a6393751d9db5222867a74e90 (diff)
downloadqtsvg-f9d233b7fb413d1f242c8560b1ccb6e3b5766fdb.tar.gz
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtsvg-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtsvg-staging: examples: avoid OpenGL examples if Qt OpenGL support is disabled
-rw-r--r--examples/examples.pro4
1 files changed, 3 insertions, 1 deletions
diff --git a/examples/examples.pro b/examples/examples.pro
index 7595abd..1806642 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -1,2 +1,4 @@
TEMPLATE = subdirs
-SUBDIRS += opengl richtext draganddrop painting network desktop
+SUBDIRS += richtext draganddrop painting network desktop
+
+contains(QT_CONFIG,opengl):SUBDIRS += opengl