Remove the code to manually initialize resources in static builds

After commit be9a56e5e3ced5d0d668fa24e4c65ae928f2e25a in qtbase, this is
not needed anymore. Instead the resource system injects the plugin entry
point with a reference to all resources.

Change-Id: I03294a3ee43097ce535ef7c2805ee33a99e7dd25
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>

6 files changed, 3 insertions, 42 deletions

diff --git a/src/imports/location/location.cpp b/src/imports/location/location.cpp
index 45b104b9..f806e013 100644
--- a/src/imports/location/location.cpp
+++ b/src/imports/location/location.cpp
@@ -73,13 +73,6 @@
 
 #include <QtCore/QDebug>
 
-static void initResources()
-{
-#ifdef QT_STATIC
-    Q_INIT_RESOURCE(qmake_QtLocation);
-#endif
-}
-
 QT_BEGIN_NAMESPACE
 
 
@@ -91,7 +84,7 @@ class QtLocationDeclarativeModule: public QQmlExtensionPlugin
                       FILE "plugin.json")
 
 public:
-    QtLocationDeclarativeModule(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); }
+    QtLocationDeclarativeModule(QObject *parent = 0) : QQmlExtensionPlugin(parent) { }
     virtual void registerTypes(const char *uri)
     {
         if (QLatin1String(uri) == QLatin1String("QtLocation")) {
diff --git a/src/imports/locationlabs/locationlabs.cpp b/src/imports/locationlabs/locationlabs.cpp
index 56924b80..6f3b6dd1 100644
--- a/src/imports/locationlabs/locationlabs.cpp
+++ b/src/imports/locationlabs/locationlabs.cpp
@@ -46,13 +46,6 @@
 #include <QtQml/qqml.h>
 #include <QtCore/QDebug>
 
-static void initResources()
-{
-#ifdef QT_STATIC
-    Q_INIT_RESOURCE(qmake_QtLocationLabs);
-#endif
-}
-
 QT_BEGIN_NAMESPACE
 
 
@@ -64,7 +57,7 @@ class QtLocationLabsDeclarativeModule: public QQmlExtensionPlugin
                       FILE "plugin.json")
 
 public:
-    QtLocationLabsDeclarativeModule(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); }
+    QtLocationLabsDeclarativeModule(QObject *parent = 0) : QQmlExtensionPlugin(parent) { }
     virtual void registerTypes(const char *uri)
     {
         if (QLatin1String(uri) == QLatin1String("Qt.labs.location")) {
diff --git a/src/imports/positioning/positioning.cpp b/src/imports/positioning/positioning.cpp
index 6af79b54..08ce384b 100644
--- a/src/imports/positioning/positioning.cpp
+++ b/src/imports/positioning/positioning.cpp
@@ -62,13 +62,6 @@
 
 #include <QtCore/QDebug>
 
-static void initResources()
-{
-#ifdef QT_STATIC
-    Q_INIT_RESOURCE(qmake_QtPositioning);
-#endif
-}
-
 QT_BEGIN_NAMESPACE
 
 /*!
@@ -572,7 +565,7 @@ class QtPositioningDeclarativeModule: public QQmlExtensionPlugin
                       FILE "plugin.json")
 
 public:
-    QtPositioningDeclarativeModule(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); }
+    QtPositioningDeclarativeModule(QObject *parent = 0) : QQmlExtensionPlugin(parent) { }
     virtual void registerTypes(const char *uri)
     {
         if (QLatin1String(uri) == QStringLiteral("QtPositioning")) {
diff --git a/src/plugins/geoservices/esri/geotiledmappingmanagerengine_esri.cpp b/src/plugins/geoservices/esri/geotiledmappingmanagerengine_esri.cpp
index 3fa9a177..33b639fa 100644
--- a/src/plugins/geoservices/esri/geotiledmappingmanagerengine_esri.cpp
+++ b/src/plugins/geoservices/esri/geotiledmappingmanagerengine_esri.cpp
@@ -53,11 +53,6 @@
 #include <QJsonDocument>
 #include <QJsonObject>
 
-static void initResources()
-{
-    Q_INIT_RESOURCE(esri);
-}
-
 QT_BEGIN_NAMESPACE
 
 static const QString kPrefixEsri(QStringLiteral("esri."));
@@ -241,7 +236,6 @@ bool GeoTiledMappingManagerEngineEsri::initializeMapSources(QGeoServiceProvider:
                                                             QString *errorString,
                                                             const QGeoCameraCapabilities &cameraCaps)
 {
-    initResources();
     QFile mapsFile(":/esri/maps.json");
 
     if (!mapsFile.open(QIODevice::ReadOnly)) {
diff --git a/src/plugins/geoservices/mapboxgl/qgeoserviceproviderpluginmapboxgl.cpp b/src/plugins/geoservices/mapboxgl/qgeoserviceproviderpluginmapboxgl.cpp
index dd25c99e..afa723a5 100644
--- a/src/plugins/geoservices/mapboxgl/qgeoserviceproviderpluginmapboxgl.cpp
+++ b/src/plugins/geoservices/mapboxgl/qgeoserviceproviderpluginmapboxgl.cpp
@@ -40,16 +40,10 @@
 
 #include <QtGui/QOpenGLContext>
 
-static void initResources()
-{
-    Q_INIT_RESOURCE(mapboxgl);
-}
-
 QT_BEGIN_NAMESPACE
 
 QGeoServiceProviderFactoryMapboxGL::QGeoServiceProviderFactoryMapboxGL()
 {
-    initResources();
 }
 
 QGeoCodingManagerEngine *QGeoServiceProviderFactoryMapboxGL::createGeocodingManagerEngine(
diff --git a/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp b/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp
index f68a0d99..e4ef86d6 100644
--- a/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp
@@ -47,11 +47,6 @@
 #include <QNetworkProxy>
 #include <QCoreApplication>
 
-static void initResources()
-{
-    Q_INIT_RESOURCE(nokia);
-}
-
 QT_BEGIN_NAMESPACE
 
 namespace
@@ -117,7 +112,6 @@ namespace
 
 QGeoServiceProviderFactoryNokia::QGeoServiceProviderFactoryNokia()
 {
-    initResources();
 }
 
 QGeoCodingManagerEngine *QGeoServiceProviderFactoryNokia::createGeocodingManagerEngine(