diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-08 01:00:09 +0100 |
|---|---|---|
| committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2019-11-08 08:16:27 +0100 |
| commit | 53db1ef8d6a40484a1fc8633b2bad9fb2405c08a (patch) | |
| tree | fd922515894c0c0c6c565bb6dad655b62d84cd90 /src/quickwidgets | |
| parent | 8e380f6199df1cbaf5d88d929e648a5368f6e0ef (diff) | |
| parent | 210f4271e8946c0da0cefff0c07af80081df20f1 (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
tests/auto/qml/qqmltypeloader/tst_qqmltypeloader.cpp
Change-Id: I1c0c7c44053bf3d5f8f9723662bd0fe67253c8ae
Diffstat (limited to 'src/quickwidgets')
| -rw-r--r-- | src/quickwidgets/qquickwidget.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/quickwidgets/qquickwidget.cpp b/src/quickwidgets/qquickwidget.cpp index 4d2914ff6c..3854a8bd0b 100644 --- a/src/quickwidgets/qquickwidget.cpp +++ b/src/quickwidgets/qquickwidget.cpp @@ -885,7 +885,9 @@ void QQuickWidgetPrivate::createContext() context = new QOpenGLContext; context->setFormat(offscreenWindow->requestedFormat()); - + const QWindow *win = q->window()->windowHandle(); + if (win && win->screen()) + context->setScreen(win->screen()); QOpenGLContext *shareContext = qt_gl_global_share_context(); if (!shareContext) shareContext = QWidgetPrivate::get(q->window())->shareContext(); |