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 /src/sdk/installerbase.cpp | |
| 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 'src/sdk/installerbase.cpp')
| -rw-r--r-- | src/sdk/installerbase.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
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) { |