From 2c84d4c9d6bb84239cca70f3a1452c37744d2506 Mon Sep 17 00:00:00 2001
From: Bill King <bill.king@nokia.com>
Date: Mon, 1 Nov 2010 13:58:04 +1000
Subject: [PATCH] tests: more autotest cleanup
---
tests/auto/debugger/dumpers.pro | 3 +++
tests/auto/utils_stringutils/tst_stringutils.cpp | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/tests/auto/debugger/dumpers.pro b/tests/auto/debugger/dumpers.pro
index 92eb131535c..6226deaf23e 100644
--- a/tests/auto/debugger/dumpers.pro
+++ b/tests/auto/debugger/dumpers.pro
@@ -12,4 +12,7 @@ SOURCES += \
DEFINES += MACROSDEBUG
+DEFINES -= QT_USE_FAST_CONCATENATION QT_USE_FAST_OPERATOR_PLUS
+DEFINES -= QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII
+
INCLUDEPATH += $$DEBUGGERDIR $$UTILSDIR $$MACROSDIR
diff --git a/tests/auto/utils_stringutils/tst_stringutils.cpp b/tests/auto/utils_stringutils/tst_stringutils.cpp
index d2dd5931ab3..ba655524301 100644
--- a/tests/auto/utils_stringutils/tst_stringutils.cpp
+++ b/tests/auto/utils_stringutils/tst_stringutils.cpp
@@ -62,7 +62,7 @@ void tst_StringUtils::testWithTildeHomePath()
QLatin1String("~/some/path/file.txt"));
// not sub of home path
QCOMPARE(Utils::withTildeHomePath(QDir::homePath() + QLatin1String("/../foo")),
- QDir::homePath() + QLatin1String("/../foo"));
+ QString(QDir::homePath() + QLatin1String("/../foo")));
#else
// windows: should return same as input
QCOMPARE(Utils::withTildeHomePath(QDir::homePath()), QDir::homePath());
--
GitLab