aboutsummaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorSamuel Rødal <samuel.rodal@digia.com>2013-02-19 14:47:12 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-02-20 08:52:28 +0100
commit35989314618c9fc0ef495d2903fb9afda65dcb9d (patch)
treea0e216f5a431bbf7995150cfd3e916a19ef9327b /examples
parentce447efe1dc546ff5f7d3b3d327f1759231124f2 (diff)
Fixed build when Qt is configured with -no-opengl.
Task-number: QTBUG-28849 Change-Id: I331ebca76892ce7ffbc6f8e03ff4afe0c8e28d5e Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Diffstat (limited to 'examples')
-rw-r--r--examples/examples.pro7
-rw-r--r--examples/qml/qml.pro6
2 files changed, 6 insertions, 7 deletions
diff --git a/examples/examples.pro b/examples/examples.pro
index 1bcc66d164..0712e81552 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -1,5 +1,4 @@
TEMPLATE = subdirs
-SUBDIRS += \
- qmltest \
- qml \
- quick
+qtHaveModule(qmltest): SUBDIRS += qmltest
+SUBDIRS += qml
+qtHaveModule(quick): SUBDIRS += quick
diff --git a/examples/qml/qml.pro b/examples/qml/qml.pro
index e6591c895f..34b2622b98 100644
--- a/examples/qml/qml.pro
+++ b/examples/qml/qml.pro
@@ -1,11 +1,11 @@
TEMPLATE = subdirs
+qtHaveModule(quick): SUBDIRS += networkaccessmanagerfactory xmlhttprequest
+
SUBDIRS += \
- networkaccessmanagerfactory \
plugins \
referenceexamples \
- shell \
- xmlhttprequest
+ shell
EXAMPLE_FILES = \
dynamicscene \