diff options
| -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 \ |