From f983a4f2f447b27e233211814884b8d0d6bfc126 Mon Sep 17 00:00:00 2001 From: Arttu Tarkiainen Date: Wed, 20 Apr 2022 10:10:22 +0300 Subject: Fix wrong ApplicationsDir value on macOS This has been already fixed but the change was overwritten by a merge commit. From original commit message: QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation) first element returns $HOME/Applications, as being user writable it has a higher priority. Change the variable to return system wide /Applications as it is a more expected default. Task-number: QTIFW-1011 Change-Id: Iff4f65450db03ed412d4cb97db5f294bf52ffc72 Reviewed-by: Iikka Eklund Reviewed-by: Katja Marttila --- src/libs/installer/packagemanagercoredata.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/libs') diff --git a/src/libs/installer/packagemanagercoredata.cpp b/src/libs/installer/packagemanagercoredata.cpp index 58782c03f..567f97785 100644 --- a/src/libs/installer/packagemanagercoredata.cpp +++ b/src/libs/installer/packagemanagercoredata.cpp @@ -129,7 +129,9 @@ void PackageManagerCoreData::addDynamicPredefinedVariables() SHGetFolderPath(nullptr, CSIDL_PROGRAM_FILES, nullptr, 0, buffer); dir = QString::fromWCharArray(buffer); #elif defined (Q_OS_MACOS) - dir = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation).value(0); + dir = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation).value(1); + if (dir.isEmpty()) + dir = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation).value(0); #endif addNewVariable(QLatin1String("ApplicationsDir"), dir); -- cgit v1.2.3