QmlDesigner: Fix thread local tracing categories

The macro was not exported to the category was not enabled in other
targets for inline functions.

Change-Id: I176df1bc6aaaf8b3c8851224e78e43238a98a3a8
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>

3 files changed, 22 insertions, 17 deletions

diff --git a/src/libs/sqlite/CMakeLists.txt b/src/libs/sqlite/CMakeLists.txt
index 59654d6d5b..8d690f3bd4 100644
--- a/src/libs/sqlite/CMakeLists.txt
+++ b/src/libs/sqlite/CMakeLists.txt
@@ -73,7 +73,7 @@ add_qtc_library(Sqlite
 extend_qtc_library(Sqlite
   CONDITION TARGET Nanotrace
   DEPENDS Nanotrace
-  DEFINES
+  PUBLIC_DEFINES
     $<$<BOOL:${ENABLE_SQLITE_TRACING}>:ENABLE_SQLITE_TRACING>
 )
 
diff --git a/src/libs/sqlite/sqlitebasestatement.cpp b/src/libs/sqlite/sqlitebasestatement.cpp
index 79e8cd6db6..36247484d7 100644
--- a/src/libs/sqlite/sqlitebasestatement.cpp
+++ b/src/libs/sqlite/sqlitebasestatement.cpp
@@ -35,12 +35,17 @@ thread_local auto eventQueueData = NanotraceHR::makeEventQueueData<NanotraceHR::
     traceFile);
 thread_local NanotraceHR::EventQueue eventQueue = eventQueueData.createEventQueue();
 
-NanotraceHR::StringViewCategory<sqliteTracingIsEnabled()> sqliteLowLevelCategory{"sqlite low level"_t,
-                                                                                 eventQueue};
+thread_local NanotraceHR::StringViewCategory<sqliteTracingIsEnabled()> sqliteLowLevelCategory{
+    "sqlite low level"_t, eventQueue};
+
+thread_local NanotraceHR::StringViewCategory<sqliteTracingIsEnabled()> sqliteHighLevelCategory_{
+    "sqlite high level"_t, eventQueue};
 } // namespace
 
-NanotraceHR::StringViewCategory<sqliteTracingIsEnabled()> sqliteHighLevelCategory{"sqlite high level"_t,
-                                                                                  eventQueue};
+NanotraceHR::StringViewCategory<sqliteTracingIsEnabled()> &sqliteHighLevelCategory()
+{
+    return sqliteHighLevelCategory_;
+}
 
 BaseStatement::BaseStatement(Utils::SmallStringView sqlStatement, Database &database)
     : m_database(database)
diff --git a/src/libs/sqlite/sqlitebasestatement.h b/src/libs/sqlite/sqlitebasestatement.h
index 84575ec4db..00bda5bce3 100644
--- a/src/libs/sqlite/sqlitebasestatement.h
+++ b/src/libs/sqlite/sqlitebasestatement.h
@@ -53,7 +53,7 @@ constexpr bool sqliteTracingIsEnabled()
 #endif
 }
 
-SQLITE_EXPORT extern NanotraceHR::StringViewCategory<sqliteTracingIsEnabled()> sqliteHighLevelCategory;
+SQLITE_EXPORT NanotraceHR::StringViewCategory<sqliteTracingIsEnabled()> &sqliteHighLevelCategory();
 
 class SQLITE_EXPORT BaseStatement
 {
@@ -166,7 +166,7 @@ public:
 
     void execute()
     {
-        NanotraceHR::Tracer tracer{"execute"_t, sqliteHighLevelCategory};
+        NanotraceHR::Tracer tracer{"execute"_t, sqliteHighLevelCategory()};
 
         Resetter resetter{this};
         BaseStatement::next();
@@ -175,7 +175,7 @@ public:
     template<typename... ValueType>
     void bindValues(const ValueType &...values)
     {
-        NanotraceHR::Tracer tracer{"bind"_t, sqliteHighLevelCategory};
+        NanotraceHR::Tracer tracer{"bind"_t, sqliteHighLevelCategory()};
 
         static_assert(BindParameterCount == sizeof...(values), "Wrong binding parameter count!");
 
@@ -186,7 +186,7 @@ public:
     template<typename... ValueType>
     void write(const ValueType&... values)
     {
-        NanotraceHR::Tracer tracer{"write"_t, sqliteHighLevelCategory};
+        NanotraceHR::Tracer tracer{"write"_t, sqliteHighLevelCategory()};
 
         Resetter resetter{this};
         bindValues(values...);
@@ -212,7 +212,7 @@ public:
              typename... QueryTypes>
     auto values(const QueryTypes &...queryValues)
     {
-        NanotraceHR::Tracer tracer{"values"_t, sqliteHighLevelCategory};
+        NanotraceHR::Tracer tracer{"values"_t, sqliteHighLevelCategory()};
 
         Resetter resetter{this};
         Container resultValues;
@@ -241,7 +241,7 @@ public:
     template<typename ResultType, typename... QueryTypes>
     auto value(const QueryTypes &...queryValues)
     {
-        NanotraceHR::Tracer tracer{"values"_t, sqliteHighLevelCategory};
+        NanotraceHR::Tracer tracer{"values"_t, sqliteHighLevelCategory()};
 
         Resetter resetter{this};
         ResultType resultValue{};
@@ -257,7 +257,7 @@ public:
     template<typename ResultType, typename... QueryTypes>
     auto optionalValue(const QueryTypes &...queryValues)
     {
-        NanotraceHR::Tracer tracer{"optionalValue"_t, sqliteHighLevelCategory};
+        NanotraceHR::Tracer tracer{"optionalValue"_t, sqliteHighLevelCategory()};
 
         Resetter resetter{this};
         std::optional<ResultType> resultValue;
@@ -273,7 +273,7 @@ public:
     template<typename Type>
     static auto toValue(Utils::SmallStringView sqlStatement, Database &database)
     {
-        NanotraceHR::Tracer tracer{"toValue"_t, sqliteHighLevelCategory};
+        NanotraceHR::Tracer tracer{"toValue"_t, sqliteHighLevelCategory()};
 
         StatementImplementation statement(sqlStatement, database);
 
@@ -287,7 +287,7 @@ public:
     template<typename Callable, typename... QueryTypes>
     void readCallback(Callable &&callable, const QueryTypes &...queryValues)
     {
-        NanotraceHR::Tracer tracer{"readCallback"_t, sqliteHighLevelCategory};
+        NanotraceHR::Tracer tracer{"readCallback"_t, sqliteHighLevelCategory()};
 
         Resetter resetter{this};
 
@@ -304,7 +304,7 @@ public:
     template<typename Container, typename... QueryTypes>
     void readTo(Container &container, const QueryTypes &...queryValues)
     {
-        NanotraceHR::Tracer tracer{"readTo"_t, sqliteHighLevelCategory};
+        NanotraceHR::Tracer tracer{"readTo"_t, sqliteHighLevelCategory()};
 
         Resetter resetter{this};
 
@@ -401,8 +401,8 @@ public:
         const_iterator end() const & { return iterator{m_statement, false}; }
 
     private:
-        NanotraceHR::Tracer<decltype(sqliteHighLevelCategory)> tracer{"range"_t,
-                                                                      sqliteHighLevelCategory};
+        NanotraceHR::Tracer<decltype(sqliteHighLevelCategory())> tracer{"range"_t,
+                                                                        sqliteHighLevelCategory()};
         StatementImplementation &m_statement;
     };