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

hausmann at webkit.org hausmann at webkit.org
Wed Dec 22 12:04:20 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 202ce576986a82e7b3391778a858d53d5e636d22
Author: hausmann at webkit.org <hausmann at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Aug 13 13:48:48 2010 +0000

    [Qt] Introduce Maemo6 for mobile features
    https://bugs.webkit.org/show_bug.cgi?id=43969
    
    Reviewed by Ariya Hidayat.
    
    * WebKit.pri: Use maemo6 where we also use maemo5.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65322 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 35b8759..086a085 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,15 @@
 
         Reviewed by Ariya Hidayat.
 
+        [Qt] Introduce Maemo6 for mobile features
+        https://bugs.webkit.org/show_bug.cgi?id=43969
+
+        * WebKit.pri: Use maemo6 where we also use maemo5.
+
+2010-08-13  Simon Hausmann  <simon.hausmann at nokia.com>
+
+        Reviewed by Ariya Hidayat.
+
         [Qt] Clean up mobile feature useage
         https://bugs.webkit.org/show_bug.cgi?id=43968
 
diff --git a/WebKit.pri b/WebKit.pri
index 024092a..d611fb5 100644
--- a/WebKit.pri
+++ b/WebKit.pri
@@ -82,7 +82,7 @@ symbian {
 }
 
 ##### Defaults for some mobile platforms
-symbian|maemo5 {
+symbian|maemo5|maemo6 {
     CONFIG += disable_uitools
     CONFIG += enable_fast_mobile_scrolling
     CONFIG += use_qt_mobile_theme

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list