Fixed build when Qt is configured with -no-opengl.

Task-number: QTBUG-28849
Change-Id: I331ebca76892ce7ffbc6f8e03ff4afe0c8e28d5e
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>

diff --git a/examples/examples.pro b/examples/examples.pro
index 1bcc66d..0712e81 100644 (file)
--- 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 e6591c8..34b2622 100644 (file)
--- 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 \

diff --git a/src/src.pro b/src/src.pro
index f593eb8..7584823 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -3,7 +3,7 @@ CONFIG += ordered
 SUBDIRS += \
     qml
 
-qtHaveModule(gui) {
+qtHaveModule(gui):contains(QT_CONFIG, opengl(es1|es2)?) {
     SUBDIRS += \
         quick \
         qmltest \

diff --git a/tools/tools.pro b/tools/tools.pro
index c193cc9..86e2f38 100644 (file)
--- a/tools/tools.pro
+++ b/tools/tools.pro
@@ -1,11 +1,8 @@
 TEMPLATE = subdirs
+qtHaveModule(quick): SUBDIRS += qmlscene qmlplugindump
+qtHaveModule(qmltest): SUBDIRS += qmltestrunner
 SUBDIRS += \
-    qmlscene \
-    qmlplugindump \
     qmlmin \
     qmlprofiler \
-    qmlbundle \
-    qmltestrunner
-qtHaveModule(widgets): SUBDIRS += qmleasing
-
-
+    qmlbundle
+qtHaveModule(quick):qtHaveModule(widgets): SUBDIRS += qmleasing