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

remove the rewrite for platform specific stuff

Browse Source 
don't bomb if m_engine->importPathList() changes at runtime
This commit is contained in:
Marco Martin 2014-05-30 19:47:06 +02:00
parent 1419eea367
commit 78c779c91d
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/plasmaquick/packageurlinterceptor.cpp
View File

@ -33,7 +33,7 @@ PackageUrlInterceptor::PackageUrlInterceptor(QQmlEngine *engine, const Plasma::P
m_package(p), m_package(p),
m_engine(engine) m_engine(engine)
{ {
m_allowedPaths << m_engine->importPathList(); //m_allowedPaths << m_engine->importPathList();
} }
PackageUrlInterceptor::~PackageUrlInterceptor() PackageUrlInterceptor::~PackageUrlInterceptor()
@ -116,7 +116,14 @@ QUrl PackageUrlInterceptor::intercept(const QUrl &path, QQmlAbstractUrlIntercept
if (m_package.allowExternalPaths()) { if (m_package.allowExternalPaths()) {
return path; return path;
} }
foreach (const QString &allowed, m_allowedPaths) {
//NOTE: It's needed to build this on the fly because importPathList
//can change at runtime
QStringList allowedPaths;
allowedPaths << m_engine->importPathList();
allowedPaths << m_allowedPaths;
foreach (const QString &allowed, allowedPaths) {
//It's a private import //It's a private import
if (path.path().contains("org/kde/plasma/private")) { if (path.path().contains("org/kde/plasma/private")) {
QString pathCheck(path.path()); QString pathCheck(path.path());
@ -131,20 +138,6 @@ QUrl PackageUrlInterceptor::intercept(const QUrl &path, QQmlAbstractUrlIntercept
//it's from an allowed, good //it's from an allowed, good
if (path.path().startsWith(allowed)) { if (path.path().startsWith(allowed)) {
//qDebug() << "Found allowed, access granted" << path; //qDebug() << "Found allowed, access granted" << path;
//check if there is a platform specific file that overrides this allowed
foreach (const QString &platform, KDeclarative::KDeclarative::runtimePlatform()) {
//qDebug() << "Trying" << platform;
//search for a platformqml/ path sibling of this allowed path
const QString &platformPath = allowed + QStringLiteral("/../platformqml/") + platform + path.path().mid(allowed.length());
const QFile f(platformPath);
//qDebug() << "Found a platform specific file:" << QUrl::fromLocalFile(platformPath)<<f.exists();
if (f.exists()) {
return QUrl::fromLocalFile(platformPath);
}
}
return path; return path;
} }
} }