From 57ae1b15b61ac6e45ae6a37d943e600fcd47c388 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 16 Jul 2015 16:41:43 +0200 Subject: [PATCH] Testlib: Remove overload qCompare(bool, int, ...). It was added for NokiaX86 / RVCT compilers and may produce unexpected results with g++, where it matches for qCompare(int, enum). Task-number: QTBUG-47260 Change-Id: Ia29b9ae289c6df579a923aef6eb67e46db0b1120 Reviewed-by: Simon Hausmann Reviewed-by: Jason McDonald --- src/testlib/qtestcase.h | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/testlib/qtestcase.h b/src/testlib/qtestcase.h index 7d623a7cec..9b0af186bc 100644 --- a/src/testlib/qtestcase.h +++ b/src/testlib/qtestcase.h @@ -409,14 +409,6 @@ namespace QTest return compare_string_helper(t1, t2, actual, expected, file, line); } - // NokiaX86 and RVCT do not like implicitly comparing bool with int - inline bool qCompare(bool const &t1, int const &t2, - const char *actual, const char *expected, const char *file, int line) - { - return qCompare(int(t1), t2, actual, expected, file, line); - } - - template inline bool qTest(const T& actual, const char *elementName, const char *actualStr, const char *expected, const char *file, int line)