Add missing Q_INIT_RESOURCE

The library needs to do Q_INIT_RESOURCE for all resources it uses
internally, otherwise static linking will fail, and the user has
no idea how to rectify it as the name of the missing resource is
not known.

Change-Id: I8ea766e63cff22bbb0c45e6125c3a07948de2274
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

4 files changed, 28 insertions, 0 deletions

diff --git a/src/imports/dialogs/plugin.cpp b/src/imports/dialogs/plugin.cpp
index c85d270c6e..44df1447d1 100644
--- a/src/imports/dialogs/plugin.cpp
+++ b/src/imports/dialogs/plugin.cpp
@@ -60,6 +60,11 @@
 //#define PURE_QML_ONLY
 //#define DEBUG_REGISTRATION
 
+static void initResources()
+{
+    Q_INIT_RESOURCE(dialogs);
+}
+
 QT_BEGIN_NAMESPACE
 
 /*!
@@ -96,6 +101,8 @@ public:
     }
 
     virtual void registerTypes(const char *uri) {
+        initResources();
+
 #ifdef DEBUG_REGISTRATION
         qDebug() << Q_FUNC_INFO << uri;
 #endif
diff --git a/src/particles/qquickparticlesmodule.cpp b/src/particles/qquickparticlesmodule.cpp
index 7d11028e3b..dd0b83f99a 100644
--- a/src/particles/qquickparticlesmodule.cpp
+++ b/src/particles/qquickparticlesmodule.cpp
@@ -69,10 +69,17 @@
 #include "qquickparticlegroup_p.h"
 #include "qquickgroupgoal_p.h"
 
+static void initResources()
+{
+    Q_INIT_RESOURCE(particles);
+}
+
 QT_BEGIN_NAMESPACE
 
 void QQuickParticlesModule::defineModule()
 {
+    initResources();
+
     const char* uri = "QtQuick.Particles";
 
     qmlRegisterType<QQuickParticleSystem>(uri, 2, 0, "ParticleSystem");
diff --git a/src/quick/items/qquickitemsmodule.cpp b/src/quick/items/qquickitemsmodule.cpp
index 23fd75756a..ebc32c89eb 100644
--- a/src/quick/items/qquickitemsmodule.cpp
+++ b/src/quick/items/qquickitemsmodule.cpp
@@ -268,10 +268,17 @@ static void qt_quickitems_defineModule(const char *uri, int major, int minor)
     qmlRegisterType<QQuickTextEdit, 2>(uri, 2, 2, "TextEdit");
 }
 
+static void initResources()
+{
+    Q_INIT_RESOURCE(items);
+}
+
 QT_BEGIN_NAMESPACE
 
 void QQuickItemsModule::defineModule()
 {
+    initResources();
+
     QByteArray name = "QtQuick";
     int majorVersion = 2;
     int minorVersion = 0;
diff --git a/src/quick/qtquick2.cpp b/src/quick/qtquick2.cpp
index 5216fca355..ee5034c108 100644
--- a/src/quick/qtquick2.cpp
+++ b/src/quick/qtquick2.cpp
@@ -55,6 +55,11 @@
 #include <qqmlproperty.h>
 #include <QtCore/QPointer>
 
+static void initResources()
+{
+    Q_INIT_RESOURCE(scenegraph);
+}
+
 QT_BEGIN_NAMESPACE
 
 class QQmlQtQuick2DebugStatesDelegate : public QQmlDebugStatesDelegate
@@ -172,6 +177,8 @@ void QQmlQtQuick2DebugStatesDelegate::resetBindingForInvalidProperty(QObject *ob
 
 void QQmlQtQuick2Module::defineModule()
 {
+    initResources();
+
     QQuick_initializeProviders();
 
     QQuickUtilModule::defineModule();