[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[vestbo at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 3d6eef09287e9fa23df8041422430100e528dfb7
Author: vestbo at webkit.org <vestbo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Nov 3 15:58:58 2010 +0000

    [Qt] Add the webkit2 library to LIBS instead of QMAKE_LFLAGS
    
    Reviewed by Kenneth Rohde Christiansen.
    
    Otherwise the library order will get messed up and cause
    missing symbols on Mac OS X.
    
    * WebKit2.pri:
    * WebKit2.pro:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71243 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 6229a4a..8045732 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,15 @@
+2010-11-03  Tor Arne Vestbø  <tor.arne.vestbo at nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] Add the webkit2 library to LIBS instead of QMAKE_LFLAGS
+
+        Otherwise the library order will get messed up and cause
+        missing symbols on Mac OS X.
+
+        * WebKit2.pri:
+        * WebKit2.pro:
+
 2010-11-02  Daniel Bates  <dbates at rim.com>
 
         Reviewed by Adam Barth.
diff --git a/WebKit2/WebKit2.pri b/WebKit2/WebKit2.pri
index 3e81581..da08ea8 100644
--- a/WebKit2/WebKit2.pri
+++ b/WebKit2/WebKit2.pri
@@ -30,8 +30,8 @@ defineTest(_addWebKit2Lib_common) {
 defineTest(addWebKit2Lib) {
     _addWebKit2Lib_common($$ARGS)
 
-    QMAKE_LFLAGS += -l$$WEBKIT2_TARGET
-    export(QMAKE_LFLAGS)
+    LIBS += -l$$WEBKIT2_TARGET
+    export(LIBS)
 
     return(true)
 }
@@ -40,9 +40,9 @@ defineTest(addWebKit2LibWholeArchive) {
     _addWebKit2Lib_common($$ARGS)
 
     # -whole-archive makes all objects, even if unreferenced, included in the linked target.
-    mac:QMAKE_LFLAGS += -Wl,-all_load -l$$WEBKIT2_TARGET
-    else:QMAKE_LFLAGS += -Wl,-whole-archive -l$$WEBKIT2_TARGET -Wl,-no-whole-archive
-    export(QMAKE_LFLAGS)
+    mac: LIBS += -Wl,-all_load -l$$WEBKIT2_TARGET
+    else: LIBS += -Wl,-whole-archive -l$$WEBKIT2_TARGET -Wl,-no-whole-archive
+    export(LIBS)
 
     return(true)
 }

-- 
WebKit Debian packaging