diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-06-07 12:07:44 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-06-07 13:52:32 +0200 |
| commit | e6c944939f88afe852d2d0a604fd9815c409f2eb (patch) | |
| tree | 644736aa8a6235dd1db6e1cef18ee1aec28439da /src/client/qwaylandscreen.cpp | |
| parent | dbf418dce41fe08368d38a098a771348a5b3d0fd (diff) | |
| parent | 4934b87156a889584a34e36c22abd9aee64cef7e (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
src/client/qwaylandwindow.cpp
Change-Id: I3ae070ff20df4b858a4eef769438092c061e47ef
Diffstat (limited to 'src/client/qwaylandscreen.cpp')
| -rw-r--r-- | src/client/qwaylandscreen.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/client/qwaylandscreen.cpp b/src/client/qwaylandscreen.cpp index e3d9e7394..7f12a4214 100644 --- a/src/client/qwaylandscreen.cpp +++ b/src/client/qwaylandscreen.cpp @@ -254,7 +254,7 @@ void QWaylandScreen::output_done() QWindowSystemInterface::handleScreenOrientationChange(screen(), m_orientation); mTransform = -1; } - QWindowSystemInterface::handleScreenGeometryChange(screen(), mGeometry, mGeometry); + QWindowSystemInterface::handleScreenGeometryChange(screen(), geometry(), geometry()); QWindowSystemInterface::handleScreenRefreshRateChange(screen(), refreshRate()); } |