summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/corelib/text/qstring.cpp10
-rw-r--r--src/corelib/text/qstring.h8
2 files changed, 18 insertions, 0 deletions
diff --git a/src/corelib/text/qstring.cpp b/src/corelib/text/qstring.cpp
index 5e3debcc34..61c6aa97f8 100644
--- a/src/corelib/text/qstring.cpp
+++ b/src/corelib/text/qstring.cpp
@@ -9098,6 +9098,16 @@ QString &QString::setRawData(const QChar *unicode, int size)
\sa latin1()
*/
+/*!
+ \fn QLatin1String::toString() const
+ \since 6.0
+
+ Converts this Latin-1 string into a QString. Equivalent to
+ \code
+ return QString(*this);
+ \endcode
+*/
+
/*! \fn const char *QLatin1String::latin1() const
Returns the Latin-1 string stored in this object.
diff --git a/src/corelib/text/qstring.h b/src/corelib/text/qstring.h
index efd57328bb..b94abdf21b 100644
--- a/src/corelib/text/qstring.h
+++ b/src/corelib/text/qstring.h
@@ -93,6 +93,8 @@ public:
Q_DECL_CONSTEXPR inline explicit QLatin1String(const char *s, int sz) noexcept : m_size(sz), m_data(s) {}
inline explicit QLatin1String(const QByteArray &s) noexcept : m_size(int(qstrnlen(s.constData(), s.size()))), m_data(s.constData()) {}
+ inline QString toString() const;
+
Q_DECL_CONSTEXPR const char *latin1() const noexcept { return m_data; }
Q_DECL_CONSTEXPR int size() const noexcept { return m_size; }
Q_DECL_CONSTEXPR const char *data() const noexcept { return m_data; }
@@ -1058,6 +1060,12 @@ public:
};
//
+// QLatin1String inline members that require QString:
+//
+
+QString QLatin1String::toString() const { return *this; }
+
+//
// QStringView inline members that require QString:
//
QString QStringView::toString() const