diff options
| author | Katja Marttila <katja.marttila@qt.io> | 2020-10-06 14:13:22 +0300 |
|---|---|---|
| committer | Katja Marttila <katja.marttila@qt.io> | 2020-10-15 10:46:08 +0300 |
| commit | 0a9427d03b174cf4a4f0fa41151688d0c227ba61 (patch) | |
| tree | ec14f991a0218bad674843ec6d3ae3028f884c8b /src/libs/installer/packagemanagercore_p.cpp | |
| parent | 9f94110b7de18870d690d8ad102d26deceb17e0e (diff) | |
Don't warn if maintenance tool cannot be deleted
We have a deferred delete for maintenance tool as in Windows the running
program cannot be deleted.
Task-number: QTIFW-1979
Change-Id: I3bfd98dd1d476450b9b770c9b2f1c70810e67492
Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
Diffstat (limited to 'src/libs/installer/packagemanagercore_p.cpp')
| -rw-r--r-- | src/libs/installer/packagemanagercore_p.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp index 7ed6d5a29..8b08c3be1 100644 --- a/src/libs/installer/packagemanagercore_p.cpp +++ b/src/libs/installer/packagemanagercore_p.cpp @@ -1891,12 +1891,14 @@ bool PackageManagerCorePrivate::runUninstaller() deleteMaintenanceTool(); // this will also delete the TargetDir on Windows // If not on Windows, we need to remove TargetDir manually. +#ifndef Q_OS_WIN if (QVariant(m_core->value(scRemoveTargetDir)).toBool() && !targetDir().isEmpty()) { if (updateAdminRights && !adminRightsGained) adminRightsGained = m_core->gainAdminRights(); removeDirectoryThreaded(targetDir(), true); qCDebug(QInstaller::lcInstallerInstallLog) << "Complete uninstallation was chosen."; } +#endif unregisterMaintenanceTool(); m_needToWriteMaintenanceTool = false; |