Changeset 105997 in webkit


Ignore:
Timestamp:
Jan 26, 2012 6:07:36 AM (12 years ago)
Author:
commit-queue@webkit.org
Message:

[Qt] Use ICU if available
https://bugs.webkit.org/show_bug.cgi?id=76821

Patch by Jesus Sanchez-Palencia <jesus.palencia@openbossa.org> on 2012-01-26
Reviewed by Simon Hausmann.

Source/WebCore:

Adding correct sources to a Qt 5 based build.

No new tests, it's just a build dependency change.

  • Target.pri:

Source/WTF:

Adding libicu dependencies for a Qt5 based build.

  • WTF.pri:

Tools:

Adding unicode defines for a Qt 5 based build.

  • qmake/mkspecs/features/features.prf:

LayoutTests:

Unskipping ICU related tests for Qt 5 and skipping for
Qt 4.

  • platform/qt-4.8/Skipped:
  • platform/qt-arm/Skipped:
  • platform/qt-wk2/Skipped:
  • platform/qt/Skipped:
Location:
trunk
Files:
11 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r105992 r105997  
     12012-01-26  Jesus Sanchez-Palencia  <jesus.palencia@openbossa.org>
     2
     3        [Qt] Use ICU if available
     4        https://bugs.webkit.org/show_bug.cgi?id=76821
     5
     6        Reviewed by Simon Hausmann.
     7
     8        Unskipping ICU related tests for Qt 5 and skipping for
     9        Qt 4.
     10
     11        * platform/qt-4.8/Skipped:
     12        * platform/qt-arm/Skipped:
     13        * platform/qt-wk2/Skipped:
     14        * platform/qt/Skipped:
     15
    1162012-01-26  Nikolas Zimmermann  <nzimmermann@rim.com>
    217
  • trunk/LayoutTests/platform/qt-4.8/Skipped

    r103504 r105997  
    55# https://bugs.webkit.org/show_bug.cgi?id=55767
    66http/tests/appcache/auth.html
     7
     8#################################################
     9# Moved from qt/Skipped after:
     10# [Qt] Use ICU if available
     11# https://bugs.webkit.org/show_bug.cgi?id=76821
     12fast/encoding/GBK/EUC-CN.html
     13fast/encoding/GBK/chinese.html
     14fast/encoding/GBK/cn-gb.html
     15fast/encoding/GBK/csgb2312.html
     16fast/encoding/GBK/csgb231280.html
     17fast/encoding/GBK/gb2312.html
     18fast/encoding/GBK/gb_2312-80.html
     19fast/encoding/GBK/gbk.html
     20fast/encoding/GBK/iso-ir-58.html
     21fast/encoding/GBK/x-euc-cn.html
     22fast/encoding/GBK/x-gbk.html
     23fast/encoding/char-decoding-mac.html
     24fast/encoding/char-decoding.html
     25fast/encoding/char-encoding-mac.html
     26fast/encoding/char-encoding.html
     27fast/encoding/hebrew/8859-8-e.html
     28fast/encoding/hebrew/8859-8-i.html
     29fast/encoding/hebrew/csISO88598I.html
     30fast/encoding/hebrew/logical.html
     31sputnik/Unicode/Unicode_500/S7.6_A3.1.html
     32sputnik/Unicode/Unicode_500/S7.6_A3.2.html
     33sputnik/Unicode/Unicode_500/S7.6_A5.3_T1.html
     34sputnik/Unicode/Unicode_500/S7.6_A5.3_T2.html
     35sputnik/Unicode/Unicode_510/S15.5.4.16_A1.html
     36sputnik/Unicode/Unicode_510/S15.5.4.18_A1.html
     37sputnik/Unicode/Unicode_510/S7.6_A1.1_T1.html
     38sputnik/Unicode/Unicode_510/S7.6_A1.1_T2.html
     39sputnik/Unicode/Unicode_510/S7.6_A1.1_T4.html
     40sputnik/Unicode/Unicode_510/S7.6_A2.2_T1.html
     41sputnik/Unicode/Unicode_510/S7.6_A2.2_T2.html
     42sputnik/Unicode/Unicode_510/S7.6_A2.3.html
     43sputnik/Unicode/Unicode_510/S7.6_A5.2_T1.html
     44sputnik/Unicode/Unicode_510/S7.6_A5.2_T2.html
     45sputnik/Unicode/Unicode_510/S7.6_A5.2_T4.html
     46sputnik/Unicode/Unicode_510/S7.6_A5.2_T7.html
     47sputnik/Unicode/Unicode_510/S7.6_A5.2_T8.html
     48sputnik/Unicode/Unicode_510/S7.6_A5.2_T9.html
     49
     50# REGRESSION(r74971): [Qt] /editing/selection/caret-bidi-first-and-last-letters.html fails
     51# https://bugs.webkit.org/show_bug.cgi?id=51884
     52editing/selection/caret-bidi-first-and-last-letters.html
     53
     54# [Qt] editing/selection/collapse-selection-in-bidi.html fails
     55# https://bugs.webkit.org/show_bug.cgi?id=66431
     56editing/selection/collapse-selection-in-bidi.html
     57
     58# [Qt] editing/selection/caret-at-bidi-boundary.html fails
     59# https://bugs.webkit.org/show_bug.cgi?id=66514
     60editing/selection/caret-at-bidi-boundary.html
     61
     62editing/selection/click-left-of-rtl-wrapping-text.html
     63#################################################
  • trunk/LayoutTests/platform/qt-arm/Skipped

    r105872 r105997  
    181181# fails because of missing WebGL support
    182182fast/events/constructors/webgl-context-event-constructor.html
     183
     184# Timed out Sputnik tests on ARM
     185sputnik/Unicode/Unicode_218/S7.6_A5.3_T1.html
     186sputnik/Unicode/Unicode_218/S7.6_A5.3_T2.html
  • trunk/LayoutTests/platform/qt-wk2/Skipped

    r105896 r105997  
    8686# <https://bugs.webkit.org/show_bug.cgi?id=69946>
    8787editing/pasteboard/drag-drop-iframe-refresh-crash.html
    88 editing/selection/select-across-readonly-input-1.html
    89 editing/selection/select-across-readonly-input-2.html
    90 editing/selection/select-across-readonly-input-3.html
    91 editing/selection/select-across-readonly-input-4.html
    92 editing/selection/select-across-readonly-input-5.html
    9388
    9489# WebKit2 needs layoutTestController.overridePreference
     
    418413# Crashing test on qt-wk2 after unskipping qt-5.0/Skipped tests, need more investigation
    419414editing/execCommand/align-in-span.html
    420 # It made the following test(s) timeout
    421 editing/selection/drag-in-iframe.html
    422415
    423416# [Qt][WK2] 2 editing tests introduced in r103073 fails
  • trunk/LayoutTests/platform/qt/Skipped

    r105973 r105997  
    671671editing/selection/move-vertically-with-paddings-borders.html
    672672
    673 # [Qt] editing/selection/collapse-selection-in-bidi.html fails
    674 # https://bugs.webkit.org/show_bug.cgi?id=66431
    675 editing/selection/collapse-selection-in-bidi.html
    676 
    677673# editing/selection/select-bidi-run.html fails on Qt
    678674# https://bugs.webkit.org/show_bug.cgi?id=68854
     
    685681# REGRESSION(r72861): editing/selection/click-left-of-rtl-wrapping-text.html and modify-up-on-rtl-wrapping-text.html fail on all but Mac platform
    686682# https://bugs.webkit.org/show_bug.cgi?id=50204
    687 editing/selection/click-left-of-rtl-wrapping-text.html
    688683editing/selection/modify-up-on-rtl-wrapping-text.html
    689 
    690 # REGRESSION(r74971): [Qt] /editing/selection/caret-bidi-first-and-last-letters.html fails
    691 # https://bugs.webkit.org/show_bug.cgi?id=51884
    692 editing/selection/caret-bidi-first-and-last-letters.html
    693684
    694685# [Qt]REGRESSION(r78846): editing/selection/mixed-editability-10.html
     
    704695editing/selection/move-by-word-visually-inline-block-positioned-element.html
    705696
    706 # [Qt] editing/selection/caret-at-bidi-boundary.html fails
    707 # https://bugs.webkit.org/show_bug.cgi?id=66514
    708 editing/selection/caret-at-bidi-boundary.html
    709 
    710697# ============================================================================= #
    711698# Failing editing/spelling tests
     
    781768sputnik/Conformance/15_Native_Objects/15.9_Date/15.9.3/S15.9.3.1_A5_T5.html
    782769sputnik/Conformance/15_Native_Objects/15.9_Date/15.9.3/S15.9.3.1_A5_T6.html
    783 sputnik/Unicode/Unicode_500/S7.6_A3.1.html
    784 sputnik/Unicode/Unicode_500/S7.6_A3.2.html
    785 sputnik/Unicode/Unicode_500/S7.6_A5.3_T1.html
    786 sputnik/Unicode/Unicode_500/S7.6_A5.3_T2.html
    787 sputnik/Unicode/Unicode_510/S15.5.4.16_A1.html
    788 sputnik/Unicode/Unicode_510/S15.5.4.18_A1.html
    789 sputnik/Unicode/Unicode_510/S7.6_A1.1_T1.html
    790 sputnik/Unicode/Unicode_510/S7.6_A1.1_T2.html
    791 sputnik/Unicode/Unicode_510/S7.6_A1.1_T4.html
    792 sputnik/Unicode/Unicode_510/S7.6_A2.2_T1.html
    793 sputnik/Unicode/Unicode_510/S7.6_A2.2_T2.html
    794 sputnik/Unicode/Unicode_510/S7.6_A2.3.html
    795770sputnik/Unicode/Unicode_510/S7.6_A3.1.html
    796771sputnik/Unicode/Unicode_510/S7.6_A3.2.html
    797 sputnik/Unicode/Unicode_510/S7.6_A5.2_T1.html
    798 sputnik/Unicode/Unicode_510/S7.6_A5.2_T2.html
    799 sputnik/Unicode/Unicode_510/S7.6_A5.2_T4.html
    800 sputnik/Unicode/Unicode_510/S7.6_A5.2_T7.html
    801 sputnik/Unicode/Unicode_510/S7.6_A5.2_T8.html
    802 sputnik/Unicode/Unicode_510/S7.6_A5.2_T9.html
    803772sputnik/Unicode/Unicode_510/S7.6_A5.3_T1.html
    804773sputnik/Unicode/Unicode_510/S7.6_A5.3_T2.html
     
    814783sputnik/Unicode/Unicode_218/S7.6_A3.1.html
    815784sputnik/Unicode/Unicode_218/S7.6_A3.2.html
    816 sputnik/Unicode/Unicode_218/S7.6_A5.3_T1.html
    817 sputnik/Unicode/Unicode_218/S7.6_A5.3_T2.html
    818785
    819786# =========================================================================== #
     
    15421509fast/dom/isindex-002.html
    15431510# seems to trigger some bugs/missing features in QTextCodec
    1544 fast/encoding/char-encoding.html
    15451511# QUrl::from/toACE seems to be stricter than what ICU does.
    15461512fast/encoding/idn-security.html
    15471513fast/encoding/xmacroman-encoding-test.html
    1548 fast/encoding/GBK/EUC-CN.html
    1549 fast/encoding/GBK/chinese.html
    1550 fast/encoding/GBK/cn-gb.html
    1551 fast/encoding/GBK/csgb2312.html
    1552 fast/encoding/GBK/csgb231280.html
    1553 fast/encoding/GBK/gb2312.html
    1554 fast/encoding/GBK/gb_2312-80.html
    1555 fast/encoding/GBK/gbk.html
    1556 fast/encoding/GBK/iso-ir-58.html
    1557 fast/encoding/GBK/x-euc-cn.html
    1558 fast/encoding/GBK/x-gbk.html
    15591514fast/events/autoscroll.html
    15601515fast/events/content-changed-during-drop.html
     
    16251580fast/dom/tabindex-clamp.html
    16261581fast/dom/Window/webkitConvertPoint.html
    1627 fast/encoding/char-encoding-mac.html
    1628 fast/encoding/hebrew/8859-8-e.html
    1629 fast/encoding/hebrew/8859-8-i.html
    1630 fast/encoding/hebrew/logical.html
    16311582fast/events/crash-on-mutate-during-drop.html
    16321583fast/forms/option-mouseevents.html
     
    16351586fast/history/window-open.html
    16361587fast/dom/Range/range-expand.html
    1637 fast/encoding/char-decoding.html
    16381588fast/encoding/frame-default-enc.html
    16391589fast/encoding/invalid-xml.html
     
    16641614fast/dom/icon-url-property.html
    16651615fast/dynamic/008.html
    1666 fast/encoding/char-decoding-mac.html
    1667 fast/encoding/hebrew/csISO88598I.html
    16681616fast/events/offsetX-offsetY.html
    16691617fast/forms/basic-textareas.html
  • trunk/Source/WTF/ChangeLog

    r105995 r105997  
     12012-01-26  Jesus Sanchez-Palencia  <jesus.palencia@openbossa.org>
     2
     3        [Qt] Use ICU if available
     4        https://bugs.webkit.org/show_bug.cgi?id=76821
     5
     6        Reviewed by Simon Hausmann.
     7
     8        Adding libicu dependencies for a Qt5 based build.
     9
     10        * WTF.pri:
     11
    1122012-01-26  Csaba Osztrogonác  <ossy@webkit.org>
    213
  • trunk/Source/WTF/WTF.pri

    r105995 r105997  
    1818    $$OLD_SOURCE_DIR/unicode
    1919
    20 contains(CONFIG, use_system_icu) {
    21     DEFINES += WTF_USE_ICU_UNICODE=1
    22     DEFINES -= WTF_USE_QT4_UNICODE
    23     LIBS += -licuuc -licui18n
     20haveQt(5):contains(QT_CONFIG,icu) {
     21    unix:!mac: LIBS += $$system(icu-config --ldflags-searchpath --ldflags-libsonly)
     22    else: LIBS += -licuin
    2423} else {
    25     DEFINES += WTF_USE_QT4_UNICODE=1
    26     DEFINES -= WTF_USE_ICU_UNICODE
     24    haveQt(5): error("To build QtWebKit with Qt 5 you need ICU")
    2725}
    2826
  • trunk/Source/WebCore/ChangeLog

    r105994 r105997  
     12012-01-26  Jesus Sanchez-Palencia  <jesus.palencia@openbossa.org>
     2
     3        [Qt] Use ICU if available
     4        https://bugs.webkit.org/show_bug.cgi?id=76821
     5
     6        Reviewed by Simon Hausmann.
     7
     8        Adding correct sources to a Qt 5 based build.
     9
     10        No new tests, it's just a build dependency change.
     11
     12        * Target.pri:
     13
    1142012-01-26  Nikolas Zimmermann  <nzimmermann@rim.com>
    215
  • trunk/Source/WebCore/Target.pri

    r105925 r105997  
    28332833    platform/qt/TemporaryLinkStubsQt.cpp \
    28342834    platform/text/qt/TextBoundariesQt.cpp \
    2835     platform/text/qt/TextBreakIteratorQt.cpp \
    28362835    platform/text/qt/TextBreakIteratorInternalICUQt.cpp \
    28372836    platform/text/qt/TextCodecQt.cpp \
     
    28722871}
    28732872
    2874 contains (CONFIG, use_system_icu) {
     2873haveQt(5):contains(QT_CONFIG,icu) {
    28752874    SOURCES += platform/text/TextBreakIteratorICU.cpp
     2875} else {
     2876    SOURCES += platform/text/qt/TextBreakIteratorQt.cpp
    28762877}
    28772878
  • trunk/Tools/ChangeLog

    r105988 r105997  
     12012-01-26  Jesus Sanchez-Palencia  <jesus.palencia@openbossa.org>
     2
     3        [Qt] Use ICU if available
     4        https://bugs.webkit.org/show_bug.cgi?id=76821
     5
     6        Reviewed by Simon Hausmann.
     7
     8        Adding unicode defines for a Qt 5 based build.
     9
     10        * qmake/mkspecs/features/features.prf:
     11
    1122012-01-26  Nándor Huszka  <huszka.nandor@stud.u-szeged.hu>
    213
  • trunk/Tools/qmake/mkspecs/features/features.prf

    r105922 r105997  
    3131}
    3232
    33 contains(CONFIG, use_system_icu) {
     33haveQt(5):contains(QT_CONFIG,icu) {
    3434    DEFINES += WTF_USE_ICU_UNICODE=1
    3535    DEFINES -= WTF_USE_QT4_UNICODE
    36     LIBS += -licuuc -licui18n
    3736} else {
    3837    DEFINES += WTF_USE_QT4_UNICODE=1
Note: See TracChangeset for help on using the changeset viewer.