make module compile with -no-gui

Change-Id: I106cf0933930115464b0b7507177e6129098d22b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

diff --git a/src/imports/folderlistmodel/folderlistmodel.pro b/src/imports/folderlistmodel/folderlistmodel.pro
index 08a5061..c29f1f8 100644 (file)
--- a/src/imports/folderlistmodel/folderlistmodel.pro
+++ b/src/imports/folderlistmodel/folderlistmodel.pro
@@ -3,7 +3,7 @@ TARGET  = qmlfolderlistmodelplugin
 TARGETPATH = Qt/labs/folderlistmodel
 IMPORT_VERSION = 2.0
 
-QT += core-private qml qml-private v8-private
+QT = core-private qml-private v8-private
 
 SOURCES += qquickfolderlistmodel.cpp plugin.cpp \
     fileinfothread.cpp

diff --git a/src/imports/imports.pro b/src/imports/imports.pro
index 899c437..601e9c7 100644 (file)
--- a/src/imports/imports.pro
+++ b/src/imports/imports.pro
@@ -1,10 +1,15 @@
 TEMPLATE = subdirs
 
 SUBDIRS += \
-    qtquick2 \
-    particles \
-    window \
     folderlistmodel \
-    localstorage \
-    testlib
+    localstorage
+
+!isEmpty(QT.quick.name) {
+    SUBDIRS += \
+        qtquick2 \
+        particles \
+        window \
+        testlib
+}
+
 contains(QT_CONFIG, xmlpatterns) : SUBDIRS += xmllistmodel

diff --git a/src/imports/localstorage/localstorage.pro b/src/imports/localstorage/localstorage.pro
index bce5362..c783404 100644 (file)
--- a/src/imports/localstorage/localstorage.pro
+++ b/src/imports/localstorage/localstorage.pro
@@ -3,7 +3,7 @@ TARGET  = qmllocalstorageplugin
 TARGETPATH = QtQuick/LocalStorage
 IMPORT_VERSION = 2.0
 
-QT += sql qml qml-private v8-private core-private
+QT = sql qml-private v8-private core-private
 
 SOURCES += plugin.cpp
 

diff --git a/src/imports/xmllistmodel/xmllistmodel.pro b/src/imports/xmllistmodel/xmllistmodel.pro
index 4984fd0..c2cb4bb 100644 (file)
--- a/src/imports/xmllistmodel/xmllistmodel.pro
+++ b/src/imports/xmllistmodel/xmllistmodel.pro
@@ -3,7 +3,7 @@ TARGET  = qmlxmllistmodelplugin
 TARGETPATH = QtQuick/XmlListModel
 IMPORT_VERSION = 2.0
 
-QT += network qml xmlpatterns qml-private v8-private core-private
+QT = network xmlpatterns qml-private v8-private core-private
 
 SOURCES += qqmlxmllistmodel.cpp plugin.cpp
 HEADERS += qqmlxmllistmodel_p.h

diff --git a/src/plugins/accessible/accessible.pro b/src/plugins/accessible/accessible.pro
index 77cba71..bff6507 100644 (file)
--- a/src/plugins/accessible/accessible.pro
+++ b/src/plugins/accessible/accessible.pro
@@ -1,2 +1,2 @@
 TEMPLATE = subdirs
-SUBDIRS +=  quick
+!isEmpty(QT.quick.name): SUBDIRS += quick

diff --git a/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro b/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro
index 22241a3..859aeef 100644 (file)
--- a/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro
+++ b/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro
@@ -1,5 +1,5 @@
 TARGET = qmldbg_tcp
-QT       += qml-private network v8-private core-private
+QT = qml-private network v8-private core-private
 
 PLUGIN_TYPE = qmltooling
 load(qt_plugin)

diff --git a/src/plugins/qmltooling/qmltooling.pro b/src/plugins/qmltooling/qmltooling.pro
index 41e1c65..3b6a908 100644 (file)
--- a/src/plugins/qmltooling/qmltooling.pro
+++ b/src/plugins/qmltooling/qmltooling.pro
@@ -1,4 +1,4 @@
 TEMPLATE = subdirs
 
 SUBDIRS =  qmldbg_tcp
-SUBDIRS += qmldbg_qtquick2
+!isEmpty(QT.quick.name): SUBDIRS += qmldbg_qtquick2

diff --git a/src/src.pro b/src/src.pro
index f1b2663..80d859f 100644 (file)
--- a/src/src.pro
+++ b/src/src.pro
@@ -1,10 +1,16 @@
 TEMPLATE = subdirs
 CONFIG += ordered
 SUBDIRS += \
-    qml \
-    quick \
-    qmltest \
-    particles \
+    qml
+
+!isEmpty(QT.gui.name) {
+    SUBDIRS += \
+        quick \
+        qmltest \
+        particles
+}
+
+SUBDIRS += \
     plugins \
     imports \
     qmldevtools