From 470286ecfe79d59df14944e5b5d34630fc739391 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 22 Nov 2012 09:09:45 +0100 Subject: Imported WebKit commit e89504fa9195b2063b2530961d4b73dd08de3242 (http://svn.webkit.org/repository/webkit/trunk@135485) Change-Id: I03774e5ac79721c13ffa30d152537a74d0b12e66 Reviewed-by: Simon Hausmann --- Source/WebKit2/Shared/qt/ProcessExecutablePathQt.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'Source/WebKit2/Shared/qt/ProcessExecutablePathQt.cpp') diff --git a/Source/WebKit2/Shared/qt/ProcessExecutablePathQt.cpp b/Source/WebKit2/Shared/qt/ProcessExecutablePathQt.cpp index 9cb29b3eb..bba73657f 100644 --- a/Source/WebKit2/Shared/qt/ProcessExecutablePathQt.cpp +++ b/Source/WebKit2/Shared/qt/ProcessExecutablePathQt.cpp @@ -30,6 +30,7 @@ #include #include #include +#include namespace WebKit { @@ -38,6 +39,11 @@ static String executablePath(QString baseName) QString expectedPath = QCoreApplication::applicationDirPath() + QDir::separator() + baseName; if (QFile::exists(expectedPath)) return String(expectedPath); + + expectedPath = QLibraryInfo::location(QLibraryInfo::BinariesPath) + QDir::separator() + baseName; + if (QFile::exists(expectedPath)) + return String(expectedPath); + return String(QString(baseName)); } -- cgit v1.2.1