diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp
index e35a8b3c317..ec07dda5cd0 100644
--- a/src/corelib/kernel/qmetatype.cpp
+++ b/src/corelib/kernel/qmetatype.cpp
@@ -1843,11 +1843,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 e7f2c2bd9a8..05808d3555e 100644
--- a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
+++ b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
@@ -4720,6 +4720,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()