diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-21 09:56:15 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-21 09:56:15 +0100 |
| commit | dd07bf6a9aadf1db040df12fb8796782fe6b46f6 (patch) | |
| tree | 2de1ec666be68f9f1c954228e4bb499aef535177 | |
| parent | c01b60a4882f256eea58ffc87d3aac9ce146f98d (diff) | |
| parent | de84efac79724970bcdeac7fcdfe72a5fa846761 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Ie7acee62aed1dbf64681ad0aa5d455b88139ccab
4 files changed, 8 insertions, 8 deletions
diff --git a/tests/auto/qml-qtquicktest/tst_boxplotseries.qml b/tests/auto/qml-qtquicktest/tst_boxplotseries.qml index 9927654f..06f01e20 100644 --- a/tests/auto/qml-qtquicktest/tst_boxplotseries.qml +++ b/tests/auto/qml-qtquicktest/tst_boxplotseries.qml @@ -58,7 +58,7 @@ Rectangle { countChangedSpy.clear(); var count = 50; for (var i = 0; i < count; i++) - boxPlotSeries.append("boxplot" + i, Math.random()); + boxPlotSeries.append("boxplot" + i, [1, 3, 5, 7, 9]); compare(addedSpy.count, count); compare(countChangedSpy.count, count); compare(boxPlotSeries.count, count) @@ -71,7 +71,7 @@ Rectangle { countChangedSpy.clear(); var count = 50; for (var i = 0; i < count; i++) - boxPlotSeries.append("boxplot" + i, Math.random()); + boxPlotSeries.append("boxplot" + i, [1, 3, 5, 7, 9]); for (var j = 0; j < count; j++) boxPlotSeries.remove(boxPlotSeries.at(0)); compare(removedSpy.count, count); diff --git a/tests/auto/qml-qtquicktest/tst_boxplotseries_1_3.qml b/tests/auto/qml-qtquicktest/tst_boxplotseries_1_3.qml index 746b401e..35606f75 100644 --- a/tests/auto/qml-qtquicktest/tst_boxplotseries_1_3.qml +++ b/tests/auto/qml-qtquicktest/tst_boxplotseries_1_3.qml @@ -55,7 +55,7 @@ Rectangle { countChangedSpy.clear(); var count = 50; for (var i = 0; i < count; i++) - boxPlotSeries.append("boxplot" + i, Math.random()); + boxPlotSeries.append("boxplot" + i, [1, 3, 5, 7, 9]); compare(addedSpy.count, count); compare(countChangedSpy.count, count); boxPlotSeries.clear(); @@ -66,7 +66,7 @@ Rectangle { countChangedSpy.clear(); var count = 50; for (var i = 0; i < count; i++) - boxPlotSeries.append("boxplot" + i, Math.random()); + boxPlotSeries.append("boxplot" + i, [1, 3, 5, 7, 9]); for (var j = 0; j < count; j++) boxPlotSeries.remove(boxPlotSeries.at(0)); compare(removedSpy.count, count); diff --git a/tests/auto/qml-qtquicktest/tst_boxplotseries_1_4.qml b/tests/auto/qml-qtquicktest/tst_boxplotseries_1_4.qml index ddedd9b0..51014e11 100644 --- a/tests/auto/qml-qtquicktest/tst_boxplotseries_1_4.qml +++ b/tests/auto/qml-qtquicktest/tst_boxplotseries_1_4.qml @@ -58,7 +58,7 @@ Rectangle { countChangedSpy.clear(); var count = 50; for (var i = 0; i < count; i++) - boxPlotSeries.append("boxplot" + i, Math.random()); + boxPlotSeries.append("boxplot" + i, [1, 3, 5, 7, 9]); compare(addedSpy.count, count); compare(countChangedSpy.count, count); compare(boxPlotSeries.count, count) @@ -71,7 +71,7 @@ Rectangle { countChangedSpy.clear(); var count = 50; for (var i = 0; i < count; i++) - boxPlotSeries.append("boxplot" + i, Math.random()); + boxPlotSeries.append("boxplot" + i, [1, 3, 5, 7, 9]); for (var j = 0; j < count; j++) boxPlotSeries.remove(boxPlotSeries.at(0)); compare(removedSpy.count, count); diff --git a/tests/auto/qml-qtquicktest/tst_boxplotseries_2_0.qml b/tests/auto/qml-qtquicktest/tst_boxplotseries_2_0.qml index 032b5547..58711a8f 100644 --- a/tests/auto/qml-qtquicktest/tst_boxplotseries_2_0.qml +++ b/tests/auto/qml-qtquicktest/tst_boxplotseries_2_0.qml @@ -58,7 +58,7 @@ Rectangle { countChangedSpy.clear(); var count = 50; for (var i = 0; i < count; i++) - boxPlotSeries.append("boxplot" + i, Math.random()); + boxPlotSeries.append("boxplot" + i, [1, 3, 5, 7, 9]); compare(addedSpy.count, count); compare(countChangedSpy.count, count); compare(boxPlotSeries.count, count) @@ -71,7 +71,7 @@ Rectangle { countChangedSpy.clear(); var count = 50; for (var i = 0; i < count; i++) - boxPlotSeries.append("boxplot" + i, Math.random()); + boxPlotSeries.append("boxplot" + i, [1, 3, 5, 7, 9]); for (var j = 0; j < count; j++) boxPlotSeries.remove(boxPlotSeries.at(0)); compare(removedSpy.count, count); |