Title: [134161] trunk/Source/WebKit2
- Revision
- 134161
- Author
- [email protected]
- Date
- 2012-11-10 13:19:43 -0800 (Sat, 10 Nov 2012)
Log Message
[Qt][WK2] Use QLibraryInfo to search for executables.
https://bugs.webkit.org/show_bug.cgi?id=101774
Reviewed by Simon Hausmann.
This allows finding the WebProcess or the PluginProcess
in it's installed location. This is necessary when
deploying QtWebKit with an installer.
* Shared/qt/ProcessExecutablePathQt.cpp:
(WebKit::executablePath):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (134160 => 134161)
--- trunk/Source/WebKit2/ChangeLog 2012-11-10 19:48:24 UTC (rev 134160)
+++ trunk/Source/WebKit2/ChangeLog 2012-11-10 21:19:43 UTC (rev 134161)
@@ -1,3 +1,17 @@
+2012-11-10 Zeno Albisser <[email protected]>
+
+ [Qt][WK2] Use QLibraryInfo to search for executables.
+ https://bugs.webkit.org/show_bug.cgi?id=101774
+
+ Reviewed by Simon Hausmann.
+
+ This allows finding the WebProcess or the PluginProcess
+ in it's installed location. This is necessary when
+ deploying QtWebKit with an installer.
+
+ * Shared/qt/ProcessExecutablePathQt.cpp:
+ (WebKit::executablePath):
+
2012-11-09 Huang Dongsung <[email protected]>
Coordinated Graphics: Rename tileRect from targetRect.
Modified: trunk/Source/WebKit2/Shared/qt/ProcessExecutablePathQt.cpp (134160 => 134161)
--- trunk/Source/WebKit2/Shared/qt/ProcessExecutablePathQt.cpp 2012-11-10 19:48:24 UTC (rev 134160)
+++ trunk/Source/WebKit2/Shared/qt/ProcessExecutablePathQt.cpp 2012-11-10 21:19:43 UTC (rev 134161)
@@ -30,6 +30,7 @@
#include <QCoreApplication>
#include <QDir>
#include <QFile>
+#include <QLibraryInfo>
namespace WebKit {
@@ -38,6 +39,11 @@
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));
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
