[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[jocelyn.turcotte at nokia.com]

The following commit has been merged in the webkit-1.1 branch:
commit b6e2f5b89a18da08ee447f5096fbcc421ee21e5d
Author: jocelyn.turcotte at nokia.com <jocelyn.turcotte at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 27 12:43:06 2010 +0000

    [Qt] Add the "d" suffix to QtWebKit's dll on Windows.
    
    Reviewed by Tor Arne Vestbø.
    
    * WebKit.pri:
    
    WebCore:
    
    * WebCore.pro:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53924 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index f469d47..646808c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2010-01-27  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
 
+        Reviewed by Tor Arne Vestbø.
+
+        [Qt] Add the "d" suffix to QtWebKit's dll on Windows.
+
+        * WebKit.pri:
+
+2010-01-27  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
+
         Unreviewed build fix
 
         [Qt] Build fix for windows when QTDIR contains release libraries.
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 86680df..78e9c06 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,11 @@
+2010-01-27  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
+
+        Reviewed by Tor Arne Vestbø.
+
+        [Qt] Add the "d" suffix to QtWebKit's dll on Windows.
+
+        * WebCore.pro:
+
 2010-01-27  Matt Perry  <mpcomplete at chromium.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index 97b108c..4e12f33 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -2659,6 +2659,7 @@ HEADERS += $$WEBKIT_API_HEADERS
 
     win32-*|wince* {
         DLLDESTDIR = $$OUTPUT_DIR/bin
+        TARGET = $$qtLibraryTarget($$TARGET)
 
         dlltarget.commands = $(COPY_FILE) $(DESTDIR)$(TARGET) $$[QT_INSTALL_BINS]
         dlltarget.CONFIG = no_path
diff --git a/WebKit.pri b/WebKit.pri
index 95f140c..0dd0799 100644
--- a/WebKit.pri
+++ b/WebKit.pri
@@ -28,12 +28,14 @@ building-libs {
         QT += webkit
     } else {
         QMAKE_LIBDIR = $$OUTPUT_DIR/lib $$QMAKE_LIBDIR
+        QTWEBKITLIBNAME = QtWebKit
         mac:!static:contains(QT_CONFIG, qt_framework):!CONFIG(webkit_no_framework) {
-            LIBS += -framework QtWebKit
+            LIBS += -framework $$QTWEBKITLIBNAME
             QMAKE_FRAMEWORKPATH = $$OUTPUT_DIR/lib $$QMAKE_FRAMEWORKPATH
         } else {
             win32-*|wince* {
-                QTWEBKITLIBNAME = QtWebKit$${QT_MAJOR_VERSION}
+                CONFIG(debug, debug|release):build_pass: QTWEBKITLIBNAME = $${QTWEBKITLIBNAME}d
+                QTWEBKITLIBNAME = $${QTWEBKITLIBNAME}$${QT_MAJOR_VERSION}
                 win32-g++: LIBS += -l$$QTWEBKITLIBNAME
                 else: LIBS += $${QTWEBKITLIBNAME}.lib
             } else {

-- 
WebKit Debian packaging