From 4c01d0526ba4dd8cff0c0ff22a6f0ab5eb973064 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 29 Nov 2012 12:18:48 +0100 Subject: 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 --- Source/WebKit2/Shared/qt/ProcessExecutablePathQt.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (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 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); -- cgit v1.2.1