From 56f8ca15da6f56fee1a7089ef2dd914fb1d7d3bc Mon Sep 17 00:00:00 2001
From: Christian Stenger <christian.stenger@qt.io>
Date: Wed, 9 Oct 2024 10:51:55 +0200
Subject: [PATCH] Adapt Qbs build

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

Change-Id: I81b301e56a0084dd94f8f03011b4eb7adb737603
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 src/libs/nanotrace/nanotrace.qbs | 7 +++++++
 src/libs/sqlite/sqlite.qbs       | 5 ++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/libs/nanotrace/nanotrace.qbs b/src/libs/nanotrace/nanotrace.qbs
index 0e0c9237dd7..76d09d58c0d 100644
--- a/src/libs/nanotrace/nanotrace.qbs
+++ b/src/libs/nanotrace/nanotrace.qbs
@@ -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 {
diff --git a/src/libs/sqlite/sqlite.qbs b/src/libs/sqlite/sqlite.qbs
index c25bd5f3fc0..9c1641bdd93 100644
--- a/src/libs/sqlite/sqlite.qbs
+++ b/src/libs/sqlite/sqlite.qbs
@@ -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