From 42c083cd5ad80bf2bf2e73926bfb5b03a0955980 Mon Sep 17 00:00:00 2001
From: Bill King <bill.king@nokia.com>
Date: Thu, 4 Nov 2010 10:06:06 +1000
Subject: [PATCH] tests: fixes compile
---
.../utils_stringutils/tst_stringutils.cpp | 36 +++++++++----------
.../utils_stringutils/utils_stringutils.pro | 2 ++
2 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/tests/auto/utils_stringutils/tst_stringutils.cpp b/tests/auto/utils_stringutils/tst_stringutils.cpp
index ba655524301..1b83459761c 100644
--- a/tests/auto/utils_stringutils/tst_stringutils.cpp
+++ b/tests/auto/utils_stringutils/tst_stringutils.cpp
@@ -46,30 +46,30 @@ void tst_StringUtils::testWithTildeHomePath()
{
#ifndef Q_OS_WIN
// home path itself
- QCOMPARE(Utils::withTildeHomePath(QDir::homePath()), QLatin1String("~"));
+ QCOMPARE(Utils::withTildeHomePath(QDir::homePath()), QString::fromLatin1("~"));
QCOMPARE(Utils::withTildeHomePath(QDir::homePath() + QLatin1Char('/')),
- QLatin1String("~"));
- QCOMPARE(Utils::withTildeHomePath(QLatin1String("/unclean/..") + QDir::homePath()),
- QLatin1String("~"));
+ QString::fromLatin1("~"));
+ QCOMPARE(Utils::withTildeHomePath(QString::fromLatin1("/unclean/..") + QDir::homePath()),
+ QString::fromLatin1("~"));
// sub of home path
- QCOMPARE(Utils::withTildeHomePath(QDir::homePath() + QLatin1String("/foo")),
- QLatin1String("~/foo"));
- QCOMPARE(Utils::withTildeHomePath(QDir::homePath() + QLatin1String("/foo/")),
- QLatin1String("~/foo"));
- QCOMPARE(Utils::withTildeHomePath(QDir::homePath() + QLatin1String("/some/path/file.txt")),
- QLatin1String("~/some/path/file.txt"));
- QCOMPARE(Utils::withTildeHomePath(QDir::homePath() + QLatin1String("/some/unclean/../path/file.txt")),
- QLatin1String("~/some/path/file.txt"));
+ QCOMPARE(Utils::withTildeHomePath(QDir::homePath() + QString::fromLatin1("/foo")),
+ QString::fromLatin1("~/foo"));
+ QCOMPARE(Utils::withTildeHomePath(QDir::homePath() + QString::fromLatin1("/foo/")),
+ QString::fromLatin1("~/foo"));
+ QCOMPARE(Utils::withTildeHomePath(QDir::homePath() + QString::fromLatin1("/some/path/file.txt")),
+ QString::fromLatin1("~/some/path/file.txt"));
+ QCOMPARE(Utils::withTildeHomePath(QDir::homePath() + QString::fromLatin1("/some/unclean/../path/file.txt")),
+ QString::fromLatin1("~/some/path/file.txt"));
// not sub of home path
- QCOMPARE(Utils::withTildeHomePath(QDir::homePath() + QLatin1String("/../foo")),
- QString(QDir::homePath() + QLatin1String("/../foo")));
+ QCOMPARE(Utils::withTildeHomePath(QDir::homePath() + QString::fromLatin1("/../foo")),
+ QString(QDir::homePath() + QString::fromLatin1("/../foo")));
#else
// windows: should return same as input
QCOMPARE(Utils::withTildeHomePath(QDir::homePath()), QDir::homePath());
- QCOMPARE(Utils::withTildeHomePath(QDir::homePath() + QLatin1String("/foo")),
- QDir::homePath() + QLatin1String("/foo"));
- QCOMPARE(Utils::withTildeHomePath(QDir::homePath() + QLatin1String("/../foo")),
- Utils::withTildeHomePath(QDir::homePath() + QLatin1String("/../foo")));
+ QCOMPARE(Utils::withTildeHomePath(QDir::homePath() + QString::fromLatin1("/foo")),
+ QDir::homePath() + QString::fromLatin1("/foo"));
+ QCOMPARE(Utils::withTildeHomePath(QDir::homePath() + QString::fromLatin1("/../foo")),
+ Utils::withTildeHomePath(QDir::homePath() + QString::fromLatin1("/../foo")));
#endif
}
diff --git a/tests/auto/utils_stringutils/utils_stringutils.pro b/tests/auto/utils_stringutils/utils_stringutils.pro
index d31b014dc21..41a576f5da5 100644
--- a/tests/auto/utils_stringutils/utils_stringutils.pro
+++ b/tests/auto/utils_stringutils/utils_stringutils.pro
@@ -3,6 +3,8 @@ DEFINES += QTCREATOR_UTILS_LIB
UTILS_PATH = ../../../src/libs/utils
+DEFINES -= QT_USE_FAST_OPERATOR_PLUS QT_USE_FAST_CONCATENATION
+
INCLUDEPATH += $$UTILS_PATH
# Input
SOURCES += tst_stringutils.cpp \
--
GitLab