Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into windows-7-multitouch

1 files changed, 49 insertions, 49 deletions

diff --git a/src/gui/kernel/qapplication_win.cpp b/src/gui/kernel/qapplication_win.cpp
index c7ecdae..9b756a6 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
@@ -107,7 +107,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>
@@ -189,7 +189,7 @@ static PtrFlashWindowEx pFlashWindowEx = 0;
 
 QT_BEGIN_NAMESPACE
 
-#ifdef Q_OS_WINCE
+#ifdef Q_WS_WINCE
 #ifndef SHRG_RETURNCMD
 struct SHRGINFO {
     DWORD cbSize;
@@ -300,7 +300,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
 
@@ -531,7 +531,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));
@@ -607,7 +607,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;
@@ -659,7 +659,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()
@@ -787,7 +787,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
@@ -800,7 +800,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
@@ -812,7 +812,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
 
@@ -826,7 +826,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);
@@ -846,7 +846,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;
@@ -854,7 +854,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
 
@@ -913,7 +913,7 @@ void qt_cleanup()
     delete QApplicationPrivate::inputContext;
     QApplicationPrivate::inputContext = 0;
 
-#ifndef Q_OS_WINCE
+#ifndef Q_WS_WINCE
   // Deinitialize OLE/COM
     OleUninitialize();
 #endif
@@ -961,7 +961,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;
@@ -976,14 +976,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
@@ -996,7 +996,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)
@@ -1041,7 +1041,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;
@@ -1421,7 +1421,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)
@@ -1472,7 +1472,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
             ;
@@ -1512,7 +1512,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);
@@ -1542,7 +1542,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
@@ -1552,7 +1552,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);
@@ -1603,7 +1603,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
@@ -1705,7 +1705,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)) {
@@ -1938,7 +1938,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)));
@@ -1957,7 +1957,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
@@ -1985,7 +1985,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);
@@ -2008,7 +2008,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);
@@ -2058,7 +2058,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;
@@ -2115,7 +2115,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
@@ -2142,7 +2142,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;
@@ -2231,7 +2231,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;
@@ -2347,7 +2347,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
@@ -2454,7 +2454,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);
@@ -2498,7 +2498,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)) {
@@ -2696,19 +2696,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
             ) {
@@ -2726,7 +2726,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();
@@ -2884,7 +2884,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,
@@ -3684,7 +3684,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
@@ -3696,7 +3696,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);
@@ -3708,7 +3708,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);
@@ -3754,7 +3754,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);
@@ -3766,7 +3766,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
     }
@@ -3808,7 +3808,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;