summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXizhi Zhu <xizhi.zhu@nokia.com>2011-08-29 13:55:09 +0300
committerQt by Nokia <qt-info@nokia.com>2011-08-29 13:01:48 +0200
commite233d8aa0710f8253e6ca2635cf6c9afa95757d2 (patch)
tree46770407ff4687072eea5eb01ea6edc89c96f510
parentf29bfda2e609f00fad46160495017168094eff7b (diff)
Fix build break introduced by changes in QTestLog.
The mode parameter of QTestLog::addSkip() has been removed, more details at: http://codereview.qt.nokia.com/3547 Change-Id: Id5428a506d177ae9d4480a522ee492672048dad7 Reviewed-on: http://codereview.qt.nokia.com/3735 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Xizhi Zhu <xizhi.zhu@nokia.com>
-rw-r--r--src/qmltest/quicktestresult.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qmltest/quicktestresult.cpp b/src/qmltest/quicktestresult.cpp
index 534c57e1c2..80c3f8b3d5 100644
--- a/src/qmltest/quicktestresult.cpp
+++ b/src/qmltest/quicktestresult.cpp
@@ -442,14 +442,14 @@ bool QuickTestResult::compare
void QuickTestResult::skipSingle
(const QString &message, const QString &file, int line)
{
- QTestResult::addSkip(message.toLatin1().constData(), QTest::SkipSingle,
+ QTestResult::addSkip(message.toLatin1().constData(),
qtest_fixFile(file).toLatin1().constData(), line);
}
void QuickTestResult::skipAll
(const QString &message, const QString &file, int line)
{
- QTestResult::addSkip(message.toLatin1().constData(), QTest::SkipAll,
+ QTestResult::addSkip(message.toLatin1().constData(),
qtest_fixFile(file).toLatin1().constData(), line);
QTestResult::setSkipCurrentTest(true);
}