Merge 5.10 into 5.10.0

Change-Id: Ieb3abe997b444fc46218cd2a1d00a5cfaf37f7b1

1 files changed, 8 insertions, 0 deletions

diff --git a/src/compositor/compositor_api/qwaylandoutput.cpp b/src/compositor/compositor_api/qwaylandoutput.cpp
index 522de08e8..77d3dc1a9 100644
--- a/src/compositor/compositor_api/qwaylandoutput.cpp
+++ b/src/compositor/compositor_api/qwaylandoutput.cpp
@@ -529,6 +529,8 @@ void QWaylandOutput::setCurrentMode(const QWaylandOutputMode &mode)
 
     Q_EMIT currentModeChanged();
     Q_EMIT geometryChanged();
+    if (!d->availableGeometry.isValid())
+        emit availableGeometryChanged();
 
     d->sendModesInfo();
 }
@@ -938,6 +940,9 @@ void QWaylandOutput::handleSetWidth(int newWidth)
             QWaylandOutputMode mode = d->modes.at(d->currentMode);
             mode.setWidth(newWidth * d->window->devicePixelRatio());
             d->modes.replace(d->currentMode, mode);
+            emit geometryChanged();
+            if (!d->availableGeometry.isValid())
+                emit availableGeometryChanged();
             d->sendModesInfo();
         } else {
             // We didn't add a mode during the initialization because the window
@@ -968,6 +973,9 @@ void QWaylandOutput::handleSetHeight(int newHeight)
             QWaylandOutputMode mode = d->modes.at(d->currentMode);
             mode.setHeight(newHeight * d->window->devicePixelRatio());
             d->modes.replace(d->currentMode, mode);
+            emit geometryChanged();
+            if (!d->availableGeometry.isValid())
+                emit availableGeometryChanged();
             d->sendModesInfo();
         } else {
             // We didn't add a mode during the initialization because the window