From a7ae92e67dd15b0dde25c8bca2b1e16c983896bf Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Wed, 6 Apr 2016 13:57:19 +0200 Subject: QStringRef: add missing relational operators against QByteArray QStringRef op QByteArray was ambiguous between bool QStringRef::operator op(const char*) const bool operator op(const QStringRef&, const QString&) QByteArray op QStringRef was ambiguous between bool operator op(const QString&, const QStringRef&) bool operator op(const char*, const QStringRef&) Fix by providing more overloads. [ChangeLog][QtCore] Disambiguated the relational operators comparing QByteArray with QStringRef (and vice versa). Change-Id: I1cfa9ecfdd8b4102e652593faf35f6098289bc34 Reviewed-by: Edward Welbourne Reviewed-by: Lars Knoll --- tests/auto/corelib/tools/qstringapisymmetry/tst_qstringapisymmetry.cpp | 3 --- 1 file changed, 3 deletions(-) (limited to 'tests/auto/corelib/tools/qstringapisymmetry') diff --git a/tests/auto/corelib/tools/qstringapisymmetry/tst_qstringapisymmetry.cpp b/tests/auto/corelib/tools/qstringapisymmetry/tst_qstringapisymmetry.cpp index 5fd484ab03..7305a00d94 100644 --- a/tests/auto/corelib/tools/qstringapisymmetry/tst_qstringapisymmetry.cpp +++ b/tests/auto/corelib/tools/qstringapisymmetry/tst_qstringapisymmetry.cpp @@ -58,9 +58,6 @@ QString toQString(const QStringRef &ref) { return ref.toString(); } MAKE_RELOP(>=, A1, A2) \ /*end*/ -MAKE_ALL(QStringRef, QByteArray) -MAKE_ALL(QByteArray, QStringRef) - MAKE_ALL(QByteArray, QChar) MAKE_ALL(QByteArray, QLatin1String) -- cgit v1.2.3