From eda6e8553082bfe84b9dcd7389201d91b751fe29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thorbj=C3=B8rn=20Lindeijer?= <thorbjorn.lindeijer@nokia.com>
Date: Thu, 24 Feb 2011 13:38:47 +0100
Subject: [PATCH] QmlJSDebugger: Fixed availability of resources of static
library
On some systems, apparently including Linux and Windows, it is necessary
to manually initialize resources when they are included in a static
library, with Q_INIT_RESOURCE.
---
.../qtcreator/qml/qmljsdebugger/qdeclarativeviewobserver.cpp | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/share/qtcreator/qml/qmljsdebugger/qdeclarativeviewobserver.cpp b/share/qtcreator/qml/qmljsdebugger/qdeclarativeviewobserver.cpp
index 85c3b8353fd..bf8c930cd0d 100644
--- a/share/qtcreator/qml/qmljsdebugger/qdeclarativeviewobserver.cpp
+++ b/share/qtcreator/qml/qmljsdebugger/qdeclarativeviewobserver.cpp
@@ -55,6 +55,8 @@
#include <QtGui/QApplication>
#include <QtCore/QSettings>
+static inline void initEditorResource() { Q_INIT_RESOURCE(editor); }
+
namespace QmlJSDebugger {
const char * const KEY_TOOLBOX_GEOMETRY = "toolBox/geometry";
@@ -83,6 +85,8 @@ QDeclarativeViewObserverPrivate::~QDeclarativeViewObserverPrivate()
QDeclarativeViewObserver::QDeclarativeViewObserver(QDeclarativeView *view, QObject *parent) :
QObject(parent), data(new QDeclarativeViewObserverPrivate(this))
{
+ initEditorResource();
+
data->view = view;
data->manipulatorLayer = new LiveLayerItem(view->scene());
data->selectionTool = new LiveSelectionTool(this);
--
GitLab