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

Adapt Qbs build

Browse Source 
Add files to nanotrace and limit sqlite to MSVC2022 and later.

Change-Id: I81b301e56a0084dd94f8f03011b4eb7adb737603
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Christian Stenger
2024-10-09 10:51:55 +02:00
parent f2f4e30334
commit 56f8ca15da
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/libs/nanotrace/nanotrace.qbs
View File

@@ -1,11 +1,18 @@
QtcLibrary {
name: "Nanotrace"
Depends { name: "Utils" }
Depends { name: "Qt.gui" }
cpp.defines: base.concat("NANOTRACE_LIBRARY", "NANOTRACE_ENABLED")
files: [
"nanotrace.cpp",
"nanotrace.h",
"nanotraceglobals.h",
"nanotracehr.cpp",
"nanotracehr.h",
"staticstring.h",
]
Export {

5
src/libs/sqlite/sqlite.qbs
View File

@@ -3,10 +3,13 @@ import qbs.Utilities
QtcLibrary {
name: "Sqlite"
Depends { name: "Nanotrace" }
Depends { name: "Utils" }
Depends { name: "sqlite_sources" }
Depends { name: "Qt.core"; required:false }
condition: Qt.core.present && Utilities.versionCompare(Qt.core.version, "6.4.3") >= 0
condition: ((Qt.core.present && Utilities.versionCompare(Qt.core.version, "6.4.3") >= 0)
&& (!qbs.toolchain.contains("msvc")
|| Utilities.versionCompare(cpp.compilerVersion, "19.30.0") >= 0))
property string exportedIncludeDir: sqlite_sources.includeDir