diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-05-23 21:27:07 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-05-23 21:27:07 +0200 |
| commit | d3a8bc803cd7c4ce106038bfc4b37cdd6bb8e177 (patch) | |
| tree | 3b6db0d4869f334d0eb4559c5ae457995cbe913e /tests/auto/widgets/widgets | |
| parent | d934ddc297f6db94dbc548fe01da64350f13577d (diff) | |
| parent | 47a7628023610904c6ac52e23fa289f75f349b4e (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/corelib/io/qdatastream.cpp
src/corelib/io/qdatastream.h
src/corelib/json/qjsonwriter.cpp
src/plugins/platforms/cocoa/qcocoawindow.mm
src/plugins/platforms/xcb/qxcbkeyboard.cpp
Change-Id: I46fef1455f5a9f2ce1ec394a3c65881093c51b62
Diffstat (limited to 'tests/auto/widgets/widgets')
| -rw-r--r-- | tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp | 12 | ||||
| -rw-r--r-- | tests/auto/widgets/widgets/qstackedwidget/qstackedwidget.pro | 1 |
2 files changed, 9 insertions, 4 deletions
diff --git a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp index 6364a736cd..f5d92be95d 100644 --- a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp +++ b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp @@ -1705,6 +1705,11 @@ void tst_QMdiArea::tileSubWindows() subWindow->setMinimumSize(minSize); QCOMPARE(workspace.size(), QSize(350, 150)); + + // Prevent scrollbars from messing up the expected viewport calculation below + workspace.setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); + workspace.setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); + workspace.tileSubWindows(); // The sub-windows are now tiled like this: // | win 1 || win 2 || win 3 | @@ -1723,11 +1728,12 @@ void tst_QMdiArea::tileSubWindows() #ifdef Q_OS_WINCE QSKIP("Not fixed yet! See task 197453"); #endif -#ifdef Q_OS_MAC - QEXPECT_FAIL("", "QTBUG-25298", Abort); -#endif QTRY_COMPARE(workspace.viewport()->rect().size(), expectedViewportSize); + // Restore original scrollbar behavior for test below + workspace.setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded); + workspace.setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded); + // Not enough space for all sub-windows to be visible -> provide scroll bars. workspace.resize(160, 150); qApp->processEvents(); diff --git a/tests/auto/widgets/widgets/qstackedwidget/qstackedwidget.pro b/tests/auto/widgets/widgets/qstackedwidget/qstackedwidget.pro index d016caf393..2e8b86f35a 100644 --- a/tests/auto/widgets/widgets/qstackedwidget/qstackedwidget.pro +++ b/tests/auto/widgets/widgets/qstackedwidget/qstackedwidget.pro @@ -3,7 +3,6 @@ ############################################################ CONFIG += testcase -CONFIG += parallel_test TARGET = tst_qstackedwidget QT += widgets testlib SOURCES += tst_qstackedwidget.cpp |