diff options
Diffstat (limited to 'src/lib/corelib')
-rw-r--r-- | src/lib/corelib/corelib.qbs | 4 | ||||
-rw-r--r-- | src/lib/corelib/jsextensions/propertylist.mm | 2 | ||||
-rw-r--r-- | src/lib/corelib/jsextensions/utilitiesextension.cpp | 8 | ||||
-rw-r--r-- | src/lib/corelib/language/moduleloader.cpp | 4 | ||||
-rw-r--r-- | src/lib/corelib/language/testdata/getNativeSetting.qbs | 2 | ||||
-rw-r--r-- | src/lib/corelib/language/tst_language.cpp | 6 | ||||
-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 |
9 files changed, 21 insertions, 21 deletions
diff --git a/src/lib/corelib/corelib.qbs b/src/lib/corelib/corelib.qbs index 27f058621..3231777d5 100644 --- a/src/lib/corelib/corelib.qbs +++ b/src/lib/corelib/corelib.qbs @@ -407,8 +407,8 @@ QbsLibrary { ] } Group { - condition: qbs.targetOS.contains("osx") - name: "tools (OS X)" + condition: qbs.targetOS.contains("macos") + name: "tools (macOS)" prefix: "tools/" files: [ "applecodesignutils.cpp", diff --git a/src/lib/corelib/jsextensions/propertylist.mm b/src/lib/corelib/jsextensions/propertylist.mm index 0306310c5..65b37f6ae 100644 --- a/src/lib/corelib/jsextensions/propertylist.mm +++ b/src/lib/corelib/jsextensions/propertylist.mm @@ -322,7 +322,7 @@ QByteArray PropertyListPrivate::writeToData(QScriptContext *context, const QStri #endif else { errorString = @"JSON serialization of property lists is not " - @"supported on this version of OS X"; + @"supported on this version of macOS"; } } else if (format == QLatin1String("xml1") || format == QLatin1String("binary1")) { const NSPropertyListFormat plistFormat = format == QLatin1String("xml1") diff --git a/src/lib/corelib/jsextensions/utilitiesextension.cpp b/src/lib/corelib/jsextensions/utilitiesextension.cpp index f4ca809de..52335b02a 100644 --- a/src/lib/corelib/jsextensions/utilitiesextension.cpp +++ b/src/lib/corelib/jsextensions/utilitiesextension.cpp @@ -35,7 +35,7 @@ #include <tools/architectures.h> #include <tools/fileinfo.h> -#ifdef Q_OS_OSX +#if defined(Q_OS_MACOS) || defined(Q_OS_OSX) #include <tools/applecodesignutils.h> #endif @@ -174,7 +174,7 @@ QScriptValue UtilitiesExtension::js_rfc1034identifier(QScriptContext *context, QScriptValue UtilitiesExtension::js_smimeMessageContent(QScriptContext *context, QScriptEngine *engine) { -#ifndef Q_OS_OSX +#if !defined(Q_OS_MACOS) && !defined(Q_OS_OSX) Q_UNUSED(engine); return context->throwError(QScriptContext::UnknownError, QLatin1String("smimeMessageContent is not available on this platform")); @@ -198,7 +198,7 @@ QScriptValue UtilitiesExtension::js_smimeMessageContent(QScriptContext *context, QScriptValue UtilitiesExtension::js_certificateInfo(QScriptContext *context, QScriptEngine *engine) { -#ifndef Q_OS_OSX +#if !defined(Q_OS_MACOS) && !defined(Q_OS_OSX) Q_UNUSED(engine); return context->throwError(QScriptContext::UnknownError, QLatin1String("certificateInfo is not available on this platform")); @@ -214,7 +214,7 @@ QScriptValue UtilitiesExtension::js_certificateInfo(QScriptContext *context, QScriptValue UtilitiesExtension::js_signingIdentities(QScriptContext *context, QScriptEngine *engine) { -#ifndef Q_OS_OSX +#if !defined(Q_OS_MACOS) && !defined(Q_OS_OSX) Q_UNUSED(engine); return context->throwError(QScriptContext::UnknownError, QLatin1String("signingIdentities is not available on this platform")); diff --git a/src/lib/corelib/language/moduleloader.cpp b/src/lib/corelib/language/moduleloader.cpp index f878cfc0f..2197dc349 100644 --- a/src/lib/corelib/language/moduleloader.cpp +++ b/src/lib/corelib/language/moduleloader.cpp @@ -1349,8 +1349,8 @@ static QStringList hostOS() #if defined(Q_OS_LYNX) hostSystem << QLatin1String("lynx"); #endif -#if defined(Q_OS_OSX) - hostSystem << QLatin1String("osx"); +#if defined(Q_OS_MACOS) || defined(Q_OS_OSX) + hostSystem << QLatin1String("macos") << QLatin1String("osx"); #endif #if defined(Q_OS_MSDOS) hostSystem << QLatin1String("msdos"); diff --git a/src/lib/corelib/language/testdata/getNativeSetting.qbs b/src/lib/corelib/language/testdata/getNativeSetting.qbs index 122b0e657..ab2943499 100644 --- a/src/lib/corelib/language/testdata/getNativeSetting.qbs +++ b/src/lib/corelib/language/testdata/getNativeSetting.qbs @@ -4,7 +4,7 @@ import qbs.Utilities Project { Product { name: { - if (qbs.hostOS.contains("osx")) { + if (qbs.hostOS.contains("macos")) { return Utilities.getNativeSetting("/System/Library/CoreServices/SystemVersion.plist", "ProductName"); } else if (qbs.hostOS.contains("windows")) { var productName = Utilities.getNativeSetting("HKEY_LOCAL_MACHINE\\Software\\Microsoft\\Windows NT\\CurrentVersion", "ProductName"); diff --git a/src/lib/corelib/language/tst_language.cpp b/src/lib/corelib/language/tst_language.cpp index 6ec955caf..3796121cd 100644 --- a/src/lib/corelib/language/tst_language.cpp +++ b/src/lib/corelib/language/tst_language.cpp @@ -664,7 +664,7 @@ void TestLanguage::getNativeSetting() project = loader->loadProject(defaultParameters); QString expectedProductName; - if (HostOsInfo::isOsxHost()) + if (HostOsInfo::isMacosHost()) expectedProductName = QLatin1String("Mac OS X"); else if (HostOsInfo::isWindowsHost()) expectedProductName = QLatin1String("Windows"); @@ -1949,7 +1949,7 @@ void TestLanguage::wildcards() QVERIFY(product); GroupPtr group; if (useGroup) { - QCOMPARE(product->groups.count(), HostOsInfo::isOsxHost() ? 4 : 3); + QCOMPARE(product->groups.count(), HostOsInfo::isMacosHost() ? 4 : 3); foreach (const GroupPtr &rg, product->groups) { if (rg->name == groupName) { group = rg; @@ -1957,7 +1957,7 @@ void TestLanguage::wildcards() } } } else { - QCOMPARE(product->groups.count(), HostOsInfo::isOsxHost() ? 3 : 2); + QCOMPARE(product->groups.count(), HostOsInfo::isMacosHost() ? 3 : 2); group = product->groups.first(); } QVERIFY(group); 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"); |