summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorSami Varanka <sami.varanka@qt.io>2021-05-18 16:04:25 +0300
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-05-25 04:21:33 +0000
commit08114577e37380314128ed0b05e9a2a067557824 (patch)
tree629401fb7fe042adf3d38ff501851143130c1d9c /examples
parentdb1a5e82fcd48e82485fe24e214f71b9e0aebfac (diff)
Fix warnings in datavisualization examples
Injection of parameters into signal handlers is deprecated. So those signal handlers using parameters needed to be changed to use formal parameters instead. Uncommented the theme in qmlperf manual test. Added missing space to qmlgradient manual test. Fixes: QTBUG-92995 Change-Id: I5999df841c077be63a9f01d71188c07574b2669e Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> (cherry picked from commit 3184afc8c9cea87fdfc71ed003f29cb29c23ed40) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'examples')
-rw-r--r--examples/datavisualization/qml3doscilloscope/qml/qml3doscilloscope/main.qml4
-rw-r--r--examples/datavisualization/qmlaxisdrag/qml/qmlaxisdrag/main.qml4
-rw-r--r--examples/datavisualization/qmlbars/qml/qmlbars/main.qml4
-rw-r--r--examples/datavisualization/qmlcustominput/qml/qmlcustominput/main.qml4
-rw-r--r--examples/datavisualization/qmlspectrogram/qml/qmlspectrogram/main.qml10
5 files changed, 12 insertions, 14 deletions
diff --git a/examples/datavisualization/qml3doscilloscope/qml/qml3doscilloscope/main.qml b/examples/datavisualization/qml3doscilloscope/qml/qml3doscilloscope/main.qml
index 70484c18..ba733c21 100644
--- a/examples/datavisualization/qml3doscilloscope/qml/qml3doscilloscope/main.qml
+++ b/examples/datavisualization/qml3doscilloscope/qml/qml3doscilloscope/main.qml
@@ -75,7 +75,7 @@ Item {
axisZ.segmentCount: 4
measureFps: true
- onCurrentFpsChanged: {
+ onCurrentFpsChanged: (fps)=> {
if (fps > 10)
fpsText.text = "FPS: " + Math.round(surfaceGraph.currentFps)
else
@@ -118,7 +118,7 @@ Item {
Rectangle {
width: parent.width
- height: flatShadingToggle.height * 2
+ height: flatShadingToggle.implicitHeight * 2
anchors.left: parent.left
anchors.top: parent.top
color: surfaceGraph.theme.backgroundColor
diff --git a/examples/datavisualization/qmlaxisdrag/qml/qmlaxisdrag/main.qml b/examples/datavisualization/qmlaxisdrag/qml/qmlaxisdrag/main.qml
index 642da51a..ac4cbd85 100644
--- a/examples/datavisualization/qmlaxisdrag/qml/qmlaxisdrag/main.qml
+++ b/examples/datavisualization/qmlaxisdrag/qml/qmlaxisdrag/main.qml
@@ -186,7 +186,7 @@ Item {
//! [1]
//! [3]
- onPositionChanged: {
+ onPositionChanged: (mouse)=> {
currentMouseX = mouse.x;
currentMouseY = mouse.y;
//! [3]
@@ -201,7 +201,7 @@ Item {
//! [4]
//! [2]
- onPressed: {
+ onPressed: (mouse)=> {
scatterGraph.scene.selectionQueryPosition = Qt.point(mouse.x, mouse.y);
}
//! [2]
diff --git a/examples/datavisualization/qmlbars/qml/qmlbars/main.qml b/examples/datavisualization/qmlbars/qml/qmlbars/main.qml
index b32a2aa0..ab855fd9 100644
--- a/examples/datavisualization/qmlbars/qml/qmlbars/main.qml
+++ b/examples/datavisualization/qmlbars/qml/qmlbars/main.qml
@@ -142,7 +142,7 @@ Rectangle {
ColorGradientStop { position: 0.0; color: "#600000" }
}
- onSelectedBarChanged: handleSelectionChange(secondarySeries, position)
+ onSelectedBarChanged: (position)=> handleSelectionChange(secondarySeries, position)
}
//! [3]
@@ -171,7 +171,7 @@ Rectangle {
ColorGradientStop { position: 0.0; color: "#006000" }
}
- onSelectedBarChanged: handleSelectionChange(barSeries, position)
+ onSelectedBarChanged: (position)=> handleSelectionChange(barSeries, position)
}
}
}
diff --git a/examples/datavisualization/qmlcustominput/qml/qmlcustominput/main.qml b/examples/datavisualization/qmlcustominput/qml/qmlcustominput/main.qml
index 67972b6a..23fb13ee 100644
--- a/examples/datavisualization/qmlcustominput/qml/qmlcustominput/main.qml
+++ b/examples/datavisualization/qmlcustominput/qml/qmlcustominput/main.qml
@@ -112,14 +112,14 @@ Rectangle {
//! [2]
//! [3]
- onPositionChanged: {
+ onPositionChanged: (mouse)=> {
mouseX = mouse.x;
mouseY = mouse.y;
}
//! [3]
//! [5]
- onWheel: {
+ onWheel: (wheel)=> {
// Adjust zoom level based on what zoom range we're in.
var zoomLevel = scatterGraph.scene.activeCamera.zoomLevel;
if (zoomLevel > 100)
diff --git a/examples/datavisualization/qmlspectrogram/qml/qmlspectrogram/main.qml b/examples/datavisualization/qmlspectrogram/qml/qmlspectrogram/main.qml
index 3e7478ef..35143179 100644
--- a/examples/datavisualization/qmlspectrogram/qml/qmlspectrogram/main.qml
+++ b/examples/datavisualization/qmlspectrogram/qml/qmlspectrogram/main.qml
@@ -221,12 +221,10 @@ Window {
Layout.fillHeight: true
text: "Toggle axis grid on top"
onClicked: {
- onClicked: {
- if (surfaceGraph.flipHorizontalGrid === true) {
- surfaceGraph.flipHorizontalGrid = false;
- } else {
- surfaceGraph.flipHorizontalGrid = true;
- }
+ if (surfaceGraph.flipHorizontalGrid === true) {
+ surfaceGraph.flipHorizontalGrid = false;
+ } else {
+ surfaceGraph.flipHorizontalGrid = true;
}
}
}