summaryrefslogtreecommitdiffstats
path: root/tests/auto/qmake/testcompiler.cpp
diff options
context:
space:
mode:
authorKeith Isdale <keith.isdale@nokia.com>2009-08-28 02:58:18 (GMT)
committerKeith Isdale <keith.isdale@nokia.com>2009-08-28 02:58:18 (GMT)
commit008d0c69c16b80af6c8c59b8c3a9b6de0238f6d4 (patch)
treeb02dde12fea3d5d09bbdde00b716077d2edcb0d6 /tests/auto/qmake/testcompiler.cpp
parente9274b6cb9bbc71cf9aa7614190e0d3a242fef29 (diff)
downloadQt-008d0c69c16b80af6c8c59b8c3a9b6de0238f6d4.zip
Qt-008d0c69c16b80af6c8c59b8c3a9b6de0238f6d4.tar.gz
Qt-008d0c69c16b80af6c8c59b8c3a9b6de0238f6d4.tar.bz2
Add an autotest for qmake's include function
qmake's include function has been changed in 4.6.x and later to warn,by default, if the specified file does not exist. It is possible to ignore missing .pri files, eg include(SomeOptionalFile.pri, "", true); Reviewed-by: Rohan McGovern
Diffstat (limited to 'tests/auto/qmake/testcompiler.cpp')
-rw-r--r--tests/auto/qmake/testcompiler.cpp14
1 files changed, 14 insertions, 0 deletions
diff --git a/tests/auto/qmake/testcompiler.cpp b/tests/auto/qmake/testcompiler.cpp
index 8d7c9d2..4e1d9ba 100644
--- a/tests/auto/qmake/testcompiler.cpp
+++ b/tests/auto/qmake/testcompiler.cpp
@@ -261,3 +261,17 @@ bool TestCompiler::removeMakefile( const QString &workPath )
else
return true;
}
+
+QString TestCompiler::commandOutput() const
+{
+#ifndef Q_OS_WIN
+ return testOutput_.join("\n");
+#else
+ return testOutput_.join("\r\n");
+#endif
+}
+
+void TestCompiler::clearCommandOutput()
+{
+ testOutput_.clear();
+}