From adb91d5dd8159910f08041d7dbce1a9c66fae1fd Mon Sep 17 00:00:00 2001 From: Niels Weber Date: Thu, 3 Jul 2014 10:57:09 +0200 Subject: Replace Q_OS_MAC with Q_OS_OSX Q_OS_MAC also refers to iOS. Change-Id: I91603d0add90a0f3948453a6b9628814b0d9f80c Reviewed-by: Jarek Kobus Reviewed-by: Karsten Heimrich --- src/libs/installer/addqtcreatorarrayvalueoperation.cpp | 2 +- src/libs/installer/binaryformat.cpp | 2 +- src/libs/installer/fileutils.cpp | 2 +- src/libs/installer/init.cpp | 8 ++++---- src/libs/installer/messageboxhandler.cpp | 2 +- src/libs/installer/operationrunner.cpp | 2 +- src/libs/installer/packagemanagercore.cpp | 2 +- src/libs/installer/packagemanagercore_p.cpp | 12 ++++++------ src/libs/installer/packagemanagercoredata.cpp | 4 ++-- src/libs/installer/packagemanagergui.cpp | 10 +++++----- src/libs/installer/packagemanagerproxyfactory.cpp | 2 +- src/libs/installer/qtpatchoperation.cpp | 4 ++-- src/libs/installer/setqtcreatorvalueoperation.cpp | 2 +- src/libs/installer/settings.cpp | 2 +- src/sdk/installerbase.cpp | 8 ++++---- .../tst_consumeoutputoperationtest.cpp | 2 +- tests/auto/installer/settings/tst_settings.cpp | 2 +- tools/binarycreator/binarycreator.cpp | 14 +++++++------- 18 files changed, 41 insertions(+), 41 deletions(-) diff --git a/src/libs/installer/addqtcreatorarrayvalueoperation.cpp b/src/libs/installer/addqtcreatorarrayvalueoperation.cpp index 23d160a9a..54222efa6 100644 --- a/src/libs/installer/addqtcreatorarrayvalueoperation.cpp +++ b/src/libs/installer/addqtcreatorarrayvalueoperation.cpp @@ -140,7 +140,7 @@ bool AddQtCreatorArrayValueOperation::undoOperation() } // default value is the old value to keep the possibility that old saved operations can run undo -#ifdef Q_OS_MAC +#ifdef Q_OS_OSX QString qtCreatorInstallerSettingsFileName = core->value(scQtCreatorInstallerSettingsFile, QString::fromLatin1("%1/Qt Creator.app/Contents/Resources/QtProject/QtCreator.ini").arg( core->value(QLatin1String("TargetDir")))); diff --git a/src/libs/installer/binaryformat.cpp b/src/libs/installer/binaryformat.cpp index 8ff870256..28666f8e4 100644 --- a/src/libs/installer/binaryformat.cpp +++ b/src/libs/installer/binaryformat.cpp @@ -558,7 +558,7 @@ BinaryContent BinaryContent::readAndRegisterFromBinary(const QString &path) */ BinaryContent BinaryContent::readFromApplicationFile() { -#ifdef Q_OS_MAC +#ifdef Q_OS_OSX // On Mac, data is always in a separate file so that the binary can be signed QDir dataPath(QCoreApplication::applicationDirPath()); dataPath.cdUp(); diff --git a/src/libs/installer/fileutils.cpp b/src/libs/installer/fileutils.cpp index 309c52180..2ec690f6d 100644 --- a/src/libs/installer/fileutils.cpp +++ b/src/libs/installer/fileutils.cpp @@ -290,7 +290,7 @@ void QInstaller::removeSystemGeneratedFiles(const QString &path) { if (path.isEmpty()) return; -#if defined Q_OS_MAC +#if defined Q_OS_OSX QFile::remove(path + QLatin1String("/.DS_Store")); #elif defined Q_OS_WIN QFile::remove(path + QLatin1String("/Thumbs.db")); diff --git a/src/libs/installer/init.cpp b/src/libs/installer/init.cpp index 78f608ccc..478d77ae8 100644 --- a/src/libs/installer/init.cpp +++ b/src/libs/installer/init.cpp @@ -67,9 +67,9 @@ #include "setqtcreatorvalueoperation.h" #include "addqtcreatorarrayvalueoperation.h" -#ifdef Q_OS_MAC +#ifdef Q_OS_OSX # include "macreplaceinstallnamesoperation.h" -#endif // Q_OS_MAC +#endif // Q_OS_OSX #include "utils.h" @@ -237,8 +237,8 @@ void QInstaller::init() FileDownloaderFactory::setFollowRedirects(true); -#ifdef Q_OS_MAC +#ifdef Q_OS_OSX factory.registerUpdateOperation(QLatin1String("ReplaceInstallNames")); -#endif // Q_OS_MAC +#endif // Q_OS_OSX qInstallMessageHandler(messageHandler); } diff --git a/src/libs/installer/messageboxhandler.cpp b/src/libs/installer/messageboxhandler.cpp index 54065b32e..0992e4140 100644 --- a/src/libs/installer/messageboxhandler.cpp +++ b/src/libs/installer/messageboxhandler.cpp @@ -295,7 +295,7 @@ static QMessageBox::StandardButton showNewMessageBox(QWidget *parent, QMessageBo msgBox.setDefaultButton(button); } } -#if defined(Q_OS_MAC) +#if defined(Q_OS_OSX) msgBox.setWindowModality(Qt::WindowModal); #endif if (msgBox.exec() == -1) diff --git a/src/libs/installer/operationrunner.cpp b/src/libs/installer/operationrunner.cpp index 3cc1565d8..f19f93782 100644 --- a/src/libs/installer/operationrunner.cpp +++ b/src/libs/installer/operationrunner.cpp @@ -69,7 +69,7 @@ OperationRunner::OperationRunner() : m_core(0) { m_path = QCoreApplication::applicationFilePath(); -#ifdef Q_OS_MAC +#ifdef Q_OS_OSX QDir resourcePath(QFileInfo(m_path).dir()); resourcePath.cdUp(); resourcePath.cd(QLatin1String("Resources")); diff --git a/src/libs/installer/packagemanagercore.cpp b/src/libs/installer/packagemanagercore.cpp index 79b3a4ba5..424ce0c09 100644 --- a/src/libs/installer/packagemanagercore.cpp +++ b/src/libs/installer/packagemanagercore.cpp @@ -1717,7 +1717,7 @@ QString PackageManagerCore::findLibrary(const QString &name, const QStringList & #if defined(Q_OS_WIN) return findPath(QString::fromLatin1("%1.lib").arg(name), findPaths); #else -#if defined(Q_OS_MAC) +#if defined(Q_OS_OSX) if (findPaths.isEmpty()) { findPaths.push_back(QLatin1String("/lib")); findPaths.push_back(QLatin1String("/usr/lib")); diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp index 7ac6ca1a7..033174d7e 100644 --- a/src/libs/installer/packagemanagercore_p.cpp +++ b/src/libs/installer/packagemanagercore_p.cpp @@ -600,7 +600,7 @@ void PackageManagerCorePrivate::initialize(const QHash ¶ms #endif if (!m_core->isInstaller()) { -#ifdef Q_OS_MAC +#ifdef Q_OS_OSX readMaintenanceConfigFiles(QCoreApplication::applicationDirPath() + QLatin1String("/../../..")); #else readMaintenanceConfigFiles(QCoreApplication::applicationDirPath()); @@ -736,7 +736,7 @@ Operation *PackageManagerCorePrivate::takeOwnedOperation(Operation *operation) QString PackageManagerCorePrivate::uninstallerName() const { QString filename = m_data.settings().uninstallerName(); -#if defined(Q_OS_MAC) +#if defined(Q_OS_OSX) if (QFileInfo(QCoreApplication::applicationDirPath() + QLatin1String("/../..")).isBundle()) filename += QLatin1String(".app/Contents/MacOS/") + filename; #elif defined(Q_OS_WIN) @@ -1047,7 +1047,7 @@ void PackageManagerCorePrivate::writeUninstallerBinary(QFile *const input, qint6 QInstaller::appendData(&out, input, size); if (writeBinaryLayout) { -#ifdef Q_OS_MAC +#ifdef Q_OS_OSX QDir resourcePath(QFileInfo(uninstallerRenamedName).dir()); if (!resourcePath.path().endsWith(QLatin1String("Contents/MacOS"))) throw Error(tr("Uninstaller is not a bundle")); @@ -1183,7 +1183,7 @@ void PackageManagerCorePrivate::writeUninstaller(OperationList performedOperatio performedOperations.append(takeOwnedOperation(op)); } -#ifdef Q_OS_MAC +#ifdef Q_OS_OSX // if it is a bundle, we need some stuff in it... const QString sourceAppDirPath = QCoreApplication::applicationDirPath(); if (isInstaller() && QFileInfo(sourceAppDirPath + QLatin1String("/../..")).isBundle()) { @@ -1334,7 +1334,7 @@ void PackageManagerCorePrivate::writeUninstaller(OperationList performedOperatio QInstaller::openForRead(&input); layout = BinaryContent::readBinaryLayout(&input, findMagicCookie(&input, MagicCookieDat)); } catch (const Error &/*error*/) { -#ifdef Q_OS_MAC +#ifdef Q_OS_OSX // On Mac, data is always in a separate file so that the binary can be signed QString binaryName = isInstaller() ? installerBinaryPath() : uninstallerName(); QDir dataPath(QFileInfo(binaryName).dir()); @@ -2004,7 +2004,7 @@ void PackageManagerCorePrivate::deleteUninstaller() // every other platform has no problem if we just delete ourselves now QFile uninstaller(QFileInfo(installerBinaryPath()).absoluteFilePath()); uninstaller.remove(); -# ifdef Q_OS_MAC +# ifdef Q_OS_OSX const QLatin1String cdUp("/../../.."); if (QFileInfo(QFileInfo(installerBinaryPath() + cdUp).absoluteFilePath()).isBundle()) { removeDirectoryThreaded(QFileInfo(installerBinaryPath() + cdUp).absoluteFilePath()); diff --git a/src/libs/installer/packagemanagercoredata.cpp b/src/libs/installer/packagemanagercoredata.cpp index ab6bd798c..969ae67b7 100644 --- a/src/libs/installer/packagemanagercoredata.cpp +++ b/src/libs/installer/packagemanagercoredata.cpp @@ -75,14 +75,14 @@ PackageManagerCoreData::PackageManagerCoreData(const QHash &va TCHAR buffer[MAX_PATH + 1] = { 0 }; SHGetFolderPath(0, CSIDL_PROGRAM_FILES, 0, 0, buffer); dir = QString::fromWCharArray(buffer); -#elif defined (Q_OS_MAC) +#elif defined (Q_OS_OSX) dir = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation).value(0); #endif m_variables.insert(QLatin1String("ApplicationsDir"), dir); #ifdef Q_OS_WIN m_variables.insert(QLatin1String("os"), QLatin1String("win")); -#elif defined(Q_OS_MAC) +#elif defined(Q_OS_OSX) m_variables.insert(QLatin1String("os"), QLatin1String("mac")); #elif defined(Q_OS_LINUX) m_variables.insert(QLatin1String("os"), QLatin1String("x11")); diff --git a/src/libs/installer/packagemanagergui.cpp b/src/libs/installer/packagemanagergui.cpp index 3914250e5..c17364fd5 100644 --- a/src/libs/installer/packagemanagergui.cpp +++ b/src/libs/installer/packagemanagergui.cpp @@ -241,7 +241,7 @@ PackageManagerGui::PackageManagerGui(PackageManagerCore *core, QWidget *parent) setWindowTitle(tr("Maintain %1").arg(m_core->value(scTitle))); setWindowFlags(windowFlags() &~ Qt::WindowContextHelpButtonHint); -#ifndef Q_OS_MAC +#ifndef Q_OS_OSX setWindowIcon(QIcon(m_core->settings().installerWindowIcon())); #else setPixmap(QWizard::BackgroundPixmap, m_core->settings().background()); @@ -1714,7 +1714,7 @@ bool TargetDirectoryPage::validatePage() const QFileInfo fi(targetDir); if (fi.isDir()) { QString fileName = packageManagerCore()->settings().uninstallerName(); -#if defined(Q_OS_MAC) +#if defined(Q_OS_OSX) if (QFileInfo(QCoreApplication::applicationDirPath() + QLatin1String("/../..")).isBundle()) fileName += QLatin1String(".app/Contents/MacOS/") + fileName; #elif defined(Q_OS_WIN) @@ -2283,7 +2283,7 @@ FinishedPage::FinishedPage(PackageManagerCore *core) m_msgLabel->setWordWrap(true); m_msgLabel->setObjectName(QLatin1String("MessageLabel")); -#ifdef Q_OS_MAC +#ifdef Q_OS_OSX m_msgLabel->setText(tr("Click Done to exit the %1 Wizard.").arg(productName())); #else m_msgLabel->setText(tr("Click Finish to exit the %1 Wizard.").arg(productName())); @@ -2308,7 +2308,7 @@ void FinishedPage::entering() setCommitPage(true); if (packageManagerCore()->isUpdater() || packageManagerCore()->isPackageManager()) { -#ifdef Q_OS_MAC +#ifdef Q_OS_OSX gui()->setOption(QWizard::NoCancelButton, false); #endif if (QAbstractButton *cancel = gui()->button(QWizard::CancelButton)) { @@ -2370,7 +2370,7 @@ void FinishedPage::entering() void FinishedPage::leaving() { -#ifdef Q_OS_MAC +#ifdef Q_OS_OSX gui()->setOption(QWizard::NoCancelButton, true); #endif diff --git a/src/libs/installer/packagemanagerproxyfactory.cpp b/src/libs/installer/packagemanagerproxyfactory.cpp index 219ff5e49..84fb41648 100644 --- a/src/libs/installer/packagemanagerproxyfactory.cpp +++ b/src/libs/installer/packagemanagerproxyfactory.cpp @@ -62,7 +62,7 @@ QList PackageManagerProxyFactory::queryProxy(const QNetworkProxyQ QList list; if (settings.proxyType() == Settings::SystemProxy) { -#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) +#if defined(Q_OS_UNIX) && !defined(Q_OS_OSX) QUrl proxyUrl = QUrl::fromUserInput(QString::fromUtf8(qgetenv("http_proxy"))); if (proxyUrl.isValid()) { return list << QNetworkProxy(QNetworkProxy::HttpProxy, proxyUrl.host(), proxyUrl.port(), diff --git a/src/libs/installer/qtpatchoperation.cpp b/src/libs/installer/qtpatchoperation.cpp index e9fbb65c5..7acd07029 100644 --- a/src/libs/installer/qtpatchoperation.cpp +++ b/src/libs/installer/qtpatchoperation.cpp @@ -41,7 +41,7 @@ #include "qtpatchoperation.h" #include "qtpatch.h" -#ifdef Q_OS_MAC +#ifdef Q_OS_OSX #include "macreplaceinstallnamesoperation.h" #endif @@ -253,7 +253,7 @@ bool QtPatchOperation::performOperation() return false; } -#ifdef Q_OS_MAC +#ifdef Q_OS_OSX // looking for /lib/Qt wasn't enough for all libs and frameworks, // at the Qt4 case we had for example: /lib/libQtCLucene* and /lib/phonon* // so now we find every possible replace string inside dynlib dependencies diff --git a/src/libs/installer/setqtcreatorvalueoperation.cpp b/src/libs/installer/setqtcreatorvalueoperation.cpp index 4f2bbfbc1..3d382d9a3 100644 --- a/src/libs/installer/setqtcreatorvalueoperation.cpp +++ b/src/libs/installer/setqtcreatorvalueoperation.cpp @@ -136,7 +136,7 @@ bool SetQtCreatorValueOperation::undoOperation() } // default value is the old value to keep the possibility that old saved operations can run undo -#ifdef Q_OS_MAC +#ifdef Q_OS_OSX QString qtCreatorInstallerSettingsFileName = core->value(scQtCreatorInstallerSettingsFile, QString::fromLatin1("%1/Qt Creator.app/Contents/Resources/QtProject/QtCreator.ini").arg( core->value(QLatin1String("TargetDir")))); diff --git a/src/libs/installer/settings.cpp b/src/libs/installer/settings.cpp index d56d2d120..cf1d163cd 100644 --- a/src/libs/installer/settings.cpp +++ b/src/libs/installer/settings.cpp @@ -372,7 +372,7 @@ QString Settings::installerWindowIcon() const QString Settings::systemIconSuffix() const { -#if defined(Q_OS_MAC) +#if defined(Q_OS_OSX) return QLatin1String(".icns"); #elif defined(Q_OS_WIN) return QLatin1String(".ico"); diff --git a/src/sdk/installerbase.cpp b/src/sdk/installerbase.cpp index 590a3e1fb..62b65da22 100644 --- a/src/sdk/installerbase.cpp +++ b/src/sdk/installerbase.cpp @@ -104,7 +104,7 @@ static QStringList repositories(const QStringList &arguments, const int index) int main(int argc, char *argv[]) { // increase maximum numbers of file descriptors -#if defined (Q_OS_MAC) +#if defined (Q_OS_OSX) struct rlimit rl; getrlimit(RLIMIT_NOFILE, &rl); rl.rlim_cur = qMin((rlim_t)OPEN_MAX, rl.rlim_max); @@ -114,7 +114,7 @@ int main(int argc, char *argv[]) QStringList args = QInstaller::parseCommandLineArgs(argc, argv); // hack to use cleanlooks if it is under Ubuntu -#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) +#if defined(Q_OS_UNIX) && !defined(Q_OS_OSX) std::string standardString; std::string cleanLooks ="-style=cleanlooks"; std::ifstream input("/etc/os-release"); @@ -173,7 +173,7 @@ int main(int argc, char *argv[]) } // Make sure we honor the system's proxy settings -#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) +#if defined(Q_OS_UNIX) && !defined(Q_OS_OSX) QUrl proxyUrl(QString::fromLatin1(qgetenv("http_proxy"))); if (proxyUrl.isValid()) { QNetworkProxy proxy(QNetworkProxy::HttpProxy, proxyUrl.host(), proxyUrl.port(), @@ -298,7 +298,7 @@ int main(int argc, char *argv[]) args.removeAll(QLatin1String("--binarydatafile")); } -#ifdef Q_OS_MAC +#ifdef Q_OS_OSX // Load the external binary resource if we got one passed, otherwise assume we are a bundle. In that // case we need to figure out the path into the bundles resources folder to get the binary data. if (index < 0) { diff --git a/tests/auto/installer/consumeoutputoperationtest/tst_consumeoutputoperationtest.cpp b/tests/auto/installer/consumeoutputoperationtest/tst_consumeoutputoperationtest.cpp index 227820ed1..14977aa1d 100644 --- a/tests/auto/installer/consumeoutputoperationtest/tst_consumeoutputoperationtest.cpp +++ b/tests/auto/installer/consumeoutputoperationtest/tst_consumeoutputoperationtest.cpp @@ -127,7 +127,7 @@ private slots: return; #if defined(Q_OS_WIN) QString patchType = "windows"; -#elif defined(Q_OS_MAC) +#elif defined(Q_OS_OSX) QString patchType = "mac"; #else QString patchType = "linux"; diff --git a/tests/auto/installer/settings/tst_settings.cpp b/tests/auto/installer/settings/tst_settings.cpp index d36c15d5d..2bd318f52 100644 --- a/tests/auto/installer/settings/tst_settings.cpp +++ b/tests/auto/installer/settings/tst_settings.cpp @@ -44,7 +44,7 @@ void tst_Settings::loadTutorialConfig() QCOMPARE(settings.icon(), QLatin1String(":/installer.ico")); QCOMPARE(settings.installerApplicationIcon(), QLatin1String(":/installer.ico")); QCOMPARE(settings.installerWindowIcon(), QLatin1String(":/installer.ico")); -#elif defined(Q_OS_MAC) +#elif defined(Q_OS_OSX) QCOMPARE(settings.icon(), QLatin1String(":/installer.icns")); QCOMPARE(settings.installerApplicationIcon(), QLatin1String(":/installer.icns")); QCOMPARE(settings.installerWindowIcon(), QLatin1String(":/installer.icns")); 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"); -- cgit v1.2.3