diff options
author | Jani Heikkinen <jani.heikkinen@qt.io> | 2020-02-19 15:14:03 +0200 |
---|---|---|
committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2020-04-08 07:48:27 +0300 |
commit | 51719ae6e726ef8a30e7d0ab3e84d97b2ca67857 (patch) | |
tree | ed48621a92a6238a9536fe57fbd34f33a511fd10 | |
parent | 622c757a93624c660de9a33fc833a10de6a2efe6 (diff) |
Update plugins.qmltypes for 5.15
Task-number: QTBUG-82253
Change-Id: I64a804c306e06076f185ffaf422a1cb1f93b055b
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
-rw-r--r-- | src/quick3d/imports/animation/plugins.qmltypes | 2 | ||||
-rw-r--r-- | src/quick3d/imports/core/plugins.qmltypes | 2 | ||||
-rw-r--r-- | src/quick3d/imports/extras/plugins.qmltypes | 14 | ||||
-rw-r--r-- | src/quick3d/imports/input/plugins.qmltypes | 15 | ||||
-rw-r--r-- | src/quick3d/imports/logic/plugins.qmltypes | 2 | ||||
-rw-r--r-- | src/quick3d/imports/render/plugins.qmltypes | 96 | ||||
-rw-r--r-- | src/quick3d/imports/scene2d/plugins.qmltypes | 2 | ||||
-rw-r--r-- | src/quick3d/imports/scene3d/plugins.qmltypes | 2 |
8 files changed, 119 insertions, 16 deletions
diff --git a/src/quick3d/imports/animation/plugins.qmltypes b/src/quick3d/imports/animation/plugins.qmltypes index aff5ccb9c..beca47875 100644 --- a/src/quick3d/imports/animation/plugins.qmltypes +++ b/src/quick3d/imports/animation/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 -dependencies dependencies.json Qt3D.Animation 2.14' +// 'qmlplugindump -nonrelocatable -dependencies dependencies.json Qt3D.Animation 2.15' Module { dependencies: ["Qt3D.Core 2.0"] diff --git a/src/quick3d/imports/core/plugins.qmltypes b/src/quick3d/imports/core/plugins.qmltypes index 476bb99a7..e8cb1b43a 100644 --- a/src/quick3d/imports/core/plugins.qmltypes +++ b/src/quick3d/imports/core/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 Qt3D.Core 2.14' +// 'qmlplugindump -nonrelocatable Qt3D.Core 2.15' Module { dependencies: ["QtQuick 2.0"] diff --git a/src/quick3d/imports/extras/plugins.qmltypes b/src/quick3d/imports/extras/plugins.qmltypes index fcc15e022..a4e5d4503 100644 --- a/src/quick3d/imports/extras/plugins.qmltypes +++ b/src/quick3d/imports/extras/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 -dependencies dependencies.json Qt3D.Extras 2.14' +// 'qmlplugindump -nonrelocatable -dependencies dependencies.json Qt3D.Extras 2.15' Module { dependencies: ["Qt3D.Logic 2.0", "Qt3D.Render 2.0"] @@ -800,9 +800,10 @@ Module { exports: [ "Qt3D.Extras/ForwardRenderer 2.0", "Qt3D.Extras/ForwardRenderer 2.14", + "Qt3D.Extras/ForwardRenderer 2.15", "Qt3D.Extras/ForwardRenderer 2.9" ] - exportMetaObjectRevisions: [0, 14, 9] + exportMetaObjectRevisions: [0, 14, 15, 9] Property { name: "surface"; type: "QObject"; isPointer: true } Property { name: "window"; type: "QObject"; isPointer: true } Property { name: "viewportRect"; type: "QRectF" } @@ -812,6 +813,7 @@ Module { Property { name: "externalRenderTargetSize"; type: "QSize" } Property { name: "frustumCulling"; type: "bool" } Property { name: "gamma"; revision: 9; type: "float" } + Property { name: "showDebugOverlay"; revision: 15; type: "bool" } Signal { name: "viewportRectChanged" Parameter { name: "viewportRect"; type: "QRectF" } @@ -844,6 +846,10 @@ Module { name: "gammaChanged" Parameter { name: "gamma"; type: "float" } } + Signal { + name: "showDebugOverlayChanged" + Parameter { name: "showDebugOverlay"; type: "bool" } + } Method { name: "setViewportRect" Parameter { name: "viewportRect"; type: "QRectF" } @@ -876,6 +882,10 @@ Module { name: "setGamma" Parameter { name: "gamma"; type: "float" } } + Method { + name: "setShowDebugOverlay" + Parameter { name: "showDebugOverlay"; type: "bool" } + } } Component { name: "Qt3DExtras::QGoochMaterial" diff --git a/src/quick3d/imports/input/plugins.qmltypes b/src/quick3d/imports/input/plugins.qmltypes index 0a70b97c3..649c4a173 100644 --- a/src/quick3d/imports/input/plugins.qmltypes +++ b/src/quick3d/imports/input/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 -dependencies dependencies.json Qt3D.Input 2.14' +// 'qmlplugindump -nonrelocatable -dependencies dependencies.json Qt3D.Input 2.15' Module { dependencies: ["Qt3D.Core 2.0"] @@ -562,8 +562,8 @@ Module { Component { name: "Qt3DInput::QMouseDevice" prototype: "Qt3DInput::QAbstractPhysicalDevice" - exports: ["Qt3D.Input/MouseDevice 2.0"] - exportMetaObjectRevisions: [0] + exports: ["Qt3D.Input/MouseDevice 2.0", "Qt3D.Input/MouseDevice 2.15"] + exportMetaObjectRevisions: [0, 15] Enum { name: "Axis" values: { @@ -574,14 +574,23 @@ Module { } } Property { name: "sensitivity"; type: "float" } + Property { name: "updateAxesContinuously"; revision: 15; type: "bool" } Signal { name: "sensitivityChanged" Parameter { name: "value"; type: "float" } } + Signal { + name: "updateAxesContinuouslyChanged" + Parameter { name: "updateAxesContinuously"; type: "bool" } + } Method { name: "setSensitivity" Parameter { name: "value"; type: "float" } } + Method { + name: "setUpdateAxesContinuously" + Parameter { name: "updateAxesContinuously"; type: "bool" } + } } Component { name: "Qt3DInput::QMouseEvent" diff --git a/src/quick3d/imports/logic/plugins.qmltypes b/src/quick3d/imports/logic/plugins.qmltypes index 1ad7b1f58..f6e7cc9c7 100644 --- a/src/quick3d/imports/logic/plugins.qmltypes +++ b/src/quick3d/imports/logic/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 -dependencies dependencies.json Qt3D.Logic 2.14' +// 'qmlplugindump -nonrelocatable -dependencies dependencies.json Qt3D.Logic 2.15' Module { dependencies: ["Qt3D.Core 2.0"] diff --git a/src/quick3d/imports/render/plugins.qmltypes b/src/quick3d/imports/render/plugins.qmltypes index 6408abb27..8ea988efe 100644 --- a/src/quick3d/imports/render/plugins.qmltypes +++ b/src/quick3d/imports/render/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 -dependencies dependencies.json Qt3D.Render 2.14' +// 'qmlplugindump -nonrelocatable -dependencies dependencies.json Qt3D.Render 2.15' Module { dependencies: ["Qt3D.Core 2.0"] @@ -141,6 +141,12 @@ Module { Method { name: "raise" } Method { name: "lower" } Method { + name: "startSystemResize" + type: "bool" + Parameter { name: "edges"; type: "Qt::Edges" } + } + Method { name: "startSystemMove"; type: "bool" } + Method { name: "setTitle" Parameter { type: "string" } } @@ -2069,7 +2075,8 @@ Module { "OpenGLES": 2, "OpenGL": 1, "Vulkan": 3, - "DirectX": 4 + "DirectX": 4, + "RHI": 5 } } Enum { @@ -2799,6 +2806,59 @@ Module { } } Component { + name: "Qt3DRender::QRenderCapabilities" + prototype: "QObject" + exports: ["Qt3D.Render/RenderCapabilities 2.15"] + isCreatable: false + exportMetaObjectRevisions: [0] + Enum { + name: "API" + values: { + "OpenGL": 1, + "OpenGLES": 2 + } + } + Enum { + name: "Profile" + values: { + "NoProfile": 0, + "CoreProfile": 1, + "CompatibilityProfile": 2 + } + } + Property { name: "valid"; type: "bool"; isReadonly: true } + Property { name: "api"; type: "API"; isReadonly: true } + Property { name: "profile"; type: "Profile"; isReadonly: true } + Property { name: "majorVersion"; type: "int"; isReadonly: true } + Property { name: "minorVersion"; type: "int"; isReadonly: true } + Property { name: "extensions"; type: "QStringList"; isReadonly: true } + Property { name: "vendor"; type: "string"; isReadonly: true } + Property { name: "renderer"; type: "string"; isReadonly: true } + Property { name: "driverVersion"; type: "string"; isReadonly: true } + Property { name: "glslVersion"; type: "string"; isReadonly: true } + Property { name: "maxSamples"; type: "int"; isReadonly: true } + Property { name: "maxTextureSize"; type: "int"; isReadonly: true } + Property { name: "maxTextureUnits"; type: "int"; isReadonly: true } + Property { name: "maxTextureLayers"; type: "int"; isReadonly: true } + Property { name: "supportsUBO"; type: "bool"; isReadonly: true } + Property { name: "maxUBOSize"; type: "int"; isReadonly: true } + Property { name: "maxUBOBindings"; type: "int"; isReadonly: true } + Property { name: "supportsSSBO"; type: "bool"; isReadonly: true } + Property { name: "maxSSBOSize"; type: "int"; isReadonly: true } + Property { name: "maxSSBOBindings"; type: "int"; isReadonly: true } + Property { name: "supportsImageStore"; type: "bool"; isReadonly: true } + Property { name: "maxImageUnits"; type: "int"; isReadonly: true } + Property { name: "supportsCompute"; type: "bool"; isReadonly: true } + Property { name: "maxWorkGroupCountX"; type: "int"; isReadonly: true } + Property { name: "maxWorkGroupCountY"; type: "int"; isReadonly: true } + Property { name: "maxWorkGroupCountZ"; type: "int"; isReadonly: true } + Property { name: "maxWorkGroupSizeX"; type: "int"; isReadonly: true } + Property { name: "maxWorkGroupSizeY"; type: "int"; isReadonly: true } + Property { name: "maxWorkGroupSizeZ"; type: "int"; isReadonly: true } + Property { name: "maxComputeInvocations"; type: "int"; isReadonly: true } + Property { name: "maxComputeSharedMemorySize"; type: "int"; isReadonly: true } + } + Component { name: "Qt3DRender::QRenderCapture" prototype: "Qt3DRender::QFrameGraphNode" exports: [ @@ -2905,8 +2965,11 @@ Module { name: "Qt3DRender::QRenderSettings" defaultProperty: "activeFrameGraph" prototype: "Qt3DCore::QComponent" - exports: ["Qt3D.Render/RenderSettings 2.0"] - exportMetaObjectRevisions: [0] + exports: [ + "Qt3D.Render/RenderSettings 2.0", + "Qt3D.Render/RenderSettings 2.15" + ] + exportMetaObjectRevisions: [0, 15] Enum { name: "RenderPolicy" values: { @@ -2915,6 +2978,13 @@ Module { } } Property { + name: "renderCapabilities" + revision: 15 + type: "Qt3DRender::QRenderCapabilities" + isReadonly: true + isPointer: true + } + Property { name: "pickingSettings" type: "Qt3DRender::QPickingSettings" isReadonly: true @@ -3376,9 +3446,10 @@ Module { prototype: "Qt3DCore::QNode" exports: [ "Qt3D.Render/ShaderProgram 2.0", + "Qt3D.Render/ShaderProgram 2.15", "Qt3D.Render/ShaderProgram 2.9" ] - exportMetaObjectRevisions: [0, 9] + exportMetaObjectRevisions: [0, 15, 9] Enum { name: "ShaderType" values: { @@ -3398,6 +3469,13 @@ Module { "Error": 2 } } + Enum { + name: "Format" + values: { + "GLSL": 0, + "SPIRV": 1 + } + } Property { name: "vertexShaderCode"; type: "QByteArray" } Property { name: "tessellationControlShaderCode"; type: "QByteArray" } Property { name: "tessellationEvaluationShaderCode"; type: "QByteArray" } @@ -3406,6 +3484,7 @@ Module { Property { name: "computeShaderCode"; type: "QByteArray" } Property { name: "log"; revision: 9; type: "string"; isReadonly: true } Property { name: "status"; revision: 9; type: "Status"; isReadonly: true } + Property { name: "format"; revision: 15; type: "Format" } Signal { name: "vertexShaderCodeChanged" Parameter { name: "vertexShaderCode"; type: "QByteArray" } @@ -3438,6 +3517,10 @@ Module { name: "statusChanged" Parameter { name: "status"; type: "Status" } } + Signal { + name: "formatChanged" + Parameter { name: "format"; type: "Format" } + } Method { name: "setVertexShaderCode" Parameter { name: "vertexShaderCode"; type: "QByteArray" } @@ -3622,7 +3705,8 @@ Module { "BackToFront": 2, "Material": 4, "FrontToBack": 8, - "Texture": 16 + "Texture": 16, + "Uniform": 32 } } Property { name: "sortTypes"; type: "QVector<int>" } diff --git a/src/quick3d/imports/scene2d/plugins.qmltypes b/src/quick3d/imports/scene2d/plugins.qmltypes index 32fb8122f..16b892728 100644 --- a/src/quick3d/imports/scene2d/plugins.qmltypes +++ b/src/quick3d/imports/scene2d/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 -dependencies dependencies.json QtQuick.Scene2D 2.14' +// 'qmlplugindump -nonrelocatable -dependencies dependencies.json QtQuick.Scene2D 2.15' Module { dependencies: ["Qt3D.Core 2.0", "Qt3D.Render 2.0"] diff --git a/src/quick3d/imports/scene3d/plugins.qmltypes b/src/quick3d/imports/scene3d/plugins.qmltypes index aca01ac25..f0ce9a334 100644 --- a/src/quick3d/imports/scene3d/plugins.qmltypes +++ b/src/quick3d/imports/scene3d/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 -dependencies dependencies.json QtQuick.Scene3D 2.14' +// 'qmlplugindump -nonrelocatable -dependencies dependencies.json QtQuick.Scene3D 2.15' Module { dependencies: ["Qt3D.Core 2.0", "QtQuick 2.0"] |