From 20d1d25119e67724ac8fcb0a69451cd8c1fb984c Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Thu, 30 Oct 2014 13:19:28 +0200 Subject: Fix crash on qmloscilloscope in Qt 5.4 Binding slider value to its minimum value is not correct, so just initialize it on component complete. Change-Id: Ia21ecbffdef84448b70c6b09d240ea4f854ca541 Reviewed-by: Mika Salmela --- examples/datavisualization/qmloscilloscope/datasource.cpp | 2 +- examples/datavisualization/qmloscilloscope/qml/qmloscilloscope/main.qml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'examples/datavisualization') diff --git a/examples/datavisualization/qmloscilloscope/datasource.cpp b/examples/datavisualization/qmloscilloscope/datasource.cpp index f466b2b0..0bb5ec2b 100644 --- a/examples/datavisualization/qmloscilloscope/datasource.cpp +++ b/examples/datavisualization/qmloscilloscope/datasource.cpp @@ -45,7 +45,7 @@ void DataSource::generateData(int cacheCount, int rowCount, int columnCount, float xMin, float xMax, float yMin, float yMax, float zMin, float zMax) { - if (!cacheCount) + if (!cacheCount || !rowCount || !columnCount) return; clearData(); diff --git a/examples/datavisualization/qmloscilloscope/qml/qmloscilloscope/main.qml b/examples/datavisualization/qmloscilloscope/qml/qmloscilloscope/main.qml index c2e6b70b..2ad43e97 100644 --- a/examples/datavisualization/qmloscilloscope/qml/qmloscilloscope/main.qml +++ b/examples/datavisualization/qmloscilloscope/qml/qmloscilloscope/main.qml @@ -150,7 +150,7 @@ Item { maximumValue: minimumValue * 10 stepSize: mainView.sampleCache updateValueWhileDragging: false - value: minimumValue * 2 + Component.onCompleted: value = minimumValue * 2 } Rectangle { -- cgit v1.2.3