diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-06-30 08:56:25 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-06-30 15:08:36 +0200 |
| commit | 3b93882e2b2397b7e259da30552ff1ee05e0036c (patch) | |
| tree | 4b3e28b5071c610f58d6d3d94a488b26367049a0 /src/core/web_engine_library_info.cpp | |
| parent | 7c966f59a8f8f8a51ffe4325f0809e0d3363a9fc (diff) | |
Replace qgetenv with qEnvironmentVariable
This preserves unicode characters in the environment variable on
Windows.
Fixes: QTBUG-85054
Change-Id: I3352cc3db4ce8d7b9b352c1634e3239954780618
Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io>
Diffstat (limited to 'src/core/web_engine_library_info.cpp')
| -rw-r--r-- | src/core/web_engine_library_info.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/web_engine_library_info.cpp b/src/core/web_engine_library_info.cpp index 1c8316430..9c99e7e22 100644 --- a/src/core/web_engine_library_info.cpp +++ b/src/core/web_engine_library_info.cpp @@ -153,10 +153,10 @@ QString subProcessPath() #endif QStringList candidatePaths; - const QByteArray fromEnv = qgetenv("QTWEBENGINEPROCESS_PATH"); + const QString fromEnv = qEnvironmentVariable("QTWEBENGINEPROCESS_PATH"); if (!fromEnv.isEmpty()) { // Only search in QTWEBENGINEPROCESS_PATH if set - candidatePaths << QString::fromLocal8Bit(fromEnv); + candidatePaths << fromEnv; } else { #if defined(OS_MACOSX) && defined(QT_MAC_FRAMEWORK_BUILD) candidatePaths << getPath(frameworkBundle()) @@ -218,10 +218,10 @@ QString dictionariesPath() if (!initialized) { initialized = true; - const QByteArray fromEnv = qgetenv("QTWEBENGINE_DICTIONARIES_PATH"); + const QString fromEnv = qEnvironmentVariable("QTWEBENGINE_DICTIONARIES_PATH"); if (!fromEnv.isEmpty()) { // Only search in QTWEBENGINE_DICTIONARIES_PATH if set - candidatePaths << QString::fromLocal8Bit(fromEnv); + candidatePaths << fromEnv; } else { // First try to find dictionaries near the application. #ifdef OS_MACOSX |