diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-01-10 10:13:55 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-10 19:54:03 +0100 |
| commit | dc5ea809634560e836d2847f42f66beb43db7924 (patch) | |
| tree | 5a80b2e483451e19da23af36f706c95bc102416c /dist/changes-5.0.0 | |
| parent | 00d4b151123b5df415db9cd49d4683ac485cf1e7 (diff) | |
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 <jason.mcdonald@nokia.com>
Change-Id: Iaeaa4938eb14f2c431537055f626510cba183ce3
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'dist/changes-5.0.0')
| -rw-r--r-- | dist/changes-5.0.0 | 6 |
1 files changed, 4 insertions, 2 deletions
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 <QtTest/QtTest> header. + by including the <QtTest/QtTest> 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 |