From eaedebb7f16991bed4ed827540fbded11c25bcc3 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Thu, 9 Feb 2017 15:54:29 +0100 Subject: [PATCH] Fix linkage on msvc2015 This does not link without this explicit compare function after the QLatin1Strings have been removed. Change-Id: I09cd323f850954eedefed6ee58597cb0ef3ab026 Reviewed-by: hjk --- src/plugins/valgrind/valgrindmemcheckparsertest.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/plugins/valgrind/valgrindmemcheckparsertest.cpp b/src/plugins/valgrind/valgrindmemcheckparsertest.cpp index 0ae276adf31..c38be539d17 100644 --- a/src/plugins/valgrind/valgrindmemcheckparsertest.cpp +++ b/src/plugins/valgrind/valgrindmemcheckparsertest.cpp @@ -56,6 +56,12 @@ inline bool qCompare(int const &t1, MemcheckErrorKind const &t2, return qCompare(t1, int(t2), actual, expected, file, line); } +inline bool qCompare(const QString &t1, char const *t2, + char const *actual, char const *expected, char const *file, int line) +{ + return qCompare(t1, QString::fromLatin1(t2), actual, expected, file, line); +} + } // namespace QTest QT_END_NAMESPACE