diff options
| author | Katja Marttila <katja.marttila@qt.io> | 2019-08-23 11:05:07 +0300 |
|---|---|---|
| committer | Katja Marttila <katja.marttila@qt.io> | 2019-08-23 11:05:07 +0300 |
| commit | 516492370b95e9c07cad4080ef713d5b2b3f2f94 (patch) | |
| tree | c094d82a3cebf3aaff4182ae7824c3efbce6d3a3 /src/libs/installer/packagemanagercoredata.cpp | |
| parent | 3b310a3ec13a743ae2258bc43d92a5df42c6ad37 (diff) | |
| parent | 8f7af86198935849c74c71add7c9ca081347fb85 (diff) | |
Merge remote-tracking branch 'origin/3.1' into master
Change-Id: I8b203e12283374aed707e0e89c2f73d44ff296cb
Diffstat (limited to 'src/libs/installer/packagemanagercoredata.cpp')
| -rw-r--r-- | src/libs/installer/packagemanagercoredata.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/libs/installer/packagemanagercoredata.cpp b/src/libs/installer/packagemanagercoredata.cpp index 41c6f111c..599352fb9 100644 --- a/src/libs/installer/packagemanagercoredata.cpp +++ b/src/libs/installer/packagemanagercoredata.cpp @@ -57,7 +57,7 @@ PackageManagerCoreData::PackageManagerCoreData(const QHash<QString, QString> &va #ifdef Q_OS_WIN m_variables.insert(QLatin1String("os"), QLatin1String("win")); -#elif defined(Q_OS_OSX) +#elif defined(Q_OS_MACOS) m_variables.insert(QLatin1String("os"), QLatin1String("mac")); #elif defined(Q_OS_LINUX) m_variables.insert(QLatin1String("os"), QLatin1String("x11")); @@ -110,10 +110,8 @@ void PackageManagerCoreData::setDynamicPredefinedVariables() TCHAR buffer[MAX_PATH + 1] = { 0 }; SHGetFolderPath(nullptr, CSIDL_PROGRAM_FILES, nullptr, 0, buffer); dir = QString::fromWCharArray(buffer); -#elif defined (Q_OS_OSX) - dir = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation).value(1); - if (dir.isEmpty()) - dir = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation).value(0); +#elif defined (Q_OS_MACOS) + dir = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation).value(0); #endif m_variables.insert(QLatin1String("ApplicationsDir"), dir); |