From b6e6ad4876ab6c2c2a20f6cce191e27411441921 Mon Sep 17 00:00:00 2001 From: Arttu Tarkiainen Date: Fri, 27 May 2022 15:54:45 +0300 Subject: macOS: make creating maintenance tool alias optional Currently the installer will create an alias file for maintenance tool with the name defaulting to the file name of maintenance tool, if the name is not explicitly declared in the installer's configuration file. This can cause issues with installers that use the same maintenance tool filename, as the alias would be overwritten on each install, and the default name does not tell which installation the alias is associated with. Make it so that the alias is only created if installer config specifies a name for the alias. Task-number: QTIFW-2665 Change-Id: I790ee376ec56cff16730189e513a194b8c610066 Reviewed-by: Katja Marttila --- src/libs/installer/settings.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/libs/installer/settings.cpp') diff --git a/src/libs/installer/settings.cpp b/src/libs/installer/settings.cpp index b0c6b9d31..108d68832 100644 --- a/src/libs/installer/settings.cpp +++ b/src/libs/installer/settings.cpp @@ -386,8 +386,6 @@ Settings Settings::fromFileAndPrefix(const QString &path, const QString &prefix, s.d->m_data.value(QLatin1String("UninstallerName"), QLatin1String("maintenancetool")) .toString()); } - if (s.d->m_data.value(scMaintenanceToolAlias).toString().isEmpty()) - s.d->m_data.replace(scMaintenanceToolAlias, s.d->m_data.value(scMaintenanceToolName)); if (s.d->m_data.value(scTargetConfigurationFile).toString().isEmpty()) s.d->m_data.replace(scTargetConfigurationFile, QLatin1String("components.xml")); -- cgit v1.2.3