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

QmlDesigner.Model: fix for directory imports

Browse Source 
Direcotry imports do not have a version that needs to be checked.

Change-Id: I0ba2826927eb7ddeaaed402c75be03aedfaa2f4a
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
This commit is contained in:
Thomas Hartmann
2013-01-15 13:48:55 +01:00
parent 5d7690cfea
commit 72d415019a
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmldesigner/designercore/model/model.cpp
View File

@@ -1709,7 +1709,7 @@ bool Model::hasImport(const Import &import, bool ignoreAlias, bool allowHigherVe
foreach (const Import &existingImport, imports()) {
if (existingImport.isFileImport() && import.isFileImport())
if (existingImport.file() == import.file() && compareVersions(existingImport.version(), import.version(), allowHigherVersion))
if (existingImport.file() == import.file())
return true;
if (existingImport.isLibraryImport() && import.isLibraryImport())
if (existingImport.url() == import.url() && compareVersions(existingImport.version(), import.version(), allowHigherVersion))