From 2df17d56b91f7b9c424102c1897d337ae7b7db19 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Wed, 21 Jun 2023 07:56:49 +0200 Subject: [PATCH] QMessageBox: cut out the _q_requireVersion() middle-man Just de-inline the original function instead of merely moving its implementation into an out-of-line function. Amends 408fbd3f2d7a6b87521f5b3c27ecf6341dc06e13. Change-Id: I6860a10e0a7d876ce1837f196b1fb4165779540a Reviewed-by: Axel Spoerl (cherry picked from commit 91efd6116665bd71f7932adcf7a589204c239276) Reviewed-by: Qt Cherry-pick Bot --- src/widgets/dialogs/qmessagebox.cpp | 2 +- src/widgets/dialogs/qmessagebox.h | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/widgets/dialogs/qmessagebox.cpp b/src/widgets/dialogs/qmessagebox.cpp index b6094372e00..e7fc7e5d255 100644 --- a/src/widgets/dialogs/qmessagebox.cpp +++ b/src/widgets/dialogs/qmessagebox.cpp @@ -2847,7 +2847,7 @@ void QMessageBoxPrivate::helperDone(QDialog::DialogCode code, QPlatformDialogHel clickedButton = button; } -Q_WIDGETS_EXPORT void _q_requireVersion(int argc, char *argv[], QAnyStringView req) +void qRequireVersion(int argc, char *argv[], QAnyStringView req) { const auto required = QVersionNumber::fromString(req).normalized(); const auto current = QVersionNumber::fromString(qVersion()).normalized(); diff --git a/src/widgets/dialogs/qmessagebox.h b/src/widgets/dialogs/qmessagebox.h index 2dee2e9204f..76b23efc016 100644 --- a/src/widgets/dialogs/qmessagebox.h +++ b/src/widgets/dialogs/qmessagebox.h @@ -312,12 +312,7 @@ private: Q_DECLARE_OPERATORS_FOR_FLAGS(QMessageBox::StandardButtons) -[[maybe_unused]] -static inline void qRequireVersion(int argc, char *argv[], QAnyStringView req) -{ - Q_WIDGETS_EXPORT void _q_requireVersion(int, char *[], QAnyStringView); - _q_requireVersion(argc, argv, req); -} +Q_WIDGETS_EXPORT void qRequireVersion(int argc, char *argv[], QAnyStringView req); #define QT_REQUIRE_VERSION(argc, argv, str) qRequireVersion(argc, argv, str);