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

allow urls that are just an UrlString

Browse Source 
BUG:333284
This commit is contained in:
Marco Martin 2014-04-11 12:55:05 +02:00
parent 767336e87e
commit 96e2522b8a
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/plasmaquick/packageurlinterceptor.cpp
View File

@ -57,7 +57,7 @@ QStringList PackageUrlInterceptor::allowedPaths() const
QUrl PackageUrlInterceptor::intercept(const QUrl &path, QQmlAbstractUrlInterceptor::DataType type)
{
//qDebug() << "Intercepted URL:" << path;
//qDebug() << "Intercepted URL:" << path << type;
if (path.scheme() == QStringLiteral("plasmapackage")) {
//FIXME: this is incorrect but works around a bug in qml in resolution of urls of qmldir files
@ -73,6 +73,10 @@ QUrl PackageUrlInterceptor::intercept(const QUrl &path, QQmlAbstractUrlIntercept
return path;
}
//if is just a normal string, no qml file was asked, allow it
if (type == QQmlAbstractUrlInterceptor::UrlString) {
return path;
}
//asked a file inside a package: let's rewrite the url!
if (path.path().startsWith(m_package.path())) {