From 33c36fae2a0814715082a8fe59f208eeb018ed1d Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 15 Feb 2024 18:49:06 +0900 Subject: Replace QT_STATIC_CONST_* with actual definitions Signed-off-by: Michele Calgaro (cherry picked from commit 1d318a47b0b45a7f916f526de60d628302cbfd4c) --- src/sql/ntqsqldatabase.h | 2 +- src/sql/qsqldatabase.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/sql') diff --git a/src/sql/ntqsqldatabase.h b/src/sql/ntqsqldatabase.h index a6d744877..1fed63e04 100644 --- a/src/sql/ntqsqldatabase.h +++ b/src/sql/ntqsqldatabase.h @@ -129,7 +129,7 @@ public: TQSqlDriver* driver() const; // MOC_SKIP_BEGIN - QT_STATIC_CONST char * const defaultConnection; + static const char * const defaultConnection; // MOC_SKIP_END static TQSqlDatabase* addDatabase( const TQString& type, const TQString& connectionName = defaultConnection ); diff --git a/src/sql/qsqldatabase.cpp b/src/sql/qsqldatabase.cpp index 8c42452d2..66c1725aa 100644 --- a/src/sql/qsqldatabase.cpp +++ b/src/sql/qsqldatabase.cpp @@ -87,7 +87,7 @@ #include "ntqdict.h" #include -QT_STATIC_CONST_IMPL char * const TQSqlDatabase::defaultConnection = "qt_sql_default_connection"; +const char * const TQSqlDatabase::defaultConnection = "qt_sql_default_connection"; TQPtrDict *qt_driver_extension_dict = 0; TQPtrDict *qt_open_extension_dict = 0; -- cgit v1.2.3