diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-01-31 11:55:33 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-05 12:33:57 +0100 |
| commit | 032ed118eeb3cb642720336a1ef67623bb97f9c4 (patch) | |
| tree | 0e59274454ec7861d1edd0349f3ce27ec0ceb424 /Tools | |
| parent | 39ec04fedbc2862073ed38b61e152d9e0d73077d (diff) | |
| download | qtwebkit-032ed118eeb3cb642720336a1ef67623bb97f9c4.tar.gz | |
Use WebKit's copy of leveldb when system version is not available
To support indexed database webkit needs leveldb, therefore webkit
contains a copy of leveldb which we can use to provide support when
the system doesn't ship with a suitable version.
Change-Id: I231694e6a7c7cb83855bfed3f9ee24fbd2795362
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'Tools')
| -rw-r--r-- | Tools/qmake/config.tests/leveldb/leveldb.cpp | 2 | ||||
| -rw-r--r-- | Tools/qmake/mkspecs/features/features.prf | 4 | ||||
| -rw-r--r-- | Tools/qmake/mkspecs/features/webkit_modules.prf | 2 | ||||
| -rw-r--r-- | Tools/qmake/mkspecs/modules/leveldb.prf | 9 |
4 files changed, 13 insertions, 4 deletions
diff --git a/Tools/qmake/config.tests/leveldb/leveldb.cpp b/Tools/qmake/config.tests/leveldb/leveldb.cpp index 84a52beb7..9c647bc1e 100644 --- a/Tools/qmake/config.tests/leveldb/leveldb.cpp +++ b/Tools/qmake/config.tests/leveldb/leveldb.cpp @@ -19,7 +19,7 @@ #include <leveldb/db.h> #include <leveldb/env.h> -#include <leveldb/helpers/memenv.h> +#include <helpers/memenv/memenv.h> int main(int, char**) { diff --git a/Tools/qmake/mkspecs/features/features.prf b/Tools/qmake/mkspecs/features/features.prf index d8da581c6..9f9677d0b 100644 --- a/Tools/qmake/mkspecs/features/features.prf +++ b/Tools/qmake/mkspecs/features/features.prf @@ -44,7 +44,7 @@ defineTest(detectFeatures) { config_libxslt: WEBKIT_CONFIG += xslt config_libzlib: WEBKIT_CONFIG += use_zlib config_libwebp: WEBKIT_CONFIG += use_webp - config_leveldb: WEBKIT_CONFIG += use_leveldb + config_leveldb: WEBKIT_CONFIG += use_system_leveldb # We can't use Qt's 3rdparty sources for libjpeg and libpng outside of qtbase, but if Qt # is using the system libraries, use them to take advantage of the WebCore image decoders as well. @@ -170,7 +170,7 @@ defineTest(santizeFeatures) { use?(gstreamer): WEBKIT_CONFIG += use_glib # IndexedDB requires leveldb - !use?(leveldb): WEBKIT_CONFIG -= indexed_database + enable?(indexed_database): WEBKIT_CONFIG += use_leveldb # VideoTrack requires video !enable?(video): WEBKIT_CONFIG -= video_track diff --git a/Tools/qmake/mkspecs/features/webkit_modules.prf b/Tools/qmake/mkspecs/features/webkit_modules.prf index 189387835..005a1bd3d 100644 --- a/Tools/qmake/mkspecs/features/webkit_modules.prf +++ b/Tools/qmake/mkspecs/features/webkit_modules.prf @@ -7,7 +7,7 @@ # Reorder libraries so that the link and include order is correct, # and make sure the case matches the original case. -libraries = WebKit1 WebKit2 WebCore ANGLE JavaScriptCore WTF +libraries = WebKit1 WebKit2 WebCore ANGLE leveldb JavaScriptCore WTF for(library, libraries) { contains(WEBKIT, $$lower($$library)) { WEBKIT -= $$lower($$library) diff --git a/Tools/qmake/mkspecs/modules/leveldb.prf b/Tools/qmake/mkspecs/modules/leveldb.prf new file mode 100644 index 000000000..d06acf05e --- /dev/null +++ b/Tools/qmake/mkspecs/modules/leveldb.prf @@ -0,0 +1,9 @@ +# ------------------------------------------------------------------- +# Module file for leveldb, used by targets that depend on leveldb +# +# See 'Tools/qmake/README' for an overview of the build system +# ------------------------------------------------------------------- + +WEBKIT.leveldb.root_source_dir = $${ROOT_WEBKIT_DIR}/Source/ThirdParty/leveldb + +include($${WEBKIT.leveldb.root_source_dir}/leveldb.pri) |