[Qt] Clean up mobile feature useage
authorhausmann@webkit.org <hausmann@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 13 Aug 2010 13:48:38 +0000 (13:48 +0000)
committerhausmann@webkit.org <hausmann@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 13 Aug 2010 13:48:38 +0000 (13:48 +0000)
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: https://svn.webkit.org/repository/webkit/trunk@65321 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
WebCore/ChangeLog
WebCore/WebCore.pro
WebKit.pri

index fe7eb11..35b8759 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2010-08-13  Simon Hausmann  <simon.hausmann@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@paroga.com>
 
         Reviewed by Nikolas Zimmermann.
index 398d316..84fd23d 100644 (file)
@@ -1,3 +1,13 @@
+2010-08-13  Simon Hausmann  <simon.hausmann@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@chromium.org>
 
         Reviewed by Yury Semikhatsky.
index f82f8f6..1ff749d 100644 (file)
@@ -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
index 21404dd..024092a 100644 (file)
@@ -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