diff options
| author | Antti Määttä <antti.maatta@qt.io> | 2017-02-17 15:53:30 +0200 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2017-03-03 18:50:46 +0000 |
| commit | fddaeae702df644c1792a29f1875201e8bd64e94 (patch) | |
| tree | d1dff5e594e8ef6a0ada157d3d4f34bee2b19f36 /src/quick3d/imports/scene2d | |
| parent | 5b43b8d785351310d1f0869c9c065bf8c840d055 (diff) | |
cleanup scene2d - change mouse event handling
Task-number: QTBUG-58876
Change-Id: I103125ff15a4b28a67832eb7b86b1abbd2f3fde8
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/quick3d/imports/scene2d')
| -rw-r--r-- | src/quick3d/imports/scene2d/importsscene2d.pro | 2 | ||||
| -rw-r--r-- | src/quick3d/imports/scene2d/qtquickscene2dplugin.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/quick3d/imports/scene2d/importsscene2d.pro b/src/quick3d/imports/scene2d/importsscene2d.pro index 13ccf7818..32fbc5b1b 100644 --- a/src/quick3d/imports/scene2d/importsscene2d.pro +++ b/src/quick3d/imports/scene2d/importsscene2d.pro @@ -3,7 +3,7 @@ TARGET = qtquickscene2dplugin TARGETPATH = QtQuick/Scene2D IMPORT_VERSION = 2.0 -QT += qml quick 3dcore 3drender 3drender-private 3dinput 3dlogic 3dquickscene2d +QT += qml quick 3dcore 3drender 3drender-private 3dinput 3dlogic 3dquickscene2d 3dquickscene2d-private # Qt3D is free of Q_FOREACH - make sure it stays that way: DEFINES += QT_NO_FOREACH diff --git a/src/quick3d/imports/scene2d/qtquickscene2dplugin.cpp b/src/quick3d/imports/scene2d/qtquickscene2dplugin.cpp index 44ca596d3..c67271adb 100644 --- a/src/quick3d/imports/scene2d/qtquickscene2dplugin.cpp +++ b/src/quick3d/imports/scene2d/qtquickscene2dplugin.cpp @@ -38,6 +38,7 @@ #include <Qt3DQuickScene2D/qscene2d.h> #include <private/qrenderaspect_p.h> +#include <Qt3DQuickScene2D/private/qt3dquick3dscene2d_p.h> QT_BEGIN_NAMESPACE @@ -50,7 +51,7 @@ Q_COREAPP_STARTUP_FUNCTION(initScene2dPlugin) void QtQuickScene2DPlugin::registerTypes(const char *uri) { - qmlRegisterType<Qt3DRender::Quick::QScene2D>(uri, 2, 9, "Scene2D"); + qmlRegisterExtendedType<Qt3DRender::Quick::QScene2D, Qt3DRender::Render::Quick::QQuick3DScene2D>(uri, 2, 9, "Scene2D"); } QT_END_NAMESPACE |