summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorZoltan Arvai <zarvai@inf.u-szeged.hu>2014-03-24 13:56:18 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-03-31 14:49:03 +0200
commitbbced0d3fde11034f8c3a9334abccc571ab52dd0 (patch)
tree2d64b821ebb0877e838c35b2a9c3cc1d24de39c7 /src
parent673941bfa7887faabc18b19aab64d8251c5ae24c (diff)
Fix QtWebEngineProcess name on Windows
QtWebEngineProcess has an exe extension that need to be added to processPath. Change-Id: I2ab1691f7af35c76bf693046396b5464e0f2dde2 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/core/web_engine_library_info.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/core/web_engine_library_info.cpp b/src/core/web_engine_library_info.cpp
index 67a466c90..4e7d20cc7 100644
--- a/src/core/web_engine_library_info.cpp
+++ b/src/core/web_engine_library_info.cpp
@@ -99,8 +99,13 @@ QString location(QLibraryInfo::LibraryLocation path)
QString subProcessPath()
{
static bool initialized = false;
+#if defined(OS_WIN)
+ static QString processPath (location(QLibraryInfo::LibraryExecutablesPath)
+ % QDir::separator() % QStringLiteral(QTWEBENGINEPROCESS_NAME) % QStringLiteral(".exe"));
+#else
static QString processPath (location(QLibraryInfo::LibraryExecutablesPath)
% QDir::separator() % QStringLiteral(QTWEBENGINEPROCESS_NAME));
+#endif
if (!initialized) {
// Allow overriding at runtime for the time being.
const QByteArray fromEnv = qgetenv("QTWEBENGINEPROCESS_PATH");