fix usage of wince scope

Fix style issues along the way.

Change-Id: Ic6a6de28e198eb0b14c198b802e78845703909b9
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>

16 files changed, 24 insertions, 24 deletions

diff --git a/src/3rdparty/libjpeg.pri b/src/3rdparty/libjpeg.pri
index 82c6ed536d..62077c99a9 100644
--- a/src/3rdparty/libjpeg.pri
+++ b/src/3rdparty/libjpeg.pri
@@ -1,4 +1,4 @@
-wince*: {
+wince {
     DEFINES += NO_GETENV
     contains(CE_ARCH,x86):CONFIG -= stl exceptions
     contains(CE_ARCH,x86):CONFIG += exceptions_off
diff --git a/src/3rdparty/zlib.pri b/src/3rdparty/zlib.pri
index 868d1c71bb..363461220b 100644
--- a/src/3rdparty/zlib.pri
+++ b/src/3rdparty/zlib.pri
@@ -1,4 +1,4 @@
-wince*: DEFINES += NO_ERRNO_H
+wince: DEFINES += NO_ERRNO_H
 INCLUDEPATH = $$PWD/zlib $$INCLUDEPATH
 SOURCES+= \
     $$PWD/zlib/adler32.c \
diff --git a/src/corelib/kernel/kernel.pri b/src/corelib/kernel/kernel.pri
index dabbb2dbbe..65dc44def2 100644
--- a/src/corelib/kernel/kernel.pri
+++ b/src/corelib/kernel/kernel.pri
@@ -84,7 +84,7 @@ win32 {
         }
 }
 
-wince*: {
+wince {
         SOURCES += \
                 kernel/qfunctions_wince.cpp
         HEADERS += \
diff --git a/src/dbus/dbus.pro b/src/dbus/dbus.pro
index 3ef8e6c80c..ebeab5c1b0 100644
--- a/src/dbus/dbus.pro
+++ b/src/dbus/dbus.pro
@@ -16,7 +16,7 @@ contains(QT_CONFIG, dbus-linked) {
 }
 
 win32 { 
-    wince*:LIBS_PRIVATE += -lws2
+    wince: LIBS_PRIVATE += -lws2
     else:LIBS_PRIVATE += -lws2_32 \
         -ladvapi32 \
         -lnetapi32 \
diff --git a/src/network/socket/socket.pri b/src/network/socket/socket.pri
index 3fb85160ea..f50a7b1229 100644
--- a/src/network/socket/socket.pri
+++ b/src/network/socket/socket.pri
@@ -43,7 +43,7 @@ win32:!winrt:SOURCES += socket/qnativesocketengine_win.cpp \
                 socket/qlocalsocket_win.cpp \
                 socket/qlocalserver_win.cpp
 
-win32:!wince*:!winrt:LIBS_PRIVATE += -ladvapi32
+win32:!wince:!winrt:LIBS_PRIVATE += -ladvapi32
 
 winrt {
     SOURCES += socket/qnativesocketengine_winrt.cpp \
@@ -54,7 +54,7 @@ winrt {
     DEFINES += QT_LOCALSOCKET_TCP
 }
 
-wince*: {
+wince {
     SOURCES -= socket/qlocalsocket_win.cpp \
                socket/qlocalserver_win.cpp
     SOURCES += socket/qlocalsocket_tcp.cpp \
diff --git a/src/plugins/bearer/bearer.pro b/src/plugins/bearer/bearer.pro
index 7637bf1f5e..2239d52737 100644
--- a/src/plugins/bearer/bearer.pro
+++ b/src/plugins/bearer/bearer.pro
@@ -8,7 +8,7 @@ TEMPLATE = subdirs
 #win32:SUBDIRS += nla
 win32:SUBDIRS += generic
 blackberry:SUBDIRS += blackberry
-win32:!wince*:SUBDIRS += nativewifi
+win32:!wince: SUBDIRS += nativewifi
 mac:contains(QT_CONFIG, corewlan):SUBDIRS += corewlan
 mac:SUBDIRS += generic
 android:!android-no-sdk:SUBDIRS += android
diff --git a/src/plugins/platforms/windows/windows.pri b/src/plugins/platforms/windows/windows.pri
index a0460630a7..de901aaeb1 100644
--- a/src/plugins/platforms/windows/windows.pri
+++ b/src/plugins/platforms/windows/windows.pri
@@ -1,14 +1,14 @@
 # Note: OpenGL32 must precede Gdi32 as it overwrites some functions.
 LIBS *= -lole32
-!wince*:LIBS *= -luser32 -lwinspool -limm32 -lwinmm  -loleaut32
+!wince: LIBS *= -luser32 -lwinspool -limm32 -lwinmm -loleaut32
 
 contains(QT_CONFIG, opengl):!contains(QT_CONFIG, opengles2):!contains(QT_CONFIG, dynamicgl): LIBS *= -lopengl32
 
 mingw: LIBS *= -luuid
 # For the dialog helpers:
-!wince*:LIBS *= -lshlwapi -lshell32
-!wince*:LIBS *= -ladvapi32
-wince*:DEFINES *= QT_LIBINFIX=L"\"\\\"$${QT_LIBINFIX}\\\"\""
+!wince: LIBS *= -lshlwapi -lshell32
+!wince: LIBS *= -ladvapi32
+wince: DEFINES *= QT_LIBINFIX=L"\"\\\"$${QT_LIBINFIX}\\\"\""
 
 DEFINES *= QT_NO_CAST_FROM_ASCII
 
@@ -103,22 +103,22 @@ contains(QT_CONFIG,dynamicgl) {
     }
 }
 
-!wince*:!contains( DEFINES, QT_NO_TABLETEVENT ) {
+!wince:!contains( DEFINES, QT_NO_TABLETEVENT ) {
     INCLUDEPATH += $$QT_SOURCE_TREE/src/3rdparty/wintab
     HEADERS += $$PWD/qwindowstabletsupport.h
     SOURCES += $$PWD/qwindowstabletsupport.cpp
 }
 
-!wince*:!contains( DEFINES, QT_NO_SESSIONMANAGER ) {
+!wince:!contains( DEFINES, QT_NO_SESSIONMANAGER ) {
     SOURCES += $$PWD/qwindowssessionmanager.cpp
     HEADERS += $$PWD/qwindowssessionmanager.h
 }
 
-!wince*:!contains( DEFINES, QT_NO_IMAGEFORMAT_PNG ) {
+!wince:!contains( DEFINES, QT_NO_IMAGEFORMAT_PNG ) {
     RESOURCES += $$PWD/cursors.qrc
 }
 
-!wince*: RESOURCES += $$PWD/openglblacklists.qrc
+!wince: RESOURCES += $$PWD/openglblacklists.qrc
 
 contains(QT_CONFIG, freetype) {
     DEFINES *= QT_NO_FONTCONFIG
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index 587063b100..af4f6fc8fe 100644
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -5,4 +5,4 @@ SUBDIRS *= sqldrivers
 qtHaveModule(gui): SUBDIRS *= imageformats platforms platforminputcontexts platformthemes generic
 qtHaveModule(widgets): SUBDIRS *= styles
 
-!winrt:!wince*:qtHaveModule(widgets):SUBDIRS += printsupport
+!winrt:!wince:qtHaveModule(widgets): SUBDIRS += printsupport
diff --git a/src/src.pro b/src/src.pro
index b4d62aa8b0..61e5ce2d8d 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -176,7 +176,7 @@ contains(QT_CONFIG, concurrent):SUBDIRS += src_concurrent
             SUBDIRS += src_opengl
             src_plugins.depends += src_opengl
         }
-        !wince*:!winrt {
+        !wince:!winrt {
             SUBDIRS += src_printsupport
             src_plugins.depends += src_printsupport
         }
diff --git a/src/widgets/dialogs/dialogs.pri b/src/widgets/dialogs/dialogs.pri
index 53d1985fb5..a5b4883db8 100644
--- a/src/widgets/dialogs/dialogs.pri
+++ b/src/widgets/dialogs/dialogs.pri
@@ -25,7 +25,7 @@ win32 {
     SOURCES += dialogs/qwizard_win.cpp
 }
 
-wince*: FORMS += dialogs/qfiledialog_embedded.ui
+wince: FORMS += dialogs/qfiledialog_embedded.ui
 else: FORMS += dialogs/qfiledialog.ui
 
 INCLUDEPATH += $$PWD
diff --git a/src/widgets/kernel/kernel.pri b/src/widgets/kernel/kernel.pri
index 21a982f349..0060ad2d31 100644
--- a/src/widgets/kernel/kernel.pri
+++ b/src/widgets/kernel/kernel.pri
@@ -69,7 +69,7 @@ macx: {
     SOURCES += kernel/qmacgesturerecognizer.cpp
 }
 
-wince*: {
+wince {
         HEADERS += \
                 ../corelib/kernel/qfunctions_wince.h \
                 kernel/qwidgetsfunctions_wince.h
diff --git a/src/widgets/kernel/win.pri b/src/widgets/kernel/win.pri
index 76bb709e2b..e2d5afdeec 100644
--- a/src/widgets/kernel/win.pri
+++ b/src/widgets/kernel/win.pri
@@ -2,6 +2,6 @@
 # --------------------------------------------------------------------
 
 INCLUDEPATH += ../3rdparty/wintab
-!wince*:!winrt {
+!wince:!winrt {
     LIBS_PRIVATE *= -lshell32
 }
diff --git a/src/widgets/util/util.pri b/src/widgets/util/util.pri
index b4bbc5fc30..9f43dc42f0 100644
--- a/src/widgets/util/util.pri
+++ b/src/widgets/util/util.pri
@@ -27,7 +27,7 @@ SOURCES += \
         util/qundostack.cpp \
         util/qundoview.cpp
 
-win32:!wince*:!winrt {
+win32:!wince:!winrt {
     SOURCES += util/qsystemtrayicon_win.cpp
 } else:contains(QT_CONFIG, xcb) {
     SOURCES += util/qsystemtrayicon_x11.cpp
diff --git a/src/widgets/widgets.pro b/src/widgets/widgets.pro
index d819436f66..ceb6f96f7c 100644
--- a/src/widgets/widgets.pro
+++ b/src/widgets/widgets.pro
@@ -1,5 +1,5 @@
 TARGET     = QtWidgets
-wince*:ORIG_TARGET = $$TARGET
+wince: ORIG_TARGET = $$TARGET
 QT = core-private gui-private
 MODULE_CONFIG = uic
 
diff --git a/src/widgets/widgets/widgets.pri b/src/widgets/widgets/widgets.pri
index 342d2093db..c31a7f7682 100644
--- a/src/widgets/widgets/widgets.pri
+++ b/src/widgets/widgets/widgets.pri
@@ -154,7 +154,7 @@ macx {
         widgets/qmaccocoaviewcontainer_mac.mm
 }
 
-wince*: {
+wince {
     SOURCES += widgets/qmenu_wince.cpp
     HEADERS += widgets/qmenu_wince_resource_p.h
     RC_FILE = widgets/qmenu_wince.rc
diff --git a/src/winmain/winmain.pro b/src/winmain/winmain.pro
index b891e4bce0..e8c9ace03b 100644
--- a/src/winmain/winmain.pro
+++ b/src/winmain/winmain.pro
@@ -32,4 +32,4 @@ load(qt_targets)
 load(qt_build_paths)
 load(qt_common)
 
-wince*:QMAKE_POST_LINK =
+wince: QMAKE_POST_LINK =