diff options
| author | Marco Bubke <marco.bubke@qt.io> | 2021-05-06 15:27:51 +0000 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2021-05-06 15:30:02 +0000 |
| commit | f0a86d45104f585b7aeef07fcc68cea24061aedb (patch) | |
| tree | 6f2bb2de1ed9a81b420c20198c7c629a6f69a802 /qbs | |
| parent | 53c0b82a93df3e79ae1f8f896e9cd164148bebf8 (diff) | |
| download | qt-creator-f0a86d45104f585b7aeef07fcc68cea24061aedb.tar.gz | |
Revert "Merge remote-tracking branch 'origin/4.15'"
This reverts commit 888ca0dd20ff647970fc85340e108cfa34d78c3a.
Reason for revert: wrong patchset
Change-Id: I1291789938601aaf606c59917ff938e3c24c78dd
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Diffstat (limited to 'qbs')
| -rw-r--r-- | qbs/modules/sqlite_sources/sqlite-sources.qbs | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/qbs/modules/sqlite_sources/sqlite-sources.qbs b/qbs/modules/sqlite_sources/sqlite-sources.qbs index ea80e58b1b..559c3ec865 100644 --- a/qbs/modules/sqlite_sources/sqlite-sources.qbs +++ b/qbs/modules/sqlite_sources/sqlite-sources.qbs @@ -9,7 +9,16 @@ Module { Depends { name: "cpp" } cpp.defines: [ - "_HAVE_SQLITE_CONFIG_H", "SQLITE_CORE" + "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", ].concat(buildSharedLib ? "BUILD_SQLITE_LIBRARY" : "BUILD_SQLITE_STATIC_LIBRARY") cpp.dynamicLibraries: base.concat((qbs.targetOS.contains("unix") && !qbs.targetOS.contains("bsd")) |