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: Ieb67edec480eba18cdad29f39b262cfb8839bf8a
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

7 files changed, 4 insertions, 58 deletions

diff --git a/src/controls/Styles/Android/plugin.cpp b/src/controls/Styles/Android/plugin.cpp
index 646fff36..7a09bb9c 100644
--- a/src/controls/Styles/Android/plugin.cpp
+++ b/src/controls/Styles/Android/plugin.cpp
@@ -44,13 +44,6 @@
 #include "qquickandroidstyle_p.h"
 #include "qquickandroid9patch_p.h"
 
-static void initResources()
-{
-#ifdef QT_STATIC
-    Q_INIT_RESOURCE(qmake_QtQuick_Controls_Styles_Android);
-#endif
-}
-
 QT_BEGIN_NAMESPACE
 
 class QtQuickControls1AndroidStylePlugin: public QQmlExtensionPlugin
@@ -59,7 +52,7 @@ class QtQuickControls1AndroidStylePlugin: public QQmlExtensionPlugin
     Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
 
 public:
-    QtQuickControls1AndroidStylePlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); }
+    QtQuickControls1AndroidStylePlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { }
     void registerTypes(const char *uri);
 };
 
diff --git a/src/controls/Styles/WinRT/plugin.cpp b/src/controls/Styles/WinRT/plugin.cpp
index e6d0adfe..b205d75e 100644
--- a/src/controls/Styles/WinRT/plugin.cpp
+++ b/src/controls/Styles/WinRT/plugin.cpp
@@ -39,15 +39,9 @@
 
 #include <QtCore/qglobal.h>
 
-static void initResources()
-{
-    Q_INIT_RESOURCE(WinRT);
-}
-
 extern "C" {
     Q_DECL_EXPORT bool qt_quick_controls_style_init()
     {
-        initResources();
         return true;
     }
 
diff --git a/src/controls/plugin.cpp b/src/controls/plugin.cpp
index 4eb6c466..8aca0c49 100644
--- a/src/controls/plugin.cpp
+++ b/src/controls/plugin.cpp
@@ -71,14 +71,6 @@
 #include <QtCore/qlocale.h>
 #endif
 
-static void initResources()
-{
-#ifdef QT_STATIC
-    Q_INIT_RESOURCE(qmake_QtQuick_Controls);
-    Q_INIT_RESOURCE(qmake_controls);
-#endif
-}
-
 QT_BEGIN_NAMESPACE
 
 static const struct {
@@ -129,7 +121,6 @@ static const struct {
 
 QtQuickControls1Plugin::QtQuickControls1Plugin(QObject *parent) : QQmlExtensionPlugin(parent)
 {
-    initResources();
 }
 
 void QtQuickControls1Plugin::registerTypes(const char *uri)
diff --git a/src/dialogs/Private/dialogsprivateplugin.cpp b/src/dialogs/Private/dialogsprivateplugin.cpp
index ba8aabe3..a785f388 100644
--- a/src/dialogs/Private/dialogsprivateplugin.cpp
+++ b/src/dialogs/Private/dialogsprivateplugin.cpp
@@ -42,13 +42,6 @@
 #include "qquickwritingsystemlistmodel_p.h"
 #include "qquickfontlistmodel_p.h"
 
-static void initResources()
-{
-#ifdef QT_STATIC
-    Q_INIT_RESOURCE(qmake_QtQuick_Dialogs_Private);
-#endif
-}
-
 QT_BEGIN_NAMESPACE
 
 class QtQuick2DialogsPrivatePlugin : public QQmlExtensionPlugin
@@ -57,7 +50,7 @@ class QtQuick2DialogsPrivatePlugin : public QQmlExtensionPlugin
     Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
 
 public:
-    QtQuick2DialogsPrivatePlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); }
+    QtQuick2DialogsPrivatePlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { }
     virtual void registerTypes(const char *uri)
     {
         Q_ASSERT(QLatin1String(uri) == QLatin1String("QtQuick.Dialogs.Private"));
diff --git a/src/dialogs/plugin.cpp b/src/dialogs/plugin.cpp
index 1e6740d5..8c10786f 100644
--- a/src/dialogs/plugin.cpp
+++ b/src/dialogs/plugin.cpp
@@ -62,13 +62,6 @@
 
 Q_LOGGING_CATEGORY(lcRegistration, "qt.quick.dialogs.registration")
 
-static void initResources()
-{
-#ifdef QT_STATIC
-    Q_INIT_RESOURCE(qmake_QtQuick_Dialogs);
-#endif
-}
-
 QT_BEGIN_NAMESPACE
 
 /*!
@@ -92,7 +85,7 @@ class QtQuick2DialogsPlugin : public QQmlExtensionPlugin
     Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
 
 public:
-    QtQuick2DialogsPlugin() : QQmlExtensionPlugin(), m_useResources(true) { initResources(); }
+    QtQuick2DialogsPlugin() : QQmlExtensionPlugin(), m_useResources(true) { }
 
     virtual void initializeEngine(QQmlEngine *engine, const char * uri) {
         qCDebug(lcRegistration) << uri << m_decorationComponentUrl;
diff --git a/src/extras/Styles/Flat/flatstyleplugin.cpp b/src/extras/Styles/Flat/flatstyleplugin.cpp
index 5d88134b..7efbb16c 100644
--- a/src/extras/Styles/Flat/flatstyleplugin.cpp
+++ b/src/extras/Styles/Flat/flatstyleplugin.cpp
@@ -45,20 +45,10 @@
 
 #include "qquicktexthandle.h"
 
-static void initResources()
-{
-#ifndef QT_STATIC
-    Q_INIT_RESOURCE(flatstyle);
-#else
-    Q_INIT_RESOURCE(qmake_QtQuick_Controls_Styles_Flat);
-#endif
-}
-
 #ifndef QT_STATIC
 extern "C" {
     Q_DECL_EXPORT bool qt_quick_controls_style_init()
     {
-        initResources();
         return true;
     }
 
@@ -74,7 +64,6 @@ QT_BEGIN_NAMESPACE
 QtQuickExtrasStylesPlugin::QtQuickExtrasStylesPlugin(QObject *parent) :
     QQmlExtensionPlugin(parent)
 {
-    initResources();
 }
 
 void QtQuickExtrasStylesPlugin::registerTypes(const char *uri)
diff --git a/src/widgets/widgetsplugin.cpp b/src/widgets/widgetsplugin.cpp
index 65233756..3289e6fd 100644
--- a/src/widgets/widgetsplugin.cpp
+++ b/src/widgets/widgetsplugin.cpp
@@ -44,13 +44,6 @@
 #include "qquickqcolordialog_p.h"
 #include "qquickqfontdialog_p.h"
 
-static void initResources()
-{
-#ifdef QT_STATIC
-    Q_INIT_RESOURCE(qmake_QtQuick_PrivateWidgets);
-#endif
-}
-
 QT_BEGIN_NAMESPACE
 
 /*!
@@ -78,7 +71,7 @@ class QtQuick2PrivateWidgetsPlugin : public QQmlExtensionPlugin
     Q_PLUGIN_METADATA(IID QQmlExtensionInterface_iid)
 
 public:
-    QtQuick2PrivateWidgetsPlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { initResources(); }
+    QtQuick2PrivateWidgetsPlugin(QObject *parent = 0) : QQmlExtensionPlugin(parent) { }
     virtual void registerTypes(const char *uri)
     {
         Q_ASSERT(QLatin1String(uri) == QLatin1String("QtQuick.PrivateWidgets"));