From e4920a4b4bc454ad309324a62db0e9257bba7367 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Mon, 9 May 2011 17:42:53 +0200
Subject: fix build on symbian

provide dummy implementation of QProcessEnvironment::systemEnvironment()
---
 src/corelib/io/qprocess_symbian.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/corelib/io/qprocess_symbian.cpp b/src/corelib/io/qprocess_symbian.cpp
index 8a74c7b..2ce7a00 100644
--- a/src/corelib/io/qprocess_symbian.cpp
+++ b/src/corelib/io/qprocess_symbian.cpp
@@ -1062,6 +1062,11 @@ void QProcessPrivate::initializeProcessManager()
     (void) processManager();
 }
 
+QProcessEnvironment QProcessEnvironment::systemEnvironment()
+{
+    return QProcessEnvironment();
+}
+
 QT_END_NAMESPACE
 
 #endif // QT_NO_PROCESS
-- 
cgit v0.12


From 76ac26383922b4c452592a9175e7f3b9b3fd2513 Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Date: Mon, 9 May 2011 17:44:48 +0200
Subject: ifdef out mac/no_coreservices path more cleanly

the symbian path was also dead
---
 src/corelib/io/qprocess_unix.cpp | 5 ++---
 1 file 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;
 }
 
-- 
cgit v0.12