summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Holzammer <andreas.holzammer@kdab.com>2014-06-24 10:29:58 +0200
committerAndreas Holzammer <andreas.holzammer@kdab.com>2014-06-24 10:54:12 +0200
commit7a719d3f5c488cf49e28c579300dfbcc70cefb6a (patch)
tree024e3d377e83440c69cf80130d536bfda5a942f0
parenta780d2ddedb769eba44263ae46684080d7ddc843 (diff)
downloadqtquickcontrols-7a719d3f5c488cf49e28c579300dfbcc70cefb6a.tar.gz
Remove Widgets dependency for QNX
Changes.txt says that with Qt 5.2.0 dependency for Widgets have been removed for touch based platforms. But QNX is also a touch based platform and its missing. Change-Id: I140842d4501422537175ac5acb07beebe994f0eb Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
-rw-r--r--examples/quick/controls/basiclayouts/basiclayouts.pro2
-rw-r--r--examples/quick/controls/gallery/gallery.pro2
-rw-r--r--examples/quick/controls/splitview/splitview.pro2
-rw-r--r--examples/quick/controls/tableview/tableview.pro2
-rw-r--r--examples/quick/controls/texteditor/texteditor.pro2
-rw-r--r--examples/quick/controls/touch/touch.pro2
-rw-r--r--examples/quick/dialogs/systemdialogs/systemdialogs.pro2
-rw-r--r--src/controls/Private/private.pri2
-rw-r--r--src/controls/Private/qquickcontrolsettings.cpp2
-rw-r--r--tests/auto/activeFocusOnTab/activeFocusOnTab.pro2
-rw-r--r--tests/auto/controls/controls.pro2
-rw-r--r--tests/auto/testplugin/testplugin.pro2
-rw-r--r--tests/manual/combobox/combobox.pro2
13 files changed, 13 insertions, 13 deletions
diff --git a/examples/quick/controls/basiclayouts/basiclayouts.pro b/examples/quick/controls/basiclayouts/basiclayouts.pro
index a5586fe6..86b361d2 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 68ed0c16..4c45612f 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 11c55f74..d5125b98 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 7238d007..b24de497 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 06e669d9..af92c830 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 6afca140..2aebaade 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 52ab103c..009598c7 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 b530a229..a9205338 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 e1d0cabb..4ad5cfe2 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 1a156805..da037ee3 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 1a3b0c0a..4c79b612 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 6624daca..3758b910 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 249e8ca4..8e18049d 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