diff options
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/auto.pro | 4 | ||||
| -rw-r--r-- | tests/auto/declarative_geoshape/tst_locationsingleton.qml | 4 | ||||
| -rw-r--r-- | tests/auto/nokia_services/routing/tst_routing.cpp | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 2b04d110..390e9135 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -93,9 +93,7 @@ SUBDIRS += \ qgeolocation \ qgeopositioninfo \ qgeosatelliteinfo \ - qgeosatelliteinfosource \ - qgeojson \ - qnmeapositioninfosource + qgeojson !android: SUBDIRS += \ positionplugin \ diff --git a/tests/auto/declarative_geoshape/tst_locationsingleton.qml b/tests/auto/declarative_geoshape/tst_locationsingleton.qml index 096a72e9..b58eedfd 100644 --- a/tests/auto/declarative_geoshape/tst_locationsingleton.qml +++ b/tests/auto/declarative_geoshape/tst_locationsingleton.qml @@ -222,11 +222,11 @@ Item { polygon = QtPositioning.shapeToPolygon(QtPositioning.circle()) verify(!polygon.isValid) polygon = QtPositioning.shapeToPolygon(QtPositioning.circle(tl, 10000)) - verify(!polygon.isValid) + verify(polygon.isValid) // fixed, polygon copy constructor can now initialize from a circle. polygon = QtPositioning.shapeToPolygon(QtPositioning.rectangle()) verify(!polygon.isValid) polygon = QtPositioning.shapeToPolygon(QtPositioning.rectangle(tl, br)) - verify(!polygon.isValid) + verify(polygon.isValid) // fixed, polygon copy constructor can now initialize from a rectangle. polygon = QtPositioning.shapeToPolygon(QtPositioning.polygon()) verify(!polygon.isValid) diff --git a/tests/auto/nokia_services/routing/tst_routing.cpp b/tests/auto/nokia_services/routing/tst_routing.cpp index 833c95af..fdfdfe0a 100644 --- a/tests/auto/nokia_services/routing/tst_routing.cpp +++ b/tests/auto/nokia_services/routing/tst_routing.cpp @@ -103,7 +103,7 @@ void MockGeoNetworkReply::setFile(QFile* file) void MockGeoNetworkReply::complete() { if (error() != QNetworkReply::NoError) - emit error(error()); + emit errorOccurred(error()); setFinished(true); emit finished(); } |