diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2016-01-18 10:08:41 +0000 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2016-01-18 10:54:59 +0000 |
commit | 4b4a407512fdd4cc0a2f7caa463b7b03520b3f62 (patch) | |
tree | e66ecb95b53b8e0a9e263772147ef1201fa9ece7 /examples/qt3d/examples-common/qt3dquickwindow.cpp | |
parent | d401456e1b1a3d0f4c043137a3cff935c0c8aa0e (diff) |
Temporarily expose window to QML context
Allows to restore most of the QML examples using this approach until a
more permanent solution can be developed (I have an idea on how to do
this and will try it today).
Change-Id: I9b9bb86a5323140be3ed2456cdfa91b1f93187b1
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'examples/qt3d/examples-common/qt3dquickwindow.cpp')
-rw-r--r-- | examples/qt3d/examples-common/qt3dquickwindow.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/examples/qt3d/examples-common/qt3dquickwindow.cpp b/examples/qt3d/examples-common/qt3dquickwindow.cpp index 27f2ee5ef..5aa5a6e85 100644 --- a/examples/qt3d/examples-common/qt3dquickwindow.cpp +++ b/examples/qt3d/examples-common/qt3dquickwindow.cpp @@ -39,6 +39,9 @@ #include <Qt3DRender/qrenderaspect.h> #include <Qt3DInput/qinputaspect.h> #include <Qt3DLogic/qlogicaspect.h> + +#include <QQmlContext> + #include <QtGui/qopenglcontext.h> QT_BEGIN_NAMESPACE @@ -107,6 +110,9 @@ void Qt3DQuickWindow::showEvent(QShowEvent *e) data.insert(QStringLiteral("eventSource"), QVariant::fromValue(this)); m_engine->aspectEngine()->setData(data); + // TODO: Remove this hack once we can automagically set the window on the framegraph + m_engine->qmlEngine()->rootContext()->setContextProperty("_q_window", this); + m_engine->setSource(m_source); // Set the QQmlIncubationController on the window |