diff options
| author | Tim Jenssen <tim.jenssen@qt.io> | 2023-06-02 21:23:26 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@qt.io> | 2023-06-02 19:26:05 +0000 |
| commit | 002d84cb15e314a207346fdfd6cf78055d1b8b92 (patch) | |
| tree | f3354186e1b3f7e80a2786acfaff6656eb7cdb09 /src/libs/sqlite | |
| parent | bc6487068892be8c99404998c93dc6125551cf18 (diff) | |
| parent | e759ce310fe6f30724f29b809bf0bcab1df88e1d (diff) | |
Merge remote-tracking branch 'origin/11.0' into qds/dev
Conflicts: src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp
src/plugins/qmlprojectmanager/cmakegen/generatecmakelists.cpp
tests/auto/qml/qmlprojectmanager/fileformat/fileformat.qbs
tests/auto/qml/qmlprojectmanager/fileformat/tst_fileformat.cpp
Change-Id: I257f1908917bcc58805619b53b6866f2f73ca544
Diffstat (limited to 'src/libs/sqlite')
| -rw-r--r-- | src/libs/sqlite/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/libs/sqlite/sqliteexception.h | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/src/libs/sqlite/CMakeLists.txt b/src/libs/sqlite/CMakeLists.txt index 7f33b18921..4c7cd774c6 100644 --- a/src/libs/sqlite/CMakeLists.txt +++ b/src/libs/sqlite/CMakeLists.txt @@ -1,5 +1,5 @@ add_qtc_library(SqliteC OBJECT - PROPERTIES AUTOMOC OFF AUTOUIC OFF QT_COMPILE_OPTIONS_DISABLE_WARNINGS ON POSITION_INDEPENDENT_CODE ON + PROPERTIES AUTOMOC OFF AUTOUIC OFF QT_COMPILE_OPTIONS_DISABLE_WARNINGS ON DEFINES SQLITE_CORE SQLITE_CUSTOM_INCLUDE=config.h $<$<CONFIG:Debug>:SQLITE_DEBUG> PROPERTIES COMPILE_OPTIONS $<IF:$<CXX_COMPILER_ID:MSVC>,/FIconfig.h,-includeconfig.h> PUBLIC_INCLUDES diff --git a/src/libs/sqlite/sqliteexception.h b/src/libs/sqlite/sqliteexception.h index d030f65280..f0cadfc748 100644 --- a/src/libs/sqlite/sqliteexception.h +++ b/src/libs/sqlite/sqliteexception.h @@ -3,6 +3,7 @@ #pragma once +#include "sqlite3_fwd.h" #include "sqliteglobal.h" #include <utils/smallstring.h> @@ -10,10 +11,6 @@ #include <exception> #include <iostream> -extern "C" { -struct sqlite3; -} - namespace Sqlite { class SQLITE_EXPORT Exception : public std::exception |