From eecacbfbfef0a911cfc47688b045958f2118ebad Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@digia.com>
Date: Mon, 26 Aug 2013 14:58:24 +0200
Subject: [PATCH] CPlusPlus: Some compile fixes for autotests.
Change-Id: Id2ced5e41686387e67a7bb8419fe1547b23779c7
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
---
tests/auto/cplusplus/checksymbols/tst_checksymbols.cpp | 2 ++
tests/auto/cplusplus/preprocessor/tst_preprocessor.cpp | 1 +
tests/auto/cplusplus/simplifytypes/tst_simplifytypestest.cpp | 4 ++--
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/tests/auto/cplusplus/checksymbols/tst_checksymbols.cpp b/tests/auto/cplusplus/checksymbols/tst_checksymbols.cpp
index 0b00c25adf1..60da31d6467 100644
--- a/tests/auto/cplusplus/checksymbols/tst_checksymbols.cpp
+++ b/tests/auto/cplusplus/checksymbols/tst_checksymbols.cpp
@@ -81,6 +81,7 @@ static QString useKindToString(UseKind useKind)
}
// The following two functions are "enhancements" for QCOMPARE().
+QT_BEGIN_NAMESPACE
namespace QTest {
template<>
@@ -96,6 +97,7 @@ char *toString(const Use &use)
}
} // namespace QTest
+QT_END_NAMESPACE
namespace {
diff --git a/tests/auto/cplusplus/preprocessor/tst_preprocessor.cpp b/tests/auto/cplusplus/preprocessor/tst_preprocessor.cpp
index 834a5790925..2594bc692f6 100644
--- a/tests/auto/cplusplus/preprocessor/tst_preprocessor.cpp
+++ b/tests/auto/cplusplus/preprocessor/tst_preprocessor.cpp
@@ -30,6 +30,7 @@
#include <cplusplus/pp.h>
#include <QtTest>
+#include <QFile>
#include <QHash>
//TESTED_COMPONENT=src/libs/cplusplus
diff --git a/tests/auto/cplusplus/simplifytypes/tst_simplifytypestest.cpp b/tests/auto/cplusplus/simplifytypes/tst_simplifytypestest.cpp
index 79f2f5ee84a..3ce2958bbcd 100644
--- a/tests/auto/cplusplus/simplifytypes/tst_simplifytypestest.cpp
+++ b/tests/auto/cplusplus/simplifytypes/tst_simplifytypestest.cpp
@@ -139,8 +139,8 @@ void SimplifyTypesTest::testCase1_data()
QTest::addColumn<QString>("expected");
const size_t count = sizeof(input)/sizeof(const char *);
for (size_t i = 0; i < count; i++ )
- QTest::newRow(description[i]) << QString::fromAscii(input[i])
- << QString::fromAscii(output[i]);
+ QTest::newRow(description[i]) << QString::fromLatin1(input[i])
+ << QString::fromLatin1(output[i]);
}
QTEST_APPLESS_MAIN(SimplifyTypesTest);
--
GitLab