1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ifdef out mac/no_coreservices path more cleanly

Browse Source 
the symbian path was also dead
(cherry picked from commit 76ac26383922b4c452592a9175e7f3b9b3fd2513)
This commit is contained in:
Oswald Buddenhagen 2011-05-09 17:44:48 +02:00 committed by Olivier Goffart
parent 00bfc268c4
commit 1e331968e1
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/corelib/io/qprocess_unix.cpp
View File

@ -471,9 +471,6 @@ QT_BEGIN_INCLUDE_NAMESPACE
#if defined(Q_OS_MAC) && !defined(QT_NO_CORESERVICES) #if defined(Q_OS_MAC) && !defined(QT_NO_CORESERVICES)
# include <crt_externs.h> # include <crt_externs.h>
# define environ (*_NSGetEnviron()) # 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 #else
extern char **environ; extern char **environ;
#endif #endif
@ -482,6 +479,7 @@ QT_END_INCLUDE_NAMESPACE
QProcessEnvironment QProcessEnvironment::systemEnvironment() QProcessEnvironment QProcessEnvironment::systemEnvironment()
{ {
QProcessEnvironment env; QProcessEnvironment env;
#if !defined(Q_OS_MAC) || !defined(QT_NO_CORESERVICES)
const char *entry; const char *entry;
for (int count = 0; (entry = environ[count]); ++count) { for (int count = 0; (entry = environ[count]); ++count) {
const char *equal = strchr(entry, '='); const char *equal = strchr(entry, '=');
@ -493,6 +491,7 @@ QProcessEnvironment QProcessEnvironment::systemEnvironment()
env.d->hash.insert(QProcessEnvironmentPrivate::Key(name), env.d->hash.insert(QProcessEnvironmentPrivate::Key(name),
QProcessEnvironmentPrivate::Value(value)); QProcessEnvironmentPrivate::Value(value));
} }
#endif
return env; return env;
} }