summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorSami Varanka <sami.varanka@qt.io>2021-04-16 13:01:42 +0300
committerSami Varanka <sami.varanka@qt.io>2021-04-22 07:40:20 +0300
commit7953e45cb47fd264d446dcbe7c5186cef8987e5b (patch)
treedeb91811a2612536ae99db96a96dcd8dc65082e8 /examples
parent66fba36bd8699aaa7f1e424cb5c7b241849a1d2a (diff)
Fix qml3doscilloscope example crash
Changed buttonlayout's minimumheight property to use flatshadingtoggle's implicitHeight instead of height. Created a ticket to quick layouts (QTBUG-92896). Also removed direct rendering (QTBUG-90665) Pick-to: 6.1 Fixes: QTBUG-92830 Change-Id: I088ccfad19bf44a5aa7b837fb8e2f5fd3ee4752a Reviewed-by: Tuomo Pelkonen <tuomo.pelkonen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Diffstat (limited to 'examples')
-rw-r--r--examples/datavisualization/qml3doscilloscope/doc/src/qml3doscilloscope.qdoc5
-rw-r--r--examples/datavisualization/qml3doscilloscope/qml/qml3doscilloscope/main.qml7
2 files changed, 4 insertions, 8 deletions
diff --git a/examples/datavisualization/qml3doscilloscope/doc/src/qml3doscilloscope.qdoc b/examples/datavisualization/qml3doscilloscope/doc/src/qml3doscilloscope.qdoc
index 6ad3f69f..3772df32 100644
--- a/examples/datavisualization/qml3doscilloscope/doc/src/qml3doscilloscope.qdoc
+++ b/examples/datavisualization/qml3doscilloscope/doc/src/qml3doscilloscope.qdoc
@@ -110,6 +110,7 @@
\snippet qml3doscilloscope/qml/qml3doscilloscope/main.qml 3
+ \omit
\section1 Enabling Direct Rendering
Since this application potentially deals with a lot of rapidly changing data, we use direct
@@ -121,8 +122,6 @@
\snippet qml3doscilloscope/main.cpp 1
\dots 0
\snippet qml3doscilloscope/main.cpp 2
+ \endomit
- On the QML side, direct rendering mode is enabled via \l{AbstractGraph3D::renderingMode}{renderingMode} property:
-
- \snippet qml3doscilloscope/qml/qml3doscilloscope/main.qml 5
*/
diff --git a/examples/datavisualization/qml3doscilloscope/qml/qml3doscilloscope/main.qml b/examples/datavisualization/qml3doscilloscope/qml/qml3doscilloscope/main.qml
index 7a97764a..70484c18 100644
--- a/examples/datavisualization/qml3doscilloscope/qml/qml3doscilloscope/main.qml
+++ b/examples/datavisualization/qml3doscilloscope/qml/qml3doscilloscope/main.qml
@@ -60,9 +60,6 @@ Item {
height: dataView.height
shadowQuality: AbstractGraph3D.ShadowQualityNone
selectionMode: AbstractGraph3D.SelectionSlice | AbstractGraph3D.SelectionItemAndRow
- //! [5]
- renderingMode: AbstractGraph3D.RenderDirectToBackground
- //! [5]
axisX.labelFormat: "%d ms"
axisY.labelFormat: "%d W"
@@ -132,7 +129,7 @@ Item {
id: sliderLayout
Layout.fillHeight: true
Layout.fillWidth: true
- Layout.minimumHeight: flatShadingToggle.height
+ Layout.minimumHeight: flatShadingToggle.implicitHeight
spacing: 0
Rectangle {
@@ -268,7 +265,7 @@ Item {
id: buttonLayout
Layout.fillHeight: true
Layout.fillWidth: true
- Layout.minimumHeight: flatShadingToggle.height
+ Layout.minimumHeight: flatShadingToggle.implicitHeight
spacing: 0
Button {