diff options
| author | Sona Kurazyan <sona.kurazyan@qt.io> | 2020-08-25 13:41:25 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-08-26 09:09:05 +0000 |
| commit | 90c084884ea008fa0c37f55e900fbfa0b12bfd02 (patch) | |
| tree | aad969965a51fd8c8d7741b9eaff864cf8b6228a /tests | |
| parent | d8c5fab0d9421b0f0c43286d4518308786203fdc (diff) | |
Un-deprecate QByteArray's relational operators taking QString
QString still has the overloads of relational operators taking
QByteArray. Un-deprecate QByteArray's relational operators taking
QString for symmetry. See also the comments of
d7ccd8cb4565c8643b158891c9de3187c1586dc9 for more details.
Change-Id: If3f59376b389fe4cbc2bd649a748bb78378a530c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit d8ee1f6385b4dfeb57cb466b6c5f6bcfd3a90dfb)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/corelib/text/qstringapisymmetry/tst_qstringapisymmetry.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tests/auto/corelib/text/qstringapisymmetry/tst_qstringapisymmetry.cpp b/tests/auto/corelib/text/qstringapisymmetry/tst_qstringapisymmetry.cpp index 63d6635130..35546c2968 100644 --- a/tests/auto/corelib/text/qstringapisymmetry/tst_qstringapisymmetry.cpp +++ b/tests/auto/corelib/text/qstringapisymmetry/tst_qstringapisymmetry.cpp @@ -232,9 +232,7 @@ private Q_SLOTS: void compare_QByteArray_QStringRef_data() { compare_data(); } void compare_QByteArray_QStringRef() { compare_impl<QByteArray, QStringRef>(); } void compare_QByteArray_QString_data() { compare_data(); } -#if QT_DEPRECATED_SINCE(5, 15) void compare_QByteArray_QString() { compare_impl<QByteArray, QString>(); } -#endif void compare_QByteArray_QLatin1String_data() { compare_data(); } void compare_QByteArray_QLatin1String() { compare_impl<QByteArray, QLatin1String>(); } void compare_QByteArray_QByteArray_data() { compare_data(); } |