diff --git a/tests/auto/debugger/dumpers.pro b/tests/auto/debugger/dumpers.pro index 92eb131535c3ad1d87c316638a2b46629df46b19..6226deaf23ef34e162c320208b1bc7b3ac436c8b 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 d2dd5931ab390447cbea363f875071311a717982..ba6555243011f957186714973156444a4339b3f5 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());