From 1c76aa077e9c9d74fa2314752948896f9da381ee Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Tue, 13 Oct 2020 21:00:21 +0200 Subject: Get rid of all usage of QApplication:desktop MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use QScreen APIs instead. Change-Id: Ie99af94fe4292223dbb165b3f5c1b74e8fe0498b Reviewed-by: Tor Arne Vestbø Reviewed-by: Qt CI Bot --- .../effects/qgraphicseffect/tst_qgraphicseffect.cpp | 4 ++-- .../auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp | 4 ++-- tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp | 2 +- .../auto/widgets/kernel/qapplication/tst_qapplication.cpp | 1 - tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp | 10 ++++------ tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp | 2 +- .../widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp | 14 +++++--------- 7 files changed, 15 insertions(+), 22 deletions(-) (limited to 'tests/auto/widgets') diff --git a/tests/auto/widgets/effects/qgraphicseffect/tst_qgraphicseffect.cpp b/tests/auto/widgets/effects/qgraphicseffect/tst_qgraphicseffect.cpp index 0aead57d11..16c4ba6058 100644 --- a/tests/auto/widgets/effects/qgraphicseffect/tst_qgraphicseffect.cpp +++ b/tests/auto/widgets/effects/qgraphicseffect/tst_qgraphicseffect.cpp @@ -409,7 +409,7 @@ void tst_QGraphicsEffect::opacity() void tst_QGraphicsEffect::grayscale() { - if (qApp->desktop()->depth() < 24) + if (QGuiApplication::primaryScreen()->depth() < 24) QSKIP("Test only works on 32 bit displays"); QGraphicsScene scene(0, 0, 100, 100); @@ -456,7 +456,7 @@ void tst_QGraphicsEffect::grayscale() void tst_QGraphicsEffect::colorize() { - if (qApp->desktop()->depth() < 24) + if (QGuiApplication::primaryScreen()->depth() < 24) QSKIP("Test only works on 32 bit displays"); QGraphicsScene scene(0, 0, 100, 100); diff --git a/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp b/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp index ff76ddc39c..9b11bcdec1 100644 --- a/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp +++ b/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp @@ -3433,14 +3433,14 @@ void tst_QHeaderView::statusTips() QtTestModel model(5, 5); headerView.setModel(&model); headerView.viewport()->setMouseTracking(true); - headerView.setGeometry(QRect(QPoint(QApplication::desktop()->geometry().center() - QPoint(250, 250)), + headerView.setGeometry(QRect(QPoint(QGuiApplication::primaryScreen()->geometry().center() - QPoint(250, 250)), QSize(500, 500))); headerView.show(); QApplication::setActiveWindow(&headerView); QVERIFY(QTest::qWaitForWindowActive(&headerView)); // Ensure it is moved away first and then moved to the relevant section - QTest::mouseMove(QApplication::desktop(), + QTest::mouseMove(&headerView, headerView.rect().bottomLeft() + QPoint(20, 20)); QPoint centerPoint = QRect(headerView.sectionPosition(0), 0, headerView.sectionSize(0), headerView.height()).center(); diff --git a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp index 844c9260bf..d1adc7a29f 100644 --- a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp +++ b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp @@ -4787,7 +4787,7 @@ void tst_QTreeView::statusTip() mw.setCentralWidget(view); } mw.statusBar(); - mw.setGeometry(QRect(QPoint(QApplication::desktop()->geometry().center() - QPoint(250, 250)), + mw.setGeometry(QRect(QPoint(QGuiApplication::primaryScreen()->geometry().center() - QPoint(250, 250)), QSize(500, 500))); mw.show(); QApplication::setActiveWindow(&mw); diff --git a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp index 54a9499fbf..6c6793b26b 100644 --- a/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp +++ b/tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp @@ -2415,7 +2415,6 @@ void tst_QApplication::staticFunctions() QApplication::setStyle(QStringLiteral("blub")); QApplication::allWidgets(); QApplication::topLevelWidgets(); - QApplication::desktop(); QApplication::activePopupWidget(); QApplication::activeModalWidget(); QApplication::focusWidget(); diff --git a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp index 98cba63e6f..dbeebfa523 100644 --- a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp +++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp @@ -6513,7 +6513,7 @@ void tst_QWidget::minAndMaxSizeWithX11BypassWindowManagerHint() if (m_platform != QStringLiteral("xcb")) QSKIP("This test is for X11 only."); // Same size as in QWidgetPrivate::create. - const QSize desktopSize = QApplication::desktop()->size(); + const QSize desktopSize = QGuiApplication::primaryScreen()->size(); const QSize originalSize(desktopSize.width() / 2, desktopSize.height() * 4 / 10); { // Maximum size. @@ -9262,13 +9262,11 @@ void tst_QWidget::translucentWidget() label.show(); QVERIFY(QTest::qWaitForWindowExposed(&label)); - QPixmap widgetSnapshot; - + QPixmap widgetSnapshot = #ifdef Q_OS_WIN - QWidget *desktopWidget = QApplication::desktop(); - widgetSnapshot = grabWindow(desktopWidget->windowHandle(), labelPos.x(), labelPos.y(), label.width(), label.height()); + QGuiApplication::primaryScreen()->grabWindow(0, labelPos.x(), labelPos.y(), label.width(), label.height()); #else - widgetSnapshot = label.grab(QRect(QPoint(0, 0), label.size())); + label.grab(QRect(QPoint(0, 0), label.size())); #endif const QImage actual = widgetSnapshot.toImage().convertToFormat(QImage::Format_RGB32); QImage expected = pm.toImage().scaled(label.devicePixelRatio() * pm.size()); diff --git a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp index 12593298e8..4914caf788 100644 --- a/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp +++ b/tests/auto/widgets/widgets/qmdiarea/tst_qmdiarea.cpp @@ -901,7 +901,7 @@ void tst_QMdiArea::sizeHint() { QMdiArea workspace; workspace.show(); - QSize desktopSize = QApplication::desktop()->size(); + QSize desktopSize = QGuiApplication::primaryScreen()->size(); QSize expectedSize(desktopSize.width() * 2/3, desktopSize.height() * 2/3); QCOMPARE(workspace.sizeHint(), expectedSize); diff --git a/tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp b/tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp index a18fd0299a..1e99bb4074 100644 --- a/tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp +++ b/tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp @@ -504,23 +504,19 @@ static inline QString msgRgbMismatch(unsigned actual, unsigned expected) static QPixmap grabWidgetWithoutRepaint(const QWidget *widget, QRect clipArea) { - const QWidget *targetWidget = widget; + const QWindow *window = widget->window()->windowHandle(); + Q_ASSERT(window); + WId windowId = window->winId(); + #ifdef Q_OS_WIN // OpenGL content is not properly grabbed on Windows when passing a top level widget window, // because GDI functions can't grab OpenGL layer content. // Instead the whole screen should be captured, with an adjusted clip area, which contains // the final composited content. - QWidget *desktopWidget = QApplication::desktop(QGuiApplication::primaryScreen()); - const QWidget *mainScreenWidget = desktopWidget; - targetWidget = mainScreenWidget; + windowId = 0; clipArea = QRect(widget->mapToGlobal(clipArea.topLeft()), widget->mapToGlobal(clipArea.bottomRight())); #endif - - const QWindow *window = targetWidget->window()->windowHandle(); - Q_ASSERT(window); - WId windowId = window->winId(); - QScreen *screen = window->screen(); Q_ASSERT(screen); -- cgit v1.2.3