Merge remote-tracking branch 'origin/5.8' into dev

Conflicts:
	tests/auto/cpptest/q3dscene/tst_scene.cpp
	tests/auto/qmltest/scene3d/tst_scene.qml

Change-Id: I0aef5e7d8fe202e7f4c7565922938d1627ab8124

3 files changed, 20 insertions, 5 deletions

diff --git a/src/datavisualization/engine/bars3dcontroller.cpp b/src/datavisualization/engine/bars3dcontroller.cpp
index 1cfc4e64..6b304026 100644
--- a/src/datavisualization/engine/bars3dcontroller.cpp
+++ b/src/datavisualization/engine/bars3dcontroller.cpp
@@ -147,7 +147,12 @@ void Bars3DController::synchDataToRenderer()
 
 void Bars3DController::handleArrayReset()
 {
-    QBar3DSeries *series = static_cast<QBarDataProxy *>(sender())->series();
+    QBar3DSeries *series;
+    if (qobject_cast<QBarDataProxy *>(sender()))
+        series = static_cast<QBarDataProxy *>(sender())->series();
+    else
+        series = static_cast<QBar3DSeries *>(sender());
+
     if (series->isVisible()) {
         adjustAxisRanges();
         m_isDataDirty = true;
diff --git a/src/datavisualization/engine/scatter3dcontroller.cpp b/src/datavisualization/engine/scatter3dcontroller.cpp
index ee190196..6fc29b20 100644
--- a/src/datavisualization/engine/scatter3dcontroller.cpp
+++ b/src/datavisualization/engine/scatter3dcontroller.cpp
@@ -135,7 +135,12 @@ QList<QScatter3DSeries *> Scatter3DController::scatterSeriesList()
 
 void Scatter3DController::handleArrayReset()
 {
-    QScatter3DSeries *series = static_cast<QScatterDataProxy *>(sender())->series();
+    QScatter3DSeries *series;
+    if (qobject_cast<QScatterDataProxy *>(sender()))
+        series = static_cast<QScatterDataProxy *>(sender())->series();
+    else
+        series = static_cast<QScatter3DSeries *>(sender());
+
     if (series->isVisible()) {
         adjustAxisRanges();
         m_isDataDirty = true;
@@ -394,7 +399,7 @@ void Scatter3DController::adjustAxisRanges()
             if (scatterSeries->isVisible() && proxy) {
                 QVector3D minLimits;
                 QVector3D maxLimits;
-                proxy->dptrc()->limitValues(minLimits, maxLimits);
+                proxy->dptrc()->limitValues(minLimits, maxLimits, valueAxisX, valueAxisY, valueAxisZ);
                 if (adjustX) {
                     if (!series) {
                         // First series initializes the values
diff --git a/src/datavisualization/engine/surface3dcontroller.cpp b/src/datavisualization/engine/surface3dcontroller.cpp
index b0cdef14..1a140a5c 100644
--- a/src/datavisualization/engine/surface3dcontroller.cpp
+++ b/src/datavisualization/engine/surface3dcontroller.cpp
@@ -321,7 +321,12 @@ void Surface3DController::clearSelection()
 
 void Surface3DController::handleArrayReset()
 {
-    QSurface3DSeries *series = static_cast<QSurfaceDataProxy *>(sender())->series();
+    QSurface3DSeries *series;
+    if (qobject_cast<QSurfaceDataProxy *>(sender()))
+        series = static_cast<QSurfaceDataProxy *>(sender())->series();
+    else
+        series = static_cast<QSurface3DSeries *>(sender());
+
     if (series->isVisible()) {
         adjustAxisRanges();
         m_isDataDirty = true;
@@ -510,7 +515,7 @@ void Surface3DController::adjustAxisRanges()
             if (surfaceSeries->isVisible() && proxy) {
                 QVector3D minLimits;
                 QVector3D maxLimits;
-                proxy->dptrc()->limitValues(minLimits, maxLimits);
+                proxy->dptrc()->limitValues(minLimits, maxLimits, valueAxisX, valueAxisY, valueAxisZ);
                 if (adjustX) {
                     if (first) {
                         // First series initializes the values