introduce Q_WS_WINCE

Task-number: 246130
Reviewed-by: joerg

Introduce Q_WS_WINCE for Windows CE only windowing parts. So far we
decided to stick with Q_WS_WIN32, but having a separate define
makes the code more readable. In addition Q_WS_WINCE_WM is available
for Windows Mobile only parts, where we do not check for the OS on
runtime.

10 files changed, 106 insertions, 106 deletions

diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp
index 303f3eb2ea..98285f0086 100644
--- a/src/gui/kernel/qapplication.cpp
+++ b/src/gui/kernel/qapplication.cpp
@@ -89,7 +89,7 @@
 
 #include "qapplication.h"
 
-#ifdef Q_OS_WINCE
+#ifdef Q_WS_WINCE
 #include "qdatetime.h"
 #include "qguifunctions_wince.h"
 extern bool qt_wince_is_smartphone(); //qguifunctions_wince.cpp
@@ -101,7 +101,7 @@ extern bool qt_wince_is_pocket_pc();  //qguifunctions_wince.cpp
 
 static void initResources()
 {
-#ifdef Q_OS_WINCE
+#ifdef Q_WS_WINCE
     Q_INIT_RESOURCE(qstyle_wince);
 #else
     Q_INIT_RESOURCE(qstyle);
@@ -127,7 +127,7 @@ QInputContext *QApplicationPrivate::inputContext;
 
 bool QApplicationPrivate::quitOnLastWindowClosed = true;
 
-#ifdef Q_OS_WINCE
+#ifdef Q_WS_WINCE
 int QApplicationPrivate::autoMaximizeThreshold = -1;
 bool QApplicationPrivate::autoSipEnabled = false;
 #endif
@@ -439,7 +439,7 @@ bool QApplicationPrivate::fade_tooltip = false;
 bool QApplicationPrivate::animate_toolbox = false;
 bool QApplicationPrivate::widgetCount = false;
 QString* QApplicationPrivate::styleOverride = 0;
-#if defined(Q_WS_WIN) && !defined(Q_OS_WINCE)
+#if defined(Q_WS_WIN) && !defined(Q_WS_WINCE)
 bool QApplicationPrivate::inSizeMove = false;
 #endif
 #ifdef QT_KEYPAD_NAVIGATION
@@ -856,7 +856,7 @@ void QApplicationPrivate::initialize()
         q->setAttribute(Qt::AA_NativeWindows);
 #endif
 
-#ifdef Q_OS_WINCE
+#ifdef Q_WS_WINCE
 #ifdef QT_AUTO_MAXIMIZE_THRESHOLD
     autoMaximizeThreshold = QT_AUTO_MAXIMIZE_THRESHOLD;
 #else
@@ -865,7 +865,7 @@ void QApplicationPrivate::initialize()
     else
         autoMaximizeThreshold = -1;
 #endif //QT_AUTO_MAXIMIZE_THRESHOLD
-#endif //Q_OS_WINCE
+#endif //Q_WS_WINCE
 
     // Set up which span functions should be used in raster engine...
     qInitDrawhelperAsm();
@@ -1217,7 +1217,7 @@ bool QApplication::compressEvent(QEvent *event, QObject *receiver, QPostEventLis
     the WA_InputMethodEnabled attribute set.
 */
 
-#ifdef Q_OS_WINCE
+#ifdef Q_WS_WINCE
 void QApplication::setAutoMaximizeThreshold(const int threshold)
 {
     QApplicationPrivate::autoMaximizeThreshold = threshold;
@@ -1292,7 +1292,7 @@ QStyle *QApplication::style()
             delete QApplicationPrivate::styleOverride;
             QApplicationPrivate::styleOverride = 0;
         } else {
-#if defined(Q_WS_WIN) && defined(Q_OS_WINCE)
+#if defined(Q_WS_WIN) && defined(Q_WS_WINCE)
     if (qt_wince_is_smartphone() || qt_wince_is_pocket_pc())
         style = QLatin1String("WindowsMobile");
      else
@@ -4027,7 +4027,7 @@ bool QApplicationPrivate::notify_helper(QObject *receiver, QEvent * e)
     if (receiver->isWidgetType()) {
         QWidget *widget = static_cast<QWidget *>(receiver);
 
-#if !defined(Q_OS_WINCE) || (defined(GWES_ICONCURS) && !defined(QT_NO_CURSOR))
+#if !defined(Q_WS_WINCE) || (defined(GWES_ICONCURS) && !defined(QT_NO_CURSOR))
         // toggle HasMouse widget state on enter and leave
         if ((e->type() == QEvent::Enter || e->type() == QEvent::DragEnter) &&
             (!qApp->activePopupWidget() || qApp->activePopupWidget() == widget->window()))
diff --git a/src/gui/kernel/qapplication.h b/src/gui/kernel/qapplication.h
index 1d6941d5fc..2baf6dc625 100644
--- a/src/gui/kernel/qapplication.h
+++ b/src/gui/kernel/qapplication.h
@@ -102,7 +102,7 @@ class Q_GUI_EXPORT QApplication : public QCoreApplication
 #ifndef QT_NO_STYLE_STYLESHEET
     Q_PROPERTY(QString styleSheet READ styleSheet WRITE setStyleSheet)
 #endif
-#ifdef Q_OS_WINCE
+#ifdef Q_WS_WINCE
     Q_PROPERTY(int autoMaximizeThreshold READ autoMaximizeThreshold WRITE setAutoMaximizeThreshold)
     Q_PROPERTY(bool autoSipEnabled READ autoSipEnabled WRITE setAutoSipEnabled)
 #endif
@@ -281,7 +281,7 @@ public Q_SLOTS:
 #ifndef QT_NO_STYLE_STYLESHEET
     void setStyleSheet(const QString& sheet);
 #endif
-#ifdef Q_OS_WINCE
+#ifdef Q_WS_WINCE
     void setAutoMaximizeThreshold(const int threshold);
     int autoMaximizeThreshold() const;
     void setAutoSipEnabled(const bool enabled);
diff --git a/src/gui/kernel/qapplication_p.h b/src/gui/kernel/qapplication_p.h
index 7487f0a919..7e97418bc5 100644
--- a/src/gui/kernel/qapplication_p.h
+++ b/src/gui/kernel/qapplication_p.h
@@ -219,7 +219,7 @@ public:
 #endif
     static bool quitOnLastWindowClosed;
     static void emitLastWindowClosed();
-#ifdef Q_OS_WINCE
+#ifdef Q_WS_WINCE
     static int autoMaximizeThreshold;
     static bool autoSipEnabled;
 #endif
@@ -358,7 +358,7 @@ public:
 #ifdef Q_WS_MAC
     static bool native_modal_dialog_active;
 #endif
-#if defined(Q_WS_WIN) && !defined(Q_OS_WINCE)
+#if defined(Q_WS_WIN) && !defined(Q_WS_WINCE)
     static bool inSizeMove;
 #endif
 
diff --git a/src/gui/kernel/qapplication_win.cpp b/src/gui/kernel/qapplication_win.cpp
index c1cb7e2ce2..07b386522d 100644
--- a/src/gui/kernel/qapplication_win.cpp
+++ b/src/gui/kernel/qapplication_win.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#ifdef Q_OS_WINCE
+#ifdef Q_WS_WINCE
 #include "qguifunctions_wince.h"
 #include "qmenubar.h"
 extern bool qt_wince_is_mobile();             //defined in qguifunctions_wince.cpp
@@ -48,7 +48,7 @@ extern bool qt_wince_is_smartphone();         //defined in qguifunctions_wince.c
 extern bool qt_wince_is_pocket_pc();          //defined in qguifunctions_wince.cpp
 extern void qt_wince_hide_taskbar(HWND hwnd); //defined in qguifunctions_wince.cpp
 #endif
-#ifdef Q_OS_WINCE_WM
+#ifdef Q_WS_WINCE_WM
 #include <windowsm.h>
 #include <tpcshell.h>
 #endif
@@ -106,7 +106,7 @@ extern void qt_wince_hide_taskbar(HWND hwnd); //defined in qguifunctions_wince.c
 
 #include <winuser.h>
 #if !defined(WINABLEAPI)
-#  if defined(Q_OS_WINCE)
+#  if defined(Q_WS_WINCE)
 #    include <bldver.h>
 #  endif
 #  include <winable.h>
@@ -155,7 +155,7 @@ static PtrFlashWindowEx pFlashWindowEx = 0;
 
 QT_BEGIN_NAMESPACE
 
-#ifdef Q_OS_WINCE
+#ifdef Q_WS_WINCE
 #ifndef SHRG_RETURNCMD
 struct SHRGINFO {
     DWORD cbSize;
@@ -266,7 +266,7 @@ Q_CORE_EXPORT bool winPostMessage(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPa
 #define MK_XBUTTON2         0x0040
 #endif
 
-#ifdef Q_OS_WINCE
+#ifdef Q_WS_WINCE
 #define GET_KEYSTATE_WPARAM(wParam)     (LOWORD(wParam))
 #endif
 
@@ -497,7 +497,7 @@ static void qt_set_windows_color_resources()
     pal.setColor(QPalette::HighlightedText,
                  QColor(qt_colorref2qrgb(GetSysColor(COLOR_HIGHLIGHTTEXT))));
 
-#if defined(Q_OS_WINCE)
+#if defined(Q_WS_WINCE)
     // ### hardcoded until I find out how to get it from the system settings.
     pal.setColor(QPalette::LinkVisited, pal.highlight().color().dark(150));
     pal.setColor(QPalette::Link, pal.highlight().color().light(130));
@@ -573,7 +573,7 @@ static void qt_set_windows_color_resources()
 
 static void qt_set_windows_font_resources()
 {
-#ifndef Q_OS_WINCE
+#ifndef Q_WS_WINCE
     QFont menuFont;
     QFont messageFont;
     QFont statusFont;
@@ -625,7 +625,7 @@ static void qt_set_windows_font_resources()
         smallerFont.setPointSize(systemFont.pointSize()-1);
         QApplication::setFont(smallerFont, "QTabBar");
     }
-#endif// Q_OS_WINCE
+#endif// Q_WS_WINCE
 }
 
 static void qt_win_read_cleartype_settings()
@@ -753,7 +753,7 @@ void qt_init(QApplicationPrivate *priv, int)
     }
 
     // Get the application name/instance if qWinMain() was not invoked
-#ifndef Q_OS_WINCE
+#ifndef Q_WS_WINCE
     // No message boxes but important ones
     SetErrorMode(SetErrorMode(0) | SEM_FAILCRITICALERRORS|SEM_NOOPENFILEERRORBOX);
 #endif
@@ -766,7 +766,7 @@ void qt_init(QApplicationPrivate *priv, int)
         });
     }
 
-#ifndef Q_OS_WINCE
+#ifndef Q_WS_WINCE
     // Initialize OLE/COM
     //         S_OK means success and S_FALSE means that it has already
     //         been initialized
@@ -778,7 +778,7 @@ void qt_init(QApplicationPrivate *priv, int)
 #endif
 
     // Misc. initialization
-#if defined(QT_DEBUG) && !defined(Q_OS_WINCE)
+#if defined(QT_DEBUG) && !defined(Q_WS_WINCE)
     GdiSetBatchLimit(1);
 #endif
 
@@ -792,7 +792,7 @@ void qt_init(QApplicationPrivate *priv, int)
 #endif
     qApp->setObjectName(QLatin1String(theAppName));
 
-#if !defined(Q_OS_WINCE)
+#if !defined(Q_WS_WINCE)
     // default font
     HFONT hfont = (HFONT)GetStockObject(DEFAULT_GUI_FONT);
     QFont f(QLatin1String("MS Sans Serif"),8);
@@ -812,7 +812,7 @@ void qt_init(QApplicationPrivate *priv, int)
         && f.family() == QLatin1String("MS Shell Dlg"))
         f.setFamily(QLatin1String("MS Shell Dlg 2"));
     QApplicationPrivate::setSystemFont(f);
-#else //Q_OS_WINCE
+#else //Q_WS_WINCE
         LOGFONT lf;
         HGDIOBJ stockFont = GetStockObject(SYSTEM_FONT);
         int result = 0;
@@ -820,7 +820,7 @@ void qt_init(QApplicationPrivate *priv, int)
         QFont font = qt_LOGFONTtoQFont(lf, true);
         if (result)
           QApplicationPrivate::setSystemFont(font);
-#endif //Q_OS_WINCE
+#endif //Q_WS_WINCE
 
     // QFont::locale_init();  ### Uncomment when it does something on Windows
 
@@ -877,7 +877,7 @@ void qt_cleanup()
     delete QApplicationPrivate::inputContext;
     QApplicationPrivate::inputContext = 0;
 
-#ifndef Q_OS_WINCE
+#ifndef Q_WS_WINCE
   // Deinitialize OLE/COM
     OleUninitialize();
 #endif
@@ -925,7 +925,7 @@ const QString qt_reg_winclass(QWidget *w)        // register window class
     if (flags & Qt::MSWindowsOwnDC) {
         cname = QLatin1String("QWidgetOwnDC");
         style = CS_DBLCLKS;
-#ifndef Q_OS_WINCE
+#ifndef Q_WS_WINCE
         style |= CS_OWNDC;
 #endif
         icon  = true;
@@ -940,14 +940,14 @@ const QString qt_reg_winclass(QWidget *w)        // register window class
         } else {
             cname = QLatin1String("QTool");
         }
-#ifndef Q_OS_WINCE
+#ifndef Q_WS_WINCE
         style |= CS_SAVEBITS;
 #endif
         icon = false;
     } else if (type == Qt::Popup) {
         cname = QLatin1String("QPopup");
         style = CS_DBLCLKS;
-#ifndef Q_OS_WINCE
+#ifndef Q_WS_WINCE
         style |= CS_SAVEBITS;
 #endif
         if ((QSysInfo::WindowsVersion >= QSysInfo::WV_XP
@@ -960,7 +960,7 @@ const QString qt_reg_winclass(QWidget *w)        // register window class
         icon  = true;
     }
 
-#ifndef Q_OS_WINCE
+#ifndef Q_WS_WINCE
     // force CS_OWNDC when the GL graphics system is
     // used as the default renderer
     if (qt_win_owndc_required)
@@ -1005,7 +1005,7 @@ const QString qt_reg_winclass(QWidget *w)        // register window class
         return cname;
 
     ATOM atom;
-#ifndef Q_OS_WINCE
+#ifndef Q_WS_WINCE
     HBRUSH bgBrush = (HBRUSH)GetSysColorBrush(COLOR_WINDOW);
     QT_WA({
         WNDCLASS wc;
@@ -1385,7 +1385,7 @@ void QApplication::winFocus(QWidget *widget, bool gotFocus)
             && (QApplicationPrivate::active_window->windowType() == Qt::Dialog)) {
             // raise the entire application, not just the dialog
             QWidget* mw = QApplicationPrivate::active_window;
-#ifndef Q_OS_WINCE
+#ifndef Q_WS_WINCE
             while(mw->parentWidget() && (mw->windowType() == Qt::Dialog))
                 mw = mw->parentWidget()->window();
             if (mw->testAttribute(Qt::WA_WState_Created) && mw != QApplicationPrivate::active_window)
@@ -1436,7 +1436,7 @@ static bool qt_is_translatable_mouse_event(UINT message)
                 message >= WM_XBUTTONDOWN && message <= WM_XBUTTONDBLCLK)
             && message != WM_MOUSEWHEEL
 
-#ifndef Q_OS_WINCE
+#ifndef Q_WS_WINCE
             || message >= WM_NCMOUSEMOVE && message <= WM_NCMBUTTONDBLCLK
 #endif
             ;
@@ -1476,7 +1476,7 @@ LRESULT CALLBACK QtWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam
     msg.pt.y = GET_Y_LPARAM(lParam);
     // If it's a non-client-area message the coords are screen coords, otherwise they are
     // client coords.
-#ifndef Q_OS_WINCE
+#ifndef Q_WS_WINCE
     if (message < WM_NCMOUSEMOVE || message > WM_NCMBUTTONDBLCLK)
 #endif
         ClientToScreen(msg.hwnd, &msg.pt);
@@ -1506,7 +1506,7 @@ LRESULT CALLBACK QtWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam
     if (imeParentWnd  && QApplication::activePopupWidget()
         && (message == WM_MBUTTONDOWN || message == WM_XBUTTONDOWN
         || message == WM_LBUTTONDOWN || message == WM_RBUTTONDOWN
-#ifndef Q_OS_WINCE
+#ifndef Q_WS_WINCE
         || message == WM_NCMBUTTONDOWN || message == WM_NCLBUTTONDOWN
         || message == WM_NCRBUTTONDOWN)) {
 #else
@@ -1516,7 +1516,7 @@ LRESULT CALLBACK QtWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam
     }
 
     switch (message) {
-#ifndef Q_OS_WINCE
+#ifndef Q_WS_WINCE
     case WM_QUERYENDSESSION: {
         if (sm_smActive) // bogus message from windows
             RETURN(true);
@@ -1567,7 +1567,7 @@ LRESULT CALLBACK QtWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam
 #endif
 
     case WM_SETTINGCHANGE:
-#ifdef Q_OS_WINCE
+#ifdef Q_WS_WINCE
         // CE SIP hide/show
         if (wParam == SPI_SETSIPINFO) {
             QResizeEvent re(QSize(0, 0), QSize(0, 0)); // Calculated by QDesktopWidget
@@ -1669,7 +1669,7 @@ LRESULT CALLBACK QtWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam
 
         if (!qt_tabletChokeMouse) {
             result = widget->translateMouseEvent(msg);        // mouse event
-#if defined(Q_OS_WINCE) && !defined(QT_NO_CONTEXTMENU)
+#if defined(Q_WS_WINCE) && !defined(QT_NO_CONTEXTMENU)
             if (message == WM_LBUTTONDOWN && widget != qApp->activePopupWidget()) {
                 QWidget* alienWidget = widget;
                 if ((alienWidget != qApp->activePopupWidget()) && (alienWidget->contextMenuPolicy() != Qt::PreventContextMenu)) {
@@ -1897,7 +1897,7 @@ LRESULT CALLBACK QtWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam
             }
             break;
 
-#ifndef Q_OS_WINCE
+#ifndef Q_WS_WINCE
         case WM_NCHITTEST:
             if (widget->isWindow()) {
                 QPoint pos = widget->mapFromGlobal(QPoint(GET_X_LPARAM(lParam), GET_Y_LPARAM(lParam)));
@@ -1916,7 +1916,7 @@ LRESULT CALLBACK QtWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam
 #endif
 
         case WM_SYSCOMMAND: {
-#ifndef Q_OS_WINCE
+#ifndef Q_WS_WINCE
             bool window_state_change = false;
             Qt::WindowStates oldstate = Qt::WindowStates(widget->dataPtr()->window_state);
             // MSDN:In WM_SYSCOMMAND messages, the four low-order bits of the wParam parameter are
@@ -1944,7 +1944,7 @@ LRESULT CALLBACK QtWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam
                     QHideEvent e;
                     qt_sendSpontaneousEvent(widget, &e);
                     widget->hideChildren(true);
-#ifndef Q_OS_WINCE
+#ifndef Q_WS_WINCE
                     const QString title = widget->windowIconText();
                     if (!title.isEmpty())
                         widget->setWindowTitle_helper(title);
@@ -1967,7 +1967,7 @@ LRESULT CALLBACK QtWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam
                     widget->showChildren(true);
                     QShowEvent e;
                     qt_sendSpontaneousEvent(widget, &e);
-#ifndef Q_OS_WINCE
+#ifndef Q_WS_WINCE
                     const QString title = widget->windowTitle();
                     if (!title.isEmpty())
                         widget->setWindowTitle_helper(title);
@@ -2017,7 +2017,7 @@ LRESULT CALLBACK QtWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam
             result = widget->translatePaintEvent(msg);
             break;
 
-#ifndef Q_OS_WINCE
+#ifndef Q_WS_WINCE
         case WM_ENTERSIZEMOVE:
             autoCaptureWnd = hwnd;
             QApplicationPrivate::inSizeMove = true;
@@ -2074,7 +2074,7 @@ LRESULT CALLBACK QtWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam
                 // where it got it from; it would simply get a 0 value as the old focus widget.
                 if (!(widget->windowState() & Qt::WindowMinimized)) {
                     // Ignore the activate message send by WindowsXP to a minimized window
-#ifdef Q_OS_WINCE_WM
+#ifdef Q_WS_WINCE_WM
                     if  (widget->windowState() & Qt::WindowFullScreen)
                         qt_wince_hide_taskbar(widget->winId());
 #endif
@@ -2101,7 +2101,7 @@ LRESULT CALLBACK QtWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam
             }
             break;
 
-#ifndef Q_OS_WINCE
+#ifndef Q_WS_WINCE
             case WM_MOUSEACTIVATE:
                 if (widget->window()->windowType() == Qt::Tool) {
                     QWidget *w = widget;
@@ -2190,7 +2190,7 @@ LRESULT CALLBACK QtWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam
             result = false;
             break;
 
-#ifndef Q_OS_WINCE
+#ifndef Q_WS_WINCE
         case WM_WINDOWPOSCHANGING:
             {
                 result = false;
@@ -2306,7 +2306,7 @@ LRESULT CALLBACK QtWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam
             break;
         }
 
-#ifndef Q_OS_WINCE
+#ifndef Q_WS_WINCE
         case WM_CHANGECBCHAIN:
         case WM_DRAWCLIPBOARD:
 #endif
@@ -2413,7 +2413,7 @@ LRESULT CALLBACK QtWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam
 #endif // QT_NO_TABLETEVENT
             }
             break;
-#ifdef Q_OS_WINCE_WM
+#ifdef Q_WS_WINCE_WM
         case WM_SETFOCUS: {
             HIMC hC;
             hC = ImmGetContext(hwnd);
@@ -2457,7 +2457,7 @@ LRESULT CALLBACK QtWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam
                 widget->update();
             break;
 
-#ifndef Q_OS_WINCE
+#ifndef Q_WS_WINCE
         case WM_INPUTLANGCHANGE: {
             char info[7];
             if (!GetLocaleInfoA(MAKELCID(lParam, SORT_DEFAULT), LOCALE_IDEFAULTANSICODEPAGE, info, 6)) {
@@ -2655,19 +2655,19 @@ bool qt_try_modal(QWidget *widget, MSG *msg, int& ret)
     int type = msg->message;
 
     bool block_event = false;
-#ifndef Q_OS_WINCE
+#ifndef Q_WS_WINCE
     if (type != WM_NCHITTEST)
 #endif
         if ((type >= WM_MOUSEFIRST && type <= WM_MOUSELAST) ||
              type == WM_MOUSEWHEEL || type == (int)WM95_MOUSEWHEEL ||
              type == WM_MOUSELEAVE ||
              (type >= WM_KEYFIRST && type <= WM_KEYLAST)
-#ifndef Q_OS_WINCE
+#ifndef Q_WS_WINCE
             || type == WM_NCMOUSEMOVE
 #endif
          ) {
             if (type == WM_MOUSEMOVE
-#ifndef Q_OS_WINCE
+#ifndef Q_WS_WINCE
                  || type == WM_NCMOUSEMOVE
 #endif
             ) {
@@ -2685,7 +2685,7 @@ bool qt_try_modal(QWidget *widget, MSG *msg, int& ret)
         } else if (type == WM_CLOSE) {
             block_event = true;
         }
-#ifndef Q_OS_WINCE
+#ifndef Q_WS_WINCE
     else if (type == WM_MOUSEACTIVATE || type == WM_NCLBUTTONDOWN){
         if (!top->isActiveWindow()) {
             top->activateWindow();
@@ -2843,7 +2843,7 @@ static const ushort mouseTbl[] = {
     WM_XBUTTONUP,        QEvent::MouseButtonRelease,      Qt::XButton1,
     WM_XBUTTONDBLCLK,    QEvent::MouseButtonDblClick,     Qt::XButton1,
 
-#ifndef Q_OS_WINCE
+#ifndef Q_WS_WINCE
     WM_NCMOUSEMOVE,      QEvent::NonClientAreaMouseMove,           0,
     WM_NCLBUTTONDOWN,    QEvent::NonClientAreaMouseButtonPress,    Qt::LeftButton,
     WM_NCLBUTTONUP,      QEvent::NonClientAreaMouseButtonRelease,  Qt::LeftButton,
@@ -3643,7 +3643,7 @@ bool QETWidget::translateConfigEvent(const MSG &msg)
         WORD b = HIWORD(msg.lParam);
         QSize oldSize = size();
         QSize newSize(a, b);
-#ifdef Q_OS_WINCE_WM
+#ifdef Q_WS_WINCE_WM
         if (isFullScreen() && (oldSize.width() == newSize.height()) && (oldSize.height() == newSize.width()))
             qt_wince_hide_taskbar(internalWinId());
 #endif
@@ -3655,7 +3655,7 @@ bool QETWidget::translateConfigEvent(const MSG &msg)
             // Capture SIZE_MINIMIZED without preceding WM_SYSCOMMAND
             // (like Windows+M)
             if (msg.wParam == SIZE_MINIMIZED && !isMinimized()) {
-#ifndef Q_OS_WINCE
+#ifndef Q_WS_WINCE
                 const QString title = windowIconText();
                 if (!title.isEmpty())
                     d_func()->setWindowTitle_helper(title);
@@ -3667,7 +3667,7 @@ bool QETWidget::translateConfigEvent(const MSG &msg)
                     hideChildren(true);
                 }
             } else if (msg.wParam != SIZE_MINIMIZED && isMinimized()) {
-#ifndef Q_OS_WINCE
+#ifndef Q_WS_WINCE
                 const QString title = windowTitle();
                 if (!title.isEmpty())
                     d_func()->setWindowTitle_helper(title);
@@ -3713,7 +3713,7 @@ bool QETWidget::translateConfigEvent(const MSG &msg)
         QPoint oldPos = geometry().topLeft();
         QPoint newCPos(a, b);
         // Ignore silly Windows move event to wild pos after iconify.
-#if !defined(Q_OS_WINCE)
+#if !defined(Q_WS_WINCE)
         if (!IsIconic(internalWinId()) && newCPos != oldPos) {
 #endif
             cr.moveTopLeft(newCPos);
@@ -3725,7 +3725,7 @@ bool QETWidget::translateConfigEvent(const MSG &msg)
                 QMoveEvent * e = new QMoveEvent(newCPos, oldPos);
                 QApplication::postEvent(this, e);
             }
-#if !defined(Q_OS_WINCE)
+#if !defined(Q_WS_WINCE)
         }
 #endif
     }
@@ -3767,7 +3767,7 @@ int QApplication::cursorFlashTime()
 
 void QApplication::setDoubleClickInterval(int ms)
 {
-#ifndef Q_OS_WINCE
+#ifndef Q_WS_WINCE
     SetDoubleClickTime(ms);
 #endif
     QApplicationPrivate::mouse_double_click_time = ms;
diff --git a/src/gui/kernel/qcursor_win.cpp b/src/gui/kernel/qcursor_win.cpp
index 85d5a11500..a475882239 100644
--- a/src/gui/kernel/qcursor_win.cpp
+++ b/src/gui/kernel/qcursor_win.cpp
@@ -66,7 +66,7 @@ QCursorData::~QCursorData()
 {
     delete bm;
     delete bmm;
-#if !defined(Q_OS_WINCE) || defined(GWES_ICONCURS)
+#if !defined(Q_WS_WINCE) || defined(GWES_ICONCURS)
     if (hcurs)
         DestroyCursor(hcurs);
 #endif
@@ -129,7 +129,7 @@ extern HBITMAP qt_createIconMask(const QBitmap &bitmap);
 static HCURSOR create32BitCursor(const QPixmap &pixmap, int hx, int hy)
 {
     HCURSOR cur = 0;
-#if !defined(Q_OS_WINCE)
+#if !defined(Q_WS_WINCE)
     QBitmap mask = pixmap.mask();
     if (mask.isNull()) {
         mask = QBitmap(pixmap.size());
@@ -407,7 +407,7 @@ void QCursorData::update()
         }
         int n = qMax(1, bbits.width() / 8);
         int h = bbits.height();
-#if !defined(Q_OS_WINCE)
+#if !defined(Q_WS_WINCE)
         uchar* xBits = new uchar[h * n];
         uchar* xMask = new uchar[h * n];
         int x = 0;
@@ -430,7 +430,7 @@ void QCursorData::update()
                                    xBits, xMask);
         delete [] xBits;
         delete [] xMask;
-#elif defined(GWES_ICONCURS) // Q_OS_WINCE
+#elif defined(GWES_ICONCURS) // Q_WS_WINCE
         // Windows CE only supports fixed cursor size.
         int sysW = GetSystemMetrics(SM_CXCURSOR);
         int sysH = GetSystemMetrics(SM_CYCURSOR);
diff --git a/src/gui/kernel/qdesktopwidget_win.cpp b/src/gui/kernel/qdesktopwidget_win.cpp
index 725e985870..b9e2e1ea7b 100644
--- a/src/gui/kernel/qdesktopwidget_win.cpp
+++ b/src/gui/kernel/qdesktopwidget_win.cpp
@@ -45,7 +45,7 @@
 #include "qlibrary.h"
 #include <qvector.h>
 #include <limits.h>
-#ifdef Q_OS_WINCE
+#ifdef Q_WS_WINCE
 #include <sipapi.h>
 #endif
 #include "qwidget_p.h"
@@ -92,7 +92,7 @@ QVector<QRect> *QDesktopWidgetPrivate::rects = 0;
 QVector<QRect> *QDesktopWidgetPrivate::workrects = 0;
 static int screen_number = 0;
 int QDesktopWidgetPrivate::refcount = 0;
-#ifdef Q_OS_WINCE_WM
+#ifdef Q_WS_WINCE_WM
 // Use SIP information, if available
 // SipGetInfo is not supported by SSDK (no definition!). 
 static inline void qt_get_sip_info(QRect &rect)
@@ -208,7 +208,7 @@ void QDesktopWidgetPrivate::init(QDesktopWidget *that)
         SystemParametersInfo(SPI_GETWORKAREA, 0, &r, 0);
         QRect qr = QRect(QPoint(r.left, r.top), QPoint(r.right - 1, r.bottom - 1));
 
-#if defined(Q_OS_WINCE_WM)
+#if defined(Q_WS_WINCE_WM)
         qt_get_sip_info(qr);
 #endif
 
@@ -222,7 +222,7 @@ void QDesktopWidgetPrivate::init(QDesktopWidget *that)
     enumDisplayMonitors(0, 0, enumCallback, 0);
     enumDisplayMonitors = 0;
     getMonitorInfo = 0;
-#endif // Q_OS_WINCE
+#endif // Q_WS_WINCE
 }
 
 QDesktopWidgetPrivate::~QDesktopWidgetPrivate()
@@ -303,7 +303,7 @@ QWidget *QDesktopWidget::screen(int /* screen */)
 const QRect QDesktopWidget::availableGeometry(int screen) const
 {
     Q_D(const QDesktopWidget);
-#ifdef Q_OS_WINCE_WM
+#ifdef Q_WS_WINCE_WM
     for(int i=0; i < d->workrects->size(); ++i)
         qt_get_sip_info((*d->workrects)[i]);
 #endif
@@ -385,7 +385,7 @@ void QDesktopWidget::resizeEvent(QResizeEvent *)
 
     QDesktopWidgetPrivate::cleanup();
     QDesktopWidgetPrivate::init(this);
-#ifdef Q_OS_WINCE_WM
+#ifdef Q_WS_WINCE_WM
     for(int i=0; i < d->workrects->size(); ++i)
         qt_get_sip_info((*d->workrects)[i]);
 #endif
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp
index 9f0d2a4c11..dfc8365de1 100644
--- a/src/gui/kernel/qwidget.cpp
+++ b/src/gui/kernel/qwidget.cpp
@@ -1027,7 +1027,7 @@ void QWidgetPrivate::adjustFlags(Qt::WindowFlags &flags, QWidget *w)
     if (customize)
         ; // don't modify window flags if the user explicitely set them.
     else if (type == Qt::Dialog || type == Qt::Sheet)
-#ifndef Q_OS_WINCE
+#ifndef Q_WS_WINCE
         flags |= Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowContextHelpButtonHint | Qt::WindowCloseButtonHint;
 #else
         flags |= Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowCloseButtonHint;
@@ -1094,7 +1094,7 @@ void QWidgetPrivate::init(QWidget *parentWidget, Qt::WindowFlags f)
     if (f & Qt::MSWindowsOwnDC)
         q->setAttribute(Qt::WA_NativeWindow);
 
-#ifdef Q_OS_WINCE
+#ifdef Q_WS_WINCE
     data.window_state_internal = 0;
 #endif
 
@@ -4201,7 +4201,7 @@ const QPalette &QWidget::palette() const
     if (!isEnabled()) {
         data->pal.setCurrentColorGroup(QPalette::Disabled);
     } else if ((!isVisible() || isActiveWindow())
-#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
+#if defined(Q_OS_WIN) && !defined(Q_WS_WINCE)
         && !QApplicationPrivate::isBlockedByModal(const_cast<QWidget *>(this))
 #endif
         ) {
@@ -7333,7 +7333,7 @@ QSize QWidgetPrivate::adjustedSize() const
 #else // all others
         QRect screen = QApplication::desktop()->screenGeometry(q->pos());
 #endif
-#if defined (Q_OS_WINCE)
+#if defined (Q_WS_WINCE)
         s.setWidth(qMin(s.width(), screen.width()));
         s.setHeight(qMin(s.height(), screen.height()));
 #else
diff --git a/src/gui/kernel/qwidget.h b/src/gui/kernel/qwidget.h
index 309463e235..6703d26517 100644
--- a/src/gui/kernel/qwidget.h
+++ b/src/gui/kernel/qwidget.h
@@ -130,7 +130,7 @@ public:
     int alloc_region_index;
 //    int alloc_region_revision;
 #endif
-#if defined(Q_OS_WINCE)
+#if defined(Q_WS_WINCE)
     uint window_state_internal : 4;
 #endif
     QRect wrect;
@@ -469,7 +469,7 @@ public Q_SLOTS:
 
     virtual void setVisible(bool visible);
     inline void setHidden(bool hidden) { setVisible(!hidden); }
-#ifndef Q_OS_WINCE
+#ifndef Q_WS_WINCE
     inline void show() { setVisible(true); }
 #else
     void show();
diff --git a/src/gui/kernel/qwidget_win.cpp b/src/gui/kernel/qwidget_win.cpp
index 7374994e0a..cfdabaf1c5 100644
--- a/src/gui/kernel/qwidget_win.cpp
+++ b/src/gui/kernel/qwidget_win.cpp
@@ -62,7 +62,7 @@
 #include <private/qwininputcontext_p.h>
 #include <private/qpaintengine_raster_p.h>
 
-#if defined(Q_OS_WINCE)
+#if defined(Q_WS_WINCE)
 #include "qguifunctions_wince.h"
 QT_USE_NAMESPACE
 extern void qt_wince_maximize(QWidget *widget);                          //defined in qguifunctions_wince.cpp
@@ -251,7 +251,7 @@ extern "C" LRESULT CALLBACK QtWndProc(HWND, UINT, WPARAM, LPARAM);
   QWidget member functions
  *****************************************************************************/
 
-#ifndef Q_OS_WINCE
+#ifndef Q_WS_WINCE
 void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyOldWindow)
 {
     Q_Q(QWidget);
@@ -540,7 +540,7 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
     }
 }
 
-#endif //Q_OS_WINCE
+#endif //Q_WS_WINCE
 
 
 void QWidget::destroy(bool destroyWindow, bool destroySubWindows)
@@ -568,7 +568,7 @@ void QWidget::destroy(bool destroyWindow, bool destroySubWindows)
         if (destroyWindow && !(windowType() == Qt::Desktop) && internalWinId()) {
             DestroyWindow(internalWinId());
         }
-#ifdef Q_OS_WINCE
+#ifdef Q_WS_WINCE
         if (destroyWindow && (windowType() == Qt::Desktop) && !GetDesktopWindow()) {
             DestroyWindow(internalWinId());
         }
@@ -675,7 +675,7 @@ void QWidgetPrivate::setParent_sys(QWidget *parent, Qt::WindowFlags f)
             EnableMenuItem(systemMenu, SC_CLOSE, MF_BYCOMMAND|MF_GRAYED);
     }
 
-#ifdef Q_OS_WINCE
+#ifdef Q_WS_WINCE
     // Show borderless toplevel windows in tasklist & NavBar
     if (!parent) {
         QString txt = q->windowTitle().isEmpty()?qAppName():q->windowTitle();
@@ -871,12 +871,12 @@ QCursor *qt_grab_cursor()
 }
 
 // The procedure does nothing, but is required for mousegrabbing to work
-#ifndef Q_OS_WINCE
+#ifndef Q_WS_WINCE
 LRESULT CALLBACK qJournalRecordProc(int nCode, WPARAM wParam, LPARAM lParam)
 {
     return CallNextHookEx(journalRec, nCode, wParam, lParam);
 }
-#endif //Q_OS_WINCE
+#endif //Q_WS_WINCE
 
 /* Works only as long as pointer is inside the application's window,
    which is good enough for QDockWidget.
@@ -899,7 +899,7 @@ void QWidgetPrivate::grabMouseWhileInWindow()
     }
 }
 
-#ifndef Q_OS_WINCE
+#ifndef Q_WS_WINCE
 void QWidget::grabMouse()
 {
     if (!qt_nograb()) {
@@ -976,7 +976,7 @@ void QWidget::activateWindow()
     SetForegroundWindow(window()->internalWinId());
 }
 
-#ifndef Q_OS_WINCE
+#ifndef Q_WS_WINCE
 void QWidget::setWindowState(Qt::WindowStates newstate)
 {
     Q_D(QWidget);
@@ -1078,7 +1078,7 @@ void QWidget::setWindowState(Qt::WindowStates newstate)
     QWindowStateChangeEvent e(oldstate);
     QApplication::sendEvent(this, &e);
 }
-#endif //Q_OS_WINCE
+#endif //Q_WS_WINCE
 
 
 /*
@@ -1091,7 +1091,7 @@ void QWidgetPrivate::hide_sys()
     Q_Q(QWidget);
     deactivateWidgetCleanup();
     Q_ASSERT(q->testAttribute(Qt::WA_WState_Created));
-#ifdef Q_OS_WINCE
+#ifdef Q_WS_WINCE
     if (!qt_wince_is_mobile() && q->isFullScreen()) {
         HWND handle = FindWindow(L"HHTaskBar", L"");
         if (handle) {
@@ -1120,7 +1120,7 @@ void QWidgetPrivate::hide_sys()
   \internal
   Platform-specific part of QWidget::show().
 */
-#ifndef Q_OS_WINCE
+#ifndef Q_WS_WINCE
 void QWidgetPrivate::show_sys()
 {
     Q_Q(QWidget);
@@ -1188,7 +1188,7 @@ void QWidgetPrivate::show_sys()
 
     invalidateBuffer(q->rect());
 }
-#endif //Q_OS_WINCE
+#endif //Q_WS_WINCE
 
 void QWidgetPrivate::setFocus_sys()
 {
@@ -1446,7 +1446,7 @@ void QWidgetPrivate::setGeometry_sys(int x, int y, int w, int h, bool isMove)
                 show_sys();
             } else if (!q->testAttribute(Qt::WA_DontShowOnScreen)) {
                 q->setAttribute(Qt::WA_OutsideWSRange, false);
-#ifndef Q_OS_WINCE
+#ifndef Q_WS_WINCE
                 // If the window is hidden and in maximized state or minimized, instead of moving the
                 // window, set the normal position of the window.
                 WINDOWPLACEMENT wndpl;
@@ -1565,7 +1565,7 @@ bool QWidgetPrivate::shouldShowMaximizeButton()
 
 void QWidgetPrivate::winUpdateIsOpaque()
 {
-#ifndef Q_OS_WINCE
+#ifndef Q_WS_WINCE
     Q_Q(QWidget);
 
     if (!q->isWindow() || !q->testAttribute(Qt::WA_TranslucentBackground))
@@ -1586,7 +1586,7 @@ void QWidgetPrivate::winUpdateIsOpaque()
 
 void QWidgetPrivate::setConstraints_sys()
 {
-#ifndef Q_OS_WINCE_WM
+#ifndef Q_WS_WINCE_WM
     Q_Q(QWidget);
     if (q->isWindow() && q->testAttribute(Qt::WA_WState_Created)) {
         int style = GetWindowLongA(q->internalWinId(), GWL_STYLE);
@@ -1704,7 +1704,7 @@ int QWidget::metric(PaintDeviceMetric m) const
     return val;
 }
 
-#ifndef Q_OS_WINCE
+#ifndef Q_WS_WINCE
 void QWidgetPrivate::createSysExtra()
 {
 #ifndef QT_NO_DRAGANDDROP
@@ -1715,7 +1715,7 @@ void QWidgetPrivate::createSysExtra()
 void QWidgetPrivate::deleteSysExtra()
 {
 }
-#endif //Q_OS_WINCE
+#endif //Q_WS_WINCE
 
 void QWidgetPrivate::createTLSysExtra()
 {
@@ -1866,7 +1866,7 @@ void QWidgetPrivate::updateFrameStrut()
                                 GetWindowLongA(q->internalWinId(), GWL_EXSTYLE));
     uint style = QT_WA_INLINE(GetWindowLongW(q->internalWinId(), GWL_STYLE),
                               GetWindowLongA(q->internalWinId(), GWL_STYLE));
-#ifndef Q_OS_WINCE
+#ifndef Q_WS_WINCE
     if (AdjustWindowRectEx(&rect, style & ~(WS_OVERLAPPED), FALSE, exstyle)) {
 #else
     if (AdjustWindowRectEx(&rect, style, FALSE, exstyle)) {
@@ -1876,7 +1876,7 @@ void QWidgetPrivate::updateFrameStrut()
     }
 }
 
-#ifndef Q_OS_WINCE
+#ifndef Q_WS_WINCE
 void QWidgetPrivate::setWindowOpacity_sys(qreal level)
 {
     Q_Q(QWidget);
@@ -1911,7 +1911,7 @@ void QWidgetPrivate::setWindowOpacity_sys(qreal level)
     }
     (*ptrSetLayeredWindowAttributes)(q->internalWinId(), 0, (int)(level * 255), Q_LWA_ALPHA);
 }
-#endif //Q_OS_WINCE
+#endif //Q_WS_WINCE
 
 // class QGlobalRasterPaintEngine: public QRasterPaintEngine
 // {
@@ -2072,6 +2072,6 @@ void QWidgetPrivate::setModal_sys()
 
 QT_END_NAMESPACE
 
-#ifdef Q_OS_WINCE
+#ifdef Q_WS_WINCE
 #       include "qwidget_wince.cpp"
 #endif
diff --git a/src/gui/kernel/qwidget_wince.cpp b/src/gui/kernel/qwidget_wince.cpp
index bb9681e486..cca928e976 100644
--- a/src/gui/kernel/qwidget_wince.cpp
+++ b/src/gui/kernel/qwidget_wince.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#ifdef Q_OS_WINCE
+#ifdef Q_WS_WINCE
 
 #include "qguifunctions_wince.h"
 
@@ -211,7 +211,7 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
                 style |= WS_SYSMENU;
             if (flags & Qt::WindowContextHelpButtonHint)
                 exsty |= WS_EX_CONTEXTHELP;
-#ifndef Q_OS_WINCE_WM
+#ifndef Q_WS_WINCE_WM
             if (flags & Qt::WindowMinimizeButtonHint)
                 style |= WS_MINIMIZEBOX;
             if (shouldShowMaximizeButton())
@@ -414,7 +414,7 @@ void QWidgetPrivate::show_sys() {
     int sm = SW_SHOW;
     bool fakedMaximize = false;
     if (q->isWindow()) {
-#ifndef Q_OS_WINCE_WM
+#ifndef Q_WS_WINCE_WM
         if (q->isMinimized()) {
             sm = SW_SHOWMINIMIZED;
         } else if (q->isMaximized()) {
@@ -450,7 +450,7 @@ void QWidgetPrivate::show_sys() {
     if (q->isMaximized() && q->isWindow())
         qt_wince_maximize(q);
 
-#ifndef Q_OS_WINCE_WM
+#ifndef Q_WS_WINCE_WM
     if (!qt_wince_is_mobile() && q->isFullScreen()) {
         HWND handle = FindWindow(L"HHTaskBar", L"");
         if (handle) {
@@ -583,7 +583,7 @@ void QWidget::setWindowState(Qt::WindowStates newstate)
         }
         if ((newstate & Qt::WindowMaximized) && !(newstate & Qt::WindowFullScreen)) {
             QRect r = d->topData()->normalGeometry;
-#ifdef Q_OS_WINCE_WM
+#ifdef Q_WS_WINCE_WM
             if (!inherits("QDialog") && !inherits("QMdiArea") && !isVisible()) {
                 d->data.crect.setRect(0, 0, -1, -1);
             }
@@ -704,4 +704,4 @@ void QWidget::show()
 
 QT_END_NAMESPACE
 
-#endif Q_OS_WINCE
+#endif // Q_WS_WINCE