From 056e127ff6107acb8a3f5316e28c14556e2bd995 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20K=C3=B6hne?= Date: Wed, 19 Jul 2023 16:41:51 +0200 Subject: [PATCH] Deprecate QtSystemMsg enum QtSystemMsg has been an alias to QtCriticalMsg since Qt 4 times, probably because of the misleading name. Let's formally deprecate the enum now, so that it at one point (Qt 7?) can be finally removed. Change-Id: I385b62a77ceb66f75f318a00a73ea5e7333bf4f1 Reviewed-by: Giuseppe D'Angelo Reviewed-by: Edward Welbourne --- src/corelib/global/qlogging.cpp | 2 +- src/corelib/global/qlogging.h | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/corelib/global/qlogging.cpp b/src/corelib/global/qlogging.cpp index 9b0fbe37b5c..d33f0937207 100644 --- a/src/corelib/global/qlogging.cpp +++ b/src/corelib/global/qlogging.cpp @@ -2509,7 +2509,7 @@ QMessageLogContext &QMessageLogContext::copyContextFrom(const QMessageLogContext A message generated by the qCritical() function. \value QtFatalMsg A message generated by the qFatal() function. - \value QtSystemMsg + \omitvalue QtSystemMsg \c QtInfoMsg was added in Qt 5.5. diff --git a/src/corelib/global/qlogging.h b/src/corelib/global/qlogging.h index 44821b44636..de822672184 100644 --- a/src/corelib/global/qlogging.h +++ b/src/corelib/global/qlogging.h @@ -32,7 +32,9 @@ enum QtMsgType { QtCriticalMsg, QtFatalMsg, QtInfoMsg, - QtSystemMsg = QtCriticalMsg +#if QT_DEPRECATED_SINCE(6, 7) + QtSystemMsg Q_DECL_ENUMERATOR_DEPRECATED_X("Use QtCriticalMsg instead.") = QtCriticalMsg +#endif }; class QMessageLogContext