2 files changed, 13 insertions, 5 deletions
diff --git a/src/corelib/serialization/qcborarray.h b/src/corelib/serialization/qcborarray.h
index ae6b8c09d7..ed0f4912ba 100644
--- a/src/corelib/serialization/qcborarray.h
+++ b/src/corelib/serialization/qcborarray.h
@@ -185,7 +185,7 @@ public:
     QCborValue at(qsizetype i) const;
     QCborValue first() const { return at(0); }
     QCborValue last() const { return at(size() - 1); }
-    QCborValue operator[](qsizetype i) const { return at(i); }
+    const QCborValue operator[](qsizetype i) const { return at(i); }
     QCborValueRef first() { Q_ASSERT(!isEmpty()); return begin()[0]; }
     QCborValueRef last() { Q_ASSERT(!isEmpty()); return begin()[size() - 1]; }
     QCborValueRef operator[](qsizetype i)
diff --git a/src/corelib/serialization/qcbormap.h b/src/corelib/serialization/qcbormap.h
index 45ef430e40..3eb2107691 100644
--- a/src/corelib/serialization/qcbormap.h
+++ b/src/corelib/serialization/qcbormap.h
@@ -195,14 +195,22 @@ public:
     { const_iterator it = find(key); return it == end() ? QCborValue() : it.value(); }
     QCborValue value(const QCborValue &key) const
     { const_iterator it = find(key); return it == end() ? QCborValue() : it.value(); }
-    QCborValue operator[](qint64 key) const
+#if !defined(QT_NO_CAST_FROM_ASCII) && !defined(QT_RESTRICTED_CAST_FROM_ASCII)
+    template<size_t N> QT_ASCII_CAST_WARN const QCborValue value(const char (&key)[N]) const
+    { return value(QString::fromUtf8(key, N - 1)); }
+#endif
+    const QCborValue operator[](qint64 key) const
     { const_iterator it = find(key); return it == end() ? QCborValue() : it.value(); }
-    QCborValue operator[](QLatin1String key) const
+    const QCborValue operator[](QLatin1String key) const
     { const_iterator it = find(key); return it == end() ? QCborValue() : it.value(); }
-    QCborValue operator[](const QString & key) const
+    const QCborValue operator[](const QString & key) const
     { const_iterator it = find(key); return it == end() ? QCborValue() : it.value(); }
-    QCborValue operator[](const QCborValue &key) const
+    const QCborValue operator[](const QCborValue &key) const
     { const_iterator it = find(key); return it == end() ? QCborValue() : it.value(); }
+#if !defined(QT_NO_CAST_FROM_ASCII) && !defined(QT_RESTRICTED_CAST_FROM_ASCII)
+    template<size_t N> QT_ASCII_CAST_WARN const QCborValue operator[](const char (&key)[N]) const
+    { return operator[](QString::fromUtf8(key, N - 1)); }
+#endif
     QCborValueRef operator[](qint64 key);
     QCborValueRef operator[](QLatin1String key);
     QCborValueRef operator[](const QString & key);