diff options
| author | Niels Weber <niels.weber@digia.com> | 2014-07-03 10:57:09 +0200 |
|---|---|---|
| committer | Niels Weber <niels.weber@digia.com> | 2014-07-03 11:14:19 +0200 |
| commit | adb91d5dd8159910f08041d7dbce1a9c66fae1fd (patch) | |
| tree | b5f78d1be6e98bfe424414b3b12668167b0d0d26 /tools | |
| parent | 8a898f63e556922ace34ced391480bdf9e698fea (diff) | |
Replace Q_OS_MAC with Q_OS_OSX
Q_OS_MAC also refers to iOS.
Change-Id: I91603d0add90a0f3948453a6b9628814b0d9f80c
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/binarycreator/binarycreator.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tools/binarycreator/binarycreator.cpp b/tools/binarycreator/binarycreator.cpp index cbb8fddc7..84f5dfa42 100644 --- a/tools/binarycreator/binarycreator.cpp +++ b/tools/binarycreator/binarycreator.cpp @@ -116,7 +116,7 @@ static void chmod755(const QString &absolutFilePath) static int assemble(Input input, const QInstaller::Settings &settings) { -#ifdef Q_OS_MAC +#ifdef Q_OS_OSX if (QFileInfo(input.installerExePath).isBundle()) { const QString bundle = input.installerExePath; // if the input file was a bundle @@ -240,7 +240,7 @@ static int assemble(Input input, const QInstaller::Settings &settings) setApplicationIcon(tempFile, settings.icon()); } } -#elif defined(Q_OS_MAC) +#elif defined(Q_OS_OSX) if (isBundle) { // no error handling as this is not fatal const QString copyscript = QDir::temp().absoluteFilePath(QLatin1String("copylibsintobundle.sh")); @@ -257,7 +257,7 @@ static int assemble(Input input, const QInstaller::Settings &settings) QTemporaryFile out; QString targetName = input.outputPath; -#ifdef Q_OS_MAC +#ifdef Q_OS_OSX QDir resourcePath(QFileInfo(input.outputPath).dir()); resourcePath.cdUp(); resourcePath.cd(QLatin1String("Resources")); @@ -278,7 +278,7 @@ static int assemble(Input input, const QInstaller::Settings &settings) QInstaller::openForWrite(&out); QFile exe(input.installerExePath); -#ifdef Q_OS_MAC +#ifdef Q_OS_OSX if (!exe.copy(input.outputPath)) { throw Error(QString::fromLatin1("Could not copy %1 to %2: %3").arg(exe.fileName(), input.outputPath, exe.errorString())); @@ -353,7 +353,7 @@ static int assemble(Input input, const QInstaller::Settings &settings) #endif QFile::remove(tempFile); -#ifdef Q_OS_MAC +#ifdef Q_OS_OSX bundleBackup.release(); if (createDMG) { @@ -539,7 +539,7 @@ void copyConfigData(const QString &configFile, const QString &targetDir) QString targetFile; QFileInfo elementFileInfo; if (tagName == QLatin1String("Icon") || tagName == QLatin1String("InstallerApplicationIcon")) { -#if defined(Q_OS_MAC) +#if defined(Q_OS_OSX) const QString suffix = QLatin1String(".icns"); #elif defined(Q_OS_WIN) const QString suffix = QLatin1String(".ico"); @@ -746,7 +746,7 @@ int main(int argc, char **argv) confInternal.setValue(QLatin1String("offlineOnly"), offlineOnly); } -#if defined(Q_OS_MAC) +#if defined(Q_OS_OSX) // on mac, we enforce building a bundle if (!target.endsWith(QLatin1String(".app")) && !target.endsWith(QLatin1String(".dmg"))) target += QLatin1String(".app"); |