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

 Conflicts:
	.qmake.conf

Change-Id: Ibd0e0140e7055c7819a65e661a96095648de6fcd

1 files changed, 6 insertions, 2 deletions

diff --git a/src/datavisualization/engine/surface3drenderer.cpp b/src/datavisualization/engine/surface3drenderer.cpp
index fa8bae8e..cad9b97c 100644
--- a/src/datavisualization/engine/surface3drenderer.cpp
+++ b/src/datavisualization/engine/surface3drenderer.cpp
@@ -317,8 +317,12 @@ void Surface3DRenderer::updateSurfaceTextures(QVector<QSurface3DSeries *> series
             const QSurfaceDataArray &array = *dataProxy->array();
 
             if (!series->texture().isNull()) {
-                cache->setSurfaceTexture(m_textureHelper->create2DTexture(
-                                             series->texture(), true, true, true));
+                GLuint texId = m_textureHelper->create2DTexture(series->texture(),
+                                                                true, true, true, true);
+                glBindTexture(GL_TEXTURE_2D, texId);
+                glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+                glBindTexture(GL_TEXTURE_2D, 0);
+                cache->setSurfaceTexture(texId);
 
                 if (cache->isFlatShadingEnabled())
                     cache->surfaceObject()->coarseUVs(array, cache->dataArray());