diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2012-09-19 14:57:15 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-09-26 10:08:59 +0200 |
| commit | 54d18cdc295dbd753647defd064e3ae92c161de0 (patch) | |
| tree | 6997743e5cb72a58f3176da6bc21eca2e6ab4eb0 /tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp | |
| parent | 8b032fe423e854428c1c8324dcd0f8c6150b3503 (diff) | |
Auto tests: remove PlatformQuirks::isAutoMaximizing()
Use QStyleHints::showIsFullScreen() where necessary.
Notice that QWidget::show() already calls showFullScreen()
if appropriate, and Qt::X11BypassWindowManagerHint doesn't
do anything in the XCB platform plugin.
Change-Id: Ib8f61188c075170d646894388561cbb3f72daee8
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Diffstat (limited to 'tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp')
| -rw-r--r-- | tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp index 393c84f4a8..259ec2ecd3 100644 --- a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp +++ b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp @@ -61,8 +61,7 @@ #include <QtOpenGL> #endif #include <QMacStyle> - -#include "../../../platformquirks.h" +#include <QStyleHints> static const Qt::WindowFlags DefaultWindowFlags = Qt::SubWindow | Qt::WindowSystemMenuHint @@ -502,7 +501,7 @@ void tst_QMdiArea::subWindowActivated2() QCOMPARE(mdiArea.activeSubWindow(), activeSubWindow); spy.clear(); - if (PlatformQuirks::isAutoMaximizing()) + if (qGuiApp->styleHints()->showIsFullScreen()) QSKIP("Platform is auto maximizing, so no showMinimized()"); // Check that we only emit _one_ signal and the active window @@ -1576,8 +1575,6 @@ void tst_QMdiArea::tileSubWindows() { QMdiArea workspace; workspace.resize(600,480); - if (PlatformQuirks::isAutoMaximizing()) - workspace.setWindowFlags(workspace.windowFlags() | Qt::X11BypassWindowManagerHint); workspace.show(); QVERIFY(QTest::qWaitForWindowExposed(&workspace)); |