feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmnlDesigner: Avoid paths starting with '//'

Browse Source 
Windows these are interpreted as network hosts
and the timeout when resolving those is way too long.

Task-number: QTCREATORBUG-21372
Change-Id: Ib796473158cec620de26592bf628ab18d676153d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Thomas Hartmann
2018-10-29 10:39:31 +01:00
committed by Tim Jenssen
parent 81f019f033
commit 4f7d24acb6
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/plugins/qmldesigner/components/propertyeditor/propertyeditorqmlbackend.cpp
View File

@@ -554,21 +554,25 @@ QString PropertyEditorQmlBackend::locateQmlFile(const NodeMetaInfo &info, const
const QString withoutDirWithVersion = relativePathWithVersion.split(QStringLiteral("/")).constLast(); const QString withoutDirWithVersion = relativePathWithVersion.split(QStringLiteral("/")).constLast();
const QStringList possiblePaths = { QStringList possiblePaths = {
importDir.absoluteFilePath(relativePathWithVersion),
//Since we are in a subfolder of the import we do not require the directory
importDir.absoluteFilePath(withoutDirWithVersion),
fileSystemDir.absoluteFilePath(relativePathWithVersion), fileSystemDir.absoluteFilePath(relativePathWithVersion),
resourcesDir.absoluteFilePath(relativePathWithVersion), resourcesDir.absoluteFilePath(relativePathWithVersion),
importDir.absoluteFilePath(relativePath),
//Since we are in a subfolder of the import we do not require the directory
importDir.absoluteFilePath(withoutDir),
fileSystemDir.absoluteFilePath(relativePath), fileSystemDir.absoluteFilePath(relativePath),
resourcesDir.absoluteFilePath(relativePath) resourcesDir.absoluteFilePath(relativePath)
}; };
if (!importDir.isEmpty())
possiblePaths.append({
importDir.absoluteFilePath(relativePathWithVersion),
//Since we are in a subfolder of the import we do not require the directory
importDir.absoluteFilePath(withoutDirWithVersion),
importDir.absoluteFilePath(relativePath),
//Since we are in a subfolder of the import we do not require the directory
importDir.absoluteFilePath(withoutDir),
});
return Utils::findOrDefault(possiblePaths, [](const QString &possibleFilePath) { return Utils::findOrDefault(possiblePaths, [](const QString &possibleFilePath) {
return QFile::exists(possibleFilePath); return QFileInfo::exists(possibleFilePath);
}); });
} }