diff options
author | Jan Arve Saether <jan-arve.saether@qt.io> | 2016-07-20 16:42:40 +0200 |
---|---|---|
committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2016-07-23 06:49:54 +0000 |
commit | 7436638b51ef7b121afd5ea8135e4a3ce5913fa4 (patch) | |
tree | d34ce24c6bdc4d5a91fde55cdb149cd4e16ae7dc /src/quick/items/qquickevents_p_p.h | |
parent | a5e7897dd7705a9df3a97e5de75b5b95d6a88e25 (diff) |
Use Q_GLOBAL_STATIC instead of static members of QWindowPrivate
Having the members static in QWindowPrivate only gives the benefit of
tidyness, but there's still the problem of initialization order and
thread-safety.
Q_GLOBAL_STATIC solves those issues for us.
Change-Id: I8e1279959d0bb2b16fd720cb7f4e9afb6eda6355
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/quick/items/qquickevents_p_p.h')
-rw-r--r-- | src/quick/items/qquickevents_p_p.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/quick/items/qquickevents_p_p.h b/src/quick/items/qquickevents_p_p.h index 9e37955914..f2e06b69df 100644 --- a/src/quick/items/qquickevents_p_p.h +++ b/src/quick/items/qquickevents_p_p.h @@ -499,6 +499,10 @@ public: qint64 uniqueId() const { return m_uniqueId; } QQuickPointerEvent *pointerEvent() const { return m_event; } + static QQuickPointerDevice *touchDevice(QTouchDevice *d); + static QQuickPointerDevice *genericMouseDevice(); + static QQuickPointerDevice *tabletDevice(qint64); + private: DeviceType m_deviceType; PointerType m_pointerType; |