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

QmlDesigner.ItemLibrary: fix search pathes for .metainfo

Browse Source 
Change-Id: I8f79b8ad41acc8f8aa77d78037191513596de924
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
This commit is contained in:
Thomas Hartmann
2013-06-10 18:06:43 +02:00
parent 21150df910
commit e97a565605
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp
View File

@@ -212,10 +212,11 @@ void SubComponentManager::parseDirectories()
parseDirectory(dirInfo.canonicalFilePath(), true, dirInfo.baseName().toUtf8()); parseDirectory(dirInfo.canonicalFilePath(), true, dirInfo.baseName().toUtf8());
} else { } else {
QString url = import.url(); QString url = import.url();
url.replace(QLatin1Char('.'), QLatin1Char('/'));
QFileInfo dirInfo = QFileInfo(url);
foreach (const QString &path, importPaths()) { foreach (const QString &path, importPaths()) {
url.replace(QLatin1Char('.'), QLatin1Char('/')); QString fullUrl = path + QLatin1Char('/') + url;
url = path + QLatin1Char('/') + url; dirInfo = QFileInfo(fullUrl);
QFileInfo dirInfo = QFileInfo(url);
if (dirInfo.exists() && dirInfo.isDir()) { if (dirInfo.exists() && dirInfo.isDir()) {
//### todo full qualified names QString nameSpace = import.uri(); //### todo full qualified names QString nameSpace = import.uri();
parseDirectory(dirInfo.canonicalFilePath(), false); parseDirectory(dirInfo.canonicalFilePath(), false);