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

vestbo at webkit.org vestbo at webkit.org
Wed Dec 22 15:28:38 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit ddd77a94e8b4d7ddab44e378954b7832ed31d6c1
Author: vestbo at webkit.org <vestbo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 4 13:24:16 2010 +0000

    [Qt] Build Webkit2 both in debug and release on Mac
    
    Reviewed by Andreas Kling..
    
    On Mac OS X we build QtWebKit in both debug and release, so
    we need to also build the webkit2 library in both configs.
    
    * WebKit2.pro:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71330 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index b95676d..359ca50 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,14 @@
+2010-11-04  Tor Arne Vestbø  <tor.arne.vestbo at nokia.com>
+
+        Reviewed by Andreas Kling..
+
+        [Qt] Build Webkit2 both in debug and release on Mac
+
+        On Mac OS X we build QtWebKit in both debug and release, so
+        we need to also build the webkit2 library in both configs.
+
+        * WebKit2.pro:
+
 2010-11-04  Adam Roben  <aroben at apple.com>
 
         Remove lame puts()s from WebPageProxy
diff --git a/WebKit2/WebKit2.pro b/WebKit2/WebKit2.pro
index 0f11c57..5799cd7 100644
--- a/WebKit2/WebKit2.pro
+++ b/WebKit2/WebKit2.pro
@@ -20,6 +20,9 @@ DESTDIR = $$WEBKIT2_DESTDIR
     DEFINES += NDEBUG
 }
 
+# Build both debug and release configurations
+mac: CONFIG += build_all
+
 INCLUDEPATH = \
     $$PWD/.. \
     $$PWD/../JavaScriptCore \

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list