diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2020-05-12 10:59:20 +0200 |
|---|---|---|
| committer | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2020-05-13 03:53:16 +0200 |
| commit | 554ef6c39ca3863049de4988fe33f327e72dbe7e (patch) | |
| tree | ea955864fc5c8e5db0257fb8a313fe8e7d30ae62 /src | |
| parent | 688e5da4e71cb5262fcd689e9067070b312a6fc4 (diff) | |
Drop the deprecated QStringViewLiteral
Change-Id: I6e6643b4c7cbcd43c495c332de0d6874856b9528
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/text/qstringliteral.h | 4 | ||||
| -rw-r--r-- | src/corelib/text/qstringview.h | 7 |
2 files changed, 0 insertions, 11 deletions
diff --git a/src/corelib/text/qstringliteral.h b/src/corelib/text/qstringliteral.h index 913a8b0ee82..c3b274ca90f 100644 --- a/src/corelib/text/qstringliteral.h +++ b/src/corelib/text/qstringliteral.h @@ -76,10 +76,6 @@ Q_STATIC_ASSERT_X(sizeof(qunicodechar) == 2, }()) \ /**/ -#if QT_DEPRECATED_SINCE(5, 14) -# define QStringViewLiteral(str) QStringView(QT_UNICODE_LITERAL(str), QtPrivate::Deprecated) -#endif - using QStringPrivate = QArrayDataPointer<ushort>; QT_END_NAMESPACE diff --git a/src/corelib/text/qstringview.h b/src/corelib/text/qstringview.h index bc2c25f83d7..dc929902faf 100644 --- a/src/corelib/text/qstringview.h +++ b/src/corelib/text/qstringview.h @@ -202,13 +202,6 @@ 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)) {} |