From dc5ea809634560e836d2847f42f66beb43db7924 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 10 Jan 2012 10:13:55 +0100 Subject: Tests: Remove duplicate QTRY_VERIFY/QTRY_COMPARE macros in bearer. Introduce QTRY_VERIFY_WITH_TIMEOUT and QTRY_COMPARE_WITH_TIMEOUT to be able to specify a timeout value. Reviewed-by: Jason McDonald Change-Id: Iaeaa4938eb14f2c431537055f626510cba183ce3 Reviewed-by: Friedemann Kleint --- dist/changes-5.0.0 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'dist') diff --git a/dist/changes-5.0.0 b/dist/changes-5.0.0 index c20d9a3075..03858e66eb 100644 --- a/dist/changes-5.0.0 +++ b/dist/changes-5.0.0 @@ -35,7 +35,7 @@ information about a particular change. - QCoreApplication::translate() will no longer return the source text when the translation is empty. Use lrelease -removeidentical for optimization. - + - Qt::escape() is deprecated (but can be enabled via QT_DISABLE_DEPRECATED_BEFORE), use QString::toHtmlEscaped() instead. @@ -44,7 +44,9 @@ information about a particular change. - QTestLib: * The QTRY_VERIFY and QTRY_COMPARE macros have been moved into QTestLib. These macros formerly lived in tests/shared/util.h but are now provided - by including the header. + by including the header. In addition, + QTRY_VERIFY_WITH_TIMEOUT and QTRY_COMPARE_WITH_TIMEOUT are provided, + allowing for specifying custom timeout values. * The QTEST_NOOP_MAIN macro has been removed from the API. If a test is known at compile-time to be inapplicable for a particular build it should be omitted via .pro file logic, or the test should call QSKIP in the -- cgit v1.2.3