diff options
author | Arttu Tarkiainen <arttu.tarkiainen@qt.io> | 2021-11-16 17:23:30 +0200 |
---|---|---|
committer | Arttu Tarkiainen <arttu.tarkiainen@qt.io> | 2021-12-21 10:16:32 +0200 |
commit | 347d9cd8525a0baadbd4822465248905877babd3 (patch) | |
tree | a9a7aa98f32008cfdc11132842fe63eb7113be05 /src/libs/installer/uninstallercalculator.cpp | |
parent | 7ba80f53f3f493e6b66c9867a9f31cbdcf364466 (diff) |
Fix deprecation warnings from building with Qt 5.15.2
Also update build version requirements.
Task-number: QTIFW-2388
Change-Id: Iae1949548dda7a3b8d448228e27060efb5abd8eb
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
Diffstat (limited to 'src/libs/installer/uninstallercalculator.cpp')
-rw-r--r-- | src/libs/installer/uninstallercalculator.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/libs/installer/uninstallercalculator.cpp b/src/libs/installer/uninstallercalculator.cpp index 668ace699..10b44d80a 100644 --- a/src/libs/installer/uninstallercalculator.cpp +++ b/src/libs/installer/uninstallercalculator.cpp @@ -62,8 +62,9 @@ void UninstallerCalculator::appendComponentToUninstall(Component *component) PackageManagerCore *core = component->packageManagerCore(); // remove all already resolved dependees - QSet<Component *> dependees = core->dependees(component).toSet() - .subtract(m_componentsToUninstall); + const QList<Component *> dependeesList = core->dependees(component); + QSet<Component *> dependees = QSet<Component *>(dependeesList.begin(), + dependeesList.end()).subtract(m_componentsToUninstall); foreach (Component *dependee, dependees) appendComponentToUninstall(dependee); @@ -104,7 +105,7 @@ void UninstallerCalculator::appendComponentsToUninstall(const QList<Component*> foreach (Component *c, m_installedComponents) { const QString replaces = c->value(scReplaces); const QStringList possibleNames = replaces.split(QInstaller::commaRegExp(), - QString::SkipEmptyParts) << c->name(); + Qt::SkipEmptyParts) << c->name(); foreach (const QString &possibleName, possibleNames) { Component *cc = PackageManagerCore::componentByName(possibleName, m_installedComponents); |