From ba2ae1720a11692e2fc57c8be176f2dd9e126f2f Mon Sep 17 00:00:00 2001 From: Fabian Kosmale Date: Mon, 27 Jun 2022 08:17:27 +0200 Subject: QString(En|De)coder: Remove noexcept from ctor taking name It is necessary as the QStringConverter ctor is no longer noexcept, as it can now allocate memory. This change is ABI-wise safe, as the method was only changed to be noexcept in 6.4. Amends 122270d6bea164e6df4357f4d4d77aacfa430470. Pick-to: 6.4 Change-Id: Ifab4302d659524e27f38f0f90e5813a2c2a4a452 Reviewed-by: Thiago Macieira --- src/corelib/text/qstringconverter.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/corelib/text/qstringconverter.h b/src/corelib/text/qstringconverter.h index 6664beccb3..f10aa3b6d3 100644 --- a/src/corelib/text/qstringconverter.h +++ b/src/corelib/text/qstringconverter.h @@ -32,7 +32,7 @@ public: constexpr explicit QStringEncoder(Encoding encoding, Flags flags = Flag::Default) : QStringConverter(encoding, flags) {} - explicit QStringEncoder(const char *name, Flags flags = Flag::Default) noexcept + explicit QStringEncoder(const char *name, Flags flags = Flag::Default) : QStringConverter(name, flags) {} @@ -101,7 +101,7 @@ public: constexpr QStringDecoder() noexcept : QStringConverter() {} - explicit QStringDecoder(const char *name, Flags f = Flag::Default) noexcept + explicit QStringDecoder(const char *name, Flags f = Flag::Default) : QStringConverter(name, f) {} -- cgit v1.2.3