diff options
| author | Paul Olav Tvete <paul.tvete@qt.io> | 2019-01-21 09:25:32 +0100 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@qt.io> | 2019-01-21 09:25:32 +0100 |
| commit | 5f645af22bb63f0d215294535cf683029ed7aab5 (patch) | |
| tree | 04010e754bbcb70577cee5f396083d0333fe7b4c /src/compositor | |
| parent | 9fbaa5c13cfb9712273586abbb708eff07df60a5 (diff) | |
| parent | d296dea131ad51cfb4809e9a5e2d6908b2844a57 (diff) | |
Merge remote-tracking branch 'qt/5.12.1' into 5.12
Change-Id: I6ca92b605c55b0c8941d42e40fad624f00a65cd3
Diffstat (limited to 'src/compositor')
| -rw-r--r-- | src/compositor/compositor_api/qwaylandquickoutput.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/compositor/compositor_api/qwaylandquickoutput.cpp b/src/compositor/compositor_api/qwaylandquickoutput.cpp index 79e4fdec7..c6294eead 100644 --- a/src/compositor/compositor_api/qwaylandquickoutput.cpp +++ b/src/compositor/compositor_api/qwaylandquickoutput.cpp @@ -66,7 +66,7 @@ void QWaylandQuickOutput::initialize() this, &QWaylandQuickOutput::updateStarted, Qt::DirectConnection); - connect(quickWindow, &QQuickWindow::beforeRendering, + connect(quickWindow, &QQuickWindow::afterRendering, this, &QWaylandQuickOutput::doFrameCallbacks); } |