summaryrefslogtreecommitdiffstats
path: root/src/widgets
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2015-06-03 17:04:53 +0200
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2015-06-05 10:29:10 +0000
commitd32f47b70387713335656a8e93f289c819fb9b05 (patch)
tree4ecd3f75a94d77f1068807a6fce058238915c2a4 /src/widgets
parent92b3397a8914ef6b516a8473888986f838396781 (diff)
fix usage of wince scope
Fix style issues along the way. Change-Id: Ic6a6de28e198eb0b14c198b802e78845703909b9 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'src/widgets')
-rw-r--r--src/widgets/dialogs/dialogs.pri2
-rw-r--r--src/widgets/kernel/kernel.pri2
-rw-r--r--src/widgets/kernel/win.pri2
-rw-r--r--src/widgets/util/util.pri2
-rw-r--r--src/widgets/widgets.pro2
-rw-r--r--src/widgets/widgets/widgets.pri2
6 files changed, 6 insertions, 6 deletions
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