diff options
author | Jason McDonald <jason.mcdonald@nokia.com> | 2011-10-19 14:58:08 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-09 01:58:03 +0100 |
commit | aa84281b36f65746ed8804477ce3bf1f6d3c4890 (patch) | |
tree | 8e612b8d931ee5a6404fa820e80a18b362e420ba /tests/auto/qgeopositioninfosource | |
parent | 234d02b07c5603f20bcadeeebfae4c07892955a6 (diff) | |
download | qtlocation-aa84281b36f65746ed8804477ce3bf1f6d3c4890.tar.gz |
Remove SkipMode parameter from QSKIP.
The SkipMode parameter has been removed from the API in qtbase, so it
must be in all calls to QSKIP.
Task-number: QTBUG-21851, QTBUG-21652
Change-Id: I0aa6661b24614572c546b24c1019e0c7797da437
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/qgeopositioninfosource')
-rw-r--r-- | tests/auto/qgeopositioninfosource/testqgeopositioninfosource.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qgeopositioninfosource/testqgeopositioninfosource.cpp b/tests/auto/qgeopositioninfosource/testqgeopositioninfosource.cpp index cb24278b..cc35a2f3 100644 --- a/tests/auto/qgeopositioninfosource/testqgeopositioninfosource.cpp +++ b/tests/auto/qgeopositioninfosource/testqgeopositioninfosource.cpp @@ -68,7 +68,7 @@ Q_DECLARE_METATYPE(QGeoPositionInfo) #define CHECK_SOURCE_VALID { \ if (!m_source) { \ if (m_testingDefaultSource && QGeoPositionInfoSource::createDefaultSource(0) == 0) \ - QSKIP("No default position source on this system", SkipAll); \ + QSKIP("No default position source on this system"); \ else \ QFAIL("createTestSource() must return a valid source!"); \ } \ @@ -337,7 +337,7 @@ void TestQGeoPositionInfoSource::lastKnownPosition() = static_cast<QGeoPositionInfoSource::PositioningMethods>(positioningMethod); if ((m_source->supportedPositioningMethods() & method) == 0) - QSKIP("Not a supported positioning method for this position source", SkipSingle); + QSKIP("Not a supported positioning method for this position source"); m_source->setPreferredPositioningMethods(method); |