AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make qtbase compile with QT_NO_GESTURES

Browse Source 
Change-Id: I90f173265e177ff37ce80da3983080651856259d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
This commit is contained in:
Tasuku Suzuki 2014-01-03 14:38:12 +09:00 committed by The Qt Project
parent 263fdd15da
commit f568e43e10
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/kernel/qguiapplication.cpp
View File

@ -1473,10 +1473,12 @@ void QGuiApplicationPrivate::processWindowSystemEvent(QWindowSystemInterfacePriv
QGuiApplicationPrivate::processTabletLeaveProximityEvent( QGuiApplicationPrivate::processTabletLeaveProximityEvent(
static_cast<QWindowSystemInterfacePrivate::TabletLeaveProximityEvent *>(e)); static_cast<QWindowSystemInterfacePrivate::TabletLeaveProximityEvent *>(e));
break; break;
#ifndef QT_NO_GESTURES
case QWindowSystemInterfacePrivate::Gesture: case QWindowSystemInterfacePrivate::Gesture:
QGuiApplicationPrivate::processGestureEvent( QGuiApplicationPrivate::processGestureEvent(
static_cast<QWindowSystemInterfacePrivate::GestureEvent *>(e)); static_cast<QWindowSystemInterfacePrivate::GestureEvent *>(e));
break; break;
#endif
case QWindowSystemInterfacePrivate::PlatformPanel: case QWindowSystemInterfacePrivate::PlatformPanel:
QGuiApplicationPrivate::processPlatformPanelEvent( QGuiApplicationPrivate::processPlatformPanelEvent(
static_cast<QWindowSystemInterfacePrivate::PlatformPanelEvent *>(e)); static_cast<QWindowSystemInterfacePrivate::PlatformPanelEvent *>(e));

3
src/gui/kernel/qguiapplication_p.h
View File

@ -148,7 +148,10 @@ public:
static void processTabletEvent(QWindowSystemInterfacePrivate::TabletEvent *e); static void processTabletEvent(QWindowSystemInterfacePrivate::TabletEvent *e);
static void processTabletEnterProximityEvent(QWindowSystemInterfacePrivate::TabletEnterProximityEvent *e); static void processTabletEnterProximityEvent(QWindowSystemInterfacePrivate::TabletEnterProximityEvent *e);
static void processTabletLeaveProximityEvent(QWindowSystemInterfacePrivate::TabletLeaveProximityEvent *e); static void processTabletLeaveProximityEvent(QWindowSystemInterfacePrivate::TabletLeaveProximityEvent *e);
#ifndef QT_NO_GESTURES
static void processGestureEvent(QWindowSystemInterfacePrivate::GestureEvent *e); static void processGestureEvent(QWindowSystemInterfacePrivate::GestureEvent *e);
#endif
static void processPlatformPanelEvent(QWindowSystemInterfacePrivate::PlatformPanelEvent *e); static void processPlatformPanelEvent(QWindowSystemInterfacePrivate::PlatformPanelEvent *e);
#ifndef QT_NO_CONTEXTMENU #ifndef QT_NO_CONTEXTMENU

4
src/gui/kernel/qwindowsysteminterface_p.h
View File

@ -91,7 +91,9 @@ public:
PlatformPanel = UserInputEvent | 0x17, PlatformPanel = UserInputEvent | 0x17,
ContextMenu = UserInputEvent | 0x18, ContextMenu = UserInputEvent | 0x18,
EnterWhatsThisMode = UserInputEvent | 0x19, EnterWhatsThisMode = UserInputEvent | 0x19,
#ifndef QT_NO_GESTURES
Gesture = UserInputEvent | 0x1a, Gesture = UserInputEvent | 0x1a,
#endif
ApplicationStateChanged = 0x19, ApplicationStateChanged = 0x19,
FlushEvents = 0x20, FlushEvents = 0x20,
WindowScreenChanged = 0x21 WindowScreenChanged = 0x21
@ -400,6 +402,7 @@ public:
}; };
#endif #endif
#ifndef QT_NO_GESTURES
class GestureEvent : public InputEvent { class GestureEvent : public InputEvent {
public: public:
GestureEvent(QWindow *window, ulong time, Qt::NativeGestureType type, QPointF pos, QPointF globalPos) GestureEvent(QWindow *window, ulong time, Qt::NativeGestureType type, QPointF pos, QPointF globalPos)
@ -414,6 +417,7 @@ public:
ulong sequenceId; ulong sequenceId;
quint64 intValue; quint64 intValue;
}; };
#endif
class WindowSystemEventList { class WindowSystemEventList {
QList<WindowSystemEvent *> impl; QList<WindowSystemEvent *> impl;