diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2011-09-29 12:36:33 (GMT) |
|---|---|---|
| committer | Jan-Arve Saether <jan-arve.saether@nokia.com> | 2011-09-29 12:36:33 (GMT) |
| commit | 7d9ac9659568f77d3acf70f304fa152d3ecadcb1 (patch) | |
| tree | e75d6ec40e07a7f77b5ff1ae4bea0583f0dca51d /src | |
| parent | d63910575949106f84dacf04abaa14fc866aa66b (diff) | |
| download | Qt-7d9ac9659568f77d3acf70f304fa152d3ecadcb1.zip Qt-7d9ac9659568f77d3acf70f304fa152d3ecadcb1.tar.gz Qt-7d9ac9659568f77d3acf70f304fa152d3ecadcb1.tar.bz2 | |
don't assume the PATH envvar is latin1-encoded
use Unicode getenv() version instead
Merge-request: 1344
Reviewed-by: Jan-Arve Saether <jan-arve.saether@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/plugin/qsystemlibrary.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/plugin/qsystemlibrary.cpp b/src/corelib/plugin/qsystemlibrary.cpp index bb9c82a..c983f38 100644 --- a/src/corelib/plugin/qsystemlibrary.cpp +++ b/src/corelib/plugin/qsystemlibrary.cpp @@ -115,7 +115,7 @@ HINSTANCE QSystemLibrary::load(const wchar_t *libraryName, bool onlySystemDirect searchOrder << qSystemDirectory(); if (!onlySystemDirectory) { - const QString PATH(QLatin1String(qgetenv("PATH").constData())); + const QString PATH = QString::fromWCharArray((const wchar_t *)_wgetenv(L"PATH")); searchOrder << PATH.split(QLatin1Char(';'), QString::SkipEmptyParts); } QString fileName = QString::fromWCharArray(libraryName); |