diff options
| author | Daniel Teske <daniel.teske@digia.com> | 2013-01-11 12:37:38 +0100 |
|---|---|---|
| committer | Daniel Teske <daniel.teske@digia.com> | 2013-01-14 15:03:12 +0100 |
| commit | 0cd5e277c19a115ddede6a01327fdabad176cb89 (patch) | |
| tree | a562db67216da0cf0299c356862523dba182ab44 /src/libs/utils/environment.cpp | |
| parent | 497843c95167cb0d8758c2a7c7225ba575a2da52 (diff) | |
| download | qt-creator-0cd5e277c19a115ddede6a01327fdabad176cb89.tar.gz | |
Utils::Environment: Use systemEnvironment from QProcessEnvironment
The QProcessEnvironment::systemEnvironment() uses the function
GetEnvironmentStringsW(), which allows for retrieving values that can
not be encoded in the current locale.
Also see QTCREATORBUG-8184 for a related bug.
Change-Id: Id7c9b8c881db7ba2efd13f2fb241fbbdb9d2a7eb
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Diffstat (limited to 'src/libs/utils/environment.cpp')
| -rw-r--r-- | src/libs/utils/environment.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libs/utils/environment.cpp b/src/libs/utils/environment.cpp index 8703eb6da5..9d954df4be 100644 --- a/src/libs/utils/environment.cpp +++ b/src/libs/utils/environment.cpp @@ -33,6 +33,7 @@ #include <QDir> #include <QProcess> +#include <QProcessEnvironment> #include <QString> #include <QCoreApplication> @@ -40,7 +41,7 @@ class SystemEnvironment : public Utils::Environment { public: SystemEnvironment() - : Environment(QProcess::systemEnvironment()) + : Environment(QProcessEnvironment::systemEnvironment().toStringList()) { if (Utils::HostOsInfo::isLinuxHost()) { QString ldLibraryPath = value(QLatin1String("LD_LIBRARY_PATH")); |