From 5180186da2644c06c339083a10aab36ed11cf273 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Tue, 10 Jan 2012 15:19:47 +1000 Subject: Update copyright year in Nokia copyright headers. Update copyright headers from before 2011, and a couple of new ones that were merged after the previous change to copyright headers. Change-Id: Ia76e08e2734afa4ef3f1207dbcda5ff3bc81b366 Reviewed-by: Rohan McGovern --- src/qmltest/quicktestresult.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/qmltest/quicktestresult.cpp') diff --git a/src/qmltest/quicktestresult.cpp b/src/qmltest/quicktestresult.cpp index 27bb4d6053..7310eae418 100644 --- a/src/qmltest/quicktestresult.cpp +++ b/src/qmltest/quicktestresult.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -- cgit v1.2.3 From e6b224aa2872d7d1030fa98bd30603e16f8f9604 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Fri, 20 Jan 2012 14:04:27 +1000 Subject: Update obsolete contact address. Replace Nokia contact email address with Qt Project website. Change-Id: I6a730abc0c396fb545a48b2d6938abedac2e3f1c Reviewed-by: Rohan McGovern Reviewed-by: Alan Alpert --- src/qmltest/quicktestresult.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/qmltest/quicktestresult.cpp') diff --git a/src/qmltest/quicktestresult.cpp b/src/qmltest/quicktestresult.cpp index 7310eae418..2232a0b34a 100644 --- a/src/qmltest/quicktestresult.cpp +++ b/src/qmltest/quicktestresult.cpp @@ -2,7 +2,7 @@ ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the test suite of the Qt Toolkit. ** -- cgit v1.2.3 From c730c089fd8ef686127a929a9b96970b032c5300 Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Fri, 13 Jan 2012 13:13:35 +1000 Subject: Avoid using QTestResult::ignoreMessage(). QTestResult::ignoreMessage() is just a wrapper around QTestLog::ignoreMessage(). Both are private API, so just call the latter directly so that the former can be removed from the API. Change-Id: Icf77e2bf656afc556205ddf0dda5bb48fdbdfbbf Reviewed-by: Rohan McGovern --- src/qmltest/quicktestresult.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/qmltest/quicktestresult.cpp') diff --git a/src/qmltest/quicktestresult.cpp b/src/qmltest/quicktestresult.cpp index 2232a0b34a..af2324b3ad 100644 --- a/src/qmltest/quicktestresult.cpp +++ b/src/qmltest/quicktestresult.cpp @@ -437,7 +437,7 @@ void QuickTestResult::warn(const QString &message, const QUrl &location, int lin void QuickTestResult::ignoreWarning(const QString &message) { - QTestResult::ignoreMessage(QtWarningMsg, message.toLatin1().constData()); + QTestLog::ignoreMessage(QtWarningMsg, message.toLatin1().constData()); } void QuickTestResult::wait(int ms) -- cgit v1.2.3 From c185988013f670813adef1bc53e51e69bfc0783d Mon Sep 17 00:00:00 2001 From: Jason McDonald Date: Mon, 16 Jan 2012 15:36:00 +1000 Subject: Call new pass/fail/skip count function in QTestLog. The passCount, failCount and skipCount functions have moved from QTestResult to QTestLog. Change-Id: I0dbf8b43521f81dc29e20bb7547ff9f213487007 Reviewed-by: Rohan McGovern --- src/qmltest/quicktestresult.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/qmltest/quicktestresult.cpp') diff --git a/src/qmltest/quicktestresult.cpp b/src/qmltest/quicktestresult.cpp index af2324b3ad..a1fd7ba464 100644 --- a/src/qmltest/quicktestresult.cpp +++ b/src/qmltest/quicktestresult.cpp @@ -256,7 +256,7 @@ void QuickTestResult::setSkipped(bool skip) */ int QuickTestResult::passCount() const { - return QTestResult::passCount(); + return QTestLog::passCount(); } /*! @@ -268,7 +268,7 @@ int QuickTestResult::passCount() const */ int QuickTestResult::failCount() const { - return QTestResult::failCount(); + return QTestLog::failCount(); } /*! @@ -280,7 +280,7 @@ int QuickTestResult::failCount() const */ int QuickTestResult::skipCount() const { - return QTestResult::skipCount(); + return QTestLog::skipCount(); } /*! @@ -582,7 +582,7 @@ int QuickTestResult::exitCode() #else // make sure our exit code is never going above 127 // since that could wrap and indicate 0 test fails - return qMin(QTestResult::failCount(), 127); + return qMin(QTestLog::failCount(), 127); #endif } -- cgit v1.2.3