diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-16 09:22:15 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-16 09:22:15 +0200 |
commit | f87ba0409856a678e8a940b70f7452c3a1b730c3 (patch) | |
tree | 8c804075fe23ba1bcf8fe5c578780597cbfa4d4f /examples | |
parent | b4a065d70e86405bc658b54fffad7c69a12f27aa (diff) | |
parent | cd543e15c12c838eb0b30fc1d656bdebda13b324 (diff) | |
download | qtlocation-f87ba0409856a678e8a940b70f7452c3a1b730c3.tar.gz |
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: I48858c7a8b57b1ad2bd8aa5bea578dd12113b24b
Diffstat (limited to 'examples')
30 files changed, 30 insertions, 30 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 35996063..43af605d 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 |