diff options
| author | Thomas Hartmann <Thomas.Hartmann@theqtcompany.com> | 2015-07-08 11:48:42 +0200 |
|---|---|---|
| committer | Thomas Hartmann <Thomas.Hartmann@digia.com> | 2015-07-14 12:27:28 +0000 |
| commit | 00f8b9ee23ca42ca3e91940f9e1664e81bf9e3e1 (patch) | |
| tree | eb258b597a9c108d36463ee420fa052114ba798d /src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp | |
| parent | 10bbc008734f1fede69e422d5522ec9aa993e647 (diff) | |
QmlDesigner: Fix lookup of navigator icons
The version check was simply wrong.
The version of the used item might be higher then the version in the
item library. We can still use the icon.
I removed the version check completely. There is no reason to have different
icons for different versions. This just increases the complexity and
introduces bugs without any reason/use cases.
Change-Id: Ib6d2040490739ee903ffe8eb308cd942b96444aa
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Diffstat (limited to 'src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp')
| -rw-r--r-- | src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp index 8e7f8f26b0..708963965f 100644 --- a/src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp +++ b/src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp @@ -274,9 +274,7 @@ QList<ItemLibraryEntry> ItemLibraryInfo::entriesForType(const QString &typeName, QList<ItemLibraryEntry> entries; foreach (const ItemLibraryEntry &entry, m_nameToEntryHash) { - if (entry.typeName() == typeName - && entry.majorVersion() >= majorVersion - && entry.minorVersion() >= minorVersion) + if (entry.typeName() == typeName) entries += entry; } |