diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-03-29 11:58:12 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-03-29 11:58:12 (GMT) |
| commit | 01c5c585ea0839730e213ac414c191ce40bfe321 (patch) | |
| tree | bd57d74feaca4975adb6f7a225328e48f89bd887 /src/3rdparty/webkit | |
| parent | 96e55b0693b7917dd56cedf95b3205cd20c7b651 (diff) | |
| download | Qt-01c5c585ea0839730e213ac414c191ce40bfe321.zip Qt-01c5c585ea0839730e213ac414c191ce40bfe321.tar.gz Qt-01c5c585ea0839730e213ac414c191ce40bfe321.tar.bz2 | |
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( c39615d8e78f083b23f34ac24cf7d3a7ce765122 )
Changes in WebKit/qt since the last update:
* https://bugs.webkit.org/show_bug.cgi?id=34262 -- Accept XHTML MP content type as XHTML content
Diffstat (limited to 'src/3rdparty/webkit')
| -rw-r--r-- | src/3rdparty/webkit/VERSION | 2 | ||||
| -rw-r--r-- | src/3rdparty/webkit/WebCore/ChangeLog | 13 | ||||
| -rw-r--r-- | src/3rdparty/webkit/WebCore/platform/MIMETypeRegistry.cpp | 2 |
3 files changed, 14 insertions, 3 deletions
diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION index 414ba17..5bc2492 100644 --- a/src/3rdparty/webkit/VERSION +++ b/src/3rdparty/webkit/VERSION @@ -8,4 +8,4 @@ The commit imported was from the and has the sha1 checksum - bd724fb2f716336a8a4b54cd2edc96851a5a26a4 + c39615d8e78f083b23f34ac24cf7d3a7ce765122 diff --git a/src/3rdparty/webkit/WebCore/ChangeLog b/src/3rdparty/webkit/WebCore/ChangeLog index 10aa0f2..76374f3 100644 --- a/src/3rdparty/webkit/WebCore/ChangeLog +++ b/src/3rdparty/webkit/WebCore/ChangeLog @@ -1,3 +1,16 @@ +2010-03-29 Laszlo Gombos <laszlo.1.gombos@nokia.com> + + Reviewed for the Qt 4.6 branch by Simon Hausmann. + + Accept XHTML-MP content type as XHTML content + https://bugs.webkit.org/show_bug.cgi?id=34262 + + Enable processing XHTML-MP mime type as an XHTML document + even if XHTML-MP support is not enabled. + + * platform/MIMETypeRegistry.cpp: + (WebCore::initializeSupportedNonImageMimeTypes): + 2010-03-22 Jakub Wieczorek <jwieczorek@webkit.org> Reviewed by Simon Hausmann. diff --git a/src/3rdparty/webkit/WebCore/platform/MIMETypeRegistry.cpp b/src/3rdparty/webkit/WebCore/platform/MIMETypeRegistry.cpp index 609a1b0..758863c 100644 --- a/src/3rdparty/webkit/WebCore/platform/MIMETypeRegistry.cpp +++ b/src/3rdparty/webkit/WebCore/platform/MIMETypeRegistry.cpp @@ -200,9 +200,7 @@ static void initializeSupportedNonImageMimeTypes() "text/", "application/xml", "application/xhtml+xml", -#if ENABLE(XHTMLMP) "application/vnd.wap.xhtml+xml", -#endif "application/rss+xml", "application/atom+xml", #if ENABLE(SVG) |