diff options
Diffstat (limited to 'tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp')
-rw-r--r-- | tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp index 5aa7b19917..ba5c461223 100644 --- a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp +++ b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp @@ -1733,9 +1733,9 @@ void tst_QMdiArea::tileSubWindows() QTRY_COMPARE(workspace.viewport()->rect().size(), expectedViewportSize); // Not enough space for all sub-windows to be visible -> provide scroll bars. - workspace.resize(150, 150); + workspace.resize(160, 150); qApp->processEvents(); - QTRY_COMPARE(workspace.size(), QSize(150, 150)); + QTRY_COMPARE(workspace.size(), QSize(160, 150)); // Horizontal scroll bar. QScrollBar *hBar = workspace.horizontalScrollBar(); @@ -2594,7 +2594,10 @@ void tst_QMdiArea::nativeSubWindows() const QString platformName = QGuiApplication::platformName(); if (platformName != QLatin1String("xcb") && platformName != QLatin1String("windows")) QSKIP(qPrintable(QString::fromLatin1("nativeSubWindows() does not work on this platform (%1).").arg(platformName))); - +#ifdef QT_OPENGL_ES_2_ANGLE + if (platformName == QLatin1String("windows")) + QSKIP("nativeSubWindows() does not work with ANGLE on Windows, QTBUG-28545."); +#endif { // Add native widgets after show. QMdiArea mdiArea; mdiArea.addSubWindow(new QWidget); |