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

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@105997 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index fce4b38..10d4cf8 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,18 @@
+2012-01-26  Jesus Sanchez-Palencia  <jesus.palencia@openbossa.org>
+
+        [Qt] Use ICU if available
+        https://bugs.webkit.org/show_bug.cgi?id=76821
+
+        Reviewed by Simon Hausmann.
+
+        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:
+
 2012-01-26  Nikolas Zimmermann  <nzimmermann@rim.com>
 
         svg/webarchive tests are flakey under guard malloc

diff --git a/LayoutTests/platform/qt-4.8/Skipped b/LayoutTests/platform/qt-4.8/Skipped
index df0d23f..c97a61e 100644 (file)
--- a/LayoutTests/platform/qt-4.8/Skipped
+++ b/LayoutTests/platform/qt-4.8/Skipped
@@ -4,3 +4,60 @@ http/tests/xmlhttprequest/cross-origin-no-authorization.html
 # [Qt] Two http auth tests fail with Qt 4.7.2
 # https://bugs.webkit.org/show_bug.cgi?id=55767
 http/tests/appcache/auth.html
+
+#################################################
+# Moved from qt/Skipped after:
+# [Qt] Use ICU if available
+# https://bugs.webkit.org/show_bug.cgi?id=76821
+fast/encoding/GBK/EUC-CN.html
+fast/encoding/GBK/chinese.html
+fast/encoding/GBK/cn-gb.html
+fast/encoding/GBK/csgb2312.html
+fast/encoding/GBK/csgb231280.html
+fast/encoding/GBK/gb2312.html
+fast/encoding/GBK/gb_2312-80.html
+fast/encoding/GBK/gbk.html
+fast/encoding/GBK/iso-ir-58.html
+fast/encoding/GBK/x-euc-cn.html
+fast/encoding/GBK/x-gbk.html
+fast/encoding/char-decoding-mac.html
+fast/encoding/char-decoding.html
+fast/encoding/char-encoding-mac.html
+fast/encoding/char-encoding.html
+fast/encoding/hebrew/8859-8-e.html
+fast/encoding/hebrew/8859-8-i.html
+fast/encoding/hebrew/csISO88598I.html
+fast/encoding/hebrew/logical.html
+sputnik/Unicode/Unicode_500/S7.6_A3.1.html
+sputnik/Unicode/Unicode_500/S7.6_A3.2.html
+sputnik/Unicode/Unicode_500/S7.6_A5.3_T1.html
+sputnik/Unicode/Unicode_500/S7.6_A5.3_T2.html
+sputnik/Unicode/Unicode_510/S15.5.4.16_A1.html
+sputnik/Unicode/Unicode_510/S15.5.4.18_A1.html
+sputnik/Unicode/Unicode_510/S7.6_A1.1_T1.html
+sputnik/Unicode/Unicode_510/S7.6_A1.1_T2.html
+sputnik/Unicode/Unicode_510/S7.6_A1.1_T4.html
+sputnik/Unicode/Unicode_510/S7.6_A2.2_T1.html
+sputnik/Unicode/Unicode_510/S7.6_A2.2_T2.html
+sputnik/Unicode/Unicode_510/S7.6_A2.3.html
+sputnik/Unicode/Unicode_510/S7.6_A5.2_T1.html
+sputnik/Unicode/Unicode_510/S7.6_A5.2_T2.html
+sputnik/Unicode/Unicode_510/S7.6_A5.2_T4.html
+sputnik/Unicode/Unicode_510/S7.6_A5.2_T7.html
+sputnik/Unicode/Unicode_510/S7.6_A5.2_T8.html
+sputnik/Unicode/Unicode_510/S7.6_A5.2_T9.html
+
+# REGRESSION(r74971): [Qt] /editing/selection/caret-bidi-first-and-last-letters.html fails
+# https://bugs.webkit.org/show_bug.cgi?id=51884
+editing/selection/caret-bidi-first-and-last-letters.html
+
+# [Qt] editing/selection/collapse-selection-in-bidi.html fails
+# https://bugs.webkit.org/show_bug.cgi?id=66431
+editing/selection/collapse-selection-in-bidi.html
+
+# [Qt] editing/selection/caret-at-bidi-boundary.html fails
+# https://bugs.webkit.org/show_bug.cgi?id=66514
+editing/selection/caret-at-bidi-boundary.html
+
+editing/selection/click-left-of-rtl-wrapping-text.html
+#################################################

diff --git a/LayoutTests/platform/qt-arm/Skipped b/LayoutTests/platform/qt-arm/Skipped
index 1874d8a..9ff624c 100644 (file)
--- a/LayoutTests/platform/qt-arm/Skipped
+++ b/LayoutTests/platform/qt-arm/Skipped
@@ -180,3 +180,7 @@ http/tests/misc/empty-urls.html
 
 # fails because of missing WebGL support
 fast/events/constructors/webgl-context-event-constructor.html
+
+# Timed out Sputnik tests on ARM
+sputnik/Unicode/Unicode_218/S7.6_A5.3_T1.html
+sputnik/Unicode/Unicode_218/S7.6_A5.3_T2.html

diff --git a/LayoutTests/platform/qt-wk2/Skipped b/LayoutTests/platform/qt-wk2/Skipped
index 3d4123f..6a780e9 100644 (file)
--- a/LayoutTests/platform/qt-wk2/Skipped
+++ b/LayoutTests/platform/qt-wk2/Skipped
@@ -85,11 +85,6 @@ scrollbars/scroll-rtl-or-bt-layer.html
 # [WK2] [Qt] Support drag in mouse events for WebKit2 EventSender
 # <https://bugs.webkit.org/show_bug.cgi?id=69946>
 editing/pasteboard/drag-drop-iframe-refresh-crash.html
-editing/selection/select-across-readonly-input-1.html
-editing/selection/select-across-readonly-input-2.html
-editing/selection/select-across-readonly-input-3.html
-editing/selection/select-across-readonly-input-4.html
-editing/selection/select-across-readonly-input-5.html
 
 # WebKit2 needs layoutTestController.overridePreference
 # <https://bugs.webkit.org/show_bug.cgi?id=42197>
@@ -417,8 +412,6 @@ http/tests/workers/interrupt-database-sync-open-crash.html
 security/autocomplete-cleared-on-back.html
 # Crashing test on qt-wk2 after unskipping qt-5.0/Skipped tests, need more investigation
 editing/execCommand/align-in-span.html
-# It made the following test(s) timeout
-editing/selection/drag-in-iframe.html
 
 # [Qt][WK2] 2 editing tests introduced in r103073 fails
 # https://bugs.webkit.org/show_bug.cgi?id=74937

diff --git a/LayoutTests/platform/qt/Skipped b/LayoutTests/platform/qt/Skipped
index 3469e71..f881443 100644 (file)
--- a/LayoutTests/platform/qt/Skipped
+++ b/LayoutTests/platform/qt/Skipped
@@ -670,10 +670,6 @@ editing/selection/extend-to-line-boundary.html
 # https://bugs.webkit.org/show_bug.cgi?id=62821
 editing/selection/move-vertically-with-paddings-borders.html
 
-# [Qt] editing/selection/collapse-selection-in-bidi.html fails
-# https://bugs.webkit.org/show_bug.cgi?id=66431
-editing/selection/collapse-selection-in-bidi.html
-
 # editing/selection/select-bidi-run.html fails on Qt
 # https://bugs.webkit.org/show_bug.cgi?id=68854
 editing/selection/select-bidi-run.html
@@ -684,13 +680,8 @@ editing/selection/after-line-break.html
 
 # 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
 # https://bugs.webkit.org/show_bug.cgi?id=50204
-editing/selection/click-left-of-rtl-wrapping-text.html
 editing/selection/modify-up-on-rtl-wrapping-text.html
 
-# REGRESSION(r74971): [Qt] /editing/selection/caret-bidi-first-and-last-letters.html fails
-# https://bugs.webkit.org/show_bug.cgi?id=51884
-editing/selection/caret-bidi-first-and-last-letters.html
-
 # [Qt]REGRESSION(r78846): editing/selection/mixed-editability-10.html
 # https://bugs.webkit.org/show_bug.cgi?id=54725
 editing/selection/mixed-editability-10.html
@@ -703,10 +694,6 @@ editing/selection/move-by-word-visually-single-space-inline-element.html
 editing/selection/move-by-word-visually-single-space-one-element.html
 editing/selection/move-by-word-visually-inline-block-positioned-element.html
 
-# [Qt] editing/selection/caret-at-bidi-boundary.html fails
-# https://bugs.webkit.org/show_bug.cgi?id=66514
-editing/selection/caret-at-bidi-boundary.html
-
 # ============================================================================= #
 # Failing editing/spelling tests
 # ============================================================================= #
@@ -780,26 +767,8 @@ sputnik/Conformance/15_Native_Objects/15.9_Date/15.9.3/S15.9.3.1_A5_T3.html
 sputnik/Conformance/15_Native_Objects/15.9_Date/15.9.3/S15.9.3.1_A5_T4.html
 sputnik/Conformance/15_Native_Objects/15.9_Date/15.9.3/S15.9.3.1_A5_T5.html
 sputnik/Conformance/15_Native_Objects/15.9_Date/15.9.3/S15.9.3.1_A5_T6.html
-sputnik/Unicode/Unicode_500/S7.6_A3.1.html
-sputnik/Unicode/Unicode_500/S7.6_A3.2.html
-sputnik/Unicode/Unicode_500/S7.6_A5.3_T1.html
-sputnik/Unicode/Unicode_500/S7.6_A5.3_T2.html
-sputnik/Unicode/Unicode_510/S15.5.4.16_A1.html
-sputnik/Unicode/Unicode_510/S15.5.4.18_A1.html
-sputnik/Unicode/Unicode_510/S7.6_A1.1_T1.html
-sputnik/Unicode/Unicode_510/S7.6_A1.1_T2.html
-sputnik/Unicode/Unicode_510/S7.6_A1.1_T4.html
-sputnik/Unicode/Unicode_510/S7.6_A2.2_T1.html
-sputnik/Unicode/Unicode_510/S7.6_A2.2_T2.html
-sputnik/Unicode/Unicode_510/S7.6_A2.3.html
 sputnik/Unicode/Unicode_510/S7.6_A3.1.html
 sputnik/Unicode/Unicode_510/S7.6_A3.2.html
-sputnik/Unicode/Unicode_510/S7.6_A5.2_T1.html
-sputnik/Unicode/Unicode_510/S7.6_A5.2_T2.html
-sputnik/Unicode/Unicode_510/S7.6_A5.2_T4.html
-sputnik/Unicode/Unicode_510/S7.6_A5.2_T7.html
-sputnik/Unicode/Unicode_510/S7.6_A5.2_T8.html
-sputnik/Unicode/Unicode_510/S7.6_A5.2_T9.html
 sputnik/Unicode/Unicode_510/S7.6_A5.3_T1.html
 sputnik/Unicode/Unicode_510/S7.6_A5.3_T2.html
 
@@ -813,8 +782,6 @@ sputnik/Conformance/11_Expressions/11.5_Multiplicative_Operators/11.5.3_Percent/
 # Timed out Sputnik tests on ARM
 sputnik/Unicode/Unicode_218/S7.6_A3.1.html
 sputnik/Unicode/Unicode_218/S7.6_A3.2.html
-sputnik/Unicode/Unicode_218/S7.6_A5.3_T1.html
-sputnik/Unicode/Unicode_218/S7.6_A5.3_T2.html
 
 # =========================================================================== #
 # Fluctuating/flakey tests
@@ -1541,21 +1508,9 @@ fast/box-sizing/percentage-height.html
 fast/dom/focus-contenteditable.html
 fast/dom/isindex-002.html
 # seems to trigger some bugs/missing features in QTextCodec
-fast/encoding/char-encoding.html
 # QUrl::from/toACE seems to be stricter than what ICU does.
 fast/encoding/idn-security.html
 fast/encoding/xmacroman-encoding-test.html
-fast/encoding/GBK/EUC-CN.html
-fast/encoding/GBK/chinese.html
-fast/encoding/GBK/cn-gb.html
-fast/encoding/GBK/csgb2312.html
-fast/encoding/GBK/csgb231280.html
-fast/encoding/GBK/gb2312.html
-fast/encoding/GBK/gb_2312-80.html
-fast/encoding/GBK/gbk.html
-fast/encoding/GBK/iso-ir-58.html
-fast/encoding/GBK/x-euc-cn.html
-fast/encoding/GBK/x-gbk.html
 fast/events/autoscroll.html
 fast/events/content-changed-during-drop.html
 fast/events/js-keyboard-event-creation.html
@@ -1624,17 +1579,12 @@ fast/dom/Range/getBoundingClientRect.html
 fast/dom/Range/getClientRects.html
 fast/dom/tabindex-clamp.html
 fast/dom/Window/webkitConvertPoint.html
-fast/encoding/char-encoding-mac.html
-fast/encoding/hebrew/8859-8-e.html
-fast/encoding/hebrew/8859-8-i.html
-fast/encoding/hebrew/logical.html
 fast/events/crash-on-mutate-during-drop.html
 fast/forms/option-mouseevents.html
 fast/forms/text-control-intrinsic-widths.html
 fast/forms/textarea-metrics.html
 fast/history/window-open.html
 fast/dom/Range/range-expand.html
-fast/encoding/char-decoding.html
 fast/encoding/frame-default-enc.html
 fast/encoding/invalid-xml.html
 fast/events/attempt-scroll-with-no-scrollbars.html
@@ -1663,8 +1613,6 @@ fast/css/text-overflow-ellipsis-strict.html
 fast/dom/HTMLTextAreaElement/reset-textarea.html
 fast/dom/icon-url-property.html
 fast/dynamic/008.html
-fast/encoding/char-decoding-mac.html
-fast/encoding/hebrew/csISO88598I.html
 fast/events/offsetX-offsetY.html
 fast/forms/basic-textareas.html
 fast/forms/box-shadow-override.html

diff --git a/Source/WTF/ChangeLog b/Source/WTF/ChangeLog
index c08cf85..d44adf7 100644 (file)
--- a/Source/WTF/ChangeLog
+++ b/Source/WTF/ChangeLog
@@ -1,3 +1,14 @@
+2012-01-26  Jesus Sanchez-Palencia  <jesus.palencia@openbossa.org>
+
+        [Qt] Use ICU if available
+        https://bugs.webkit.org/show_bug.cgi?id=76821
+
+        Reviewed by Simon Hausmann.
+
+        Adding libicu dependencies for a Qt5 based build.
+
+        * WTF.pri:
+
 2012-01-26  Csaba Osztrogonác  <ossy@webkit.org>
 
         [Qt][Win] One more speculative buildfix after r105970.

diff --git a/Source/WTF/WTF.pri b/Source/WTF/WTF.pri
index a601f1c..93bbe92 100644 (file)
--- a/Source/WTF/WTF.pri
+++ b/Source/WTF/WTF.pri
@@ -17,13 +17,11 @@ INCLUDEPATH += \
     $$OLD_SOURCE_DIR/qt \
     $$OLD_SOURCE_DIR/unicode
 
-contains(CONFIG, use_system_icu) {
-    DEFINES += WTF_USE_ICU_UNICODE=1
-    DEFINES -= WTF_USE_QT4_UNICODE
-    LIBS += -licuuc -licui18n
+haveQt(5):contains(QT_CONFIG,icu) {
+    unix:!mac: LIBS += $$system(icu-config --ldflags-searchpath --ldflags-libsonly)
+    else: LIBS += -licuin
 } else {
-    DEFINES += WTF_USE_QT4_UNICODE=1
-    DEFINES -= WTF_USE_ICU_UNICODE
+    haveQt(5): error("To build QtWebKit with Qt 5 you need ICU")
 }
 
 v8 {

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 214876c..c45564c 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2012-01-26  Jesus Sanchez-Palencia  <jesus.palencia@openbossa.org>
+
+        [Qt] Use ICU if available
+        https://bugs.webkit.org/show_bug.cgi?id=76821
+
+        Reviewed by Simon Hausmann.
+
+        Adding correct sources to a Qt 5 based build.
+
+        No new tests, it's just a build dependency change.
+
+        * Target.pri:
+
 2012-01-26  Nikolas Zimmermann  <nzimmermann@rim.com>
 
         Not reviewed. Fix mac build after r105988.

diff --git a/Source/WebCore/Target.pri b/Source/WebCore/Target.pri
index 3da2e63..6b6a14b 100644 (file)
--- a/Source/WebCore/Target.pri
+++ b/Source/WebCore/Target.pri
@@ -2832,7 +2832,6 @@ SOURCES += \
     platform/qt/LanguageQt.cpp \
     platform/qt/TemporaryLinkStubsQt.cpp \
     platform/text/qt/TextBoundariesQt.cpp \
-    platform/text/qt/TextBreakIteratorQt.cpp \
     platform/text/qt/TextBreakIteratorInternalICUQt.cpp \
     platform/text/qt/TextCodecQt.cpp \
     platform/qt/WheelEventQt.cpp \
@@ -2871,8 +2870,10 @@ mac {
         platform/text/cf/StringImplCF.cpp
 }
 
-contains (CONFIG, use_system_icu) {
+haveQt(5):contains(QT_CONFIG,icu) {
     SOURCES += platform/text/TextBreakIteratorICU.cpp
+} else {
+    SOURCES += platform/text/qt/TextBreakIteratorQt.cpp
 }
 
 contains(DEFINES, ENABLE_NETSCAPE_PLUGIN_API=1) {

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index aae8584..3dfb89d 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,14 @@
+2012-01-26  Jesus Sanchez-Palencia  <jesus.palencia@openbossa.org>
+
+        [Qt] Use ICU if available
+        https://bugs.webkit.org/show_bug.cgi?id=76821
+
+        Reviewed by Simon Hausmann.
+
+        Adding unicode defines for a Qt 5 based build.
+
+        * qmake/mkspecs/features/features.prf:
+
 2012-01-26  Nándor Huszka  <huszka.nandor@stud.u-szeged.hu>
 
         [WK2] WebKitTestRunner needs layoutTestController.setGeolocationPermission

diff --git a/Tools/qmake/mkspecs/features/features.prf b/Tools/qmake/mkspecs/features/features.prf
index 926b564..fe20fdb 100644 (file)
--- a/Tools/qmake/mkspecs/features/features.prf
+++ b/Tools/qmake/mkspecs/features/features.prf
@@ -30,10 +30,9 @@ isEmpty(SQLITE3SRCDIR) {
     SQLITE3SRCDIR = $$[QT_INSTALL_PREFIX]/src/3rdparty/sqlite/
 }
 
-contains(CONFIG, use_system_icu) {
+haveQt(5):contains(QT_CONFIG,icu) {
     DEFINES += WTF_USE_ICU_UNICODE=1
     DEFINES -= WTF_USE_QT4_UNICODE
-    LIBS += -licuuc -licui18n
 } else {
     DEFINES += WTF_USE_QT4_UNICODE=1
     DEFINES -= WTF_USE_ICU_UNICODE