[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 90f1341eee069650541ccddfb2ff9b62325402eb
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 23 19:14:27 2009 +0000

    2009-10-23  Janne Koskinen  <janne.p.koskinen at digia.com>
    
            Reviewed by Tor Arne Vestbø.
    
            [Qt] Correct linking of sqlite3 for Symbian
            https://bugs.webkit.org/show_bug.cgi?id=30569
    
            ".lib" will try to include library as static library
            causing the library to be searched from wrong directory and if found
            will be statically linked instead of the inteded dynamic linking.
    
            * WebCore.pro:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49986 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 996383f..911f725 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2009-10-23  Janne Koskinen  <janne.p.koskinen at digia.com>
+
+        Reviewed by Tor Arne Vestbø.
+
+        [Qt] Correct linking of sqlite3 for Symbian
+        https://bugs.webkit.org/show_bug.cgi?id=30569
+
+        ".lib" will try to include library as static library
+        causing the library to be searched from wrong directory and if found
+        will be statically linked instead of the inteded dynamic linking.
+
+        * WebCore.pro:
+
 2009-10-23  Enrica Casucci  <enrica at apple.com>
 
         Reviewed by Adele Peterson.
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index 00b467d..d9a7056 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -2560,8 +2560,7 @@ contains(DEFINES, ENABLE_SQLITE=1) {
             LIBS *= $$QT_LFLAGS_SQLITE
         } else {
             INCLUDEPATH += $${SQLITE3SRCDIR}
-            symbian: LIBS += -lsqlite3.lib
-            else: LIBS += -lsqlite3
+            LIBS += -lsqlite3
         }
     }
 

-- 
WebKit Debian packaging