Imported WebKit commit c60cfe0fc09efd257aa0111d7b133b02deb8a63e (http://svn.webkit.org/repository/webkit/trunk@136119)

New snapshot that includes the fix for installing the QtWebProcess into libexec

Change-Id: I01344e079cbdac5678c4cba6ffcc05f4597cf0d7
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

1 files changed, 6 insertions, 1 deletions

diff --git a/Source/WebKit2/Shared/qt/ProcessExecutablePathQt.cpp b/Source/WebKit2/Shared/qt/ProcessExecutablePathQt.cpp
index bba73657f..250b16c80 100644
--- a/Source/WebKit2/Shared/qt/ProcessExecutablePathQt.cpp
+++ b/Source/WebKit2/Shared/qt/ProcessExecutablePathQt.cpp
@@ -40,7 +40,12 @@ static String executablePath(QString baseName)
     if (QFile::exists(expectedPath))
         return String(expectedPath);
 
-    expectedPath = QLibraryInfo::location(QLibraryInfo::BinariesPath) + QDir::separator() + baseName;
+    QLibraryInfo::LibraryLocation location = QLibraryInfo::BinariesPath;
+#if USE(LIBEXECDIR)
+    location = QLibraryInfo::LibraryExecutablesPath;
+#endif
+
+    expectedPath = QLibraryInfo::location(location) + QDir::separator() + baseName;
     if (QFile::exists(expectedPath))
         return String(expectedPath);