diff options
Diffstat (limited to 'tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp')
| -rw-r--r-- | tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp b/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp index 7d1e736f42..078a3215fd 100644 --- a/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp +++ b/tests/auto/widgets/widgets/qdockwidget/tst_qdockwidget.cpp @@ -36,7 +36,7 @@ #include <qmainwindow.h> #include <qlineedit.h> #include <qtabbar.h> -#include <QDesktopWidget> +#include <QScreen> #include <QtGui/QPainter> #include "private/qdockwidget_p.h" @@ -338,7 +338,7 @@ void tst_QDockWidget::features() void tst_QDockWidget::setFloating() { - const QRect deskRect = QApplication::desktop()->availableGeometry(); + const QRect deskRect = QGuiApplication::primaryScreen()->availableGeometry(); QMainWindow mw; mw.move(deskRect.left() + deskRect.width() * 2 / 3, deskRect.top() + deskRect.height() / 3); QDockWidget dw; @@ -756,7 +756,7 @@ void tst_QDockWidget::restoreStateWhileStillFloating() // When the dock widget is already floating then it takes a different code path // so this test covers the case where the restoreState() is effectively just // moving it back and resizing it - const QRect availGeom = QApplication::desktop()->availableGeometry(); + const QRect availGeom = QGuiApplication::primaryScreen()->availableGeometry(); const QPoint startingDockPos = availGeom.center(); QMainWindow mw; QDockWidget *dock = createTestDock(mw); @@ -781,10 +781,8 @@ void tst_QDockWidget::restoreDockWidget() QByteArray geometry; QByteArray state; - const bool isXcb = !QGuiApplication::platformName().compare("xcb", Qt::CaseInsensitive); - const QString name = QStringLiteral("main"); - const QRect availableGeometry = QApplication::desktop()->availableGeometry(); + const QRect availableGeometry = QGuiApplication::primaryScreen()->availableGeometry(); const QSize size = availableGeometry.size() / 5; const QPoint mainWindowPos = availableGeometry.bottomRight() - QPoint(size.width(), size.height()) - QPoint(100, 100); const QPoint dockPos = availableGeometry.center(); @@ -815,8 +813,7 @@ void tst_QDockWidget::restoreDockWidget() dock->show(); QVERIFY(QTest::qWaitForWindowExposed(dock)); QTRY_VERIFY(dock->isFloating()); - if (!isXcb) // Avoid Window manager positioning issues - QTRY_COMPARE(dock->pos(), dockPos); + QTRY_COMPARE(dock->pos(), dockPos); } QVERIFY(!geometry.isEmpty()); @@ -837,8 +834,6 @@ void tst_QDockWidget::restoreDockWidget() restoreWindow.show(); QVERIFY(QTest::qWaitForWindowExposed(&restoreWindow)); QTRY_VERIFY(dock->isFloating()); - if (isXcb) - QSKIP("Skip due to Window manager positioning issues", Abort); QTRY_COMPARE(dock->pos(), dockPos); } } @@ -868,7 +863,7 @@ void tst_QDockWidget::task169808_setFloating() public: QSize sizeHint() const { - const QRect& deskRect = qApp->desktop()->availableGeometry(); + const QRect& deskRect = QGuiApplication::primaryScreen()->availableGeometry(); return QSize(qMin(300, deskRect.width() / 2), qMin(300, deskRect.height() / 2)); } @@ -892,6 +887,9 @@ void tst_QDockWidget::task169808_setFloating() mw.show(); QVERIFY(QTest::qWaitForWindowExposed(&mw)); +#ifdef Q_OS_WINRT + QEXPECT_FAIL("", "Widgets are maximized on WinRT by default", Abort); +#endif QCOMPARE(dw->widget()->size(), dw->widget()->sizeHint()); //and now we try to test if the contents margin is taken into account @@ -934,6 +932,9 @@ void tst_QDockWidget::task248604_infiniteResize() d.setContentsMargins(2, 2, 2, 2); d.setMinimumSize(320, 240); d.showNormal(); +#ifdef Q_OS_WINRT + QEXPECT_FAIL("", "Widgets are maximized on WinRT by default", Abort); +#endif QTRY_COMPARE(d.size(), QSize(320, 240)); } |