Title: [137147] trunk/Source/WebKit2
- Revision
- 137147
- Author
- hausm...@webkit.org
- Date
- 2012-12-10 06:54:01 -0800 (Mon, 10 Dec 2012)
Log Message
[Qt] 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):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (137146 => 137147)
--- trunk/Source/WebKit2/ChangeLog 2012-12-10 14:50:44 UTC (rev 137146)
+++ trunk/Source/WebKit2/ChangeLog 2012-12-10 14:54:01 UTC (rev 137147)
@@ -1,3 +1,15 @@
+2012-12-10 Simon Hausmann <simon.hausm...@digia.com>
+
+ [Qt] 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):
+
2012-12-10 Martin Robinson <mrobin...@igalia.com>
[GTK] Bring Harfbuzz-ng support to Gtk
Modified: trunk/Source/WebKit2/Shared/qt/ProcessExecutablePathQt.cpp (137146 => 137147)
--- trunk/Source/WebKit2/Shared/qt/ProcessExecutablePathQt.cpp 2012-12-10 14:50:44 UTC (rev 137146)
+++ trunk/Source/WebKit2/Shared/qt/ProcessExecutablePathQt.cpp 2012-12-10 14:54:01 UTC (rev 137147)
@@ -36,15 +36,18 @@
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()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
