diff --git a/examples/quick/controls/basiclayouts/basiclayouts.pro b/examples/quick/controls/basiclayouts/basiclayouts.pro index ccc7d3548ee8fde87a5d9de1757b3ce0ef49041a..fbb5f0c1dc603fc58f5e9b83922a7df052ab01f4 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 +!android:!ios:!blackberry:!qnx:!winrt:qtHaveModule(widgets): 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 4b04db74511cf5ef7c6da696d109cf716ad03b5e..d4d5f16e3cf2006651e617c41ddcc333e1634f88 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 +!android:!ios:!blackberry:!qnx:!winrt:qtHaveModule(widgets): 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 2c561453a68115a8ee3b845802ddee82dddc9e5d..79f1f7d54c83874ecd670d2bd5411d88d5362f32 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 +!android:!ios:!blackberry:!qnx:!winrt:qtHaveModule(widgets): 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 9a434f8501c0c51165c183b7049404f84739ad47..77520ea5e2758f61c7b747b8c92cc39752aa10de 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 +!android:!ios:!blackberry:!qnx:!winrt:qtHaveModule(widgets): 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 a9088c878008871024a15559787d50049d4d1747..b6a908b4599d1e3c2adc637320d5a48510bb6f64 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 +!android:!ios:!blackberry:!qnx:!winrt:qtHaveModule(widgets): 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 e393fd5b55972faca0ab62241c7ff777076ca166..e230797fb5a5cb48db12e6afa0f94f372288d729 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 +!android:!ios:!blackberry:!qnx:!winrt:qtHaveModule(widgets): 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 64fbc1eb12cf4ceed132364440796c0022b9db39..d0489cd263090564a959869c1034643befd90fee 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 +!android:!ios:!blackberry:!qnx:!winrt:qtHaveModule(widgets): QT += widgets QT += quick qml SOURCES += main.cpp diff --git a/src/controls/Private/private.pri b/src/controls/Private/private.pri index a15423951dfb23bc14a3aa6b9af94c5e1d641c53..32ad0cf68578d1cb73a59ae3e2574d46ab1115df 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) { +!android:!ios:!blackberry:!qnx:!winrt:qtHaveModule(widgets) { QT += widgets HEADERS += $$PWD/qquickstyleitem_p.h SOURCES += $$PWD/qquickstyleitem.cpp diff --git a/src/controls/Private/qquickcontrolsettings.cpp b/src/controls/Private/qquickcontrolsettings.cpp index aea3d1418a7f4ae5817f46d0050b58d31a63b0e9..b7ebc213953cf27a2659eebd5153ad2257556096 100644 --- a/src/controls/Private/qquickcontrolsettings.cpp +++ b/src/controls/Private/qquickcontrolsettings.cpp @@ -53,7 +53,7 @@ QT_BEGIN_NAMESPACE static QString defaultStyleName() { //Only enable QStyle support when we are using QApplication -#if !defined(Q_OS_IOS) && !defined(Q_OS_ANDROID) && !defined (Q_OS_BLACKBERRY) && !defined (Q_OS_QNX) && !defined(Q_OS_WINRT) +#if !defined(Q_OS_IOS) && !defined(Q_OS_ANDROID) && !defined(Q_OS_BLACKBERRY) && !defined(Q_OS_QNX) && !defined(Q_OS_WINRT) if (QCoreApplication::instance()->inherits("QApplication")) return QLatin1String("Desktop"); #endif diff --git a/tests/auto/activeFocusOnTab/activeFocusOnTab.pro b/tests/auto/activeFocusOnTab/activeFocusOnTab.pro index f342a1773a8355b1598a269c5fd1e5a3c38b281c..d47a92e85ab21b7bd5ef43aa2055fcd7a5a5acd8 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 +!android:!ios:!blackberry:!qnx:!winrt:qtHaveModule(widgets): QT += widgets DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/controls/controls.pro b/tests/auto/controls/controls.pro index ef0ad16e1e2198cb5fa3b9dbbb20afb9afccd052..dad036a2445cb3f13c4a6264c4a5976f6b03f3f9 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 +!android:!ios:!blackberry:!qnx:!winrt:qtHaveModule(widgets): QT += widgets CONFIG += qmltestcase console diff --git a/tests/auto/testplugin/testplugin.pro b/tests/auto/testplugin/testplugin.pro index 83317b7f800f67027720165fd535a77b20e611ab..2b34ae77b019936c4d8a9609eb9c9e4e60e5d033 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 +!android:!ios:!blackberry:!qnx:!winrt:qtHaveModule(widgets): QT += widgets QMLDIR = $$PWD/$$TARGETPATH/qmldir diff --git a/tests/manual/combobox/combobox.pro b/tests/manual/combobox/combobox.pro index a138338512a4a9d2b0cfcce60867fabf6100777a..7d4a347f70e5f46a47e2d5c2911246db4ceaa6df 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 +!android:!ios:!blackberry:!qnx:!winrt:qtHaveModule(widgets): QT += widgets SOURCES += $$PWD/main.cpp