diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-10-20 16:36:05 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-21 21:29:46 +0200 |
commit | fc14bd2c92d42aa055ce634e246820cef426ec9c (patch) | |
tree | 1403dd2d11621d36a4d2a7ec2e986a5b85bcbf2d /src/widgets/util | |
parent | c7df1af337e0d5a013a2f1c17bb14df083769410 (diff) |
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>
Diffstat (limited to 'src/widgets/util')
-rw-r--r-- | src/widgets/util/qflickgesture.cpp | 12 | ||||
-rw-r--r-- | src/widgets/util/util.pri | 25 |
2 files changed, 4 insertions, 33 deletions
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 } |