diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-05-09 15:44:48 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2011-05-09 15:44:48 (GMT) |
| commit | 76ac26383922b4c452592a9175e7f3b9b3fd2513 (patch) | |
| tree | 53c0ab6d77aa7bd7779170a90271afd5cde40e4d | |
| parent | e4920a4b4bc454ad309324a62db0e9257bba7367 (diff) | |
| download | Qt-76ac26383922b4c452592a9175e7f3b9b3fd2513.zip Qt-76ac26383922b4c452592a9175e7f3b9b3fd2513.tar.gz Qt-76ac26383922b4c452592a9175e7f3b9b3fd2513.tar.bz2 | |
ifdef out mac/no_coreservices path more cleanly
the symbian path was also dead
| -rw-r--r-- | src/corelib/io/qprocess_unix.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/corelib/io/qprocess_unix.cpp b/src/corelib/io/qprocess_unix.cpp index a3c589f..5616d39 100644 --- a/src/corelib/io/qprocess_unix.cpp +++ b/src/corelib/io/qprocess_unix.cpp @@ -457,9 +457,6 @@ QT_BEGIN_INCLUDE_NAMESPACE #if defined(Q_OS_MAC) && !defined(QT_NO_CORESERVICES) # include <crt_externs.h> # define environ (*_NSGetEnviron()) -#elif defined(Q_OS_SYMBIAN) || (defined(Q_OS_MAC) && defined(QT_NO_CORESERVICES)) - static char *qt_empty_environ[] = { 0 }; -#define environ qt_empty_environ #else extern char **environ; #endif @@ -468,6 +465,7 @@ QT_END_INCLUDE_NAMESPACE QProcessEnvironment QProcessEnvironment::systemEnvironment() { QProcessEnvironment env; +#if !defined(Q_OS_MAC) || !defined(QT_NO_CORESERVICES) const char *entry; for (int count = 0; (entry = environ[count]); ++count) { const char *equal = strchr(entry, '='); @@ -479,6 +477,7 @@ QProcessEnvironment QProcessEnvironment::systemEnvironment() env.d->hash.insert(QProcessEnvironmentPrivate::Key(name), QProcessEnvironmentPrivate::Value(value)); } +#endif return env; } |