diff options
Diffstat (limited to 'src/lib/corelib/tools')
| -rw-r--r-- | src/lib/corelib/tools/applecodesignutils.cpp | 2 | ||||
| -rw-r--r-- | src/lib/corelib/tools/hostosinfo.h | 12 | ||||
| -rw-r--r-- | src/lib/corelib/tools/scannerpluginmanager.cpp | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/corelib/tools/applecodesignutils.cpp b/src/lib/corelib/tools/applecodesignutils.cpp index add6f9cac..fafb278d7 100644 --- a/src/lib/corelib/tools/applecodesignutils.cpp +++ b/src/lib/corelib/tools/applecodesignutils.cpp @@ -93,7 +93,7 @@ QVariantMap certificateInfo(const QByteArray &data) QVariantMap identitiesProperties() { - // Apple documentation states that the Sec* family of functions are not thread-safe on OS X + // Apple documentation states that the Sec* family of functions are not thread-safe on macOS // https://developer.apple.com/library/mac/documentation/Security/Reference/certifkeytrustservices/ static QMutex securityMutex; QMutexLocker locker(&securityMutex); diff --git a/src/lib/corelib/tools/hostosinfo.h b/src/lib/corelib/tools/hostosinfo.h index 892f3f1bd..3786a4178 100644 --- a/src/lib/corelib/tools/hostosinfo.h +++ b/src/lib/corelib/tools/hostosinfo.h @@ -61,7 +61,7 @@ class QBS_EXPORT HostOsInfo // Exported for use by command-line tools. { public: // Add more as needed. - enum HostOs { HostOsWindows, HostOsLinux, HostOsOsx, HostOsOtherUnix, HostOsOther }; + enum HostOs { HostOsWindows, HostOsLinux, HostOsMacos, HostOsOtherUnix, HostOsOther }; static inline HostOs hostOs(); @@ -75,7 +75,7 @@ public: QLatin1Char('.') + settings.value(QStringLiteral("CurrentBuildNumber")).toString()); Q_ASSERT(v.isValid()); - } else if (HostOsInfo::isOsxHost()) { + } else if (HostOsInfo::isMacosHost()) { QSettings settings(QStringLiteral("/System/Library/CoreServices/SystemVersion.plist"), QSettings::NativeFormat); v = v.fromString(settings.value(QStringLiteral("ProductVersion")).toString()); @@ -86,7 +86,7 @@ public: static bool isWindowsHost() { return hostOs() == HostOsWindows; } static bool isLinuxHost() { return hostOs() == HostOsLinux; } - static bool isOsxHost() { return hostOs() == HostOsOsx; } + static bool isMacosHost() { return hostOs() == HostOsMacos; } static inline bool isAnyUnixHost(); static inline QString rfc1034Identifier(const QString &str); @@ -113,7 +113,7 @@ public: { if (isWindowsHost()) return QStringLiteral("PATH"); - if (isOsxHost()) + if (isMacosHost()) return QStringLiteral("DYLD_LIBRARY_PATH"); return QStringLiteral("LD_LIBRARY_PATH"); } @@ -125,7 +125,7 @@ public: static Qt::KeyboardModifier controlModifier() { - return isOsxHost() ? Qt::MetaModifier : Qt::ControlModifier; + return isMacosHost() ? Qt::MetaModifier : Qt::ControlModifier; } }; @@ -136,7 +136,7 @@ HostOsInfo::HostOs HostOsInfo::hostOs() #elif defined(Q_OS_LINUX) return HostOsLinux; #elif defined(Q_OS_DARWIN) - return HostOsOsx; + return HostOsMacos; #elif defined(Q_OS_UNIX) return HostOsOtherUnix; #else diff --git a/src/lib/corelib/tools/scannerpluginmanager.cpp b/src/lib/corelib/tools/scannerpluginmanager.cpp index 7341fea7c..3bd0609df 100644 --- a/src/lib/corelib/tools/scannerpluginmanager.cpp +++ b/src/lib/corelib/tools/scannerpluginmanager.cpp @@ -70,7 +70,7 @@ void ScannerPluginManager::loadPlugins(const QStringList &pluginPaths, const Log if (HostOsInfo::isWindowsHost()) filters << QLatin1String("*.dll"); - else if (HostOsInfo::isOsxHost()) + else if (HostOsInfo::isMacosHost()) filters << QLatin1String("*.dylib"); else filters << QLatin1String("*.so"); |