diff --git a/examples/quick/controls/basiclayouts/basiclayouts.pro b/examples/quick/controls/basiclayouts/basiclayouts.pro index a5586fe62ffc6e8478f7572a6381c503b4be03f1..86b361d2f8ccf1c14cfb3852376ef13b6e145e8e 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: qtHaveModule(widgets): QT += widgets +!android: !ios: !blackberry: !qnx: 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 68ed0c161e9b7cdc28958546cfff236f014a8ad2..4c45612f030a1033b17ad002a7d529b9b4aa32c4 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: qtHaveModule(widgets): QT += widgets +!android: !ios: !blackberry: !qnx: 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 11c55f745d0e43e7cb8eb9c4c5657fb0db8847a1..d5125b98441e8eee42586fd7dbf0da481b526973 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: qtHaveModule(widgets): QT += widgets +!android: !ios: !blackberry: !qnx: 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 7238d007bd9ef713bebff5c627fef65db2512536..b24de4971eb62d498d4b3adb8aebf95de4f54c60 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: qtHaveModule(widgets): QT += widgets +!android: !ios: !blackberry: !qnx: 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 06e669d914f743918f43a8b76986c6f5fe3460a6..af92c8309c766abcab92b086db68315bd528225f 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: qtHaveModule(widgets): QT += widgets +!android: !ios: !blackberry: !qnx: 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 6afca140455a2c8ee0517bc7ef7c6a7dc23e1875..2aebaaded2d83d6b8036584bf0c41298de05d7d9 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: qtHaveModule(widgets): QT += widgets +!android: !ios: !blackberry: !qnx: 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 52ab103c60bc7462218a5db6a765b7b27a21e5ac..009598c7cee2c2ecd00f78d2167d045a0d750cfe 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: qtHaveModule(widgets): QT += widgets +!android: !ios: !blackberry: !qnx: 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 b530a2291da01ef0133e995d03322ee94007bd5a..a92053389c0081a190ca1cbb6147af8912c1a148 100644 --- a/src/controls/Private/private.pri +++ b/src/controls/Private/private.pri @@ -22,7 +22,7 @@ SOURCES += \ $$PWD/qquickabstractstyle.cpp -!android: !ios: !blackberry: qtHaveModule(widgets) { +!android: !ios: !blackberry: !qnx: 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 e1d0cabb742de4446530355f0613018426947f5e..4ad5cfe27663e4dfa4e0b8fb36a45911b87c8010 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) +#if !defined(Q_OS_IOS) && !defined(Q_OS_ANDROID) && !defined (Q_OS_BLACKBERRY) && !defined (Q_OS_QNX) if (QCoreApplication::instance()->inherits("QApplication")) return QLatin1String("Desktop"); #endif diff --git a/tests/auto/activeFocusOnTab/activeFocusOnTab.pro b/tests/auto/activeFocusOnTab/activeFocusOnTab.pro index 1a15680593bf905619897247882ef89bdae6b4ad..da037ee314fe42478d7c1860794a3bcc0be6f390 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: qtHaveModule(widgets): QT += widgets +!android: !ios: !blackberry: !qnx: 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 1a3b0c0a7a10798d4c983c4c7f092b492ebdf3ed..4c79b6121728eb2344f59b7133107c127a7db719 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: qtHaveModule(widgets): QT += widgets +!android: !ios: !blackberry: !qnx: qtHaveModule(widgets): QT += widgets CONFIG += qmltestcase console diff --git a/tests/auto/testplugin/testplugin.pro b/tests/auto/testplugin/testplugin.pro index 6624daca5554c6a2bea8edd8a25836bb8282e952..3758b910525a52a3a99caf2c5a9dc44d506db982 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: qtHaveModule(widgets): QT += widgets +!android: !ios: !blackberry: !qnx: qtHaveModule(widgets): QT += widgets QMLDIR = $$PWD/$$TARGETPATH/qmldir diff --git a/tests/manual/combobox/combobox.pro b/tests/manual/combobox/combobox.pro index 249e8ca40824b0e926bb7bbae4c87ed65e7445a2..8e18049d0b09aea170e1469ed4efd9f516dd56de 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: qtHaveModule(widgets): QT += widgets +!android: !ios: !blackberry: !qnx: qtHaveModule(widgets): QT += widgets SOURCES += $$PWD/main.cpp