summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorArttu Tarkiainen <arttu.tarkiainen@qt.io>2019-08-07 14:51:12 +0300
committerArttu Tarkiainen <arttu.tarkiainen@qt.io>2019-08-16 08:35:19 +0000
commitc7066c9dc25bc4cafdd7bd8057ce34457a86ee65 (patch)
tree03a2f790af380528cd54415b5bf29bb495df972c /tools
parent54f1de217b774322f383df446844c3ec3422dee2 (diff)
Update usage of Apple-related terminology
Replace deprecated Q_OS_OSX macro used in several places with the newer Q_OS_MACOS. Old style reference of Apple's desktop operating system name as "OS X" in documentation and files are also replaced with "macOS" where applicable. Task-number: QTIFW-1406 Change-Id: I0561d5e0d964917ac4fca0702d58a06b85d30e57 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
Diffstat (limited to 'tools')
-rw-r--r--tools/binarycreator/binarycreator.cpp18
-rw-r--r--tools/binarycreator/resources/copylibsintobundle.sh2
-rw-r--r--tools/devtool/binaryreplace.cpp2
-rw-r--r--tools/devtool/main.cpp2
4 files changed, 12 insertions, 12 deletions
diff --git a/tools/binarycreator/binarycreator.cpp b/tools/binarycreator/binarycreator.cpp
index 257fc22fe..f9a8f31d4 100644
--- a/tools/binarycreator/binarycreator.cpp
+++ b/tools/binarycreator/binarycreator.cpp
@@ -263,7 +263,7 @@ static QVersionNumber readMachOMinimumSystemVersion(QIODevice *device)
static int assemble(Input input, const QInstaller::Settings &settings, const QString &signingIdentity)
{
-#ifdef Q_OS_OSX
+#ifdef Q_OS_MACOS
if (QInstaller::isInBundle(input.installerExePath)) {
const QString bundle = input.installerExePath;
// if the input file was a bundle
@@ -394,7 +394,7 @@ static int assemble(Input input, const QInstaller::Settings &settings, const QSt
// no error handling as this is not fatal
setApplicationIcon(tempFile, settings.installerApplicationIcon());
}
-#elif defined(Q_OS_OSX)
+#elif defined(Q_OS_MACOS)
if (isBundle) {
// no error handling as this is not fatal
const QString copyscript = QDir::temp().absoluteFilePath(QLatin1String("copylibsintobundle.sh"));
@@ -411,7 +411,7 @@ static int assemble(Input input, const QInstaller::Settings &settings, const QSt
QTemporaryFile out;
QString targetName = input.outputPath;
-#ifdef Q_OS_OSX
+#ifdef Q_OS_MACOS
QDir resourcePath(QFileInfo(input.outputPath).dir());
resourcePath.cdUp();
resourcePath.cd(QLatin1String("Resources"));
@@ -432,7 +432,7 @@ static int assemble(Input input, const QInstaller::Settings &settings, const QSt
QInstaller::openForWrite(&out);
QFile exe(input.installerExePath);
-#ifdef Q_OS_OSX
+#ifdef Q_OS_MACOS
if (!exe.copy(input.outputPath)) {
throw Error(QString::fromLatin1("Cannot copy %1 to %2: %3").arg(exe.fileName(),
input.outputPath, exe.errorString()));
@@ -477,7 +477,7 @@ static int assemble(Input input, const QInstaller::Settings &settings, const QSt
#endif
QFile::remove(tempFile);
-#ifdef Q_OS_OSX
+#ifdef Q_OS_MACOS
if (isBundle && !signingIdentity.isEmpty()) {
qDebug() << "Signing .app bundle...";
@@ -660,7 +660,7 @@ static void printUsage()
std::cout << " -rcc|--compile-resource Compiles the default resource and outputs the result into"
<< std::endl;
std::cout << " 'update.rcc' in the current path." << std::endl;
-#ifdef Q_OS_OSX
+#ifdef Q_OS_MACOS
std::cout << " -s|--sign identity Sign generated app bundle using the given code " << std::endl;
std::cout << " signing identity" << std::endl;
#endif
@@ -718,7 +718,7 @@ void copyConfigData(const QString &configFile, const QString &targetDir)
QString targetFile;
QFileInfo elementFileInfo;
if (tagName == QLatin1String("Icon") || tagName == QLatin1String("InstallerApplicationIcon")) {
-#if defined(Q_OS_OSX)
+#if defined(Q_OS_MACOS)
const QString suffix = QLatin1String(".icns");
#elif defined(Q_OS_WIN)
const QString suffix = QLatin1String(".ico");
@@ -885,7 +885,7 @@ int main(int argc, char **argv)
continue;
} else if (*it == QLatin1String("-rcc") || *it == QLatin1String("--compile-resource")) {
compileResource = true;
-#ifdef Q_OS_OSX
+#ifdef Q_OS_MACOS
} else if (*it == QLatin1String("-s") || *it == QLatin1String("--sign")) {
++it;
if (it == args.end() || it->startsWith(QLatin1String("-")))
@@ -986,7 +986,7 @@ int main(int argc, char **argv)
confInternal.setValue(QLatin1String("offlineOnly"), offlineOnly);
}
-#ifdef Q_OS_OSX
+#ifdef Q_OS_MACOS
// on mac, we enforce building a bundle
if (!target.endsWith(QLatin1String(".app")) && !target.endsWith(QLatin1String(".dmg")))
target += QLatin1String(".app");
diff --git a/tools/binarycreator/resources/copylibsintobundle.sh b/tools/binarycreator/resources/copylibsintobundle.sh
index c6765364e..1ad5da4db 100644
--- a/tools/binarycreator/resources/copylibsintobundle.sh
+++ b/tools/binarycreator/resources/copylibsintobundle.sh
@@ -71,7 +71,7 @@ function handleFile()
if [ `basename $FILE` != $NAME ]; then
- # this part handles libraries which are Mac OS X frameworks
+ # this part handles libraries which are macOS frameworks
if echo $lib | grep '\.framework' >/dev/null; then
local FRAMEWORKPATH=`echo $lib | sed -ne 's,\(.*\.framework\).*,\1,p'`
local FRAMEWORKNAME=`basename $FRAMEWORKPATH`
diff --git a/tools/devtool/binaryreplace.cpp b/tools/devtool/binaryreplace.cpp
index 7497f2199..97dac37d2 100644
--- a/tools/devtool/binaryreplace.cpp
+++ b/tools/devtool/binaryreplace.cpp
@@ -99,7 +99,7 @@ int BinaryReplace::replace(const QString &source, const QString &target)
result = EXIT_FAILURE;
try {
QFile installerBaseNew(newInstallerBasePath);
-#ifndef Q_OS_OSX
+#ifndef Q_OS_MACOS
QFile installerBaseOld(target);
QInstaller::openForAppend(&installerBaseNew);
diff --git a/tools/devtool/main.cpp b/tools/devtool/main.cpp
index d75ab4e81..dbe8f2b09 100644
--- a/tools/devtool/main.cpp
+++ b/tools/devtool/main.cpp
@@ -168,7 +168,7 @@ int main(int argc, char *argv[])
if (QInstaller::isInBundle(path, &bundlePath)) {
path = QDir(bundlePath).filePath(QLatin1String("Contents/Resources/installer.dat"));
}
-#ifndef Q_OS_OSX
+#ifndef Q_OS_MACOS
QFileInfo fi = QFileInfo(path);
bundlePath = path;
QString tmp = QDir(fi.path()).filePath(QLatin1String("installer.dat"));