summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
diff options
context:
space:
mode:
authorNils Jeisecke <nils.jeisecke@saltation.com>2018-10-06 07:37:27 +0200
committerChristian Ehrlicher <ch.ehrlicher@gmx.de>2019-03-03 11:51:36 +0000
commiteea3947842e461662cea4a31c7a5dd7f1969ec23 (patch)
tree9255d5230bb8eae23dbdba4d9f0db58a00265060 /src/3rdparty
parent84e15d6f485fe0e9a4549d57ef39dbc3d18eeaa9 (diff)
sqlite: Remove SQLITE_OMIT_LOAD_EXTENSION define
This define prevents the usage of some customization possibilities, e.g. injecting data by using virtual tables that are implemented as an extension. [ChangeLog][Third-Party Code] Build sqlite without SQLITE_OMIT_LOAD_EXTENSION Fixes: QTBUG-70972 Change-Id: Idaf1c2c7bccbaec6f7bbf3d79334ffb4a0bad3fc Reviewed-by: Nils Jeisecke <nils.jeisecke@saltation.com> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/3rdparty')
-rw-r--r--src/3rdparty/sqlite.pri4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/3rdparty/sqlite.pri b/src/3rdparty/sqlite.pri
index 068764c726..6405beb3d0 100644
--- a/src/3rdparty/sqlite.pri
+++ b/src/3rdparty/sqlite.pri
@@ -1,5 +1,6 @@
CONFIG(release, debug|release):DEFINES *= NDEBUG
-DEFINES += SQLITE_ENABLE_COLUMN_METADATA SQLITE_OMIT_LOAD_EXTENSION SQLITE_OMIT_COMPLETE SQLITE_ENABLE_FTS3 SQLITE_ENABLE_FTS3_PARENTHESIS SQLITE_ENABLE_FTS5 SQLITE_ENABLE_RTREE SQLITE_ENABLE_JSON1
+QT_FOR_CONFIG += core-private
+DEFINES += SQLITE_ENABLE_COLUMN_METADATA SQLITE_OMIT_COMPLETE SQLITE_ENABLE_FTS3 SQLITE_ENABLE_FTS3_PARENTHESIS SQLITE_ENABLE_FTS5 SQLITE_ENABLE_RTREE SQLITE_ENABLE_JSON1
!contains(CONFIG, largefile):DEFINES += SQLITE_DISABLE_LFS
qtConfig(posix_fallocate): DEFINES += HAVE_POSIX_FALLOCATE=1
winrt {
@@ -8,6 +9,7 @@ winrt {
}
qnx: DEFINES += _QNX_SOURCE
!win32:!winrt:!winphone: DEFINES += HAVE_USLEEP=1
+qtConfig(dlopen): QMAKE_USE += libdl
integrity: QMAKE_CFLAGS += -include qplatformdefs.h
INCLUDEPATH += $$PWD/sqlite
SOURCES += $$PWD/sqlite/sqlite3.c