From fc14bd2c92d42aa055ce634e246820cef426ec9c Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Thu, 20 Oct 2011 16:36:05 +0200
Subject: Widgets: Remove Q_WS_QPA and qpa-sections from .pro files.

Enable compilation without -qpa.

- Remove conditionals from Q_WS_QPA sections.
- Rename precompiled header.
- Remove gui-related Q_OS_SYMBIAN-#ifdef sections.
- Leave other Q_WS code in for reference.

Change-Id: I16326b631fff483aec8edd2f7a2e7a1822eab814
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
---
 src/widgets/util/qflickgesture.cpp | 12 ------------
 src/widgets/util/util.pri          | 25 ++++---------------------
 2 files changed, 4 insertions(+), 33 deletions(-)

(limited to 'src/widgets/util')

diff --git a/src/widgets/util/qflickgesture.cpp b/src/widgets/util/qflickgesture.cpp
index c92fb94be7..a028b27d72 100644
--- a/src/widgets/util/qflickgesture.cpp
+++ b/src/widgets/util/qflickgesture.cpp
@@ -510,13 +510,7 @@ QGestureRecognizer::Result QFlickGestureRecognizer::recognize(QGesture *state,
         }
         break;
     case QEvent::MouseMove:
-#ifdef Q_OS_SYMBIAN
-        // Qt on Symbian tracks the button state internally, while Qt on Win/Mac/Unix
-        // relies on the windowing system to report the current buttons state.
-        if (me && (me->buttons() == button || !me->buttons())) {
-#else
         if (me && me->buttons() == button) {
-#endif
             point = me->globalPos();
             inputType = QScroller::InputMove;
         }
@@ -539,13 +533,7 @@ QGestureRecognizer::Result QFlickGestureRecognizer::recognize(QGesture *state,
         }
         break;
     case QEvent::GraphicsSceneMouseMove:
-#ifdef Q_OS_SYMBIAN
-        // Qt on Symbian tracks the button state internally, while Qt on Win/Mac/Unix
-        // relies on the windowing system to report the current buttons state.
-        if (gsme && (gsme->buttons() == button || !me->buttons())) {
-#else
         if (gsme && gsme->buttons() == button) {
-#endif
             point = gsme->scenePos();
             inputType = QScroller::InputMove;
         }
diff --git a/src/widgets/util/util.pri b/src/widgets/util/util.pri
index 9deb3b5efc..abfb1d86fe 100644
--- a/src/widgets/util/util.pri
+++ b/src/widgets/util/util.pri
@@ -25,28 +25,11 @@ SOURCES += \
         util/qflickgesture.cpp \
         util/qundogroup.cpp \
         util/qundostack.cpp \
-        util/qundoview.cpp
+        util/qundoview.cpp \
+        util/qsystemtrayicon_qpa.cpp
 
-
-wince* {
-		SOURCES += \
-				util/qsystemtrayicon_wince.cpp
-} else:win32:!qpa {
-		SOURCES += \
-				util/qsystemtrayicon_win.cpp
-}
-
-unix:x11 {
-		SOURCES += \
-				util/qsystemtrayicon_x11.cpp
-}
-
-qpa {
-		SOURCES += \
-                                util/qsystemtrayicon_qpa.cpp
-}
-
-!qpa:!x11:mac {
+# TODO
+false:!x11:mac {
 		OBJECTIVE_SOURCES += util/qsystemtrayicon_mac.mm
 }
 
-- 
cgit v1.2.3