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

[hausmann at webkit.org]

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

    [Qt] Clean up mobile feature useage
    https://bugs.webkit.org/show_bug.cgi?id=43968
    
    Reviewed by Ariya Hidayat.
    
    .:
    
    * WebKit.pri: Set feature defaults here for some Nokia specific mobile platforms
    
    WebCore:
    
    * WebCore.pro: Replaced use of Nokia specific platform scopes with concrete
    feature names.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65321 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index fe7eb11..35b8759 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+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
+
+        * WebKit.pri: Set feature defaults here for some Nokia specific mobile platforms
+
 2010-08-13  Patrick Gansterer  <paroga at paroga.com>
 
         Reviewed by Nikolas Zimmermann.
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 398d316..84fd23d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+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
+
+        * WebCore.pro: Replaced use of Nokia specific platform scopes with concrete
+        feature names.
+
 2010-08-13  Pavel Feldman  <pfeldman at chromium.org>
 
         Reviewed by Yury Semikhatsky.
diff --git a/WebCore/WebCore.pro b/WebCore/WebCore.pro
index f82f8f6..1ff749d 100644
--- a/WebCore/WebCore.pro
+++ b/WebCore/WebCore.pro
@@ -136,17 +136,11 @@ symbian {
 RESOURCES += \
     $$PWD/../WebCore/WebCore.qrc
 
-!symbian:!maemo5 {
-    RESOURCES += $$PWD/../WebCore/inspector/front-end/WebKit.qrc
-}
+include_webinspector: RESOURCES += $$PWD/../WebCore/inspector/front-end/WebKit.qrc
 
-maemo5|symbian|embedded {
-    DEFINES += ENABLE_FAST_MOBILE_SCROLLING=1
-}
+enable_fast_mobile_scrolling: DEFINES += ENABLE_FAST_MOBILE_SCROLLING=1
 
-maemo5|symbian {
-    DEFINES += WTF_USE_QT_MOBILE_THEME=1
-}
+use_qt_mobile_theme: DEFINES += WTF_USE_QT_MOBILE_THEME=1
 
 contains(DEFINES, WTF_USE_QT_MOBILE_THEME=1) {
     DEFINES += ENABLE_NO_LISTBOX_RENDERING=1
diff --git a/WebKit.pri b/WebKit.pri
index 21404dd..024092a 100644
--- a/WebKit.pri
+++ b/WebKit.pri
@@ -81,7 +81,20 @@ symbian {
     QMAKE_CXXFLAGS.ARMCC += $$RVCT_COMMON_CXXFLAGS
 }
 
-symbian|maemo5: DEFINES *= QT_NO_UITOOLS
+##### Defaults for some mobile platforms
+symbian|maemo5 {
+    CONFIG += disable_uitools
+    CONFIG += enable_fast_mobile_scrolling
+    CONFIG += use_qt_mobile_theme
+} else {
+    CONFIG += include_webinspector
+}
+
+embedded: CONFIG += enable_fast_mobile_scrolling
+
+####
+
+disable_uitools: DEFINES *= QT_NO_UITOOLS
 
 contains(DEFINES, QT_NO_UITOOLS): CONFIG -= uitools
 

-- 
WebKit Debian packaging