tests: more autotest cleanup

diff --git a/tests/auto/debugger/dumpers.pro b/tests/auto/debugger/dumpers.pro
index 92eb131..6226dea 100644 (file)
--- 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 d2dd593..ba65552 100644 (file)
--- 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());