diff options
| author | Katja Marttila <katja.marttila@qt.io> | 2022-03-14 18:52:22 +0200 |
|---|---|---|
| committer | Katja Marttila <katja.marttila@qt.io> | 2022-03-22 10:44:04 +0200 |
| commit | caee7332c4a049508c91fe23e3e3bed062a4815d (patch) | |
| tree | 1ad9570f3443e95643854de456c24acf5da0ff1e /src/libs/installer/packagemanagercore_p.h | |
| parent | 72939d59553ba00d50df72bfb28367595c5e7425 (diff) | |
Fix replaced component uninstall4.3
Replaced component was uninstalled when installing other components
although no update or install was requested to the component. Fixes also
a bug when some components were uninstalled unvisible from user.
Task-number: QTIFW-2577
Change-Id: I6a7e9ce4a56991dfbdea53eb376d782dfb5d050a
Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
Diffstat (limited to 'src/libs/installer/packagemanagercore_p.h')
| -rw-r--r-- | src/libs/installer/packagemanagercore_p.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/libs/installer/packagemanagercore_p.h b/src/libs/installer/packagemanagercore_p.h index 73c378f43..d17a752f9 100644 --- a/src/libs/installer/packagemanagercore_p.h +++ b/src/libs/installer/packagemanagercore_p.h @@ -1,6 +1,6 @@ /************************************************************************** ** -** Copyright (C) 2021 The Qt Company Ltd. +** Copyright (C) 2022 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. @@ -250,6 +250,7 @@ private: void findExecutablesRecursive(const QString &path, const QStringList &excludeFiles, QStringList *result); QStringList runningInstallerProcesses(const QStringList &exludeFiles); bool calculateComponentsAndRun(); + void calculateUninstallComponents(); bool acceptLicenseAgreements() const; bool askUserAcceptLicense(const QString &name, const QString &content) const; bool askUserConfirmCommand() const; @@ -294,6 +295,7 @@ private: void restoreCheckState(); void storeCheckState(); QHash<Component*, Qt::CheckState> m_coreCheckedHash; + QList<Component*> m_deletedReplacedComponents; }; } // namespace QInstaller |