From 54aa7e75b89d5d27e59594ce35206089ccc22d3b Mon Sep 17 00:00:00 2001
From: Eirik Aavitsland <eirik.aavitsland@qt.io>
Date: Mon, 29 Aug 2022 17:48:27 +0200
Subject: [PATCH] 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 <thiago.macieira@intel.com>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
---
 src/corelib/kernel/qmetatype.cpp               | 18 +++++++++++++-----
 .../corelib/kernel/qvariant/tst_qvariant.cpp   |  2 ++
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp
index 620e6d57a83..aa0b4fc2998 100644
--- a/src/corelib/kernel/qmetatype.cpp
+++ b/src/corelib/kernel/qmetatype.cpp
@@ -1945,11 +1945,19 @@ static bool convertFromEnum(QMetaType fromType, const void *from, QMetaType toTy
 #ifndef QT_NO_QOBJECT
     QMetaEnum en = metaEnumFromType(fromType);
     if (en.isValid()) {
-        const char *key = en.valueToKey(ll);
-        if (toType.id() == QMetaType::QString)
-            *static_cast<QString *>(to) = QString::fromUtf8(key);
-        else
-            *static_cast<QByteArray *>(to) = key;
+        if (en.isFlag()) {
+            const QByteArray keys = en.valueToKeys(ll);
+            if (toType.id() == QMetaType::QString)
+                *static_cast<QString *>(to) = QString::fromUtf8(keys);
+            else
+                *static_cast<QByteArray *>(to) = keys;
+        } else {
+            const char *key = en.valueToKey(ll);
+            if (toType.id() == QMetaType::QString)
+                *static_cast<QString *>(to) = QString::fromUtf8(key);
+            else
+                *static_cast<QByteArray *>(to) = key;
+        }
         return true;
     }
 #endif
diff --git a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
index aa88fd0ea8e..5f2ce689188 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()