aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/qtquick2.cpp
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@digia.com>2013-11-04 14:24:26 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-11-05 16:18:33 +0100
commitc9a90b3181723061e27e7545b70a66dda4f4306d (patch)
tree705e3096c0bb040435b82a5885cf8359c4f7972f /src/quick/qtquick2.cpp
parentb14c5e934846e660c0809b5afb882ec56128d202 (diff)
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>
Diffstat (limited to 'src/quick/qtquick2.cpp')
-rw-r--r--src/quick/qtquick2.cpp7
1 files changed, 7 insertions, 0 deletions
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();