From acdb40b607607330b236027c80b466f5cbffed93 Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Wed, 23 Sep 2015 08:32:55 +0200 Subject: Bump all QtLocation 5.5 tags to 5.6 5.5 was a tech preview release. The real release is 5.6. Some 5.5 interfaces did change. It is possible that there are apps in existence which are based on the 5.5 API's. To avoid miscommunication we bump all version tags to the real first release version. The existing 5.5 QML imports will continue to work but apps may encounter API changes when they move from 5.5 to 5.6. The API changes are listed in the QtLocation documentation. Change-Id: Ia7000e871a5ee6b09234e5d58d4fc8927e93b154 Reviewed-by: Laszlo Agocs --- examples/location/mapviewer/forms/RouteAddress.qml | 2 +- examples/location/mapviewer/map/CircleItem.qml | 2 +- examples/location/mapviewer/map/ImageItem.qml | 2 +- examples/location/mapviewer/map/MapComponent.qml | 2 +- examples/location/mapviewer/map/Marker.qml | 2 +- examples/location/mapviewer/map/MiniMap.qml | 2 +- examples/location/mapviewer/map/PolygonItem.qml | 2 +- examples/location/mapviewer/map/PolylineItem.qml | 2 +- examples/location/mapviewer/map/RectangleItem.qml | 2 +- examples/location/mapviewer/mapviewer.qml | 2 +- examples/location/mapviewer/menus/MainMenu.qml | 2 +- examples/location/places/forms/SearchOptions.qml | 2 +- examples/location/places/items/MainMenu.qml | 2 +- examples/location/places/items/MapComponent.qml | 2 +- examples/location/places/places.qml | 2 +- examples/location/places/views/CategoryDelegate.qml | 2 +- examples/location/places/views/CategoryView.qml | 2 +- examples/location/places/views/EditorialDelegate.qml | 2 +- examples/location/places/views/EditorialPage.qml | 2 +- examples/location/places/views/EditorialView.qml | 2 +- examples/location/places/views/ImageView.qml | 2 +- examples/location/places/views/ReviewDelegate.qml | 2 +- examples/location/places/views/ReviewPage.qml | 2 +- examples/location/places/views/ReviewView.qml | 2 +- examples/location/places/views/SearchResultDelegate.qml | 2 +- examples/location/places/views/SearchResultView.qml | 2 +- examples/location/places_list/places_list.qml | 2 +- examples/location/places_map/places_map.qml | 2 +- examples/location/planespotter/Plane.qml | 2 +- examples/location/planespotter/planespotter.qml | 2 +- src/imports/location/qdeclarativegeomap.cpp | 2 +- src/location/doc/snippets/declarative/maps.qml | 2 +- src/location/doc/snippets/declarative/places.qml | 2 +- src/location/doc/snippets/declarative/routing.qml | 2 +- src/location/doc/src/qtlocation.qdoc | 2 +- src/location/maps/qgeocameracapabilities.cpp | 2 +- src/location/maps/qgeocodereply.cpp | 2 +- src/location/maps/qgeocodingmanager.cpp | 2 +- src/location/maps/qgeocodingmanagerengine.cpp | 2 +- src/location/maps/qgeomaneuver.cpp | 2 +- src/location/maps/qgeomappingmanager.cpp | 2 +- src/location/maps/qgeomappingmanagerengine.cpp | 2 +- src/location/maps/qgeoroute.cpp | 2 +- src/location/maps/qgeoroutereply.cpp | 2 +- src/location/maps/qgeorouterequest.cpp | 2 +- src/location/maps/qgeoroutesegment.cpp | 2 +- src/location/maps/qgeoroutingmanager.cpp | 2 +- src/location/maps/qgeoroutingmanagerengine.cpp | 2 +- src/location/maps/qgeoserviceprovider.cpp | 2 +- src/location/maps/qgeoserviceproviderfactory.cpp | 2 +- src/location/maps/qgeotiledmapreply.cpp | 2 +- src/location/places/qplace.cpp | 2 +- src/location/places/qplaceattribute.cpp | 2 +- src/location/places/qplacecategory.cpp | 2 +- src/location/places/qplacecontent.cpp | 2 +- src/location/places/qplacecontentreply.cpp | 2 +- src/location/places/qplacecontentrequest.cpp | 2 +- src/location/places/qplacedetailsreply.cpp | 2 +- src/location/places/qplaceeditorial.cpp | 2 +- src/location/places/qplaceicon.cpp | 2 +- src/location/places/qplaceidreply.cpp | 2 +- src/location/places/qplaceimage.cpp | 2 +- src/location/places/qplacemanager.cpp | 2 +- src/location/places/qplacemanagerengine.cpp | 2 +- src/location/places/qplacematchreply.cpp | 2 +- src/location/places/qplacematchrequest.cpp | 2 +- src/location/places/qplaceratings.cpp | 2 +- src/location/places/qplacereply.cpp | 2 +- src/location/places/qplaceresult.cpp | 2 +- src/location/places/qplacereview.cpp | 2 +- src/location/places/qplacesearchreply.cpp | 2 +- src/location/places/qplacesearchrequest.cpp | 2 +- src/location/places/qplacesearchresult.cpp | 2 +- src/location/places/qplacesearchsuggestionreply.cpp | 2 +- src/location/places/qplacesupplier.cpp | 2 +- src/location/places/qplaceuser.cpp | 2 +- tests/auto/declarative_ui/tst_map.qml | 2 +- tests/auto/declarative_ui/tst_map_coordinateanimation.qml | 2 +- tests/auto/declarative_ui/tst_map_error.qml | 2 +- tests/auto/declarative_ui/tst_map_flick.qml | 2 +- tests/auto/declarative_ui/tst_map_item.qml | 2 +- tests/auto/declarative_ui/tst_map_item_details.qml | 2 +- tests/auto/declarative_ui/tst_map_item_fit_viewport.qml | 2 +- tests/auto/declarative_ui/tst_map_itemview.qml | 2 +- tests/auto/declarative_ui/tst_map_keepgrab.qml | 2 +- tests/auto/declarative_ui/tst_map_maptype.qml | 2 +- tests/auto/declarative_ui/tst_map_mouse.qml | 2 +- tests/auto/qmlinterface/data/TestPlace.qml | 2 +- 88 files changed, 88 insertions(+), 88 deletions(-) diff --git a/examples/location/mapviewer/forms/RouteAddress.qml b/examples/location/mapviewer/forms/RouteAddress.qml index 09bc80bb..248396d9 100644 --- a/examples/location/mapviewer/forms/RouteAddress.qml +++ b/examples/location/mapviewer/forms/RouteAddress.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.5 -import QtLocation 5.5 +import QtLocation 5.6 import QtPositioning 5.5 RouteAddressForm { diff --git a/examples/location/mapviewer/map/CircleItem.qml b/examples/location/mapviewer/map/CircleItem.qml index 3f663149..3b32ba51 100644 --- a/examples/location/mapviewer/map/CircleItem.qml +++ b/examples/location/mapviewer/map/CircleItem.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.5 -import QtLocation 5.5 +import QtLocation 5.6 //TODO: remove/refactor me when items are integrated diff --git a/examples/location/mapviewer/map/ImageItem.qml b/examples/location/mapviewer/map/ImageItem.qml index 27456ed9..3bf4dfe2 100644 --- a/examples/location/mapviewer/map/ImageItem.qml +++ b/examples/location/mapviewer/map/ImageItem.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.5; -import QtLocation 5.5 +import QtLocation 5.6 MapQuickItem { //to be used inside MapComponent only id: imageItem diff --git a/examples/location/mapviewer/map/MapComponent.qml b/examples/location/mapviewer/map/MapComponent.qml index 0857804b..ece4798b 100644 --- a/examples/location/mapviewer/map/MapComponent.qml +++ b/examples/location/mapviewer/map/MapComponent.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.5 import QtQuick.Controls 1.4 -import QtLocation 5.5 +import QtLocation 5.6 import QtPositioning 5.5 import "../helper.js" as Helper diff --git a/examples/location/mapviewer/map/Marker.qml b/examples/location/mapviewer/map/Marker.qml index a8851a4c..3c0ed170 100644 --- a/examples/location/mapviewer/map/Marker.qml +++ b/examples/location/mapviewer/map/Marker.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.5; -import QtLocation 5.5 +import QtLocation 5.6 //! [mqi-top] MapQuickItem { diff --git a/examples/location/mapviewer/map/MiniMap.qml b/examples/location/mapviewer/map/MiniMap.qml index 29a6a880..3ab9a572 100644 --- a/examples/location/mapviewer/map/MiniMap.qml +++ b/examples/location/mapviewer/map/MiniMap.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.5 -import QtLocation 5.5 +import QtLocation 5.6 Rectangle{ id: miniMapRect diff --git a/examples/location/mapviewer/map/PolygonItem.qml b/examples/location/mapviewer/map/PolygonItem.qml index b28ff22c..cab4e6c0 100644 --- a/examples/location/mapviewer/map/PolygonItem.qml +++ b/examples/location/mapviewer/map/PolygonItem.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.5 -import QtLocation 5.5 +import QtLocation 5.6 //TODO: remove me when items are integrated diff --git a/examples/location/mapviewer/map/PolylineItem.qml b/examples/location/mapviewer/map/PolylineItem.qml index 4861e5af..c27d8b7a 100644 --- a/examples/location/mapviewer/map/PolylineItem.qml +++ b/examples/location/mapviewer/map/PolylineItem.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.5 -import QtLocation 5.5 +import QtLocation 5.6 //TODO: remove/refactor me when items are integrated diff --git a/examples/location/mapviewer/map/RectangleItem.qml b/examples/location/mapviewer/map/RectangleItem.qml index 57b0a483..8369c903 100644 --- a/examples/location/mapviewer/map/RectangleItem.qml +++ b/examples/location/mapviewer/map/RectangleItem.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.5 -import QtLocation 5.5 +import QtLocation 5.6 MapRectangle { id: mapRectangle diff --git a/examples/location/mapviewer/mapviewer.qml b/examples/location/mapviewer/mapviewer.qml index adcd3fe8..bcc2c919 100644 --- a/examples/location/mapviewer/mapviewer.qml +++ b/examples/location/mapviewer/mapviewer.qml @@ -40,7 +40,7 @@ import QtQuick 2.5 import QtQuick.Controls 1.4 -import QtLocation 5.5 +import QtLocation 5.6 import QtPositioning 5.5 import "map" import "menus" diff --git a/examples/location/mapviewer/menus/MainMenu.qml b/examples/location/mapviewer/menus/MainMenu.qml index 2d402bd0..3dc3e9fb 100644 --- a/examples/location/mapviewer/menus/MainMenu.qml +++ b/examples/location/mapviewer/menus/MainMenu.qml @@ -40,7 +40,7 @@ import QtQuick 2.5 import QtQuick.Controls 1.4 -import QtLocation 5.5 +import QtLocation 5.6 MenuBar { property variant providerMenu: providerMenu diff --git a/examples/location/places/forms/SearchOptions.qml b/examples/location/places/forms/SearchOptions.qml index 80309f0a..44115398 100644 --- a/examples/location/places/forms/SearchOptions.qml +++ b/examples/location/places/forms/SearchOptions.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.5 -import QtLocation 5.5 +import QtLocation 5.6 import QtPositioning 5.5 SearchOptionsForm { diff --git a/examples/location/places/items/MainMenu.qml b/examples/location/places/items/MainMenu.qml index 1437d3c3..9785c183 100644 --- a/examples/location/places/items/MainMenu.qml +++ b/examples/location/places/items/MainMenu.qml @@ -40,7 +40,7 @@ import QtQuick 2.5 import QtQuick.Controls 1.4 -import QtLocation 5.5 +import QtLocation 5.6 MenuBar { property variant providerMenu: providerMenu diff --git a/examples/location/places/items/MapComponent.qml b/examples/location/places/items/MapComponent.qml index de4e04a7..0be555db 100644 --- a/examples/location/places/items/MapComponent.qml +++ b/examples/location/places/items/MapComponent.qml @@ -41,7 +41,7 @@ import QtQuick 2.5 import QtQuick.Controls 1.4 import QtPositioning 5.5 -import QtLocation 5.5 +import QtLocation 5.6 import "../helper.js" as Helper Map { diff --git a/examples/location/places/places.qml b/examples/location/places/places.qml index 5598fdc7..0141fbb7 100644 --- a/examples/location/places/places.qml +++ b/examples/location/places/places.qml @@ -42,7 +42,7 @@ import QtQuick 2.5 import QtQuick.Controls 1.4 import QtQuick.Layouts 1.2 import QtPositioning 5.5 -import QtLocation 5.5 +import QtLocation 5.6 import "items" ApplicationWindow { diff --git a/examples/location/places/views/CategoryDelegate.qml b/examples/location/places/views/CategoryDelegate.qml index 75f7060e..d4562d46 100644 --- a/examples/location/places/views/CategoryDelegate.qml +++ b/examples/location/places/views/CategoryDelegate.qml @@ -40,7 +40,7 @@ import QtQuick 2.5 import QtQuick.Controls 1.4 -import QtLocation 5.5 +import QtLocation 5.6 Item { id: root diff --git a/examples/location/places/views/CategoryView.qml b/examples/location/places/views/CategoryView.qml index b17f3e79..3cb83c73 100644 --- a/examples/location/places/views/CategoryView.qml +++ b/examples/location/places/views/CategoryView.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.5 -import QtLocation 5.5 +import QtLocation 5.6 import QtQml.Models 2.1 diff --git a/examples/location/places/views/EditorialDelegate.qml b/examples/location/places/views/EditorialDelegate.qml index 7d55e02b..82e544a1 100644 --- a/examples/location/places/views/EditorialDelegate.qml +++ b/examples/location/places/views/EditorialDelegate.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.5 -import QtLocation 5.5 +import QtLocation 5.6 import QtQuick.Controls 1.4 Item { diff --git a/examples/location/places/views/EditorialPage.qml b/examples/location/places/views/EditorialPage.qml index 42864ef3..caf0b7af 100644 --- a/examples/location/places/views/EditorialPage.qml +++ b/examples/location/places/views/EditorialPage.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.5 -import QtLocation 5.5 +import QtLocation 5.6 import QtQuick.Controls 1.4 import QtQuick.Layouts 1.2 diff --git a/examples/location/places/views/EditorialView.qml b/examples/location/places/views/EditorialView.qml index e7b580ef..05d45239 100644 --- a/examples/location/places/views/EditorialView.qml +++ b/examples/location/places/views/EditorialView.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.5 -import QtLocation 5.5 +import QtLocation 5.6 //! [PlaceEditorialModel view] ListView { diff --git a/examples/location/places/views/ImageView.qml b/examples/location/places/views/ImageView.qml index a82a9d1d..a4495dab 100644 --- a/examples/location/places/views/ImageView.qml +++ b/examples/location/places/views/ImageView.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.5 -import QtLocation 5.5 +import QtLocation 5.6 import QtQuick.Controls 1.4 Item { diff --git a/examples/location/places/views/ReviewDelegate.qml b/examples/location/places/views/ReviewDelegate.qml index 97991254..7f2ba64f 100644 --- a/examples/location/places/views/ReviewDelegate.qml +++ b/examples/location/places/views/ReviewDelegate.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.5 -import QtLocation 5.5 +import QtLocation 5.6 import QtQuick.Controls 1.4 Item { diff --git a/examples/location/places/views/ReviewPage.qml b/examples/location/places/views/ReviewPage.qml index 2fdf3523..d3ccf73b 100644 --- a/examples/location/places/views/ReviewPage.qml +++ b/examples/location/places/views/ReviewPage.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.5 -import QtLocation 5.5 +import QtLocation 5.6 import QtQuick.Controls 1.4 import QtQuick.Layouts 1.2 diff --git a/examples/location/places/views/ReviewView.qml b/examples/location/places/views/ReviewView.qml index 095f0947..eb8727b4 100644 --- a/examples/location/places/views/ReviewView.qml +++ b/examples/location/places/views/ReviewView.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.5 -import QtLocation 5.5 +import QtLocation 5.6 //! [ReviewModel delegate] ListView { diff --git a/examples/location/places/views/SearchResultDelegate.qml b/examples/location/places/views/SearchResultDelegate.qml index 5d6cb45c..a4ef9af9 100644 --- a/examples/location/places/views/SearchResultDelegate.qml +++ b/examples/location/places/views/SearchResultDelegate.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.5 -import QtLocation 5.5 +import QtLocation 5.6 import QtQuick.Controls 1.4 import QtQuick.Layouts 1.2 import "../helper.js" as Helper diff --git a/examples/location/places/views/SearchResultView.qml b/examples/location/places/views/SearchResultView.qml index c5151f30..1c2ee17c 100644 --- a/examples/location/places/views/SearchResultView.qml +++ b/examples/location/places/views/SearchResultView.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.5 -import QtLocation 5.5 +import QtLocation 5.6 import QtQuick.Controls 1.4 import QtQuick.Layouts 1.2 diff --git a/examples/location/places_list/places_list.qml b/examples/location/places_list/places_list.qml index 791d0aaf..cb5633ab 100644 --- a/examples/location/places_list/places_list.qml +++ b/examples/location/places_list/places_list.qml @@ -41,7 +41,7 @@ //! [Imports] import QtQuick 2.0 import QtPositioning 5.5 -import QtLocation 5.5 +import QtLocation 5.6 //! [Imports] Rectangle { diff --git a/examples/location/places_map/places_map.qml b/examples/location/places_map/places_map.qml index 7ff3706a..e7d20e7b 100644 --- a/examples/location/places_map/places_map.qml +++ b/examples/location/places_map/places_map.qml @@ -41,7 +41,7 @@ //! [Imports] import QtQuick 2.0 import QtPositioning 5.5 -import QtLocation 5.5 +import QtLocation 5.6 //! [Imports] Rectangle { diff --git a/examples/location/planespotter/Plane.qml b/examples/location/planespotter/Plane.qml index 8037f153..eec5a237 100644 --- a/examples/location/planespotter/Plane.qml +++ b/examples/location/planespotter/Plane.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.4 -import QtLocation 5.5 +import QtLocation 5.6 //! [PlaneMapQuick1] // Plane.qml diff --git a/examples/location/planespotter/planespotter.qml b/examples/location/planespotter/planespotter.qml index 91d9e056..624a015e 100644 --- a/examples/location/planespotter/planespotter.qml +++ b/examples/location/planespotter/planespotter.qml @@ -41,7 +41,7 @@ import QtQuick 2.4 import QtQuick.Window 2.2 import QtPositioning 5.5 -import QtLocation 5.5 +import QtLocation 5.6 Window { width: 700 diff --git a/src/imports/location/qdeclarativegeomap.cpp b/src/imports/location/qdeclarativegeomap.cpp index 87023708..e290487e 100644 --- a/src/imports/location/qdeclarativegeomap.cpp +++ b/src/imports/location/qdeclarativegeomap.cpp @@ -704,7 +704,7 @@ QGeoCoordinate QDeclarativeGeoMap::center() const This property does not provide any change notifications. - \since 5.5 + \since 5.6 */ void QDeclarativeGeoMap::setVisibleRegion(const QGeoShape &shape) { diff --git a/src/location/doc/snippets/declarative/maps.qml b/src/location/doc/snippets/declarative/maps.qml index 59e92c45..3378ee06 100644 --- a/src/location/doc/snippets/declarative/maps.qml +++ b/src/location/doc/snippets/declarative/maps.qml @@ -43,7 +43,7 @@ import QtQuick 2.0 //! [QtQuick import] //! [QtLocation import] import QtPositioning 5.5 -import QtLocation 5.5 +import QtLocation 5.6 //! [QtLocation import] Item { diff --git a/src/location/doc/snippets/declarative/places.qml b/src/location/doc/snippets/declarative/places.qml index a0081bd9..7dab804c 100644 --- a/src/location/doc/snippets/declarative/places.qml +++ b/src/location/doc/snippets/declarative/places.qml @@ -42,7 +42,7 @@ import QtQuick 2.0 //! [QtQuick import] import QtPositioning 5.5 -import QtLocation 5.5 +import QtLocation 5.6 Item { width: 400; height: 400; diff --git a/src/location/doc/snippets/declarative/routing.qml b/src/location/doc/snippets/declarative/routing.qml index 75d18c5b..643722bf 100644 --- a/src/location/doc/snippets/declarative/routing.qml +++ b/src/location/doc/snippets/declarative/routing.qml @@ -42,7 +42,7 @@ import QtQuick 2.3 //! [QtQuick import] import QtPositioning 5.5 -import QtLocation 5.5 +import QtLocation 5.6 Item { width: 1000 diff --git a/src/location/doc/src/qtlocation.qdoc b/src/location/doc/src/qtlocation.qdoc index 975f840d..7979bbe5 100644 --- a/src/location/doc/src/qtlocation.qdoc +++ b/src/location/doc/src/qtlocation.qdoc @@ -85,7 +85,7 @@ To load the Qt Location module, add the following statement to your .qml files \code import QtPositioning 5.5 - import QtLocation 5.5 + import QtLocation 5.6 \endcode The QtLocation QML module depends on the QtPositioning QML module. diff --git a/src/location/maps/qgeocameracapabilities.cpp b/src/location/maps/qgeocameracapabilities.cpp index 41f71b97..7b4a014a 100644 --- a/src/location/maps/qgeocameracapabilities.cpp +++ b/src/location/maps/qgeocameracapabilities.cpp @@ -107,7 +107,7 @@ QGeoCameraCapabilitiesPrivate &QGeoCameraCapabilitiesPrivate::operator = (const \class QGeoCameraCapabilities \inmodule QtLocation \ingroup QtLocation-impl - \since 5.5 + \since 5.6 \internal \brief The QGeoCameraCapabilities class describes the limitations on camera settings imposed by a mapping plugin. diff --git a/src/location/maps/qgeocodereply.cpp b/src/location/maps/qgeocodereply.cpp index 7ed18b17..47018217 100644 --- a/src/location/maps/qgeocodereply.cpp +++ b/src/location/maps/qgeocodereply.cpp @@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE \class QGeoCodeReply \inmodule QtLocation \ingroup QtLocation-geocoding - \since 5.5 + \since 5.6 \brief The QGeoCodeReply class manages an operation started by an instance of QGeoCodingManager. diff --git a/src/location/maps/qgeocodingmanager.cpp b/src/location/maps/qgeocodingmanager.cpp index 284adde3..70c5de82 100644 --- a/src/location/maps/qgeocodingmanager.cpp +++ b/src/location/maps/qgeocodingmanager.cpp @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE \class QGeoCodingManager \inmodule QtLocation \ingroup QtLocation-geocoding - \since 5.5 + \since 5.6 \brief The QGeoCodingManager class provides support for geocoding operations. diff --git a/src/location/maps/qgeocodingmanagerengine.cpp b/src/location/maps/qgeocodingmanagerengine.cpp index 97d0f75d..b163d173 100644 --- a/src/location/maps/qgeocodingmanagerengine.cpp +++ b/src/location/maps/qgeocodingmanagerengine.cpp @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE \class QGeoCodingManagerEngine \inmodule QtLocation \ingroup QtLocation-impl - \since 5.5 + \since 5.6 \brief The QGeoCodingManagerEngine class provides an interface and convenience methods to implementers of QGeoServiceProvider plugins who want diff --git a/src/location/maps/qgeomaneuver.cpp b/src/location/maps/qgeomaneuver.cpp index 679390ed..f38cb293 100644 --- a/src/location/maps/qgeomaneuver.cpp +++ b/src/location/maps/qgeomaneuver.cpp @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE \class QGeoManeuver \inmodule QtLocation \ingroup QtLocation-routing - \since 5.5 + \since 5.6 \brief The QGeoManeuver class represents the information relevant to the point at which two QGeoRouteSegments meet. diff --git a/src/location/maps/qgeomappingmanager.cpp b/src/location/maps/qgeomappingmanager.cpp index d009bbdd..681e68a7 100644 --- a/src/location/maps/qgeomappingmanager.cpp +++ b/src/location/maps/qgeomappingmanager.cpp @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE \class QGeoMappingManager \inmodule QtLocation \ingroup QtLocation-maps - \since 5.5 + \since 5.6 \internal \brief The QGeoMappingManager class provides support for displaying diff --git a/src/location/maps/qgeomappingmanagerengine.cpp b/src/location/maps/qgeomappingmanagerengine.cpp index 9129e69b..70b1e836 100644 --- a/src/location/maps/qgeomappingmanagerengine.cpp +++ b/src/location/maps/qgeomappingmanagerengine.cpp @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE \class QGeoMappingManagerEngine \inmodule QtLocation \ingroup QtLocation-impl - \since 5.5 + \since 5.6 \internal \brief Provides support functionality for map display with QGeoServiceProvider. diff --git a/src/location/maps/qgeoroute.cpp b/src/location/maps/qgeoroute.cpp index 2406ee86..52fa4a5e 100644 --- a/src/location/maps/qgeoroute.cpp +++ b/src/location/maps/qgeoroute.cpp @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE \class QGeoRoute \inmodule QtLocation \ingroup QtLocation-routing - \since 5.5 + \since 5.6 \brief The QGeoRoute class represents a route between two points. diff --git a/src/location/maps/qgeoroutereply.cpp b/src/location/maps/qgeoroutereply.cpp index 99b4f2f3..ab869d3c 100644 --- a/src/location/maps/qgeoroutereply.cpp +++ b/src/location/maps/qgeoroutereply.cpp @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE \class QGeoRouteReply \inmodule QtLocation \ingroup QtLocation-routing - \since 5.5 + \since 5.6 \brief The QGeoRouteReply class manages an operation started by an instance of QGeoRoutingManager. diff --git a/src/location/maps/qgeorouterequest.cpp b/src/location/maps/qgeorouterequest.cpp index e01cbe46..369606ea 100644 --- a/src/location/maps/qgeorouterequest.cpp +++ b/src/location/maps/qgeorouterequest.cpp @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE \class QGeoRouteRequest \inmodule QtLocation \ingroup QtLocation-routing - \since 5.5 + \since 5.6 \brief The QGeoRouteRequest class represents the parameters and restrictions which define a request for routing information. diff --git a/src/location/maps/qgeoroutesegment.cpp b/src/location/maps/qgeoroutesegment.cpp index bee136eb..45c2cc69 100644 --- a/src/location/maps/qgeoroutesegment.cpp +++ b/src/location/maps/qgeoroutesegment.cpp @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE \class QGeoRouteSegment \inmodule QtLocation \ingroup QtLocation-routing - \since 5.5 + \since 5.6 \brief The QGeoRouteSegment class represents a segment of a route. diff --git a/src/location/maps/qgeoroutingmanager.cpp b/src/location/maps/qgeoroutingmanager.cpp index 18e6fa04..8eca6719 100644 --- a/src/location/maps/qgeoroutingmanager.cpp +++ b/src/location/maps/qgeoroutingmanager.cpp @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE \class QGeoRoutingManager \inmodule QtLocation \ingroup QtLocation-routing - \since 5.5 + \since 5.6 \brief The QGeoRoutingManager class provides support for geographic routing operations. diff --git a/src/location/maps/qgeoroutingmanagerengine.cpp b/src/location/maps/qgeoroutingmanagerengine.cpp index e59f89b2..9c552682 100644 --- a/src/location/maps/qgeoroutingmanagerengine.cpp +++ b/src/location/maps/qgeoroutingmanagerengine.cpp @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE \class QGeoRoutingManagerEngine \inmodule QtLocation \ingroup QtLocation-impl - \since 5.5 + \since 5.6 \brief The QGeoRoutingManagerEngine class provides an interface and convenience methods to implementers of QGeoServiceProvider plugins who want diff --git a/src/location/maps/qgeoserviceprovider.cpp b/src/location/maps/qgeoserviceprovider.cpp index 4056662c..b1b9cb86 100644 --- a/src/location/maps/qgeoserviceprovider.cpp +++ b/src/location/maps/qgeoserviceprovider.cpp @@ -75,7 +75,7 @@ Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader, \class QGeoServiceProvider \inmodule QtLocation \ingroup QtLocation-common - \since 5.5 + \since 5.6 \brief The QGeoServiceProvider class aggregates access to services which provide geographical information. diff --git a/src/location/maps/qgeoserviceproviderfactory.cpp b/src/location/maps/qgeoserviceproviderfactory.cpp index 4a1a46fd..7efc8a9f 100644 --- a/src/location/maps/qgeoserviceproviderfactory.cpp +++ b/src/location/maps/qgeoserviceproviderfactory.cpp @@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE \class QGeoServiceProviderFactory \inmodule QtLocation \ingroup QtLocation-impl - \since 5.5 + \since 5.6 \brief The QGeoServiceProviderFactory class is a factory class used as the plugin interface for services related to geographical information. diff --git a/src/location/maps/qgeotiledmapreply.cpp b/src/location/maps/qgeotiledmapreply.cpp index abbebc4b..f2dfd9eb 100644 --- a/src/location/maps/qgeotiledmapreply.cpp +++ b/src/location/maps/qgeotiledmapreply.cpp @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE \class QGeoTiledMapReply \inmodule QtLocation \ingroup QtLocation-impl - \since 5.5 + \since 5.6 \internal \brief The QGeoTiledMapReply class manages a tile fetch operation started diff --git a/src/location/places/qplace.cpp b/src/location/places/qplace.cpp index c3e99eab..82f9f641 100644 --- a/src/location/places/qplace.cpp +++ b/src/location/places/qplace.cpp @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE \inmodule QtLocation \ingroup QtLocation-places \ingroup QtLocation-places-data - \since 5.5 + \since 5.6 \brief The QPlace class represents a set of data about a place. diff --git a/src/location/places/qplaceattribute.cpp b/src/location/places/qplaceattribute.cpp index e2546f3c..e7812a78 100644 --- a/src/location/places/qplaceattribute.cpp +++ b/src/location/places/qplaceattribute.cpp @@ -69,7 +69,7 @@ bool QPlaceAttributePrivate::isEmpty() const \inmodule QtLocation \ingroup QtLocation-places \ingroup QtLocation-places-data - \since 5.5 + \since 5.6 \brief The QPlaceAttribute class represents generic attribute information about a place. diff --git a/src/location/places/qplacecategory.cpp b/src/location/places/qplacecategory.cpp index 408eacca..5629631a 100644 --- a/src/location/places/qplacecategory.cpp +++ b/src/location/places/qplacecategory.cpp @@ -78,7 +78,7 @@ bool QPlaceCategoryPrivate::isEmpty() const \inmodule QtLocation \ingroup QtLocation-places \ingroup QtLocation-places-data - \since 5.5 + \since 5.6 \brief The QPlaceCategory class represents a category that a \l QPlace can be associated with. diff --git a/src/location/places/qplacecontent.cpp b/src/location/places/qplacecontent.cpp index 88f0e898..a3334c6a 100644 --- a/src/location/places/qplacecontent.cpp +++ b/src/location/places/qplacecontent.cpp @@ -68,7 +68,7 @@ bool QPlaceContentPrivate::compare(const QPlaceContentPrivate *other) const \inmodule QtLocation \ingroup QtLocation-places \ingroup QtLocation-places-data - \since 5.5 + \since 5.6 \brief The QPlaceContent class serves as the base class for rich content types. diff --git a/src/location/places/qplacecontentreply.cpp b/src/location/places/qplacecontentreply.cpp index df02d094..f6030198 100644 --- a/src/location/places/qplacecontentreply.cpp +++ b/src/location/places/qplacecontentreply.cpp @@ -61,7 +61,7 @@ QT_USE_NAMESPACE \inmodule QtLocation \ingroup QtLocation-places \ingroup QtLocation-places-replies - \since 5.5 + \since 5.6 \brief The QPlaceContentReply class manages a content retrieval operation started by an instance of QPlaceManager. diff --git a/src/location/places/qplacecontentrequest.cpp b/src/location/places/qplacecontentrequest.cpp index 8ab14774..5a211ae9 100644 --- a/src/location/places/qplacecontentrequest.cpp +++ b/src/location/places/qplacecontentrequest.cpp @@ -72,7 +72,7 @@ void QPlaceContentRequestPrivate::clear() \inmodule QtLocation \ingroup QtLocation-places \ingroup QtLocation-places-requests - \since 5.5 + \since 5.6 \brief The QPlaceContentRequest class represents the parameters of a content request. diff --git a/src/location/places/qplacedetailsreply.cpp b/src/location/places/qplacedetailsreply.cpp index 11ad191f..84ea9f84 100644 --- a/src/location/places/qplacedetailsreply.cpp +++ b/src/location/places/qplacedetailsreply.cpp @@ -55,7 +55,7 @@ QT_USE_NAMESPACE \inmodule QtLocation \ingroup QtLocation-places \ingroup QtLocation-places-replies - \since 5.5 + \since 5.6 \brief The QPlaceDetailsReply class manages a place details fetch operation started by an instance of QPlaceManager. diff --git a/src/location/places/qplaceeditorial.cpp b/src/location/places/qplaceeditorial.cpp index 6018770f..bd1cb647 100644 --- a/src/location/places/qplaceeditorial.cpp +++ b/src/location/places/qplaceeditorial.cpp @@ -68,7 +68,7 @@ bool QPlaceEditorialPrivate::compare(const QPlaceContentPrivate *other) const \inmodule QtLocation \ingroup QtLocation-places \ingroup QtLocation-places-data - \since 5.5 + \since 5.6 \brief The QPlaceEditorial class represents a publisher's article describing a place. diff --git a/src/location/places/qplaceicon.cpp b/src/location/places/qplaceicon.cpp index 914c079e..c3a2b851 100644 --- a/src/location/places/qplaceicon.cpp +++ b/src/location/places/qplaceicon.cpp @@ -79,7 +79,7 @@ bool QPlaceIconPrivate::operator == (const QPlaceIconPrivate &other) const \inmodule QtLocation \ingroup QtLocation-places \ingroup QtLocation-places-data - \since 5.5 + \since 5.6 \brief The QPlaceIcon class represents an icon. diff --git a/src/location/places/qplaceidreply.cpp b/src/location/places/qplaceidreply.cpp index d2f54c82..7fb8bbe8 100644 --- a/src/location/places/qplaceidreply.cpp +++ b/src/location/places/qplaceidreply.cpp @@ -57,7 +57,7 @@ QT_USE_NAMESPACE \inmodule QtLocation \ingroup QtLocation-places \ingroup QtLocation-places-replies - \since 5.5 + \since 5.6 \brief The QPlaceIdReply class manages operations which return an identifier such as saving and removal operations of places and categories. diff --git a/src/location/places/qplaceimage.cpp b/src/location/places/qplaceimage.cpp index 7143d290..f3dda154 100644 --- a/src/location/places/qplaceimage.cpp +++ b/src/location/places/qplaceimage.cpp @@ -67,7 +67,7 @@ bool QPlaceImagePrivate::compare(const QPlaceContentPrivate *other) const \inmodule QtLocation \ingroup QtLocation-places \ingroup QtLocation-places-data - \since 5.5 + \since 5.6 \brief The QPlaceImage class represents a reference to an image. diff --git a/src/location/places/qplacemanager.cpp b/src/location/places/qplacemanager.cpp index 8ed1afc3..e78489f7 100644 --- a/src/location/places/qplacemanager.cpp +++ b/src/location/places/qplacemanager.cpp @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE \inmodule QtLocation \ingroup QtLocation-places \ingroup QtLocation-places-manager - \since 5.5 + \since 5.6 \brief The QPlaceManager class provides the interface which allows clients to access places stored in a particular backend. diff --git a/src/location/places/qplacemanagerengine.cpp b/src/location/places/qplacemanagerengine.cpp index 65c4933e..c1b5f237 100644 --- a/src/location/places/qplacemanagerengine.cpp +++ b/src/location/places/qplacemanagerengine.cpp @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE \ingroup QtLocation-impl \ingroup QtLocation-places \ingroup QtLocation-places-manager - \since 5.5 + \since 5.6 \brief The QPlaceManagerEngine class provides an interface for implementers of QGeoServiceProvider plugins who want to provide access to place diff --git a/src/location/places/qplacematchreply.cpp b/src/location/places/qplacematchreply.cpp index dc4a79bc..9794b3f3 100644 --- a/src/location/places/qplacematchreply.cpp +++ b/src/location/places/qplacematchreply.cpp @@ -56,7 +56,7 @@ QT_USE_NAMESPACE \inmodule QtLocation \ingroup QtLocation-places \ingroup QtLocation-places-replies - \since 5.5 + \since 5.6 \brief The QPlaceMatchReply class manages a place matching operation started by an instance of QPlaceManager. diff --git a/src/location/places/qplacematchrequest.cpp b/src/location/places/qplacematchrequest.cpp index 7c5fb749..89343dc6 100644 --- a/src/location/places/qplacematchrequest.cpp +++ b/src/location/places/qplacematchrequest.cpp @@ -101,7 +101,7 @@ void QPlaceMatchRequestPrivate::clear() \inmodule QtLocation \ingroup QtLocation-places \ingroup QtLocation-places-requests - \since 5.5 + \since 5.6 \brief The QPlaceMatchRequest class is used to find places from one manager that match those from another. It represents a set of request parameters. diff --git a/src/location/places/qplaceratings.cpp b/src/location/places/qplaceratings.cpp index db5dd3ac..391db376 100644 --- a/src/location/places/qplaceratings.cpp +++ b/src/location/places/qplaceratings.cpp @@ -68,7 +68,7 @@ bool QPlaceRatingsPrivate::isEmpty() const \inmodule QtLocation \ingroup QtLocation-places \ingroup QtLocation-places-data - \since 5.5 + \since 5.6 \brief The QPlaceRatings class holds rating information about a place. diff --git a/src/location/places/qplacereply.cpp b/src/location/places/qplacereply.cpp index 758d6fea..0590871d 100644 --- a/src/location/places/qplacereply.cpp +++ b/src/location/places/qplacereply.cpp @@ -44,7 +44,7 @@ QT_USE_NAMESPACE \inmodule QtLocation \ingroup QtLocation-places \ingroup QtLocation-places-replies - \since 5.5 + \since 5.6 \brief The QPlaceReply class manages an operation started by an instance of QPlaceManager and serves as a base class for more specialized replies. diff --git a/src/location/places/qplaceresult.cpp b/src/location/places/qplaceresult.cpp index 8ed5fed6..fe89eff7 100644 --- a/src/location/places/qplaceresult.cpp +++ b/src/location/places/qplaceresult.cpp @@ -70,7 +70,7 @@ bool QPlaceResultPrivate::compare(const QPlaceSearchResultPrivate *other) const \inmodule QtLocation \ingroup QtLocation-places \ingroup QtLocation-places-data - \since 5.5 + \since 5.6 \brief The QPlaceResult class represents a search result containing a place. diff --git a/src/location/places/qplacereview.cpp b/src/location/places/qplacereview.cpp index afc31c49..ca79b076 100644 --- a/src/location/places/qplacereview.cpp +++ b/src/location/places/qplacereview.cpp @@ -76,7 +76,7 @@ bool QPlaceReviewPrivate::compare(const QPlaceContentPrivate *other) const \inmodule QtLocation \ingroup QtLocation-places \ingroup QtLocation-places-data - \since 5.5 + \since 5.6 \brief The QPlaceReview class represents a review of a place. diff --git a/src/location/places/qplacesearchreply.cpp b/src/location/places/qplacesearchreply.cpp index a29e49f7..06eef4e5 100644 --- a/src/location/places/qplacesearchreply.cpp +++ b/src/location/places/qplacesearchreply.cpp @@ -56,7 +56,7 @@ public: \inmodule QtLocation \ingroup QtLocation-places \ingroup QtLocation-places-replies - \since 5.5 + \since 5.6 \brief The QPlaceSearchReply class manages a place search operation started by an instance of QPlaceManager. diff --git a/src/location/places/qplacesearchrequest.cpp b/src/location/places/qplacesearchrequest.cpp index 2fddbe9a..c2d993e3 100644 --- a/src/location/places/qplacesearchrequest.cpp +++ b/src/location/places/qplacesearchrequest.cpp @@ -136,7 +136,7 @@ void QPlaceSearchRequestPrivate::clear() \inmodule QtLocation \ingroup QtLocation-places \ingroup QtLocation-places-requests - \since 5.5 + \since 5.6 \brief The QPlaceSearchRequest class represents the set of parameters for a search request. diff --git a/src/location/places/qplacesearchresult.cpp b/src/location/places/qplacesearchresult.cpp index f0ed5f5b..d8ddc50a 100644 --- a/src/location/places/qplacesearchresult.cpp +++ b/src/location/places/qplacesearchresult.cpp @@ -67,7 +67,7 @@ bool QPlaceSearchResultPrivate::compare(const QPlaceSearchResultPrivate *other) \inmodule QtLocation \ingroup QtLocation-places \ingroup QtLocation-places-data - \since 5.5 + \since 5.6 \brief The QPlaceSearchResult class is the base class for search results. diff --git a/src/location/places/qplacesearchsuggestionreply.cpp b/src/location/places/qplacesearchsuggestionreply.cpp index 09ed9390..9bfc5f0a 100644 --- a/src/location/places/qplacesearchsuggestionreply.cpp +++ b/src/location/places/qplacesearchsuggestionreply.cpp @@ -55,7 +55,7 @@ QT_USE_NAMESPACE \inmodule QtLocation \ingroup QtLocation-places \ingroup QtLocation-places-replies - \since 5.5 + \since 5.6 \brief The QPlaceSearchSuggestionReply class manages a search suggestion operation started by an instance of QPlaceManager. diff --git a/src/location/places/qplacesupplier.cpp b/src/location/places/qplacesupplier.cpp index fb8b6b6e..aa9e1220 100644 --- a/src/location/places/qplacesupplier.cpp +++ b/src/location/places/qplacesupplier.cpp @@ -80,7 +80,7 @@ bool QPlaceSupplierPrivate::isEmpty() const \inmodule QtLocation \ingroup QtLocation-places \ingroup QtLocation-places-data - \since 5.5 + \since 5.6 \brief The QPlaceSupplier class represents a supplier of a place or content associated with a place. diff --git a/src/location/places/qplaceuser.cpp b/src/location/places/qplaceuser.cpp index fd176525..fbfba621 100644 --- a/src/location/places/qplaceuser.cpp +++ b/src/location/places/qplaceuser.cpp @@ -63,7 +63,7 @@ bool QPlaceUserPrivate::operator==(const QPlaceUserPrivate &other) const \inmodule QtLocation \ingroup QtLocation-places \ingroup QtLocation-places-data - \since 5.5 + \since 5.6 \brief The QPlaceUser class represents an individual user. */ diff --git a/tests/auto/declarative_ui/tst_map.qml b/tests/auto/declarative_ui/tst_map.qml index 7794cac4..34f109d1 100644 --- a/tests/auto/declarative_ui/tst_map.qml +++ b/tests/auto/declarative_ui/tst_map.qml @@ -33,7 +33,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtLocation 5.5 +import QtLocation 5.6 import QtPositioning 5.5 Item { diff --git a/tests/auto/declarative_ui/tst_map_coordinateanimation.qml b/tests/auto/declarative_ui/tst_map_coordinateanimation.qml index b297e619..ec8042fd 100644 --- a/tests/auto/declarative_ui/tst_map_coordinateanimation.qml +++ b/tests/auto/declarative_ui/tst_map_coordinateanimation.qml @@ -33,7 +33,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtLocation 5.5 +import QtLocation 5.6 import QtPositioning 5.5 Item { diff --git a/tests/auto/declarative_ui/tst_map_error.qml b/tests/auto/declarative_ui/tst_map_error.qml index 6a70cade..68752f11 100644 --- a/tests/auto/declarative_ui/tst_map_error.qml +++ b/tests/auto/declarative_ui/tst_map_error.qml @@ -33,7 +33,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtLocation 5.5 +import QtLocation 5.6 import QtPositioning 5.5 Item { diff --git a/tests/auto/declarative_ui/tst_map_flick.qml b/tests/auto/declarative_ui/tst_map_flick.qml index 04814566..526cbb6f 100644 --- a/tests/auto/declarative_ui/tst_map_flick.qml +++ b/tests/auto/declarative_ui/tst_map_flick.qml @@ -33,7 +33,7 @@ import QtQuick 2.5 import QtTest 1.0 -import QtLocation 5.5 +import QtLocation 5.6 import QtPositioning 5.5 Item { diff --git a/tests/auto/declarative_ui/tst_map_item.qml b/tests/auto/declarative_ui/tst_map_item.qml index b0615f4f..32de8efd 100644 --- a/tests/auto/declarative_ui/tst_map_item.qml +++ b/tests/auto/declarative_ui/tst_map_item.qml @@ -33,7 +33,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtLocation 5.5 +import QtLocation 5.6 import QtPositioning 5.5 /* diff --git a/tests/auto/declarative_ui/tst_map_item_details.qml b/tests/auto/declarative_ui/tst_map_item_details.qml index f6fcca4b..b4468301 100644 --- a/tests/auto/declarative_ui/tst_map_item_details.qml +++ b/tests/auto/declarative_ui/tst_map_item_details.qml @@ -34,7 +34,7 @@ import QtQuick 2.0 import QtTest 1.0 import QtPositioning 5.5 -import QtLocation 5.5 +import QtLocation 5.6 Item { id: page diff --git a/tests/auto/declarative_ui/tst_map_item_fit_viewport.qml b/tests/auto/declarative_ui/tst_map_item_fit_viewport.qml index f14cea3a..55fbd348 100644 --- a/tests/auto/declarative_ui/tst_map_item_fit_viewport.qml +++ b/tests/auto/declarative_ui/tst_map_item_fit_viewport.qml @@ -33,7 +33,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtLocation 5.5 +import QtLocation 5.6 import QtPositioning 5.5 import QtLocation.Test 5.5 diff --git a/tests/auto/declarative_ui/tst_map_itemview.qml b/tests/auto/declarative_ui/tst_map_itemview.qml index 33276198..5fe00d97 100644 --- a/tests/auto/declarative_ui/tst_map_itemview.qml +++ b/tests/auto/declarative_ui/tst_map_itemview.qml @@ -33,7 +33,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtLocation 5.5 +import QtLocation 5.6 import QtPositioning 5.5 import QtLocation.Test 5.5 diff --git a/tests/auto/declarative_ui/tst_map_keepgrab.qml b/tests/auto/declarative_ui/tst_map_keepgrab.qml index cf620676..645946c3 100644 --- a/tests/auto/declarative_ui/tst_map_keepgrab.qml +++ b/tests/auto/declarative_ui/tst_map_keepgrab.qml @@ -33,7 +33,7 @@ import QtQuick 2.5 import QtTest 1.0 -import QtLocation 5.5 +import QtLocation 5.6 import QtPositioning 5.5 Item { diff --git a/tests/auto/declarative_ui/tst_map_maptype.qml b/tests/auto/declarative_ui/tst_map_maptype.qml index a20241fc..d96ee60e 100644 --- a/tests/auto/declarative_ui/tst_map_maptype.qml +++ b/tests/auto/declarative_ui/tst_map_maptype.qml @@ -33,7 +33,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtLocation 5.5 +import QtLocation 5.6 Item{ id: page diff --git a/tests/auto/declarative_ui/tst_map_mouse.qml b/tests/auto/declarative_ui/tst_map_mouse.qml index aa595a28..fe02f81d 100644 --- a/tests/auto/declarative_ui/tst_map_mouse.qml +++ b/tests/auto/declarative_ui/tst_map_mouse.qml @@ -33,7 +33,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtLocation 5.5 +import QtLocation 5.6 import QtPositioning 5.5 /* diff --git a/tests/auto/qmlinterface/data/TestPlace.qml b/tests/auto/qmlinterface/data/TestPlace.qml index 33e54104..e2571cb4 100644 --- a/tests/auto/qmlinterface/data/TestPlace.qml +++ b/tests/auto/qmlinterface/data/TestPlace.qml @@ -31,7 +31,7 @@ ** ****************************************************************************/ -import QtLocation 5.5 +import QtLocation 5.6 Place { name: "Test Place" -- cgit v1.2.3