diff options
| author | Paul Lemire <paul.lemire350@gmail.com> | 2016-11-27 11:22:24 +0100 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2016-12-07 13:22:24 +0000 |
| commit | 08daecb93d275dca62c32f98a7d28ed02bc555e7 (patch) | |
| tree | e2df13697f8b49cdfe4f72d93afb996ab06c7629 | |
| parent | 886594c2b75c02e06269dc1c265b5422f8ccb4a0 (diff) | |
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 <sean.harmer@kdab.com>
| -rw-r--r-- | src/quick3d/imports/render/qt3dquick3drenderplugin.cpp | 4 | ||||
| -rw-r--r-- | tests/manual/rendercapture-qml/CaptureScene.qml | 2 | ||||
| -rw-r--r-- | 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<Qt3DRender::QNoDraw>(uri, 2, 0, "NoDraw"); qmlRegisterType<Qt3DRender::QFrustumCulling>(uri, 2, 0, "FrustumCulling"); qmlRegisterType<Qt3DRender::QDispatchCompute>(uri, 2, 0, "DispatchCompute"); - qmlRegisterType<Qt3DRender::QRenderCapture>(uri, 2, 0, "RenderCapture"); - qmlRegisterUncreatableType<Qt3DRender::QRenderCaptureReply>(uri, 2, 0, "RenderCaptureReply", QStringLiteral("RenderCaptureReply is only instantiated by RenderCapture")); + qmlRegisterType<Qt3DRender::QRenderCapture>(uri, 2, 1, "RenderCapture"); + qmlRegisterUncreatableType<Qt3DRender::QRenderCaptureReply>(uri, 2, 1, "RenderCaptureReply", QStringLiteral("RenderCaptureReply is only instantiated by RenderCapture")); // RenderTarget qmlRegisterType<Qt3DRender::QRenderTargetOutput>(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 { |