diff options
| author | con <qtc-committer@nokia.com> | 2011-03-07 14:24:42 (GMT) |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2011-03-10 11:58:13 (GMT) |
| commit | c84d09e1c5dd8fc3e989a07372abba8ed589ec67 (patch) | |
| tree | 844d98d9b188d67b473f780bb10e4e728ea92924 | |
| parent | bf1eb9a98bedae2c1b261ed4d7d92d4a1dbe28e3 (diff) | |
| download | Qt-c84d09e1c5dd8fc3e989a07372abba8ed589ec67.zip Qt-c84d09e1c5dd8fc3e989a07372abba8ed589ec67.tar.gz Qt-c84d09e1c5dd8fc3e989a07372abba8ed589ec67.tar.bz2 | |
Build QProcess on platforms that don't have _NSGetEnviron
Reviewed-by: Jørgen Lind
| -rw-r--r-- | src/corelib/io/qprocess.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/io/qprocess.cpp b/src/corelib/io/qprocess.cpp index a44c1e1..e11cef9 100644 --- a/src/corelib/io/qprocess.cpp +++ b/src/corelib/io/qprocess.cpp @@ -2232,10 +2232,10 @@ bool QProcess::startDetached(const QString &program) } QT_BEGIN_INCLUDE_NAMESPACE -#ifdef Q_OS_MAC +#if defined(Q_OS_MAC) && !defined(QT_NO_CORESERVICES) # include <crt_externs.h> # define environ (*_NSGetEnviron()) -#elif defined(Q_OS_WINCE) || defined(Q_OS_SYMBIAN) +#elif defined(Q_OS_WINCE) || defined(Q_OS_SYMBIAN) || (defined(Q_OS_MAC) && defined(QT_NO_CORESERVICES)) static char *qt_empty_environ[] = { 0 }; #define environ qt_empty_environ #elif !defined(Q_OS_WIN) |