summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2011-05-02 14:20:15 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2011-05-02 14:20:15 (GMT)
commit62e73a463cb7035192acdce6538c5b0248e643d4 (patch)
tree743f02099c78d082eac1ea893613f388b91fb240
parent4dcb4a41022085aa82f25f7e0a2ce9e92510f4ae (diff)
downloadQt-62e73a463cb7035192acdce6538c5b0248e643d4.zip
Qt-62e73a463cb7035192acdce6538c5b0248e643d4.tar.gz
Qt-62e73a463cb7035192acdce6538c5b0248e643d4.tar.bz2
no environment on WinCE
-rw-r--r--src/corelib/io/qprocess_win.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/corelib/io/qprocess_win.cpp b/src/corelib/io/qprocess_win.cpp
index c9b1ba4..bb23954 100644
--- a/src/corelib/io/qprocess_win.cpp
+++ b/src/corelib/io/qprocess_win.cpp
@@ -281,6 +281,7 @@ static QString qt_create_commandline(const QString &program, const QStringList &
QProcessEnvironment QProcessEnvironment::systemEnvironment()
{
QProcessEnvironment env;
+#if !defined(Q_OS_WINCE)
// Calls to setenv() affect the low-level environment as well.
// This is not the case the other way round.
if (wchar_t *envStrings = GetEnvironmentStringsW()) {
@@ -296,9 +297,11 @@ QProcessEnvironment QProcessEnvironment::systemEnvironment()
}
FreeEnvironmentStringsW(envStrings);
}
+#endif
return env;
}
+#if !defined(Q_OS_WINCE)
static QByteArray qt_create_environment(const QProcessEnvironmentPrivate::Hash &environment)
{
QByteArray envlist;
@@ -358,6 +361,7 @@ static QByteArray qt_create_environment(const QProcessEnvironmentPrivate::Hash &
}
return envlist;
}
+#endif
void QProcessPrivate::startProcess()
{