From 554ef6c39ca3863049de4988fe33f327e72dbe7e Mon Sep 17 00:00:00 2001 From: Giuseppe D'Angelo Date: Tue, 12 May 2020 10:59:20 +0200 Subject: [PATCH] Drop the deprecated QStringViewLiteral Change-Id: I6e6643b4c7cbcd43c495c332de0d6874856b9528 Reviewed-by: Marc Mutz --- src/corelib/text/qstringliteral.h | 4 ---- src/corelib/text/qstringview.h | 7 ------- 2 files changed, 11 deletions(-) diff --git a/src/corelib/text/qstringliteral.h b/src/corelib/text/qstringliteral.h index 913a8b0ee8..c3b274ca90 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; QT_END_NAMESPACE diff --git a/src/corelib/text/qstringview.h b/src/corelib/text/qstringview.h index bc2c25f83d..dc929902fa 100644 --- a/src/corelib/text/qstringview.h +++ b/src/corelib/text/qstringview.h @@ -202,13 +202,6 @@ public: template Q_DECL_CONSTEXPR QStringView(const Char *str) noexcept; #else -#if QT_DEPRECATED_SINCE(5, 14) - template = 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 = true> Q_DECL_CONSTEXPR QStringView(const Array &str) noexcept : QStringView(str, lengthHelperArray(str)) {}