diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2019-10-15 09:40:09 +0200 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2019-10-15 09:40:40 +0200 |
| commit | 7339e9ae93df3720e1b936dd027d821105020bc4 (patch) | |
| tree | f563b7cf4e02ad8a0628fb228733dc841f8ca554 /src/quick3d/quick3dextras | |
| parent | fd85ebb1e24d48ffdff0659810a1830691bba89f (diff) | |
| parent | 7628760f8f16aba7769c04f2251633faa9fbcad1 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Change-Id: I44133fbc9b93e96918463b0b0891ee5ab7db9f2c
Diffstat (limited to 'src/quick3d/quick3dextras')
| -rw-r--r-- | src/quick3d/quick3dextras/qt3dquickwindow.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/quick3d/quick3dextras/qt3dquickwindow.cpp b/src/quick3d/quick3dextras/qt3dquickwindow.cpp index bc4bb25ee..d67dfdc71 100644 --- a/src/quick3d/quick3dextras/qt3dquickwindow.cpp +++ b/src/quick3d/quick3dextras/qt3dquickwindow.cpp @@ -66,6 +66,7 @@ #include <Qt3DQuickExtras/private/qt3dquickwindowlogging_p.h> #include <Qt3DRender/private/qrendersurfaceselector_p.h> +#include <Qt3DRender/private/qrenderaspect_p.h> QT_BEGIN_NAMESPACE @@ -132,6 +133,8 @@ Qt3DQuickWindow::Qt3DQuickWindow(QWindow *parent) QSurfaceFormat::setDefaultFormat(format); d->m_renderAspect = new Qt3DRender::QRenderAspect; + if (parent && parent->screen()) + static_cast<Qt3DRender::QRenderAspectPrivate*>(Qt3DRender::QRenderAspectPrivate::get(d->m_renderAspect))->m_screen = parent->screen(); d->m_inputAspect = new Qt3DInput::QInputAspect; d->m_logicAspect = new Qt3DLogic::QLogicAspect; d->m_engine = new Qt3DCore::Quick::QQmlAspectEngine; |