Fix resources not loading on static builds

Explicitly call Q_INIT_RESOURCE, otherwise the resources are not
found and the plugins using resources are broken when building
Qt with -static.

This patch also adds a prefix to these resources to avoid collision,
since they are very generic like "logo.png" or "maps.json".

Task-number: QTBUG-60007
Change-Id: Ifb73e9b97af107f2e24f5478f3de534bbd40e158
Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>

2 files changed, 12 insertions, 0 deletions

diff --git a/src/plugins/geoservices/mapboxgl/qgeoserviceproviderpluginmapboxgl.cpp b/src/plugins/geoservices/mapboxgl/qgeoserviceproviderpluginmapboxgl.cpp
index fb8dd19e..c7d5d3ee 100644
--- a/src/plugins/geoservices/mapboxgl/qgeoserviceproviderpluginmapboxgl.cpp
+++ b/src/plugins/geoservices/mapboxgl/qgeoserviceproviderpluginmapboxgl.cpp
@@ -40,8 +40,18 @@
 
 #include <QtGui/QOpenGLContext>
 
+static void initResources()
+{
+    Q_INIT_RESOURCE(mapboxgl);
+}
+
 QT_BEGIN_NAMESPACE
 
+QGeoServiceProviderFactoryMapboxGL::QGeoServiceProviderFactoryMapboxGL()
+{
+    initResources();
+}
+
 QGeoCodingManagerEngine *QGeoServiceProviderFactoryMapboxGL::createGeocodingManagerEngine(
     const QVariantMap &parameters, QGeoServiceProvider::Error *error, QString *errorString) const
 {
diff --git a/src/plugins/geoservices/mapboxgl/qgeoserviceproviderpluginmapboxgl.h b/src/plugins/geoservices/mapboxgl/qgeoserviceproviderpluginmapboxgl.h
index 2bba96f1..b9c0098a 100644
--- a/src/plugins/geoservices/mapboxgl/qgeoserviceproviderpluginmapboxgl.h
+++ b/src/plugins/geoservices/mapboxgl/qgeoserviceproviderpluginmapboxgl.h
@@ -51,6 +51,8 @@ class QGeoServiceProviderFactoryMapboxGL: public QObject, public QGeoServiceProv
                       FILE "mapboxgl_plugin.json")
 
 public:
+    QGeoServiceProviderFactoryMapboxGL();
+
     QGeoCodingManagerEngine *createGeocodingManagerEngine(const QVariantMap &parameters,
                                                           QGeoServiceProvider::Error *error,
                                                           QString *errorString) const;