Merge remote-tracking branch 'origin/5.9' into 5.10

 Conflicts:
	.qmake.conf

Change-Id: I4e39ad733fec72e2233cd16fc50c96ca96280782

1 files changed, 5 insertions, 1 deletions

diff --git a/src/datavisualization/engine/abstract3drenderer.cpp b/src/datavisualization/engine/abstract3drenderer.cpp
index dd3212ac..417be0e8 100644
--- a/src/datavisualization/engine/abstract3drenderer.cpp
+++ b/src/datavisualization/engine/abstract3drenderer.cpp
@@ -755,6 +755,9 @@ void Abstract3DRenderer::updateCustomData(const QList<QCustom3DItem *> &customIt
             delete renderItem;
         }
     }
+
+    m_customItemDrawOrder.clear();
+    m_customItemDrawOrder = QList<QCustom3DItem *>(customItems);
 }
 
 void Abstract3DRenderer::updateCustomItems()
@@ -1436,7 +1439,8 @@ void Abstract3DRenderer::drawCustomItems(RenderingState state,
     bool volumeDetected = false;
     int loopCount = 0;
     while (loopCount < 2) {
-        foreach (CustomRenderItem *item, m_customRenderCache) {
+        for (QCustom3DItem *customItem : qAsConst(m_customItemDrawOrder)) {
+            CustomRenderItem *item = m_customRenderCache.value(customItem);
             // Check that the render item is visible, and skip drawing if not
             // Also check if reflected item is on the "wrong" side, and skip drawing if it is
             if (!item->isVisible() || ((m_reflectionEnabled && reflection < 0.0f)