Merge remote-tracking branch 'origin/5.6' into 5.7

Change-Id: I65ebe53c4eac112d7e124c19efe7273b6cde3657

7 files changed, 20 insertions, 19 deletions

diff --git a/src/chartsqml2/declarativecategoryaxis.cpp b/src/chartsqml2/declarativecategoryaxis.cpp
index 626a3004..44f0a1ef 100644
--- a/src/chartsqml2/declarativecategoryaxis.cpp
+++ b/src/chartsqml2/declarativecategoryaxis.cpp
@@ -48,7 +48,8 @@ DeclarativeCategoryRange::DeclarativeCategoryRange(QObject *parent) :
 }
 
 DeclarativeCategoryAxis::DeclarativeCategoryAxis(QObject *parent) :
-    QCategoryAxis(parent)
+    QCategoryAxis(parent),
+    m_labelsPosition(AxisLabelsPositionCenter)
 {
 }
 
diff --git a/tests/auto/qml-qtquicktest/tst_pieseries.qml b/tests/auto/qml-qtquicktest/tst_pieseries.qml
index 7d5c95b4..3e6a82e8 100644
--- a/tests/auto/qml-qtquicktest/tst_pieseries.qml
+++ b/tests/auto/qml-qtquicktest/tst_pieseries.qml
@@ -76,7 +76,7 @@ Rectangle {
             sumChangedSpy.clear();
             var count = 50;
             for (var i = 0; i < count; i++)
-                pieSeries.append("slice" + i, Math.random());
+                pieSeries.append("slice" + i, Math.random() + 0.01); // Add 0.01 to avoid zero
             compare(addedSpy.count, count);
             compare(countChangedSpy.count, count);
             compare(sumChangedSpy.count, count);
@@ -89,7 +89,7 @@ Rectangle {
             sumChangedSpy.clear();
             var count = 50;
             for (var i = 0; i < count; i++)
-                pieSeries.append("slice" + i, Math.random());
+                pieSeries.append("slice" + i, Math.random() + 0.01); // Add 0.01 to avoid zero
             for (var j = 0; j < count; j++)
                 pieSeries.remove(pieSeries.at(0));
             compare(removedSpy.count, count);
@@ -101,7 +101,7 @@ Rectangle {
         function test_find_and_at() {
             var count = 50;
             for (var i = 0; i < count; i++)
-                pieSeries.append("slice" + i, Math.random());
+                pieSeries.append("slice" + i, Math.random() + 0.01); // Add 0.01 to avoid zero
             for (var j = 0; j < count; j++) {
                 compare(pieSeries.find("slice" + j).label, "slice" + j);
                 compare(pieSeries.find("slice" + j).brushFilename, "");
diff --git a/tests/auto/qml-qtquicktest/tst_pieseries_1_1.qml b/tests/auto/qml-qtquicktest/tst_pieseries_1_1.qml
index 01b03827..5016d15e 100644
--- a/tests/auto/qml-qtquicktest/tst_pieseries_1_1.qml
+++ b/tests/auto/qml-qtquicktest/tst_pieseries_1_1.qml
@@ -75,7 +75,7 @@ Rectangle {
             sumChangedSpy.clear();
             var count = 50;
             for (var i = 0; i < count; i++)
-                pieSeries.append("slice" + i, Math.random());
+                pieSeries.append("slice" + i, Math.random() + 0.01); // Add 0.01 to avoid zero
             compare(addedSpy.count, count);
             compare(countChangedSpy.count, count);
             compare(sumChangedSpy.count, count);
@@ -88,7 +88,7 @@ Rectangle {
             sumChangedSpy.clear();
             var count = 50;
             for (var i = 0; i < count; i++)
-                pieSeries.append("slice" + i, Math.random());
+                pieSeries.append("slice" + i, Math.random() + 0.01); // Add 0.01 to avoid zero
             for (var j = 0; j < count; j++)
                 pieSeries.remove(pieSeries.at(0));
             compare(removedSpy.count, count);
@@ -100,7 +100,7 @@ Rectangle {
         function test_find() {
             var count = 50;
             for (var i = 0; i < count; i++)
-                pieSeries.append("slice" + i, Math.random());
+                pieSeries.append("slice" + i, Math.random() + 0.01); // Add 0.01 to avoid zero
             for (var j = 0; j < count; j++)
                 compare(pieSeries.find("slice" + j).label, "slice" + j);
             pieSeries.clear();
diff --git a/tests/auto/qml-qtquicktest/tst_pieseries_1_2.qml b/tests/auto/qml-qtquicktest/tst_pieseries_1_2.qml
index 5160975f..74ad1511 100644
--- a/tests/auto/qml-qtquicktest/tst_pieseries_1_2.qml
+++ b/tests/auto/qml-qtquicktest/tst_pieseries_1_2.qml
@@ -75,7 +75,7 @@ Rectangle {
             sumChangedSpy.clear();
             var count = 50;
             for (var i = 0; i < count; i++)
-                pieSeries.append("slice" + i, Math.random());
+                pieSeries.append("slice" + i, Math.random() + 0.01); // Add 0.01 to avoid zero
             compare(addedSpy.count, count);
             compare(countChangedSpy.count, count);
             compare(sumChangedSpy.count, count);
@@ -88,7 +88,7 @@ Rectangle {
             sumChangedSpy.clear();
             var count = 50;
             for (var i = 0; i < count; i++)
-                pieSeries.append("slice" + i, Math.random());
+                pieSeries.append("slice" + i, Math.random() + 0.01); // Add 0.01 to avoid zero
             for (var j = 0; j < count; j++)
                 pieSeries.remove(pieSeries.at(0));
             compare(removedSpy.count, count);
@@ -100,7 +100,7 @@ Rectangle {
         function test_find() {
             var count = 50;
             for (var i = 0; i < count; i++)
-                pieSeries.append("slice" + i, Math.random());
+                pieSeries.append("slice" + i, Math.random() + 0.01); // Add 0.01 to avoid zero
             for (var j = 0; j < count; j++)
                 compare(pieSeries.find("slice" + j).label, "slice" + j);
             pieSeries.clear();
diff --git a/tests/auto/qml-qtquicktest/tst_pieseries_1_3.qml b/tests/auto/qml-qtquicktest/tst_pieseries_1_3.qml
index 8e53b42f..15fd4b6e 100644
--- a/tests/auto/qml-qtquicktest/tst_pieseries_1_3.qml
+++ b/tests/auto/qml-qtquicktest/tst_pieseries_1_3.qml
@@ -75,7 +75,7 @@ Rectangle {
             sumChangedSpy.clear();
             var count = 50;
             for (var i = 0; i < count; i++)
-                pieSeries.append("slice" + i, Math.random());
+                pieSeries.append("slice" + i, Math.random() + 0.01); // Add 0.01 to avoid zero
             compare(addedSpy.count, count);
             compare(countChangedSpy.count, count);
             compare(sumChangedSpy.count, count);
@@ -88,7 +88,7 @@ Rectangle {
             sumChangedSpy.clear();
             var count = 50;
             for (var i = 0; i < count; i++)
-                pieSeries.append("slice" + i, Math.random());
+                pieSeries.append("slice" + i, Math.random() + 0.01); // Add 0.01 to avoid zero
             for (var j = 0; j < count; j++)
                 pieSeries.remove(pieSeries.at(0));
             compare(removedSpy.count, count);
@@ -100,7 +100,7 @@ Rectangle {
         function test_find() {
             var count = 50;
             for (var i = 0; i < count; i++)
-                pieSeries.append("slice" + i, Math.random());
+                pieSeries.append("slice" + i, Math.random() + 0.01); // Add 0.01 to avoid zero
             for (var j = 0; j < count; j++)
                 compare(pieSeries.find("slice" + j).label, "slice" + j);
             pieSeries.clear();
diff --git a/tests/auto/qml-qtquicktest/tst_pieseries_1_4.qml b/tests/auto/qml-qtquicktest/tst_pieseries_1_4.qml
index 393f631c..ccd133dd 100644
--- a/tests/auto/qml-qtquicktest/tst_pieseries_1_4.qml
+++ b/tests/auto/qml-qtquicktest/tst_pieseries_1_4.qml
@@ -76,7 +76,7 @@ Rectangle {
             sumChangedSpy.clear();
             var count = 50;
             for (var i = 0; i < count; i++)
-                pieSeries.append("slice" + i, Math.random());
+                pieSeries.append("slice" + i, Math.random() + 0.01); // Add 0.01 to avoid zero
             compare(addedSpy.count, count);
             compare(countChangedSpy.count, count);
             compare(sumChangedSpy.count, count);
@@ -89,7 +89,7 @@ Rectangle {
             sumChangedSpy.clear();
             var count = 50;
             for (var i = 0; i < count; i++)
-                pieSeries.append("slice" + i, Math.random());
+                pieSeries.append("slice" + i, Math.random() + 0.01); // Add 0.01 to avoid zero
             for (var j = 0; j < count; j++)
                 pieSeries.remove(pieSeries.at(0));
             compare(removedSpy.count, count);
@@ -101,7 +101,7 @@ Rectangle {
         function test_find_and_at() {
             var count = 50;
             for (var i = 0; i < count; i++)
-                pieSeries.append("slice" + i, Math.random());
+                pieSeries.append("slice" + i, Math.random() + 0.01); // Add 0.01 to avoid zero
             for (var j = 0; j < count; j++) {
                 compare(pieSeries.find("slice" + j).label, "slice" + j);
                 compare(pieSeries.find("slice" + j).brushFilename, "");
diff --git a/tests/auto/qml-qtquicktest/tst_pieseries_2_0.qml b/tests/auto/qml-qtquicktest/tst_pieseries_2_0.qml
index b1d3fa27..6a594fde 100644
--- a/tests/auto/qml-qtquicktest/tst_pieseries_2_0.qml
+++ b/tests/auto/qml-qtquicktest/tst_pieseries_2_0.qml
@@ -76,7 +76,7 @@ Rectangle {
             sumChangedSpy.clear();
             var count = 50;
             for (var i = 0; i < count; i++)
-                pieSeries.append("slice" + i, Math.random());
+                pieSeries.append("slice" + i, Math.random() + 0.01); // Add 0.01 to avoid zero
             compare(addedSpy.count, count);
             compare(countChangedSpy.count, count);
             compare(sumChangedSpy.count, count);
@@ -89,7 +89,7 @@ Rectangle {
             sumChangedSpy.clear();
             var count = 50;
             for (var i = 0; i < count; i++)
-                pieSeries.append("slice" + i, Math.random());
+                pieSeries.append("slice" + i, Math.random() + 0.01); // Add 0.01 to avoid zero
             for (var j = 0; j < count; j++)
                 pieSeries.remove(pieSeries.at(0));
             compare(removedSpy.count, count);
@@ -101,7 +101,7 @@ Rectangle {
         function test_find_and_at() {
             var count = 50;
             for (var i = 0; i < count; i++)
-                pieSeries.append("slice" + i, Math.random());
+                pieSeries.append("slice" + i, Math.random() + 0.01); // Add 0.01 to avoid zero
             for (var j = 0; j < count; j++) {
                 compare(pieSeries.find("slice" + j).label, "slice" + j);
                 compare(pieSeries.find("slice" + j).brushFilename, "");