diff options
author | Liang Qi <liang.qi@qt.io> | 2019-09-12 10:00:03 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-09-12 20:19:28 +0200 |
commit | 2f71cdff2cda7903fd0b5ff0033d790877e40181 (patch) | |
tree | 0255e40f5366123bedefcbc9ad7d482f2e8198a2 /tests/manual/widgets/webgl/main.cpp | |
parent | d91b839d67bcfa1cfeb3d095b6885c97c53b9812 (diff) | |
parent | 5b0bbd7345b698faab0116b821802fb4a30c0fa4 (diff) | |
download | qtwebengine-wip/qt6.tar.gz |
Merge "Merge remote-tracking branch 'origin/5.14' into wip/qt6"wip/qt6
Diffstat (limited to 'tests/manual/widgets/webgl/main.cpp')
-rw-r--r-- | tests/manual/widgets/webgl/main.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/manual/widgets/webgl/main.cpp b/tests/manual/widgets/webgl/main.cpp index 364eda8b9..c18a15bac 100644 --- a/tests/manual/widgets/webgl/main.cpp +++ b/tests/manual/widgets/webgl/main.cpp @@ -30,9 +30,9 @@ #include <QtCore/QLoggingCategory> #include <QtCore/QOperatingSystemVersion> #include <QtGui/QOpenGLContext> +#include <QtGui/QScreen> #include <QtGui/QSurfaceFormat> #include <QtWidgets/QApplication> -#include <QtWidgets/QDesktopWidget> #include <QtWidgets/QGroupBox> #include <QtWidgets/QHBoxLayout> #include <QtWidgets/QMainWindow> @@ -104,7 +104,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) QSize MainWindow::sizeHint() const { - const QRect desktopRect = QApplication::desktop()->screenGeometry(); + const QRect desktopRect = QGuiApplication::primaryScreen()->geometry(); const QSize size = desktopRect.size() * qreal(0.9); return size; } @@ -172,7 +172,7 @@ int main(int argc, char *argv[]) MainWindow w; // Move middle-ish. - const QRect desktopRect = QApplication::desktop()->screenGeometry(); + const QRect desktopRect = QGuiApplication::primaryScreen()->geometry(); const QSize pos = desktopRect.size() * qreal(0.1); w.move(pos.width(), pos.height()); |