From 652fe10689a043cebf6c54a68b24522c655205ed Mon Sep 17 00:00:00 2001 From: Ivan Solovev Date: Mon, 13 Jan 2025 12:18:47 +0100 Subject: [PATCH] Use [[noreturn]] on QCommandLineParser::showMessageAndExit() ... instead of Q_NORETURN, as the attribute should be unconditionally available since C++11. Amends bad618606d64e943e3fa78e7d1dbc8e1fab55480. Found in Qt 6.9 API review. Change-Id: Ia008acf0777867f551c7e1cc3423f29f8ed6fbed Reviewed-by: Thiago Macieira (cherry picked from commit 8472004a895fa98e68f6f3ff134720904a00c150) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/tools/qcommandlineparser.cpp | 2 +- src/corelib/tools/qcommandlineparser.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/corelib/tools/qcommandlineparser.cpp b/src/corelib/tools/qcommandlineparser.cpp index 21de967a80d..3bf451cf427 100644 --- a/src/corelib/tools/qcommandlineparser.cpp +++ b/src/corelib/tools/qcommandlineparser.cpp @@ -562,7 +562,7 @@ static inline bool displayMessageBox() \sa addVersionOption(), showHelp(), showVersion(), QCommandLineParser::MessageType */ -Q_NORETURN void QCommandLineParser::showMessageAndExit(MessageType type, const QString &message, int exitCode) +[[noreturn]] void QCommandLineParser::showMessageAndExit(MessageType type, const QString &message, int exitCode) { #if defined(Q_OS_WIN) && !defined(QT_BOOTSTRAPPED) if (displayMessageBox()) { diff --git a/src/corelib/tools/qcommandlineparser.h b/src/corelib/tools/qcommandlineparser.h index 1efcf41b578..cdf7c20617f 100644 --- a/src/corelib/tools/qcommandlineparser.h +++ b/src/corelib/tools/qcommandlineparser.h @@ -71,7 +71,7 @@ public: InformationMessage, ErrorMessage, }; - Q_NORETURN static void showMessageAndExit(MessageType type, const QString &message, int exitCode = 0); + [[noreturn]] static void showMessageAndExit(MessageType type, const QString &message, int exitCode = 0); private: Q_DISABLE_COPY(QCommandLineParser)