From 7b53e87bd7934e2d05e343291fc56a790f3df445 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Wed, 3 Jul 2024 16:36:08 +0200 Subject: [PATCH] tst_QWindow: Remove data for positioning test We no longer support fake fullscreen mode on macOS, and haven't for a long time. Pick-to: 6.7 6.5 Change-Id: Ic2eb6065239c4e5be5ab2011a6da50272c77460a Reviewed-by: Volker Hilsheimer (cherry picked from commit 4079ecfb9b3dc794212a81154e18145256741cfd) Reviewed-by: Qt Cherry-pick Bot --- tests/auto/gui/kernel/qwindow/tst_qwindow.cpp | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp index 232fc7af9ac..ce815114862 100644 --- a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp +++ b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp @@ -44,7 +44,6 @@ private slots: void resizeEventAfterResize(); void exposeEventOnShrink_QTBUG54040(); void mapGlobal(); - void positioning_data(); void positioning(); void framePositioning(); void framePositioning_data(); @@ -514,17 +513,6 @@ void tst_QWindow::exposeEventOnShrink_QTBUG54040() QTRY_VERIFY(window.received(QEvent::Expose) > exposeCount); } -void tst_QWindow::positioning_data() -{ - QTest::addColumn("windowflags"); - - QTest::newRow("default") << (Qt::Window | Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint | Qt::WindowFullscreenButtonHint); - -#ifdef Q_OS_MACOS - QTest::newRow("fake") << (Qt::Window | Qt::WindowTitleHint | Qt::WindowMinMaxButtonsHint | Qt::WindowCloseButtonHint); -#endif -} - // Compare a window position that may go through scaling in the platform plugin with fuzz. static inline bool qFuzzyCompareWindowPosition(const QPoint &p1, const QPoint p2, int fuzz) { @@ -574,8 +562,7 @@ void tst_QWindow::positioning() // events, so set the width to suitably large value to avoid those. const QRect geometry(m_availableTopLeft + QPoint(80, 80), m_testWindowSize); - QFETCH(Qt::WindowFlags, windowflags); - Window window(windowflags); + Window window; window.setGeometry(QRect(m_availableTopLeft + QPoint(20, 20), m_testWindowSize)); window.setFramePosition(m_availableTopLeft + QPoint(40, 40)); // Move window around before show, size must not change. QCOMPARE(window.geometry().size(), m_testWindowSize);