alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

qmlobjectsharedengine in wallpapers

Browse Source 
Change-Id: I6125cfa6d7a0cbf1f6f4ece132e9b824a447ddfb
This commit is contained in:
Marco Martin 2015-05-11 20:54:52 +02:00
parent a595bf9f61
commit 1b5805ba02
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plasmaquick/appletquickitem.cpp
View File

@ -462,7 +462,7 @@ void AppletQuickItem::init()
//if the engine of the qmlObject is different from the static one, then we //if the engine of the qmlObject is different from the static one, then we
//are using an old version of the api in which every applet had one engine //are using an old version of the api in which every applet had one engine
//so initialize a private url interceptor //so initialize a private url interceptor
if (d->applet->package().isValid() && qobject_cast<KDeclarative::QmlObjectSharedEngine *>(d->qmlObject)) { if (d->applet->package().isValid() && !qobject_cast<KDeclarative::QmlObjectSharedEngine *>(d->qmlObject)) {
PackageUrlInterceptor *interceptor = new PackageUrlInterceptor(engine, d->applet->package()); PackageUrlInterceptor *interceptor = new PackageUrlInterceptor(engine, d->applet->package());
interceptor->addAllowedPath(d->coronaPackage.path()); interceptor->addAllowedPath(d->coronaPackage.path());
engine->setUrlInterceptor(interceptor); engine->setUrlInterceptor(interceptor);

4
src/scriptengines/qml/plasmoid/wallpaperinterface.cpp
View File

@ -21,7 +21,7 @@
#include "containmentinterface.h" #include "containmentinterface.h"
#include <kdeclarative/configpropertymap.h> #include <kdeclarative/configpropertymap.h>
#include <kdeclarative/qmlobject.h> #include <kdeclarative/qmlobjectsharedengine.h>
#include <kactioncollection.h> #include <kactioncollection.h>
#include <kdesktopfile.h> #include <kdesktopfile.h>
@ -127,7 +127,7 @@ void WallpaperInterface::syncWallpaperPackage()
m_wallpaperPlugin = m_containmentInterface->containment()->wallpaper(); m_wallpaperPlugin = m_containmentInterface->containment()->wallpaper();
if (!m_qmlObject) { if (!m_qmlObject) {
m_qmlObject = new KDeclarative::QmlObject(this); m_qmlObject = new KDeclarative::QmlObjectSharedEngine(this);
s_rootObjects[m_qmlObject->engine()] = this; s_rootObjects[m_qmlObject->engine()] = this;
m_qmlObject->setInitializationDelayed(true); m_qmlObject->setInitializationDelayed(true);
connect(m_qmlObject, &KDeclarative::QmlObject::finished, this, &WallpaperInterface::loadFinished); connect(m_qmlObject, &KDeclarative::QmlObject::finished, this, &WallpaperInterface::loadFinished);