diff options
Diffstat (limited to 'src/platformsupport/eventdispatchers')
4 files changed, 27 insertions, 5 deletions
diff --git a/src/platformsupport/eventdispatchers/qgenericunixeventdispatcher.cpp b/src/platformsupport/eventdispatchers/qgenericunixeventdispatcher.cpp index 11d9c259d5..2e1d81a181 100644 --- a/src/platformsupport/eventdispatchers/qgenericunixeventdispatcher.cpp +++ b/src/platformsupport/eventdispatchers/qgenericunixeventdispatcher.cpp @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE -class QAbstractEventDispatcher *createUnixEventDispatcher() +class QAbstractEventDispatcher *QtGenericUnixDispatcher::createUnixEventDispatcher() { #if !defined(QT_NO_GLIB) && !defined(Q_OS_WIN) if (qEnvironmentVariableIsEmpty("QT_NO_GLIB") && QEventDispatcherGlib::versionSupported()) diff --git a/src/platformsupport/eventdispatchers/qgenericunixeventdispatcher_p.h b/src/platformsupport/eventdispatchers/qgenericunixeventdispatcher_p.h index adf70adc05..61b4d0515c 100644 --- a/src/platformsupport/eventdispatchers/qgenericunixeventdispatcher_p.h +++ b/src/platformsupport/eventdispatchers/qgenericunixeventdispatcher_p.h @@ -56,7 +56,10 @@ QT_BEGIN_NAMESPACE class QAbstractEventDispatcher; +namespace QtGenericUnixDispatcher { QAbstractEventDispatcher* createUnixEventDispatcher(); +} +using QtGenericUnixDispatcher::createUnixEventDispatcher; QT_END_NAMESPACE diff --git a/src/platformsupport/eventdispatchers/qunixeventdispatcher_qpa_p.h b/src/platformsupport/eventdispatchers/qunixeventdispatcher_qpa_p.h index 23be081ba3..7f775b73ee 100644 --- a/src/platformsupport/eventdispatchers/qunixeventdispatcher_qpa_p.h +++ b/src/platformsupport/eventdispatchers/qunixeventdispatcher_qpa_p.h @@ -56,12 +56,9 @@ QT_BEGIN_NAMESPACE -class QUnixEventDispatcherQPAPrivate; - class QUnixEventDispatcherQPA : public QEventDispatcherUNIX { Q_OBJECT - Q_DECLARE_PRIVATE(QUnixEventDispatcherQPA) public: explicit QUnixEventDispatcherQPA(QObject *parent = 0); diff --git a/src/platformsupport/eventdispatchers/qwindowsguieventdispatcher.cpp b/src/platformsupport/eventdispatchers/qwindowsguieventdispatcher.cpp index aa7bb102c6..3583ead788 100644 --- a/src/platformsupport/eventdispatchers/qwindowsguieventdispatcher.cpp +++ b/src/platformsupport/eventdispatchers/qwindowsguieventdispatcher.cpp @@ -184,7 +184,29 @@ messageDebugEntries[] = { {WM_DRAWCLIPBOARD, "WM_DRAWCLIPBOARD", true}, {WM_THEMECHANGED, "WM_THEMECHANGED", true}, {0x90, "WM_UAHDESTROYWINDOW", true}, - {0x272, "WM_UNREGISTER_WINDOW_SERVICES", true} + {0x272, "WM_UNREGISTER_WINDOW_SERVICES", true}, +#ifdef WM_POINTERUPDATE + {WM_POINTERDEVICECHANGE, "WM_POINTERDEVICECHANGE", true}, + {WM_POINTERDEVICEINRANGE, "WM_POINTERDEVICEINRANGE", true}, + {WM_POINTERDEVICEOUTOFRANGE, "WM_POINTERDEVICEOUTOFRANGE", true}, + {WM_NCPOINTERUPDATE, "WM_NCPOINTERUPDATE", true}, + {WM_NCPOINTERDOWN, "WM_NCPOINTERDOWN", true}, + {WM_NCPOINTERUP, "WM_NCPOINTERUP", true}, + {WM_POINTERUPDATE, "WM_POINTERUPDATE", true}, + {WM_POINTERDOWN, "WM_POINTERDOWN", true}, + {WM_POINTERUP, "WM_POINTERUP", true}, + {WM_POINTERENTER, "WM_POINTERENTER", true}, + {WM_POINTERLEAVE, "WM_POINTERLEAVE", true}, + {WM_POINTERACTIVATE, "WM_POINTERACTIVATE", true}, + {WM_POINTERCAPTURECHANGED, "WM_POINTERCAPTURECHANGED", true}, + {WM_TOUCHHITTESTING, "WM_TOUCHHITTESTING", true}, + {WM_POINTERWHEEL, "WM_POINTERWHEEL", true}, + {WM_POINTERHWHEEL, "WM_POINTERHWHEEL", true}, + {DM_POINTERHITTEST, "DM_POINTERHITTEST", true}, + {WM_POINTERROUTEDTO, "WM_POINTERROUTEDTO", true}, + {WM_POINTERROUTEDAWAY, "WM_POINTERROUTEDAWAY", true}, + {WM_POINTERROUTEDRELEASED, "WM_POINTERROUTEDRELEASED", true} +#endif // WM_POINTERUPDATE }; static inline const MessageDebugEntry *messageDebugEntry(UINT msg) |