diff options
author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-10-13 21:00:21 +0200 |
---|---|---|
committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-10-14 06:38:43 +0200 |
commit | 1c76aa077e9c9d74fa2314752948896f9da381ee (patch) | |
tree | ef979f532d759c9ae061c400415afd974d3edd26 /tests/auto/widgets/widgets/qopenglwidget | |
parent | 772a10391eead51e2c7c9b50473ef0f8096cef82 (diff) |
Get rid of all usage of QApplication:desktop
Use QScreen APIs instead.
Change-Id: Ie99af94fe4292223dbb165b3f5c1b74e8fe0498b
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Diffstat (limited to 'tests/auto/widgets/widgets/qopenglwidget')
-rw-r--r-- | tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp | 14 |
1 files changed, 5 insertions, 9 deletions
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); |