diff options
| author | Fabian Kosmale <fabian.kosmale@qt.io> | 2022-06-27 08:17:27 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-06-27 23:39:44 +0000 |
| commit | 257e3fee16e6ba798495006e8e52d475a1b08183 (patch) | |
| tree | 99e03086cf6a30736f3ac1afa228abcf51bc96cb /src/corelib | |
| parent | a7044900b2fa2da2bdbc9de721b62c2703d64c2a (diff) | |
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.
Change-Id: Ifab4302d659524e27f38f0f90e5813a2c2a4a452
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit ba2ae1720a11692e2fc57c8be176f2dd9e126f2f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/text/qstringconverter.h | 4 |
1 files 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) {} |