diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-16 01:00:49 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-16 01:00:49 +0200 |
commit | faab18c65ab63617c2e03a27a7a03dfae050292f (patch) | |
tree | 891a02e8876ee84d999d7d172f0f7c38d174366d /examples/opengl | |
parent | 06ca5c49e7fb6dd23eab3a02de404c82e03bc5db (diff) | |
parent | 9cc040a806fd2e6f1458e801a99311168d594c77 (diff) |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Ifd83db69416230175ddc3161f640b612755018fc
Diffstat (limited to 'examples/opengl')
-rw-r--r-- | examples/opengl/threadedqopenglwidget/main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/opengl/threadedqopenglwidget/main.cpp b/examples/opengl/threadedqopenglwidget/main.cpp index 983f608543..975def030b 100644 --- a/examples/opengl/threadedqopenglwidget/main.cpp +++ b/examples/opengl/threadedqopenglwidget/main.cpp @@ -50,7 +50,7 @@ #include <QApplication> #include <QMainWindow> -#include <QDesktopWidget> +#include <QScreen> #include <QSurfaceFormat> #include <QOpenGLContext> #include <QCommandLineParser> @@ -90,7 +90,7 @@ int main( int argc, char ** argv ) // The rendering for the four QOpenGLWidgets happens on four separate threads. GLWidget topLevelGlWidget; - QPoint pos = QApplication::desktop()->availableGeometry(&topLevelGlWidget).topLeft() + QPoint(200, 200); + QPoint pos = topLevelGlWidget.screen()->availableGeometry().topLeft() + QPoint(200, 200); topLevelGlWidget.setWindowTitle(QStringLiteral("Threaded QOpenGLWidget example top level")); topLevelGlWidget.resize(200, 200); topLevelGlWidget.move(pos); |