From e44f1dabe44f4979da5da7d5d50395883f3de684 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Thu, 20 Sep 2012 16:36:51 +0200 Subject: QTestLib: clean up qCompare specialisation/overload mix qCompare() was both overloaded and specialised, but always as a template. This lead to the QIcon specialisation actually invoking qCompare(QFlags, ...) when specifically asking for qCompare() (detected by adding underlying-type detection to QFlags). Fix by preferring overloading and not specialising anything. Change-Id: Ie001ebb9dfb0847c6c33a3f45177a61579fd61ee Reviewed-by: Olivier Goffart --- src/testlib/qtest.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/testlib/qtest.h') diff --git a/src/testlib/qtest.h b/src/testlib/qtest.h index 4aea51de27..09af3b2bad 100644 --- a/src/testlib/qtest.h +++ b/src/testlib/qtest.h @@ -173,13 +173,13 @@ template<> inline bool qCompare(QString const &t1, QLatin1String const &t2, const char *actual, const char *expected, const char *file, int line) { - return qCompare(t1, QString(t2), actual, expected, file, line); + return qCompare(t1, QString(t2), actual, expected, file, line); } template<> inline bool qCompare(QLatin1String const &t1, QString const &t2, const char *actual, const char *expected, const char *file, int line) { - return qCompare(QString(t1), t2, actual, expected, file, line); + return qCompare(QString(t1), t2, actual, expected, file, line); } template<> -- cgit v1.2.3