diff options
| author | Alex Blasche <alexander.blasche@theqtcompany.com> | 2016-05-26 13:25:02 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@theqtcompany.com> | 2016-05-26 13:25:02 +0200 |
| commit | 4a5e6d6e8b816ac2dd8c673feb56a0af096a4a18 (patch) | |
| tree | 64db1f3d677ee225ed6c919355882cc7a88497a7 | |
| parent | d1b708cde9428928b9f5c59c099f2deb584efd5f (diff) | |
| parent | 55414e7ff710b5ca43f248d0609a15fc6cbe24ff (diff) | |
| download | qtlocation-4a5e6d6e8b816ac2dd8c673feb56a0af096a4a18.tar.gz | |
Merge branch '5.6' into 5.7
Change-Id: If8d408079ba6cceffd516c0ed95a21a2ca1ca2a0
| -rw-r--r-- | .qmake.conf | 3 | ||||
| -rw-r--r-- | tests/auto/declarative_geoshape/tst_locationsingleton.qml | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/.qmake.conf b/.qmake.conf index 33a2710f..a2a0d418 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,4 +1,3 @@ load(qt_build_config) -CONFIG += qt_example_installs -MODULE_VERSION = 5.7.0 +MODULE_VERSION = 5.7.1 diff --git a/tests/auto/declarative_geoshape/tst_locationsingleton.qml b/tests/auto/declarative_geoshape/tst_locationsingleton.qml index 4b0a55ae..e38e4ec7 100644 --- a/tests/auto/declarative_geoshape/tst_locationsingleton.qml +++ b/tests/auto/declarative_geoshape/tst_locationsingleton.qml @@ -204,7 +204,7 @@ Item { function test_path_operations() { compare(mapPolyline.path[1].latitude, -27) compare(mapPolyline.path[1].longitude, 154.1) - compare(mapPolyline.coordinateAt(1), QtPositioning.coordinate(27, 154.1)) + compare(mapPolyline.coordinateAt(1), QtPositioning.coordinate(-27, 154.1)) compare(mapPolyline.path.length, mapPolyline.pathLength()) mapPolyline.removeCoordinate(1); |