Centralize determination of "no desktop" configurations

Change-Id: I030012f48668db4f01737ef92fdb7e6e0426e025
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Liang Qi <liang.qi@digia.com>

14 files changed, 14 insertions, 13 deletions

diff --git a/.qmake.conf b/.qmake.conf
index 3d3f19b8..22328365 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -1,3 +1,4 @@
 load(qt_build_config)
+android|ios|qnx|winrt|isEmpty(QT.widgets.name): CONFIG += no_desktop
 
 MODULE_VERSION = 5.3.2
diff --git a/examples/quick/controls/basiclayouts/basiclayouts.pro b/examples/quick/controls/basiclayouts/basiclayouts.pro
index fbb5f0c1..54e60992 100644
--- a/examples/quick/controls/basiclayouts/basiclayouts.pro
+++ b/examples/quick/controls/basiclayouts/basiclayouts.pro
@@ -1,6 +1,6 @@
 QT += qml quick
 TARGET = basiclayouts
-!android:!ios:!blackberry:!qnx:!winrt:qtHaveModule(widgets): QT += widgets
+!no_desktop: QT += widgets
 
 include(src/src.pri)
 include(../shared/shared.pri)
diff --git a/examples/quick/controls/gallery/gallery.pro b/examples/quick/controls/gallery/gallery.pro
index d4d5f16e..d3b04aab 100644
--- a/examples/quick/controls/gallery/gallery.pro
+++ b/examples/quick/controls/gallery/gallery.pro
@@ -1,6 +1,6 @@
 QT += qml quick
 TARGET = gallery
-!android:!ios:!blackberry:!qnx:!winrt:qtHaveModule(widgets): QT += widgets
+!no_desktop: QT += widgets
 
 include(src/src.pri)
 include(../shared/shared.pri)
diff --git a/examples/quick/controls/splitview/splitview.pro b/examples/quick/controls/splitview/splitview.pro
index 79f1f7d5..40adf3d1 100644
--- a/examples/quick/controls/splitview/splitview.pro
+++ b/examples/quick/controls/splitview/splitview.pro
@@ -1,6 +1,6 @@
 QT += qml quick
 TARGET = splitview
-!android:!ios:!blackberry:!qnx:!winrt:qtHaveModule(widgets): QT += widgets
+!no_desktop: QT += widgets
 
 include(src/src.pri)
 include(../shared/shared.pri)
diff --git a/examples/quick/controls/tableview/tableview.pro b/examples/quick/controls/tableview/tableview.pro
index 77520ea5..c982ac20 100644
--- a/examples/quick/controls/tableview/tableview.pro
+++ b/examples/quick/controls/tableview/tableview.pro
@@ -1,6 +1,6 @@
 QT += qml quick
 TARGET = tableview
-!android:!ios:!blackberry:!qnx:!winrt:qtHaveModule(widgets): QT += widgets
+!no_desktop: QT += widgets
 
 include(src/src.pri)
 include(../shared/shared.pri)
diff --git a/examples/quick/controls/texteditor/texteditor.pro b/examples/quick/controls/texteditor/texteditor.pro
index b6a908b4..ec9d8d86 100644
--- a/examples/quick/controls/texteditor/texteditor.pro
+++ b/examples/quick/controls/texteditor/texteditor.pro
@@ -1,6 +1,6 @@
 QT += qml quick
 TARGET = texteditor
-!android:!ios:!blackberry:!qnx:!winrt:qtHaveModule(widgets): QT += widgets
+!no_desktop: QT += widgets
 
 include(src/src.pri)
 include(../shared/shared.pri)
diff --git a/examples/quick/controls/touch/touch.pro b/examples/quick/controls/touch/touch.pro
index e230797f..63902f81 100644
--- a/examples/quick/controls/touch/touch.pro
+++ b/examples/quick/controls/touch/touch.pro
@@ -1,6 +1,6 @@
 QT += qml quick
 TARGET = touch
-!android:!ios:!blackberry:!qnx:!winrt:qtHaveModule(widgets): QT += widgets
+!no_desktop: QT += widgets
 
 include(src/src.pri)
 include(../shared/shared.pri)
diff --git a/examples/quick/dialogs/systemdialogs/systemdialogs.pro b/examples/quick/dialogs/systemdialogs/systemdialogs.pro
index d0489cd2..128bb1b5 100644
--- a/examples/quick/dialogs/systemdialogs/systemdialogs.pro
+++ b/examples/quick/dialogs/systemdialogs/systemdialogs.pro
@@ -1,5 +1,5 @@
 QT += qml quick
-!android:!ios:!blackberry:!qnx:!winrt:qtHaveModule(widgets): QT += widgets
+!no_desktop: QT += widgets
 
 QT += quick qml
 SOURCES += main.cpp
diff --git a/src/controls/Private/private.pri b/src/controls/Private/private.pri
index 32ad0cf6..ae16dc0f 100644
--- a/src/controls/Private/private.pri
+++ b/src/controls/Private/private.pri
@@ -22,7 +22,7 @@ SOURCES += \
     $$PWD/qquickabstractstyle.cpp
 
 
-!android:!ios:!blackberry:!qnx:!winrt:qtHaveModule(widgets) {
+!no_desktop {
     QT += widgets
     HEADERS += $$PWD/qquickstyleitem_p.h
     SOURCES += $$PWD/qquickstyleitem.cpp
diff --git a/src/controls/Styles/styles.pri b/src/controls/Styles/styles.pri
index 090fe22a..bcc1e8ba 100644
--- a/src/controls/Styles/styles.pri
+++ b/src/controls/Styles/styles.pri
@@ -25,7 +25,7 @@ STYLES_QML_FILES = \
     $$PWD/Base/ToolButtonStyle.qml
 
 # Desktop
-!android:!ios:!blackberry:!qnx:!winrt:qtHaveModule(widgets) {
+!no_desktop {
     STYLES_QML_FILES += \
         $$PWD/Desktop/qmldir \
         $$PWD/Desktop/RowItemSingleton.qml \
diff --git a/tests/auto/activeFocusOnTab/activeFocusOnTab.pro b/tests/auto/activeFocusOnTab/activeFocusOnTab.pro
index d47a92e8..47b14865 100644
--- a/tests/auto/activeFocusOnTab/activeFocusOnTab.pro
+++ b/tests/auto/activeFocusOnTab/activeFocusOnTab.pro
@@ -9,5 +9,5 @@ include (../shared/util.pri)
 TESTDATA = data/*
 
 QT += core-private gui-private qml-private quick-private testlib
-!android:!ios:!blackberry:!qnx:!winrt:qtHaveModule(widgets): QT += widgets
+!no_desktop: QT += widgets
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/tests/auto/controls/controls.pro b/tests/auto/controls/controls.pro
index dad036a2..c3f00094 100644
--- a/tests/auto/controls/controls.pro
+++ b/tests/auto/controls/controls.pro
@@ -3,7 +3,7 @@ TARGET = tst_controls
 
 IMPORTPATH = $$OUT_PWD/../testplugin
 
-!android:!ios:!blackberry:!qnx:!winrt:qtHaveModule(widgets): QT += widgets
+!no_desktop: QT += widgets
 
 CONFIG += qmltestcase console
 
diff --git a/tests/auto/testplugin/testplugin.pro b/tests/auto/testplugin/testplugin.pro
index 2b34ae77..3914c7ee 100644
--- a/tests/auto/testplugin/testplugin.pro
+++ b/tests/auto/testplugin/testplugin.pro
@@ -4,7 +4,7 @@ TARGET  = testplugin
 TARGETPATH = QtQuickControlsTests
 
 QT += qml quick core-private gui-private
-!android:!ios:!blackberry:!qnx:!winrt:qtHaveModule(widgets): QT += widgets
+!no_desktop: QT += widgets
 
 
 QMLDIR = $$PWD/$$TARGETPATH/qmldir
diff --git a/tests/manual/combobox/combobox.pro b/tests/manual/combobox/combobox.pro
index 7d4a347f..89c89627 100644
--- a/tests/manual/combobox/combobox.pro
+++ b/tests/manual/combobox/combobox.pro
@@ -1,6 +1,6 @@
 QT += qml quick
 TARGET = combobox
-!android:!ios:!blackberry:!qnx:!winrt:qtHaveModule(widgets): QT += widgets
+!no_desktop: QT += widgets
 
 SOURCES += $$PWD/main.cpp