From 7a719d3f5c488cf49e28c579300dfbcc70cefb6a Mon Sep 17 00:00:00 2001 From: Andreas Holzammer Date: Tue, 24 Jun 2014 10:29:58 +0200 Subject: 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 --- examples/quick/controls/basiclayouts/basiclayouts.pro | 2 +- examples/quick/controls/gallery/gallery.pro | 2 +- examples/quick/controls/splitview/splitview.pro | 2 +- examples/quick/controls/tableview/tableview.pro | 2 +- examples/quick/controls/texteditor/texteditor.pro | 2 +- examples/quick/controls/touch/touch.pro | 2 +- examples/quick/dialogs/systemdialogs/systemdialogs.pro | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) (limited to 'examples/quick') 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 -- cgit v1.2.1 From b804244af89313fda33106321fcbc508d6a2e884 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Tue, 24 Jun 2014 13:13:02 +0200 Subject: Remove QtWidgets dependency for WinRT Change-Id: Ifacceae8690d2ab4dfaed0d5439b9e29804c1943 Reviewed-by: Andrew Knight --- examples/quick/controls/basiclayouts/basiclayouts.pro | 2 +- examples/quick/controls/gallery/gallery.pro | 2 +- examples/quick/controls/splitview/splitview.pro | 2 +- examples/quick/controls/tableview/tableview.pro | 2 +- examples/quick/controls/texteditor/texteditor.pro | 2 +- examples/quick/controls/touch/touch.pro | 2 +- examples/quick/dialogs/systemdialogs/systemdialogs.pro | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) (limited to 'examples/quick') diff --git a/examples/quick/controls/basiclayouts/basiclayouts.pro b/examples/quick/controls/basiclayouts/basiclayouts.pro index 86b361d2..ccc7d354 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: 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 4c45612f..4b04db74 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: 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 d5125b98..2c561453 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: 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 b24de497..9a434f85 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: 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 af92c830..a9088c87 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: 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 2aebaade..e393fd5b 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: 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 009598c7..64fbc1eb 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: qtHaveModule(widgets): QT += widgets +!android: !ios: !blackberry: !qnx: !winrt: qtHaveModule(widgets): QT += widgets QT += quick qml SOURCES += main.cpp -- cgit v1.2.1 From 6b876b21cd23f2af879543edf773dac41b4d0e97 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Tue, 24 Jun 2014 13:19:17 +0200 Subject: Cleanup whitespace Change-Id: I9e84ce56e853a18205aa180cef1ee8ff4f2f678c Reviewed-by: Caroline Chao --- examples/quick/controls/basiclayouts/basiclayouts.pro | 2 +- examples/quick/controls/gallery/gallery.pro | 2 +- examples/quick/controls/splitview/splitview.pro | 2 +- examples/quick/controls/tableview/tableview.pro | 2 +- examples/quick/controls/texteditor/texteditor.pro | 2 +- examples/quick/controls/touch/touch.pro | 2 +- examples/quick/dialogs/systemdialogs/systemdialogs.pro | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) (limited to 'examples/quick') diff --git a/examples/quick/controls/basiclayouts/basiclayouts.pro b/examples/quick/controls/basiclayouts/basiclayouts.pro index ccc7d354..fbb5f0c1 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 4b04db74..d4d5f16e 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 2c561453..79f1f7d5 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 9a434f85..77520ea5 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 a9088c87..b6a908b4 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 e393fd5b..e230797f 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 64fbc1eb..d0489cd2 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 -- cgit v1.2.1