Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta3

 Conflicts:
	.qmake.conf

Change-Id: I9a3d7ec0bb203ac8b5bd483af3973510ca33c4a9

1 files changed, 10 insertions, 7 deletions

diff --git a/src/plugins/geoservices/mapboxgl/qgeomapmapboxgl.cpp b/src/plugins/geoservices/mapboxgl/qgeomapmapboxgl.cpp
index 8df00905..dd5c9a86 100644
--- a/src/plugins/geoservices/mapboxgl/qgeomapmapboxgl.cpp
+++ b/src/plugins/geoservices/mapboxgl/qgeomapmapboxgl.cpp
@@ -97,23 +97,26 @@ QSGNode *QGeoMapMapboxGLPrivate::updateSceneGraph(QSGNode *node, QQuickWindow *w
     }
 
     QMapboxGL *map = 0;
-    if (m_useFBO) {
-        if (!node) {
+    if (!node) {
+        QOpenGLContext *currentCtx = QOpenGLContext::currentContext();
+        if (!currentCtx) {
+            qWarning("QOpenGLContext is NULL!");
+            return node;
+        }
+        if (m_useFBO) {
             QSGMapboxGLTextureNode *mbglNode = new QSGMapboxGLTextureNode(m_settings, m_viewportSize, window->devicePixelRatio(), q);
             QObject::connect(mbglNode->map(), &QMapboxGL::mapChanged, q, &QGeoMapMapboxGL::onMapChanged);
             m_syncState = MapTypeSync | CameraDataSync | ViewportSync;
             node = mbglNode;
-        }
-        map = static_cast<QSGMapboxGLTextureNode *>(node)->map();
-    } else {
-        if (!node) {
+        } else {
             QSGMapboxGLRenderNode *mbglNode = new QSGMapboxGLRenderNode(m_settings, m_viewportSize, window->devicePixelRatio(), q);
             QObject::connect(mbglNode->map(), &QMapboxGL::mapChanged, q, &QGeoMapMapboxGL::onMapChanged);
             m_syncState = MapTypeSync | CameraDataSync | ViewportSync;
             node = mbglNode;
         }
-        map = static_cast<QSGMapboxGLRenderNode *>(node)->map();
     }
+    map = (m_useFBO) ? static_cast<QSGMapboxGLTextureNode *>(node)->map()
+                     : static_cast<QSGMapboxGLRenderNode *>(node)->map();
 
     if (m_syncState & MapTypeSync) {
         m_developmentMode = m_activeMapType.name().startsWith("mapbox://")