summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKonstantin Tokarev <annulen@yandex.ru>2016-05-11 16:14:12 +0300
committerKonstantin Tokarev <annulen@yandex.ru>2016-05-20 13:01:22 +0000
commite23e63be27e195b4f4cf46f1d947720d85e5e044 (patch)
tree7299620404da93740f24162ee44a1146bbef36e7
parent9d69c357ca97785eee385b14942a27ec2a680ede (diff)
downloadqtwebkit-e23e63be27e195b4f4cf46f1d947720d85e5e044.tar.gz
Moved use_leveldb configuration from detectFeatures to sanitizeFeatures.
Otherwise compilation breaks when indexed_database is disabled, because USE(LEVELDB) is always true. Change-Id: I680475baeb6796cdba859ff8daaba0c39a3e8338 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
-rw-r--r--Tools/qmake/mkspecs/features/features.prf3
1 files changed, 3 insertions, 0 deletions
diff --git a/Tools/qmake/mkspecs/features/features.prf b/Tools/qmake/mkspecs/features/features.prf
index bb3432bd2..b7fb4c43b 100644
--- a/Tools/qmake/mkspecs/features/features.prf
+++ b/Tools/qmake/mkspecs/features/features.prf
@@ -173,6 +173,9 @@ defineTest(sanitizeFeatures) {
# GStreamer uses Glib
use?(gstreamer): WEBKIT_CONFIG += use_glib
+ # LevelDB is not needed without indexed_database
+ !enable?(indexed_database): WEBKIT_CONFIG -= use_leveldb
+
# VideoTrack requires video
!enable?(video): WEBKIT_CONFIG -= video_track