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

[dbates at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit df1fa59b40f364db1d795bd17855f7de322610b2
Author: dbates at webkit.org <dbates at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 23 07:54:31 2009 +0000

    2009-12-22  Daniel Bates  <dbates at rim.com>
    
            Reviewed by Eric Seidel.
    
            https://bugs.webkit.org/show_bug.cgi?id=32680
    
            Fixes an issue in builtDylibPathForName so that it returns the correct
            path to the built QtWebKit library on the Qt Windows port. Currently,
            it returns the path to the file named QtWebKit.dll but this file does
            not exist on the Qt Windows build. Instead, the file is named
            QtWebKit4.dll.
    
            * Scripts/webkitdirs.pm:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52522 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index f096d27..c24596a 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,17 @@
+2009-12-22  Daniel Bates  <dbates at rim.com>
+
+        Reviewed by Eric Seidel.
+
+        https://bugs.webkit.org/show_bug.cgi?id=32680
+
+        Fixes an issue in builtDylibPathForName so that it returns the correct
+        path to the built QtWebKit library on the Qt Windows port. Currently,
+        it returns the path to the file named QtWebKit.dll but this file does
+        not exist on the Qt Windows build. Instead, the file is named
+        QtWebKit4.dll.
+
+        * Scripts/webkitdirs.pm:
+
 2009-12-22  Marc-Antoine Ruel  <maruel at chromium.org>
 
         Reviewed by Adam Roben.
diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm
index 9cad88e..a818eda 100644
--- a/WebKitTools/Scripts/webkitdirs.pm
+++ b/WebKitTools/Scripts/webkitdirs.pm
@@ -531,8 +531,13 @@ sub builtDylibPathForName
         $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";
+        } elsif (isWindows()) {
+            chomp(my $mkspec = `qmake -query QMAKE_MKSPECS`);
+            my $qtMajorVersion = retrieveQMakespecVar("$mkspec/qconfig.pri", "QT_MAJOR_VERSION");
+            if ($qtMajorVersion eq "unknown") {
+                $qtMajorVersion = "";
+            }
+            return "$configurationProductDir/lib/$libraryName$qtMajorVersion.dll";
         } else {
             return "$configurationProductDir/lib/lib$libraryName.so";
         }

-- 
WebKit Debian packaging