diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/content_client_qt.cpp | 2 | ||||
| -rw-r--r-- | src/core/devtools_manager_delegate_qt.cpp | 2 | ||||
| -rw-r--r-- | src/core/web_engine_context.cpp | 6 | ||||
| -rw-r--r-- | src/core/web_engine_library_info.cpp | 8 | ||||
| -rw-r--r-- | src/tools/qwebengine_convert_dict/main.cpp | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/src/core/content_client_qt.cpp b/src/core/content_client_qt.cpp index 083e10f2a..647d45819 100644 --- a/src/core/content_client_qt.cpp +++ b/src/core/content_client_qt.cpp @@ -199,7 +199,7 @@ void AddPepperFlashFromSystem(std::vector<content::PepperPluginInfo>* plugins) { QStringList pluginPaths; #if defined(Q_OS_WIN) - QString winDir = QDir::fromNativeSeparators(qgetenv("WINDIR")); + QString winDir = QDir::fromNativeSeparators(qEnvironmentVariable("WINDIR")); if (winDir.isEmpty()) winDir = QString::fromLatin1("C:/Windows"); QDir pluginDir(winDir + "/System32/Macromed/Flash"); diff --git a/src/core/devtools_manager_delegate_qt.cpp b/src/core/devtools_manager_delegate_qt.cpp index ecd2a7d40..8c4037879 100644 --- a/src/core/devtools_manager_delegate_qt.cpp +++ b/src/core/devtools_manager_delegate_qt.cpp @@ -114,7 +114,7 @@ DevToolsServerQt::~DevToolsServerQt() void DevToolsServerQt::parseAddressAndPort() { - const QString inspectorEnv = QString::fromUtf8(qgetenv("QTWEBENGINE_REMOTE_DEBUGGING")); + const QString inspectorEnv = qEnvironmentVariable("QTWEBENGINE_REMOTE_DEBUGGING"); const base::CommandLine &commandLine = *base::CommandLine::ForCurrentProcess(); QString portStr; diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp index b36e76417..1399c0fdc 100644 --- a/src/core/web_engine_context.cpp +++ b/src/core/web_engine_context.cpp @@ -173,9 +173,9 @@ bool usingDefaultSGBackend() } if (device.isEmpty()) - device = QString::fromLocal8Bit(qgetenv("QT_QUICK_BACKEND")); + device = qEnvironmentVariable("QT_QUICK_BACKEND"); if (device.isEmpty()) - device = QString::fromLocal8Bit(qgetenv("QMLSCENE_DEVICE")); + device = qEnvironmentVariable("QMLSCENE_DEVICE"); return device.isEmpty(); } @@ -878,7 +878,7 @@ base::CommandLine* WebEngineContext::commandLine() { QStringList appArgs = QCoreApplication::arguments(); if (qEnvironmentVariableIsSet(kChromiumFlagsEnv)) { appArgs = appArgs.mid(0, 1); // Take application name and drop the rest - appArgs.append(parseEnvCommandLine(QString::fromLocal8Bit(qgetenv(kChromiumFlagsEnv)))); + appArgs.append(parseEnvCommandLine(qEnvironmentVariable(kChromiumFlagsEnv))); } #ifdef Q_OS_WIN appArgs.removeAll(QStringLiteral("--enable-webgl-software-rendering")); 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 diff --git a/src/tools/qwebengine_convert_dict/main.cpp b/src/tools/qwebengine_convert_dict/main.cpp index 5c95f6d69..37b6e0171 100644 --- a/src/tools/qwebengine_convert_dict/main.cpp +++ b/src/tools/qwebengine_convert_dict/main.cpp @@ -159,7 +159,7 @@ int main(int argc, char *argv[]) // Try to look up the path to the ICU data directory via an environment variable // (e.g. for the case when the tool is ran during build phase, and regular installed // ICU data file is not available). - QString icuPossibleEnvDataDir = QString::fromLatin1(qgetenv("QT_WEBENGINE_ICU_DATA_DIR")); + const QString icuPossibleEnvDataDir = qEnvironmentVariable("QT_WEBENGINE_ICU_DATA_DIR"); if (!icuPossibleEnvDataDir.isEmpty() && QFileInfo::exists(icuPossibleEnvDataDir)) { icuDataDir = icuPossibleEnvDataDir; icuDataDirFound = true; |