diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2010-05-14 09:25:51 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2010-05-14 09:25:51 (GMT) |
| commit | 96bf7b880976f225ca390aab1cb1492e8d79ea4c (patch) | |
| tree | 1eacfbc1046d8e1e1dd4936cf5cc590c43817103 /src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.h | |
| parent | d6ddd9d1ba3a987b45c1718b995200421befbd0d (diff) | |
| download | Qt-96bf7b880976f225ca390aab1cb1492e8d79ea4c.zip Qt-96bf7b880976f225ca390aab1cb1492e8d79ea4c.tar.gz Qt-96bf7b880976f225ca390aab1cb1492e8d79ea4c.tar.bz2 | |
Updated WebKit to 5cf023650a8da206a8cf3130e9d4820b95e1bc7c
Integrated changes:
* Doc day API doc overhaul
|| <https://webkit.org/b/38370> || [Qt] GraphicsLayer: depth-test causes flicker in certain situations ||
|| <https://webkit.org/b/38921> || [Qt] emit initialLayoutCompleted signal from FrameLoaderClientQt::dispatchDidFirstVisuallyNonEmptyLayout ||
|| <https://webkit.org/b/38863> || [Qt] Detect debug mode consistently ||
|| <https://webkit.org/b/38389> || [Qt] Update the Symbian version for the user agent ||
|| <https://webkit.org/b/39062> || [Qt] Improve QtLauncher user agent dialog resize ||
|| <https://webkit.org/b/38841> || Ignore invalid values for various CanvasRenderingContext2D properties ||
|| <https://webkit.org/b/38685> || [Qt] tst_QWebPage::inputMethods failing on Maemo5 ||
|| <https://webkit.org/b/38655> || [Qt] REGRESSION(r58497) tst_QGraphicsWebView::crashOnViewlessWebPages() is failing ||
Diffstat (limited to 'src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.h')
| -rw-r--r-- | src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.h b/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.h index d2e536e..3592e2c 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.h +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.h @@ -63,7 +63,7 @@ public: OfflineStorageDatabaseEnabled, OfflineWebApplicationCacheEnabled, LocalStorageEnabled, -#ifdef QT_DEPRECATED +#if defined(QT_DEPRECATED) || defined(qdoc) LocalStorageDatabaseEnabled = LocalStorageEnabled, #endif LocalContentCanAccessRemoteUrls, |