diff options
author | Tomi Korpipaa <tomi.korpipaa@qt.io> | 2019-09-30 09:10:45 +0300 |
---|---|---|
committer | Tomi Korpipaa <tomi.korpipaa@qt.io> | 2019-10-01 13:57:23 +0300 |
commit | 247e38fcb8c08e8af3e221e32ab0d776cf758da5 (patch) | |
tree | a508d0a9f868e53a81df57550474e897d61ee3f1 /src/api/studio3dqml/plugins.qmltypes | |
parent | 2902563f2f97fe18e3a547e72e66ee57d443df4f (diff) |
Bump qml module version
Revision new APIs: asyncInit, shaderCache, exportShaderCache,
stereMode, stereoEyeSeparation, textureId, and addImageProvider.
Also fixed missing array in qt_attribution.json
Task-number: QT3DS-3963
Change-Id: I3fc6ac38ff6f524a5268ad4706f4d0edcc0af6f3
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/api/studio3dqml/plugins.qmltypes')
-rw-r--r-- | src/api/studio3dqml/plugins.qmltypes | 85 |
1 files changed, 77 insertions, 8 deletions
diff --git a/src/api/studio3dqml/plugins.qmltypes b/src/api/studio3dqml/plugins.qmltypes index bb8f052..a1d360d 100644 --- a/src/api/studio3dqml/plugins.qmltypes +++ b/src/api/studio3dqml/plugins.qmltypes @@ -4,7 +4,7 @@ import QtQuick.tooling 1.2 // It is used for QML tooling purposes only. // // This file was auto-generated by: -// 'qmlplugindump -nonrelocatable QtStudio3D.OpenGL 2.4' +// 'qmlplugindump -nonrelocatable QtStudio3D.OpenGL 2.5' Module { dependencies: ["QtQuick 2.12"] @@ -25,6 +25,11 @@ Module { Method { name: "setValue" Parameter { name: "value"; type: "QVariant" } + Parameter { name: "force"; type: "bool" } + } + Method { + name: "setValue" + Parameter { name: "value"; type: "QVariant" } } Method { name: "metadata" @@ -85,6 +90,7 @@ Module { Property { name: "createdElements"; type: "QStringList"; isReadonly: true } Property { name: "createdMaterials"; type: "QStringList"; isReadonly: true } Property { name: "createdMeshes"; type: "QStringList"; isReadonly: true } + Property { name: "shaderCacheFile"; revision: 1; type: "QUrl" } Signal { name: "variantListChanged" Parameter { name: "variantList"; type: "QStringList" } @@ -131,6 +137,14 @@ Module { Parameter { name: "meshNames"; type: "QStringList" } Parameter { name: "error"; type: "string" } } + Signal { + name: "shaderCacheFileChanged" + Parameter { name: "fileName"; type: "QUrl" } + } + Signal { + name: "shaderCacheExported" + Parameter { name: "success"; type: "bool" } + } Method { name: "setSource" Parameter { name: "source"; type: "QUrl" } @@ -184,13 +198,17 @@ Module { name: "setDataInputValue" Parameter { name: "name"; type: "string" } Parameter { name: "value"; type: "QVariant" } - Parameter { name: "valueRole"; type: "Q3DSDataInput::ValueRole" } + Parameter { name: "force"; type: "bool" } } Method { name: "setDataInputValue" Parameter { name: "name"; type: "string" } Parameter { name: "value"; type: "QVariant" } } + Method { + name: "setShaderCacheFile" + Parameter { name: "fileName"; type: "QUrl" } + } Method { name: "getDataInputs"; type: "QVariantList" } Method { name: "getDataInputs" @@ -206,13 +224,27 @@ Module { name: "unloadSlide" Parameter { name: "elementPath"; type: "string" } } + Method { + name: "exportShaderCache" + revision: 1 + Parameter { name: "shaderCacheFile"; type: "QUrl" } + Parameter { name: "binaryShaders"; type: "bool" } + } + Method { + name: "exportShaderCache" + revision: 1 + Parameter { name: "binaryShaders"; type: "bool" } + } } Component { name: "Q3DSPresentationItem" defaultProperty: "qmlChildren" prototype: "Q3DSPresentation" - exports: ["QtStudio3D.OpenGL/Presentation 2.4"] - exportMetaObjectRevisions: [0] + exports: [ + "QtStudio3D.OpenGL/Presentation 2.4", + "QtStudio3D.OpenGL/Presentation 2.5" + ] + exportMetaObjectRevisions: [0, 0] Property { name: "qmlChildren"; type: "QObject"; isList: true; isReadonly: true } Method { name: "appendQmlChildren" @@ -292,8 +324,11 @@ Module { name: "Q3DSStudio3D" defaultProperty: "data" prototype: "QQuickFramebufferObject" - exports: ["QtStudio3D.OpenGL/Studio3D 2.4"] - exportMetaObjectRevisions: [0] + exports: [ + "QtStudio3D.OpenGL/Studio3D 2.4", + "QtStudio3D.OpenGL/Studio3D 2.5" + ] + exportMetaObjectRevisions: [0, 0] Enum { name: "EventIgnoreFlags" values: { @@ -309,6 +344,7 @@ Module { Property { name: "viewerSettings"; type: "Q3DSViewerSettings"; isReadonly: true; isPointer: true } Property { name: "error"; type: "string"; isReadonly: true } Property { name: "ignoredEvents"; type: "EventIgnoreFlags" } + Property { name: "asyncInit"; revision: 1; type: "bool" } Signal { name: "frameUpdate" } Signal { name: "runningChanged" @@ -320,6 +356,10 @@ Module { } Signal { name: "presentationReady" } Signal { name: "presentationLoaded" } + Signal { + name: "asyncInitChanged" + Parameter { name: "enabled"; type: "bool" } + } Method { name: "reset" } } Component { @@ -332,8 +372,11 @@ Module { Component { name: "Q3DSViewerSettings" prototype: "QObject" - exports: ["QtStudio3D.OpenGL/ViewerSettings 2.4"] - exportMetaObjectRevisions: [0] + exports: [ + "QtStudio3D.OpenGL/ViewerSettings 2.4", + "QtStudio3D.OpenGL/ViewerSettings 2.5" + ] + exportMetaObjectRevisions: [0, 0] Enum { name: "ShadeMode" values: { @@ -349,10 +392,20 @@ Module { "ScaleModeCenter": 2 } } + Enum { + name: "StereoMode" + values: { + "StereoModeMono": 0, + "StereoModeTopBottom": 1, + "StereoModeLeftRight": 2 + } + } Property { name: "matteEnabled"; type: "bool" } Property { name: "matteColor"; type: "QColor" } Property { name: "showRenderStats"; type: "bool" } Property { name: "scaleMode"; type: "ScaleMode" } + Property { name: "stereoMode"; revision: 1; type: "StereoMode" } + Property { name: "stereoEyeSeparation"; revision: 1; type: "double" } Signal { name: "matteEnabledChanged" Parameter { name: "enabled"; type: "bool" } @@ -373,6 +426,14 @@ Module { name: "scaleModeChanged" Parameter { name: "mode"; type: "ScaleMode" } } + Signal { + name: "stereoModeChanged" + Parameter { name: "mode"; type: "StereoMode" } + } + Signal { + name: "stereoEyeSeparationChanged" + Parameter { name: "separation"; type: "double" } + } Method { name: "setMatteEnabled" Parameter { name: "enabled"; type: "bool" } @@ -390,6 +451,14 @@ Module { Parameter { name: "mode"; type: "ScaleMode" } } Method { + name: "setStereoMode" + Parameter { name: "mode"; type: "StereoMode" } + } + Method { + name: "setStereoEyeSeparation" + Parameter { name: "separation"; type: "double" } + } + Method { name: "save" Parameter { name: "group"; type: "string" } Parameter { name: "organization"; type: "string" } |