1 files changed, 23 insertions, 2 deletions
diff --git a/src/gui/kernel/qplatformscreen.cpp b/src/gui/kernel/qplatformscreen.cpp
index f3213bf5ea..e511a6f5c4 100644
--- a/src/gui/kernel/qplatformscreen.cpp
+++ b/src/gui/kernel/qplatformscreen.cpp
@@ -410,15 +410,22 @@ void QPlatformScreen::resizeMaximizedWindows()
     const QRect newGeometry = deviceIndependentGeometry();
     const QRect newAvailableGeometry = QHighDpi::fromNative(availableGeometry(), QHighDpiScaling::factor(this), newGeometry.topLeft());
 
+    const bool supportsMaximizeUsingFullscreen = QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::MaximizeUsingFullscreenGeometry);
+
     for (QWindow *w : windows()) {
         // Skip non-platform windows, e.g., offscreen windows.
         if (!w->handle())
             continue;
 
-        if (w->windowState() & Qt::WindowMaximized || w->geometry() == oldAvailableGeometry)
+        if (supportsMaximizeUsingFullscreen
+                && w->windowState() & Qt::WindowMaximized
+                && w->flags() & Qt::MaximizeUsingFullscreenGeometryHint) {
+            w->setGeometry(newGeometry);
+        } else if (w->windowState() & Qt::WindowMaximized || w->geometry() == oldAvailableGeometry) {
             w->setGeometry(newAvailableGeometry);
-        else if (w->windowState() & Qt::WindowFullScreen || w->geometry() == oldGeometry)
+        } else if (w->windowState() & Qt::WindowFullScreen || w->geometry() == oldGeometry) {
             w->setGeometry(newGeometry);
+        }
     }
 }
 
@@ -609,4 +616,18 @@ int QPlatformScreen::preferredMode() const
     return 0;
 }
 
+QList<QPlatformScreen *> QPlatformPlaceholderScreen::virtualSiblings() const
+{
+    QList<QPlatformScreen *> siblings;
+
+    if (!m_virtualSibling)
+        return siblings;
+
+    for (QScreen *screen : QGuiApplication::screens()) {
+        if (screen->handle() && screen->handle() != this)
+            siblings << screen->handle();
+    }
+    return siblings;
+}
+
 QT_END_NAMESPACE