diff options
author | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2010-11-22 13:40:30 (GMT) |
---|---|---|
committer | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2010-11-22 13:40:30 (GMT) |
commit | dd8ae3d39b9181bebcba6ea60fb9edc2aea0a4e2 (patch) | |
tree | d238497b25df4a72ec834dad86aaf76d37898a0e /tests | |
parent | 718dc1e87de2cb991e4000e480ea61bf5d559e62 (diff) | |
download | Qt-dd8ae3d39b9181bebcba6ea60fb9edc2aea0a4e2.zip Qt-dd8ae3d39b9181bebcba6ea60fb9edc2aea0a4e2.tar.gz Qt-dd8ae3d39b9181bebcba6ea60fb9edc2aea0a4e2.tar.bz2 |
Revert "Resolve two save/restore geometry issues on X11."
This reverts commit 3b80b70d1464320aee2b38ddeb1ec0d257f6bd1c.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/qwidget/tst_qwidget.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/tests/auto/qwidget/tst_qwidget.cpp b/tests/auto/qwidget/tst_qwidget.cpp index ba6d8ba..d230f2c 100644 --- a/tests/auto/qwidget/tst_qwidget.cpp +++ b/tests/auto/qwidget/tst_qwidget.cpp @@ -3272,13 +3272,8 @@ void tst_QWidget::restoreVersion1Geometry() QTest::qWait(10); if (expectedWindowState != Qt::WindowNoState) { -#ifndef Q_WS_X11 - // X11 fullscreen handling has changed. The window is positioned correctly - // on screen, but geometry() returns different values. Let this silently - // fail when restoring from version1 data. + // restoring from maximized or fullscreen, we can only restore to the normal geometry QTRY_COMPARE(widget.geometry(), expectedNormalGeometry); -#endif - } else { QTRY_COMPARE(widget.pos(), expectedPosition); QTRY_COMPARE(widget.size(), expectedSize); |