diff options
author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2012-08-16 13:32:43 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-28 10:07:49 +0200 |
commit | 059388adce26be48868cd741b4c5d751298fb4d8 (patch) | |
tree | 1a8a41c0f280b7ab3c502b49527bd609d1c0884a /tests/auto/declarative_core/tst_placesearchmodel.qml | |
parent | 7dd46f8c96a4bdaca2809ff97b773f358392516f (diff) |
Convert GeoShape, GeoRectangle and GeoCircle into QML value types.v5.0.0-beta1
This replaces the GeoShape, GeoRectangle and GeoCircle QML elements with
value types. A value type is a better fit for shape types. It is very
similar to a rect with some utility functions.
Declare QGeoShape, QGeoRectangle and QGeoCircle as movable types.
Update documentation.
Change-Id: Id6c48e1e841c68f2f0c5c6a9c4a6580a57e2dfb6
Reviewed-by: abcd <amos.choy@nokia.com>
Diffstat (limited to 'tests/auto/declarative_core/tst_placesearchmodel.qml')
-rw-r--r-- | tests/auto/declarative_core/tst_placesearchmodel.qml | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/tests/auto/declarative_core/tst_placesearchmodel.qml b/tests/auto/declarative_core/tst_placesearchmodel.qml index 8ec3c0a2..aef710d9 100644 --- a/tests/auto/declarative_core/tst_placesearchmodel.qml +++ b/tests/auto/declarative_core/tst_placesearchmodel.qml @@ -66,17 +66,8 @@ TestCase { name: "foo" } - Plugin { - id: uninitializedPlugin - } - - GeoCircle { - id: testSearchArea - center { - latitude: 10 - longitude: 20 - } - radius: 5000 + Plugin { + id: uninitializedPlugin } Category { @@ -104,9 +95,11 @@ TestCase { } function test_setAndGet_data() { + var testSearchArea = QtLocation.circle(QtLocation.coordinate(10, 20), 5000); + return [ { tag: "plugin", property: "plugin", signal: "pluginChanged", value: testPlugin }, - { tag: "searchArea", property: "searchArea", signal: "searchAreaChanged", value: testSearchArea }, + { tag: "searchArea", property: "searchArea", signal: "searchAreaChanged", value: testSearchArea, reset: QtLocation.shape() }, { tag: "offset", property: "offset", signal: "offsetChanged", value: 10, reset: 0 }, { tag: "limit", property: "limit", signal: "limitChanged", value: 10, reset: -1 }, |