diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-08-12 15:16:17 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-08-19 19:04:34 +0200 |
| commit | 2df41e2c4876cb692bf575d9d0d1cc798e09237c (patch) | |
| tree | 877ddfe165b3ec1d73a0389cc18de97d9724c406 /src/corelib/text/qstring.h | |
| parent | cced8c900561684609203667c303884fef0ea758 (diff) | |
Remove binary compat sources for qbytearray and qstring
No longer needed in Qt6.
Change-Id: I29567e175e07cc3658f0619acfd604abf64f6459
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/text/qstring.h')
| -rw-r--r-- | src/corelib/text/qstring.h | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/src/corelib/text/qstring.h b/src/corelib/text/qstring.h index 6ad24b2b5f..57ac84f48f 100644 --- a/src/corelib/text/qstring.h +++ b/src/corelib/text/qstring.h @@ -475,14 +475,7 @@ public: Q_REQUIRED_RESULT QString leftJustified(qsizetype width, QChar fill = QLatin1Char(' '), bool trunc = false) const; Q_REQUIRED_RESULT QString rightJustified(qsizetype width, QChar fill = QLatin1Char(' '), bool trunc = false) const; -#if defined(Q_COMPILER_REF_QUALIFIERS) && !defined(QT_COMPILING_QSTRING_COMPAT_CPP) && !defined(Q_CLANG_QDOC) -# if defined(Q_CC_GNU) && !defined(Q_CC_CLANG) && !defined(Q_CC_INTEL) && !__has_cpp_attribute(nodiscard) - // required due to https://gcc.gnu.org/bugzilla/show_bug.cgi?id=61941 -# pragma push_macro("Q_REQUIRED_RESULT") -# undef Q_REQUIRED_RESULT -# define Q_REQUIRED_RESULT -# define Q_REQUIRED_RESULT_pushed -# endif +#if !defined(Q_CLANG_QDOC) Q_REQUIRED_RESULT QString toLower() const & { return toLower_helper(*this); } Q_REQUIRED_RESULT QString toLower() && @@ -503,9 +496,6 @@ public: { return simplified_helper(*this); } Q_REQUIRED_RESULT QString simplified() && { return simplified_helper(*this); } -# ifdef Q_REQUIRED_RESULT_pushed -# pragma pop_macro("Q_REQUIRED_RESULT") -# endif #else Q_REQUIRED_RESULT QString toLower() const; Q_REQUIRED_RESULT QString toUpper() const; |