diff options
author | Tomi Korpipaa <tomi.korpipaa@qt.io> | 2023-01-18 13:11:59 +0200 |
---|---|---|
committer | Tomi Korpipaa <tomi.korpipaa@qt.io> | 2023-01-19 15:01:06 +0200 |
commit | 1642c98c919e3fab6dedd465638dd72619bc4641 (patch) | |
tree | 6f7e168164ee37c6b1ad33acf08dbdd974df65f3 /examples/datavisualization/qmlsurface/qml/qmlsurface/main.qml | |
parent | 5933f55a52bec88d4fe3222418abb1d5b6d1f6d1 (diff) |
Fix qmllint warnings in qmlsurface
Pick-to: 6.5
Task-number: QTBUG-110274
Change-Id: I50327348ad6e8e6ab0a58ef0e97eadcf229d5472
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Diffstat (limited to 'examples/datavisualization/qmlsurface/qml/qmlsurface/main.qml')
-rw-r--r-- | examples/datavisualization/qmlsurface/qml/qmlsurface/main.qml | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/examples/datavisualization/qmlsurface/qml/qmlsurface/main.qml b/examples/datavisualization/qmlsurface/qml/qmlsurface/main.qml index d1f4589e..e6f228f1 100644 --- a/examples/datavisualization/qmlsurface/qml/qmlsurface/main.qml +++ b/examples/datavisualization/qmlsurface/qml/qmlsurface/main.qml @@ -4,7 +4,6 @@ import QtQuick import QtQuick.Controls import QtDataVisualization -import "." Rectangle { id: mainview @@ -81,7 +80,7 @@ Rectangle { yPosRole: "height" } //! [6] - onDrawModeChanged: checkState() + onDrawModeChanged: mainview.checkState() } //! [4] Surface3DSeries { @@ -99,7 +98,7 @@ Rectangle { maxXValue: 97 } - onDrawModeChanged: checkState() + onDrawModeChanged: mainview.checkState() } //! [4] } @@ -111,8 +110,8 @@ Rectangle { anchors.left: parent.left anchors.right: parent.right anchors.margins: 10 - height: portraitMode ? surfaceGridToggle.implicitHeight * 4 + 15 - : surfaceGridToggle.implicitHeight * 3 + 10 + height: mainview.portraitMode ? surfaceGridToggle.implicitHeight * 4 + 15 + : surfaceGridToggle.implicitHeight * 3 + 10 opacity: 0.5 Button { @@ -120,7 +119,7 @@ Rectangle { anchors.margins: 5 anchors.left: parent.left anchors.top: parent.top - width: portraitMode ? (mainview.width - 35) / 2 : (mainview.width - 40) / 3 + width: mainview.portraitMode ? (mainview.width - 35) / 2 : (mainview.width - 40) / 3 text: "Show Surface\nGrid" //! [1] onClicked: { @@ -140,7 +139,7 @@ Rectangle { anchors.margins: 5 anchors.left: surfaceGridToggle.right anchors.top: parent.top - width: portraitMode ? (mainview.width - 35) / 2 : (mainview.width - 40) / 3 + width: mainview.portraitMode ? (mainview.width - 35) / 2 : (mainview.width - 40) / 3 text: "Red surface\ngrid color" onClicked: { if (Qt.colorEqual(surfaceSeries.wireframeColor, "#000000") @@ -160,9 +159,9 @@ Rectangle { Button { id: surfaceToggle anchors.margins: 5 - anchors.left: portraitMode ? parent.left : surfaceGridColor.right - anchors.top: portraitMode ? surfaceGridColor.bottom : parent.top - width: portraitMode ? (mainview.width - 35) / 2 : (mainview.width - 40) / 3 + anchors.left: mainview.portraitMode ? parent.left : surfaceGridColor.right + anchors.top: mainview.portraitMode ? surfaceGridColor.bottom : parent.top + width: mainview.portraitMode ? (mainview.width - 35) / 2 : (mainview.width - 40) / 3 text: "Hide\nSurface" //! [8] onClicked: { @@ -180,9 +179,9 @@ Rectangle { Button { id: flatShadingToggle anchors.margins: 5 - anchors.left: portraitMode ? surfaceToggle.right : parent.left - anchors.top: portraitMode ? surfaceGridColor.bottom : surfaceToggle.bottom - width: portraitMode ? (mainview.width - 35) / 2 : (mainview.width - 40) / 3 + anchors.left: mainview.portraitMode ? surfaceToggle.right : parent.left + anchors.top: mainview.portraitMode ? surfaceGridColor.bottom : surfaceToggle.bottom + width: mainview.portraitMode ? (mainview.width - 35) / 2 : (mainview.width - 40) / 3 text: surfaceSeries.flatShadingSupported ? "Show\nFlat" : "Flat not\nsupported" enabled: surfaceSeries.flatShadingSupported //! [2] @@ -203,9 +202,9 @@ Rectangle { Button { id: backgroundToggle anchors.margins: 5 - anchors.left: portraitMode ? parent.left : flatShadingToggle.right - anchors.top: portraitMode ? flatShadingToggle.bottom : surfaceToggle.bottom - width: portraitMode ? (mainview.width - 35) / 2 : (mainview.width - 40) / 3 + anchors.left: mainview.portraitMode ? parent.left : flatShadingToggle.right + anchors.top: mainview.portraitMode ? flatShadingToggle.bottom : surfaceToggle.bottom + width: mainview.portraitMode ? (mainview.width - 35) / 2 : (mainview.width - 40) / 3 text: "Hide\nBackground" onClicked: { if (surfacePlot.theme.backgroundEnabled === true) { @@ -222,8 +221,8 @@ Rectangle { id: gridToggle anchors.margins: 5 anchors.left: backgroundToggle.right - anchors.top: portraitMode ? flatShadingToggle.bottom : surfaceToggle.bottom - width: portraitMode ? (mainview.width - 35) / 2 : (mainview.width - 40) / 3 + anchors.top: mainview.portraitMode ? flatShadingToggle.bottom : surfaceToggle.bottom + width: mainview.portraitMode ? (mainview.width - 35) / 2 : (mainview.width - 40) / 3 text: "Hide\nGrid" onClicked: { if (surfacePlot.theme.gridEnabled === true) { |