From 7953e45cb47fd264d446dcbe7c5186cef8987e5b Mon Sep 17 00:00:00 2001 From: Sami Varanka Date: Fri, 16 Apr 2021 13:01:42 +0300 Subject: Fix qml3doscilloscope example crash MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Tomi Korpipää --- .../qml3doscilloscope/doc/src/qml3doscilloscope.qdoc | 5 ++--- .../qml3doscilloscope/qml/qml3doscilloscope/main.qml | 7 ++----- 2 files changed, 4 insertions(+), 8 deletions(-) (limited to 'examples/datavisualization') 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 { -- cgit v1.2.3