diff options
| author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2019-10-19 03:02:05 +0200 |
|---|---|---|
| committer | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2019-10-21 09:23:06 +0200 |
| commit | 29fcb97446ae2c1d89e537f3a04c5a87a275e3bd (patch) | |
| tree | a53fb92cbf40f9c167e821676c5780727a50ce10 /src/client/qwaylandwindow_p.h | |
| parent | bb1b46a4862e0a562b8f55e3410394492bd48b1f (diff) | |
| parent | 9f5b96225885f927727a57b6123d8550d6c373bb (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
src/client/qwaylandwindow.cpp
tests/auto/compositor/compositor/tst_compositor.cpp
Change-Id: Iacfcae577a4a99c847694ae3a2c6e3e9ae050817
Diffstat (limited to 'src/client/qwaylandwindow_p.h')
| -rw-r--r-- | src/client/qwaylandwindow_p.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/client/qwaylandwindow_p.h b/src/client/qwaylandwindow_p.h index 52e57c72a..5f15ca304 100644 --- a/src/client/qwaylandwindow_p.h +++ b/src/client/qwaylandwindow_p.h @@ -229,7 +229,6 @@ protected: // True when we have called deliverRequestUpdate, but the client has not yet attached a new buffer bool mWaitingForUpdate = false; - int mFallbackUpdateTimerId = -1; // Started when waiting for app to commit QMutex mResizeLock; bool mWaitingToApplyConfigure = false; |