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

allow sub-packages from addons

Browse Source 
svn path=/trunk/KDE/kdebase/runtime/; revision=1171702
This commit is contained in:
Aaron J. Seigo 2010-09-04 22:22:40 +00:00
parent 2737eb6890
commit 3ada6f78e9
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
scriptengines/javascript/dataengine/javascriptdataengine.cpp
View File

@ -312,12 +312,26 @@ Plasma::Service *JavaScriptDataEngine::serviceForSource(const QString &source)
QString JavaScriptDataEngine::filePath(const char *type, const QString &file) const QString JavaScriptDataEngine::filePath(const char *type, const QString &file) const
{ {
QScriptContext *c = m_qscriptEngine->currentContext();
while (c) {
QScriptValue v = c->activationObject().property("__plasma_package");
//kDebug() << "variant in parent context?" << v.isVariant();
if (v.isVariant()) {
const QString path = v.toVariant().value<Plasma::Package>().filePath(type, file);
if (!path.isEmpty()) {
return path;
}
}
c = c->parentContext();
}
return package()->filePath(type, file); return package()->filePath(type, file);
} }
bool JavaScriptDataEngine::include(const QString &script) bool JavaScriptDataEngine::include(const QString &script)
{ {
const QString path = package()->filePath("scripts", script); const QString path = filePath("scripts", script);
if (path.isEmpty()) { if (path.isEmpty()) {
return false; return false;
} }