Title: [138136] trunk/Tools
- Revision
- 138136
- Author
- zeno.albis...@digia.com
- Date
- 2012-12-19 02:46:03 -0800 (Wed, 19 Dec 2012)
Log Message
[Qt][Mac] run-launcher cannot find Qt5WebKitWidgets.
https://bugs.webkit.org/show_bug.cgi?id=105309
The version number is only used as a part
of the library name on Linux.
Reviewed by Kenneth Rohde Christiansen.
* Scripts/webkitdirs.pm:
(builtDylibPathForName):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (138135 => 138136)
--- trunk/Tools/ChangeLog 2012-12-19 10:39:17 UTC (rev 138135)
+++ trunk/Tools/ChangeLog 2012-12-19 10:46:03 UTC (rev 138136)
@@ -1,3 +1,16 @@
+2012-12-19 Zeno Albisser <z...@webkit.org>
+
+ [Qt][Mac] run-launcher cannot find Qt5WebKitWidgets.
+ https://bugs.webkit.org/show_bug.cgi?id=105309
+
+ The version number is only used as a part
+ of the library name on Linux.
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ * Scripts/webkitdirs.pm:
+ (builtDylibPathForName):
+
2012-12-19 Alberto Garcia <agar...@igalia.com>
[GTK] Tests that time out are not considered as failures.
Modified: trunk/Tools/Scripts/webkitdirs.pm (138135 => 138136)
--- trunk/Tools/Scripts/webkitdirs.pm 2012-12-19 10:39:17 UTC (rev 138135)
+++ trunk/Tools/Scripts/webkitdirs.pm 2012-12-19 10:46:03 UTC (rev 138136)
@@ -723,7 +723,11 @@
}
if (isQt()) {
my $isSearchingForWebCore = $libraryName =~ "WebCore";
- $libraryName = "Qt5WebKitWidgets";
+ if (isDarwin() || isWindows()) {
+ $libraryName = "QtWebKitWidgets";
+ } else {
+ $libraryName = "Qt5WebKitWidgets";
+ }
my $result;
if (isDarwin() and -d "$configurationProductDir/lib/$libraryName.framework") {
$result = "$configurationProductDir/lib/$libraryName.framework/$libraryName";
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
