diff options
| author | Tim Jenssen <tim.jenssen@qt.io> | 2021-05-06 13:06:28 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2021-05-06 13:07:48 +0200 |
| commit | 888ca0dd20ff647970fc85340e108cfa34d78c3a (patch) | |
| tree | 94ab52c0af43e5c3fd575ea270304683daf05956 /qbs | |
| parent | 201786d3fc39f92cec4ad9eafa548e534e5cc442 (diff) | |
| parent | fb26650d86636fff7b84a7218ebcf95e089431d9 (diff) | |
| download | qt-creator-888ca0dd20ff647970fc85340e108cfa34d78c3a.tar.gz | |
Merge remote-tracking branch 'origin/4.15'
Conflicts:
src/libs/sqlite/sqlitebasestatement.h
src/plugins/qmldesigner/qmldesignerplugin.cpp
Change-Id: I0fa0a8a7feffed24c0d2bc26eca86590f1156755
Diffstat (limited to 'qbs')
| -rw-r--r-- | qbs/modules/sqlite_sources/sqlite-sources.qbs | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/qbs/modules/sqlite_sources/sqlite-sources.qbs b/qbs/modules/sqlite_sources/sqlite-sources.qbs index 559c3ec865..ea80e58b1b 100644 --- a/qbs/modules/sqlite_sources/sqlite-sources.qbs +++ b/qbs/modules/sqlite_sources/sqlite-sources.qbs @@ -9,16 +9,7 @@ Module { Depends { name: "cpp" } cpp.defines: [ - "SQLITE_THREADSAFE=2", "SQLITE_ENABLE_FTS5", "SQLITE_ENABLE_UNLOCK_NOTIFY", - "SQLITE_ENABLE_JSON1", "SQLITE_DEFAULT_FOREIGN_KEYS=1", "SQLITE_TEMP_STORE=2", - "SQLITE_DEFAULT_WAL_SYNCHRONOUS=1", "SQLITE_MAX_WORKER_THREADS", "SQLITE_DEFAULT_MEMSTATUS=0", - "SQLITE_OMIT_DEPRECATED", "SQLITE_OMIT_DECLTYPE", - "SQLITE_MAX_EXPR_DEPTH=0", "SQLITE_OMIT_SHARED_CACHE", "SQLITE_USE_ALLOCA", - "SQLITE_ENABLE_MEMORY_MANAGEMENT", "SQLITE_ENABLE_NULL_TRIM", "SQLITE_OMIT_EXPLAIN", - "SQLITE_OMIT_LOAD_EXTENSION", "SQLITE_OMIT_UTF16", "SQLITE_DQS=0", - "SQLITE_ENABLE_STAT4", "HAVE_ISNAN", "HAVE_FDATASYNC", "HAVE_MALLOC_USABLE_SIZE", - "SQLITE_DEFAULT_MMAP_SIZE=268435456", "SQLITE_CORE", "SQLITE_ENABLE_SESSION", "SQLITE_ENABLE_PREUPDATE_HOOK", - "SQLITE_LIKE_DOESNT_MATCH_BLOBS", + "_HAVE_SQLITE_CONFIG_H", "SQLITE_CORE" ].concat(buildSharedLib ? "BUILD_SQLITE_LIBRARY" : "BUILD_SQLITE_STATIC_LIBRARY") cpp.dynamicLibraries: base.concat((qbs.targetOS.contains("unix") && !qbs.targetOS.contains("bsd")) |