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 | |
| parent | b4a065d70e86405bc658b54fffad7c69a12f27aa (diff) | |
| parent | cd543e15c12c838eb0b30fc1d656bdebda13b324 (diff) | |
| download | qtlocation-f87ba0409856a678e8a940b70f7452c3a1b730c3.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: I48858c7a8b57b1ad2bd8aa5bea578dd12113b24b
162 files changed, 1015 insertions, 136 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 diff --git a/src/imports/location/declarativeplaces/qdeclarativecategory.cpp b/src/imports/location/declarativeplaces/qdeclarativecategory.cpp index 0edf09d9..ae496c1b 100644 --- a/src/imports/location/declarativeplaces/qdeclarativecategory.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativecategory.cpp @@ -155,7 +155,7 @@ void QDeclarativeCategory::pluginReady() /*! \qmlproperty QPlaceCategory Category::category - \target Category::category + \keyword Category::category For details on how to use this property to interface between C++ and QML see "\l {Category - QPlaceCategory} {Interfaces between C++ and QML Code}". diff --git a/src/imports/location/declarativeplaces/qdeclarativecategory_p.h b/src/imports/location/declarativeplaces/qdeclarativecategory_p.h index ac8747e3..63b255b4 100644 --- a/src/imports/location/declarativeplaces/qdeclarativecategory_p.h +++ b/src/imports/location/declarativeplaces/qdeclarativecategory_p.h @@ -37,6 +37,17 @@ #ifndef QDECLARATIVECATEGORY_P_H #define QDECLARATIVECATEGORY_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <QtQml/qqml.h> #include <QtQml/QQmlParserStatus> #include <QObject> diff --git a/src/imports/location/declarativeplaces/qdeclarativecontactdetail_p.h b/src/imports/location/declarativeplaces/qdeclarativecontactdetail_p.h index db0a094d..9d404def 100644 --- a/src/imports/location/declarativeplaces/qdeclarativecontactdetail_p.h +++ b/src/imports/location/declarativeplaces/qdeclarativecontactdetail_p.h @@ -37,6 +37,17 @@ #ifndef QDECLARATIVECONTACTDETAIL_P_H #define QDECLARATIVECONTACTDETAIL_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <QtCore/QObject> #include <QtLocation/QPlaceContactDetail> #include <QtQml/QQmlPropertyMap> diff --git a/src/imports/location/declarativeplaces/qdeclarativeperiod_p.h b/src/imports/location/declarativeplaces/qdeclarativeperiod_p.h index 56994eff..3ded0109 100644 --- a/src/imports/location/declarativeplaces/qdeclarativeperiod_p.h +++ b/src/imports/location/declarativeplaces/qdeclarativeperiod_p.h @@ -37,6 +37,17 @@ #ifndef QDECLARATIVEPERIOD_P_H #define QDECLARATIVEPERIOD_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <qplaceperiod.h> #include <QtQml/qqml.h> diff --git a/src/imports/location/declarativeplaces/qdeclarativeplace_p.h b/src/imports/location/declarativeplaces/qdeclarativeplace_p.h index 1488bb20..78557091 100644 --- a/src/imports/location/declarativeplaces/qdeclarativeplace_p.h +++ b/src/imports/location/declarativeplaces/qdeclarativeplace_p.h @@ -37,6 +37,17 @@ #ifndef QDECLARATIVEPLACE_P_H #define QDECLARATIVEPLACE_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <QtCore/QObject> #include <QtQml/QQmlListProperty> #include <QtQml/QQmlParserStatus> diff --git a/src/imports/location/declarativeplaces/qdeclarativeplaceattribute_p.h b/src/imports/location/declarativeplaces/qdeclarativeplaceattribute_p.h index 451edfe2..f1c873c3 100644 --- a/src/imports/location/declarativeplaces/qdeclarativeplaceattribute_p.h +++ b/src/imports/location/declarativeplaces/qdeclarativeplaceattribute_p.h @@ -37,6 +37,17 @@ #ifndef QDECLARATIVEPLACEATTRIBUTE_P_H #define QDECLARATIVEPLACEATTRIBUTE_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <QObject> #include <QtQml/qqml.h> #include <QString> diff --git a/src/imports/location/declarativeplaces/qdeclarativeplaceicon_p.h b/src/imports/location/declarativeplaces/qdeclarativeplaceicon_p.h index cf588b77..23acb36e 100644 --- a/src/imports/location/declarativeplaces/qdeclarativeplaceicon_p.h +++ b/src/imports/location/declarativeplaces/qdeclarativeplaceicon_p.h @@ -37,6 +37,17 @@ #ifndef QDECLARATIVEPLACEICON_P_H #define QDECLARATIVEPLACEICON_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include "qdeclarativegeoserviceprovider_p.h" #include <qplaceicon.h> diff --git a/src/imports/location/declarativeplaces/qdeclarativeplaceimagemodel_p.h b/src/imports/location/declarativeplaces/qdeclarativeplaceimagemodel_p.h index 51d46597..8f8f3f4e 100644 --- a/src/imports/location/declarativeplaces/qdeclarativeplaceimagemodel_p.h +++ b/src/imports/location/declarativeplaces/qdeclarativeplaceimagemodel_p.h @@ -37,6 +37,17 @@ #ifndef QDECLARATIVEPLACEIMAGEMODEL_P_H #define QDECLARATIVEPLACEIMAGEMODEL_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include "qdeclarativeplacecontentmodel.h" QT_BEGIN_NAMESPACE diff --git a/src/imports/location/declarativeplaces/qdeclarativeplaceuser_p.h b/src/imports/location/declarativeplaces/qdeclarativeplaceuser_p.h index ea9a3638..6c6ececf 100644 --- a/src/imports/location/declarativeplaces/qdeclarativeplaceuser_p.h +++ b/src/imports/location/declarativeplaces/qdeclarativeplaceuser_p.h @@ -37,6 +37,17 @@ #ifndef QDECLARATIVEPLACEUSER_P_H #define QDECLARATIVEPLACEUSER_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <QtCore/QObject> #include <QtQml/qqml.h> #include <QtLocation/QPlaceUser> diff --git a/src/imports/location/declarativeplaces/qdeclarativeratings_p.h b/src/imports/location/declarativeplaces/qdeclarativeratings_p.h index 596eed69..7583e703 100644 --- a/src/imports/location/declarativeplaces/qdeclarativeratings_p.h +++ b/src/imports/location/declarativeplaces/qdeclarativeratings_p.h @@ -37,6 +37,17 @@ #ifndef QDECLARATIVERATINGS_P_H #define QDECLARATIVERATINGS_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <qplaceratings.h> #include <QtQml/qqml.h> diff --git a/src/imports/location/declarativeplaces/qdeclarativereviewmodel_p.h b/src/imports/location/declarativeplaces/qdeclarativereviewmodel_p.h index 343f9f7e..06bf7aa8 100644 --- a/src/imports/location/declarativeplaces/qdeclarativereviewmodel_p.h +++ b/src/imports/location/declarativeplaces/qdeclarativereviewmodel_p.h @@ -37,6 +37,17 @@ #ifndef QDECLARATIVEREVIEWMODEL_P_H #define QDECLARATIVEREVIEWMODEL_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include "qdeclarativeplacecontentmodel.h" QT_BEGIN_NAMESPACE diff --git a/src/imports/location/declarativeplaces/qdeclarativesearchresultmodel_p.h b/src/imports/location/declarativeplaces/qdeclarativesearchresultmodel_p.h index fb63d72c..73bf16d3 100644 --- a/src/imports/location/declarativeplaces/qdeclarativesearchresultmodel_p.h +++ b/src/imports/location/declarativeplaces/qdeclarativesearchresultmodel_p.h @@ -37,6 +37,17 @@ #ifndef QDECLARATIVESEARCHRESULTMODEL_P_H #define QDECLARATIVESEARCHRESULTMODEL_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include "qdeclarativesearchmodelbase.h" #include "qdeclarativecategory_p.h" #include "qdeclarativeplace_p.h" diff --git a/src/imports/location/declarativeplaces/qdeclarativesearchsuggestionmodel_p.h b/src/imports/location/declarativeplaces/qdeclarativesearchsuggestionmodel_p.h index c8d30a51..49e09980 100644 --- a/src/imports/location/declarativeplaces/qdeclarativesearchsuggestionmodel_p.h +++ b/src/imports/location/declarativeplaces/qdeclarativesearchsuggestionmodel_p.h @@ -37,6 +37,17 @@ #ifndef QDECLARATIVESEARCHSUGGESTIONMODEL_P_H #define QDECLARATIVESEARCHSUGGESTIONMODEL_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include "qdeclarativesearchmodelbase.h" #include <QtCore/QStringList> diff --git a/src/imports/location/declarativeplaces/qdeclarativesupplier_p.h b/src/imports/location/declarativeplaces/qdeclarativesupplier_p.h index 68e7680f..35b1dbda 100644 --- a/src/imports/location/declarativeplaces/qdeclarativesupplier_p.h +++ b/src/imports/location/declarativeplaces/qdeclarativesupplier_p.h @@ -37,6 +37,17 @@ #ifndef QDECLARATIVESUPPLIER_P_H #define QDECLARATIVESUPPLIER_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <QObject> #include <QtCore/QUrl> #include <QtQml/qqml.h> diff --git a/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel_p.h b/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel_p.h index 6026a79b..98167892 100644 --- a/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel_p.h +++ b/src/imports/location/declarativeplaces/qdeclarativesupportedcategoriesmodel_p.h @@ -37,6 +37,17 @@ #ifndef QDECLARATIVESUPPORTEDCATEGORIESMODEL_H #define QDECLARATIVESUPPORTEDCATEGORIESMODEL_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <qdeclarativegeoserviceprovider_p.h> #include <QObject> diff --git a/src/imports/location/locationvaluetypehelper_p.h b/src/imports/location/locationvaluetypehelper_p.h index 648dae34..50038e88 100644 --- a/src/imports/location/locationvaluetypehelper_p.h +++ b/src/imports/location/locationvaluetypehelper_p.h @@ -37,6 +37,17 @@ #ifndef LOCATION_VALUE_TYPE_HELPER #define LOCATION_VALUE_TYPE_HELPER +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <QJSValue> #include <QGeoCoordinate> #include <QGeoRectangle> diff --git a/src/imports/location/mapitemviewdelegateincubator.cpp b/src/imports/location/mapitemviewdelegateincubator.cpp index 2c4ba823..98f0d460 100644 --- a/src/imports/location/mapitemviewdelegateincubator.cpp +++ b/src/imports/location/mapitemviewdelegateincubator.cpp @@ -1,39 +1,35 @@ /**************************************************************************** ** +** Copyright (C) 2015 The Qt Company Ltd. ** Copyright (C) 2015 Jolla Ltd, author: Aaron McCarthy <aaron.mccarthy@jollamobile.com> -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the QtLocation module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL$ +** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. ** ** GNU General Public License Usage ** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. ** ** $QT_END_LICENSE$ ** diff --git a/src/imports/location/mapitemviewdelegateincubator.h b/src/imports/location/mapitemviewdelegateincubator.h index 7e0813c0..aa82a6bf 100644 --- a/src/imports/location/mapitemviewdelegateincubator.h +++ b/src/imports/location/mapitemviewdelegateincubator.h @@ -1,44 +1,39 @@ /**************************************************************************** ** +** Copyright (C) 2015 The Qt Company Ltd. ** Copyright (C) 2015 Jolla Ltd, author: Aaron McCarthy <aaron.mccarthy@jollamobile.com> -** Contact: http://www.qt-project.org/legal +** Contact: http://www.qt.io/licensing/ ** ** This file is part of the QtLocation module of the Qt Toolkit. ** -** $QT_BEGIN_LICENSE:LGPL$ +** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and Digia. For licensing terms and -** conditions see http://qt.digia.com/licensing. For further information -** use the contact form at http://qt.digia.com/contact-us. +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. ** ** GNU Lesser General Public License Usage ** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Digia gives you certain additional -** rights. These rights are described in the Digia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. ** ** GNU General Public License Usage ** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. ** ** $QT_END_LICENSE$ ** ****************************************************************************/ - #ifndef MAPITEMVIEWDELEGATEINCUBATOR_H #define MAPITEMVIEWDELEGATEINCUBATOR_H diff --git a/src/imports/location/qdeclarativecirclemapitem_p.h b/src/imports/location/qdeclarativecirclemapitem_p.h index 9fb98c9a..fb786e08 100644 --- a/src/imports/location/qdeclarativecirclemapitem_p.h +++ b/src/imports/location/qdeclarativecirclemapitem_p.h @@ -37,6 +37,17 @@ #ifndef QDECLARATIVECIRCLEMAPITEM_H #define QDECLARATIVECIRCLEMAPITEM_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include "qdeclarativegeomapitembase_p.h" #include "qdeclarativepolylinemapitem_p.h" #include "qdeclarativepolygonmapitem_p.h" diff --git a/src/imports/location/qdeclarativegeocodemodel_p.h b/src/imports/location/qdeclarativegeocodemodel_p.h index cb610bb0..2fbe9937 100644 --- a/src/imports/location/qdeclarativegeocodemodel_p.h +++ b/src/imports/location/qdeclarativegeocodemodel_p.h @@ -37,6 +37,17 @@ #ifndef QDECLARATIVEGEOCODEMODEL_H #define QDECLARATIVEGEOCODEMODEL_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include "qdeclarativegeoserviceprovider_p.h" #include <qgeocodereply.h> diff --git a/src/imports/location/qdeclarativegeomaneuver_p.h b/src/imports/location/qdeclarativegeomaneuver_p.h index 5f2facad..b189d83f 100644 --- a/src/imports/location/qdeclarativegeomaneuver_p.h +++ b/src/imports/location/qdeclarativegeomaneuver_p.h @@ -37,6 +37,17 @@ #ifndef QDECLARATIVEGEOMANEUVER_H #define QDECLARATIVEGEOMANEUVER_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <qgeomaneuver.h> #include <QtPositioning/QGeoCoordinate> diff --git a/src/imports/location/qdeclarativegeomap.cpp b/src/imports/location/qdeclarativegeomap.cpp index dbef7045..026a515a 100644 --- a/src/imports/location/qdeclarativegeomap.cpp +++ b/src/imports/location/qdeclarativegeomap.cpp @@ -713,7 +713,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/imports/location/qdeclarativegeomap_p.h b/src/imports/location/qdeclarativegeomap_p.h index 737598e3..9db3b199 100644 --- a/src/imports/location/qdeclarativegeomap_p.h +++ b/src/imports/location/qdeclarativegeomap_p.h @@ -37,6 +37,17 @@ #ifndef QDECLARATIVEGEOMAP_H #define QDECLARATIVEGEOMAP_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include "qgeoserviceprovider.h" #include "qdeclarativegeomapitemview_p.h" #include "qquickgeomapgesturearea_p.h" diff --git a/src/imports/location/qdeclarativegeomapcopyrightsnotice_p.h b/src/imports/location/qdeclarativegeomapcopyrightsnotice_p.h index b4bd6c40..771ced6c 100644 --- a/src/imports/location/qdeclarativegeomapcopyrightsnotice_p.h +++ b/src/imports/location/qdeclarativegeomapcopyrightsnotice_p.h @@ -38,6 +38,17 @@ #ifndef QDECLARATIVEGEOMAPCOPYRIGHTSNOTICE_H #define QDECLARATIVEGEOMAPCOPYRIGHTSNOTICE_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <QtGui/QImage> #include <QtQuick/QQuickPaintedItem> diff --git a/src/imports/location/qdeclarativegeomapitembase_p.h b/src/imports/location/qdeclarativegeomapitembase_p.h index 2ca22821..d4ad34c5 100644 --- a/src/imports/location/qdeclarativegeomapitembase_p.h +++ b/src/imports/location/qdeclarativegeomapitembase_p.h @@ -37,6 +37,17 @@ #ifndef QDECLARATIVEGEOMAPITEMBASE_H #define QDECLARATIVEGEOMAPITEMBASE_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <QtQuick/QQuickItem> #include "qdeclarativegeomap_p.h" diff --git a/src/imports/location/qdeclarativegeomapitemview_p.h b/src/imports/location/qdeclarativegeomapitemview_p.h index 29675295..004e3fb9 100644 --- a/src/imports/location/qdeclarativegeomapitemview_p.h +++ b/src/imports/location/qdeclarativegeomapitemview_p.h @@ -39,6 +39,17 @@ #ifndef QDECLARATIVEGEOMAPITEMVIEW_H #define QDECLARATIVEGEOMAPITEMVIEW_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <QtCore/QModelIndex> #include <QtQml/QQmlParserStatus> #include <QtQml/QQmlIncubator> diff --git a/src/imports/location/qdeclarativegeomapquickitem_p.h b/src/imports/location/qdeclarativegeomapquickitem_p.h index 2be5457c..af9f6ec6 100644 --- a/src/imports/location/qdeclarativegeomapquickitem_p.h +++ b/src/imports/location/qdeclarativegeomapquickitem_p.h @@ -37,6 +37,17 @@ #ifndef QDECLARATIVEGEOMAPQUICKITEM_H #define QDECLARATIVEGEOMAPQUICKITEM_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <QtQuick/QQuickItem> #include <QtQuick/QSGNode> diff --git a/src/imports/location/qdeclarativegeomaptype_p.h b/src/imports/location/qdeclarativegeomaptype_p.h index 903b6aac..980c594a 100644 --- a/src/imports/location/qdeclarativegeomaptype_p.h +++ b/src/imports/location/qdeclarativegeomaptype_p.h @@ -37,6 +37,17 @@ #ifndef QDECLARATIVEGEOMAPTYPE_H #define QDECLARATIVEGEOMAPTYPE_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <QtCore/QObject> #include <QtQml/qqml.h> #include <QtLocation/private/qgeomaptype_p.h> diff --git a/src/imports/location/qdeclarativegeoroute_p.h b/src/imports/location/qdeclarativegeoroute_p.h index 42fa6789..9bb46087 100644 --- a/src/imports/location/qdeclarativegeoroute_p.h +++ b/src/imports/location/qdeclarativegeoroute_p.h @@ -37,6 +37,17 @@ #ifndef QDECLARATIVEGEOROUTE_H #define QDECLARATIVEGEOROUTE_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include "qdeclarativegeoroutesegment_p.h" #include <QtCore/QObject> diff --git a/src/imports/location/qdeclarativegeoroutemodel_p.h b/src/imports/location/qdeclarativegeoroutemodel_p.h index 35cfe004..66769ea7 100644 --- a/src/imports/location/qdeclarativegeoroutemodel_p.h +++ b/src/imports/location/qdeclarativegeoroutemodel_p.h @@ -37,6 +37,17 @@ #ifndef QDECLARATIVEGEOROUTEMODEL_H #define QDECLARATIVEGEOROUTEMODEL_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include "qdeclarativegeoserviceprovider_p.h" #include <QtPositioning/QGeoCoordinate> diff --git a/src/imports/location/qdeclarativegeoroutesegment_p.h b/src/imports/location/qdeclarativegeoroutesegment_p.h index b02e8f2b..e6cf5aa5 100644 --- a/src/imports/location/qdeclarativegeoroutesegment_p.h +++ b/src/imports/location/qdeclarativegeoroutesegment_p.h @@ -37,6 +37,17 @@ #ifndef QDECLARATIVEGEOROUTESEGMENT_H #define QDECLARATIVEGEOROUTESEGMENT_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include "qdeclarativegeomaneuver_p.h" #include <QtCore/QObject> diff --git a/src/imports/location/qdeclarativegeoserviceprovider_p.h b/src/imports/location/qdeclarativegeoserviceprovider_p.h index 56529aa6..f7a2ee83 100644 --- a/src/imports/location/qdeclarativegeoserviceprovider_p.h +++ b/src/imports/location/qdeclarativegeoserviceprovider_p.h @@ -37,6 +37,17 @@ #ifndef QDECLARATIVEQGEOSERVICEPROVIDER_H #define QDECLARATIVEQGEOSERVICEPROVIDER_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <QtCore/QMap> #include <QtCore/QString> #include <QtCore/QStringList> diff --git a/src/imports/location/qdeclarativepolygonmapitem_p.h b/src/imports/location/qdeclarativepolygonmapitem_p.h index 38249354..86a9ec4c 100644 --- a/src/imports/location/qdeclarativepolygonmapitem_p.h +++ b/src/imports/location/qdeclarativepolygonmapitem_p.h @@ -37,6 +37,17 @@ #ifndef QDECLARATIVEPOLYGONMAPITEM #define QDECLARATIVEPOLYGONMAPITEM +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include "qdeclarativegeomapitembase_p.h" #include "qdeclarativepolylinemapitem_p.h" #include "qgeomapitemgeometry_p.h" diff --git a/src/imports/location/qdeclarativepolylinemapitem_p.h b/src/imports/location/qdeclarativepolylinemapitem_p.h index 8822f49d..6eeeb11f 100644 --- a/src/imports/location/qdeclarativepolylinemapitem_p.h +++ b/src/imports/location/qdeclarativepolylinemapitem_p.h @@ -37,6 +37,17 @@ #ifndef QDECLARATIVEPOLYLINEMAPITEM #define QDECLARATIVEPOLYLINEMAPITEM +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include "qdeclarativegeomapitembase_p.h" #include "qgeomapitemgeometry_p.h" diff --git a/src/imports/location/qdeclarativerectanglemapitem_p.h b/src/imports/location/qdeclarativerectanglemapitem_p.h index 6046c190..d4c319ab 100644 --- a/src/imports/location/qdeclarativerectanglemapitem_p.h +++ b/src/imports/location/qdeclarativerectanglemapitem_p.h @@ -37,6 +37,17 @@ #ifndef QDECLARATIVERECTANGLEMAPITEM_H_ #define QDECLARATIVERECTANGLEMAPITEM_H_ +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include "qdeclarativegeomapitembase_p.h" #include "qgeomapitemgeometry_p.h" #include "qdeclarativepolylinemapitem_p.h" diff --git a/src/imports/location/qdeclarativeroutemapitem_p.h b/src/imports/location/qdeclarativeroutemapitem_p.h index 5ba9f071..9bb3a443 100644 --- a/src/imports/location/qdeclarativeroutemapitem_p.h +++ b/src/imports/location/qdeclarativeroutemapitem_p.h @@ -37,6 +37,17 @@ #ifndef QDECLARATIVEROUTEMAPITEM_H_ #define QDECLARATIVEROUTEMAPITEM_H_ +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include "qdeclarativegeomapitembase_p.h" #include "qdeclarativegeomap_p.h" #include "qdeclarativepolylinemapitem_p.h" diff --git a/src/imports/location/qgeomapitemgeometry_p.h b/src/imports/location/qgeomapitemgeometry_p.h index eac90042..36b670f9 100644 --- a/src/imports/location/qgeomapitemgeometry_p.h +++ b/src/imports/location/qgeomapitemgeometry_p.h @@ -37,6 +37,17 @@ #ifndef QGEOMAPITEMGEOMETRY_H #define QGEOMAPITEMGEOMETRY_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <QPainterPath> #include <QPointF> #include <QRectF> diff --git a/src/imports/location/qquickgeomapgesturearea_p.h b/src/imports/location/qquickgeomapgesturearea_p.h index 54d850cf..43bb2ce5 100644 --- a/src/imports/location/qquickgeomapgesturearea_p.h +++ b/src/imports/location/qquickgeomapgesturearea_p.h @@ -37,6 +37,17 @@ #ifndef QQUICKGEOMAPGESTUREAREA_P_H #define QQUICKGEOMAPGESTUREAREA_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <QtQuick/QQuickItem> #include <QTouchEvent> #include <QDebug> diff --git a/src/imports/positioning/qdeclarativeposition_p.h b/src/imports/positioning/qdeclarativeposition_p.h index 67253abe..78f78464 100644 --- a/src/imports/positioning/qdeclarativeposition_p.h +++ b/src/imports/positioning/qdeclarativeposition_p.h @@ -36,6 +36,17 @@ #ifndef QDECLARATIVEPOSITION_H #define QDECLARATIVEPOSITION_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <QtCore/QObject> #include <QtCore/QDateTime> #include <QtQml/qqml.h> diff --git a/src/imports/positioning/qdeclarativepositionsource_p.h b/src/imports/positioning/qdeclarativepositionsource_p.h index 376014e4..b4530aff 100644 --- a/src/imports/positioning/qdeclarativepositionsource_p.h +++ b/src/imports/positioning/qdeclarativepositionsource_p.h @@ -34,6 +34,17 @@ #ifndef QDECLARATIVEPOSITIONSOURCE_H #define QDECLARATIVEPOSITIONSOURCE_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include "qdeclarativeposition_p.h" #include <QtCore/QObject> diff --git a/src/imports/positioning/qquickgeocoordinateanimation_p.h b/src/imports/positioning/qquickgeocoordinateanimation_p.h index 936894cb..526aa456 100644 --- a/src/imports/positioning/qquickgeocoordinateanimation_p.h +++ b/src/imports/positioning/qquickgeocoordinateanimation_p.h @@ -34,6 +34,17 @@ #ifndef QQUICKGEOCOORDINATEANIMATION_P_H #define QQUICKGEOCOORDINATEANIMATION_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <QtQuick/private/qquickanimation_p.h> #include <QtPositioning/qgeocoordinate.h> 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/nmealog.txt b/src/location/doc/snippets/declarative/nmealog.txt index 8c8286dd..8c8286dd 100755..100644 --- a/src/location/doc/snippets/declarative/nmealog.txt +++ b/src/location/doc/snippets/declarative/nmealog.txt 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 11d0d2f7..7979bbe5 100644 --- a/src/location/doc/src/qtlocation.qdoc +++ b/src/location/doc/src/qtlocation.qdoc @@ -68,9 +68,6 @@ applications. The Qt Location API helps you create viable mapping solutions using the data available from some of the popular location services. -The release of this API with Qt 5.5 is a Technology Preview. This implies a -soft API freeze for Qt Location. - \section1 Overview The Qt Location API enables you to: @@ -88,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/qgeotilecache.cpp b/src/location/maps/qgeotilecache.cpp index 3da2865b..01cfcba4 100644 --- a/src/location/maps/qgeotilecache.cpp +++ b/src/location/maps/qgeotilecache.cpp @@ -468,6 +468,23 @@ QString QGeoTileCache::baseCacheDirectory() // If this is not supported by the platform, use the application-specific cache // location. (e.g. ~/.cache/<app_name>/QtLocation) dir = QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation); + + if (!dir.isEmpty()) { + // The shared cache may not be writable when application isolation is enforced. + static bool writable = false; + static bool writableChecked = false; + if (!writableChecked) { + writableChecked = true; + QDir::root().mkpath(dir); + QFile writeTestFile(QDir(dir).filePath(QStringLiteral("qt_cache_check"))); + writable = writeTestFile.open(QIODevice::WriteOnly); + if (writable) + writeTestFile.remove(); + } + if (!writable) + dir = QString(); + } + if (dir.isEmpty()) dir = QStandardPaths::writableLocation(QStandardPaths::CacheLocation); diff --git a/src/location/maps/qgeotiledmappingmanagerengine_p.h b/src/location/maps/qgeotiledmappingmanagerengine_p.h index b0078397..12b43c40 100644 --- a/src/location/maps/qgeotiledmappingmanagerengine_p.h +++ b/src/location/maps/qgeotiledmappingmanagerengine_p.h @@ -37,6 +37,17 @@ #ifndef QGEOTILEDMAPPINGMANAGERENGINE_H #define QGEOTILEDMAPPINGMANAGERENGINE_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <QObject> #include <QSize> #include <QPair> 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/qplacecategory_p.h b/src/location/places/qplacecategory_p.h index c12c9d5e..07fec3c3 100644 --- a/src/location/places/qplacecategory_p.h +++ b/src/location/places/qplacecategory_p.h @@ -37,6 +37,17 @@ #ifndef QPLACECATEGORY_P_H #define QPLACECATEGORY_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <QtCore/QSharedData> #include <QtCore/QString> #include <QtLocation/QLocation> 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/qplacecontentrequest_p.h b/src/location/places/qplacecontentrequest_p.h index d82c1101..d9ba3700 100644 --- a/src/location/places/qplacecontentrequest_p.h +++ b/src/location/places/qplacecontentrequest_p.h @@ -37,6 +37,17 @@ #ifndef QPLACECONTENTREQUEST_P_H #define QPLACECONTENTREQUEST_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <QtCore/QSharedData> #include <QtCore/QVariant> #include <QtLocation/QPlaceContent> 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/qplaceeditorial_p.h b/src/location/places/qplaceeditorial_p.h index 9d74b0d5..f502db73 100644 --- a/src/location/places/qplaceeditorial_p.h +++ b/src/location/places/qplaceeditorial_p.h @@ -37,6 +37,17 @@ #ifndef QPLACEDESCRIPTION_P_H #define QPLACEDESCRIPTION_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <QtCore/QUrl> #include <QtLocation/QPlaceSupplier> 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/qplaceimage_p.h b/src/location/places/qplaceimage_p.h index b8a4d0f7..4030b08d 100644 --- a/src/location/places/qplaceimage_p.h +++ b/src/location/places/qplaceimage_p.h @@ -37,6 +37,17 @@ #ifndef QPLACEIMAGE_P_H #define QPLACEIMAGE_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <QtCore/QSharedData> #include <QtCore/QUrl> 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/qplaceproposedsearchresult_p.h b/src/location/places/qplaceproposedsearchresult_p.h index 90cbbe10..46f95106 100644 --- a/src/location/places/qplaceproposedsearchresult_p.h +++ b/src/location/places/qplaceproposedsearchresult_p.h @@ -37,6 +37,17 @@ #ifndef QPROPOSEDSEARCHRESULT_P_H #define QPROPOSEDSEARCHRESULT_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include "qplacesearchresult_p.h" QT_BEGIN_NAMESPACE 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/qplaceratings_p.h b/src/location/places/qplaceratings_p.h index 4a3d8731..21d441a2 100644 --- a/src/location/places/qplaceratings_p.h +++ b/src/location/places/qplaceratings_p.h @@ -37,6 +37,17 @@ #ifndef QPLACERATINGS_P_H #define QPLACERATINGS_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <QSharedData> QT_BEGIN_NAMESPACE 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/qplaceresult_p.h b/src/location/places/qplaceresult_p.h index d3d2f6c2..0e0bf8cd 100644 --- a/src/location/places/qplaceresult_p.h +++ b/src/location/places/qplaceresult_p.h @@ -37,6 +37,17 @@ #ifndef QPLACERESULT_P_H #define QPLACERESULT_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include "qplacesearchresult_p.h" QT_BEGIN_NAMESPACE 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/qplacereview_p.h b/src/location/places/qplacereview_p.h index 19fa8fa6..345aa192 100644 --- a/src/location/places/qplacereview_p.h +++ b/src/location/places/qplacereview_p.h @@ -37,6 +37,17 @@ #ifndef QPLACEREVIEW_P_H #define QPLACEREVIEW_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <QtCore/QUrl> #include <QtCore/QDateTime> 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/qplacesearchresult_p.h b/src/location/places/qplacesearchresult_p.h index 6960c129..e7c1aaf5 100644 --- a/src/location/places/qplacesearchresult_p.h +++ b/src/location/places/qplacesearchresult_p.h @@ -37,6 +37,17 @@ #ifndef QPLACESEARCHRESULT_P_H #define QPLACESEARCHRESULT_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include "qplacesearchresult.h" #include "qplacesearchrequest.h" 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/qplacesupplier_p.h b/src/location/places/qplacesupplier_p.h index 072c0fe3..ab09349d 100644 --- a/src/location/places/qplacesupplier_p.h +++ b/src/location/places/qplacesupplier_p.h @@ -37,6 +37,17 @@ #ifndef QPLACESUPPLIER_P_H #define QPLACESUPPLIER_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <QString> #include <QSharedData> #include <QUrl> 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/src/location/places/qplaceuser_p.h b/src/location/places/qplaceuser_p.h index 334683b6..f49110b5 100644 --- a/src/location/places/qplaceuser_p.h +++ b/src/location/places/qplaceuser_p.h @@ -37,6 +37,17 @@ #ifndef QPLACEUSER_P_H #define QPLACEUSER_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <QSharedData> #include <QString> diff --git a/src/location/places/unsupportedreplies_p.h b/src/location/places/unsupportedreplies_p.h index 7b0bef1a..b23a3b34 100644 --- a/src/location/places/unsupportedreplies_p.h +++ b/src/location/places/unsupportedreplies_p.h @@ -37,6 +37,17 @@ #ifndef UNSUPPORTEDREPLIES_P_H #define UNSUPPORTEDREPLIES_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include "qplacedetailsreply.h" #include "qplacecontentreply.h" #include "qplacesearchreply.h" diff --git a/src/location/qlocation.cpp b/src/location/qlocation.cpp index e9f8cf37..2afed10b 100644 --- a/src/location/qlocation.cpp +++ b/src/location/qlocation.cpp @@ -43,7 +43,7 @@ namespace QLocation { /*! \namespace QLocation \inmodule QtLocation - \target QLocation Namespace + \keyword QLocation Namespace \brief The QLocation namespace contains miscellaneous identifiers used throughout the QtLocation module. diff --git a/src/plugins/position/android/src/qgeopositioninfosource_android_p.h b/src/plugins/position/android/src/qgeopositioninfosource_android_p.h index 0980a0ce..cdff1e13 100644 --- a/src/plugins/position/android/src/qgeopositioninfosource_android_p.h +++ b/src/plugins/position/android/src/qgeopositioninfosource_android_p.h @@ -34,6 +34,17 @@ #ifndef QGEOPOSITIONINFOSOURCE_ANDROID_P_H #define QGEOPOSITIONINFOSOURCE_ANDROID_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <QGeoPositionInfoSource> #include <QTimer> diff --git a/src/plugins/position/android/src/qgeosatelliteinfosource_android_p.h b/src/plugins/position/android/src/qgeosatelliteinfosource_android_p.h index 0bc8f5dd..06cc25b9 100644 --- a/src/plugins/position/android/src/qgeosatelliteinfosource_android_p.h +++ b/src/plugins/position/android/src/qgeosatelliteinfosource_android_p.h @@ -35,6 +35,17 @@ #ifndef QGEOSATELLITEINFOSOURCEANDROID_H #define QGEOSATELLITEINFOSOURCEANDROID_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <QGeoSatelliteInfoSource> #include <QTimer> diff --git a/src/plugins/position/corelocation/qgeopositioninfosource_cl_p.h b/src/plugins/position/corelocation/qgeopositioninfosource_cl_p.h index d5c0313c..53b3d412 100644 --- a/src/plugins/position/corelocation/qgeopositioninfosource_cl_p.h +++ b/src/plugins/position/corelocation/qgeopositioninfosource_cl_p.h @@ -34,6 +34,17 @@ #ifndef QGEOPOSITIONINFOSOURCECL_H #define QGEOPOSITIONINFOSOURCECL_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #import <CoreLocation/CoreLocation.h> #include "qgeopositioninfosource.h" diff --git a/src/plugins/position/position.pro b/src/plugins/position/position.pro index 3886eb4d..f9492a79 100644 --- a/src/plugins/position/position.pro +++ b/src/plugins/position/position.pro @@ -6,6 +6,7 @@ qtHaveModule(simulator):SUBDIRS += simulator osx|ios:SUBDIRS += corelocation android:!android-no-sdk:SUBDIRS += android winrt:SUBDIRS += winrt +win32:qtHaveModule(serialport):SUBDIRS += serialnmea SUBDIRS += \ positionpoll diff --git a/src/plugins/position/serialnmea/plugin.json b/src/plugins/position/serialnmea/plugin.json new file mode 100644 index 00000000..826836c3 --- /dev/null +++ b/src/plugins/position/serialnmea/plugin.json @@ -0,0 +1,9 @@ +{ + "Keys": ["serialnmea"], + "Provider": "serialnmea", + "Position": true, + "Satellite": false, + "Monitor" : false, + "Priority": 1000, + "Testable": false +} diff --git a/src/plugins/position/serialnmea/qgeopositioninfosourcefactory_serialnmea.cpp b/src/plugins/position/serialnmea/qgeopositioninfosourcefactory_serialnmea.cpp new file mode 100644 index 00000000..2b6b3ce6 --- /dev/null +++ b/src/plugins/position/serialnmea/qgeopositioninfosourcefactory_serialnmea.cpp @@ -0,0 +1,123 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the QtPositioning module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL21$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 or version 3 as published by the Free +** Software Foundation and appearing in the file LICENSE.LGPLv21 and +** LICENSE.LGPLv3 included in the packaging of this file. Please review the +** following information to ensure the GNU Lesser General Public License +** requirements will be met: https://www.gnu.org/licenses/lgpl.html and +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "qgeopositioninfosourcefactory_serialnmea.h" +#include <QtPositioning/qnmeapositioninfosource.h> +#include <QtSerialPort/qserialport.h> +#include <QtSerialPort/qserialportinfo.h> +#include <QtCore/qloggingcategory.h> + +Q_LOGGING_CATEGORY(lcSerial, "qt.positioning.serialnmea") + +class NmeaSource : public QNmeaPositionInfoSource +{ +public: + NmeaSource(QObject *parent); + bool isValid() const { return !m_port.isNull(); } + +private: + QScopedPointer<QSerialPort> m_port; +}; + +NmeaSource::NmeaSource(QObject *parent) + : QNmeaPositionInfoSource(RealTimeMode, parent), + m_port(new QSerialPort) +{ + QByteArray requestedPort = qgetenv("QT_NMEA_SERIAL_PORT"); + if (requestedPort.isEmpty()) { + const QList<QSerialPortInfo> ports = QSerialPortInfo::availablePorts(); + qCDebug(lcSerial) << "Found" << ports.count() << "serial ports"; + if (ports.isEmpty()) { + qWarning("serialnmea: No serial ports found"); + m_port.reset(); + return; + } + + // Try to find a well-known device. + QString portName; + for (int i = 0; i < ports.count(); ++i) { + const QString candidatePortName = ports[i].portName(); + bool acceptThis = false; + + // GlobalSat (BU-353S4 and probably others) + acceptThis |= ports[i].hasVendorIdentifier() && ports[i].vendorIdentifier() == 0x67b; + + if (acceptThis) { + portName = candidatePortName; + break; + } + } + + if (portName.isEmpty()) { + qWarning("serialnmea: No known GPS device found. Specify the COM port via QT_NMEA_SERIAL_PORT."); + m_port.reset(); + return; + } + + m_port->setPortName(portName); + } else { + m_port->setPortName(QString::fromUtf8(requestedPort)); + } + + m_port->setBaudRate(4800); + + qCDebug(lcSerial) << "Opening serial port" << m_port->portName(); + + if (!m_port->open(QIODevice::ReadOnly)) { + qWarning("serialnmea: Failed to open %s", qPrintable(m_port->portName())); + m_port.reset(); + return; + } + + setDevice(m_port.data()); + + qCDebug(lcSerial) << "Opened successfully"; +} + +QGeoPositionInfoSource *QGeoPositionInfoSourceFactorySerialNmea::positionInfoSource(QObject *parent) +{ + QScopedPointer<NmeaSource> src(new NmeaSource(parent)); + return src->isValid() ? src.take() : Q_NULLPTR; +} + +QGeoSatelliteInfoSource *QGeoPositionInfoSourceFactorySerialNmea::satelliteInfoSource(QObject *parent) +{ + Q_UNUSED(parent); + return Q_NULLPTR; +} + +QGeoAreaMonitorSource *QGeoPositionInfoSourceFactorySerialNmea::areaMonitor(QObject *parent) +{ + Q_UNUSED(parent); + return Q_NULLPTR; +} diff --git a/src/plugins/position/serialnmea/qgeopositioninfosourcefactory_serialnmea.h b/src/plugins/position/serialnmea/qgeopositioninfosourcefactory_serialnmea.h new file mode 100644 index 00000000..b28d9834 --- /dev/null +++ b/src/plugins/position/serialnmea/qgeopositioninfosourcefactory_serialnmea.h @@ -0,0 +1,53 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the QtPositioning module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL21$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 or version 3 as published by the Free +** Software Foundation and appearing in the file LICENSE.LGPLv21 and +** LICENSE.LGPLv3 included in the packaging of this file. Please review the +** following information to ensure the GNU Lesser General Public License +** requirements will be met: https://www.gnu.org/licenses/lgpl.html and +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** As a special exception, The Qt Company gives you certain additional +** rights. These rights are described in The Qt Company LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QGEOPOSITIONINFOSOURCEFACTORY_SERIALNMEA_H +#define QGEOPOSITIONINFOSOURCEFACTORY_SERIALNMEA_H + +#include <QObject> +#include <qgeopositioninfosourcefactory.h> + +class QGeoPositionInfoSourceFactorySerialNmea : public QObject, public QGeoPositionInfoSourceFactory +{ + Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.qt.position.sourcefactory/5.0" + FILE "plugin.json") + Q_INTERFACES(QGeoPositionInfoSourceFactory) + +public: + QGeoPositionInfoSource *positionInfoSource(QObject *parent); + QGeoSatelliteInfoSource *satelliteInfoSource(QObject *parent); + QGeoAreaMonitorSource *areaMonitor(QObject *parent); +}; + +#endif diff --git a/src/plugins/position/serialnmea/serialnmea.pro b/src/plugins/position/serialnmea/serialnmea.pro new file mode 100644 index 00000000..81570837 --- /dev/null +++ b/src/plugins/position/serialnmea/serialnmea.pro @@ -0,0 +1,15 @@ +TARGET = qtposition_serialnmea +QT = core positioning serialport + +PLUGIN_TYPE = position +PLUGIN_CLASS_NAME = QGeoPositionInfoSourceFactorySerialNmea +load(qt_plugin) + +HEADERS += \ + qgeopositioninfosourcefactory_serialnmea.h + +SOURCES += \ + qgeopositioninfosourcefactory_serialnmea.cpp + +OTHER_FILES += \ + plugin.json diff --git a/src/plugins/position/simulator/qgeopositioninfosource_simulator_p.h b/src/plugins/position/simulator/qgeopositioninfosource_simulator_p.h index 323956aa..0f5cce6e 100644 --- a/src/plugins/position/simulator/qgeopositioninfosource_simulator_p.h +++ b/src/plugins/position/simulator/qgeopositioninfosource_simulator_p.h @@ -34,6 +34,17 @@ #ifndef QGEOPOSITIONINFOSOURCESIMULATOR_H #define QGEOPOSITIONINFOSOURCESIMULATOR_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include "qgeopositioninfosource.h" #include "qgeopositioninfo.h" #include "qlocationdata_simulator_p.h" diff --git a/src/plugins/position/simulator/qgeosatelliteinfosource_simulator_p.h b/src/plugins/position/simulator/qgeosatelliteinfosource_simulator_p.h index 5a687368..745d76b3 100644 --- a/src/plugins/position/simulator/qgeosatelliteinfosource_simulator_p.h +++ b/src/plugins/position/simulator/qgeosatelliteinfosource_simulator_p.h @@ -34,6 +34,17 @@ #ifndef QGEOSATELLITEINFOSOURCE_SIMULATOR_H #define QGEOSATELLITEINFOSOURCE_SIMULATOR_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <QTimer> #include "qgeosatelliteinfosource.h" #include "qgeosatelliteinfo.h" diff --git a/src/plugins/position/simulator/qlocationconnection_simulator_p.h b/src/plugins/position/simulator/qlocationconnection_simulator_p.h index 17635dfc..21b1fdef 100644 --- a/src/plugins/position/simulator/qlocationconnection_simulator_p.h +++ b/src/plugins/position/simulator/qlocationconnection_simulator_p.h @@ -34,6 +34,17 @@ #ifndef QLOCATIONCONNECTION_H #define QLOCATIONCONNECTION_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include "qlocationdata_simulator_p.h" #include <QtCore/QObject> diff --git a/src/plugins/position/winrt/qgeopositioninfosource_winrt_p.h b/src/plugins/position/winrt/qgeopositioninfosource_winrt_p.h index a7d3cae1..45c22847 100644 --- a/src/plugins/position/winrt/qgeopositioninfosource_winrt_p.h +++ b/src/plugins/position/winrt/qgeopositioninfosource_winrt_p.h @@ -37,6 +37,17 @@ #ifndef QGEOPOSITIONINFOSOURCEWINRT_H #define QGEOPOSITIONINFOSOURCEWINRT_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include "qgeopositioninfosource.h" #include "qgeopositioninfo.h" diff --git a/src/positioning/doc/src/qtpositioning.qdoc b/src/positioning/doc/src/qtpositioning.qdoc index c80ae8e1..1ce33085 100644 --- a/src/positioning/doc/src/qtpositioning.qdoc +++ b/src/positioning/doc/src/qtpositioning.qdoc @@ -64,8 +64,9 @@ The Qt Positioning API provides positioning information via QML and C++ interfac Currently the API is supported on \l {Qt for Android}{Android}, \l {Qt for iOS}{iOS}, \l {Qt for OS X}{OS X}, \l {Qt for Linux/X11}{Linux} (using -\l {http://www.freedesktop.org/wiki/Software/GeoClue}{GeoClue version 0.12.99}) -and \l {Qt for WinRT}{WinRT}. +\l {http://www.freedesktop.org/wiki/Software/GeoClue}{GeoClue version 0.12.99}), +\l {Qt for Windows}{Windows} (with GPS receivers exposed as a serial port providing NMEA sentences), +and \l {Qt for WinRT}{WinRT} (using Windows.Devices.Geolocation). \section1 Overview diff --git a/src/positioning/qdeclarativegeoaddress_p.h b/src/positioning/qdeclarativegeoaddress_p.h index 7f51d555..c8210878 100644 --- a/src/positioning/qdeclarativegeoaddress_p.h +++ b/src/positioning/qdeclarativegeoaddress_p.h @@ -34,6 +34,17 @@ #ifndef QDECLARATIVEGEOADDRESS_P_H #define QDECLARATIVEGEOADDRESS_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <QtCore/QObject> #include <QtPositioning/QGeoAddress> diff --git a/src/positioning/qdeclarativegeolocation_p.h b/src/positioning/qdeclarativegeolocation_p.h index 832dac61..446dd1f0 100644 --- a/src/positioning/qdeclarativegeolocation_p.h +++ b/src/positioning/qdeclarativegeolocation_p.h @@ -34,6 +34,17 @@ #ifndef QDECLARATIVEGEOLOCATION_P_H #define QDECLARATIVEGEOLOCATION_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <QtCore/QObject> #include <QtPositioning/QGeoLocation> #include <QtPositioning/QGeoRectangle> diff --git a/src/positioning/qgeolocation_p.h b/src/positioning/qgeolocation_p.h index cafcafea..62db53b3 100644 --- a/src/positioning/qgeolocation_p.h +++ b/src/positioning/qgeolocation_p.h @@ -34,6 +34,17 @@ #ifndef QGEOLOCATION_P_H #define QGEOLOCATION_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include <QtCore/QSharedData> #include <QtPositioning/QGeoAddress> #include <QtPositioning/QGeoCoordinate> diff --git a/src/positioning/qgeopositioninfosource_p.h b/src/positioning/qgeopositioninfosource_p.h index aedf3319..b11d6451 100644 --- a/src/positioning/qgeopositioninfosource_p.h +++ b/src/positioning/qgeopositioninfosource_p.h @@ -34,6 +34,17 @@ #ifndef QGEOPOSITIONINFOSOURCE_P_H #define QGEOPOSITIONINFOSOURCE_P_H +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + #include "qgeopositioninfosource.h" #include "qgeopositioninfosourcefactory.h" #include <QJsonObject> diff --git a/sync.profile b/sync.profile index afc5e035..fa9885a4 100644 --- a/sync.profile +++ b/sync.profile @@ -16,4 +16,5 @@ "qtxmlpatterns" => "", "qtdeclarative" => "", "qtquickcontrols" => "", + "qtserialport" => "", ); 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" |