From 72d0b8f709c0c73fac6062b5a287ef5630f9b770 Mon Sep 17 00:00:00 2001 From: Giuseppe D'Angelo Date: Mon, 13 Jan 2025 14:22:33 +0100 Subject: [PATCH] QStringConverterBase: make it move-only The class declares a protected destructor, which interferes with the RO5. The only subclass in qtbase is move-only; QTextCodec (in Core5Compat) is not even movable. Make QStringConverterBase move-only as well. Pick-to: 6.8 Change-Id: I20d16df79f7ad8e7e7a8af339954cfa2d1482e96 Reviewed-by: Marc Mutz Reviewed-by: Edward Welbourne (cherry picked from commit eb533c81b8aa55f89605bb1d091afe4df4db763c) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/text/qstringconverter_base.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/corelib/text/qstringconverter_base.h b/src/corelib/text/qstringconverter_base.h index 7978f8bc590..5b0f30254c5 100644 --- a/src/corelib/text/qstringconverter_base.h +++ b/src/corelib/text/qstringconverter_base.h @@ -81,7 +81,10 @@ public: Q_DISABLE_COPY(State) }; protected: + QStringConverterBase() = default; ~QStringConverterBase() = default; + QStringConverterBase(QStringConverterBase &&) = default; + QStringConverterBase &operator=(QStringConverterBase &&) = default; }; Q_DECLARE_OPERATORS_FOR_FLAGS(QStringConverterBase::Flags)