diff options
| author | Ian Dean <ian@mediator-software.com> | 2012-07-18 23:02:56 -0700 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-18 11:09:00 +0200 |
| commit | b3c21d93f66617b87b341911d329c0b1ad6af485 (patch) | |
| tree | aee75fa9e661cc33916b3ef6c01de7217a8b4676 /src/corelib/io/qprocess_unix.cpp | |
| parent | c14694621aab2e7df13830f80621fb5680b432e4 (diff) | |
Refactor coreservices -> ios & QT_NO_CORESERVICES -> Q_OS_IOS
Similar work was done in Qt5 in Change Id3b02316
Change-Id: I392d2a5bfffb9a335f28d5dbc5ea27b800fc4487
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Diffstat (limited to 'src/corelib/io/qprocess_unix.cpp')
| -rw-r--r-- | src/corelib/io/qprocess_unix.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/io/qprocess_unix.cpp b/src/corelib/io/qprocess_unix.cpp index 3f080d7345..0e069a3566 100644 --- a/src/corelib/io/qprocess_unix.cpp +++ b/src/corelib/io/qprocess_unix.cpp @@ -459,7 +459,7 @@ bool QProcessPrivate::createChannel(Channel &channel) } QT_BEGIN_INCLUDE_NAMESPACE -#if defined(Q_OS_MAC) && !defined(QT_NO_CORESERVICES) +#if defined(Q_OS_MAC) && !defined(Q_OS_IOS) # include <crt_externs.h> # define environ (*_NSGetEnviron()) #else @@ -470,7 +470,7 @@ QT_END_INCLUDE_NAMESPACE QProcessEnvironment QProcessEnvironment::systemEnvironment() { QProcessEnvironment env; -#if !defined(Q_OS_MAC) || !defined(QT_NO_CORESERVICES) +#if !defined(Q_OS_IOS) const char *entry; for (int count = 0; (entry = environ[count]); ++count) { const char *equal = strchr(entry, '='); |