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

[jocelyn.turcotte at nokia.com]

The following commit has been merged in the webkit-1.2 branch:
commit ebb1aca8467062ca19952c97b40811e157e179b2
Author: jocelyn.turcotte at nokia.com <jocelyn.turcotte at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 27 11:51:37 2010 +0000

    [Qt] Build fix for windows when QTDIR contains release libraries.
    
    Unreviewed build fix
    
    * WebKit.pri: Use the <name>.lib syntax for linking instead of qmake's -l<name> emulation
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53918 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index d67af57..f469d47 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-01-27  Jocelyn Turcotte  <jocelyn.turcotte at nokia.com>
+
+        Unreviewed build fix
+
+        [Qt] Build fix for windows when QTDIR contains release libraries.
+
+        * WebKit.pri: Use the <name>.lib syntax for linking instead of qmake's -l<name> emulation
+
 2010-01-26  Jedrzej Nowacki  <jedrzej.nowacki at nokia.com>
 
         Reviewed by Simon Hausmann.
diff --git a/WebKit.pri b/WebKit.pri
index fc3a951..95f140c 100644
--- a/WebKit.pri
+++ b/WebKit.pri
@@ -33,7 +33,9 @@ building-libs {
             QMAKE_FRAMEWORKPATH = $$OUTPUT_DIR/lib $$QMAKE_FRAMEWORKPATH
         } else {
             win32-*|wince* {
-                LIBS += -lQtWebKit$${QT_MAJOR_VERSION}
+                QTWEBKITLIBNAME = QtWebKit$${QT_MAJOR_VERSION}
+                win32-g++: LIBS += -l$$QTWEBKITLIBNAME
+                else: LIBS += $${QTWEBKITLIBNAME}.lib
             } else {
                 LIBS += -lQtWebKit
                 symbian {

-- 
WebKit Debian packaging