summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Roquetto <rafael.roquetto.qnx@kdab.com>2012-04-30 14:24:34 +0200
committerQt by Nokia <qt-info@nokia.com>2012-05-04 15:24:52 +0200
commitee69c935c0f7b4ad3747e369fc18373d31e2521b (patch)
tree2f354674df71091acb9bc996bdf33e92dc7950dd
parent06887461548bebcb7aa47f5cb06d421d8fd40944 (diff)
Enable some SQLITE extensions by default
Enable SQLITE_ENABLE_FTS3 SQLITE_ENABLE_FTS3_PARENTHESIS SQLITE_ENABLE_RTREE by default on all platforms. These options were previously enabled in Ubuntu, Nokia N9 and in some mobile devices. Change-Id: I5b3d2d9a683916216058ca94ec82957bd8cacdb0 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Honglei Zhang <honglei.zhang@nokia.com>
-rw-r--r--dist/changes-5.0.04
-rw-r--r--src/3rdparty/sqlite.pri2
2 files changed, 4 insertions, 2 deletions
diff --git a/dist/changes-5.0.0 b/dist/changes-5.0.0
index 0df359f3ed..9763c5ad17 100644
--- a/dist/changes-5.0.0
+++ b/dist/changes-5.0.0
@@ -279,7 +279,9 @@ General Improvements
Third party components
----------------------
--
+- SQLITE_ENABLE_FTS3,SQLITE_ENABLE_FTS3_PARENTHESIS and SQLITE_ENABLE_RTREE
+flags are now enabled by default on all platforms, for the sqlite3 copy under
+the 3rdparty directory.
****************************************************************************
diff --git a/src/3rdparty/sqlite.pri b/src/3rdparty/sqlite.pri
index e8fa827b13..e31415a80e 100644
--- a/src/3rdparty/sqlite.pri
+++ b/src/3rdparty/sqlite.pri
@@ -1,5 +1,5 @@
CONFIG(release, debug|release):DEFINES *= NDEBUG
-DEFINES += SQLITE_OMIT_LOAD_EXTENSION SQLITE_OMIT_COMPLETE
+DEFINES += SQLITE_OMIT_LOAD_EXTENSION SQLITE_OMIT_COMPLETE SQLITE_ENABLE_FTS3 SQLITE_ENABLE_FTS3_PARENTHESIS SQLITE_ENABLE_RTREE
!contains(CONFIG, largefile):DEFINES += SQLITE_DISABLE_LFS
INCLUDEPATH += $$PWD/sqlite
SOURCES += $$PWD/sqlite/sqlite3.c