diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-12 13:59:19 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-12 14:01:46 +0200 |
| commit | 73bc91c9dfc66b5cd1a89c75b414c0573bc35c2a (patch) | |
| tree | 6bda1e09322e0ff4638783cff8c6bcfb35a173ce /src/plugins/platforms/winrt/qwinrtscreen.h | |
| parent | 793b7e80083d77b0804a40b5732a8888c9ce5cd8 (diff) | |
| parent | 9bde391da4a36a612d38fb0041f5ab2e262741b1 (diff) | |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: I9300572e2b74f0564b2589cbd0fbdf24850f68df
Diffstat (limited to 'src/plugins/platforms/winrt/qwinrtscreen.h')
| -rw-r--r-- | src/plugins/platforms/winrt/qwinrtscreen.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/plugins/platforms/winrt/qwinrtscreen.h b/src/plugins/platforms/winrt/qwinrtscreen.h index c6511e9446..753d89541c 100644 --- a/src/plugins/platforms/winrt/qwinrtscreen.h +++ b/src/plugins/platforms/winrt/qwinrtscreen.h @@ -101,12 +101,6 @@ class QWinRTPageFlipper; class QWinRTCursor; class QWinRTInputContext; -struct Pointer { - enum Type { Unknown, Mouse, TouchScreen, Tablet }; - Type type; - QTouchDevice *device; -}; - class QWinRTScreen : public QPlatformScreen { public: @@ -165,6 +159,7 @@ private: ABI::Windows::UI::Core::ICoreWindow *m_coreWindow; ABI::Windows::UI::ViewManagement::IApplicationViewStatics *m_applicationView; ABI::Windows::ApplicationModel::Core::ICoreApplication *m_application; + QRect m_geometry; QImage::Format m_format; QSurfaceFormat m_surfaceFormat; @@ -183,7 +178,7 @@ private: #ifndef Q_OS_WINPHONE QHash<quint32, QPair<Qt::Key, QString> > m_activeKeys; #endif - QHash<quint32, Pointer> m_pointers; + QTouchDevice *m_touchDevice; QHash<quint32, QWindowSystemInterface::TouchPoint> m_touchPoints; }; |