From bbced0d3fde11034f8c3a9334abccc571ab52dd0 Mon Sep 17 00:00:00 2001
From: Zoltan Arvai <zarvai@inf.u-szeged.hu>
Date: Mon, 24 Mar 2014 13:56:18 +0100
Subject: [PATCH] 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>
---
src/core/web_engine_library_info.cpp | 5 +++++
1 file changed, 5 insertions(+)
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");
--
GitLab