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

QmlDesigner: Fix lookup of navigator icons

Browse Source 
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>
This commit is contained in:
Thomas Hartmann
2015-07-08 11:48:42 +02:00
committed by Thomas Hartmann
parent 10bbc00873
commit 00f8b9ee23
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp
View File

@@ -274,9 +274,7 @@ QList<ItemLibraryEntry> ItemLibraryInfo::entriesForType(const QString &typeName,
QList<ItemLibraryEntry> entries; QList<ItemLibraryEntry> entries;
foreach (const ItemLibraryEntry &entry, m_nameToEntryHash) { foreach (const ItemLibraryEntry &entry, m_nameToEntryHash) {
if (entry.typeName() == typeName if (entry.typeName() == typeName)
&& entry.majorVersion() >= majorVersion
&& entry.minorVersion() >= minorVersion)
entries += entry; entries += entry;
} }