diff options
| author | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2018-03-24 21:03:00 +0100 |
|---|---|---|
| committer | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2018-05-28 17:22:59 +0000 |
| commit | 2843c58e5f0447e553d0f29614177b3b1d1884dc (patch) | |
| tree | 8d1e74a0ee99b10a23366bedf3098481448e4f9a /tests/auto/widgets/graphicsview/qgraphicsview | |
| parent | be45ada0359c0a33b97a2672af6b4c1f5dfe78a1 (diff) | |
Tests: replace deprecated QDesktopWidget::screenGeometry()
QDesktopWidget::screenGeometry() and similar was deprecated in 5.11
and replaced by QScreen::geometry()
Change-Id: Ic630d022bc6461af78f49684c8ac9d1836d738bc
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Diffstat (limited to 'tests/auto/widgets/graphicsview/qgraphicsview')
| -rw-r--r-- | tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp index 87a05d02d9..e080af1e3d 100644 --- a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp @@ -48,7 +48,6 @@ #include <QtWidgets/QBoxLayout> #include <QtWidgets/QStyle> #include <QtWidgets/QPushButton> -#include <QtWidgets/QDesktopWidget> #ifndef QT_NO_OPENGL #include <QtWidgets/QOpenGLWidget> #endif @@ -2439,8 +2438,8 @@ void tst_QGraphicsView::viewportUpdateMode() scene.setBackgroundBrush(Qt::red); CustomView view; - QDesktopWidget desktop; - view.setFixedSize(QSize(500, 500).boundedTo(desktop.availableGeometry().size())); // 500 is too big for all common smartphones + QScreen *screen = QGuiApplication::primaryScreen(); + view.setFixedSize(QSize(500, 500).boundedTo(screen->availableGeometry().size())); // 500 is too big for all common smartphones view.setScene(&scene); QCOMPARE(view.viewportUpdateMode(), QGraphicsView::MinimalViewportUpdate); |