From b73884bee5b22949c538b0f4854a397d3ca4ed74 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Tue, 8 Jun 2021 16:13:18 +0300 Subject: [PATCH] QmlPuppet: Fix runtime warnings in 3D editor Fixes: QDS-4491 Change-Id: I462e165ef59111f70c928b7d652ade99c5b3c0d0 Reviewed-by: Thomas Hartmann Reviewed-by: Mahmoud Badri --- .../qmlpuppet/mockfiles/AreaLightHandle.qml | 6 ++--- .../qml/qmlpuppet/mockfiles/Arrow.qml | 4 ++-- .../qml/qmlpuppet/mockfiles/AxisHelper.qml | 4 ++-- .../mockfiles/DirectionalDraggable.qml | 24 ++++++++++++++----- .../mockfiles/EditCameraController.qml | 6 ++--- .../qml/qmlpuppet/mockfiles/EditView3D.qml | 20 +++++++++++----- .../qml/qmlpuppet/mockfiles/FadeHandle.qml | 6 ++--- .../qml/qmlpuppet/mockfiles/IconGizmo.qml | 8 ++++--- .../qml/qmlpuppet/mockfiles/LightGizmo.qml | 22 +++++++++++------ .../qmlpuppet/mockfiles/PlanarDraggable.qml | 12 +++++++--- .../qmlpuppet/mockfiles/PlanarMoveHandle.qml | 4 ++-- .../qmlpuppet/mockfiles/PlanarScaleHandle.qml | 4 ++-- .../qml/qmlpuppet/mockfiles/RotateGizmo.qml | 12 +++++++--- .../qml/qmlpuppet/mockfiles/RotateRing.qml | 12 +++++++--- .../qml/qmlpuppet/mockfiles/ScaleGizmo.qml | 6 ++--- .../qml/qmlpuppet/mockfiles/ScaleRod.qml | 4 ++-- .../qmlpuppet/mockfiles/SpotLightHandle.qml | 6 ++--- .../qml2puppet/editor3d/camerageometry.cpp | 1 + .../qml2puppet/editor3d/gridgeometry.cpp | 1 + .../qml2puppet/editor3d/lightgeometry.cpp | 1 + .../qml2puppet/editor3d/linegeometry.cpp | 1 + .../editor3d/selectionboxgeometry.cpp | 1 + 22 files changed, 109 insertions(+), 56 deletions(-) diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/AreaLightHandle.qml b/share/qtcreator/qml/qmlpuppet/mockfiles/AreaLightHandle.qml index 64c827dbcf4..68cfa3a1cbe 100644 --- a/share/qtcreator/qml/qmlpuppet/mockfiles/AreaLightHandle.qml +++ b/share/qtcreator/qml/qmlpuppet/mockfiles/AreaLightHandle.qml @@ -67,18 +67,18 @@ DirectionalDraggable { handleRoot.currentMousePos = screenPos; } - onPressed: { + onPressed: (mouseArea, screenPos)=> { _startScale = autoScaler.relativeScale * baseScale; _startValue = propValue; updateValue(0, screenPos); } - onDragged: { + onDragged: (mouseArea, sceneRelativeDistance, relativeDistance, screenPos)=> { updateValue(relativeDistance, screenPos); handleRoot.valueChange(); } - onReleased: { + onReleased: (mouseArea, sceneRelativeDistance, relativeDistance, screenPos)=> { updateValue(relativeDistance, screenPos); handleRoot.valueCommit(); } diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/Arrow.qml b/share/qtcreator/qml/qmlpuppet/mockfiles/Arrow.qml index 0d8a9e8c3ee..8b5993a76f1 100644 --- a/share/qtcreator/qml/qmlpuppet/mockfiles/Arrow.qml +++ b/share/qtcreator/qml/qmlpuppet/mockfiles/Arrow.qml @@ -47,14 +47,14 @@ DirectionalDraggable { _generalHelper.restartMultiSelection(); } - onDragged: { + onDragged: (mouseArea, sceneRelativeDistance)=> { targetNode.position = localPos(sceneRelativeDistance); if (targetNode == multiSelectionNode) _generalHelper.moveMultiSelection(false); positionMove(); } - onReleased: { + onReleased: (mouseArea, sceneRelativeDistance)=> { targetNode.position = localPos(sceneRelativeDistance); if (targetNode == multiSelectionNode) _generalHelper.moveMultiSelection(true); diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/AxisHelper.qml b/share/qtcreator/qml/qmlpuppet/mockfiles/AxisHelper.qml index 7ae7bd44d91..b61b05bdd4a 100644 --- a/share/qtcreator/qml/qmlpuppet/mockfiles/AxisHelper.qml +++ b/share/qtcreator/qml/qmlpuppet/mockfiles/AxisHelper.qml @@ -113,11 +113,11 @@ View3D { } } - onPositionChanged: { + onPositionChanged: (mouse)=> { pick(mouse); } - onPressed: { + onPressed: (mouse)=> { pick(mouse); if (pickObj) { axisHelperView.editCameraCtrl.focusObject(axisHelperView.selectedNode, diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/DirectionalDraggable.qml b/share/qtcreator/qml/qmlpuppet/mockfiles/DirectionalDraggable.qml index 29548bee1e3..3607b8437ac 100644 --- a/share/qtcreator/qml/qmlpuppet/mockfiles/DirectionalDraggable.qml +++ b/share/qtcreator/qml/qmlpuppet/mockfiles/DirectionalDraggable.qml @@ -106,9 +106,15 @@ Model { dragHelper: rootModel.dragHelper priority: 5 - onPressed: rootModel.handlePressed(mouseAreaYZ, planePos, screenPos) - onDragged: rootModel.handleDragged(mouseAreaYZ, planePos, screenPos) - onReleased: rootModel.handleReleased(mouseAreaYZ, planePos, screenPos) + onPressed: (planePos, screenPos)=> { + rootModel.handlePressed(mouseAreaYZ, planePos, screenPos); + } + onDragged: (planePos, screenPos)=> { + rootModel.handleDragged(mouseAreaYZ, planePos, screenPos); + } + onReleased: (planePos, screenPos)=> { + rootModel.handleReleased(mouseAreaYZ, planePos, screenPos); + } } MouseArea3D { @@ -124,9 +130,15 @@ Model { dragHelper: rootModel.dragHelper priority: 5 - onPressed: rootModel.handlePressed(mouseAreaXZ, planePos, screenPos) - onDragged: rootModel.handleDragged(mouseAreaXZ, planePos, screenPos) - onReleased: rootModel.handleReleased(mouseAreaXZ, planePos, screenPos) + onPressed: (planePos, screenPos)=> { + rootModel.handlePressed(mouseAreaXZ, planePos, screenPos); + } + onDragged: (planePos, screenPos)=> { + rootModel.handleDragged(mouseAreaXZ, planePos, screenPos); + } + onReleased: (planePos, screenPos)=> { + rootModel.handleReleased(mouseAreaXZ, planePos, screenPos); + } } } diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/EditCameraController.qml b/share/qtcreator/qml/qmlpuppet/mockfiles/EditCameraController.qml index 13793699530..2b23117aa28 100644 --- a/share/qtcreator/qml/qmlpuppet/mockfiles/EditCameraController.qml +++ b/share/qtcreator/qml/qmlpuppet/mockfiles/EditCameraController.qml @@ -132,7 +132,7 @@ Item { acceptedButtons: Qt.LeftButton | Qt.RightButton | Qt.MiddleButton hoverEnabled: false anchors.fill: parent - onPositionChanged: { + onPositionChanged: (mouse)=> { if (cameraCtrl.camera && mouse.modifiers === Qt.AltModifier && cameraCtrl._dragging) { var currentPoint = Qt.vector3d(mouse.x, mouse.y, 0); if (cameraCtrl._button == Qt.LeftButton) { @@ -150,7 +150,7 @@ Item { } } } - onPressed: { + onPressed: (mouse)=> { if (cameraCtrl.camera && mouse.modifiers === Qt.AltModifier) { cameraCtrl._dragging = true; cameraCtrl._startRotation = cameraCtrl.camera.eulerRotation; @@ -173,7 +173,7 @@ Item { onReleased: handleRelease() onCanceled: handleRelease() - onWheel: { + onWheel: (wheel)=> { if (cameraCtrl.camera) { // Empirically determined divisor for nice zoom cameraCtrl.zoomRelative(wheel.angleDelta.y / -40); diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/EditView3D.qml b/share/qtcreator/qml/qmlpuppet/mockfiles/EditView3D.qml index 2de922997c9..318673e0c9e 100644 --- a/share/qtcreator/qml/qmlpuppet/mockfiles/EditView3D.qml +++ b/share/qtcreator/qml/qmlpuppet/mockfiles/EditView3D.qml @@ -604,8 +604,12 @@ Item { view3D: overlayView dragHelper: gizmoDragHelper - onPropertyValueCommit: viewRoot.commitObjectProperty([targetNode], [propName]) - onPropertyValueChange: viewRoot.changeObjectProperty([targetNode], [propName]) + onPropertyValueCommit: (propName)=> { + viewRoot.commitObjectProperty([targetNode], [propName]); + } + onPropertyValueChange: (propName)=> { + viewRoot.changeObjectProperty([targetNode], [propName]); + } } AutoScaleHelper { @@ -682,7 +686,7 @@ Item { property point pressPoint property bool initialMoveBlock: false - onPressed: { + onPressed: (mouse)=> { if (viewRoot.editView) { var pickResult = viewRoot.editView.pick(mouse.x, mouse.y); handleObjectClicked(_generalHelper.resolvePick(pickResult.objectHit), @@ -703,7 +707,7 @@ Item { } } } - onPositionChanged: { + onPositionChanged: (mouse)=> { if (freeDraggerArea) { if (initialMoveBlock && Math.abs(pressPoint.x - mouse.x) + Math.abs(pressPoint.y - mouse.y) > 10) { // Don't force press event at actual press, as that puts the gizmo @@ -728,8 +732,12 @@ Item { } } - onReleased: handleRelease(mouse) - onCanceled: handleRelease(mouse) + onReleased: (mouse)=> { + handleRelease(mouse); + } + onCanceled: (mouse)=> { + handleRelease(mouse); + } } DropArea { diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/FadeHandle.qml b/share/qtcreator/qml/qmlpuppet/mockfiles/FadeHandle.qml index 6c0d86a9e48..74564acce42 100644 --- a/share/qtcreator/qml/qmlpuppet/mockfiles/FadeHandle.qml +++ b/share/qtcreator/qml/qmlpuppet/mockfiles/FadeHandle.qml @@ -98,7 +98,7 @@ DirectionalDraggable { handleRoot.currentMousePos = screenPos; } - onPressed: { + onPressed: (mouseArea, screenPos)=> { _startScale = autoScaler.relativeScale * baseScale * dragScale; _startFadeScale = fadeScale; _l = targetNode.linearFade; @@ -116,12 +116,12 @@ DirectionalDraggable { updateFade(0, screenPos); } - onDragged: { + onDragged: (mouseArea, sceneRelativeDistance, relativeDistance, screenPos)=> { updateFade(relativeDistance, screenPos); handleRoot.valueChange(_currentProp); } - onReleased: { + onReleased: (mouseArea, sceneRelativeDistance, relativeDistance, screenPos)=> { updateFade(relativeDistance, screenPos); handleRoot.valueCommit(_currentProp); } diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/IconGizmo.qml b/share/qtcreator/qml/qmlpuppet/mockfiles/IconGizmo.qml index 78f4190621a..24459e08d4f 100644 --- a/share/qtcreator/qml/qmlpuppet/mockfiles/IconGizmo.qml +++ b/share/qtcreator/qml/qmlpuppet/mockfiles/IconGizmo.qml @@ -81,7 +81,7 @@ Item { MouseArea { id: iconMouseArea anchors.fill: parent - onPressed: { + onPressed: (mouse)=> { // Ignore singleselection mouse presses when we have single object selected // so that the icon gizmo doesn't hijack mouse clicks meant for other gizmos if (iconGizmo.selected && !(mouse.modifiers & Qt.ControlModifier) @@ -90,8 +90,10 @@ Item { } } - onClicked: iconGizmo.clicked(iconGizmo.targetNode, - mouse.modifiers & Qt.ControlModifier) + onClicked: (mouse)=> { + iconGizmo.clicked(iconGizmo.targetNode, + mouse.modifiers & Qt.ControlModifier); + } hoverEnabled: iconGizmo.highlightOnHover && !iconGizmo.selected acceptedButtons: Qt.LeftButton diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/LightGizmo.qml b/share/qtcreator/qml/qmlpuppet/mockfiles/LightGizmo.qml index b69884cb7d6..95f157d3a35 100644 --- a/share/qtcreator/qml/qmlpuppet/mockfiles/LightGizmo.qml +++ b/share/qtcreator/qml/qmlpuppet/mockfiles/LightGizmo.qml @@ -109,8 +109,12 @@ Node { lightGizmo.currentMousePos = currentMousePos; lightGizmo.currentLabel = currentLabel; } - onValueChange: lightGizmo.propertyValueChange(propName) - onValueCommit: lightGizmo.propertyValueCommit(propName) + onValueChange: (propName)=> { + lightGizmo.propertyValueChange(propName); + } + onValueCommit: (propName)=> { + lightGizmo.propertyValueCommit(propName); + } } } @@ -223,8 +227,12 @@ Node { lightGizmo.currentMousePos = currentMousePos; lightGizmo.currentLabel = currentLabel; } - onValueChange: lightGizmo.propertyValueChange(propName) - onValueCommit: lightGizmo.propertyValueCommit(propName) + onValueChange: (propName)=> { + lightGizmo.propertyValueChange(propName); + } + onValueCommit: (propName)=> { + lightGizmo.propertyValueCommit(propName); + } } } Node { @@ -322,17 +330,17 @@ Node { targetNode.brightness = currentValue; } - onPressed: { + onPressed: (mouseArea, screenPos)=> { _startBrightness = targetNode.brightness; updateBrightness(0, screenPos); } - onDragged: { + onDragged: (mouseArea, sceneRelativeDistance, relativeDistance, screenPos)=> { updateBrightness(relativeDistance, screenPos); lightGizmo.propertyValueChange("brightness"); } - onReleased: { + onReleased: (mouseArea, sceneRelativeDistance, relativeDistance, screenPos)=> { updateBrightness(relativeDistance, screenPos); lightGizmo.propertyValueCommit("brightness"); } diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/PlanarDraggable.qml b/share/qtcreator/qml/qmlpuppet/mockfiles/PlanarDraggable.qml index 0d66033eaad..41e35b6a3a6 100644 --- a/share/qtcreator/qml/qmlpuppet/mockfiles/PlanarDraggable.qml +++ b/share/qtcreator/qml/qmlpuppet/mockfiles/PlanarDraggable.qml @@ -105,9 +105,15 @@ Model { active: rootModel.active dragHelper: rootModel.dragHelper - onPressed: rootModel.handlePressed(mouseArea, planePos) - onDragged: rootModel.handleDragged(mouseArea, planePos) - onReleased: rootModel.handleReleased(mouseArea, planePos) + onPressed: (planePos)=> { + rootModel.handlePressed(mouseArea, planePos); + } + onDragged: (planePos)=> { + rootModel.handleDragged(mouseArea, planePos); + } + onReleased: (planePos)=> { + rootModel.handleReleased(mouseArea, planePos); + } } } diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/PlanarMoveHandle.qml b/share/qtcreator/qml/qmlpuppet/mockfiles/PlanarMoveHandle.qml index 069150cbaae..f6d72830c0a 100644 --- a/share/qtcreator/qml/qmlpuppet/mockfiles/PlanarMoveHandle.qml +++ b/share/qtcreator/qml/qmlpuppet/mockfiles/PlanarMoveHandle.qml @@ -48,14 +48,14 @@ PlanarDraggable { _generalHelper.restartMultiSelection(); } - onDragged: { + onDragged: (mouseArea, sceneRelativeDistance)=> { targetNode.position = localPos(sceneRelativeDistance); if (targetNode == multiSelectionNode) _generalHelper.moveMultiSelection(false); positionMove(); } - onReleased: { + onReleased: (mouseArea, sceneRelativeDistance)=> { targetNode.position = localPos(sceneRelativeDistance); if (targetNode == multiSelectionNode) _generalHelper.moveMultiSelection(true); diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/PlanarScaleHandle.qml b/share/qtcreator/qml/qmlpuppet/mockfiles/PlanarScaleHandle.qml index 3c6cd9d14b5..ca7d53ec730 100644 --- a/share/qtcreator/qml/qmlpuppet/mockfiles/PlanarScaleHandle.qml +++ b/share/qtcreator/qml/qmlpuppet/mockfiles/PlanarScaleHandle.qml @@ -46,7 +46,7 @@ PlanarDraggable { _startScale = targetNode.scale; } - onDragged: { + onDragged: (mouseArea, sceneRelativeDistance, relativeDistance)=> { targetNode.scale = mouseArea.getNewScale(_startScale, relativeDistance.times(scale.x), axisX, axisY); if (targetNode == multiSelectionNode) @@ -54,7 +54,7 @@ PlanarDraggable { scaleChange(); } - onReleased: { + onReleased: (mouseArea, sceneRelativeDistance, relativeDistance)=> { targetNode.scale = mouseArea.getNewScale(_startScale, relativeDistance.times(scale.x), axisX, axisY); if (targetNode == multiSelectionNode) diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/RotateGizmo.qml b/share/qtcreator/qml/qmlpuppet/mockfiles/RotateGizmo.qml index 571ac73c546..e9a53a42c69 100644 --- a/share/qtcreator/qml/qmlpuppet/mockfiles/RotateGizmo.qml +++ b/share/qtcreator/qml/qmlpuppet/mockfiles/RotateGizmo.qml @@ -279,9 +279,15 @@ Node { active: rotateGizmo.visible && !rotateGizmo.blocked dragHelper: rotateGizmo.dragHelper - onPressed: freeRotator.handlePressed(screenPos) - onDragged: freeRotator.handleDragged(screenPos) - onReleased: freeRotator.handleReleased(screenPos) + onPressed: (planePos, screenPos)=> { + freeRotator.handlePressed(screenPos); + } + onDragged: (planePos, screenPos)=> { + freeRotator.handleDragged(screenPos); + } + onReleased: (planePos, screenPos)=> { + freeRotator.handleReleased(screenPos); + } } } } diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/RotateRing.qml b/share/qtcreator/qml/qmlpuppet/mockfiles/RotateRing.qml index 6c8800c8225..e54b6301be1 100644 --- a/share/qtcreator/qml/qmlpuppet/mockfiles/RotateRing.qml +++ b/share/qtcreator/qml/qmlpuppet/mockfiles/RotateRing.qml @@ -151,8 +151,14 @@ Model { minAngle: 0.05 dragHelper: rotateRing.dragHelper - onPressed: rotateRing.handlePressed(screenPos, angle) - onDragged: rotateRing.handleDragged(screenPos) - onReleased: rotateRing.handleReleased(screenPos) + onPressed: (planePos, screenPos, angle)=> { + rotateRing.handlePressed(screenPos, angle); + } + onDragged: (planePos, screenPos)=> { + rotateRing.handleDragged(screenPos); + } + onReleased: (planePos, screenPos)=> { + rotateRing.handleReleased(screenPos); + } } } diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/ScaleGizmo.qml b/share/qtcreator/qml/qmlpuppet/mockfiles/ScaleGizmo.qml index f7071a8b79e..1b69a17ad17 100644 --- a/share/qtcreator/qml/qmlpuppet/mockfiles/ScaleGizmo.qml +++ b/share/qtcreator/qml/qmlpuppet/mockfiles/ScaleGizmo.qml @@ -208,7 +208,7 @@ Node { scaler * _startScale.z); } - onPressed: { + onPressed: (planePos, screenPos)=> { if (!scaleGizmo.targetNode) return; @@ -221,7 +221,7 @@ Node { scaleGizmo.targetNode.scale.z); _startScreenPos = screenPos; } - onDragged: { + onDragged: (planePos, screenPos)=> { if (!scaleGizmo.targetNode) return; scaleGizmo.targetNode.scale = localScale(screenPos); @@ -229,7 +229,7 @@ Node { _generalHelper.scaleMultiSelection(false); scaleGizmo.scaleChange(); } - onReleased: { + onReleased: (planePos, screenPos)=> { if (!scaleGizmo.targetNode) return; diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/ScaleRod.qml b/share/qtcreator/qml/qmlpuppet/mockfiles/ScaleRod.qml index af21ce4339f..a6f684ce62c 100644 --- a/share/qtcreator/qml/qmlpuppet/mockfiles/ScaleRod.qml +++ b/share/qtcreator/qml/qmlpuppet/mockfiles/ScaleRod.qml @@ -55,7 +55,7 @@ DirectionalDraggable { _startScale = targetNode.scale; } - onDragged: { + onDragged: (mouseArea, sceneRelativeDistance, relativeDistance)=> { targetNode.scale = mouseArea.getNewScale(_startScale, Qt.vector2d(relativeDistance, 0), axis, Qt.vector3d(0, 0, 0)); if (targetNode == multiSelectionNode) @@ -63,7 +63,7 @@ DirectionalDraggable { scaleChange(); } - onReleased: { + onReleased: (mouseArea, sceneRelativeDistance, relativeDistance)=> { targetNode.scale = mouseArea.getNewScale(_startScale, Qt.vector2d(relativeDistance, 0), axis, Qt.vector3d(0, 0, 0)); if (targetNode == multiSelectionNode) diff --git a/share/qtcreator/qml/qmlpuppet/mockfiles/SpotLightHandle.qml b/share/qtcreator/qml/qmlpuppet/mockfiles/SpotLightHandle.qml index badef266b64..ae06e05ab9a 100644 --- a/share/qtcreator/qml/qmlpuppet/mockfiles/SpotLightHandle.qml +++ b/share/qtcreator/qml/qmlpuppet/mockfiles/SpotLightHandle.qml @@ -65,17 +65,17 @@ DirectionalDraggable { handleRoot.currentMousePos = screenPos; } - onPressed: { + onPressed: (mouseArea, screenPos)=> { _startAngle = propValue; updateAngle(0, screenPos); } - onDragged: { + onDragged: (mouseArea, sceneRelativeDistance, relativeDistance, screenPos)=> { updateAngle(relativeDistance, screenPos); handleRoot.valueChange(); } - onReleased: { + onReleased: (mouseArea, sceneRelativeDistance, relativeDistance, screenPos)=> { updateAngle(relativeDistance, screenPos); handleRoot.valueCommit(); } diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/camerageometry.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/camerageometry.cpp index 0ba30125c3b..c1f533fedaf 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/camerageometry.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/camerageometry.cpp @@ -148,6 +148,7 @@ QSSGRenderGraphObject *CameraGeometry::updateSpatialNode(QSSGRenderGraphObject * m_camera->mapToViewport({}, m_viewPortRect.width(), m_viewPortRect.height()); } + setStride(12); // Silence a warning node = QQuick3DGeometry::updateSpatialNode(node); QSSGRenderGeometry *geometry = static_cast(node); diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/gridgeometry.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/gridgeometry.cpp index d45dd043aee..a9e12f69f45 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/gridgeometry.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/gridgeometry.cpp @@ -105,6 +105,7 @@ void GridGeometry::setIsCenterLine(bool enabled) QSSGRenderGraphObject *GridGeometry::updateSpatialNode(QSSGRenderGraphObject *node) { + setStride(12); // Silence a warning node = QQuick3DGeometry::updateSpatialNode(node); QSSGRenderGeometry *geometry = static_cast(node); geometry->clear(); diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/lightgeometry.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/lightgeometry.cpp index 2277adb806e..735c237a0fb 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/lightgeometry.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/lightgeometry.cpp @@ -79,6 +79,7 @@ QSSGRenderGraphObject *LightGeometry::updateSpatialNode(QSSGRenderGraphObject *n if (m_lightType == LightType::Invalid) return node; + setStride(12); // Silence a warning node = QQuick3DGeometry::updateSpatialNode(node); QSSGRenderGeometry *geometry = static_cast(node); diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/linegeometry.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/linegeometry.cpp index 680c8605b6e..314b7a3136b 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/linegeometry.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/linegeometry.cpp @@ -84,6 +84,7 @@ void LineGeometry::setEndPos(const QVector3D &pos) QSSGRenderGraphObject *LineGeometry::updateSpatialNode(QSSGRenderGraphObject *node) { + setStride(12); // Silence a warning node = QQuick3DGeometry::updateSpatialNode(node); QSSGRenderGeometry *geometry = static_cast(node); geometry->clear(); diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/selectionboxgeometry.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/selectionboxgeometry.cpp index 54ad2b10fe9..875fd3e81e1 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/selectionboxgeometry.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/selectionboxgeometry.cpp @@ -154,6 +154,7 @@ QSSGRenderGraphObject *SelectionBoxGeometry::updateSpatialNode(QSSGRenderGraphOb return node; } + setStride(12); // Silence a warning node = QQuick3DGeometry::updateSpatialNode(node); QSSGRenderGeometry *geometry = static_cast(node);