diff options
| author | Tim Jenßen <tim.jenssen@qt.io> | 2023-03-26 15:58:49 +0200 |
|---|---|---|
| committer | Tim Jenßen <tim.jenssen@qt.io> | 2023-03-26 16:26:18 +0200 |
| commit | feabda3aa78b7861ae03f1cc2296e8adf34ba038 (patch) | |
| tree | 9bc06c7eeb6fca92e8cdd273908f7350260a8cb8 /src/libs/3rdparty/sqlite | |
| parent | 359ea5d55a9452d70c20754c2380b1bf1c704c04 (diff) | |
| parent | f7639f458a4b87263e96de70f26554a660148bc3 (diff) | |
Merge remote-tracking branch 'origin/10.0' into qds/dev
bigger conflicts resolved at:
src/plugins/qmldesigner/CMakeLists.txt
src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
Change-Id: I08e2a109d8e37cbd77225129854e9e633725bfc7
Diffstat (limited to 'src/libs/3rdparty/sqlite')
| -rw-r--r-- | src/libs/3rdparty/sqlite/config.h | 2 | ||||
| -rw-r--r-- | src/libs/3rdparty/sqlite/sqlite_static_config.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libs/3rdparty/sqlite/config.h b/src/libs/3rdparty/sqlite/config.h index 44daecedfc..3672f4c5dd 100644 --- a/src/libs/3rdparty/sqlite/config.h +++ b/src/libs/3rdparty/sqlite/config.h @@ -27,7 +27,7 @@ #include <string.h> -#ifdef SQLITE_STATIC_LIBRARY +#if defined(SQLITE_STATIC_LIBRARY) || defined(SQLITEC_STATIC_LIBRARY) #include "sqlite_static_config.h" #endif diff --git a/src/libs/3rdparty/sqlite/sqlite_static_config.h b/src/libs/3rdparty/sqlite/sqlite_static_config.h index f34dc7bcb6..011fd25657 100644 --- a/src/libs/3rdparty/sqlite/sqlite_static_config.h +++ b/src/libs/3rdparty/sqlite/sqlite_static_config.h @@ -195,7 +195,7 @@ #define sqlite3_stmt_status qtc_sqlite3_stmt_status #define sqlite3_str_append qtc_sqlite3_str_append #define sqlite3_str_appendall qtc_sqlite3_str_appendall -#define sqlite3_str_appendchar qtc_sqlite3_str_appendchastruct r +#define sqlite3_str_appendchar qtc_sqlite3_str_appendchar #define sqlite3_str_appendf qtc_sqlite3_str_appendf #define sqlite3_str_errcode qtc_sqlite3_str_errcode #define sqlite3_str_finish qtc_sqlite3_str_finish |