Merge "Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake" into wip/cmake

1 files changed, 7 insertions, 0 deletions

diff --git a/src/corelib/text/qstringview.h b/src/corelib/text/qstringview.h
index 0a82ac4201..4ab4d2570f 100644
--- a/src/corelib/text/qstringview.h
+++ b/src/corelib/text/qstringview.h
@@ -185,6 +185,13 @@ public:
     template <typename Char>
     Q_DECL_CONSTEXPR QStringView(const Char *str) noexcept;
 #else
+#if QT_DEPRECATED_SINCE(5, 14)
+    template <typename Array, if_compatible_array<Array> = true>
+    QT_DEPRECATED_VERSION_X_5_14(R"(Use u"~~~" or QStringView(u"~~~") instead of QStringViewLiteral("~~~"))")
+    Q_DECL_CONSTEXPR QStringView(const Array &str, QtPrivate::Deprecated_t) noexcept
+        : QStringView(str, lengthHelperArray(str)) {}
+#endif // QT_DEPRECATED_SINCE
+
     template <typename Array, if_compatible_array<Array> = true>
     Q_DECL_CONSTEXPR QStringView(const Array &str) noexcept
         : QStringView(str, lengthHelperArray(str)) {}