diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-02-13 17:45:00 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-14 20:16:03 +0100 |
| commit | fccb376dad07f730281e93c5aafcba5b1fd689c9 (patch) | |
| tree | 8051db82b22c49651a6d7ba3d2c7e7ff7e06409a | |
| parent | 3a58945611c1a34ad9a57bededeeb61ec9ebfe70 (diff) | |
| download | qtwebkit-fccb376dad07f730281e93c5aafcba5b1fd689c9.tar.gz | |
Enable HTML5 Indexed Database API
Enable the HTML5 indexed database API which is now a W3C candidate
recommendation and supercedes WebSQL.
[ChangeLog][QtWebKit][New Features] Indexed Database API (not available on windows)
Change-Id: I924ba9cc2218658822380577dbd23ab010ef1f76
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| -rw-r--r-- | Source/api.pri | 1 | ||||
| -rw-r--r-- | Tools/qmake/mkspecs/features/features.prf | 7 | ||||
| -rw-r--r-- | Tools/qmake/mkspecs/features/features.pri | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/Source/api.pri b/Source/api.pri index ccd206cc3..fb6ad9136 100644 --- a/Source/api.pri +++ b/Source/api.pri @@ -25,6 +25,7 @@ build?(webkit1): { build?(webkit2): QMAKE_INTERNAL_INCLUDED_FILES *= WebKit2/Target.pri use?(3D_GRAPHICS): WEBKIT += angle +use?(leveldb):!use?(system_leveldb) WEBKIT += leveldb MODULE = webkit CONFIG += creating_module diff --git a/Tools/qmake/mkspecs/features/features.prf b/Tools/qmake/mkspecs/features/features.prf index ebf9a8560..d45ea40cd 100644 --- a/Tools/qmake/mkspecs/features/features.prf +++ b/Tools/qmake/mkspecs/features/features.prf @@ -135,6 +135,10 @@ defineTest(detectFeatures) { # Slider Touch is sensible to use when compiling WebKit2 enable?(touch_events): WEBKIT_CONFIG += touch_slider + # IndexedDB requires leveldb and leveldb currently requires posix + !posix:WEBKIT_CONFIG -= indexed_database + enable?(indexed_database): WEBKIT_CONFIG += use_leveldb + export(WEBKIT_CONFIG) export(CONFIGURE_WARNINGS) } @@ -166,9 +170,6 @@ defineTest(santizeFeatures) { # GStreamer uses Glib use?(gstreamer): WEBKIT_CONFIG += use_glib - # IndexedDB requires leveldb - enable?(indexed_database): WEBKIT_CONFIG += use_leveldb - # VideoTrack requires video !enable?(video): WEBKIT_CONFIG -= video_track diff --git a/Tools/qmake/mkspecs/features/features.pri b/Tools/qmake/mkspecs/features/features.pri index adc3d702f..dc847e912 100644 --- a/Tools/qmake/mkspecs/features/features.pri +++ b/Tools/qmake/mkspecs/features/features.pri @@ -59,7 +59,7 @@ FEATURE_DEFAULTS = \ ENABLE_HIGH_DPI_CANVAS=0 \ ENABLE_ICONDATABASE=1 \ ENABLE_IFRAME_SEAMLESS=1 \ - ENABLE_INDEXED_DATABASE=0 \ + ENABLE_INDEXED_DATABASE=1 \ ENABLE_INPUT_SPEECH=0 \ ENABLE_INPUT_TYPE_COLOR=1 \ ENABLE_INPUT_TYPE_DATE=0 \ |