summaryrefslogtreecommitdiffstats
path: root/src/libs/installer/packagemanagercore_p.cpp
diff options
context:
space:
mode:
authorChristian Stenger <christian.stenger@qt.io>2022-10-20 10:32:06 +0200
committerChristian Stenger <christian.stenger@qt.io>2023-01-17 12:10:41 +0000
commit1b4b466af7ff89dc00b9f81686933fbbb82561c7 (patch)
treebf15b1fcac83bcca535875172157ab55f5a8a2ee /src/libs/installer/packagemanagercore_p.cpp
parenta76fb3e0f8852a5c76f6d3a39a31fdc6e6b95c8a (diff)
Adapt to changes in QHash and QSet
Task-number: QTIFW-1829 Change-Id: I5f062ae4c6389aba57b1de6f0e1884b4cd301334 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
Diffstat (limited to 'src/libs/installer/packagemanagercore_p.cpp')
-rw-r--r--src/libs/installer/packagemanagercore_p.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp
index 759ea6bf3..52d66ff6b 100644
--- a/src/libs/installer/packagemanagercore_p.cpp
+++ b/src/libs/installer/packagemanagercore_p.cpp
@@ -505,8 +505,10 @@ void PackageManagerCorePrivate::clearAllComponentLists()
void PackageManagerCorePrivate::clearUpdaterComponentLists()
{
- QSet<Component*> usedComponents =
- QSet<Component*>::fromList(m_updaterComponents + m_updaterComponentsDeps);
+
+ QSet<Component*> usedComponents(m_updaterComponents.begin(), m_updaterComponents.end());
+ usedComponents.unite(QSet<Component*>(m_updaterComponentsDeps.begin(),
+ m_updaterComponentsDeps.end()));
const QList<QPair<Component*, Component*> > list = m_componentsToReplaceUpdaterMode.values();
for (int i = 0; i < list.count(); ++i) {