From 08daecb93d275dca62c32f98a7d28ed02bc555e7 Mon Sep 17 00:00:00 2001 From: Paul Lemire Date: Sun, 27 Nov 2016 11:22:24 +0100 Subject: RenderCapture: register with version 2.1 To clearly identify this was added in 5.8 and not part of 5.7 Change-Id: Ifd713efa34f0092c250eae58260fab71865bb49e Reviewed-by: Sean Harmer --- src/quick3d/imports/render/qt3dquick3drenderplugin.cpp | 4 ++-- tests/manual/rendercapture-qml/CaptureScene.qml | 2 +- tests/manual/rendercapture-qml/main.qml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp index 28416d894..2e68893d6 100644 --- a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp +++ b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp @@ -224,8 +224,8 @@ void Qt3DQuick3DRenderPlugin::registerTypes(const char *uri) qmlRegisterType(uri, 2, 0, "NoDraw"); qmlRegisterType(uri, 2, 0, "FrustumCulling"); qmlRegisterType(uri, 2, 0, "DispatchCompute"); - qmlRegisterType(uri, 2, 0, "RenderCapture"); - qmlRegisterUncreatableType(uri, 2, 0, "RenderCaptureReply", QStringLiteral("RenderCaptureReply is only instantiated by RenderCapture")); + qmlRegisterType(uri, 2, 1, "RenderCapture"); + qmlRegisterUncreatableType(uri, 2, 1, "RenderCaptureReply", QStringLiteral("RenderCaptureReply is only instantiated by RenderCapture")); // RenderTarget qmlRegisterType(uri, 2, 0, "RenderTargetOutput"); diff --git a/tests/manual/rendercapture-qml/CaptureScene.qml b/tests/manual/rendercapture-qml/CaptureScene.qml index 17fa83a5c..2329e4730 100644 --- a/tests/manual/rendercapture-qml/CaptureScene.qml +++ b/tests/manual/rendercapture-qml/CaptureScene.qml @@ -50,7 +50,7 @@ import QtQuick 2.2 as QQ2 import Qt3D.Core 2.0 -import Qt3D.Render 2.0 +import Qt3D.Render 2.1 import Qt3D.Input 2.0 import Qt3D.Extras 2.0 diff --git a/tests/manual/rendercapture-qml/main.qml b/tests/manual/rendercapture-qml/main.qml index 83746c3a9..77e96d739 100644 --- a/tests/manual/rendercapture-qml/main.qml +++ b/tests/manual/rendercapture-qml/main.qml @@ -51,7 +51,7 @@ import QtQuick 2.2 import QtQuick.Layouts 1.3 import QtQuick.Controls 1.4 -import Qt3D.Render 2.0 +import Qt3D.Render 2.1 import QtQuick.Scene3D 2.0 Item { -- cgit v1.2.3