diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-05-05 15:28:45 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-05-05 15:28:45 (GMT) |
| commit | b017f89f844c09354b50a45fd49fcdcee4f72e43 (patch) | |
| tree | 69385ca1f1a1791582ffc3614605db94a977cf5a /src/3rdparty/webkit/WebKit | |
| parent | ffa103af9620998f47c632f4118e789bf7f1cde7 (diff) | |
| download | Qt-b017f89f844c09354b50a45fd49fcdcee4f72e43.zip Qt-b017f89f844c09354b50a45fd49fcdcee4f72e43.tar.gz Qt-b017f89f844c09354b50a45fd49fcdcee4f72e43.tar.bz2 | |
Updated WebKit to 992e57ee469bd8c6a2afef6b15896a161ab8aeb3
Fixes integrated since the last import:
|| <https://webkit.org/b/38339> || [Qt] Enable JIT for QtWebKit on Symbian ||
|| <https://webkit.org/b/38116> || Media queries empty values ||
|| <https://webkit.org/b/38125> || View modes names in CSSValueKeywords.in ||
Also disabled QtMultimedia support for HTML 5 Audio/Video elements and removed
WebGL support.
Diffstat (limited to 'src/3rdparty/webkit/WebKit')
| -rw-r--r-- | src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.cpp | 1 | ||||
| -rw-r--r-- | src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.h | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.cpp index 2305c7f..e72af36 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.cpp +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.cpp @@ -454,7 +454,6 @@ QWebSettings::QWebSettings() d->attributes.insert(QWebSettings::LocalContentCanAccessRemoteUrls, false); d->attributes.insert(QWebSettings::LocalContentCanAccessFileUrls, true); d->attributes.insert(QWebSettings::AcceleratedCompositingEnabled, true); - d->attributes.insert(QWebSettings::WebGLEnabled, false); d->attributes.insert(QWebSettings::TiledBackingStoreEnabled, false); d->attributes.insert(QWebSettings::FrameFlatteningEnabled, false); d->offlineStorageDefaultQuota = 5 * 1024 * 1024; diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.h b/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.h index caba0d5..d2e536e 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.h +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.h @@ -70,7 +70,6 @@ public: DnsPrefetchEnabled, XSSAuditorEnabled, AcceleratedCompositingEnabled, - WebGLEnabled, SpatialNavigationEnabled, LocalContentCanAccessFileUrls, TiledBackingStoreEnabled, |