2 files changed, 27 insertions, 0 deletions
diff --git a/src/corelib/text/qstring.cpp b/src/corelib/text/qstring.cpp
index fcdf687b99..745b963260 100644
--- a/src/corelib/text/qstring.cpp
+++ b/src/corelib/text/qstring.cpp
@@ -2190,6 +2190,16 @@ inline char qToLower(char ch)
     \sa fromLatin1(), fromLocal8Bit(), fromUtf8()
 */
 
+/*! \fn QString::QString(const char8_t *str)
+
+    Constructs a string initialized with the UTF-8 string \a str. The
+    given const char8_t pointer is converted to Unicode using the
+    fromUtf8() function.
+
+    \since 6.1
+    \sa fromLatin1(), fromLocal8Bit(), fromUtf8()
+*/
+
 /*! \fn QString QString::fromStdString(const std::string &str)
 
     Returns a copy of the \a str string. The given string is converted
@@ -5327,6 +5337,14 @@ QString QString::fromLocal8Bit(QByteArrayView ba)
 */
 
 /*!
+    \fn QString QString::fromUtf8(const char8_t *str)
+    \overload
+    \since 6.1
+
+    This overload is only available when compiling in C++20 mode.
+*/
+
+/*!
     \fn QString QString::fromUtf8(const char8_t *str, qsizetype size)
     \overload
     \since 6.0
diff --git a/src/corelib/text/qstring.h b/src/corelib/text/qstring.h
index 8926f6f3af..153a9e0475 100644
--- a/src/corelib/text/qstring.h
+++ b/src/corelib/text/qstring.h
@@ -386,6 +386,12 @@ public:
     QString(QChar c);
     QString(qsizetype size, QChar c);
     inline QString(QLatin1String latin1);
+#if defined(__cpp_char8_t) || defined(Q_CLANG_QDOC)
+    Q_WEAK_OVERLOAD
+    inline QString(const char8_t *str)
+        : QString(fromUtf8(str))
+    {}
+#endif
     inline QString(const QString &) noexcept;
     inline ~QString();
     QString &operator=(QChar c);
@@ -747,6 +753,9 @@ public:
     }
 #if defined(__cpp_char8_t) || defined(Q_CLANG_QDOC)
     Q_WEAK_OVERLOAD
+    static inline QString fromUtf8(const char8_t *str)
+    { return fromUtf8(reinterpret_cast<const char *>(str)); }
+    Q_WEAK_OVERLOAD
     static inline QString fromUtf8(const char8_t *str, qsizetype size)
     { return fromUtf8(reinterpret_cast<const char *>(str), size); }
 #endif