From 5e99b07a072bedee239ed6980a44719da9ffa7c9 Mon Sep 17 00:00:00 2001 From: Bastiaan Veelo Date: Sat, 16 Nov 2013 01:02:22 +0100 Subject: Fix setWindowFlags() for QMdiSubWindow. It was impossible to hide/show the close button after a QMdiSubWindow was created. Task-number: QTBUG-9933 Task-number: QTBUG-27274 [ChangeLog][QtWidgets][QMdiSubWindow] Fixed setWindowFlags() for QMdiSubWindow. Change-Id: I7db9a1bef5ba8a8ace729acb85682c8b3de9c33c Reviewed-by: Friedemann Kleint Reviewed-by: Marc Mutz --- .../widgets/qmdisubwindow/tst_qmdisubwindow.cpp | 38 ++-------------------- 1 file changed, 2 insertions(+), 36 deletions(-) (limited to 'tests') diff --git a/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp b/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp index 72fbb6fd3d..268638a504 100644 --- a/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp +++ b/tests/auto/widgets/widgets/qmdisubwindow/tst_qmdisubwindow.cpp @@ -901,40 +901,12 @@ void tst_QMdiSubWindow::setWindowFlags() QVERIFY(QTest::qWaitForWindowExposed(&workspace)); window->setWindowFlags(windowType | customFlags); - QEXPECT_FAIL("Qt::Widget", "QTBUG-27274", Continue); - QEXPECT_FAIL("Qt::Window", "QTBUG-27274", Continue); - QEXPECT_FAIL("Qt::Dialog", "QTBUG-27274", Continue); - QEXPECT_FAIL("Qt::Sheet", "QTBUG-27274", Continue); - QEXPECT_FAIL("Qt::Drawer", "QTBUG-27274", Continue); - QEXPECT_FAIL("Qt::Popup", "QTBUG-27274", Continue); - QEXPECT_FAIL("Qt::Tool", "QTBUG-27274", Continue); - QEXPECT_FAIL("Qt::ToolTip", "QTBUG-27274", Continue); - QEXPECT_FAIL("Qt::SplashScreen", "QTBUG-27274", Continue); - QEXPECT_FAIL("Qt::Desktop", "QTBUG-27274", Continue); QCOMPARE(window->windowType(), expectedWindowType); - if (!expectedCustomFlags) { - // We expect the same as 'customFlags' + if (!expectedCustomFlags) // We expect the same as 'customFlags' QCOMPARE(window->windowFlags() & ~expectedWindowType, customFlags); - } else { - QEXPECT_FAIL("Qt::Widget", "QTBUG-27274", Continue); - QEXPECT_FAIL("Qt::Window", "QTBUG-27274", Continue); - QEXPECT_FAIL("Qt::Dialog", "QTBUG-27274", Continue); - QEXPECT_FAIL("Qt::Sheet", "QTBUG-27274", Continue); - QEXPECT_FAIL("Qt::Drawer", "QTBUG-27274", Continue); - QEXPECT_FAIL("Qt::Popup", "QTBUG-27274", Continue); - QEXPECT_FAIL("Qt::Tool", "QTBUG-27274", Continue); - QEXPECT_FAIL("Qt::ToolTip", "QTBUG-27274", Continue); - QEXPECT_FAIL("Qt::SplashScreen", "QTBUG-27274", Continue); - QEXPECT_FAIL("Qt::Desktop", "QTBUG-27274", Continue); - QEXPECT_FAIL("Qt::SubWindow", "QTBUG-27274", Continue); - QEXPECT_FAIL("StandardAndFrameless", "QTBUG-27274", Continue); - QEXPECT_FAIL("StandardAndFramelessAndStaysOnTop", "QTBUG-27274", Continue); - QEXPECT_FAIL("Shade", "QTBUG-27274", Continue); - QEXPECT_FAIL("Context", "QTBUG-27274", Continue); - QEXPECT_FAIL("ShadeAndContext", "QTBUG-27274", Continue); + else QCOMPARE(window->windowFlags() & ~expectedWindowType, expectedCustomFlags); - } } void tst_QMdiSubWindow::mouseDoubleClick() @@ -981,18 +953,12 @@ void tst_QMdiSubWindow::mouseDoubleClick() sendMouseDoubleClick(window, mousePosition); qApp->processEvents(); QVERIFY(!window->isShaded()); -#ifndef Q_OS_MAC - QEXPECT_FAIL("", "QTBUG-27274", Continue); -#endif QCOMPARE(window->geometry(), originalGeometry); window->showMinimized(); QVERIFY(window->isMinimized()); sendMouseDoubleClick(window, mousePosition); QVERIFY(!window->isMinimized()); -#ifndef Q_OS_MAC - QEXPECT_FAIL("", "QTBUG-27274", Continue); -#endif QCOMPARE(window->geometry(), originalGeometry); } -- cgit v1.2.3