feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Sqlite: Fix build with QTC_STATIC_BUILD

Browse Source 
Qt Creator was failing with:

```
In file included from /home/jarek/dev/creator-14-work/src/libs/sqlite/
sqliteexception.h:6,
                 from /home/jarek/dev/creator-14-work/src/libs/sqlite/
sqlitevalue.h:7,
                 from /home/jarek/dev/creator-14-work/src/plugins/
qmldesigner/designercore/projectstorage/projectstorageinfotypes.h:8,
                 from /home/jarek/dev/creator-14-work/src/plugins/
qmldesigner/designercore/projectstorage/projectstoragetypes.h:8,
                 from /home/jarek/dev/creator-14-work/src/plugins/
qmldesigner/designercore/include/propertymetainfo.h:9,
                 from /home/jarek/dev/creator-14-work/src/plugins/
qmldesigner/designercore/include/nodemetainfo.h:6,
                 from /home/jarek/dev/creator-14-work/tests/unit/tests/
printers/gtest-creator-printing.cpp:17:
/home/jarek/dev/creator-14-work/src/libs/sqlite/sqlite3_fwd.h:7:7:
error: conflicting declaration ‘using sqlite3 = struct qtc_sqlite3’
    7 | using sqlite3 = struct qtc_sqlite3;
      |       ^~~~~~~
```

Task-number: QTCREATORBUG-30009
Change-Id: Ibc18f16ab304a92f73882c9336eebc2abd54aa44
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
Cristian Adam
2024-06-18 16:55:28 +02:00
parent a8e2ccdea6
commit ded397ca55
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libs/sqlite/CMakeLists.txt
View File

@@ -80,5 +80,7 @@ extend_qtc_library(Sqlite
extend_qtc_library(Sqlite extend_qtc_library(Sqlite
CONDITION QTC_STATIC_BUILD CONDITION QTC_STATIC_BUILD
PROPERTIES COMPILE_OPTIONS $<IF:$<CXX_COMPILER_ID:MSVC>,/FIsqlite_static_config.h,-includesqlite_static_config.h> PROPERTIES
COMPILE_OPTIONS $<IF:$<CXX_COMPILER_ID:MSVC>,/FIsqlite_static_config.h,-includesqlite_static_config.h>
INTERFACE_COMPILE_OPTIONS $<IF:$<CXX_COMPILER_ID:MSVC>,/FI../3rdparty/sqlite/sqlite_static_config.h,-include../3rdparty/sqlite/sqlite_static_config.h>
) )