1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tst_QWindow: Remove data for positioning test

Browse Source 
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 <volker.hilsheimer@qt.io>
(cherry picked from commit 4079ecfb9b3dc794212a81154e18145256741cfd)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Tor Arne Vestbø 2024-07-03 16:36:08 +02:00 committed by Qt Cherry-pick Bot
parent f31e7385c1
commit 7b53e87bd7
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
View File

@ -44,7 +44,6 @@ private slots:
void resizeEventAfterResize(); void resizeEventAfterResize();
void exposeEventOnShrink_QTBUG54040(); void exposeEventOnShrink_QTBUG54040();
void mapGlobal(); void mapGlobal();
void positioning_data();
void positioning(); void positioning();
void framePositioning(); void framePositioning();
void framePositioning_data(); void framePositioning_data();
@ -514,17 +513,6 @@ void tst_QWindow::exposeEventOnShrink_QTBUG54040()
QTRY_VERIFY(window.received(QEvent::Expose) > exposeCount); QTRY_VERIFY(window.received(QEvent::Expose) > exposeCount);
} }
void tst_QWindow::positioning_data()
{
QTest::addColumn<Qt::WindowFlags>("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. // 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) 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. // events, so set the width to suitably large value to avoid those.
const QRect geometry(m_availableTopLeft + QPoint(80, 80), m_testWindowSize); const QRect geometry(m_availableTopLeft + QPoint(80, 80), m_testWindowSize);
QFETCH(Qt::WindowFlags, windowflags); Window window;
Window window(windowflags);
window.setGeometry(QRect(m_availableTopLeft + QPoint(20, 20), m_testWindowSize)); 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. window.setFramePosition(m_availableTopLeft + QPoint(40, 40)); // Move window around before show, size must not change.
QCOMPARE(window.geometry().size(), m_testWindowSize); QCOMPARE(window.geometry().size(), m_testWindowSize);