From 008f34be1e5eda1ff09f042537068d7659dd7e00 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 15 Feb 2024 18:48:52 +0900 Subject: [PATCH] Replace QT_STATIC_CONST_* with actual definitions Signed-off-by: Michele Calgaro (cherry picked from commit 6681698396e454494edfe62a00f54434b1b7cd43) --- src/tqdbusconnection.cpp | 2 +- src/tqdbusconnection.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tqdbusconnection.cpp b/src/tqdbusconnection.cpp index 0056570..f61f2f2 100644 --- a/src/tqdbusconnection.cpp +++ b/src/tqdbusconnection.cpp @@ -31,7 +31,7 @@ #include "tqdbusmessage_p.h" -QT_STATIC_CONST_IMPL char *TQT_DBusConnection::default_connection_name = "qt_dbus_default_connection"; +const char *TQT_DBusConnection::default_connection_name = "qt_dbus_default_connection"; class TQT_DBusConnectionManager { diff --git a/src/tqdbusconnection.h b/src/tqdbusconnection.h index 61362b1..20e04c4 100644 --- a/src/tqdbusconnection.h +++ b/src/tqdbusconnection.h @@ -654,7 +654,7 @@ public: /** * String used as the default parameter for connection names */ - QT_STATIC_CONST char *default_connection_name; + static const char *default_connection_name; private: TQT_DBusConnectionPrivate *d;