From 4b566e5db926470499bb9171b336f5e526e40bba Mon Sep 17 00:00:00 2001
From: Olli Werwolff <qt-info@nokia.com>
Date: Wed, 8 Jun 2011 11:48:38 +0200
Subject: Most checks for windows in widgets have to be ws specific

Reviewed-by: Samuel
Reviewed-by: Lars Knoll
---
 src/widgets/widgets/qdockwidget.cpp | 6 +++---
 src/widgets/widgets/qtoolbar.cpp    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/widgets/widgets')

diff --git a/src/widgets/widgets/qdockwidget.cpp b/src/widgets/widgets/qdockwidget.cpp
index 6e37683020..53e007aea5 100644
--- a/src/widgets/widgets/qdockwidget.cpp
+++ b/src/widgets/widgets/qdockwidget.cpp
@@ -854,7 +854,7 @@ bool QDockWidgetPrivate::mouseMoveEvent(QMouseEvent *event)
             && (event->pos() - state->pressPos).manhattanLength()
                 > QApplication::startDragDistance()) {
             startDrag();
-#ifdef Q_OS_WIN
+#ifdef Q_WS_WIN
             grabMouseWhileInWindow();
 #else
             q->grabMouse();
@@ -925,7 +925,7 @@ void QDockWidgetPrivate::nonClientAreaMouseEvent(QMouseEvent *event)
             initDrag(event->pos(), true);
             if (state == 0)
                 break;
-#ifdef Q_OS_WIN
+#ifdef Q_WS_WIN
             // On Windows, NCA mouse events don't contain modifier info
             state->ctrlDrag = GetKeyState(VK_CONTROL) & 0x8000;
 #else
@@ -1433,7 +1433,7 @@ bool QDockWidget::event(QEvent *event)
         if (d->mouseMoveEvent(static_cast<QMouseEvent *>(event)))
             return true;
         break;
-#ifdef Q_OS_WIN
+#ifdef Q_WS_WIN
     case QEvent::Leave:
         if (d->state != 0 && d->state->dragging && !d->state->nca) {
             // This is a workaround for loosing the mouse on Vista.
diff --git a/src/widgets/widgets/qtoolbar.cpp b/src/widgets/widgets/qtoolbar.cpp
index e0e8ce603a..7527baa518 100644
--- a/src/widgets/widgets/qtoolbar.cpp
+++ b/src/widgets/widgets/qtoolbar.cpp
@@ -354,7 +354,7 @@ bool QToolBarPrivate::mouseMoveEvent(QMouseEvent *event)
 
             startDrag(moving);
             if (!moving && !wasDragging) {
-#ifdef Q_OS_WIN
+#ifdef Q_WS_WIN
                 grabMouseWhileInWindow();
 #else
                 q->grabMouse();
-- 
cgit v1.2.3