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

qmldir is like anybody else

Browse Source
This commit is contained in:
Marco Martin 2014-01-07 12:30:21 +01:00
parent 569ad6a41d
commit f9f89eda56
1 changed files with 57 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/plasmaquick/packageurlinterceptor.cpp
View File

@ -70,10 +70,6 @@ QUrl PackageUrlInterceptor::intercept(const QUrl &path, QQmlAbstractUrlIntercept
return path;
}
//FIXME: probably needed for QmldirFile as well.
//at the moment a qt bug prevents intercept() working with qmldirs
//see https://codereview.qt-project.org/#change,61208
if (1||type != QQmlAbstractUrlInterceptor::QmldirFile) {
//asked a file inside a package: let's rewrite the url!
if (path.path().startsWith(m_package.path())) {
@ -137,10 +133,6 @@ QUrl PackageUrlInterceptor::intercept(const QUrl &path, QQmlAbstractUrlIntercept
}
}
}
//for now, just allow qmldirs
} else {
return path;
}
qWarning() << "WARNING: Access denied for URL" << path << m_package.path();
return QUrl();