diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2013-10-22 14:37:37 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@digia.com> | 2013-10-22 14:38:06 +0200 |
| commit | 71dffcd319c2641e1022bf857f9c72671cb1446a (patch) | |
| tree | 84a7685d0c174a6c461c06aed60a2961a7d3f8fb /tests/auto/declarative_geoshape | |
| parent | 2867f1efc989478667ea7ae56ff91cd991d74121 (diff) | |
| parent | 654b01af941ec620ca8a9b98be8542dda862d4a8 (diff) | |
| download | qtlocation-71dffcd319c2641e1022bf857f9c72671cb1446a.tar.gz | |
Merge branch 'stable' into dev
Conflicts:
src/imports/location/qdeclarativegeomap.cpp
src/imports/location/qdeclarativegeoroute.cpp
src/imports/location/qdeclarativegeoroutemodel.cpp
src/imports/location/qdeclarativegeoroutesegment.cpp
src/imports/location/qdeclarativepolygonmapitem.cpp
src/imports/location/qdeclarativepolylinemapitem.cpp
src/imports/positioning/positioning.cpp
Change-Id: Ieaa5f567d2144d0267e7eef5bd75bde7e0079fbe
Diffstat (limited to 'tests/auto/declarative_geoshape')
| -rw-r--r-- | tests/auto/declarative_geoshape/tst_locationsingleton.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/declarative_geoshape/tst_locationsingleton.qml b/tests/auto/declarative_geoshape/tst_locationsingleton.qml index 58682721..37210cb1 100644 --- a/tests/auto/declarative_geoshape/tst_locationsingleton.qml +++ b/tests/auto/declarative_geoshape/tst_locationsingleton.qml @@ -41,7 +41,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtPositioning 5.0 +import QtPositioning 5.2 Item { id: testCase |