diff options
author | Paul Olav Tvete <paul.tvete@qt.io> | 2018-01-30 10:37:24 +0100 |
---|---|---|
committer | Paul Olav Tvete <paul.tvete@qt.io> | 2018-01-31 10:29:53 +0100 |
commit | 6c1499b227324e29cece5651fa00c812d9e01709 (patch) | |
tree | db9ce6e6bc8c605bd54514954b91b73834249b6f /src/client/qwaylandwindow.cpp | |
parent | 7a9d0f9d0a852c727aef5a54ceeb51b7b2dda85d (diff) | |
parent | 06230d22488796d92ea130e985d1e0ee2ed05199 (diff) |
Merge remote-tracking branch 'qt/5.10' into dev
Change-Id: I603cbb164e6015c1bb7796bd8bb055d84dbc3b04
Diffstat (limited to 'src/client/qwaylandwindow.cpp')
-rw-r--r-- | src/client/qwaylandwindow.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp index 28e57be5f..2e709440f 100644 --- a/src/client/qwaylandwindow.cpp +++ b/src/client/qwaylandwindow.cpp @@ -1050,7 +1050,7 @@ QVariant QWaylandWindow::property(const QString &name, const QVariant &defaultVa void QWaylandWindow::requestUpdate() { - if (!mFrameCallback) + if (!mWaitingForFrameSync) QPlatformWindow::requestUpdate(); else mUpdateRequested = true; |