summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@theqtcompany.com>2014-10-30 13:19:28 +0200
committerMiikka Heikkinen <miikka.heikkinen@theqtcompany.com>2014-10-30 14:50:46 +0200
commit20d1d25119e67724ac8fcb0a69451cd8c1fb984c (patch)
treec189d52518e5c74366de521559b1ba59a12a9da4 /examples
parentbed7f3fbf6ef94e11c9b8620f7926a1b6751024f (diff)
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 <mika.salmela@theqtcompany.com>
Diffstat (limited to 'examples')
-rw-r--r--examples/datavisualization/qmloscilloscope/datasource.cpp2
-rw-r--r--examples/datavisualization/qmloscilloscope/qml/qmloscilloscope/main.qml2
2 files changed, 2 insertions, 2 deletions
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 {