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

implify

Browse Source 
Change-Id: I983400993050e2ebf735290387982845d27dc0d1
This commit is contained in:
Marco Martin 2015-05-11 14:51:01 +02:00
parent bb0d245d5b
commit 9802e9c6d1
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/plasmaquick/appletquickitem.cpp
View File

@ -532,7 +532,6 @@ void AppletQuickItem::init()
setHeight(d->qmlObject->rootObject()->property("height").value<qreal>());
}
//default fullrepresentation is our root main component, if none specified
if (!d->fullRepresentation) {
d->fullRepresentation = d->qmlObject->mainComponent();

6
src/plasmaquick/packageurlinterceptor.cpp
View File

@ -149,10 +149,10 @@ QUrl PackageUrlInterceptor::intercept(const QUrl &path, QQmlAbstractUrlIntercept
//obtain a string in the form foo/bar/baz.qml: ui/ gets discarded
const QString &filename = components.join("/");
//qDebug() << "Returning" << QUrl::fromLocalFile(package.filePath(prefixForType(type, filename), filename));
QUrl ret = QUrl::fromLocalFile(package.filePath(prefixForType(type, filename), filename));
//qDebug() << "Returning" << ret;
if (ret.path().isEmpty()) {
return path;
}
@ -160,6 +160,8 @@ QUrl PackageUrlInterceptor::intercept(const QUrl &path, QQmlAbstractUrlIntercept
//forbid to load random absolute paths
} else {
return path;
//TODO: remove all of this?
if (package.allowExternalPaths() || package.metadata().property("X-Plasma-RequiredExtensions").toString().contains(QStringLiteral("ExternalScripts"))) {
return path;
}