summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntti Määttä <antti.maatta@qt.io>2017-01-13 14:40:34 +0200
committerAntti Määttä <antti.maatta@qt.io>2017-01-27 13:57:14 +0000
commitd5c5a12cf45d9b0e72f9cfe78223813485b929ac (patch)
treeab21e56c8563bf3c5814b936ab70a4ffe7307d93
parent0888e3db4d390406a434036a5cf06ef662c40b10 (diff)
Fix qml registration version
Change-Id: Id1943002a0acd255b3175670851e8cac218f4cdc Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
-rw-r--r--src/quick3d/imports/render/qt3dquick3drenderplugin.cpp2
-rw-r--r--tests/manual/video-texture-qml/main.qml2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
index a5a6df040..8ac9bdb0a 100644
--- a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
+++ b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
@@ -266,7 +266,7 @@ void Qt3DQuick3DRenderPlugin::registerTypes(const char *uri)
qmlRegisterType<Qt3DRender::QStencilMask>(uri, 2, 0, "StencilMask");
// Scene2D
- Qt3DRender::Quick::registerType<Qt3DRender::Quick::QScene2D>("QScene2D", "Qt3D.Render/Scene2D", uri, 2, 0, "Scene2D");
+ Qt3DRender::Quick::registerType<Qt3DRender::Quick::QScene2D>("QScene2D", "Qt3D.Render/Scene2D", uri, 2, 2, "Scene2D");
}
QT_END_NAMESPACE
diff --git a/tests/manual/video-texture-qml/main.qml b/tests/manual/video-texture-qml/main.qml
index c7d0b47ec..55b2329eb 100644
--- a/tests/manual/video-texture-qml/main.qml
+++ b/tests/manual/video-texture-qml/main.qml
@@ -35,7 +35,7 @@
****************************************************************************/
import Qt3D.Core 2.0
-import Qt3D.Render 2.0
+import Qt3D.Render 2.2
import Qt3D.Input 2.0
import QtQuick 2.2 as QQ2
import QtQuick.Window 2.0 as QW2