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

 Conflicts:
	.qmake.conf
	src/3rdparty/protocol/qt_attribution.json
	src/client/qwaylandintegration.cpp

Change-Id: I475889f2817c7094b68a2948fdd34ddf8b0c486f

1 files changed, 1 insertions, 8 deletions

diff --git a/src/client/qwaylandwindow_p.h b/src/client/qwaylandwindow_p.h
index 52cbc3e59..146767a1e 100644
--- a/src/client/qwaylandwindow_p.h
+++ b/src/client/qwaylandwindow_p.h
@@ -193,10 +193,7 @@ public:
 
     bool startSystemMove(const QPoint &pos) override;
 
-    void timerEvent(QTimerEvent *event) override;
     void requestUpdate() override;
-    void handleUpdate();
-    void deliverUpdateRequest() override;
 
 public slots:
     void applyConfigure();
@@ -216,14 +213,10 @@ protected:
     Qt::MouseButtons mMousePressedInContentArea = Qt::NoButton;
 
     WId mWindowId;
-    bool mWaitingForFrameCallback = false;
+    bool mWaitingForFrameSync = false;
     struct ::wl_callback *mFrameCallback = nullptr;
     QWaitCondition mFrameSyncWait;
 
-    // True when we have called deliverRequestUpdate, but the client has not yet attached a new buffer
-    bool mWaitingForUpdate = false;
-    int mFallbackUpdateTimerId = -1;
-
     QMutex mResizeLock;
     bool mWaitingToApplyConfigure = false;
     bool mCanResize = true;