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 /src | |
| 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 'src')
| -rw-r--r-- | src/quick3d/imports/render/qt3dquick3drenderplugin.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp index f142a81e7..958f156ae 100644 --- a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp +++ b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp @@ -130,6 +130,8 @@ #include <Qt3DQuickRender/private/quick3dbuffer_p.h> #include <Qt3DQuickRender/private/qt3dquickrender_global_p.h> +#include <QtGui/qwindow.h> + static void initResources() { Q_INIT_RESOURCE(defaults); @@ -175,6 +177,8 @@ void Qt3DQuick3DRenderPlugin::registerTypes(const char *uri) Qt3DRender::Quick::Quick3DRender_initialize(); + qmlRegisterUncreatableType<QWindow>(uri, 2, 0, "Window", "Only for assigning window surface property"); + // Converters QMetaType::registerConverter<Qt3DRender::Render::Quick::Quick3DShaderDataArray*, QVariantList>(Quick3DShaderDataArrayToVariantListConverter); |