summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRohan McGovern <rohan.mcgovern@nokia.com>2010-02-16 07:02:37 (GMT)
committerRohan McGovern <rohan.mcgovern@nokia.com>2010-02-17 06:16:22 (GMT)
commit87613a0fb5149b934642c455cf8cae6a373598e3 (patch)
treeabddce20fce43efabd86c91c630151a70a4828d2
parentcc583fef7b9839be7173e039a1162541449e18c2 (diff)
downloadQt-87613a0fb5149b934642c455cf8cae6a373598e3.zip
Qt-87613a0fb5149b934642c455cf8cae6a373598e3.tar.gz
Qt-87613a0fb5149b934642c455cf8cae6a373598e3.tar.bz2
Fixed compile of compilerwarnings test with vcproj generator.
Rename the test C++ file from `test.cpp' to `test_cpp.txt'. When named `test.cpp', the build system will attempt to build it, which we don't want.
-rw-r--r--tests/auto/compilerwarnings/compilerwarnings.qrc2
-rw-r--r--tests/auto/compilerwarnings/test_cpp.txt (renamed from tests/auto/compilerwarnings/test.cpp)0
-rw-r--r--tests/auto/compilerwarnings/tst_compilerwarnings.cpp4
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/compilerwarnings/compilerwarnings.qrc b/tests/auto/compilerwarnings/compilerwarnings.qrc
index 40fa8f1..3fa313c 100644
--- a/tests/auto/compilerwarnings/compilerwarnings.qrc
+++ b/tests/auto/compilerwarnings/compilerwarnings.qrc
@@ -1,5 +1,5 @@
<!DOCTYPE RCC><RCC version="1.0">
<qresource>
- <file>test.cpp</file>
+ <file>test_cpp.txt</file>
</qresource>
</RCC>
diff --git a/tests/auto/compilerwarnings/test.cpp b/tests/auto/compilerwarnings/test_cpp.txt
index 62b35eb..62b35eb 100644
--- a/tests/auto/compilerwarnings/test.cpp
+++ b/tests/auto/compilerwarnings/test_cpp.txt
diff --git a/tests/auto/compilerwarnings/tst_compilerwarnings.cpp b/tests/auto/compilerwarnings/tst_compilerwarnings.cpp
index 27624e9..f910a18 100644
--- a/tests/auto/compilerwarnings/tst_compilerwarnings.cpp
+++ b/tests/auto/compilerwarnings/tst_compilerwarnings.cpp
@@ -148,7 +148,7 @@ void tst_CompilerWarnings::warnings()
if (tmpSourceFile.isEmpty()) {
tmpQSourceFile.open(QIODevice::ReadWrite | QIODevice::Truncate);
tmpSourceFile = tmpQSourceFile.fileName();
- QFile cppSource(":/test.cpp");
+ QFile cppSource(":/test_cpp.txt");
bool openResult = cppSource.open(QIODevice::ReadOnly);
if (openResult)
{
@@ -158,7 +158,7 @@ void tst_CompilerWarnings::warnings()
}
}
tmpQSourceFile.close();
- QVERIFY2(openResult, "Need resource temporary \"test.cpp\"");
+ QVERIFY2(openResult, "Need resource temporary \"test_cpp.txt\"");
QStringList args;
QString compilerName;