From 7436638b51ef7b121afd5ea8135e4a3ce5913fa4 Mon Sep 17 00:00:00 2001 From: Jan Arve Saether Date: Wed, 20 Jul 2016 16:42:40 +0200 Subject: 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 --- src/quick/items/qquickwindow_p.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'src/quick/items/qquickwindow_p.h') diff --git a/src/quick/items/qquickwindow_p.h b/src/quick/items/qquickwindow_p.h index 7e66aef9f4..15ac701c54 100644 --- a/src/quick/items/qquickwindow_p.h +++ b/src/quick/items/qquickwindow_p.h @@ -154,7 +154,6 @@ public: #ifndef QT_NO_GESTURES bool deliverNativeGestureEvent(QQuickItem *, QNativeGestureEvent *); #endif - static QQuickPointerDevice *touchDevice(QTouchDevice *d); // entry point of events to the window void handleTouchEvent(QTouchEvent *); @@ -274,10 +273,6 @@ public: mutable QQuickWindowIncubationController *incubationController; - static QQuickPointerDevice *genericMouseDevice; - static QHash touchDevices; - static QHash tabletDevices; - static bool defaultAlphaBuffer; static bool dragOverThreshold(qreal d, Qt::Axis axis, QMouseEvent *event, int startDragThreshold = -1); -- cgit v1.2.3