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

QmlDesigner: Remove duplicate sections from item library

Browse Source 
If there are multiple imports of the same library, only use the
highest version to populate item library.

Fixes: QDS-3786
Change-Id: I2dd0976c9353692342b390bec15a99554e74aa05
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Miikka Heikkinen
2021-03-05 13:11:57 +02:00
parent dfeff5b30d
commit fab090907d
1 changed files with 41 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp
View File

@@ -177,6 +177,28 @@ Import ItemLibraryModel::entryToImport(const ItemLibraryEntry &entry)
} }
// Returns true if first import version is higher or equal to second import version
static bool compareVersions(const QString &version1, const QString &version2)
{
if (version2.isEmpty() || version1 == version2)
return true;
const QStringList version1List = version1.split(QLatin1Char('.'));
const QStringList version2List = version2.split(QLatin1Char('.'));
if (version1List.count() == 2 && version2List.count() == 2) {
int major1 = version1List.constFirst().toInt();
int major2 = version2List.constFirst().toInt();
if (major1 > major2) {
return true;
} else if (major1 == major2) {
int minor1 = version1List.constLast().toInt();
int minor2 = version2List.constLast().toInt();
if (minor1 >= minor2)
return true;
}
}
return false;
}
void ItemLibraryModel::update(ItemLibraryInfo *itemLibraryInfo, Model *model) void ItemLibraryModel::update(ItemLibraryInfo *itemLibraryInfo, Model *model)
{ {
if (!model) if (!model)
@@ -190,12 +212,28 @@ void ItemLibraryModel::update(ItemLibraryInfo *itemLibraryInfo, Model *model)
QString projectName = project ? project->displayName() : ""; QString projectName = project ? project->displayName() : "";
// create import sections // create import sections
QHash<QString, ItemLibraryImport *> importHash;
for (const Import &import : model->imports()) { for (const Import &import : model->imports()) {
if (import.isLibraryImport() && import.url() != projectName) { if (import.isLibraryImport() && import.url() != projectName) {
ItemLibraryImport *itemLibImport = new ItemLibraryImport(import, this); bool addNew = true;
m_importList.append(itemLibImport); ItemLibraryImport *oldImport = importHash.value(import.url());
itemLibImport->setImportExpanded(loadExpandedState(import.url())); if (oldImport && oldImport->importEntry().url() == import.url()) {
// Retain the higher version if multiples exist
if (compareVersions(oldImport->importEntry().version(), import.version()))
addNew = false;
else
delete oldImport;
} }
if (addNew) {
ItemLibraryImport *itemLibImport = new ItemLibraryImport(import, this);
importHash.insert(import.url(), itemLibImport);
}
}
}
for (const auto itemLibImport : qAsConst(importHash)) {
m_importList.append(itemLibImport);
itemLibImport->setImportExpanded(loadExpandedState(itemLibImport->importEntry().url()));
} }
const QList<ItemLibraryEntry> itemLibEntries = itemLibraryInfo->entries(); const QList<ItemLibraryEntry> itemLibEntries = itemLibraryInfo->entries();