diff --git a/src/plugins/qmldesigner/designercore/projectstorage/projectstorage.cpp b/src/plugins/qmldesigner/designercore/projectstorage/projectstorage.cpp index 700a85bc112..3e493e87724 100644 --- a/src/plugins/qmldesigner/designercore/projectstorage/projectstorage.cpp +++ b/src/plugins/qmldesigner/designercore/projectstorage/projectstorage.cpp @@ -9,14 +9,11 @@ namespace QmlDesigner { -namespace { - -thread_local NanotraceHR::StringViewCategory projectStorageCategory_{ - "project storage"_t, Tracing::eventQueue(), projectStorageCategory}; -} - NanotraceHR::StringViewCategory &projectStorageCategory() { + thread_local NanotraceHR::StringViewCategory + projectStorageCategory_{"project storage"_t, Tracing::eventQueue(), projectStorageCategory}; + return projectStorageCategory_; } diff --git a/src/plugins/qmldesigner/designercore/tracing/qmldesignertracing.cpp b/src/plugins/qmldesigner/designercore/tracing/qmldesignertracing.cpp index 790be02b701..d49c6156a65 100644 --- a/src/plugins/qmldesigner/designercore/tracing/qmldesignertracing.cpp +++ b/src/plugins/qmldesigner/designercore/tracing/qmldesignertracing.cpp @@ -7,31 +7,37 @@ namespace QmlDesigner { namespace Tracing { namespace { + using TraceFile = NanotraceHR::TraceFile; -TraceFile traceFile{"qml_designer.json"}; - -thread_local NanotraceHR::EventQueueData - stringViewEventQueueData(traceFile); - -thread_local NanotraceHR::EventQueueData - stringViewWithStringArgumentsEventQueueData(traceFile); +TraceFile &traceFile() +{ + static TraceFile traceFile{"qml_designer.json"}; + return traceFile; +} } // namespace EventQueue &eventQueue() { + thread_local NanotraceHR::EventQueueData + stringViewEventQueueData(traceFile()); + return stringViewEventQueueData; } EventQueueWithStringArguments &eventQueueWithStringArguments() { + thread_local NanotraceHR:: + EventQueueData + stringViewWithStringArgumentsEventQueueData(traceFile()); + return stringViewWithStringArgumentsEventQueueData; } StringEventQueue &stringEventQueue() { thread_local NanotraceHR::EventQueueData eventQueue( - traceFile); + traceFile()); return eventQueue; }