Diff
Modified: trunk/LayoutTests/ChangeLog (105996 => 105997)
--- trunk/LayoutTests/ChangeLog 2012-01-26 13:53:13 UTC (rev 105996)
+++ trunk/LayoutTests/ChangeLog 2012-01-26 14:07:36 UTC (rev 105997)
@@ -1,3 +1,18 @@
+2012-01-26 Jesus Sanchez-Palencia <jesus.palen...@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 <nzimmerm...@rim.com>
svg/webarchive tests are flakey under guard malloc
Modified: trunk/LayoutTests/platform/qt/Skipped (105996 => 105997)
--- trunk/LayoutTests/platform/qt/Skipped 2012-01-26 13:53:13 UTC (rev 105996)
+++ trunk/LayoutTests/platform/qt/Skipped 2012-01-26 14:07:36 UTC (rev 105997)
@@ -670,10 +670,6 @@
# 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 @@
# 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-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_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 @@
# 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/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/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/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
Modified: trunk/LayoutTests/platform/qt-4.8/Skipped (105996 => 105997)
--- trunk/LayoutTests/platform/qt-4.8/Skipped 2012-01-26 13:53:13 UTC (rev 105996)
+++ trunk/LayoutTests/platform/qt-4.8/Skipped 2012-01-26 14:07:36 UTC (rev 105997)
@@ -4,3 +4,60 @@
# [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
+#################################################
Modified: trunk/LayoutTests/platform/qt-arm/Skipped (105996 => 105997)
--- trunk/LayoutTests/platform/qt-arm/Skipped 2012-01-26 13:53:13 UTC (rev 105996)
+++ trunk/LayoutTests/platform/qt-arm/Skipped 2012-01-26 14:07:36 UTC (rev 105997)
@@ -180,3 +180,7 @@
# 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
Modified: trunk/LayoutTests/platform/qt-wk2/Skipped (105996 => 105997)
--- trunk/LayoutTests/platform/qt-wk2/Skipped 2012-01-26 13:53:13 UTC (rev 105996)
+++ trunk/LayoutTests/platform/qt-wk2/Skipped 2012-01-26 14:07:36 UTC (rev 105997)
@@ -85,11 +85,6 @@
# [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 @@
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
Modified: trunk/Source/WTF/ChangeLog (105996 => 105997)
--- trunk/Source/WTF/ChangeLog 2012-01-26 13:53:13 UTC (rev 105996)
+++ trunk/Source/WTF/ChangeLog 2012-01-26 14:07:36 UTC (rev 105997)
@@ -1,3 +1,14 @@
+2012-01-26 Jesus Sanchez-Palencia <jesus.palen...@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 <o...@webkit.org>
[Qt][Win] One more speculative buildfix after r105970.
Modified: trunk/Source/WTF/WTF.pri (105996 => 105997)
--- trunk/Source/WTF/WTF.pri 2012-01-26 13:53:13 UTC (rev 105996)
+++ trunk/Source/WTF/WTF.pri 2012-01-26 14:07:36 UTC (rev 105997)
@@ -17,13 +17,11 @@
$$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 {
Modified: trunk/Source/WebCore/ChangeLog (105996 => 105997)
--- trunk/Source/WebCore/ChangeLog 2012-01-26 13:53:13 UTC (rev 105996)
+++ trunk/Source/WebCore/ChangeLog 2012-01-26 14:07:36 UTC (rev 105997)
@@ -1,3 +1,16 @@
+2012-01-26 Jesus Sanchez-Palencia <jesus.palen...@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 <nzimmerm...@rim.com>
Not reviewed. Fix mac build after r105988.
Modified: trunk/Source/WebCore/Target.pri (105996 => 105997)
--- trunk/Source/WebCore/Target.pri 2012-01-26 13:53:13 UTC (rev 105996)
+++ trunk/Source/WebCore/Target.pri 2012-01-26 14:07:36 UTC (rev 105997)
@@ -2832,7 +2832,6 @@
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 @@
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) {
Modified: trunk/Tools/ChangeLog (105996 => 105997)
--- trunk/Tools/ChangeLog 2012-01-26 13:53:13 UTC (rev 105996)
+++ trunk/Tools/ChangeLog 2012-01-26 14:07:36 UTC (rev 105997)
@@ -1,3 +1,14 @@
+2012-01-26 Jesus Sanchez-Palencia <jesus.palen...@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.nan...@stud.u-szeged.hu>
[WK2] WebKitTestRunner needs layoutTestController.setGeolocationPermission
Modified: trunk/Tools/qmake/mkspecs/features/features.prf (105996 => 105997)
--- trunk/Tools/qmake/mkspecs/features/features.prf 2012-01-26 13:53:13 UTC (rev 105996)
+++ trunk/Tools/qmake/mkspecs/features/features.prf 2012-01-26 14:07:36 UTC (rev 105997)
@@ -30,10 +30,9 @@
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