Merge remote-tracking branch 'origin/5.7' into dev

Conflicts:
	src/compositor/extensions/qwaylandxdgshellintegration.cpp

Change-Id: I3e8666d0c2fd047f12daeb94b2c967c646576ed9

1 files changed, 5 insertions, 0 deletions

diff --git a/src/compositor/extensions/qwaylandquickshellsurfaceitem_p.h b/src/compositor/extensions/qwaylandquickshellsurfaceitem_p.h
index 53c88c965..3cd9bf228 100644
--- a/src/compositor/extensions/qwaylandquickshellsurfaceitem_p.h
+++ b/src/compositor/extensions/qwaylandquickshellsurfaceitem_p.h
@@ -38,6 +38,7 @@
 #define QWAYLANDQUICKSHELLSURFACEITEM_P_H
 
 #include <QtWaylandCompositor/private/qwaylandquickitem_p.h>
+#include <QtCore/QBasicTimer>
 
 #include <functional>
 
@@ -88,6 +89,9 @@ public:
     static void startFilter(QWaylandClient *client, CallbackFunction closePopupCallback);
     static void cancelFilter();
 
+protected:
+    void timerEvent(QTimerEvent *event) Q_DECL_OVERRIDE;
+
 private:
     void stopFilter();
 
@@ -97,6 +101,7 @@ private:
     bool waitForRelease;
     QPointer<QWaylandClient> client;
     CallbackFunction closePopups;
+    QBasicTimer mousePressTimeout;
     static QWaylandQuickShellEventFilter *self;
 };