diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-08 03:07:36 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-08 03:07:36 +0100 |
| commit | 4cfed13377ababcfaa7dacb055bcd3dd0f2cf7d4 (patch) | |
| tree | ad28212aacfd9b127c7e46fba13ab0431b66e288 /tests | |
| parent | c91ad6b13417a1a77e092ede6dee6f40cee6d535 (diff) | |
| parent | 614d67be158e3ef8443c1b7f3126303cfcf4becc (diff) | |
| download | qtlocation-4cfed13377ababcfaa7dacb055bcd3dd0f2cf7d4.tar.gz | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: If5c3274ecf7e19b55ca54db21405d2908d8b14ae
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/declarative_geoshape/tst_locationsingleton.qml | 4 |
1 files changed, 2 insertions, 2 deletions
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) |