From edb29be8ba282181bd64af0d2a316b3220a1f2ba Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Tue, 4 Apr 2017 13:51:30 +0200 Subject: QStringView: fix ambiguity between f(QString)/f(QStringView) with QString::null args ... by removing the QStringView(QString::Null) ctor. This means that QStringView(QString::null) will now fail to compile. That's ok, since we've deprecated QString::null in the last Qt version. This will also help pulling up the QStringView definition to before the QString one in qstring.h, something that we'll require for properly adding QStringView-append/prepend/insert to QString. Change-Id: I3c836732be1e185111b13950be9d8dcd935734ff Reviewed-by: Anton Kudryavtsev Reviewed-by: Lars Knoll --- src/corelib/tools/qstringview.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/corelib/tools/qstringview.h') diff --git a/src/corelib/tools/qstringview.h b/src/corelib/tools/qstringview.h index b07e98d0a2..0cfa9e1133 100644 --- a/src/corelib/tools/qstringview.h +++ b/src/corelib/tools/qstringview.h @@ -170,10 +170,6 @@ public: : m_size(0), m_data(nullptr) {} Q_DECL_CONSTEXPR QStringView(std::nullptr_t) Q_DECL_NOTHROW : QStringView() {} -#if QT_DEPRECATED_SINCE(5, 9) - Q_DECL_CONSTEXPR QStringView(QString::Null) Q_DECL_NOTHROW - : QStringView() {} -#endif template = true> Q_DECL_CONSTEXPR QStringView(const Char *str, qssize_t len) -- cgit v1.2.3