From 6b876b21cd23f2af879543edf773dac41b4d0e97 Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@digia.com>
Date: Tue, 24 Jun 2014 13:19:17 +0200
Subject: [PATCH] Cleanup whitespace
Change-Id: I9e84ce56e853a18205aa180cef1ee8ff4f2f678c
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
---
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 +-
src/controls/Private/private.pri | 2 +-
src/controls/Private/qquickcontrolsettings.cpp | 2 +-
tests/auto/activeFocusOnTab/activeFocusOnTab.pro | 2 +-
tests/auto/controls/controls.pro | 2 +-
tests/auto/testplugin/testplugin.pro | 2 +-
tests/manual/combobox/combobox.pro | 2 +-
13 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/examples/quick/controls/basiclayouts/basiclayouts.pro b/examples/quick/controls/basiclayouts/basiclayouts.pro
index ccc7d3548..fbb5f0c1d 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 4b04db745..d4d5f16e3 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 2c561453a..79f1f7d54 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 9a434f850..77520ea5e 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 a9088c878..b6a908b45 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 e393fd5b5..e230797fb 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 64fbc1eb1..d0489cd26 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 a15423951..32ad0cf68 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 aea3d1418..b7ebc2139 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 f342a1773..d47a92e85 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 ef0ad16e1..dad036a24 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 83317b7f8..2b34ae77b 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 a13833851..7d4a347f7 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
--
GitLab