From 00f8b9ee23ca42ca3e91940f9e1664e81bf9e3e1 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Wed, 8 Jul 2015 11:48:42 +0200 Subject: [PATCH] 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 --- .../qmldesigner/designercore/metainfo/itemlibraryinfo.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp index 8e7f8f26b01..708963965f9 100644 --- a/src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp +++ b/src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp @@ -274,9 +274,7 @@ QList ItemLibraryInfo::entriesForType(const QString &typeName, QList entries; foreach (const ItemLibraryEntry &entry, m_nameToEntryHash) { - if (entry.typeName() == typeName - && entry.majorVersion() >= majorVersion - && entry.minorVersion() >= minorVersion) + if (entry.typeName() == typeName) entries += entry; }