summaryrefslogtreecommitdiffstats
path: root/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2019-05-20 10:44:06 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2019-05-20 10:51:46 +0200
commit299675e6652e0f5c36c441ba727c68d0f73576b4 (patch)
tree324eb30da7dd5098e1efce9a598e9192ab1771e5 /tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp
parent18b336990f39d849be52b981c6d8a43274c84487 (diff)
tst_QMdiSubWindow::setSystemMenu(): Pass in High DPI/multi-screen setups
The window tends to grow to span screens in multi-screen setups; force it to be on the primary screen by showing it maximized in that case. Change-Id: I984ba7a4cd4abd1f862c59c8dca0e2275f44c724 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Diffstat (limited to 'tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp')
-rw-r--r--tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp b/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp
index f69b65bdbe..2b59a227b3 100644
--- a/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp
+++ b/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp
@@ -1014,7 +1014,11 @@ void tst_QMdiSubWindow::setSystemMenu()
mdiArea->addSubWindow(subWindow);
mainWindow.setCentralWidget(mdiArea);
mainWindow.menuBar()->setNativeMenuBar(false);
- mainWindow.show();
+ // Prevent the window from spanning screens
+ if (QGuiApplication::screens().size() > 1)
+ mainWindow.showMaximized();
+ else
+ mainWindow.show();
QVERIFY(QTest::qWaitForWindowExposed(&mainWindow));
QTRY_VERIFY(subWindow->isVisible());