diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2017-09-12 12:10:03 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2017-09-12 12:39:05 +0100 |
| commit | 3f03499bf8a7cf3c3f8d19a020179c1205980bde (patch) | |
| tree | 518b0ef3fb1b31d3856f43124150ef41acb8c1aa /src/quick3d/quick3dextras | |
| parent | 8a4b9ebadb9e63ae367694f04786c7faf6306f27 (diff) | |
| parent | bf5fd7a78c91e29332ce70ad844b756150f32f18 (diff) | |
Merge branch '5.9' into 5.10
Change-Id: Id6a3d4ec579a2f2a2e559c22a2293d0e184f0bdf
Diffstat (limited to 'src/quick3d/quick3dextras')
| -rw-r--r-- | src/quick3d/quick3dextras/qt3dquickwindow.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/quick3d/quick3dextras/qt3dquickwindow.cpp b/src/quick3d/quick3dextras/qt3dquickwindow.cpp index 91773bb66..e41754f42 100644 --- a/src/quick3d/quick3dextras/qt3dquickwindow.cpp +++ b/src/quick3d/quick3dextras/qt3dquickwindow.cpp @@ -131,10 +131,10 @@ Qt3DQuickWindow::Qt3DQuickWindow(QWindow *parent) setFormat(format); QSurfaceFormat::setDefaultFormat(format); - d->m_engine = new Qt3DCore::Quick::QQmlAspectEngine; d->m_renderAspect = new Qt3DRender::QRenderAspect; d->m_inputAspect = new Qt3DInput::QInputAspect; d->m_logicAspect = new Qt3DLogic::QLogicAspect; + d->m_engine = new Qt3DCore::Quick::QQmlAspectEngine; d->m_engine->aspectEngine()->registerAspect(d->m_renderAspect); d->m_engine->aspectEngine()->registerAspect(d->m_inputAspect); |