summaryrefslogtreecommitdiffstats
path: root/src/dbus
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@qt.io>2022-03-17 12:07:44 +0100
committerMarc Mutz <marc.mutz@qt.io>2022-03-29 06:18:49 +0100
commit32692667a625f31aa02e0303f2139c780ae42694 (patch)
treebab74a97f673fd2caee7d1d0b68fac4583fcfb11 /src/dbus
parent9578a3f72fd67011263eac9d306750a2dbef01d1 (diff)
Apply Q_CONSTINIT across the codebase
Still not complete. Just grepping for static and thread_local. Task-number: QTBUG-100486 Change-Id: I90ca14e8db3a95590ecde5f89924cf6fcc9755a3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/dbus')
-rw-r--r--src/dbus/qdbus_symbols.cpp2
-rw-r--r--src/dbus/qdbus_symbols_p.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/dbus/qdbus_symbols.cpp b/src/dbus/qdbus_symbols.cpp
index 0eccbe669e..59044aa1db 100644
--- a/src/dbus/qdbus_symbols.cpp
+++ b/src/dbus/qdbus_symbols.cpp
@@ -56,7 +56,7 @@ void (*qdbus_resolve_me(const char *name))();
#if !defined QT_LINKED_LIBDBUS
#if QT_CONFIG(library)
-static QLibrary *qdbus_libdbus = nullptr;
+Q_CONSTINIT static QLibrary *qdbus_libdbus = nullptr;
void qdbus_unloadLibDBus()
{
diff --git a/src/dbus/qdbus_symbols_p.h b/src/dbus/qdbus_symbols_p.h
index accaa4f5ed..ee15c36649 100644
--- a/src/dbus/qdbus_symbols_p.h
+++ b/src/dbus/qdbus_symbols_p.h
@@ -88,7 +88,7 @@ struct TraceDBusCall
static inline ThreadData &td()
{
- static thread_local ThreadData value;
+ Q_CONSTINIT static thread_local ThreadData value;
return value;
}