diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-12-30 09:48:14 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-12-30 09:48:14 (GMT) |
| commit | a8454801a1fc195d2ef6e1a05042ccf0833d8edd (patch) | |
| tree | 271f93824957d3113544977006201ece213015f7 /src/3rdparty/webkit/WebCore | |
| parent | 698bbbeacde77b70d354aa01e6ab2b43810c82d8 (diff) | |
| download | Qt-a8454801a1fc195d2ef6e1a05042ccf0833d8edd.zip Qt-a8454801a1fc195d2ef6e1a05042ccf0833d8edd.tar.gz Qt-a8454801a1fc195d2ef6e1a05042ccf0833d8edd.tar.bz2 | |
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( c07df5686b431aa5d11643d00308d8f8f59d88b1 )
Changes in WebKit/qt since the last update:
* Disable HTML5 Datagrid
* Fix RVCT build
Diffstat (limited to 'src/3rdparty/webkit/WebCore')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/ChangeLog | 10 | ||||
| -rw-r--r-- | src/3rdparty/webkit/WebCore/WebCore.pro | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/WebCore/ChangeLog b/src/3rdparty/webkit/WebCore/ChangeLog index d9a81c1..294028c 100644 --- a/src/3rdparty/webkit/WebCore/ChangeLog +++ b/src/3rdparty/webkit/WebCore/ChangeLog @@ -1,3 +1,13 @@ +2009-12-30 Laszlo Gombos <laszlo.1.gombos@nokia.com> + + Reviewed by Simon Hausmann. + + Turn off DataGrid support by default. + + No new tests, as there is no new functionality. + + * WebCore.pro: + 2009-12-17 Yael Aharon <yael.aharon@nokia.com> Reviewed by Kenneth Rohde Christiansen. diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro index 367af19..007f6f6 100644 --- a/src/3rdparty/webkit/WebCore/WebCore.pro +++ b/src/3rdparty/webkit/WebCore/WebCore.pro @@ -136,7 +136,7 @@ contains(DEFINES, ENABLE_SINGLE_THREADED=1) { !contains(DEFINES, ENABLE_SHARED_WORKERS=.): DEFINES += ENABLE_SHARED_WORKERS=1 !contains(DEFINES, ENABLE_WORKERS=.): DEFINES += ENABLE_WORKERS=1 !contains(DEFINES, ENABLE_XHTMLMP=.): DEFINES += ENABLE_XHTMLMP=0 -!contains(DEFINES, ENABLE_DATAGRID=.): DEFINES += ENABLE_DATAGRID=1 +!contains(DEFINES, ENABLE_DATAGRID=.): DEFINES += ENABLE_DATAGRID=0 # SVG support !contains(DEFINES, ENABLE_SVG=0) { |