From 54aa7e75b89d5d27e59594ce35206089ccc22d3b Mon Sep 17 00:00:00 2001 From: Eirik Aavitsland Date: Mon, 29 Aug 2022 17:48:27 +0200 Subject: QVariant: fix conversions of Q_ENUM that are QFlags<> to string The doc of QMetaEnum::valueToKey() says to use ::valueToKeys() instead for flag types. Pick-to: 6.4 Change-Id: I48e5ba47324137f2ce2710f1d876e93e7c562e9f Reviewed-by: Thiago Macieira Reviewed-by: Qt CI Bot --- tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp') diff --git a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp index aa88fd0ea8..5f2ce68918 100644 --- a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp +++ b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp @@ -4753,6 +4753,8 @@ void tst_QVariant::metaEnums() testVariantMeta(Qt::RichText, &ok, "RichText"); testVariantMeta(Qt::Alignment(Qt::AlignBottom), &ok, "AlignBottom"); + testVariantMeta(Qt::Alignment(Qt::AlignHCenter | Qt::AlignBottom), &ok, + "AlignHCenter|AlignBottom"); } void tst_QVariant::nullConvert() -- cgit v1.2.3