[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[vestbo at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 0c91b71671dd7cd369d251de30392270d05a7e67
Author: vestbo at webkit.org <vestbo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 11 13:31:48 2009 +0000

    Compute correct library paths for Qt
    
    Reviewed by Simon Hausmann.
    
    * Scripts/webkitdirs.pm:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50802 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 9578bdc..f018a33 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,11 @@
+2009-11-11  Tor Arne Vestbø  <tor.arne.vestbo at nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        Compute correct library paths for Qt
+
+        * Scripts/webkitdirs.pm:
+
 2009-11-10  Mark Rowe  <mrowe at apple.com>
 
         Reviewed by Sam Weinig.
diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm
index 06e962f..247dbcd 100644
--- a/WebKitTools/Scripts/webkitdirs.pm
+++ b/WebKitTools/Scripts/webkitdirs.pm
@@ -521,9 +521,19 @@ sub builtDylibPathForName
 {
     my $libraryName = shift;
     determineConfigurationProductDir();
-    if (isQt() or isChromium()) {
+    if (isChromium()) {
         return "$configurationProductDir/$libraryName";
     }
+    if (isQt()) {
+        $libraryName = "QtWebKit";
+        if (isDarwin() and -d "$configurationProductDir/lib/$libraryName.framework") {
+            return "$configurationProductDir/lib/$libraryName.framework/$libraryName";
+        } elsif (isWindows() or isCygwin()) {
+            return "$configurationProductDir/lib/$libraryName.dll";
+        } else {
+            return "$configurationProductDir/lib/lib$libraryName.so";
+        }
+    }
     if (isWx()) {
         return "$configurationProductDir/libwxwebkit.dylib";
     }
@@ -561,7 +571,7 @@ sub libraryContainsSymbol
     my $path = shift;
     my $symbol = shift;
 
-    if (isCygwin()) {
+    if (isCygwin() or isWindows()) {
         # FIXME: Implement this for Windows.
         return 0;
     }

-- 
WebKit Debian packaging