diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2021-05-07 09:19:39 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2021-05-07 09:07:40 +0000 |
| commit | bf5b1d714c6eeb9a82fbf046ae18c1e63cfe6a20 (patch) | |
| tree | b8eb5867c9b690fa1d92e6285f6fc5c354e41faf /qbs | |
| parent | 635993fbdcda6b2c9711b3f74511e8fd94cb07f3 (diff) | |
Revert "Revert "Merge remote-tracking branch 'origin/4.15'""
This reverts commit f0a86d45104f585b7aeef07fcc68cea24061aedb.
Reverting a merge doesn't "undo" it - the changes would be lost
forever even with subsequent merges.
So we need to revert the revert to get the changes.
Change-Id: I65928f876f4dc886561bed17c4b2aa42b388c1e3
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
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")) |