diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-07 11:22:47 +0100 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-11-07 11:22:47 +0100 |
commit | cfd86b747d32ac22246a1aa908eaa720c63a88c1 (patch) | |
tree | 24d68c6f61c464ecba1e05670b80390ea3b0e50c /Source/cmakeconfig.h.cmake | |
parent | 69d7c744c9de19d152dbe2d8e46eb7dfd4511d1a (diff) | |
download | qtwebkit-cfd86b747d32ac22246a1aa908eaa720c63a88c1.tar.gz |
Imported WebKit commit 20271caf2e2c016d5cef40184cddeefeac4f1876 (http://svn.webkit.org/repository/webkit/trunk@133733)
New snapshot that contains all previous fixes as well as build fix for latest QtMultimedia API changes.
Diffstat (limited to 'Source/cmakeconfig.h.cmake')
-rw-r--r-- | Source/cmakeconfig.h.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Source/cmakeconfig.h.cmake b/Source/cmakeconfig.h.cmake index 5966b45fb..39bb02b2d 100644 --- a/Source/cmakeconfig.h.cmake +++ b/Source/cmakeconfig.h.cmake @@ -15,6 +15,7 @@ #cmakedefine01 ENABLE_CSP_NEXT #cmakedefine01 ENABLE_CSS3_TEXT #cmakedefine01 ENABLE_CSS_BOX_DECORATION_BREAK +#cmakedefine01 ENABLE_CSS_DEVICE_ADAPTATION #cmakedefine01 ENABLE_CSS_COMPOSITING #cmakedefine01 ENABLE_CSS_EXCLUSIONS #cmakedefine01 ENABLE_CSS_FILTERS @@ -91,6 +92,7 @@ #cmakedefine01 ENABLE_QUOTA #cmakedefine01 ENABLE_REPAINT_THROTTLING #cmakedefine01 ENABLE_REQUEST_ANIMATION_FRAME +#cmakedefine01 ENABLE_RESOLUTION_MEDIA_QUERY #cmakedefine01 ENABLE_SCRIPTED_SPEECH #cmakedefine01 ENABLE_SHADOW_DOM #cmakedefine01 ENABLE_SHARED_WORKERS @@ -104,7 +106,6 @@ #cmakedefine01 ENABLE_TEXT_AUTOSIZING #cmakedefine01 ENABLE_TOUCH_EVENTS #cmakedefine01 ENABLE_TOUCH_ICON_LOADING -#cmakedefine01 ENABLE_UNDO_MANAGER #cmakedefine01 ENABLE_VIBRATION #cmakedefine01 ENABLE_VIDEO #cmakedefine01 ENABLE_VIDEO_TRACK @@ -117,6 +118,7 @@ #cmakedefine01 ENABLE_WEB_TIMING #cmakedefine01 ENABLE_WORKERS #cmakedefine01 ENABLE_XHR_RESPONSE_BLOB +#cmakedefine01 ENABLE_XHR_TIMEOUT #cmakedefine01 ENABLE_XSLT #cmakedefine01 USE_SYSTEM_MALLOC #cmakedefine01 WTF_USE_TILED_BACKING_STORE |