summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-08-31 03:03:08 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-08-31 03:03:08 +0200
commitb92e33203097edc7711258501c4fdb74d9f8fefa (patch)
treedf57ba227f9b7916585241ad6d693fb01d49280d /src
parentf613eb3a6031d6d4f3e5ee230fab3056314fa9a4 (diff)
parentf8c1007e513b7df017ae4da2831183f3a66b69fb (diff)
downloadqtlocation-b92e33203097edc7711258501c4fdb74d9f8fefa.tar.gz
Merge remote-tracking branch 'origin/5.13' into 5.14
Change-Id: Ic431a95117ee8290a5b91937a756e9f9cfc37c7a
Diffstat (limited to 'src')
-rw-r--r--src/plugins/geoservices/mapboxgl/qgeomapmapboxgl.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/plugins/geoservices/mapboxgl/qgeomapmapboxgl.cpp b/src/plugins/geoservices/mapboxgl/qgeomapmapboxgl.cpp
index ed36cd5f..b0967499 100644
--- a/src/plugins/geoservices/mapboxgl/qgeomapmapboxgl.cpp
+++ b/src/plugins/geoservices/mapboxgl/qgeomapmapboxgl.cpp
@@ -54,6 +54,7 @@
#include <QtQuick/QQuickWindow>
#include <QtQuick/QSGImageNode>
#include <QtQuick/private/qsgtexture_p.h>
+#include <QtQuick/private/qsgcontext_p.h> // for debugging the context name
#include <QMapboxGL>
@@ -101,6 +102,11 @@ QSGNode *QGeoMapMapboxGLPrivate::updateSceneGraph(QSGNode *node, QQuickWindow *w
QOpenGLContext *currentCtx = QOpenGLContext::currentContext();
if (!currentCtx) {
qWarning("QOpenGLContext is NULL!");
+ qWarning() << "You are running on QSG backend " << QSGContext::backend();
+ qWarning("The MapboxGL plugin works with both Desktop and ES 2.0+ OpenGL versions.");
+ qWarning("Verify that your Qt is built with OpenGL, and what kind of OpenGL.");
+ qWarning("To force using a specific OpenGL version, check QSurfaceFormat::setRenderableType and QSurfaceFormat::setDefaultFormat");
+
return node;
}
if (m_useFBO) {