diff --git a/src/corelib/kernel/qmetatype.cpp b/src/corelib/kernel/qmetatype.cpp
index 3606b298dd1..139c4ec7762 100644
--- a/src/corelib/kernel/qmetatype.cpp
+++ b/src/corelib/kernel/qmetatype.cpp
@@ -1947,7 +1947,6 @@ static bool convertFromEnum(QMetaType fromType, const void *from, QMetaType toTy
         if (toType.id() != QMetaType::QString && toType.id() != QMetaType::QByteArray)
             return QMetaType::convert(QMetaType::fromType<qlonglong>(), &ll, toType, to);
     }
-    Q_ASSERT(toType.id() == QMetaType::QString || toType.id() == QMetaType::QByteArray);
 #ifndef QT_NO_QOBJECT
     QMetaEnum en = metaEnumFromType(fromType);
     if (en.isValid()) {
@@ -1967,6 +1966,8 @@ static bool convertFromEnum(QMetaType fromType, const void *from, QMetaType toTy
         return true;
     }
 #endif
+    if (toType.id() == QMetaType::QString || toType.id() == QMetaType::QByteArray)
+        return QMetaType::convert(QMetaType::fromType<qlonglong>(), &ll, toType, to);
     return false;
 }
 
@@ -1978,12 +1979,12 @@ static bool convertToEnum(QMetaType fromType, const void *from, QMetaType toType
 #ifndef QT_NO_QOBJECT
     if (fromTypeId == QMetaType::QString || fromTypeId == QMetaType::QByteArray) {
         QMetaEnum en = metaEnumFromType(toType);
-        if (!en.isValid())
-            return false;
-        QByteArray keys = (fromTypeId == QMetaType::QString)
-                ? static_cast<const QString *>(from)->toUtf8()
-                : *static_cast<const QByteArray *>(from);
-        value = en.keysToValue(keys.constData(), &ok);
+        if (en.isValid()) {
+            QByteArray keys = (fromTypeId == QMetaType::QString)
+                    ? static_cast<const QString *>(from)->toUtf8()
+                    : *static_cast<const QByteArray *>(from);
+            value = en.keysToValue(keys.constData(), &ok);
+        }
     }
 #endif
     if (!ok) {
diff --git a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
index fbd17f94b28..87b9e20770f 100644
--- a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
+++ b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp
@@ -4982,6 +4982,13 @@ template <auto value> static void testVariantEnum()
     QVERIFY(var2.convert(QMetaType::fromType<int>()));
     QCOMPARE(var2.value<int>(), static_cast<int>(value));
 
+    QVariant strVar = QString::number(qToUnderlying(value));
+    QVariant baVar = QByteArray::number(qToUnderlying(value));
+    QCOMPARE(strVar.value<Enum>(), value);
+    QCOMPARE(baVar.value<Enum>(), value);
+    QCOMPARE(var.value<QString>(), strVar);
+    QCOMPARE(var.value<QByteArray>(), baVar);
+
     // unary + to silence gcc warning
     if (losslessConvertToInt) {
         int intValue = static_cast<int>(value);