Changeset 65321 in webkit


Ignore:
Timestamp:
Aug 13, 2010 6:48:38 AM (14 years ago)
Author:
Simon Hausmann
Message:

[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.

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/ChangeLog

    r65319 r65321  
     12010-08-13  Simon Hausmann  <simon.hausmann@nokia.com>
     2
     3        Reviewed by Ariya Hidayat.
     4
     5        [Qt] Clean up mobile feature useage
     6        https://bugs.webkit.org/show_bug.cgi?id=43968
     7
     8        * WebKit.pri: Set feature defaults here for some Nokia specific mobile platforms
     9
    1102010-08-13  Patrick Gansterer  <paroga@paroga.com>
    211
  • trunk/WebCore/ChangeLog

    r65320 r65321  
     12010-08-13  Simon Hausmann  <simon.hausmann@nokia.com>
     2
     3        Reviewed by Ariya Hidayat.
     4
     5        [Qt] Clean up mobile feature useage
     6        https://bugs.webkit.org/show_bug.cgi?id=43968
     7
     8        * WebCore.pro: Replaced use of Nokia specific platform scopes with concrete
     9        feature names.
     10
    1112010-08-13  Pavel Feldman  <pfeldman@chromium.org>
    212
  • trunk/WebCore/WebCore.pro

    r65312 r65321  
    137137    $$PWD/../WebCore/WebCore.qrc
    138138
    139 !symbian:!maemo5 {
    140     RESOURCES += $$PWD/../WebCore/inspector/front-end/WebKit.qrc
    141 }
    142 
    143 maemo5|symbian|embedded {
    144     DEFINES += ENABLE_FAST_MOBILE_SCROLLING=1
    145 }
    146 
    147 maemo5|symbian {
    148     DEFINES += WTF_USE_QT_MOBILE_THEME=1
    149 }
     139include_webinspector: RESOURCES += $$PWD/../WebCore/inspector/front-end/WebKit.qrc
     140
     141enable_fast_mobile_scrolling: DEFINES += ENABLE_FAST_MOBILE_SCROLLING=1
     142
     143use_qt_mobile_theme: DEFINES += WTF_USE_QT_MOBILE_THEME=1
    150144
    151145contains(DEFINES, WTF_USE_QT_MOBILE_THEME=1) {
  • trunk/WebKit.pri

    r64657 r65321  
    8282}
    8383
    84 symbian|maemo5: DEFINES *= QT_NO_UITOOLS
     84##### Defaults for some mobile platforms
     85symbian|maemo5 {
     86    CONFIG += disable_uitools
     87    CONFIG += enable_fast_mobile_scrolling
     88    CONFIG += use_qt_mobile_theme
     89} else {
     90    CONFIG += include_webinspector
     91}
     92
     93embedded: CONFIG += enable_fast_mobile_scrolling
     94
     95####
     96
     97disable_uitools: DEFINES *= QT_NO_UITOOLS
    8598
    8699contains(DEFINES, QT_NO_UITOOLS): CONFIG -= uitools
Note: See TracChangeset for help on using the changeset viewer.