summaryrefslogtreecommitdiff
path: root/Source/WebKit2/Shared/qt/ProcessExecutablePathQt.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@digia.com>2012-12-10 14:54:01 +0000
committerSimon Hausmann <simon.hausmann@digia.com>2012-12-10 15:58:22 +0100
commit5d22b23b9184f615cc774c0aa7fd27615454f658 (patch)
tree199b25e1335498b400be79bac3a78645ce3c319a /Source/WebKit2/Shared/qt/ProcessExecutablePathQt.cpp
parente4fafc8e2084954c7ca3e2f9749e8c496683c6fd (diff)
downloadqtwebkit-5d22b23b9184f615cc774c0aa7fd27615454f658.tar.gz
Fix QtWebProcess discovery on Windows https://bugs.webkit.org/show_bug.cgi?id=104552
Reviewed by Jocelyn Turcotte. Make sure to look for QtWebProcess.exe on Windows instead of QtWebProcess. * Shared/qt/ProcessExecutablePathQt.cpp: (WebKit::executablePath): Change-Id: I5c4cfdca24fc7b54e36431f72f3b85cdae13c2f4 git-svn-id: http://svn.webkit.org/repository/webkit/trunk@137147 268f45cc-cd09-0410-ab3c-d52691b4dbfc Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'Source/WebKit2/Shared/qt/ProcessExecutablePathQt.cpp')
-rw-r--r--Source/WebKit2/Shared/qt/ProcessExecutablePathQt.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/Source/WebKit2/Shared/qt/ProcessExecutablePathQt.cpp b/Source/WebKit2/Shared/qt/ProcessExecutablePathQt.cpp
index 2a95a843e..827cda6f9 100644
--- a/Source/WebKit2/Shared/qt/ProcessExecutablePathQt.cpp
+++ b/Source/WebKit2/Shared/qt/ProcessExecutablePathQt.cpp
@@ -36,15 +36,18 @@ namespace WebKit {
static String executablePath(QString baseName)
{
+#if OS(WINDOWS)
+ baseName.append(QStringLiteral(".exe"));
+#endif
QString expectedPath = QCoreApplication::applicationDirPath() + QDir::separator() + baseName;
if (QFile::exists(expectedPath))
- return String(expectedPath);
+ return expectedPath;
expectedPath = QLibraryInfo::location(QLibraryInfo::LibraryExecutablesPath) + QDir::separator() + baseName;
if (QFile::exists(expectedPath))
- return String(expectedPath);
+ return expectedPath;
- return String(QString(baseName));
+ return baseName;
}
String executablePathOfWebProcess()