From dd195c9dac855739a6d6613be58f7a414437b870 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Wed, 16 Jan 2013 16:33:07 +0100 Subject: [PATCH] Debugger: Fix compilation of name demangler test. No more automatic QString <-> char* conversion. Change-Id: I236c119932f11e5c2515a68499451ada0fc4f6f3 Reviewed-by: Fawzi Mohamed --- tests/auto/debugger/tst_namedemangler.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/auto/debugger/tst_namedemangler.cpp b/tests/auto/debugger/tst_namedemangler.cpp index a29bf595071..94c9677c387 100644 --- a/tests/auto/debugger/tst_namedemangler.cpp +++ b/tests/auto/debugger/tst_namedemangler.cpp @@ -34,7 +34,7 @@ #define TEST_CORRECTLY_MANGLED_NAME(mangled, expectedDemangled) \ do { \ - QVERIFY2(demangler.demangle(mangled), qPrintable(demangler.errorString())); \ + QVERIFY2(demangler.demangle(QLatin1String(mangled)), qPrintable(demangler.errorString())); \ QCOMPARE(demangler.demangledName(), QLatin1String(expectedDemangled)); \ } while (0) @@ -58,7 +58,8 @@ private: void NameDemanglerAutoTest::testUnmangledName() { - QVERIFY(demangler.demangle("f") && demangler.demangledName() == "f"); + QVERIFY(demangler.demangle(QLatin1String("f")) + && demangler.demangledName() == QLatin1String("f")); } void NameDemanglerAutoTest::testCorrectlyMangledNames()