diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-01-13 10:32:44 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-16 02:12:26 +0100 |
| commit | d0c1282837ee8810fcf230151457159a076c0d8d (patch) | |
| tree | 673dd960f4e0ad44fcb862e4a861c0207d4d3fb4 /tests/auto/qgeocoordinate | |
| parent | ab8202129baecc46b69aef9b5fc237a4508aa383 (diff) | |
| download | qtlocation-d0c1282837ee8810fcf230151457159a076c0d8d.tar.gz | |
Use QTRY_COMPARE/VERIFY_WITH_TIMEOUT from QTestLib.
Change-Id: Ibe1648fabd96b8be5a64e4b6ee917fe60d69ec8a
Reviewed-by: Alex Wilson <alex.wilson@nokia.com>
Diffstat (limited to 'tests/auto/qgeocoordinate')
| -rw-r--r-- | tests/auto/qgeocoordinate/qlocationtestutils_p.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/auto/qgeocoordinate/qlocationtestutils_p.h b/tests/auto/qgeocoordinate/qlocationtestutils_p.h index 28a73884..c4d18d24 100644 --- a/tests/auto/qgeocoordinate/qlocationtestutils_p.h +++ b/tests/auto/qgeocoordinate/qlocationtestutils_p.h @@ -45,6 +45,8 @@ #include <QString> #include <QTest> +#if !defined(QTRY_COMPARE_WITH_TIMEOUT) // Now provided by QTestLib. #fixme: Remove entirely. + #define QTRY_COMPARE_WITH_TIMEOUT(a,e,t) \ for (int _i = 0; _i < t; _i += 100) { \ if ((a) >= (e)) break; \ @@ -71,6 +73,7 @@ } } \ QCOMPARE(a, e) +#endif // !defined(QTRY_COMPARE_WITH_TIMEOUT) class QLocationTestUtils { |