diff options
252 files changed, 2609 insertions, 1283 deletions
@@ -44,6 +44,7 @@ qrc_*.cpp doc/src/snippets/cpp/cppsnippet doc/src/snippets/places/placescppsnippet examples/declarative/places_list/places_list +examples/declarative/flickr/qml_position_flickr examples/declarative/places_map/places_map examples/logfilepositionsource/logfilepositionsource examples/weatherinfo/weatherinfo diff --git a/examples/declarative/declarative.pro b/examples/declarative/declarative.pro index 64e6e1b9..1ed2fd7d 100644 --- a/examples/declarative/declarative.pro +++ b/examples/declarative/declarative.pro @@ -1,3 +1,8 @@ TEMPLATE = subdirs -SUBDIRS += flickr places places_list places_map -qtHaveModule(multimedia): SUBDIRS += mapviewer + +qtHaveModule(positioning): SUBDIRS += flickr + +qtHaveModule(location) { + SUBDIRS += places places_list places_map + qtHaveModule(multimedia): SUBDIRS += mapviewer +} diff --git a/examples/declarative/flickr/flickr.pro b/examples/declarative/flickr/flickr.pro index 2903c6e3..ff83bcb2 100644 --- a/examples/declarative/flickr/flickr.pro +++ b/examples/declarative/flickr/flickr.pro @@ -1,7 +1,7 @@ TEMPLATE=app -TARGET = qml_location_flickr +TARGET = qml_position_flickr -QT += qml quick network location +QT += qml quick network positioning SOURCES += qmllocationflickr.cpp RESOURCES += \ @@ -9,8 +9,8 @@ RESOURCES += \ OTHER_FILES += flickr.qml -target.path = $$[QT_INSTALL_EXAMPLES]/qtlocation/declarative/flickr +target.path = $$[QT_INSTALL_EXAMPLES]/qtpositioning/declarative/flickr sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.qml flickrcommon flickrmobile -sources.path = $$[QT_INSTALL_EXAMPLES]/qtlocation/declarative/flickr +sources.path = $$[QT_INSTALL_EXAMPLES]/qtpositioning/declarative/flickr INSTALLS += target sources diff --git a/examples/declarative/flickr/flickrmobile/GeoTab.qml b/examples/declarative/flickr/flickrmobile/GeoTab.qml index 4cbffc17..ecfda612 100644 --- a/examples/declarative/flickr/flickrmobile/GeoTab.qml +++ b/examples/declarative/flickr/flickrmobile/GeoTab.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtLocation 5.0 +import QtPositioning 5.0 Rectangle { id: container diff --git a/examples/declarative/mapviewer/content/map/MapComponent.qml b/examples/declarative/mapviewer/content/map/MapComponent.qml index 33963968..6f8bca98 100644 --- a/examples/declarative/mapviewer/content/map/MapComponent.qml +++ b/examples/declarative/mapviewer/content/map/MapComponent.qml @@ -39,6 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 import QtLocation 5.0 +import QtPositioning 5.0 import QtLocation.examples 5.0 //! [top] diff --git a/examples/declarative/mapviewer/mapviewer.qml b/examples/declarative/mapviewer/mapviewer.qml index f5a05f72..5609821a 100644 --- a/examples/declarative/mapviewer/mapviewer.qml +++ b/examples/declarative/mapviewer/mapviewer.qml @@ -40,6 +40,7 @@ import QtQuick 2.0 import QtLocation 5.0 +import QtPositioning 5.0 import QtLocation.examples 5.0 import "content/map" import "content/dialogs" @@ -305,9 +306,9 @@ Item { tempGeocodeModel.reset() messageDialog.state = "" if (routeDialog.byCoordinates) { - startCoordinate = QtLocation.coordinate(parseFloat(routeDialog.startLatitude), + startCoordinate = QtPositioning.coordinate(parseFloat(routeDialog.startLatitude), parseFloat(routeDialog.startLongitude)); - endCoordinate = QtLocation.coordinate(parseFloat(routeDialog.endLatitude), + endCoordinate = QtPositioning.coordinate(parseFloat(routeDialog.endLatitude), parseFloat(routeDialog.endLongitude)); calculateRoute() @@ -421,7 +422,7 @@ Item { onGoButtonClicked: { page.state = "" messageDialog.state = "" - map.geocodeModel.query = QtLocation.coordinate(parseFloat(dialogModel.get(0).inputText), + map.geocodeModel.query = QtPositioning.coordinate(parseFloat(dialogModel.get(0).inputText), parseFloat(dialogModel.get(1).inputText)); map.geocodeModel.update(); } @@ -449,7 +450,7 @@ Item { var newLong = parseFloat(dialogModel.get(1).inputText) if (newLat !== "NaN" && newLong !== "NaN") { - var c = QtLocation.coordinate(newLat, newLong); + var c = QtPositioning.coordinate(newLat, newLong); if (c.isValid) { map.markers[map.currentMarker].coordinate = c; map.center = c; diff --git a/examples/declarative/places/content/places/MapComponent.qml b/examples/declarative/places/content/places/MapComponent.qml index d35bf1fe..bafb38ff 100644 --- a/examples/declarative/places/content/places/MapComponent.qml +++ b/examples/declarative/places/content/places/MapComponent.qml @@ -39,6 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 +import QtPositioning 5.0 import QtLocation 5.0 import QtLocation.examples 5.0 diff --git a/examples/declarative/places/content/places/PlaceDialog.qml b/examples/declarative/places/content/places/PlaceDialog.qml index c64c121b..ed08716d 100644 --- a/examples/declarative/places/content/places/PlaceDialog.qml +++ b/examples/declarative/places/content/places/PlaceDialog.qml @@ -132,7 +132,7 @@ Dialog { locationPlace.location.address.country = dataFieldsModel.get(7).inputText; locationPlace.location.address.postalCode = dataFieldsModel.get(8).inputText; - var c = QtLocation.coordinate(parseFloat(dataFieldsModel.get(9).inputText), + var c = QtPositioning.coordinate(parseFloat(dataFieldsModel.get(9).inputText), parseFloat(dataFieldsModel.get(10).inputText)); locationPlace.location.coordinate = c; var phone = Qt.createQmlObject('import QtLocation 5.0; ContactDetail { }', locationPlace); diff --git a/examples/declarative/places/places.qml b/examples/declarative/places/places.qml index 2df5b538..2d2ca749 100644 --- a/examples/declarative/places/places.qml +++ b/examples/declarative/places/places.qml @@ -39,6 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 +import QtPositioning 5.0 import QtLocation 5.0 import QtLocation.examples 5.0 import "content/places" @@ -49,7 +50,7 @@ Item { height: (parent && parent.height > 0) ? parent.height : 640 property variant map property variant startLocation - property variant searchRegion: QtLocation.circle(startLocation) + property variant searchRegion: QtPositioning.circle(startLocation) property variant searchRegionItem property Plugin favoritesPlugin @@ -58,7 +59,7 @@ Item { Binding { target: page property: "startLocation" - value: map ? map.center : QtLocation.coordinate() + value: map ? map.center : QtPositioning.coordinate() } Rectangle { @@ -212,12 +213,12 @@ Item { onCancelButtonClicked: page.state = "" onGoButtonClicked: { - var c = QtLocation.coordinate(parseFloat(dialogModel.get(0).inputText), + var c = QtPositioning.coordinate(parseFloat(dialogModel.get(0).inputText), parseFloat(dialogModel.get(1).inputText)); map.center = c; - searchRegion = Qt.binding(function() { return QtLocation.circle(startLocation) }); + searchRegion = Qt.binding(function() { return QtPositioning.circle(startLocation) }); if (searchRegionItem) { map.removeMapItem(searchRegionItem); @@ -249,9 +250,9 @@ Item { onCancelButtonClicked: page.state = "" onGoButtonClicked: { - var c = QtLocation.coordinate(parseFloat(dialogModel.get(0).inputText), + var c = QtPositioning.coordinate(parseFloat(dialogModel.get(0).inputText), parseFloat(dialogModel.get(1).inputText)); - var r = QtLocation.rectangle(c, parseFloat(dialogModel.get(2).inputText), + var r = QtPositioning.rectangle(c, parseFloat(dialogModel.get(2).inputText), parseFloat(dialogModel.get(3).inputText)); map.center = c; @@ -292,9 +293,9 @@ Item { onCancelButtonClicked: page.state = "" onGoButtonClicked: { - var c = QtLocation.coordinate(parseFloat(dialogModel.get(0).inputText), + var c = QtPositioning.coordinate(parseFloat(dialogModel.get(0).inputText), parseFloat(dialogModel.get(1).inputText)); - var circle = QtLocation.circle(c, parseFloat(dialogModel.get(2).inputText)); + var circle = QtPositioning.circle(c, parseFloat(dialogModel.get(2).inputText)); map.center = c; @@ -519,7 +520,7 @@ Item { MapItemView { model: placeSearchModel delegate: MapQuickItem { - coordinate: model.type === PlaceSearchModel.PlaceResult ? place.location.coordinate : QtLocation.coordinate() + coordinate: model.type === PlaceSearchModel.PlaceResult ? place.location.coordinate : QtPositioning.coordinate() visible: model.type === PlaceSearchModel.PlaceResult diff --git a/examples/declarative/places_list/places_list.qml b/examples/declarative/places_list/places_list.qml index be7849b7..92808159 100644 --- a/examples/declarative/places_list/places_list.qml +++ b/examples/declarative/places_list/places_list.qml @@ -40,12 +40,14 @@ //! [Imports] import QtQuick 2.0 +import QtPositioning 5.0 import QtLocation 5.0 //! [Imports] Rectangle { width: 360 height: 360 + property variant startCoordinate: QtPositioning.coordinate(-27.46778, 153.02778) //! [Initialize Plugin] Plugin { @@ -65,13 +67,7 @@ Rectangle { plugin: myPlugin searchTerm: "pizza" - searchArea: GeoCircle { - center { - // Brisbane - longitude: 153.02778 - latitude: -27.46778 - } - } + searchArea: QtPositioning.circle(startCoordinate); Component.onCompleted: update() diff --git a/examples/declarative/places_map/places_map.qml b/examples/declarative/places_map/places_map.qml index 29684af4..8ba703ff 100644 --- a/examples/declarative/places_map/places_map.qml +++ b/examples/declarative/places_map/places_map.qml @@ -40,6 +40,7 @@ //! [Imports] import QtQuick 2.0 +import QtPositioning 5.0 import QtLocation 5.0 //! [Imports] @@ -65,13 +66,8 @@ Rectangle { plugin: myPlugin searchTerm: "Pizza" - searchArea: GeoCircle { - center { - // Brisbane - longitude: 153.02778 - latitude: -27.46778 - } - } + //Brisbane + searchArea: QtPositioning.circle(QtPositioning.coordinate(-27.46778, 153.02778)) Component.onCompleted: update() } diff --git a/examples/examples.pro b/examples/examples.pro index fa19990e..837e277e 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -1,4 +1,7 @@ TEMPLATE = subdirs -qtHaveModule(quick): SUBDIRS += declarative weatherinfo -qtHaveModule(widgets): SUBDIRS += logfilepositionsource +qtHaveModule(quick) { + SUBDIRS += declarative + qtHaveModule(positioning): SUBDIRS += weatherinfo +} +qtHaveModule(positioning): qtHaveModule(widgets): SUBDIRS += logfilepositionsource diff --git a/examples/logfilepositionsource/logfilepositionsource.pro b/examples/logfilepositionsource/logfilepositionsource.pro index afd7b975..bd00a169 100644 --- a/examples/logfilepositionsource/logfilepositionsource.pro +++ b/examples/logfilepositionsource/logfilepositionsource.pro @@ -1,6 +1,6 @@ TEMPLATE = app TARGET = logfilepositionsource -QT = location core widgets +QT = positioning core widgets HEADERS = logfilepositionsource.h \ @@ -9,8 +9,8 @@ SOURCES = logfilepositionsource.cpp \ clientapplication.cpp \ main.cpp -target.path = $$[QT_INSTALL_EXAMPLES]/qtlocation/logfilepositionsource +target.path = $$[QT_INSTALL_EXAMPLES]/qtpositioning/logfilepositionsource sources.files = $$SOURCES $$HEADERS *.pro simplelog.txt -sources.path = $$[QT_INSTALL_EXAMPLES]/qtlocation/logfilepositionsource +sources.path = $$[QT_INSTALL_EXAMPLES]/qtpositioning/logfilepositionsource INSTALLS += target sources diff --git a/examples/weatherinfo/weatherinfo.pro b/examples/weatherinfo/weatherinfo.pro index 698115ba..1470b8a0 100644 --- a/examples/weatherinfo/weatherinfo.pro +++ b/examples/weatherinfo/weatherinfo.pro @@ -1,7 +1,7 @@ TEMPLATE = app TARGET = weatherinfo -QT += core network location qml quick +QT += core network positioning qml quick SOURCES += main.cpp \ appmodel.cpp @@ -16,7 +16,7 @@ RESOURCES += weatherinfo.qrc HEADERS += appmodel.h #install -target.path = $$[QT_INSTALL_EXAMPLES]/qtlocation/weatherinfo +target.path = $$[QT_INSTALL_EXAMPLES]/qtpositioning/weatherinfo sources.files = $$SOURCES $HEADERS $$RESOURCES $$FORMS *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtlocation/weatherinfo +sources.path = $$[QT_INSTALL_EXAMPLES]/qtpositioning/weatherinfo INSTALLS += target sources diff --git a/src/imports/imports.pro b/src/imports/imports.pro index ad697cfb..ac340141 100644 --- a/src/imports/imports.pro +++ b/src/imports/imports.pro @@ -1,4 +1,5 @@ TEMPLATE = subdirs -qtHaveModule(3d): SUBDIRS += location +qtHaveModule(positioning): SUBDIRS += positioning +qtHaveModule(3d):qtHaveModule(location): SUBDIRS += location diff --git a/src/imports/location/declarativeplaces/qdeclarativeplace.cpp b/src/imports/location/declarativeplaces/qdeclarativeplace.cpp index 5c60594b..208d955f 100644 --- a/src/imports/location/declarativeplaces/qdeclarativeplace.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativeplace.cpp @@ -441,7 +441,7 @@ QPlace QDeclarativePlace::place() } /*! - \qmlproperty QtLocation5::Location Place::location + \qmlproperty QtPositioning5::Location Place::location This property holds the location of the place which can be used to retrieve the coordinate, address and the bounding box. diff --git a/src/imports/location/declarativeplaces/qdeclarativeplaceattribute.cpp b/src/imports/location/declarativeplaces/qdeclarativeplaceattribute.cpp index a2c596b6..fc3bb15c 100644 --- a/src/imports/location/declarativeplaces/qdeclarativeplaceattribute.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativeplaceattribute.cpp @@ -101,7 +101,7 @@ \snippet declarative/places.qml ExtendedAttributes read The following example shows how to assign and modify an attribute: - \snippet declarative/places.qml + \snippet declarative/places.qml ExtendedAttributes write \sa PlaceAttribute, QQmlPropertyMap */ diff --git a/src/imports/location/declarativeplaces/qdeclarativesearchmodelbase.cpp b/src/imports/location/declarativeplaces/qdeclarativesearchmodelbase.cpp index 46edd91e..217ff9da 100644 --- a/src/imports/location/declarativeplaces/qdeclarativesearchmodelbase.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativesearchmodelbase.cpp @@ -48,7 +48,7 @@ #include <QtLocation/QPlaceManager> #include <QtLocation/QPlaceSearchRequest> #include <QtLocation/QPlaceSearchReply> -#include <QtLocation/QGeoCircle> +#include <QtPositioning/QGeoCircle> QDeclarativeSearchModelBase::QDeclarativeSearchModelBase(QObject *parent) : QAbstractListModel(parent), m_plugin(0), m_reply(0), m_complete(false), m_status(Null) diff --git a/src/imports/location/declarativeplaces/qdeclarativesearchresultmodel.cpp b/src/imports/location/declarativeplaces/qdeclarativesearchresultmodel.cpp index 9a44dac1..8d182ea8 100644 --- a/src/imports/location/declarativeplaces/qdeclarativesearchresultmodel.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativesearchresultmodel.cpp @@ -149,10 +149,9 @@ QT_USE_NAMESPACE fetch search results, but rather performs a single fetch when \l update() is run. The \l count is set to the number of search results returned during the fetch. - \snippet declarative/places.qml QtQuick import - \snippet declarative/places.qml QtLocation import + \snippet places_list/places_list.qml Imports \codeline - \snippet declarative/places.qml PlaceSearchModel + \snippet places_list/places_list.qml PlaceSearchModel \sa CategoryModel, {QPlaceManager} @@ -278,7 +277,7 @@ QT_USE_NAMESPACE PlaceSearchModel { id: model plugin: backendPlugin - searchArea: QtLocation.circle(QtLocation.coordinate(10, 10)) + searchArea: QtPositioning.circle(QtPositioning.coordinate(10, 10)) ... } diff --git a/src/imports/location/declarativeplaces/qdeclarativesearchsuggestionmodel.cpp b/src/imports/location/declarativeplaces/qdeclarativesearchsuggestionmodel.cpp index e344d8ea..f190cc4f 100644 --- a/src/imports/location/declarativeplaces/qdeclarativesearchsuggestionmodel.cpp +++ b/src/imports/location/declarativeplaces/qdeclarativesearchsuggestionmodel.cpp @@ -106,7 +106,7 @@ QT_USE_NAMESPACE */ /*! - \qmlproperty GeoShape PlaceSearchSuggestionModel::searchArea + \qmlproperty geoshape PlaceSearchSuggestionModel::searchArea This property holds the search area. Search suggestion results returned by the model will be relevant to the given search area. @@ -172,7 +172,7 @@ QT_USE_NAMESPACE PlaceSeachSuggestionModel { id: model plugin: backendPlugin - searchArea: QtLocation.circle(QtLocation.coordinate(10, 10)) + searchArea: QtPositioning.circle(QtPositioning.coordinate(10, 10)) ... } diff --git a/src/imports/location/location.cpp b/src/imports/location/location.cpp index b3313c71..894d555e 100644 --- a/src/imports/location/location.cpp +++ b/src/imports/location/location.cpp @@ -39,17 +39,6 @@ ** ****************************************************************************/ -#include "locationvaluetypeprovider.h" - -#include "qdeclarativepositionsource_p.h" -#include "qdeclarativeposition_p.h" - -#include "qdeclarativegeoshape.h" -#include "qdeclarativegeorectangle.h" -#include "qdeclarativegeocircle.h" -#include "qdeclarativegeoaddress_p.h" -#include "qdeclarativecoordinate_p.h" - #include "qdeclarativegeoserviceprovider_p.h" #include "qdeclarativegeomap_p.h" @@ -71,7 +60,6 @@ //Place includes #include "qdeclarativecategory_p.h" -#include "qdeclarativegeolocation_p.h" #include "qdeclarativeplace_p.h" #include "qdeclarativeplaceattribute_p.h" #include "qdeclarativeplaceicon_p.h" @@ -85,34 +73,16 @@ #include "qdeclarativesearchsuggestionmodel_p.h" #include "error_messages.h" -#include "locationsingleton.h" - #include <QtQml/qqmlextensionplugin.h> #include <QtQml/qqml.h> #include <QtQml/private/qqmlvaluetype_p.h> #include <QtQml/private/qqmlglobal_p.h> #include <QtQml/private/qqmlmetatype_p.h> -#include <QtLocation/QGeoRectangle> -#include <QtLocation/QGeoCircle> - #include <QtCore/QDebug> QT_BEGIN_NAMESPACE -static QObject *singleton_type_factory(QQmlEngine *engine, QJSEngine *jsEngine) -{ - Q_UNUSED(engine) - Q_UNUSED(jsEngine) - - return new LocationSingleton; -} - -static LocationValueTypeProvider *getValueTypeProvider() -{ - static LocationValueTypeProvider provider; - return &provider; -} class QLocationDeclarativeModule: public QQmlExtensionPlugin { @@ -132,15 +102,6 @@ public: // @uri QtLocation 5.0 - qmlRegisterSingletonType<LocationSingleton>(uri, 5, 0, "QtLocation", singleton_type_factory); - - QQml_addValueTypeProvider(getValueTypeProvider()); - qmlRegisterValueTypeEnums<GeoShapeValueType>(uri, 5, 0, "GeoShape"); - - qmlRegisterType<QDeclarativePosition>(uri, 5, 0, "Position"); - qmlRegisterType<QDeclarativePositionSource>(uri, 5, 0, "PositionSource"); - qmlRegisterType<QDeclarativeGeoAddress>(uri, 5, 0, "Address"); - qmlRegisterType<QDeclarativeGeoServiceProvider>(uri, 5, 0, "Plugin"); qmlRegisterType<QDeclarativeGeoServiceProviderParameter>(uri, 5, 0, "PluginParameter"); qmlRegisterUncreatableType<QDeclarativeGeoServiceProviderRequirements>(uri, 5, 0, "PluginRequirements", QCoreApplication::translate(CONTEXT_NAME, NOT_INSTANTIABLE_BY_DEVELOPER).arg("PluginRequirements")); @@ -163,7 +124,6 @@ public: qmlRegisterUncreatableType<QDeclarativeGeoMapType>(uri, 5, 0, "MapType", QCoreApplication::translate(CONTEXT_NAME, NOT_INSTANTIABLE_BY_DEVELOPER).arg("MapType")); qmlRegisterType<QDeclarativeCategory>(uri, 5, 0, "Category"); qmlRegisterType<QDeclarativePlaceEditorialModel>(uri, 5, 0, "EditorialModel"); - qmlRegisterType<QDeclarativeGeoLocation>(uri, 5, 0, "Location"); qmlRegisterType<QDeclarativePlaceImageModel>(uri, 5, 0, "ImageModel"); qmlRegisterType<QDeclarativePlace>(uri, 5, 0, "Place"); qmlRegisterType<QDeclarativePlaceIcon>(uri, 5, 0, "Icon"); @@ -189,11 +149,6 @@ public: qmlRegisterUncreatableType<QDeclarativeContactDetails>(uri, 5, 0, "ContactDetails", "ContactDetails instances cannot be instantiated. " "Only Place types have ContactDetails and they cannot " "be re-assigned (but can be modified)."); - qRegisterMetaType<QGeoCoordinate>("QGeoCoordinate"); - qRegisterMetaType<QGeoAddress>("QGeoAddress"); - qRegisterMetaType<QGeoRectangle>("QGeoRectangle"); - qRegisterMetaType<QGeoCircle>("QGeoCircle"); - qRegisterMetaType<QGeoLocation>("QGeoLocation"); qRegisterMetaType<QPlaceCategory>("QPlaceCategory"); qRegisterMetaType<QPlace>("QPlace"); qRegisterMetaType<QPlaceIcon>("QPlaceIcon"); diff --git a/src/imports/location/location.pro b/src/imports/location/location.pro index 4c110ddd..8dccfa2d 100644 --- a/src/imports/location/location.pro +++ b/src/imports/location/location.pro @@ -1,7 +1,8 @@ -QT += quick-private network location-private qml-private 3d core-private gui-private +QT += quick-private network positioning-private location-private qml-private 3d core-private gui-private INCLUDEPATH += ../../location INCLUDEPATH += ../../location/maps +INCLUDEPATH += ../../positioning INCLUDEPATH *= $$PWD LIBS += -L../../3rdparty/poly2tri -lpoly2tri @@ -14,18 +15,11 @@ win32 { } } -HEADERS += qdeclarativeposition_p.h \ - qdeclarativepositionsource_p.h \ - qdeclarativecoordinate_p.h \ - qdeclarativegeolocation_p.h \ +HEADERS += \ qdeclarativegeomapitemview_p.h \ qdeclarativegeomapmouseevent_p.h \ qdeclarativegeomapmousearea_p.h \ qdeclarativegeoserviceprovider_p.h \ - qdeclarativegeoaddress_p.h \ - qdeclarativegeoshape.h \ - qdeclarativegeorectangle.h \ - qdeclarativegeocircle.h \ qdeclarativegeocodemodel_p.h \ qdeclarativegeoroutemodel_p.h \ qdeclarativegeoroute_p.h \ @@ -45,22 +39,14 @@ HEADERS += qdeclarativeposition_p.h \ qdeclarativegeomapcopyrightsnotice_p.h \ qdeclarativegeomapgesturearea_p.h \ error_messages.h \ - locationvaluetypeprovider.h \ - locationsingleton.h + locationvaluetypehelper_p.h -SOURCES += qdeclarativeposition.cpp \ +SOURCES += \ location.cpp \ - qdeclarativepositionsource.cpp \ - qdeclarativecoordinate.cpp \ - qdeclarativegeolocation.cpp \ qdeclarativegeomapitemview.cpp \ qdeclarativegeomapmouseevent.cpp \ qdeclarativegeomapmousearea.cpp \ qdeclarativegeoserviceprovider.cpp \ - qdeclarativegeoaddress.cpp \ - qdeclarativegeoshape.cpp \ - qdeclarativegeorectangle.cpp \ - qdeclarativegeocircle.cpp \ qdeclarativegeocodemodel.cpp \ qdeclarativegeoroutemodel.cpp \ qdeclarativegeoroute.cpp \ @@ -80,8 +66,7 @@ SOURCES += qdeclarativeposition.cpp \ qdeclarativegeomapcopyrightsnotice.cpp \ qdeclarativegeomapgesturearea.cpp \ error_messages.cpp \ - locationvaluetypeprovider.cpp \ - locationsingleton.cpp + locationvaluetypehelper.cpp include(declarativeplaces/declarativeplaces.pri) diff --git a/src/imports/location/locationvaluetypehelper.cpp b/src/imports/location/locationvaluetypehelper.cpp new file mode 100644 index 00000000..95790955 --- /dev/null +++ b/src/imports/location/locationvaluetypehelper.cpp @@ -0,0 +1,122 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtLocation module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** 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. +** +** 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. +** +** 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. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "locationvaluetypehelper_p.h" + + +QGeoCoordinate parseCoordinate(const QJSValue &value, bool *ok) +{ + QGeoCoordinate c; + + if (value.isObject()) { + if (value.hasProperty(QStringLiteral("latitude"))) + c.setLatitude(value.property(QStringLiteral("latitude")).toNumber()); + if (value.hasProperty(QStringLiteral("longitude"))) + c.setLongitude(value.property(QStringLiteral("longitude")).toNumber()); + if (value.hasProperty(QStringLiteral("altitude"))) + c.setAltitude(value.property(QStringLiteral("altitude")).toNumber()); + + if (ok) + *ok = true; + } + + return c; +} + +QGeoRectangle parseRectangle(const QJSValue &value, bool *ok) +{ + QGeoRectangle r; + + *ok = false; + + if (value.isObject()) { + if (value.hasProperty(QStringLiteral("bottomLeft"))) { + QGeoCoordinate c = parseCoordinate(value.property(QStringLiteral("bottomLeft")), ok); + if (*ok) + r.setBottomLeft(c); + } + if (value.hasProperty(QStringLiteral("bottomRight"))) { + QGeoCoordinate c = parseCoordinate(value.property(QStringLiteral("bottomRight")), ok); + if (*ok) + r.setBottomRight(c); + } + if (value.hasProperty(QStringLiteral("topLeft"))) { + QGeoCoordinate c = parseCoordinate(value.property(QStringLiteral("topLeft")), ok); + if (*ok) + r.setTopLeft(c); + } + if (value.hasProperty(QStringLiteral("topRight"))) { + QGeoCoordinate c = parseCoordinate(value.property(QStringLiteral("topRight")), ok); + if (*ok) + r.setTopRight(c); + } + if (value.hasProperty(QStringLiteral("center"))) { + QGeoCoordinate c = parseCoordinate(value.property(QStringLiteral("center")), ok); + if (*ok) + r.setCenter(c); + } + if (value.hasProperty(QStringLiteral("height"))) + r.setHeight(value.property(QStringLiteral("height")).toNumber()); + if (value.hasProperty(QStringLiteral("width"))) + r.setWidth(value.property(QStringLiteral("width")).toNumber()); + } + + return r; +} + +QGeoCircle parseCircle(const QJSValue &value, bool *ok) +{ + QGeoCircle c; + + *ok = false; + + if (value.isObject()) { + if (value.hasProperty(QStringLiteral("center"))) { + QGeoCoordinate coord = parseCoordinate(value.property(QStringLiteral("center")), ok); + if (*ok) + c.setCenter(coord); + } + if (value.hasProperty(QStringLiteral("radius"))) + c.setRadius(value.property(QStringLiteral("radius")).toNumber()); + } + + return c; +} diff --git a/src/imports/location/locationvaluetypehelper_p.h b/src/imports/location/locationvaluetypehelper_p.h new file mode 100644 index 00000000..9c5bb481 --- /dev/null +++ b/src/imports/location/locationvaluetypehelper_p.h @@ -0,0 +1,54 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtLocation module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** 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. +** +** 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. +** +** 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. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef LOCATION_VALUE_TYPE_HELPER +#define LOCATION_VALUE_TYPE_HELPER + +#include <QJSValue> +#include <QGeoCoordinate> +#include <QGeoRectangle> +#include <QGeoCircle> + +QGeoCoordinate parseCoordinate(const QJSValue &value, bool *ok); +QGeoRectangle parseRectangle(const QJSValue &value, bool *ok); +QGeoCircle parseCircle(const QJSValue &value, bool *ok); + +#endif diff --git a/src/imports/location/plugins.qmltypes b/src/imports/location/plugins.qmltypes index bb59436e..c4319665 100644 --- a/src/imports/location/plugins.qmltypes +++ b/src/imports/location/plugins.qmltypes @@ -7,75 +7,6 @@ import QtQuick.tooling 1.1 Module { Component { - name: "GeoShapeValueType" - prototype: "QQmlValueType" - exports: ["QtLocation/GeoShape 5.0"] - exportMetaObjectRevisions: [0] - Enum { - name: "ShapeType" - values: { - "UnknownType": 0, - "RectangleType": 1, - "CircleType": 2 - } - } - Property { name: "type"; type: "ShapeType"; isReadonly: true } - Property { name: "isValid"; type: "bool"; isReadonly: true } - Property { name: "isEmpty"; type: "bool"; isReadonly: true } - Method { - name: "contains" - type: "bool" - Parameter { name: "coordinate"; type: "QGeoCoordinate" } - } - } - Component { - name: "LocationSingleton" - prototype: "QObject" - exports: ["QtLocation/QtLocation 5.0"] - exportMetaObjectRevisions: [0] - Method { name: "coordinate"; type: "QGeoCoordinate" } - Method { - name: "coordinate" - type: "QGeoCoordinate" - Parameter { name: "latitude"; type: "double" } - Parameter { name: "longitude"; type: "double" } - Parameter { name: "altitude"; type: "double" } - } - Method { - name: "coordinate" - type: "QGeoCoordinate" - Parameter { name: "latitude"; type: "double" } - Parameter { name: "longitude"; type: "double" } - } - Method { name: "shape"; type: "QGeoShape" } - Method { name: "rectangle"; type: "QGeoRectangle" } - Method { - name: "rectangle" - type: "QGeoRectangle" - Parameter { name: "center"; type: "QGeoCoordinate" } - Parameter { name: "width"; type: "double" } - Parameter { name: "height"; type: "double" } - } - Method { - name: "rectangle" - type: "QGeoRectangle" - Parameter { name: "topLeft"; type: "QGeoCoordinate" } - Parameter { name: "bottomRight"; type: "QGeoCoordinate" } - } - Method { name: "circle"; type: "QGeoCircle" } - Method { - name: "circle" - type: "QGeoCircle" - Parameter { name: "center"; type: "QGeoCoordinate" } - Parameter { name: "radius"; type: "double" } - } - Method { - name: "circle" - type: "QGeoCircle" - Parameter { name: "center"; type: "QGeoCoordinate" } - } - } - Component { name: "QDeclarativeCategory" prototype: "QObject" exports: ["QtLocation/Category 5.0"] @@ -157,33 +88,6 @@ Module { exportMetaObjectRevisions: [0] } Component { - name: "QDeclarativeGeoAddress" - prototype: "QObject" - exports: ["QtLocation/Address 5.0"] - exportMetaObjectRevisions: [0] - Property { name: "address"; type: "QGeoAddress" } - Property { name: "text"; type: "string" } - Property { name: "country"; type: "string" } - Property { name: "countryCode"; type: "string" } - Property { name: "state"; type: "string" } - Property { name: "county"; type: "string" } - Property { name: "city"; type: "string" } - Property { name: "district"; type: "string" } - Property { name: "street"; type: "string" } - Property { name: "postalCode"; type: "string" } - Property { name: "isTextGenerated"; type: "bool"; isReadonly: true } - } - Component { - name: "QDeclarativeGeoLocation" - prototype: "QObject" - exports: ["QtLocation/Location 5.0"] - exportMetaObjectRevisions: [0] - Property { name: "location"; type: "QGeoLocation" } - Property { name: "address"; type: "QDeclarativeGeoAddress"; isPointer: true } - Property { name: "coordinate"; type: "QGeoCoordinate" } - Property { name: "boundingBox"; type: "QGeoRectangle" } - } - Component { name: "QDeclarativeGeoManeuver" prototype: "QObject" exports: ["QtLocation/RouteManeuver 5.0"] @@ -1084,68 +988,6 @@ Module { } } Component { - name: "QDeclarativePosition" - prototype: "QObject" - exports: ["QtLocation/Position 5.0"] - exportMetaObjectRevisions: [0] - Property { name: "latitudeValid"; type: "bool"; isReadonly: true } - Property { name: "longitudeValid"; type: "bool"; isReadonly: true } - Property { name: "altitudeValid"; type: "bool"; isReadonly: true } - Property { name: "coordinate"; type: "QGeoCoordinate"; isReadonly: true } - Property { name: "timestamp"; type: "QDateTime"; isReadonly: true } - Property { name: "speed"; type: "double"; isReadonly: true } - Property { name: "speedValid"; type: "bool"; isReadonly: true } - Property { name: "horizontalAccuracy"; type: "double" } - Property { name: "verticalAccuracy"; type: "double" } - Property { name: "horizontalAccuracyValid"; type: "bool"; isReadonly: true } - Property { name: "verticalAccuracyValid"; type: "bool"; isReadonly: true } - } - Component { - name: "QDeclarativePositionSource" - prototype: "QObject" - exports: ["QtLocation/PositionSource 5.0"] - exportMetaObjectRevisions: [0] - Enum { - name: "PositioningMethod" - values: { - "NoPositioningMethod": 0, - "SatellitePositioningMethod": 255, - "NonSatellitePositioningMethod": -256, - "AllPositioningMethods": -1 - } - } - Enum { - name: "PositioningMethods" - values: { - "NoPositioningMethod": 0, - "SatellitePositioningMethod": 255, - "NonSatellitePositioningMethod": -256, - "AllPositioningMethods": -1 - } - } - Enum { - name: "SourceError" - values: { - "AccessError": 0, - "ClosedError": 1, - "UnknownSourceError": -1 - } - } - Property { name: "position"; type: "QDeclarativePosition"; isReadonly: true; isPointer: true } - Property { name: "active"; type: "bool" } - Property { name: "valid"; type: "bool"; isReadonly: true } - Property { name: "nmeaSource"; type: "QUrl" } - Property { name: "updateInterval"; type: "int" } - Property { name: "supportedPositioningMethods"; type: "PositioningMethods"; isReadonly: true } - Property { name: "preferredPositioningMethods"; type: "PositioningMethods" } - Property { name: "sourceError"; type: "SourceError"; isReadonly: true } - Property { name: "name"; type: "string" } - Signal { name: "validityChanged" } - Method { name: "update" } - Method { name: "start" } - Method { name: "stop" } - } - Component { name: "QDeclarativeRatings" prototype: "QObject" exports: ["QtLocation/Ratings 5.0"] @@ -1238,7 +1080,8 @@ Module { name: "SearchResultType" values: { "UnknownSearchResult": 0, - "PlaceResult": 1 + "PlaceResult": 1, + "ProposedSearchResult": 2 } } Enum { @@ -1265,6 +1108,10 @@ Module { Parameter { name: "index"; type: "int" } Parameter { name: "roleName"; type: "string" } } + Method { + name: "updateWith" + Parameter { name: "proposedSearchIndex"; type: "int" } + } } Component { name: "QDeclarativeSearchSuggestionModel" diff --git a/src/imports/location/qdeclarativecirclemapitem.cpp b/src/imports/location/qdeclarativecirclemapitem.cpp index 7ffaa406..eb9d1272 100644 --- a/src/imports/location/qdeclarativecirclemapitem.cpp +++ b/src/imports/location/qdeclarativecirclemapitem.cpp @@ -319,10 +319,12 @@ QDeclarativeCircleMapItem::~QDeclarativeCircleMapItem() } /*! + \qmlpropertygroup Location::MapCircle::border \qmlproperty int MapCircle::border.width \qmlproperty color MapCircle::border.color - These properties hold the width and color used to draw the border of the circle. + This property is part of the border group property. + The border property holds the width and color used to draw the border of the circle. The width is in pixels and is independent of the zoom level of the map. The default values correspond to a black border with a width of 1 pixel. diff --git a/src/imports/location/qdeclarativegeocodemodel.cpp b/src/imports/location/qdeclarativegeocodemodel.cpp index ca22a270..d242ec75 100644 --- a/src/imports/location/qdeclarativegeocodemodel.cpp +++ b/src/imports/location/qdeclarativegeocodemodel.cpp @@ -41,12 +41,11 @@ #include "qdeclarativegeocodemodel_p.h" #include "error_messages.h" -#include "qdeclarativegeolocation_p.h" #include <QtQml/qqmlinfo.h> #include <QtLocation/QGeoServiceProvider> #include <QtLocation/QGeocodingManager> -#include <QtLocation/QGeoCircle> +#include <QtPositioning/QGeoCircle> QT_BEGIN_NAMESPACE @@ -332,10 +331,10 @@ void QDeclarativeGeocodeModel::setBounds(const QVariant &boundingArea) } /*! - \qmlproperty GeoShape QtLocation5::GeocodeModel::bounds + \qmlproperty geoshape QtLocation5::GeocodeModel::bounds This property holds the bounding area used to limit the results to those - within the area. his is particularly useful if query is only partially filled out, + within the area. This is particularly useful if query is only partially filled out, as the service will attempt to (reverse) geocode all matches for the specified data. Accepted types are \l {georectangle} and @@ -498,7 +497,7 @@ int QDeclarativeGeocodeModel::count() const } /*! - \qmlmethod QtLocation5::GeocodeModel::get(int) + \qmlmethod Location QtLocation5::GeocodeModel::get(int) Returns the Location at given index. Use \l count property to check the amount of locations available. The locations are indexed from zero, so the accessible range diff --git a/src/imports/location/qdeclarativegeocodemodel_p.h b/src/imports/location/qdeclarativegeocodemodel_p.h index 66d34d6d..f5b16a25 100644 --- a/src/imports/location/qdeclarativegeocodemodel_p.h +++ b/src/imports/location/qdeclarativegeocodemodel_p.h @@ -44,12 +44,12 @@ #include "qdeclarativegeoserviceprovider_p.h" -#include "qdeclarativegeocircle.h" #include <qgeocodereply.h> +#include <QtPositioning/private/qdeclarativegeoaddress_p.h> +#include <QtPositioning/private/qdeclarativegeolocation_p.h> #include <QtQml/qqml.h> #include <QtQml/QQmlParserStatus> -#include "qdeclarativegeolocation_p.h" #include <QAbstractListModel> #include <QPointer> diff --git a/src/imports/location/qdeclarativegeomaneuver_p.h b/src/imports/location/qdeclarativegeomaneuver_p.h index e03f9b81..f81124fa 100644 --- a/src/imports/location/qdeclarativegeomaneuver_p.h +++ b/src/imports/location/qdeclarativegeomaneuver_p.h @@ -44,7 +44,7 @@ #include <qgeomaneuver.h> -#include "qdeclarativecoordinate_p.h" +#include <QtPositioning/QGeoCoordinate> #include <QObject> diff --git a/src/imports/location/qdeclarativegeomap.cpp b/src/imports/location/qdeclarativegeomap.cpp index 2283e22a..2b860eb3 100644 --- a/src/imports/location/qdeclarativegeomap.cpp +++ b/src/imports/location/qdeclarativegeomap.cpp @@ -45,7 +45,6 @@ #include "qdeclarativecirclemapitem_p.h" #include "qdeclarativegeomapquickitem_p.h" -#include "qdeclarativecoordinate_p.h" #include "qdeclarativegeoserviceprovider_p.h" #include <QtCore/QCoreApplication> #include <QtCore/qnumeric.h> diff --git a/src/imports/location/qdeclarativegeomapgesturearea.cpp b/src/imports/location/qdeclarativegeomapgesturearea.cpp index 22eeba07..e75b41f1 100644 --- a/src/imports/location/qdeclarativegeomapgesturearea.cpp +++ b/src/imports/location/qdeclarativegeomapgesturearea.cpp @@ -41,7 +41,6 @@ #include "qdeclarativegeomapgesturearea_p.h" #include "qdeclarativegeomap_p.h" -#include "qdeclarativecoordinate_p.h" #include "error_messages.h" #include <QtGui/QGuiApplication> diff --git a/src/imports/location/qdeclarativegeomapitembase_p.h b/src/imports/location/qdeclarativegeomapitembase_p.h index 2cb482d4..78424124 100644 --- a/src/imports/location/qdeclarativegeomapitembase_p.h +++ b/src/imports/location/qdeclarativegeomapitembase_p.h @@ -45,7 +45,6 @@ #include <QtQuick/QQuickItem> #include "qdeclarativegeomap_p.h" -#include "qdeclarativecoordinate_p.h" QT_BEGIN_NAMESPACE diff --git a/src/imports/location/qdeclarativegeomapmousearea_p.h b/src/imports/location/qdeclarativegeomapmousearea_p.h index 7a23ea2f..3c89ef0b 100644 --- a/src/imports/location/qdeclarativegeomapmousearea_p.h +++ b/src/imports/location/qdeclarativegeomapmousearea_p.h @@ -42,7 +42,6 @@ #ifndef QDECLARATIVEGEOMAPMOUSEAREA_H #define QDECLARATIVEGEOMAPMOUSEAREA_H -#include "qdeclarativecoordinate_p.h" #include "qdeclarativegeomap_p.h" #include "qdeclarativegeomapmouseevent_p.h" diff --git a/src/imports/location/qdeclarativegeomapmouseevent_p.h b/src/imports/location/qdeclarativegeomapmouseevent_p.h index 0529419f..34341d07 100644 --- a/src/imports/location/qdeclarativegeomapmouseevent_p.h +++ b/src/imports/location/qdeclarativegeomapmouseevent_p.h @@ -42,7 +42,7 @@ #ifndef QDECLARATIVEGEOMAPMOUSEEVENT_H #define QDECLARATIVEGEOMAPMOUSEEVENT_H -#include "qdeclarativecoordinate_p.h" +#include <QtPositioning/QGeoCoordinate> #include <QtQml/qqml.h> diff --git a/src/imports/location/qdeclarativegeomapquickitem.cpp b/src/imports/location/qdeclarativegeomapquickitem.cpp index 8a9b0c6e..3db74289 100644 --- a/src/imports/location/qdeclarativegeomapquickitem.cpp +++ b/src/imports/location/qdeclarativegeomapquickitem.cpp @@ -41,7 +41,6 @@ #include "qdeclarativegeomapquickitem_p.h" #include "qdeclarativegeomapmousearea_p.h" -#include "qdeclarativecoordinate_p.h" #include <QtQml/qqmlinfo.h> #include <QtQuick/QSGOpacityNode> diff --git a/src/imports/location/qdeclarativegeomapquickitem_p.h b/src/imports/location/qdeclarativegeomapquickitem_p.h index c67dd170..1ed658d9 100644 --- a/src/imports/location/qdeclarativegeomapquickitem_p.h +++ b/src/imports/location/qdeclarativegeomapquickitem_p.h @@ -46,7 +46,6 @@ #include <QtQuick/QSGNode> #include "qdeclarativegeomap_p.h" -#include "qdeclarativecoordinate_p.h" #include "qdeclarativegeomapitembase_p.h" QT_BEGIN_NAMESPACE diff --git a/src/imports/location/qdeclarativegeoroute.cpp b/src/imports/location/qdeclarativegeoroute.cpp index 87c49e1f..3430a2b9 100644 --- a/src/imports/location/qdeclarativegeoroute.cpp +++ b/src/imports/location/qdeclarativegeoroute.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include "qdeclarativegeoroute_p.h" -#include "locationvaluetypeprovider.h" +#include "locationvaluetypehelper_p.h" #include <private/qjsvalue_p.h> #include <private/qqmlvaluetypewrapper_p.h> @@ -48,7 +48,7 @@ #include <QtQml/QQmlContext> #include <QtQml/qqmlinfo.h> #include <QtQml/private/qqmlengine_p.h> -#include <QtLocation/QGeoRectangle> +#include <QtPositioning/QGeoRectangle> QT_BEGIN_NAMESPACE @@ -114,7 +114,7 @@ QList<QGeoCoordinate> QDeclarativeGeoRoute::routePath() } /*! - \qmlproperty GeoRectangle QtLocation5::Route::bounds + \qmlproperty georectangle QtLocation5::Route::bounds Read-only property which holds a bounding box which encompasses the entire route. @@ -160,7 +160,7 @@ qreal QDeclarativeGeoRoute::distance() const indicates the number of objects and 'path[index starting from zero]' gives the actual object. - \sa QtLocation::coordinate + \sa QtPositioning::coordinate */ QJSValue QDeclarativeGeoRoute::path() const diff --git a/src/imports/location/qdeclarativegeoroute_p.h b/src/imports/location/qdeclarativegeoroute_p.h index 8ea0e078..d9b9e718 100644 --- a/src/imports/location/qdeclarativegeoroute_p.h +++ b/src/imports/location/qdeclarativegeoroute_p.h @@ -45,6 +45,7 @@ #include "qdeclarativegeoroutesegment_p.h" #include <QtCore/QObject> +#include <QtQml/QQmlListProperty> #include <QtQml/private/qv8engine_p.h> #include <QtLocation/QGeoRoute> diff --git a/src/imports/location/qdeclarativegeoroutemodel.cpp b/src/imports/location/qdeclarativegeoroutemodel.cpp index 8afac048..9ace5174 100644 --- a/src/imports/location/qdeclarativegeoroutemodel.cpp +++ b/src/imports/location/qdeclarativegeoroutemodel.cpp @@ -42,7 +42,7 @@ #include "qdeclarativegeoroutemodel_p.h" #include "qdeclarativegeoroute_p.h" #include "error_messages.h" -#include "locationvaluetypeprovider.h" +#include "locationvaluetypehelper_p.h" #include <private/qqmlvaluetypewrapper_p.h> #include <private/qjsvalue_p.h> @@ -52,7 +52,7 @@ #include <QtQml/qqmlinfo.h> #include <QtQml/private/qqmlengine_p.h> #include <QtLocation/QGeoRoutingManager> -#include <QtLocation/QGeoRectangle> +#include <QtPositioning/QGeoRectangle> QT_BEGIN_NAMESPACE @@ -777,7 +777,7 @@ void QDeclarativeGeoRouteQuery::setWaypoints(const QJSValue &value) } /*! - \qmlproperty QQmlListProperty<GeoRectangle> RouteQuery::excludedAreas + \qmlproperty list<georectangle> RouteQuery::excludedAreas Areas that the route must not cross. @@ -835,7 +835,7 @@ void QDeclarativeGeoRouteQuery::setExcludedAreas(const QJSValue &value) } /*! - \qmlmethod QtLocation5::RouteQuery::addExcludedArea(GeoRectangle) + \qmlmethod QtLocation5::RouteQuery::addExcludedArea(georectangle) Adds the given area to excluded areas (areas that the route must not cross). Same area can only be added once. @@ -865,7 +865,7 @@ void QDeclarativeGeoRouteQuery::addExcludedArea(const QGeoRectangle &area) } /*! - \qmlmethod QtLocation5::RouteQuery::removeExcludedArea(GeoRectangle) + \qmlmethod QtLocation5::RouteQuery::removeExcludedArea(georectangle) Removes the given area to excluded areas (areas that the route must not cross). @@ -1086,10 +1086,9 @@ void QDeclarativeGeoRouteQuery::setTravelModes(QDeclarativeGeoRouteQuery::Travel /*! - \qmlproperty SegmentDetail RouteQuery::segmentDetail + \qmlproperty enumeration RouteQuery::segmentDetail The level of detail which will be used in the representation of routing segments. - Values can be combined with OR ('|') -operator. \list \li RouteQuery.NoSegmentData - No segment data should be included with the route @@ -1116,10 +1115,9 @@ QDeclarativeGeoRouteQuery::SegmentDetail QDeclarativeGeoRouteQuery::segmentDetai } /*! - \qmlproperty ManeuverDetail RouteQuery::maneuverDetail + \qmlproperty enumeration RouteQuery::maneuverDetail The level of detail which will be used in the representation of routing maneuvers. - Values can be combined with OR ('|') -operator. \list \li RouteQuery.NoManeuvers - No maneuvers should be included with the route @@ -1182,7 +1180,7 @@ QDeclarativeGeoRouteQuery::TravelModes QDeclarativeGeoRouteQuery::travelModes() } /*! - \qmlproperty RouteOptimizations RouteQuery::routeOptimizations + \qmlproperty enumeration RouteQuery::routeOptimizations The route optimizations which should be considered during the planning of the route. Values can be combined with OR ('|') -operator. diff --git a/src/imports/location/qdeclarativegeoroutemodel_p.h b/src/imports/location/qdeclarativegeoroutemodel_p.h index bf3984d5..0d663eed 100644 --- a/src/imports/location/qdeclarativegeoroutemodel_p.h +++ b/src/imports/location/qdeclarativegeoroutemodel_p.h @@ -44,8 +44,8 @@ #include "qdeclarativegeoserviceprovider_p.h" -#include "qdeclarativecoordinate_p.h" -#include "qdeclarativegeorectangle.h" +#include <QtPositioning/QGeoCoordinate> +#include <QtPositioning/QGeoRectangle> #include <qgeorouterequest.h> #include <qgeoroutereply.h> diff --git a/src/imports/location/qdeclarativegeoroutesegment.cpp b/src/imports/location/qdeclarativegeoroutesegment.cpp index 8199f9ec..3dbe06f8 100644 --- a/src/imports/location/qdeclarativegeoroutesegment.cpp +++ b/src/imports/location/qdeclarativegeoroutesegment.cpp @@ -146,7 +146,7 @@ QDeclarativeGeoManeuver *QDeclarativeGeoRouteSegment::maneuver() const indicates the number of objects and 'path[index starting from zero]' gives the actual object. - \sa QtLocation::coordinate + \sa QtPositioning::coordinate */ QJSValue QDeclarativeGeoRouteSegment::path() const diff --git a/src/imports/location/qdeclarativepolygonmapitem.cpp b/src/imports/location/qdeclarativepolygonmapitem.cpp index 6eedb2c7..c10fe03a 100644 --- a/src/imports/location/qdeclarativepolygonmapitem.cpp +++ b/src/imports/location/qdeclarativepolygonmapitem.cpp @@ -43,7 +43,7 @@ #include "qgeocameracapabilities_p.h" #include "qlocationutils_p.h" #include "error_messages.h" -#include "locationvaluetypeprovider.h" +#include "locationvaluetypehelper_p.h" #include <QtGui/private/qtriangulator_p.h> #include <QtQml/QQmlInfo> @@ -71,10 +71,10 @@ QT_BEGIN_NAMESPACE \brief The MapPolygon type displays a polygon on a Map The MapPolygon type displays a polygon on a Map, specified in terms of an ordered list of - \l {QtLocation::coordinate}{coordinates}. For best appearance and results, polygons should be + \l {QtPositioning::coordinate}{coordinates}. For best appearance and results, polygons should be simple (not self-intersecting). - The \l {QtLocation::coordinate}{coordinates} on the path cannot be directly changed after + The \l {QtPositioning::coordinate}{coordinates} on the path cannot be directly changed after being added to the Polygon. Instead, copy the \l path into a var, modify the copy and reassign the copy back to the \l path. @@ -344,10 +344,13 @@ QDeclarativePolygonMapItem::~QDeclarativePolygonMapItem() } /*! + \qmlpropertygroup Location::MapPolygon::border \qmlproperty int MapPolygon::border.width \qmlproperty color MapPolygon::border.color - These properties hold the width and color used to draw the border of the circle. + This property is part of the border property group. The border property + group holds the width and color used to draw the border of the circle. + The width is in pixels and is independent of the zoom level of the map. The default values correspond to a black border with a width of 1 pixel. diff --git a/src/imports/location/qdeclarativepolylinemapitem.cpp b/src/imports/location/qdeclarativepolylinemapitem.cpp index abdf9d53..144f55ec 100644 --- a/src/imports/location/qdeclarativepolylinemapitem.cpp +++ b/src/imports/location/qdeclarativepolylinemapitem.cpp @@ -43,7 +43,7 @@ #include "qgeocameracapabilities_p.h" #include "qlocationutils_p.h" #include "error_messages.h" -#include "locationvaluetypeprovider.h" +#include "locationvaluetypehelper_p.h" #include <QtQml/QQmlInfo> #include <QtQml/QQmlContext> @@ -590,10 +590,12 @@ void QDeclarativePolylineMapItem::removeCoordinate(const QGeoCoordinate &coordin } /*! + \qmlpropertygroup Location::MapPolyline::line \qmlproperty int MapPolyline::line.width \qmlproperty color MapPolyline::line.color - These properties hold the width and color used to draw the line. + This property is part of the line property group. The line + property group holds the width and color used to draw the line. The width is in pixels and is independent of the zoom level of the map. The default values correspond to a black border with a width of 1 pixel. diff --git a/src/imports/location/qdeclarativerectanglemapitem.cpp b/src/imports/location/qdeclarativerectanglemapitem.cpp index ffb0a2c3..8573ec51 100644 --- a/src/imports/location/qdeclarativerectanglemapitem.cpp +++ b/src/imports/location/qdeclarativerectanglemapitem.cpp @@ -205,10 +205,12 @@ void QDeclarativeRectangleMapItem::setMap(QDeclarativeGeoMap *quickMap, QGeoMap } /*! + \qmlpropertygroup Location::MapRectangle::border \qmlproperty int MapRectangle::border.width \qmlproperty color MapRectangle::border.color - These properties hold the width and color used to draw the border of the rectangle. + This property is part of the border property group. The border property group + holds the width and color used to draw the border of the rectangle. The width is in pixels and is independent of the zoom level of the map. The default values correspond to a black border with a width of 1 pixel. diff --git a/src/imports/location/qdeclarativeroutemapitem.cpp b/src/imports/location/qdeclarativeroutemapitem.cpp index 264ee835..1af8e120 100644 --- a/src/imports/location/qdeclarativeroutemapitem.cpp +++ b/src/imports/location/qdeclarativeroutemapitem.cpp @@ -173,10 +173,12 @@ QSGNode *QDeclarativeRouteMapItem::updateMapItemPaintNode(QSGNode *oldNode, Upda } /*! + \qmlpropertygroup Location::MapRoute::line \qmlproperty int MapRoute::line.width \qmlproperty color MapRoute::line.color - These properties hold the width and color used to draw the line. + This property is part of the line property group. + The line property group holds the width and color used to draw the line. The width is in pixels and is independent of the zoom level of the map. The default values correspond to a black border with a width of 1 pixel. diff --git a/src/imports/location/qdeclarativeroutemapitem_p.h b/src/imports/location/qdeclarativeroutemapitem_p.h index 099b333f..479a621d 100644 --- a/src/imports/location/qdeclarativeroutemapitem_p.h +++ b/src/imports/location/qdeclarativeroutemapitem_p.h @@ -43,7 +43,6 @@ #define QDECLARATIVEROUTEMAPITEM_H_ #include "qdeclarativegeomapitembase_p.h" -#include "qdeclarativecoordinate_p.h" #include "qdeclarativegeomap_p.h" #include "qdeclarativepolylinemapitem_p.h" #include <QPen> diff --git a/src/imports/positioning/error_messages.cpp b/src/imports/positioning/error_messages.cpp new file mode 100644 index 00000000..45b85e0a --- /dev/null +++ b/src/imports/positioning/error_messages.cpp @@ -0,0 +1,48 @@ +/*************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtPositioning module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** 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. +** +** 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. +** +** 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. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ +#include "error_messages.h" + +QT_BEGIN_NAMESPACE + +const char CONTEXT_NAME[] = "QtPositioningQML"; +const char MISSED_NMEA_FILE[] = QT_TRANSLATE_NOOP("QtPositioningQML", "Nmea file not found."); + +QT_END_NAMESPACE diff --git a/src/imports/positioning/error_messages.h b/src/imports/positioning/error_messages.h new file mode 100644 index 00000000..3c888dff --- /dev/null +++ b/src/imports/positioning/error_messages.h @@ -0,0 +1,54 @@ + +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtPositioning module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** 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. +** +** 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. +** +** 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. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ +#ifndef ERROR_MESSAGES_H +#define ERROR_MESSAGES_H + +#include <QString> + +QT_BEGIN_NAMESPACE + +extern const char CONTEXT_NAME[]; +extern const char MISSED_NMEA_FILE[]; + +QT_END_NAMESPACE + +#endif // ERROR_MESSAGES_H diff --git a/src/imports/location/locationsingleton.cpp b/src/imports/positioning/locationsingleton.cpp index e4f9a833..c44db946 100644 --- a/src/imports/location/locationsingleton.cpp +++ b/src/imports/positioning/locationsingleton.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -42,19 +42,18 @@ #include "locationsingleton.h" /*! - \qmltype QtLocation + \qmltype QtPositioning \instantiates LocationSingleton - \inqmlmodule QtLocation 5.0 - \ingroup qml-QtLocation5-common + \inqmlmodule QtPositioning 5.0 - \brief The QtLocation global object provides useful functions for working with Qt Location + \brief The QtPositioning global object provides useful functions for working with location-based types in QML. \qml - import QtLocation 5.0 + import QtPositioning 5.0 Item { - property variant coordinate: QtLocation.coordinate(-27.5, 153.1) + property variant coordinate: QtPositioning.coordinate(-27.5, 153.1) } \endqml */ @@ -65,7 +64,7 @@ LocationSingleton::LocationSingleton(QObject *parent) } /*! - \qmlmethod coordinate QtLocation5::QtLocation::coordinate() + \qmlmethod coordinate ::QtPositioning::coordinate() Constructs an invalid coordinate. @@ -76,7 +75,7 @@ QGeoCoordinate LocationSingleton::coordinate() const } /*! - \qmlmethod coordinate QtLocation5::QtLocation::coordinate(real latitude, real longitue, real altitude) const + \qmlmethod coordinate QtPositioning::coordinate(real latitude, real longitue, real altitude) const Constructs a coordinate with the specified \a latitude, \a longitude and optional \a altitude. Both \a latitude and \a longitude must be valid, otherwise an invalid coordinate is returned. @@ -89,7 +88,7 @@ QGeoCoordinate LocationSingleton::coordinate(double latitude, double longitude, } /*! - \qmlmethod geoshape QtLocation5::QtLocation::shape() const + \qmlmethod geoshape QtPositioning::shape() const Constructs an invalid geoshape. @@ -101,7 +100,7 @@ QGeoShape LocationSingleton::shape() const } /*! - \qmlmethod georectangle QtLocation5::QtLocation::rectangle() const + \qmlmethod georectangle QtPositioning::rectangle() const Constructs an invalid georectangle. @@ -113,7 +112,7 @@ QGeoRectangle LocationSingleton::rectangle() const } /*! - \qmlmethod georectangle QtLocation5::QtLocation::rectangle(coordinate center, real width, real height) const + \qmlmethod georectangle QtPositioning::rectangle(coordinate center, real width, real height) const Constructs a georectangle centered at \a center with a width of \a width degrees and a hight of \a height degrees. @@ -127,7 +126,7 @@ QGeoRectangle LocationSingleton::rectangle(const QGeoCoordinate ¢er, } /*! - \qmlmethod georectangle QtLocation5::QtLocation::rectangle(coordinate topLeft, coordinate bottomRight) const + \qmlmethod georectangle QtPositioning::rectangle(coordinate topLeft, coordinate bottomRight) const Constructs a georectangle with its top left corner positioned at \a topLeft and its bottom right corner positioned at \a {bottomLeft}. @@ -141,7 +140,7 @@ QGeoRectangle LocationSingleton::rectangle(const QGeoCoordinate &topLeft, } /*! - \qmlmethod geocircle QtLocation5::QtLocation::circle() const + \qmlmethod geocircle QtPositioning::circle() const Constructs an invalid geocircle. @@ -153,7 +152,7 @@ QGeoCircle LocationSingleton::circle() const } /*! - \qmlmethod geocircle QtLocation5::QtLocation::circle(coordinate center, real radius) const + \qmlmethod geocircle QtPositioning::circle(coordinate center, real radius) const Constructs a geocircle centered at \a center with a radius of \a radius meters. */ diff --git a/src/imports/location/locationsingleton.h b/src/imports/positioning/locationsingleton.h index b3839ba5..b5e6476e 100644 --- a/src/imports/location/locationsingleton.h +++ b/src/imports/positioning/locationsingleton.h @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -44,10 +44,10 @@ #include <QtCore/QObject> #include <QtCore/qnumeric.h> -#include <QtLocation/QGeoCoordinate> -#include <QtLocation/QGeoShape> -#include <QtLocation/QGeoRectangle> -#include <QtLocation/QGeoCircle> +#include <QtPositioning/QGeoCoordinate> +#include <QtPositioning/QGeoShape> +#include <QtPositioning/QGeoRectangle> +#include <QtPositioning/QGeoCircle> class LocationSingleton : public QObject { diff --git a/src/imports/location/locationvaluetypeprovider.cpp b/src/imports/positioning/locationvaluetypeprovider.cpp index 0477e72a..9ee93dbe 100644 --- a/src/imports/location/locationvaluetypeprovider.cpp +++ b/src/imports/positioning/locationvaluetypeprovider.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -44,90 +44,11 @@ #include "qdeclarativegeoshape.h" #include "qdeclarativegeorectangle.h" #include "qdeclarativegeocircle.h" -#include <QtLocation/QGeoRectangle> -#include <QtLocation/QGeoCircle> +#include <QtPositioning/QGeoRectangle> +#include <QtPositioning/QGeoCircle> QT_BEGIN_NAMESPACE -QGeoCoordinate parseCoordinate(const QJSValue &value, bool *ok) -{ - QGeoCoordinate c; - - if (value.isObject()) { - if (value.hasProperty(QStringLiteral("latitude"))) - c.setLatitude(value.property(QStringLiteral("latitude")).toNumber()); - if (value.hasProperty(QStringLiteral("longitude"))) - c.setLongitude(value.property(QStringLiteral("longitude")).toNumber()); - if (value.hasProperty(QStringLiteral("altitude"))) - c.setAltitude(value.property(QStringLiteral("altitude")).toNumber()); - - if (ok) - *ok = true; - } - - return c; -} - -QGeoRectangle parseRectangle(const QJSValue &value, bool *ok) -{ - QGeoRectangle r; - - *ok = false; - - if (value.isObject()) { - if (value.hasProperty(QStringLiteral("bottomLeft"))) { - QGeoCoordinate c = parseCoordinate(value.property(QStringLiteral("bottomLeft")), ok); - if (*ok) - r.setBottomLeft(c); - } - if (value.hasProperty(QStringLiteral("bottomRight"))) { - QGeoCoordinate c = parseCoordinate(value.property(QStringLiteral("bottomRight")), ok); - if (*ok) - r.setBottomRight(c); - } - if (value.hasProperty(QStringLiteral("topLeft"))) { - QGeoCoordinate c = parseCoordinate(value.property(QStringLiteral("topLeft")), ok); - if (*ok) - r.setTopLeft(c); - } - if (value.hasProperty(QStringLiteral("topRight"))) { - QGeoCoordinate c = parseCoordinate(value.property(QStringLiteral("topRight")), ok); - if (*ok) - r.setTopRight(c); - } - if (value.hasProperty(QStringLiteral("center"))) { - QGeoCoordinate c = parseCoordinate(value.property(QStringLiteral("center")), ok); - if (*ok) - r.setCenter(c); - } - if (value.hasProperty(QStringLiteral("height"))) - r.setHeight(value.property(QStringLiteral("height")).toNumber()); - if (value.hasProperty(QStringLiteral("width"))) - r.setWidth(value.property(QStringLiteral("width")).toNumber()); - } - - return r; -} - -QGeoCircle parseCircle(const QJSValue &value, bool *ok) -{ - QGeoCircle c; - - *ok = false; - - if (value.isObject()) { - if (value.hasProperty(QStringLiteral("center"))) { - QGeoCoordinate coord = parseCoordinate(value.property(QStringLiteral("center")), ok); - if (*ok) - c.setCenter(coord); - } - if (value.hasProperty(QStringLiteral("radius"))) - c.setRadius(value.property(QStringLiteral("radius")).toNumber()); - } - - return c; -} - LocationValueTypeProvider::LocationValueTypeProvider() : QQmlValueTypeProvider() { diff --git a/src/imports/location/locationvaluetypeprovider.h b/src/imports/positioning/locationvaluetypeprovider.h index 2d204aa5..b60d2c99 100644 --- a/src/imports/location/locationvaluetypeprovider.h +++ b/src/imports/positioning/locationvaluetypeprovider.h @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -46,14 +46,6 @@ QT_BEGIN_NAMESPACE -class QGeoCoordinate; -class QGeoRectangle; -class QGeoCircle; - -QGeoCoordinate parseCoordinate(const QJSValue &value, bool *ok); -QGeoRectangle parseRectangle(const QJSValue &value, bool *ok); -QGeoCircle parseCircle(const QJSValue &value, bool *ok); - class LocationValueTypeProvider : public QQmlValueTypeProvider { public: diff --git a/src/imports/positioning/plugin.json b/src/imports/positioning/plugin.json new file mode 100644 index 00000000..2c63c085 --- /dev/null +++ b/src/imports/positioning/plugin.json @@ -0,0 +1,2 @@ +{ +} diff --git a/src/imports/positioning/plugins.qmltypes b/src/imports/positioning/plugins.qmltypes new file mode 100644 index 00000000..3f5b1ff7 --- /dev/null +++ b/src/imports/positioning/plugins.qmltypes @@ -0,0 +1,167 @@ +import QtQuick.tooling 1.1 + +// This file describes the plugin-supplied types contained in the library. +// It is used for QML tooling purposes only. +// +// This file was auto-generated with the command 'qmlplugindump -notrelocatable QtPositioning 5.0'. + +Module { + Component { + name: "GeoShapeValueType" + prototype: "QQmlValueType" + exports: ["QtPositioning/GeoShape 5.0"] + exportMetaObjectRevisions: [0] + Enum { + name: "ShapeType" + values: { + "UnknownType": 0, + "RectangleType": 1, + "CircleType": 2 + } + } + Property { name: "type"; type: "ShapeType"; isReadonly: true } + Property { name: "isValid"; type: "bool"; isReadonly: true } + Property { name: "isEmpty"; type: "bool"; isReadonly: true } + Method { + name: "contains" + type: "bool" + Parameter { name: "coordinate"; type: "QGeoCoordinate" } + } + } + Component { + name: "LocationSingleton" + prototype: "QObject" + exports: ["QtPositioning/QtPositioning 5.0"] + exportMetaObjectRevisions: [0] + Method { name: "coordinate"; type: "QGeoCoordinate" } + Method { + name: "coordinate" + type: "QGeoCoordinate" + Parameter { name: "latitude"; type: "double" } + Parameter { name: "longitude"; type: "double" } + Parameter { name: "altitude"; type: "double" } + } + Method { + name: "coordinate" + type: "QGeoCoordinate" + Parameter { name: "latitude"; type: "double" } + Parameter { name: "longitude"; type: "double" } + } + Method { name: "shape"; type: "QGeoShape" } + Method { name: "rectangle"; type: "QGeoRectangle" } + Method { + name: "rectangle" + type: "QGeoRectangle" + Parameter { name: "center"; type: "QGeoCoordinate" } + Parameter { name: "width"; type: "double" } + Parameter { name: "height"; type: "double" } + } + Method { + name: "rectangle" + type: "QGeoRectangle" + Parameter { name: "topLeft"; type: "QGeoCoordinate" } + Parameter { name: "bottomRight"; type: "QGeoCoordinate" } + } + Method { name: "circle"; type: "QGeoCircle" } + Method { + name: "circle" + type: "QGeoCircle" + Parameter { name: "center"; type: "QGeoCoordinate" } + Parameter { name: "radius"; type: "double" } + } + Method { + name: "circle" + type: "QGeoCircle" + Parameter { name: "center"; type: "QGeoCoordinate" } + } + } + Component { + name: "QDeclarativeGeoAddress" + prototype: "QObject" + exports: ["QtPositioning/Address 5.0"] + exportMetaObjectRevisions: [0] + Property { name: "address"; type: "QGeoAddress" } + Property { name: "text"; type: "string" } + Property { name: "country"; type: "string" } + Property { name: "countryCode"; type: "string" } + Property { name: "state"; type: "string" } + Property { name: "county"; type: "string" } + Property { name: "city"; type: "string" } + Property { name: "district"; type: "string" } + Property { name: "street"; type: "string" } + Property { name: "postalCode"; type: "string" } + Property { name: "isTextGenerated"; type: "bool"; isReadonly: true } + } + Component { + name: "QDeclarativeGeoLocation" + prototype: "QObject" + exports: ["QtPositioning/Location 5.0"] + exportMetaObjectRevisions: [0] + Property { name: "location"; type: "QGeoLocation" } + Property { name: "address"; type: "QDeclarativeGeoAddress"; isPointer: true } + Property { name: "coordinate"; type: "QGeoCoordinate" } + Property { name: "boundingBox"; type: "QGeoRectangle" } + } + Component { + name: "QDeclarativePosition" + prototype: "QObject" + exports: ["QtPositioning/Position 5.0"] + exportMetaObjectRevisions: [0] + Property { name: "latitudeValid"; type: "bool"; isReadonly: true } + Property { name: "longitudeValid"; type: "bool"; isReadonly: true } + Property { name: "altitudeValid"; type: "bool"; isReadonly: true } + Property { name: "coordinate"; type: "QGeoCoordinate"; isReadonly: true } + Property { name: "timestamp"; type: "QDateTime"; isReadonly: true } + Property { name: "speed"; type: "double"; isReadonly: true } + Property { name: "speedValid"; type: "bool"; isReadonly: true } + Property { name: "horizontalAccuracy"; type: "double" } + Property { name: "verticalAccuracy"; type: "double" } + Property { name: "horizontalAccuracyValid"; type: "bool"; isReadonly: true } + Property { name: "verticalAccuracyValid"; type: "bool"; isReadonly: true } + } + Component { + name: "QDeclarativePositionSource" + prototype: "QObject" + exports: ["QtPositioning/PositionSource 5.0"] + exportMetaObjectRevisions: [0] + Enum { + name: "PositioningMethod" + values: { + "NoPositioningMethod": 0, + "SatellitePositioningMethod": 255, + "NonSatellitePositioningMethod": -256, + "AllPositioningMethods": -1 + } + } + Enum { + name: "PositioningMethods" + values: { + "NoPositioningMethod": 0, + "SatellitePositioningMethod": 255, + "NonSatellitePositioningMethod": -256, + "AllPositioningMethods": -1 + } + } + Enum { + name: "SourceError" + values: { + "AccessError": 0, + "ClosedError": 1, + "UnknownSourceError": -1 + } + } + Property { name: "position"; type: "QDeclarativePosition"; isReadonly: true; isPointer: true } + Property { name: "active"; type: "bool" } + Property { name: "valid"; type: "bool"; isReadonly: true } + Property { name: "nmeaSource"; type: "QUrl" } + Property { name: "updateInterval"; type: "int" } + Property { name: "supportedPositioningMethods"; type: "PositioningMethods"; isReadonly: true } + Property { name: "preferredPositioningMethods"; type: "PositioningMethods" } + Property { name: "sourceError"; type: "SourceError"; isReadonly: true } + Property { name: "name"; type: "string" } + Signal { name: "validityChanged" } + Method { name: "update" } + Method { name: "start" } + Method { name: "stop" } + } +} diff --git a/src/imports/positioning/positioning.cpp b/src/imports/positioning/positioning.cpp new file mode 100644 index 00000000..031b06b2 --- /dev/null +++ b/src/imports/positioning/positioning.cpp @@ -0,0 +1,123 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtPositioning module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** 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. +** +** 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. +** +** 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. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "locationvaluetypeprovider.h" + +#include <QtPositioning/private/qdeclarativegeoaddress_p.h> +#include <QtPositioning/private/qdeclarativegeolocation_p.h> + +#include "qdeclarativepositionsource_p.h" +#include "qdeclarativeposition_p.h" + +#include "qdeclarativegeoshape.h" +#include "qdeclarativegeorectangle.h" +#include "qdeclarativegeocircle.h" +#include "qdeclarativecoordinate_p.h" + +#include "locationsingleton.h" + +#include <QtQml/qqmlextensionplugin.h> +#include <QtQml/qqml.h> +#include <QtQml/private/qqmlvaluetype_p.h> +#include <QtQml/private/qqmlglobal_p.h> +#include <QtQml/private/qqmlmetatype_p.h> + +#include <QtPositioning/QGeoRectangle> +#include <QtPositioning/QGeoCircle> +#include <QtPositioning/QGeoLocation> + +#include <QtCore/QDebug> + +QT_BEGIN_NAMESPACE + +static QObject *singleton_type_factory(QQmlEngine *engine, QJSEngine *jsEngine) +{ + Q_UNUSED(engine) + Q_UNUSED(jsEngine) + + return new LocationSingleton; +} + +static LocationValueTypeProvider *getValueTypeProvider() +{ + static LocationValueTypeProvider provider; + return &provider; +} + +class QLocationDeclarativeModule: public QQmlExtensionPlugin +{ + Q_OBJECT + + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0" + FILE "plugin.json") + +public: + virtual void registerTypes(const char *uri) + { + if (QLatin1String(uri) == QLatin1String("QtPositioning")) { + + // @uri QtPositioning 5.0 + + qmlRegisterSingletonType<LocationSingleton>(uri, 5, 0, "QtPositioning", singleton_type_factory); + + QQml_addValueTypeProvider(getValueTypeProvider()); + qmlRegisterValueTypeEnums<GeoShapeValueType>(uri, 5, 0, "GeoShape"); + + qmlRegisterType<QDeclarativePosition>(uri, 5, 0, "Position"); + qmlRegisterType<QDeclarativePositionSource>(uri, 5, 0, "PositionSource"); + qmlRegisterType<QDeclarativeGeoAddress>(uri, 5, 0, "Address"); + + qmlRegisterType<QDeclarativeGeoLocation>(uri, 5, 0, "Location"); + + qRegisterMetaType<QGeoCoordinate>("QGeoCoordinate"); + qRegisterMetaType<QGeoAddress>("QGeoAddress"); + qRegisterMetaType<QGeoRectangle>("QGeoRectangle"); + qRegisterMetaType<QGeoCircle>("QGeoCircle"); + qRegisterMetaType<QGeoLocation>("QGeoLocation"); + } else { + qDebug() << "Unsupported URI given to load positioning QML plugin: " << QLatin1String(uri); + } + } +}; + +#include "positioning.moc" + +QT_END_NAMESPACE diff --git a/src/imports/positioning/positioning.pro b/src/imports/positioning/positioning.pro new file mode 100644 index 00000000..2d396463 --- /dev/null +++ b/src/imports/positioning/positioning.pro @@ -0,0 +1,32 @@ +QT += quick-private positioning-private qml-private core-private + +INCLUDEPATH *= $$PWD +DEFINES += TOUCH_EVENT_WORKAROUND + +HEADERS += qdeclarativeposition_p.h \ + qdeclarativepositionsource_p.h \ + qdeclarativecoordinate_p.h \ + qdeclarativegeoshape.h \ + qdeclarativegeorectangle.h \ + qdeclarativegeocircle.h \ + locationvaluetypeprovider.h \ + locationsingleton.h \ + error_messages.h \ + locationvaluetypehelper_p.h + +SOURCES += qdeclarativeposition.cpp \ + positioning.cpp \ + qdeclarativepositionsource.cpp \ + qdeclarativecoordinate.cpp \ + qdeclarativegeoshape.cpp \ + qdeclarativegeorectangle.cpp \ + qdeclarativegeocircle.cpp \ + locationvaluetypeprovider.cpp \ + locationsingleton.cpp \ + error_messages.cpp + +load(qml_plugin) + +OTHER_FILES += \ + plugin.json \ + qmldir diff --git a/src/imports/location/qdeclarativecoordinate.cpp b/src/imports/positioning/qdeclarativecoordinate.cpp index f832d4f2..20dd5cef 100644 --- a/src/imports/location/qdeclarativecoordinate.cpp +++ b/src/imports/positioning/qdeclarativecoordinate.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -45,22 +45,22 @@ QT_BEGIN_NAMESPACE /*! \qmlbasictype coordinate - \inqmlmodule QtLocation 5.0 - \ingroup qml-QtLocation5-basictypes - \since Qt Location 5.0 + \inqmlmodule QtPositioning 5.0 + \ingroup qml-QtPositioning5-basictypes + \since Qt Positioning 5.0 \brief The coordinate type represents and stores a geographic position. - The \c coordinate type represents a geographic position in the form of \c {latitude}, - \c longitude and \c altitude attributes. The \c latitude attribute specifies the number of + The \c coordinate type represents a geographic position in the form of \l {latitude}, + \l longitude and \l altitude attributes. The \l latitude attribute specifies the number of decimal degrees above and below the equator. A positive latitude indicates the Northern - Hemisphere and a negative latitude indicates the Southern Hemisphere. The \c longitude + Hemisphere and a negative latitude indicates the Southern Hemisphere. The \l longitude attribute specifies the number of decimal degrees east and west. A positive longitude indicates the Eastern Hemisphere and a negative longitude indicates the Western Hemisphere. - The \c altitude attribute specifies the number of meters above sea level. Together, these + The \l altitude attribute specifies the number of meters above sea level. Together, these attributes specify a 3-dimensional position anywhere on or near the Earth's surface. - The \c isValid attribute can be used to test if a coordinate is valid. A coordinate is + The \l isValid attribute can be used to test if a coordinate is valid. A coordinate is considered valid if it has a valid latitude and longitude. A valid altitude is not required. The latitude must be between -90 and 90 inclusive and the longitude must be between -180 and 180 inclusive. @@ -81,19 +81,19 @@ QT_BEGIN_NAMESPACE \section2 Example Usage Use properties of type \l variant to store a \c {coordinate}. To create a \c coordinate use - one of the methods described below. In all cases, specifying the \c altitude attribute is + one of the methods described below. In all cases, specifying the \l altitude attribute is optional. - To create a \c coordinate value, use the \l{QtLocation5::QtLocation}{QtLocation.coordinate()} + To create a \c coordinate value, use the \l{QtPositioning::coordinate}{QtPositioning.coordinate()} function: \qml - import QtLocation 5.0 + import QtPositioning 5.0 - Location { coordinate: QtLocation.coordinate(-27.5, 153.1) } + Location { coordinate: QtPositioning.coordinate(-27.5, 153.1) } \endqml - or as separate \c {latitude}, \c longitude and \c altitude components: + or as separate \l latitude, \l longitude and \l altitude components: \qml Location { @@ -107,6 +107,55 @@ QT_BEGIN_NAMESPACE When integrating with C++, note that any QGeoCoordinate value passed into QML from C++ is automatically converted into a \c coordinate value, and vice-versa. + \section2 Properties + + \section3 latitude + + \code + real latitude + \endcode + + This property holds latitude value of the geographical position + (decimal degrees). A positive latitude indicates the Northern Hemisphere, + and a negative latitude indicates the Southern Hemisphere. + If the property has not been set, its default value is NaN. + + \section3 longitude + + \code + real longitude + \endcode + + This property holds the longitude value of the geographical position + (decimal degrees). A positive longitude indicates the Eastern Hemisphere, + and a negative longitude indicates the Western Hemisphere + If the property has not been set, its default value is NaN. + + \section3 altitude + + \code + real altitude + \endcode + + This property holds the value of altitude (meters above sea level). + If the property has not been set, its default value is NaN. + + \section3 isValid + + \code + bool isValid + \endcode + + This property holds the current validity of the coordinate. Coordinates + are considered valid if they have been set with a valid latitude and + longitude (altitude is not required). + + The latitude must be between -90 to 90 inclusive to be considered valid, + and the longitude must be between -180 to 180 inclusive to be considered + valid. + + This is a read-only property. + \section2 Methods \section3 distanceTo() diff --git a/src/imports/location/qdeclarativecoordinate_p.h b/src/imports/positioning/qdeclarativecoordinate_p.h index 1e4e6dd5..8f7a47e5 100644 --- a/src/imports/location/qdeclarativecoordinate_p.h +++ b/src/imports/positioning/qdeclarativecoordinate_p.h @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -43,7 +43,7 @@ #define QDECLARATIVECOORDINATE_H #include <QtQml/private/qqmlvaluetype_p.h> -#include <QtLocation/QGeoCoordinate> +#include <QtPositioning/QGeoCoordinate> QT_BEGIN_NAMESPACE diff --git a/src/imports/location/qdeclarativegeocircle.cpp b/src/imports/positioning/qdeclarativegeocircle.cpp index cfa533a9..4424d2d7 100644 --- a/src/imports/location/qdeclarativegeocircle.cpp +++ b/src/imports/positioning/qdeclarativegeocircle.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -42,7 +42,7 @@ #include "qdeclarativegeocircle.h" #include <QtCore/qnumeric.h> -#include <QtLocation/QGeoCircle> +#include <QtPositioning/QGeoCircle> #include <QtCore/QDebug> @@ -50,35 +50,55 @@ QT_BEGIN_NAMESPACE /*! \qmlbasictype geocircle - \inqmlmodule QtLocation 5.0 - \ingroup qml-QtLocation5-positioning - \since Qt Location 5.0 + \inqmlmodule QtPositioning 5.0 + \ingroup qml-QtPositioning5-basictypes + \since Qt Positioning 5.0 \brief The geocircle type represents a circular geographic area. The \c geocircle type is a \l {geoshape} that represents a circular geographic area. It is defined in terms of a \l {coordinate} which - specifies the \c center of the circle and a qreal which specifies the \c radius of the circle + specifies the \l center of the circle and a qreal which specifies the \l radius of the circle in meters. - The circle is considered invalid if the center coordinate is invalid or if the radius is less + The circle is considered invalid if the \l center coordinate is invalid or if the \l radius is less than zero. \section2 Example Usage Use properties of type \l variant to store a \c {geocircle}. To create a \c geocircle value, - use the \l {QtLocation::circle}{QtLocation.circle()} function: + use the \l {QtPositioning::circle}{QtPositioning.circle()} function: \qml - import QtLocation 5.0 + import QtPositioning 5.0 Item { - property variant region: QtLocation.circle(QtLocation.coordinate(-27.5, 153.1), 1000) + property variant region: QtPositioning.circle(QtPositioning.coordinate(-27.5, 153.1), 1000) } \endqml When integrating with C++, note that any QGeoCircle value passed into QML from C++ is automatically converted into a \c geocircle value, and vise-versa. + + \section2 Properties + + \section3 center + + \code + coordinate radius + \endcode + + This property holds the coordinate of the center of the geocircle. + + \section3 radius + + \code + real radius + \endcode + + This property holds the radius of the geocircle in meters. + + The default value for the radius is -1 indicating an invalid geocircle area. */ GeoCircleValueType::GeoCircleValueType(QObject *parent) @@ -109,7 +129,7 @@ void GeoCircleValueType::setCenter(const QGeoCoordinate &coordinate) v = c; } -/*! +/* This property holds the radius of the geocircle in meters. The default value for the radius is -1 indicating an invalid geocircle area. diff --git a/src/imports/location/qdeclarativegeocircle.h b/src/imports/positioning/qdeclarativegeocircle.h index 7345d697..82948f8f 100644 --- a/src/imports/location/qdeclarativegeocircle.h +++ b/src/imports/positioning/qdeclarativegeocircle.h @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage diff --git a/src/imports/location/qdeclarativegeorectangle.cpp b/src/imports/positioning/qdeclarativegeorectangle.cpp index 8dc0dd6a..f1162b77 100644 --- a/src/imports/location/qdeclarativegeorectangle.cpp +++ b/src/imports/positioning/qdeclarativegeorectangle.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -42,7 +42,7 @@ #include "qdeclarativegeorectangle.h" #include <QtCore/qnumeric.h> -#include <QtLocation/QGeoRectangle> +#include <QtPositioning/QGeoRectangle> #include <QtCore/QDebug> @@ -50,25 +50,25 @@ QT_BEGIN_NAMESPACE /*! \qmlbasictype georectangle - \inqmlmodule QtLocation 5.0 - \ingroup qml-QtLocation5-positioning - \since Qt Location 5.0 + \inqmlmodule QtPositioning 5.0 + \ingroup qml-QtPositioning5-basictypes + \since Qt Positioning 5.0 \brief The georectangle type represents a rectangular geographic area. The \c georectangle type is a \l {geoshape} that represents a rectangular geographic area. It is defined by a pair of \l {coordinate}{coordinates} which represent the top-left and bottom-right corners - of the \c {georectangle}. The coordinates are accessible from the \c topLeft and - \c bottomRight attributes. + of the \c {georectangle}. The coordinates are accessible from the \l topLeft and + \l bottomRight attributes. A \c georectangle is considered invalid if the top-left or bottom-right coordinates are invalid or if the top-left coordinate is South of the bottom-right coordinate. The coordinates of the four corners of the \c georectangle can be accessed with the - \c {topLeft}, \c {topRight}, \c {bottomLeft} and \c {bottomRight} attributes. The \c center - attribute can be used to get the coordinate of the center of the \c georectangle. The \c width - and \c height attributes can be used to get the width and height of the \c georectangle in + \l {topLeft}, \l {topRight}, \l {bottomLeft} and \l {bottomRight} attributes. The \l center + attribute can be used to get the coordinate of the center of the \c georectangle. The \l width + and \l height attributes can be used to get the width and height of the \c georectangle in degrees. Setting one of these attributes will cause the other attributes to be adjusted accordingly. @@ -83,18 +83,79 @@ QT_BEGIN_NAMESPACE \section2 Example Usage Use properties of type \l variant to store a \c {georectangle}. To create a \c georectangle - value, use the \l {QtLocation::rectangle}{QtLocation.rectangle()} function: + value, use the \l {QtPositioning::rectangle}{QtPositioning.rectangle()} function: \qml - import QtLocation 5.0 + import QtPositioning 5.0 Item { - property variant region: QtLocation.rectangle(QtLocation.coordinate(-27.5, 153.1), QtLocation.coordinate(-27.6, 153.2)) + property variant region: QtPositioning.rectangle(QtPositioning.coordinate(-27.5, 153.1), QtPositioning.coordinate(-27.6, 153.2)) } \endqml When integrating with C++, note that any QGeoRectangle value passed into QML from C++ is automatically converted into a \c georectangle value, and vice-versa. + + \section2 Properties + + \section3 bottomLeft + + \code + coordinate bottomLeft + \endcode + + This property holds the bottom left coordinate of this georectangle. + + \section3 bottomRight + + \code + coordinate bottomRight + \endcode + + This property holds the bottom right coordinate of this georectangle. + + \section3 center + + \code + coordinate center + \endcode + + This property holds the center coordinate of this georectangle. For more details + see \l {QGeoRectangle::setCenter()}. + + \section3 height + + \code + double height + \endcode + + This property holds the height of this georectangle (in degrees). For more details + see \l {QGeoRectangle::setHeight()}. + + \section3 topLeft + + \code + coordinate topLeft + \endcode + + This property holds the top left coordinate of this georectangle. + + \section3 topRight + + \code + coordinate topRight + \endcode + + This property holds the top right coordinate of this georectangle. + + \section3 width + + \code + double width + \endcode + + This property holds the width of this georectangle (in degrees). For more details + see \l {QGeoRectangle::setWidth()}. */ GeoRectangleValueType::GeoRectangleValueType(QObject *parent) diff --git a/src/imports/location/qdeclarativegeorectangle.h b/src/imports/positioning/qdeclarativegeorectangle.h index 98c93d79..eaf63dce 100644 --- a/src/imports/location/qdeclarativegeorectangle.h +++ b/src/imports/positioning/qdeclarativegeorectangle.h @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage diff --git a/src/imports/location/qdeclarativegeoshape.cpp b/src/imports/positioning/qdeclarativegeoshape.cpp index e08f8edc..d79f5622 100644 --- a/src/imports/location/qdeclarativegeoshape.cpp +++ b/src/imports/positioning/qdeclarativegeoshape.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -41,31 +41,30 @@ #include "qdeclarativegeoshape.h" -#include <QtLocation/QGeoRectangle> -#include <QtLocation/QGeoCircle> +#include <QtPositioning/QGeoRectangle> +#include <QtPositioning/QGeoCircle> QT_BEGIN_NAMESPACE /*! \qmlbasictype geoshape - \inqmlmodule QtLocation 5.0 - \ingroup qml-QtLocation5-basictypes - \since Qt Location 5.0 + \inqmlmodule QtPositioning 5.0 + \ingroup qml-QtPositioning5-basictypes + \since Qt Positioning 5.0 \brief A geoshape type represents an abstract geographic area. The \c geoshape type represents an abstract geographic area. It includes attributes and methods common to all geographic areas. To create objects that represent a valid geographic - area use \l {georectangle}{georectangle} or - \l {geocircle}{geocircle}. + area use \l {georectangle} or \l {geocircle}. - The \c isValid attribute can be used to test if the geoshape represents a valid geographic + The \l isValid attribute can be used to test if the geoshape represents a valid geographic area. - The \c isEmpty attribute can be used to test if the geoshape represents a region with a + The \l isEmpty attribute can be used to test if the geoshape represents a region with a geomatrical area of 0. - The \l contains() method can be used to test if a \l {QtLocation::coordinate}{coordinate} is + The \l contains() method can be used to test if a \l {coordinate} is within the geoshape. \section2 Example Usage @@ -76,26 +75,50 @@ QT_BEGIN_NAMESPACE To create a \c geoshape value, specify it as a "shape()" string: \qml - import QtLocation + import QtPositioning Item { property variant region: "shape()" } \endqml - or with the \l {QtLocation::QtLocation}{QtLocation.shape()} function: + or with the \l {QtPositioning::shape}{QtPositioning.shape()} function: \qml - import QtLocation 5.0 + import QtPositioning 5.0 Item { - property variant region: QtLocation.shape() + property variant region: QtPositioning.shape() } \endqml When integrating with C++, note that any QGeoShape value passed into QML from C++ is automatically converted into a \c geoshape value, and vice-versa. + \section2 Properties + + \section3 isEmpty + + \code + bool isEmpty + \endcode + + Returns whether this geo shape is empty. An empty geo shape is a region which has + a geometrical area of 0. + + \section3 isValid + + \code + bool isValid + \endcode + + Returns whether this geo shape is valid. + + A geo shape is considered to be invalid if some of the data that is required to + unambiguously describe the geo shape has not been set or has been set to an + unsuitable value. + + \section2 Methods \section3 contains() @@ -104,7 +127,7 @@ QT_BEGIN_NAMESPACE bool contains(coordinate coord) \endcode - Returns true if the \l {QtLocation::coordinate}{coordinate} specified by \a coord is within + Returns true if the \l {QtPositioning::coordinate}{coordinate} specified by \a coord is within this geoshape; Otherwise returns false. */ diff --git a/src/imports/location/qdeclarativegeoshape.h b/src/imports/positioning/qdeclarativegeoshape.h index 9f0c16db..e75830b0 100644 --- a/src/imports/location/qdeclarativegeoshape.h +++ b/src/imports/positioning/qdeclarativegeoshape.h @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -43,7 +43,7 @@ #define QDECLARATIVEGEOSHAPE_H #include <QtQml/private/qqmlvaluetype_p.h> -#include <QtLocation/QGeoShape> +#include <QtPositioning/QGeoShape> QT_BEGIN_NAMESPACE diff --git a/src/imports/location/qdeclarativeposition.cpp b/src/imports/positioning/qdeclarativeposition.cpp index bbd53423..bce1b1fa 100644 --- a/src/imports/location/qdeclarativeposition.cpp +++ b/src/imports/positioning/qdeclarativeposition.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -49,9 +49,8 @@ QT_BEGIN_NAMESPACE /*! \qmltype Position \instantiates QDeclarativePosition - \inqmlmodule QtLocation 5.0 - \ingroup qml-QtLocation5-positioning - \since Qt Location 5.0 + \inqmlmodule QtPositioning 5.0 + \since Qt Positioning 5.0 \brief The Position type holds positional data at a particular point in time, such as coordinate (longitude, latitude, altitude) and speed. diff --git a/src/imports/location/qdeclarativeposition_p.h b/src/imports/positioning/qdeclarativeposition_p.h index bf424176..99c2d8fc 100644 --- a/src/imports/location/qdeclarativeposition_p.h +++ b/src/imports/positioning/qdeclarativeposition_p.h @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage diff --git a/src/imports/location/qdeclarativepositionsource.cpp b/src/imports/positioning/qdeclarativepositionsource.cpp index d4605a42..97ad1bbc 100644 --- a/src/imports/location/qdeclarativepositionsource.cpp +++ b/src/imports/positioning/qdeclarativepositionsource.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -54,9 +54,8 @@ QT_BEGIN_NAMESPACE /*! \qmltype PositionSource \instantiates QDeclarativePositionSource - \inqmlmodule QtLocation 5.0 - \ingroup qml-QtLocation5-positioning - \since Qt Location 5.0 + \inqmlmodule QtPositioning 5.0 + \since Qt Positioning 5.0 \brief The PositionSource type provides the device's current position. @@ -111,7 +110,7 @@ QT_BEGIN_NAMESPACE a PositionSource in your application to retrieve local data for users from a REST web service. - \sa {QtLocation5::Position}, {QGeoPositionInfoSource} + \sa {QtPositioning5::Position}, {QGeoPositionInfoSource} */ diff --git a/src/imports/location/qdeclarativepositionsource_p.h b/src/imports/positioning/qdeclarativepositionsource_p.h index dea18b62..70506c00 100644 --- a/src/imports/location/qdeclarativepositionsource_p.h +++ b/src/imports/positioning/qdeclarativepositionsource_p.h @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -46,7 +46,7 @@ #include <QtCore/QObject> #include <QtQml/QQmlParserStatus> -#include <QtLocation/QGeoPositionInfoSource> +#include <QtPositioning/QGeoPositionInfoSource> QT_BEGIN_NAMESPACE diff --git a/src/imports/positioning/qmldir b/src/imports/positioning/qmldir new file mode 100644 index 00000000..4143e0d5 --- /dev/null +++ b/src/imports/positioning/qmldir @@ -0,0 +1,3 @@ +module QtPositioning +plugin declarative_positioning +typeinfo plugins.qmltypes diff --git a/src/location/doc/images/flickr-demo.jpg b/src/location/doc/images/flickr-demo.jpg Binary files differdeleted file mode 100644 index cfd12819..00000000 --- a/src/location/doc/images/flickr-demo.jpg +++ /dev/null diff --git a/src/location/doc/qtlocation.qdocconf b/src/location/doc/qtlocation.qdocconf index a5b10857..8e000634 100644 --- a/src/location/doc/qtlocation.qdocconf +++ b/src/location/doc/qtlocation.qdocconf @@ -36,13 +36,14 @@ qhp.QtLocation.subprojects.examples.selectors = fake:example tagfile = ../../../doc/qtlocation/qtlocation.tags -depends += qtcore qtdoc qtquick qtqml qtnetwork +depends += qtcore qtdoc qtquick qtqml qtnetwork qtpositioning headerdirs += .. \ ../../imports/location sourcedirs += .. \ ../../imports/location \ + ../../plugins/geoservices/nokia exampledirs += ../../../examples \ ../../../examples/declarative \ diff --git a/src/location/doc/snippets/cpp/cppqml.cpp b/src/location/doc/snippets/cpp/cppqml.cpp index 93d2b603..34386ca8 100644 --- a/src/location/doc/snippets/cpp/cppqml.cpp +++ b/src/location/doc/snippets/cpp/cppqml.cpp @@ -48,10 +48,6 @@ #include <QtLocation/QPlaceUser> #include <QtLocation/QPlaceRatings> #include <QtLocation/QPlaceSupplier> -#include <QtLocation/QGeoAddress> -#include <QtLocation/QGeoRectangle> -#include <QtLocation/QGeoCircle> -#include <QtLocation/QGeoLocation> void cppQmlInterface(QObject *qmlObject) { @@ -118,21 +114,5 @@ void cppQmlInterface(QObject *qmlObject) //! [Supplier set] qmlObject->setProperty("supplier", QVariant::fromValue(placeSupplier)); //! [Supplier set] - - //! [Address get] - QGeoAddress geoAddress = qmlObject->property("address").value<QGeoAddress>(); - //! [Address get] - - //! [Address set] - qmlObject->setProperty("address", QVariant::fromValue(geoAddress)); - //! [Address set] - - //! [Location get] - QGeoLocation geoLocation = qmlObject->property("location").value<QGeoLocation>(); - //! [Location get] - - //! [Location set] - qmlObject->setProperty("location", QVariant::fromValue(geoLocation)); - //! [Location set] } diff --git a/src/location/doc/snippets/declarative/declarative-location.qml b/src/location/doc/snippets/declarative/declarative-location.qml index 111fe727..9b0efa42 100644 --- a/src/location/doc/snippets/declarative/declarative-location.qml +++ b/src/location/doc/snippets/declarative/declarative-location.qml @@ -40,7 +40,7 @@ //![0] import QtQuick 2.0 -import QtLocation 5.0 +import QtPositioning 5.0 Rectangle { id: page diff --git a/src/location/doc/snippets/declarative/declarative-map.qml b/src/location/doc/snippets/declarative/declarative-map.qml deleted file mode 100644 index d517580e..00000000 --- a/src/location/doc/snippets/declarative/declarative-map.qml +++ /dev/null @@ -1,168 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the examples of the Qt Mobility Components. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import Qt 4.7 -import QtMobility.location 1.2 - -Item { - id: page - width: 320 - height: 480 - focus: true - - PositionSource { - id: myPositionSource - active: true - updateInterval: 2000 - nmeaSource: 'nmealog.txt' - onPositionChanged: console.log("Position changed in PositionSource") - } - LandmarkBoxFilter { - id: boxFilter - topLeft: map.toCoordinate(Qt.point(0,0)) - bottomRight: map.toCoordinate(Qt.point(page.width, page.height)) - } - - LandmarkProximityFilter { - id: proximityFilter - center: myPositionSource.position.coordinate - //center: Coordinate {latitude: -27; longitude: 153} - radius: 500000 - } - - LandmarkModel { - id: landmarkModelAll - autoUpdate: true - filter: boxFilter - limit: 50 - onModelChanged: { - console.log("All landmark model changed, landmark count: " + count) - } - } - - //! [LandmarkModel proximity filter] - LandmarkModel { - id: landmarkModelNear - autoUpdate: true - filter: proximityFilter - limit: 50 - onModelChanged: { - console.log("Near landmark model changed, landmark count: " + count) - } - } - //! [LandmarkModel proximity filter] - - Rectangle { - id: dataArea - anchors.fill: parent - color: "#343434" - - //![Basic MapObjects and View on Map] - Map { - id: map - plugin : Plugin {name : "nokia"} - anchors.fill: parent - size.width: parent.width - size.height: parent.height - zoomLevel: 10 - - MapObjectView { - id: allLandmarks - model: landmarkModelAll - delegate: Component { - MapCircle { - color: "green" - radius: 1000 - center: Coordinate { - latitude: landmark.coordinate.latitude - longitude: landmark.coordinate.longitude - } - } - } - } - - MapCircle { - id: myPosition - color: "yellow" - radius: 1000 - center: myPositionSource.position.coordinate - } - //![Basic MapObjects and View on Map] - - MapObjectView { - id: landmarksNearMe - model: landmarkModelNear - delegate: Component { - MapGroup { - MapCircle { - color: "red" - radius: 1000 - center: Coordinate { - latitude: landmark.coordinate.latitude - longitude: landmark.coordinate.longitude - } - } - } - } - } - - // center: Coordinate {latitude: -27; longitude: 153} - center: myPositionSource.position.coordinate - - onZoomLevelChanged: { - console.log("Zoom changed") - updateFilters(); - } - onCenterChanged: { - console.log("Center changed") - updateFilters(); - } - function updateFilters () { - // The pixel coordinates used are the map's pixel coordinates, not - // the absolute pixel coordinates of the application. Hence e.g. (0,0) is always - // the top left point - var topLeftCoordinate = map.toCoordinate(Qt.point(0,0)) - var bottomRightCoordinate = map.toCoordinate(Qt.point(map.size.width, map.size.height)) - boxFilter.topLeft = topLeftCoordinate; - boxFilter.bottomRight = bottomRightCoordinate; - } - } // map - } // dataArea -} // page diff --git a/src/location/doc/snippets/declarative/maps.qml b/src/location/doc/snippets/declarative/maps.qml index fbb60b82..eb5d5bc1 100644 --- a/src/location/doc/snippets/declarative/maps.qml +++ b/src/location/doc/snippets/declarative/maps.qml @@ -41,11 +41,18 @@ //! [QtQuick import] import QtQuick 2.0 //! [QtQuick import] +import QtPositioning 5.0 //! [QtLocation import] import QtLocation 5.0 //! [QtLocation import] Item { + id: page + + Plugin { + id: myPlugin + } + //! [MapRoute] Map { RouteModel { @@ -81,7 +88,7 @@ Item { property MapCircle circle Component.onCompleted: { - circle = Qt.createQmlObject('import QtLocation 5.0; MapCircle {}') + circle = Qt.createQmlObject('import QtLocation 5.0; MapCircle {}', page) circle.center = positionSource.position.coordinate circle.radius = 5000.0 circle.color = 'green' diff --git a/src/location/doc/snippets/declarative/places.qml b/src/location/doc/snippets/declarative/places.qml index 66c62cf7..862ab182 100644 --- a/src/location/doc/snippets/declarative/places.qml +++ b/src/location/doc/snippets/declarative/places.qml @@ -42,10 +42,15 @@ import QtQuick 2.0 //! [QtQuick import] //! [QtLocation import] +import QtPositioning 5.0 import QtLocation 5.0 //! [QtLocation import] Item { + Plugin { + id: myPlugin + } + Place { id: place } @@ -110,6 +115,9 @@ Item { //! [ExtendedAttributes write] } + Icon { + id: icon + } //! [Icon] Image { source: icon.url(Qt.size(64, 64)) @@ -118,7 +126,7 @@ Item { Image { //! [Icon default] - source: icon.url() + source: icon.url() //! [Icon default] } @@ -207,7 +215,6 @@ Item { ListView { anchors.top: parent.top - anchors.bottom: position.top width: parent.width spacing: 10 @@ -303,7 +310,7 @@ Item { id: myPlace plugin: myPlugin - name: "Nokia Brisbane" + name: "Brisbane Technology Park" location: Location { address: Address { street: "53 Brandl Street" diff --git a/src/location/doc/snippets/declarative/places_loader.qml b/src/location/doc/snippets/declarative/places_loader.qml index 9f10faf7..06301064 100644 --- a/src/location/doc/snippets/declarative/places_loader.qml +++ b/src/location/doc/snippets/declarative/places_loader.qml @@ -39,6 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 +import QtPositioning 5.0 import QtLocation 5.0 Rectangle { @@ -60,13 +61,7 @@ Rectangle { plugin: myPlugin searchTerm: "pizza" - searchArea: GeoCircle { - center { - // Brisbane - longitude: 153.02778 - latitude: -27.46778 - } - } + searchArea: QtLocation.circle( -27.46778, 153.02778 ) Component.onCompleted: update() } diff --git a/src/location/doc/src/cpp-qml.qdoc b/src/location/doc/src/cpp-qml.qdoc index 3e38edb0..aabf1f8a 100644 --- a/src/location/doc/src/cpp-qml.qdoc +++ b/src/location/doc/src/cpp-qml.qdoc @@ -27,7 +27,7 @@ /*! \page location-cpp-qml.html -\title Interfaces between C++ and QML Code +\title Interfaces between C++ and QML Code in Qt Positioning \brief Some of the location QML types providing interfaces to access and modify properties in C++. @@ -120,26 +120,4 @@ The following gets the QPlaceSupplier representing this object from C++: The following sets the properties of this object based on a QPlaceSupplier object from C++: \snippet cpp/cppqml.cpp Supplier set - -\section2 Address - QGeoAddress -\target geoaddress -The \l {Address::address} {Address.address} property is used to provide an interface between C++ and QML code. First a pointer to a -Address object must be obtained from C++, then use the \l {QObject::property()}{property()} and -\l {QObject::setProperty()}{setProperty()} functions to get and set the \c address property. -The following gets the QGeoAddress representing this object from C++: -\snippet cpp/cppqml.cpp Address get -The following sets the properties of this object based on a QGeoAddress object from C++: -\snippet cpp/cppqml.cpp Address set - - -\section2 Location - QGeoLocation -\target location -The \l {Location::location} {Location.location} property is used to provide an interface between C++ and QML code. First a pointer to a -Location object must be obtained from C++, then use the \l {QObject::property()}{property()} and -\l {QObject::setProperty()}{setProperty()} functions to get and set the \c location property. -The following gets the QGeoLocation representing this object from C++: -\snippet cpp/cppqml.cpp Location get -The following sets the properties of this object based on a QGeoLocation object from C++: -\snippet cpp/cppqml.cpp Location set - */ diff --git a/src/location/doc/src/examples/qtlocation-examples.qdoc b/src/location/doc/src/examples/qtlocation-examples.qdoc index 8a7fe532..146dba76 100644 --- a/src/location/doc/src/examples/qtlocation-examples.qdoc +++ b/src/location/doc/src/examples/qtlocation-examples.qdoc @@ -34,6 +34,5 @@ These are the Qt Location examples. - \generatelist related */ diff --git a/src/location/doc/src/maps.qdoc b/src/location/doc/src/maps.qdoc index 99cc9bca..3426d626 100644 --- a/src/location/doc/src/maps.qdoc +++ b/src/location/doc/src/maps.qdoc @@ -147,7 +147,7 @@ varying degrees of accuracy. A geocoding query in QML is performed using the \l{QtLocation5::GeocodeModel}{GeocodeModel} type. For an address-to-coordinate query, its \c{query} property may be set to either an -\l{QtLocation5::Address}{Address} object or a string containing the textual +\l{QtPositioning5::Address}{Address} object or a string containing the textual form of the address to search for. To perform the reverse, the same property can be set to a \l {coordinate} instead. Results are made available in the contents of the model. @@ -161,7 +161,7 @@ contents of the model. \li \l{QtLocation5::GeocodeModel}{GeocodeModel} \li Queries the Plugin for geocoding translations and provides access to results via indexes in the model. \row - \li \l{QtLocation5::Address}{Address} + \li \l{QtPositioning5::Address}{Address} \li Structured address for use in queries and results of geocoding. \endtable @@ -181,13 +181,13 @@ between the segments. \b{Key Types} \table \row - \li \l{QtLocation5::Route}{Routing} + \li \l{QtLocation5::Route}{Route} \li The entire path to be navigated. \row - \li \l{QtLocation5::RouteSegment}{Segments} + \li \l{QtLocation5::RouteSegment}{RouteSegment} \li The individual components of a route. \row - \li \l{QtLocation5::RouteManeuver}{Maneuvers} + \li \l{QtLocation5::RouteManeuver}{RouteManeuver} \li The navigation information that joins segments. \row \li \l{QtLocation5::RouteModel}{RouteModel} @@ -213,6 +213,10 @@ between the segments. geographic coordinate from a street address) and navigation (including driving and walking directions). +Currently it is not possible to interact with maps via C++. Mapping applications +must use the \l {Maps and Navigation (QML)} API. + + \section1 Geocoding In C++, an address-to-coordinate query is performed using the @@ -234,4 +238,28 @@ on the same class. Instances of QGeocodingManager are available via \li \l{QGeocodeReply} \li Contains the results of a geocoding query. \endtable + +\section1 Navigation + +In C++, a route query is performed using the \l{QGeoRoutingManager::calculateRoute()}{calculate()} +method of the QGeoRoutingManager class. The returned route reply can contain +multiple routes to the same destination. + +\b{Key Classes} +\table + \row + \li \l{QGeoServiceProvider} + \li Provides a QGeocodingManager instance ready for use. + \row + \li \l{QGeoRoutingManager} + \li Accepts queries and produces QGeoRouteReply objects. + \row + \li \l{QGeoRouteReply} + \li Contains the results of a routing query. + \row + \li \l{QGeoRoute} + \li Contains information about a route. +\endtable + + */ diff --git a/src/location/doc/src/place-caveats.qdocinc b/src/location/doc/src/place-caveats.qdocinc index ce766338..d3d9bd0e 100644 --- a/src/location/doc/src/place-caveats.qdocinc +++ b/src/location/doc/src/place-caveats.qdocinc @@ -14,7 +14,7 @@ \endlist It is possible that providers may only support a subset of these. - See the \l {Qt Location Module#Plugin References and Parameters}{plugin documentation} for more + See the \l {Qt Location#Plugin References and Parameters}{plugin documentation} for more details. Saving of properties such as the rating, extended attributes, diff --git a/src/location/doc/src/place-definition.qdocinc b/src/location/doc/src/place-definition.qdocinc index d9bcc6b7..23987757 100644 --- a/src/location/doc/src/place-definition.qdocinc +++ b/src/location/doc/src/place-definition.qdocinc @@ -17,7 +17,7 @@ QPlace::detailsFetched() function can be queried to see if all available details have been fetched, and if not, QPlaceManager::getPlaceDetails() can be used to retrieve them. Precisely which details are populated during a search and which need to be fetched individually may vary from provider to -provider. See \l {Qt Location Module#Plugin References and Parameters}{plugin documentation} for +provider. See \l {Qt Location#Plugin References and Parameters}{plugin documentation} for more details. The rich content of a place consists of items such as images, reviews and diff --git a/src/location/doc/src/plugins/nokia_terms.qdoc b/src/location/doc/src/plugins/nokia_terms.qdoc index c10bbbf0..2f29a60f 100644 --- a/src/location/doc/src/plugins/nokia_terms.qdoc +++ b/src/location/doc/src/plugins/nokia_terms.qdoc @@ -36,6 +36,6 @@ src/plugins/geoservices/nokia/NOKIA_TERMS_AND_CONDITIONS.txt in the Qt Location package. The terms and conditions are reproduced below for convenience. \legalese -\include plugins/geoservices/nokia/NOKIA_TERMS_AND_CONDITIONS.txt +\include NOKIA_TERMS_AND_CONDITIONS.txt.qdocinc \endlegalese */ diff --git a/src/location/doc/src/qml-maps.qdoc b/src/location/doc/src/qml-maps.qdoc index 45cf82f4..f63cc5a4 100644 --- a/src/location/doc/src/qml-maps.qdoc +++ b/src/location/doc/src/qml-maps.qdoc @@ -53,15 +53,41 @@ Interaction with the added items, and the \l Map itself, is handled by \l MapMou are added as children of the \l {Maps and Navigation (QML)#Putting Objects on a Map (Map Overlay Objects)}{MapItems} or \l Map. -\section2 Position +\section2 Position on map +All position APIs are part of the \l {QtPositioning} module. The basic piece of position information is the \l {coordinate}. A coordinate encapsulates data for the latitude, longitude and altitude of the location. Altitude is in meters. It also has a method to determine distance to another \l {coordinate}. The \l {coordinate} type may -also be held within a \l {QtLocation5::Location}{Location} element, this will also have information +also be held within a \l {QtPositioning5::Location}{Location} element, this will also have information on a bounding box size to determine sufficient proximity to the location and a location address. + +Here is an example of a client that uses a \l{PositionSource}{position source} +to center a \l{Map}{map} on the current position: + +\code + Rectangle { + + import QtPositioning 5.0 + import QtLocation 5.0 + ... + + map : Map { + // initialize map + ... + } + + PositionSource { + onPositionChanged: { + // center the map on the current position + map.center = position.coordinate + } + } + } +\endcode + \section2 Geocoding \l {http://en.wikipedia.org/wiki/Geocoding}{Geocoding} is the derivation of @@ -194,9 +220,6 @@ example, by implementing the \c onValueChanged handler to update the Map \section1 Types -\section3 Positioning -\annotatedlist qml-QtLocation5-positioning - \section3 Maps \annotatedlist qml-QtLocation5-maps diff --git a/src/location/doc/src/qtlocation-cpp.qdoc b/src/location/doc/src/qtlocation-cpp.qdoc index c13360b5..0c0f946d 100644 --- a/src/location/doc/src/qtlocation-cpp.qdoc +++ b/src/location/doc/src/qtlocation-cpp.qdoc @@ -30,17 +30,16 @@ \title Qt Location C++ API \brief Information about the Qt Location C++ API -The Location API provides a library for location positioning, mapping and navigation. +The Location API provides a library for mapping, navigation and place information. \tableofcontents -The Qt Location API provides the developer with a set of functions for determining -the current location and using that information with maps and places of interest. +The Qt Location API provides the developer with a set of functions to interact +with maps, navigational data and places of interest. This is particularly useful +when associated with current position information which can be retrieved via the +\l QtPositioning module. -Positioning information can be sourced from GPS satellites or a stream of data using -NMEA formatted text. Once a position is acquired we can monitor the updated -position to see if it moves into or out of a given region. With the Maps API -we can associate the position with a map in various formats supplied by a backend. +With the Maps API we can associate a position with a map in various formats supplied by a backend. Then the Places API could be used to populate places on the Map or even specify the current position as a place of interest and associate it with an icon, contact details and other information. @@ -50,25 +49,17 @@ Qt Location C++ API. \table \row - \li \l {Positioning (C++)}{Location Positioning} - \li Retrieving information about the current position. - \row \li \l {Maps and Navigation (C++)}{Maps and Navigation} \li Displaying maps and finding routes. \row \li \l {Places (C++)} {Places} \li Searching for and managing points of interest. \row - \li \l {Qt Location GeoServices}{Geoservices and Positioning Plugin Implementation} + \li \l {Qt Location GeoServices}{Geoservices Plugin Implementation} \li Implement new geoservices and positioning plugins. \endtable -\section1 Positioning Classes - - \annotatedlist QtLocation-positioning - - \section1 Geoservice Provider Classes \annotatedlist QtLocation-common @@ -76,6 +67,8 @@ Qt Location C++ API. \section1 Maps and Navigation Classes +Currently it is not possible to interact with maps data via C++. The only available interface is the \l {Maps and Navigation (QML)} API. + \annotatedlist QtLocation-maps \annotatedlist QtLocation-routing diff --git a/src/location/doc/src/qtlocation-geoservices.qdoc b/src/location/doc/src/qtlocation-geoservices.qdoc index 7adb9b18..85c96b0f 100644 --- a/src/location/doc/src/qtlocation-geoservices.qdoc +++ b/src/location/doc/src/qtlocation-geoservices.qdoc @@ -33,29 +33,59 @@ The Qt Location provides the majority of its functionality through GeoService plugins. This document outlines how to develop a new GeoService plugin. +\section1 Plugin description + +Each plugin is described by a json file. The json describes the plugins capabilities and +version. Below is an example of a json file used by the OpenStreenMap plugin: + + +\quotefile ../../../plugins/geoservices/osm/osm_plugin.json + +The entries have the following meaning: + +\table + \header + \li Key + \li Description + \row + \li Keys + \li The unique name/key of the plugin. Each GeoService plugin must have a unique name. + \row + \li Provider + \li The provider name of the services. Multiple plugins may have the same name. + In such cases the Version string will be used to further distinguish the plugins. + \row + \li Experimental + \li Marks the service plugin as experimental. API developers may choose to ignore + such plugins when instanciating \l QGeoServiceProvider::QGeoServiceProvider(). + \row + \li Version + \li The plugin version. If multiple plugins have the same provider name, the plugin + with the higest version will be used. + \row + \li Features + \li List of features provided by the plugin/service. Each feature is a string + representation of the corresponding features in \l QGeoServiceProvider. For more + details see \l QGeoServiceProvider::routingFeatures(), + \l QGeoServiceProvider::geocodingFeatures() and \l QGeoServiceProvider::placesFeatures(). + +\endtable + \section1 Implementing Plugins A plugin implementer needs to subclass QGeoServiceProviderFactory and as many of the ManagerEngine classes as they want to provide implementations for. -Subclassing QGeoServiceProviderFactory will only involve exposing a name and -a version by overriding QGeoServiceProviderFactory::providerName() and -QGeoServiceProviderFactory::providerVersion(), and overriding -QGeoServiceProviderFactory::createSearchManagerEngine(), -QGeoServiceProviderFactory::createMappingManagerEngine() and -QGeoServiceProviderFactory::createRoutingManagerEngine() as appropriate. - -\section3 Tile-Based Map Convenience Classes - -Most of the current tile based mapping APIs are very similar, and so we -provide a number of classes intended to make writing tile based mapping -plugins much simpler. +Subclassing QGeoServiceProviderFactory will only involves overriding of one of the following +methods: -If the Mercator projection and the most common tile addressing scheme is used this will mainly -involve subclassing QGeoTiledMappingManagerEngine and providing an implementation of -QGeoTiledMappingManagerEngine::getTileImage(). +\list + \li \l QGeoServiceProviderFactory::createGeocodingManagerEngine() + \li \l QGeoServiceProviderFactory::createRoutingManagerEngine() + \li \l QGeoServiceProviderFactory::createPlaceManagerEngine() +\endlist -\section1 GeoService Classes +If a plugin does not provide an engine the relevant function should return 0. \annotatedlist QtLocation-impl diff --git a/src/location/doc/src/qtlocation-qml.qdoc b/src/location/doc/src/qtlocation-qml.qdoc index 351552de..a24820bd 100644 --- a/src/location/doc/src/qtlocation-qml.qdoc +++ b/src/location/doc/src/qtlocation-qml.qdoc @@ -40,22 +40,9 @@ statement in the QML file. \section2 Location QML Concepts -Position information can come from a variety of sources including satellites, -wifi, text files and so on. The position is described by the latitude, -the longitude, and the altitude in meters. For more information see -\l {http://en.wikipedia.org/wiki/Geographic_coordinate}{Geographic Coordinate}. - -The QML position is stored in a \l {coordinate} which contains the -latitude, longitude and altitude of the device. The \l {QtLocation5::Location}{Location} contains -this \l {coordinate} and adds an address, it also has a bounding box which -defines the recommended viewing region when displaying the location. - -Now that the device has a position, with regular updates the API can determine -the speed and heading of the device. It can also define a box or a circle that can -produce a notification when the device either leaves or enters that region. - -Adding a \l {QtLocation5::Map}{Map} with positions of interest and -\l {QtLocation5::Place}{Places}, then the device can be made aware of nearby features and related +Provided that a position has been obtained this module can +add a \l {QtLocation5::Map}{Map} with positions of interest and +\l {QtLocation5::Place}{Places}. The user can be made aware of nearby features and related information, displayed graphically. Features on the \l Map may be places of business, entertainment and so on. They may include paths, roads, or forms of transport leading so that navigation optimization and assistance are possible. @@ -101,9 +88,6 @@ API. \table \row - \li \l {Positioning (QML)}{Location Positioning} - \li Retrieving information about the current position. - \row \li \l {Maps and Navigation (QML)}{Maps and Navigation} \li Displaying maps and finding routes. \row @@ -111,18 +95,10 @@ API. \li Searching for and managing points of interest. \endtable -\section1 Basic Types - -\annotatedlist qml-QtLocation5-basictypes - \section1 Common QML Types \annotatedlist qml-QtLocation5-common -\section1 Positioning QML Types - -\annotatedlist qml-QtLocation5-positioning - \section1 Maps QML Types \annotatedlist qml-QtLocation5-maps diff --git a/src/location/doc/src/qtlocation.qdoc b/src/location/doc/src/qtlocation.qdoc index 06cd6d58..dc3fc14d 100644 --- a/src/location/doc/src/qtlocation.qdoc +++ b/src/location/doc/src/qtlocation.qdoc @@ -50,9 +50,7 @@ The .pro file should have the \e location keyword added - \code - QT += location - \endcode + \code QT += location \endcode See more in the \l{Qt Location}{Qt Location Overview}. @@ -98,25 +96,12 @@ for example applications using routes may use The .pro file should have the \e location keyword added -\code - QT += location -\endcode +\code QT += location \endcode \section2 API Sub-Modules -The API is split into three core sub-modules, which each have QML and C++ -APIs. - -\section3 Positioning -Positioning includes all the functionality necessary to find and work with geographic -coordinates. It can use a variety of external sources of information, including GPS. This -provides us with a coordinate and altitude for the device with additional features -such as speed and direction. This provides the fundamental location information used in the API. -\table -\row - \li Positioning introduction: - \li \l{Positioning (QML)}{for QML} - \li \l{Positioning (C++)}{for C++} -\endtable +The API is split into sub-modules, which each have QML and C++ APIs. It focuses on +Map and Place information. The required position data can be retrieved via the +\l {QtPositioning} module. \section3 Places Places is diff --git a/src/location/location.pro b/src/location/location.pro index 5a053632..2ba446b6 100644 --- a/src/location/location.pro +++ b/src/location/location.pro @@ -1,54 +1,16 @@ TARGET = QtLocation -QT = core-private +QT = core-private positioning QMAKE_DOCS = $$PWD/doc/qtlocation.qdocconf OTHER_FILES += doc/src/*.qdoc # show .qdoc files in Qt Creator PUBLIC_HEADERS += \ - qgeoaddress.h \ - qgeoareamonitor.h \ - qgeoshape.h \ - qgeorectangle.h \ - qgeocircle.h \ - qgeocoordinate.h \ - qgeolocation.h \ - qgeopositioninfo.h \ - qgeopositioninfosource.h \ - qgeosatelliteinfo.h \ - qgeosatelliteinfosource.h \ - qnmeapositioninfosource.h \ - qgeopositioninfosourcefactory.h \ qlocation.h \ qlocationglobal.h -PRIVATE_HEADERS += \ - qgeoaddress_p.h \ - qgeoshape_p.h \ - qgeorectangle_p.h \ - qgeocircle_p.h \ - qgeolocation_p.h \ - qlocationutils_p.h \ - qnmeapositioninfosource_p.h \ - qgeocoordinate_p.h \ - qgeopositioninfosource_p.h - SOURCES += \ - qgeoaddress.cpp \ - qgeoareamonitor.cpp \ - qgeoshape.cpp \ - qgeorectangle.cpp \ - qgeocircle.cpp \ - qgeocoordinate.cpp \ - qgeolocation.cpp \ - qgeopositioninfo.cpp \ - qgeopositioninfosource.cpp \ - qgeosatelliteinfo.cpp \ - qgeosatelliteinfosource.cpp \ - qlocationutils.cpp \ - qnmeapositioninfosource.cpp \ - qgeopositioninfosourcefactory.cpp \ - qlocation.cpp + qlocation.cpp qtHaveModule(3d): include(maps/maps.pri) include(places/places.pri) diff --git a/src/location/maps/qgeocodereply.h b/src/location/maps/qgeocodereply.h index 9d492a0e..1f36633f 100644 --- a/src/location/maps/qgeocodereply.h +++ b/src/location/maps/qgeocodereply.h @@ -44,7 +44,9 @@ #include <QtCore/QObject> #include <QtCore/QList> -#include <QtLocation/QGeoLocation> +#include <QtPositioning/QGeoLocation> + +#include <QtLocation/qlocationglobal.h> QT_BEGIN_NAMESPACE diff --git a/src/location/maps/qgeocodingmanager.h b/src/location/maps/qgeocodingmanager.h index 94b2d50a..6604c25d 100644 --- a/src/location/maps/qgeocodingmanager.h +++ b/src/location/maps/qgeocodingmanager.h @@ -43,7 +43,7 @@ #define QGEOCODINGMANAGER_H #include <QtLocation/QGeocodeReply> -#include <QtLocation/QGeoRectangle> +#include <QtPositioning/QGeoRectangle> #include <QObject> #include <QList> diff --git a/src/location/maps/qgeocodingmanagerengine.cpp b/src/location/maps/qgeocodingmanagerengine.cpp index 96508e0b..3ba59f68 100644 --- a/src/location/maps/qgeocodingmanagerengine.cpp +++ b/src/location/maps/qgeocodingmanagerengine.cpp @@ -45,7 +45,7 @@ #include "qgeoaddress.h" #include "qgeocoordinate.h" -#include <QtLocation/QGeoShape> +#include <QtPositioning/QGeoShape> QT_BEGIN_NAMESPACE diff --git a/src/location/maps/qgeocoordinateinterpolator_p.h b/src/location/maps/qgeocoordinateinterpolator_p.h index 6a6e3a21..1b75bfb4 100644 --- a/src/location/maps/qgeocoordinateinterpolator_p.h +++ b/src/location/maps/qgeocoordinateinterpolator_p.h @@ -52,7 +52,8 @@ // We mean it. // -#include "qgeocoordinate.h" +#include <QtPositioning/QGeoCoordinate> +#include <QtLocation/qlocationglobal.h> QT_BEGIN_NAMESPACE diff --git a/src/location/maps/qgeoprojection_p.h b/src/location/maps/qgeoprojection_p.h index f8b5b32d..4dcf8b4c 100644 --- a/src/location/maps/qgeoprojection_p.h +++ b/src/location/maps/qgeoprojection_p.h @@ -56,7 +56,7 @@ #define M_PI (3.14159265358979323846) #endif -#include "qglobal.h" +#include <qglobal.h> #include <QtLocation/qlocationglobal.h> QT_BEGIN_NAMESPACE diff --git a/src/location/maps/qgeoroute.h b/src/location/maps/qgeoroute.h index 0eb163f9..67287649 100644 --- a/src/location/maps/qgeoroute.h +++ b/src/location/maps/qgeoroute.h @@ -42,7 +42,7 @@ #ifndef QGEOROUTE_H #define QGEOROUTE_H -#include <QtLocation/QGeoCoordinate> +#include <QtPositioning/QGeoCoordinate> #include <QtLocation/QGeoRouteRequest> #include <QExplicitlySharedDataPointer> diff --git a/src/location/maps/qgeorouterequest.h b/src/location/maps/qgeorouterequest.h index 7eb3fcba..bcc7d6ea 100644 --- a/src/location/maps/qgeorouterequest.h +++ b/src/location/maps/qgeorouterequest.h @@ -47,7 +47,7 @@ #include <QDateTime> #include <QtLocation/qlocationglobal.h> -#include <QtLocation/qgeocoordinate.h> +#include <QtPositioning/qgeocoordinate.h> QT_BEGIN_NAMESPACE diff --git a/src/location/maps/qgeoserviceprovider.cpp b/src/location/maps/qgeoserviceprovider.cpp index 25784421..dcfe326c 100644 --- a/src/location/maps/qgeoserviceprovider.cpp +++ b/src/location/maps/qgeoserviceprovider.cpp @@ -103,8 +103,13 @@ Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader, Subclasses of QGeoServiceProvider guarantee that the different services that they provide are interoperable. - At this point only the Nokia Services plugin is packaged with Qt, - which is accessible using the provider name "nokia". + At this point there are two GeoServices plugins packaged with Qt. They are + accessible using their provider names: + + \list + \li "osm" -> \l {Qt Location Open Street Map Plugin}{OpenStreetMap} + \li "nokia" -> \l {Qt Location Nokia Plugin}{Nokia Services} + \endlist */ /*! diff --git a/src/location/maps/qgeoserviceproviderfactory.cpp b/src/location/maps/qgeoserviceproviderfactory.cpp index 2f282a67..e12e3515 100644 --- a/src/location/maps/qgeoserviceproviderfactory.cpp +++ b/src/location/maps/qgeoserviceproviderfactory.cpp @@ -101,6 +101,8 @@ QGeocodingManagerEngine *QGeoServiceProviderFactory::createGeocodingManagerEngin The default implementation returns 0, which causes a QGeoServiceProvider::NotSupportedError in QGeoServiceProvider. + + \internal */ QGeoMappingManagerEngine *QGeoServiceProviderFactory::createMappingManagerEngine(const QMap<QString, QVariant> ¶meters, QGeoServiceProvider::Error *error, diff --git a/src/location/places/qplace.h b/src/location/places/qplace.h index b6eee885..5f5f0597 100644 --- a/src/location/places/qplace.h +++ b/src/location/places/qplace.h @@ -43,10 +43,10 @@ #define QPLACE_H #include <QtCore/QSharedDataPointer> -#include <QtLocation/QGeoAddress> -#include <QtLocation/QGeoRectangle> -#include <QtLocation/QGeoCoordinate> -#include <QtLocation/QGeoLocation> +#include <QtPositioning/QGeoAddress> +#include <QtPositioning/QGeoRectangle> +#include <QtPositioning/QGeoCoordinate> +#include <QtPositioning/QGeoLocation> #include <QtLocation/QPlaceCategory> #include <QtLocation/QPlaceContent> #include <QtLocation/QPlaceRatings> diff --git a/src/plugins/geoservices/nokia/NOKIA_TERMS_AND_CONDITIONS.txt.qdocinc b/src/plugins/geoservices/nokia/NOKIA_TERMS_AND_CONDITIONS.txt.qdocinc new file mode 100644 index 00000000..d73042b6 --- /dev/null +++ b/src/plugins/geoservices/nokia/NOKIA_TERMS_AND_CONDITIONS.txt.qdocinc @@ -0,0 +1,315 @@ +NOKIA DEVELOPER SOFTWARE AGREEMENT 2.1 + +FOR THE NOKIA MAPS PLUG-IN TO Qt LOCATION + + +Please read this Nokia Developer Software Agreement carefully before accessing, downloading or using any part ofthe Nokia Maps Plug-In to Qt Mobility. By accessing, downloading, installing, using or clicking on the "Accept" button while downloading, installing and/or using the Software, You agree to the terms and conditions of this Agreement. + +Please note that this Agreement is structured in two sections: (i) general terms that apply to most Nokia developer software distributions; and (ii) additional terms and conditions applicable to certain parts of the Software or related content, services, additions and extensions that are specific to the particular Software provided. Please ensure to review the entirety of the terms provided as important restrictions relevant to your use of the Software are often included as additional terms. + +GENERAL TERMS + +1. Acceptance + +This Nokia Developer Software Agreement (the “Agreement”) governs Your use of the Software (ase defined below) and these terms and conditions constitute an agreement between You (either an individual or an entity) and Nokia Corporation including its affiliates and suppliers (collectively “Nokia”) defining the rights and responsibilities of You and Nokia with respect to the Software. + +There may be additional terms and conditions specific to the particular Software provided or applicable to certain parts of the Software or related content, services, additions and extensions. + +You are not allowed to use the Software if You do not agree to these terms and conditions. + +2. Definitions + +“Application” means one or more software programs developed by You in compliance with the requirements set forth in this Agreement and documentation provided by Nokia, under Your own trademark or brand, including bug fixes, updates, upgrades and new versions of such software programs. + +“Authorized Users” means You and Your employees and contractors or, if You are an educational institution, Your faculty and staff, as applicable, who (a) each have a valid Forum Nokia account with Nokia, (b) have a demonstrable need to know or use the Software in order to develop and test Applications, and (c) to the extent such individuals will have access to Confidential Information, each have written and binding agreements with You to protect the unauthorized use and disclosure of such Confidential Information. + +“Software” means (i) the Nokia Maps Plug-In to the Qt Mobility software product (source code and/or object code as applicable), with the exception of Open Source Software (as defined below), documentation, sample code, simulators, tools, libraries, application programming interfaces (APIs), data, files, and materials hereby provided or made available by Nokia for use by You in connection with Your Application development, and includes any updates that may be provided or made available by Nokia. + +"Open Source Software" means any software, which is, as included in the Software, subject to a license terms and conditions currently listed at http://opensource.org/licenses/ or meeting the criteria listed at http://www.opensource.org/docs/definition.php or which is subject to any similar free or open source license terms. Open Source Software contained in the Software is licensed under the license terms accompanying such Open Source Software and not the terms of this Agreement. + + “You” or “Your” means the person(s) or entity using the Software or otherwise exercising rights under these Terms. If you are accepting these Terms on behalf of your company. organization or other entity, “You” or “Your” refers to your company, organization or other entity as well. + +3. Eligibility + +You must be legally competent to execute this Agreement. Thereby You must be of the legal age of majority in the jurisdiction in which You reside (at least 18 years of age in most countries) and have the right and authority to enter into this Agreement on Your own behalf, or if You are entering into this Agreement on behalf of Your company, organization or other entity, that You have the right and authority to legally bind Your company, organization or other entity to the terms and obligations of this Agreement. + +4. Registration and termination + +If registration is required, You agree to provide truthful and complete information when registering for the Software and to keep that information updated. Providing misleading information about Your identity is forbidden. + +You may terminate Your registration(s) if You no longer wish to use the Software. After termination, You may not access the Software. Nokia may terminate Your registration(s) or restrict Your access to certain parts of the Software or related services if there is an indication that You have breached this Agreement. + +You may terminate this Agreement at any time by permanently uninstalling and/or deleting, at Your own costs, the Software and any backup copies, and all related materials provided by Nokia and by ceasing to use the Software. All Your rights automatically and immediately terminate without notice from Nokia if You fail to comply with any provision of these Terms. In such an event, You must immediately uninstall and/or delete, at Your own cost, the Software, all backup copies, and all other related material provided by Nokia as well as stop using the Software. + +Nokia may, in its sole discretion, provide with updates to the Software from time to time. Nokia may also provide with updates that are considered as important or critical by Nokia, and in such case You may not continue using the previous version of the Software and the use of the previous version of the Software may be prevented without installation of the update. Any related services or features of the Software may not be available during maintenance breaks and other times. Nokia may also decide to discontinue the Software, related service or any part thereof in its sole discretion. In such case You will be provided a prior notification and Nokia may terminate the Agreement accordingly. + +5. Updates to the Terms + +Nokia reserves the right to modify or amend the terms and conditions of this Agreement at any time without prior notice. If the terms are changed in a material, adverse way, Nokia will provide a separate notice advising of such change. In order to continue using the Software, You must accept and agree to the new terms of this Agreement. If You do not agree to new terms, Your use of the Software will be suspended or terminated by Nokia. + +6. Use of the Software + +You hereby certify and agree that You will comply with the terms of this Agreement and You agree to monitor and be responsible for Your Authorized Users’ use of the Software and their compliance with the terms of this Agreement. You may not grant access to the Software for any other than Authorized Users. + +The Software is made accessible to You for the sole purpose of developing and testing Your Application(s). You may install, as applicable, a reasonable number of copies of the Software on computers owned or controlled by You to be used by You or Your Authorized Users during the term of this Agreement. + +As a condition to using the Software, You hereby agree that: + +(i) You will not use the Software in any manner or for any purpose that violates these Terms or any applicable law or regulation, including without limitation, any intellectual property or other proprietary rights, any right of any person, rights of privacy, or rights of personality; + +(ii) You will not distribute or post spam, unreasonably large files, chain letters, pyramid schemes, any malicious code, viruses or any other technologies or content that may harm the Software, other users, servers or network; + +(iii) You will not use the Software in connection with any unlawful, offensive, abusive, obscene, pornographic, harassing, libelous or otherwise inappropriate content or material; + +(iv) You will be solely responsible for all costs, expenses, losses and liabilities incurred, and activities undertaken by You and Authorized Users in connection with the Software, Your Applications and Your related development efforts; and + +(v) You will not remove or obscure any copyright or trademark notices or other similar notices or markings or legends from the Software; + +Notwithstanding anything to the contrary contained herein, You may not (a) reverse engineer, decompile, disassemble or otherwise attempt to discover the source code of the Software, except and only to the extent permitted by applicable mandatory law; (b) modify or create derivative works of the Software, except and only to the extent permitted by Nokia; or (c) distribute, communicate to the public, export, re-export, sublicense, rent, loan, lease, disclose, sell, market, commercialise, re-license, host, or otherwise transfer or make available to any third party (including without limitation any affiliates and subcontractors) the Software (or any portions thereof). + +Nothing in this Agreement or otherwise prevents Nokia from developing, distributing and/or making use of any application that is directly or indirectly competing with Your Application. + +7. Requirements for Your Applications + +Your Application developed using the Software, or any part thereof, must comply with the following criteria and requirements, as may be modified by Nokia from time to time: + +(i) Your Application will be developed and used in compliance with the these Terms or any applicable law or regulation, including without limitation, any intellectual property or other proprietary rights, any right of any person, rights of privacy, or rights of personality; + +(ii) Your Application will be developed in compliance with the documentation, technical guidelines and other requirements as Nokia may provide from time to time; + +(iii) Your Application does not and will not, to the best of Your knowledge, violate, misappropriate, or infringe any copyright, patent, trademark, trade secret, rights of privacy or other proprietary or legal right of any third party or of Nokia; + +(iv) Your Application must not contain nor transfer any viruses, files, code malware or any other malicious software programs that may harm or disrupt the normal operation of the device or network; + +(v) Your Application must identify the nature and provider (including contact details) of the application, function as promoted and not contain any false, fraudulent or misleading information or representations; + +(vi) You will clearly communicate to the users of Your Application(s) (e.g. in the Application UI) that the use of the Application(s) creates data traffic; + +(vii) You will provide users of the Application(s) with easy settings to disable notifications; + +(viii) You will not design or market the Application, or any part thereof, in connection with any internal business application the purpose of which is directly related to the operation of Your core business and where the users of such application are Your employees or contractors (e.g. fleet or asset management and tracking); + +(ix) You will not design or market the Application, or any part thereof, for use in or with systems, devices or products that are critical to health and/or security of other people and property (e.g. intended for surgical implant into the body or other applications intended to support or sustain life or for any aviation or nuclear reactor application) or any other application in which the software or its failure, malfunction or inadequacy could directly or indirectly cause or contribute to personal injury or death or significant property damage; + +(x) Your Application must not enable push notifications routed from other notification systems and servers provided by third parties; + +(xi) Your Application shall not send any push notifications without first obtaining user consent, (e.g. unsolicited messages, advertising, promotions, or direct marketing of any kind or for the purposes of phishing and spamming); and + +(xii) Your Application shall not send any messages for the purpose of phishing or spamming, or enable anonymous or prank phone calls or SMS/MMS messaging. + +8. Ownership and Intellectual Property Rights + +The Software and all rights, without limitation including title and intellectual property rights therein, are owned by Nokia and/or its licensors and affiliates and are protected by international treaty provisions and all other applicable national laws of the country in which it is being used. The structure, organization, and code of the Software are the valuable trade secrets and confidential information of Nokia and/or its licensors and affiliates. + +No right or license, express or implied, is granted to any part of the Software except as expressly set forth above. In addition, no licenses or immunities are granted to the combination of the Software with any other software or hardware not delivered by Nokia under this Agreement. Also, any and all licenses with respect to Nokia or third party patents (including essential patents) are specifically excluded from the scope of this Agreement, and those licenses need to be acquired separately from Nokia or the respective right holders, as the case may be. + +You and Your affiliates, as the case may be, covenant and agree not to bring suit before any court or administrative agency or otherwise assert any claim against Nokia or any of its affiliates, suppliers, licensees or customers based on any of Your patent or Your affiliate’s due to reproduction, development, use, manufacturing, marketing, selling, distribution, licensing, importing, sub-licensing or other disposal of the Software or implementations thereof. + +You and Your affiliates shall impose the obligation stated in clause above on any third party to whom You or Your affiliates may assign or transfer Your patents. This obligation is restricted to suits or other assertions based on such assigned or transferred patents. + +You shall be released from Your covenant and agreement not to sue under this section in relation to a particular beneficiary (but not in relation to any other beneficiary) in the following event: (i) You are first sued for patent infringement related to the Software by such other beneficiary who benefits from Your covenant and agreement as set forth herein; and (ii) the suit is based on Your infringement of such other beneficiary’s patent rights which if held by You would be subject to the covenant and agreement not to sue provided for above in this section. + +For the purposes of this section, patent means any patent, utility model and any divisional, re-exam, re-issue, continuation and continuation-in-part thereof as well as any corresponding application globally. + +9. Fees + +Your use of the Software may be or may become subject to charges. Nokia reserves the right to charge for the Software and to change its fees from time to time, at its discretion. + +10. Availability + +The Software may not be available in all countries and may be provided only in selected languages. The Software or some features may be network dependent, contact Your network service provider for more information. + +11. Support and maintenance + +Nokia has no obligation to furnish You with technical or other support unless separately agreed in writing between You and Nokia. In case of such support given by Nokia, You understand and agree that the support has been given on “as is” and “as available” basis and Nokia will have no obligations or liabilities related to such support. + +12. Feedback + +By submitting feedback (“Feedback”) to Nokia related to the Software, You acknowledge and agree that (1) Nokia may have similar development ideas to the Feedback; (2) Your Feedback does not contain confidential or proprietary information related to Your own activities or those of any third party; (3) Nokia is not under any obligation of confidentiality with respect to the Feedback; and (4) You are not entitled to any compensation of any kind from Nokia. You hereby grant Nokia a worldwide non-exclusive, sublicensable, assignable, fully paid up, royalty-free, perpetual and irrevocable license to use, reproduce, adapt, translate, exploit, copy, publicly perform, display, distribute, further develop and modify for any purpose such Feedback, and to prepare derivative works thereof, or incorporate such Feedback into other works as well as sublicense products and Software resulting from such works. + +13. Links to Third Party Sites and Services + +For Your easy accessibility Nokia may include links to sites and services on the Internet that are owned or operated by third parties and that are not part of the Software. Upon following a link to such a third-party site, You shall review and agree to that site's rules of use before using such site or service. + +You agree that Nokia has no control over the content of third-party sites and cannot assume any responsibility for services provided or material created or published by such sites. A link to a third-party site does not imply that Nokia endorses the site or the products or services referenced in the site. + +You agree that Nokia is neither responsible nor liable for any such links or any third party Internet site. + +14. Confidentiality + +You agree that all material and information in any form received from Nokia, including, but not limited to Software and its copies, as well as all translations of computer programs contained in the Software, Nokia's products, designs, business plans, business opportunities, finances, research, development, know-how, personnel, or third-party confidential information, will be considered and referred to collectively as "Confidential Information". Confidential Information, however, does not include: (a) information that Nokia makes generally available to the public; (b) information that You can demonstrate to have had rightfully in Your possession prior to disclosure to You by Nokia; (c) information that is independently developed by You without the use of any Confidential Information; or (d) information that You rightfully obtain from a third party who has been given the right to transfer or disclose it by Nokia. You agree to keep confidential and not to disclose, publish, or disseminate any Confidential Information to any third party. You further agree to take reasonable precautions to prevent any unauthorized use, disclosure, publication, or dissemination of Confidential Information. You agree not to use Confidential Information otherwise for Your own or any third party's benefit without the prior written approval of an authorized representative of Nokia in each instance. + +You further agree that despite of any other confidentiality agreements You may have between You and Nokia, Nokia will not be responsible for keeping confidential any information You provide to Nokia through the use of the Software or any related services. Neither Nokia nor any of its employees accept or consider unsolicited ideas, including but not limited to ideas for new advertising campaigns, new promotions, new products or technologies, processes, materials, marketing plans or new product names. If, despite the request that You not send us Your ideas and materials, You still send them, please understand that Nokia makes no assurances that Your ideas and materials will be treated as confidential or proprietary. + +The rights and obligations of this section 14 shall remain in force for five (5) years from the date of the disclosure of Confidential Information. + +15. No warranties + +YOU ACKNOWLEDGE THAT THE SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, AND TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW NEITHER NOKIA, ITS LICENSORS OR AFFILIATES, NOR THE COPYRIGHT HOLDERS MAKE ANY REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ACCURACY OF DOCUMENTATION AND SUPPORT MATERIAL, OR FITNESS FOR A PARTICULAR PURPOSE OR THAT SOFTWARE WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, TRADEMARKS, OR OTHER RIGHTS. THERE IS NO WARRANTY BY NOKIA OR BY ANY OTHER PARTY THAT THE FUNCTIONS CONTAINED IN THE SOFTWARE WILL MEET YOUR REQUIREMENTS OR THAT THE OPERATION OF THE SOFTWARE WILL BE UNINTERRUPTED OR ERROR-FREE. YOU ASSUME ALL RESPONSIBILITY AND RISK FOR THE SELECTION OF THE SOFTWARE TO ACHIEVE YOUR INTENDED RESULTS AND FOR THE INSTALLATION, USE, AND RESULTS OBTAINED FROM IT. + +16. Indemnity + +You agree to defend and indemnify Nokia from and against all third party claims and all liabilities, assessments, losses, costs or damages resulting from or arising out of (i) Your breach of this Agreement, (ii) Your infringement or violation of any intellectual property, other rights or privacy of a third party, and (iii) misuse of the Software by a third party where such misuse was made available by Your failure to take reasonable measures to protect Your username and password against misuse. + +17. Limitation of liability + +TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT SHALL NOKIA, ITS EMPLOYEES,LICENSORS OR AFFILIATES BE LIABLE FOR ANY LOST PROFITS, REVENUE, SALES, DATA, OR COSTS OF PROCUREMENT OF SUBSTITUTE GOODS OR SOFTWARE, PROPERTY DAMAGE, PERSONAL INJURY, INTERRUPTION OF BUSINESS, LOSS OF BUSINESS INFORMATION, OR FOR ANY SPECIAL, DIRECT, INDIRECT, INCIDENTAL, ECONOMIC, COVER, PUNITIVE, SPECIAL, OR CONSEQUENTIAL DAMAGES, HOWEVER CAUSED AND WHETHER ARISING UNDER CONTRACT, TORT, NEGLIGENCE, OR OTHER THEORY OF LIABILITY ARISING OUT OF THE USE OF OR INABILITY TO USE THE SOFTWARE OR THE SOFTWARE, EVEN IF NOKIA OR ITS LICENSORS OR AFFILIATES ARE ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. BECAUSE SOME COUNTRIES/STATES/JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF LIABILITY, BUT MAY ALLOW LIABILITY TO BE LIMITED, IN SUCH CASES, NOKIA, ITS EMPLOYEES OR LICENSORS OR AFFILIATES' LIABILITY SHALL BE LIMITED TO U.S. $50. Nothing contained in this Agreement shall prejudice the statutory rights of any party dealing as a consumer. Nothing contained in this Agreement limits Nokia's liability to you in the event of death or personal injury resulting from Nokia's negligence. Nokia is acting on behalf of its employees and licensors or affiliates for the purpose of disclaiming, excluding, and/or restricting obligations, warranties, and liability as provided in this Agreement, but in no other respects and for no other purpose. + +18. Export control + +You acknowledge that the Software may be subject to export control restrictions of various countries. You shall fully comply with all applicable export license restrictions and requirements as well as with all laws and regulations relating to the importation of the Software and/or Applications and shall procure all necessary governmental authorizations, including without limitation, all necessary licenses, approvals, permissions or consents, where necessary for the re-exportation of the Software or Applications. + +19. Government End Users + +A "U.S. Government End User" shall mean any agency or entity of the government of the United States. The following shall apply if You are a U.S. Government End User. The Software is a "commercial item," as that term is defined in 48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer software" and "commercial computer software documentation," as such terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995), all U.S. Government End Users acquire the Software with only those rights set forth herein. The Software (including related documentation) is provided to U.S. Government End Users: (a) only as a commercial end item; and (b) only pursuant to this Agreement. + +20. Miscellaneous + +20.1 Notices + +All notices of the Software should be delivered to: + +Nokia Corporation +P.O. Box 100 +FIN-00045 Nokia Group +Finland + +20.2 Assignment + +You shall not be entitled to assign or transfer all or any of Your rights, benefits and obligations under this Agreement without the prior written consent of Nokia, which shall not be unreasonably withheld. Nokia shall be entitled to assign or transfer any of its rights, benefits or obligations under this Agreement on an unrestricted basis. + +20.3 Severability + +If any part of this Agreement is found void and unenforceable, it will not affect the validity of the balance of the Agreement, which shall remain valid and enforceable according to its terms. + +20.4 Privacy + +The Nokia Privacy Policy and any additional privacy supplements govern the use of Your personal data. + +20.5 Governing law and dispute resolution + +This Agreement is governed by the laws of Finland. All disputes arising from or relating to these Terms shall be settled by a single arbitrator appointed by the Central Chamber of Commerce of Finland. The arbitration procedure shall take place in Helsinki, Finland in the English language. + +20.6 Entire Agreement + +This is the entire agreement between Nokia and You relating to the Software, and it supersedes any prior representations, discussions, undertakings, end-user agreements, communications, or advertising relating to the Software. + +ADDITIONAL TERMS + +Location API Additional Terms + +In addition to the terms set forth in Nokia Software Development Agreement version 2.1, the Nokia Privacy Policy and following additional terms shall apply to Your use of the Nokia Maps Plug-In (“Plug-In”) that is delivered in conjunction with the Qt Mobility software package and Nokia’s related location-based services (“Service”). Please note that these terms and conditions do no apply to Your use of the location APIs included in Qt Mobility as such and only apply to the use of the Plug-In and Service + + +1. Definitions + +“Nokia Maps Content” means the maps content available from Nokia from time to time for the purpose of being rendered on the Nokia Maps, including data provided by Nokia that originates from third parties. + +“Location API Service” means the service offered by Nokia that enables You to incorporate the Location API s For Developers, the Nokia Maps Content and the Places Content, as made available by Nokia from time to time, into Your Applications and to have end-users access and use it on such Applications. + +“Location API For Developers” means the software, as made available by Nokia from time to time that allows the rendering of Nokia Maps Content and Places Content within Applications. For clarity, the Location API For Developers may include software components that are downloaded and installed on the users’ mobile device(s) and/or JavaScript libraries that are invoked and downloaded by the Location API(s) and/or data retrieved from server based APIs, including but not limited to the Ovi Maps Rendering API. “Location API Developer Package” means the Location API(s), documentation and any and all other material made accessible to You by Nokia from time to time that enables You to incorporate the Location API For Developers into Your Applications and is designated by Nokia as being a part of the Location API Developer Package. + +“Location API(s)” means the interface information made accessible to You by Nokia from time to time that enables You to incorporate the Location API For Developers into Your Applications. + +Places Content” means the geo-location content, including rich content (e.g. descriptions, opening hours, reviews) available from Nokia, including data provided by Nokia that originates from third parties + +2. Service Offering, Registration and Termination + +The Service is made available under a variety of business models to suit Your needs which will form an integral part of your agreement with Nokia for the use of the Software. For information about the Service, please visit www.forumnokia.com/Maps/. + +If you do not register for the Service Your use of the Location API For Developers is limited to internal testing of your Application(s) that use the Location API(s) and the Service will automatically disable itself once the access quota for the Service has been exceeded. + +If you elect to register for the Service (https://api.forum.nokia.com/ovi-api), You will be provided with a token and/or developer key that will enable You to create Application(s) that use the Location API(s) and distribute such Application(s) under the terms of this Agreement. The number of requests submitted by your Application(s) to the Service may be subject to certain quota limitations as updated from time to time by Nokia. + +If You elect to register for the Service, You agree to provide truthful and complete information when registering for the Service and to keep that information updated. Providing misleading information about Your identity is forbidden. You are personally responsible for any use of the Location API Service. You agree to take due care in protecting Your Application using Location API, Your token and/or developer key against misuse by others and promptly notify Nokia about any misuse. Where requested by Nokia, You agree to include and use the token and/or developer key, as applicable, in each request You make to access to the Location API(s). + +You may terminate Your registration if You no longer wish to use the Service. After termination, You may not access the Service. Nokia may terminate Your registration or restrict Your access to certain parts of the Service if there is an indication that You have breached these terms or with a prior notice if You have not signed into the Service with Your identifier code in the past three (3) months. + +3. Changes + +Nokia may, in its sole discretion, change, improve and correct the Service from time to time. Nokia may also provide with updates to the Service that are considered as important or critical by Nokia, and in such case You may not continue using the previous version of the Service and the use of the previous version of the Service may be prevented without installation of the update. The Service may not be available during maintenance breaks and other times. Nokia may also decide to discontinue the Service or any part thereof in its sole discretion. In such case You will be provided a prior notification and Nokia may terminate the Agreement accordingly. + +Except as set forth in Privacy Policy, Nokia shall not be responsible for any removal or loss of the information or content You have submitted (“Material”) to the Service when Your registration is terminated. After the Material is removed from the Service by either You or Nokia, traces and copies of the Material may still remain. + +Nokia reserves the right to modify or amend these terms and conditions at any time without prior notice. If the terms are changed in a material, adverse way, Nokia will provide a separate notice advising of such change. In order to continue using the Service, You must accept and agree to the new terms and conditions. If You do not agree to new terms, Your use of the Service will be suspended or terminated by Nokia. + +4. Use of Location API Developer Package + +The Location API Developer Package is made accessible to You for the purposes of incorporating the Service into Your Application and for the limited purposes of evaluating, testing, and controlling the Location API For Developers during the term of this Agreement, subject to the limitations set forth in Section 2 of these additional terms set forth above. If you have not registered for the Service, You may not distribute your Applications incorporating the Service. + +When using the Location API Developer Package and/or the Service, unless otherwise agreed in writing with Nokia, You hereby agree that You will not: + +(i) use or incorporate, without Nokia’s prior written permission, the Service, Location API Developer Package or any part thereof, in connection with any Application or other service (a) which has the primary functionality of providing turn-by-turn navigation services, real time navigation or route guidance; or (b) where such Application’s functionality is substantially similar to the Nokia Maps or navigation/location-based products distributed by Nokia or its affiliates; or (c) which has the primary purpose of capturing or collecting end user data; + +(ii) use, without Nokia’s prior written permission, the Service or Location API For Developers, or any part thereof, in connection with any internal business Application the purpose of which is directly related to the operation of Your core business and where the users of such Application are Your employees or contractors (e.g. fleet or asset management and tracking); + +(iii) remove, obscure, modify or omit, any copyright or trademark notices or other similar notices or markings or legends or branding requirements from the Location API Developer Package, Location API For Developers, Nokia Maps Content, or the Places Content whether such notices, markings or legends or other branding requirements originate from Nokia or a third party; + +(iv) alter or manipulate the order of search, geo-coding and/or reverse geo-coding results delivered by or through any Location API to or as part of the Application (where applicable); + +(v) alter, delete or otherwise change any Nokia Maps Content or Places Content, including third party content contained in the Nokia Maps Content or Places Content, branding or sponsorship information, that is displayed through the use of the Service or Location API For Developers; + +(vi) create an Application which obsures or alters the visibility of Places Content and/or Nokia Maps Content or any other content; or + +(v) use the Location API(s) or Service to exceed any transaction volume limits (if any) set by Nokia for Applications, Location APIs and/or Services. The amount of the possible transaction volume limit is as set forth in the documentation included in the Location API. Nokia may change the limit from time to time in its sole discretion, but will provide You with sixty (60) days’ advance notice of a change in the volume limit. Any programmatic methods or other actions intended to circumvent the transaction volume limits shall be considered a material breach of this Agreement; + +(vii) access, or use the Service any Nokia Maps Content or Places Content through any technology or means other than those provided by the Service or Location API(s), or through other explicitly authorized means Nokia may designate; + +(viii) use the Service, Location API or Location API For Developers in a manner that gives You or any other person access to mass downloads or bulk feeds of any Nokia Maps Content or Places Content, including but not limited to numerical latitude or longitude coordinates; + +(ix) pre-fetch, cache, or store any Nokia Maps Content or Places Content except that You may store (i) references and IDs; and (ii) limited amounts of Nokia Maps Content or Places Conent solely for the purpose of testing your Application, if You do so temporarily, securely, and in a manner that does not permit use of the Nokia Maps Content or Places Content outside of the Service; or + +(x) use the Location API Developer Package, including the Location API For Developers, or the Service in any manner or for any purpose that violates this Agreement or any law or regulation, including without limitation, any intellectual property or other proprietary rights, any right of any person, rights of privacy, or rights of personality; or + +(xi) use the Location API(s) to issue queries that are not in response to end user actions; or + +(xii) create Application(s) which do not display the results of every such search made by such Application(s) using the Location API(s) to the end user; or + +(xiii) distribute in any manner, such as through the Location API(s), Nokia Maps Content or Places Content collected using the Location API(s), or data derived from the Nokia Maps Content or Places Content, including, but not limited to location corrections. + +If screen size constraints prevent Nokia Maps Content or Places Content from being displayed with search or detail results, You shall display a notice informing the end user that the Nokia Maps Content or Places Content cannot be displayed. + +You also agree (i) to comply with these terms, applicable laws and good manners; (ii) not to distribute or post spam, unreasonably large files, chain letters, pyramid schemes, viruses or any other technologies that may harm the Service, or the interest or property of the Service users; (iii) not to use the Service in connection with any unlawful, offensive, abusive, pornographic, harassing, libelous or otherwise inappropriate Material and comply with Nokia Content Guidelines as may be provided by Nokia from time to time; and (iv) to respect the privacy of others. You agree to comply with Nokia Technical Guidelines and other guidelines as Nokia may provide from time to time. + +5. Nokia Maps Content and Publication + +Nokia Maps Content and Places Content are provided to You and Your end users for planning purposes only and Nokia does not guarantee the accuracy or availability of any Nokia Maps Content or Places Content. You may find that weather conditions, construction projects, closures or other events may cause road conditions, directions, positioning coordinates or other location information to differ from the results depicted in the Nokia Maps Content or Places Content. All use of Nokia Maps Content and/or Places Content is at Your own risk. + +6. Privacy and Ovi store publication + +You agree that Your use of the Services and Location API will comply with the Nokia Privacy Policy (http://www.nokia.com/privacy-policy). + +If your Application enables You or any party to gain access to information about users, including but not limited to personally identifiable information, non-personally identifiable usage information or location information (“Information”), You must provide users with notice about what Information is accessible and how such Information will be used or disclosed so that users may make informed decisions about whether or not to use Your Application. Furthermore, you must make Your privacy policy regarding the use of Information publicly available. + +If You intend to publish your Application on Nokia’s Ovi Store, please note that Your Application must comply with the Ovi Store Publication Requirements (https://publish.ovi.com/info/). + +7. Fees + +Your use of the Service may be or may become subject to charges. Nokia reserves the right to charge for the Service and to change its fees from time to time, at its discretion, but Nokia will provide You with sixty (60) days’ advance notice if charges will be implemented for use of the Service. + +8. Availability + +The Service may not be available in all countries and may be provided only in selected languages. The Service may be network dependent, contact Your network service provider for more information. + +9. Your Services + +You may interact with users, including consumers, on or through the Service. You agree that any such interactions by You do not involve Nokia and are solely between You and the other user(s). + +10. Links to Third Party Sites, Content and Advertising + +Nokia may include links to sites on the Internet that are owned or operated by third parties and that are not part of the Service. Upon following a link to such a third-party site, You shall review and agree to that site's rules of use before using such site. + +You agree that Nokia has no control over the content of third-party sites and cannot assume any responsibility for services provided or material created or published by such sites. A link to a third-party site does not imply that Nokia endorses the site or the products or services referenced in the site. + +In addition, users may create links within the Service to content that has not otherwise been submitted to the Service. You agree that Nokia is neither responsible nor liable for any such links. Moreover, Nokia Maps Content and Places Content made available to You by Nokia, may include content and data that originates from third parties. + +Nokia reserves the right, in its sole discretion, to implement advertising in the Location API For Developers. Unless otherwise agreed in writing between You and Nokia, and if Nokia implements advertising, You agree not to remove, otherwise alter, tamper with; or obsure such advertising. Nokia will provide You with sixty (60) days’ advance written notice prior to implementing advertising in the Location API For Developers. + +11. Reporting + +You agree to implement those reporting mechanisms specified by Nokia (if any). For example, if specified by Nokia, You agree to provide Nokia with reports if your Application which utilizes the Location API(s) detects its own location through the use of a sensor (including, but not limited to GPS, cell triangulation, WiFi or similar functionality) to display the location of the device on a map or to calculate a route. + +12. Additional Export Control Restrictions + +The Service and Location API Developer Package, including technical data, includes cryptographic software subject to export controls under the U.S. Export Administration Regulations ("EAR") and may be subject to import or export controls in other countries. The EAR prohibits the use of the Service and the Location API Developer Package and technical data by a Government End User, as defined hereafter, without a license from the U.S. government. A Government End User is defined in Part 772 of the EAR as "any foreign central, regional, or local government department, agency, or other entity performing governmental functions; including governmental research institutions, governmental corporations, or their separate business units (as defined in part 772 of the EAR) which are engaged in the manufacture or distribution of items or services controlled on the Wassenaar Munitions List, and international governmental organizations. This term does not include: utilities, telecommunications companies and Internet service providers; banks and financial institutions; transportation; broadcast or entertainment; educational organizations; civil health and medical organizations; retail or wholesale firms; and manufacturing or industrial entities not engaged in the manufacture or distribution of items or services controlled on the Wassenaar Munitions List. You agree to strictly comply with all applicable import and export regulations and acknowledge that You have the responsibility to obtain licenses to export, re-export, transfer, or import the Service and the Location API Developer Package. You further represent that You are not a Government End User as defined above, and You will not transfer the Service and the Location API Developer Package to any Government End User without a license. + diff --git a/src/plugins/geoservices/nokia/placesv2/jsonparserhelpers.cpp b/src/plugins/geoservices/nokia/placesv2/jsonparserhelpers.cpp index ed0c55af..1a18d15d 100644 --- a/src/plugins/geoservices/nokia/placesv2/jsonparserhelpers.cpp +++ b/src/plugins/geoservices/nokia/placesv2/jsonparserhelpers.cpp @@ -47,7 +47,7 @@ #include <QtCore/QJsonObject> #include <QtCore/QJsonArray> #include <QtCore/QVariantMap> -#include <QtLocation/QGeoCoordinate> +#include <QtPositioning/QGeoCoordinate> #include <QtLocation/QPlaceImage> #include <QtLocation/QPlaceReview> #include <QtLocation/QPlaceEditorial> diff --git a/src/plugins/geoservices/nokia/qgeocodereply_nokia.cpp b/src/plugins/geoservices/nokia/qgeocodereply_nokia.cpp index f96122db..4995358b 100644 --- a/src/plugins/geoservices/nokia/qgeocodereply_nokia.cpp +++ b/src/plugins/geoservices/nokia/qgeocodereply_nokia.cpp @@ -49,7 +49,7 @@ #include "qgeocodereply_nokia.h" #include "qgeocodexmlparser.h" -#include <QtLocation/QGeoShape> +#include <QtPositioning/QGeoShape> QT_BEGIN_NAMESPACE diff --git a/src/plugins/geoservices/nokia/qgeocodexmlparser.cpp b/src/plugins/geoservices/nokia/qgeocodexmlparser.cpp index affd6e69..b9dbd934 100644 --- a/src/plugins/geoservices/nokia/qgeocodexmlparser.cpp +++ b/src/plugins/geoservices/nokia/qgeocodexmlparser.cpp @@ -52,9 +52,9 @@ #include <QIODevice> #include <qgeolocation.h> -#include <QtLocation/QGeoAddress> -#include <QtLocation/QGeoCoordinate> -#include <QtLocation/QGeoRectangle> +#include <QtPositioning/QGeoAddress> +#include <QtPositioning/QGeoCoordinate> +#include <QtPositioning/QGeoRectangle> QT_BEGIN_NAMESPACE diff --git a/src/plugins/geoservices/nokia/qgeoroutexmlparser.cpp b/src/plugins/geoservices/nokia/qgeoroutexmlparser.cpp index c5135436..cd8a4bad 100644 --- a/src/plugins/geoservices/nokia/qgeoroutexmlparser.cpp +++ b/src/plugins/geoservices/nokia/qgeoroutexmlparser.cpp @@ -54,7 +54,7 @@ #include <QString> #include <qgeoroute.h> -#include <QtLocation/QGeoRectangle> +#include <QtPositioning/QGeoRectangle> QT_BEGIN_NAMESPACE diff --git a/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp b/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp index 044359a2..5ea99027 100644 --- a/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp +++ b/src/plugins/geoservices/nokia/qgeoroutingmanagerengine_nokia.cpp @@ -55,7 +55,7 @@ #include <QStringList> #include <QUrl> #include <QLocale> -#include <QtLocation/QGeoRectangle> +#include <QtPositioning/QGeoRectangle> QT_BEGIN_NAMESPACE diff --git a/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.h b/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.h index 175e829a..3ba30d90 100644 --- a/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.h +++ b/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.h @@ -50,7 +50,7 @@ #define QGEOTILEDMAPPINGMANAGERENGINE_NOKIA_H #include "qgeotiledmappingmanagerengine_p.h" -#include <QtLocation/QGeoRectangle> +#include <QtPositioning/QGeoRectangle> #include "qgeomaptype_p.h" #include <QGeoServiceProvider> diff --git a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp index a31d88c4..9c2a9b85 100644 --- a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp +++ b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp @@ -70,7 +70,7 @@ #include <QtNetwork/QNetworkProxyFactory> #include <QtLocation/QPlaceContentRequest> -#include <QtLocation/QGeoCircle> +#include <QtPositioning/QGeoCircle> QT_BEGIN_NAMESPACE diff --git a/src/plugins/geoservices/osm/qgeocodereplyosm.cpp b/src/plugins/geoservices/osm/qgeocodereplyosm.cpp index dfb656dd..39b5339b 100644 --- a/src/plugins/geoservices/osm/qgeocodereplyosm.cpp +++ b/src/plugins/geoservices/osm/qgeocodereplyosm.cpp @@ -44,10 +44,10 @@ #include <QtCore/QJsonDocument> #include <QtCore/QJsonObject> #include <QtCore/QJsonArray> -#include <QtLocation/QGeoCoordinate> -#include <QtLocation/QGeoAddress> -#include <QtLocation/QGeoLocation> -#include <QtLocation/QGeoRectangle> +#include <QtPositioning/QGeoCoordinate> +#include <QtPositioning/QGeoAddress> +#include <QtPositioning/QGeoLocation> +#include <QtPositioning/QGeoRectangle> QT_BEGIN_NAMESPACE diff --git a/src/plugins/geoservices/osm/qgeocodingmanagerengineosm.cpp b/src/plugins/geoservices/osm/qgeocodingmanagerengineosm.cpp index a97913d5..05bc97dd 100644 --- a/src/plugins/geoservices/osm/qgeocodingmanagerengineosm.cpp +++ b/src/plugins/geoservices/osm/qgeocodingmanagerengineosm.cpp @@ -48,10 +48,10 @@ #include <QtCore/QLocale> #include <QtNetwork/QNetworkAccessManager> #include <QtNetwork/QNetworkRequest> -#include <QtLocation/QGeoCoordinate> -#include <QtLocation/QGeoAddress> -#include <QtLocation/QGeoShape> -#include <QtLocation/QGeoRectangle> +#include <QtPositioning/QGeoCoordinate> +#include <QtPositioning/QGeoAddress> +#include <QtPositioning/QGeoShape> +#include <QtPositioning/QGeoRectangle> QT_BEGIN_NAMESPACE diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index 5d629f4d..457e8051 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -1,3 +1,3 @@ TEMPLATE = subdirs -SUBDIRS += position -qtHaveModule(3d): SUBDIRS += geoservices +qtHaveModule(positioning): SUBDIRS += position +qtHaveModule(3d):qtHaveModule(location) SUBDIRS += geoservices diff --git a/src/plugins/position/geoclue/geoclue.pro b/src/plugins/position/geoclue/geoclue.pro index b6a80c69..81e39d8a 100644 --- a/src/plugins/position/geoclue/geoclue.pro +++ b/src/plugins/position/geoclue/geoclue.pro @@ -1,5 +1,5 @@ TARGET = qtposition_geoclue -QT += location gui +QT = core positioning PLUGIN_TYPE = position load(qt_plugin) diff --git a/src/plugins/position/geoclue/qgeocluemaster.cpp b/src/plugins/position/geoclue/qgeocluemaster.cpp index e8444cef..a3eb9b14 100644 --- a/src/plugins/position/geoclue/qgeocluemaster.cpp +++ b/src/plugins/position/geoclue/qgeocluemaster.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Jolla Ltd, author: Aaron McCarthy <aaron.mccarthy@jollamobile.com> ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage diff --git a/src/plugins/position/geoclue/qgeocluemaster.h b/src/plugins/position/geoclue/qgeocluemaster.h index 0ebedb33..f48ecb7e 100644 --- a/src/plugins/position/geoclue/qgeocluemaster.h +++ b/src/plugins/position/geoclue/qgeocluemaster.h @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Jolla Ltd, author: Aaron McCarthy <aaron.mccarthy@jollamobile.com> ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage diff --git a/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster.cpp b/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster.cpp index 04f23c21..2279d832 100644 --- a/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster.cpp +++ b/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster.cpp @@ -5,7 +5,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage diff --git a/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster_p.h b/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster_p.h index 0adf004b..ff351b6a 100644 --- a/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster_p.h +++ b/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster_p.h @@ -5,7 +5,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage diff --git a/src/plugins/position/geoclue/qgeopositioninfosourcefactory_geoclue.cpp b/src/plugins/position/geoclue/qgeopositioninfosourcefactory_geoclue.cpp index 0395e5b6..e6219105 100644 --- a/src/plugins/position/geoclue/qgeopositioninfosourcefactory_geoclue.cpp +++ b/src/plugins/position/geoclue/qgeopositioninfosourcefactory_geoclue.cpp @@ -5,7 +5,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -43,7 +43,9 @@ #include "qgeopositioninfosourcefactory_geoclue.h" #include "qgeopositioninfosource_geocluemaster_p.h" +#ifdef HAS_SATELLITE #include "qgeosatelliteinfosource_geocluemaster.h" +#endif QGeoPositionInfoSource *QGeoPositionInfoSourceFactoryGeoclue::positionInfoSource(QObject *parent) { diff --git a/src/plugins/position/geoclue/qgeopositioninfosourcefactory_geoclue.h b/src/plugins/position/geoclue/qgeopositioninfosourcefactory_geoclue.h index 4eedaf81..0fa95d72 100644 --- a/src/plugins/position/geoclue/qgeopositioninfosourcefactory_geoclue.h +++ b/src/plugins/position/geoclue/qgeopositioninfosourcefactory_geoclue.h @@ -5,7 +5,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage diff --git a/src/plugins/position/geoclue/qgeosatelliteinfosource_geocluemaster.cpp b/src/plugins/position/geoclue/qgeosatelliteinfosource_geocluemaster.cpp index 276b0278..3a78b174 100644 --- a/src/plugins/position/geoclue/qgeosatelliteinfosource_geocluemaster.cpp +++ b/src/plugins/position/geoclue/qgeosatelliteinfosource_geocluemaster.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Jolla Ltd, author: Aaron McCarthy <aaron.mccarthy@jollamobile.com> ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage diff --git a/src/plugins/position/geoclue/qgeosatelliteinfosource_geocluemaster.h b/src/plugins/position/geoclue/qgeosatelliteinfosource_geocluemaster.h index 60f4fe48..1448f827 100644 --- a/src/plugins/position/geoclue/qgeosatelliteinfosource_geocluemaster.h +++ b/src/plugins/position/geoclue/qgeosatelliteinfosource_geocluemaster.h @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Jolla Ltd, author: Aaron McCarthy <aaron.mccarthy@jollamobile.com> ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -48,7 +48,7 @@ #include <QtCore/qcompilerdetection.h> #include <QtCore/QTimer> -#include <QtLocation/QGeoSatelliteInfoSource> +#include <QtPositioning/QGeoSatelliteInfoSource> QT_BEGIN_NAMESPACE diff --git a/src/plugins/position/gypsy/gypsy.pro b/src/plugins/position/gypsy/gypsy.pro index 2255746e..f67d41e7 100644 --- a/src/plugins/position/gypsy/gypsy.pro +++ b/src/plugins/position/gypsy/gypsy.pro @@ -1,5 +1,5 @@ TARGET = qtposition_gypsy -QT += location gui +QT = core positioning PLUGIN_TYPE = position load(qt_plugin) diff --git a/src/plugins/position/gypsy/qgeopositioninfosourcefactory_gypsy.cpp b/src/plugins/position/gypsy/qgeopositioninfosourcefactory_gypsy.cpp index 77c8d1d7..dee265de 100644 --- a/src/plugins/position/gypsy/qgeopositioninfosourcefactory_gypsy.cpp +++ b/src/plugins/position/gypsy/qgeopositioninfosourcefactory_gypsy.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage diff --git a/src/plugins/position/gypsy/qgeopositioninfosourcefactory_gypsy.h b/src/plugins/position/gypsy/qgeopositioninfosourcefactory_gypsy.h index f44d47f7..6cd145ca 100644 --- a/src/plugins/position/gypsy/qgeopositioninfosourcefactory_gypsy.h +++ b/src/plugins/position/gypsy/qgeopositioninfosourcefactory_gypsy.h @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage diff --git a/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy.cpp b/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy.cpp index 0a3d8c26..3a41047a 100644 --- a/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy.cpp +++ b/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage diff --git a/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy_p.h b/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy_p.h index 9d274cc0..edf6ec94 100644 --- a/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy_p.h +++ b/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy_p.h @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage diff --git a/src/plugins/position/positionpoll/positionpoll.pro b/src/plugins/position/positionpoll/positionpoll.pro index 8c871947..dd26f522 100644 --- a/src/plugins/position/positionpoll/positionpoll.pro +++ b/src/plugins/position/positionpoll/positionpoll.pro @@ -1,5 +1,5 @@ TARGET = qtposition_positionpoll -QT += location gui +QT += positioning PLUGIN_TYPE = position load(qt_plugin) diff --git a/src/plugins/position/positionpoll/positionpollfactory.cpp b/src/plugins/position/positionpoll/positionpollfactory.cpp index a35b6c1e..a3ec6527 100644 --- a/src/plugins/position/positionpoll/positionpollfactory.cpp +++ b/src/plugins/position/positionpoll/positionpollfactory.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage diff --git a/src/plugins/position/positionpoll/positionpollfactory.h b/src/plugins/position/positionpoll/positionpollfactory.h index 50658eb7..73a4d60a 100644 --- a/src/plugins/position/positionpoll/positionpollfactory.h +++ b/src/plugins/position/positionpoll/positionpollfactory.h @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage diff --git a/src/plugins/position/positionpoll/qgeoareamonitor_polling.cpp b/src/plugins/position/positionpoll/qgeoareamonitor_polling.cpp index 5fc4794b..784c9fad 100644 --- a/src/plugins/position/positionpoll/qgeoareamonitor_polling.cpp +++ b/src/plugins/position/positionpoll/qgeoareamonitor_polling.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage diff --git a/src/plugins/position/positionpoll/qgeoareamonitor_polling.h b/src/plugins/position/positionpoll/qgeoareamonitor_polling.h index d798c2bf..a94e4e40 100644 --- a/src/plugins/position/positionpoll/qgeoareamonitor_polling.h +++ b/src/plugins/position/positionpoll/qgeoareamonitor_polling.h @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage diff --git a/src/plugins/position/simulator/qgeopositioninfosource_simulator.cpp b/src/plugins/position/simulator/qgeopositioninfosource_simulator.cpp index 053a1fb0..359a9b16 100644 --- a/src/plugins/position/simulator/qgeopositioninfosource_simulator.cpp +++ b/src/plugins/position/simulator/qgeopositioninfosource_simulator.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage diff --git a/src/plugins/position/simulator/qgeopositioninfosource_simulator_p.h b/src/plugins/position/simulator/qgeopositioninfosource_simulator_p.h index 7818176b..ffc91a7a 100644 --- a/src/plugins/position/simulator/qgeopositioninfosource_simulator_p.h +++ b/src/plugins/position/simulator/qgeopositioninfosource_simulator_p.h @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage diff --git a/src/plugins/position/simulator/qgeopositioninfosourcefactory_simulator.cpp b/src/plugins/position/simulator/qgeopositioninfosourcefactory_simulator.cpp index c8f11aae..efdb65b4 100644 --- a/src/plugins/position/simulator/qgeopositioninfosourcefactory_simulator.cpp +++ b/src/plugins/position/simulator/qgeopositioninfosourcefactory_simulator.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage diff --git a/src/plugins/position/simulator/qgeopositioninfosourcefactory_simulator.h b/src/plugins/position/simulator/qgeopositioninfosourcefactory_simulator.h index 262f9098..42dadf77 100644 --- a/src/plugins/position/simulator/qgeopositioninfosourcefactory_simulator.h +++ b/src/plugins/position/simulator/qgeopositioninfosourcefactory_simulator.h @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage diff --git a/src/plugins/position/simulator/qgeosatelliteinfosource_simulator.cpp b/src/plugins/position/simulator/qgeosatelliteinfosource_simulator.cpp index 6a86bea7..1612e255 100644 --- a/src/plugins/position/simulator/qgeosatelliteinfosource_simulator.cpp +++ b/src/plugins/position/simulator/qgeosatelliteinfosource_simulator.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage diff --git a/src/plugins/position/simulator/qgeosatelliteinfosource_simulator_p.h b/src/plugins/position/simulator/qgeosatelliteinfosource_simulator_p.h index 58e414e9..5d97c7eb 100644 --- a/src/plugins/position/simulator/qgeosatelliteinfosource_simulator_p.h +++ b/src/plugins/position/simulator/qgeosatelliteinfosource_simulator_p.h @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage diff --git a/src/plugins/position/simulator/qlocationconnection_simulator.cpp b/src/plugins/position/simulator/qlocationconnection_simulator.cpp index 7906dd7c..b78eb1cf 100644 --- a/src/plugins/position/simulator/qlocationconnection_simulator.cpp +++ b/src/plugins/position/simulator/qlocationconnection_simulator.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage diff --git a/src/plugins/position/simulator/qlocationconnection_simulator_p.h b/src/plugins/position/simulator/qlocationconnection_simulator_p.h index 6cbc18dd..402d7113 100644 --- a/src/plugins/position/simulator/qlocationconnection_simulator_p.h +++ b/src/plugins/position/simulator/qlocationconnection_simulator_p.h @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage diff --git a/src/plugins/position/simulator/qlocationdata_simulator.cpp b/src/plugins/position/simulator/qlocationdata_simulator.cpp index cf9c65eb..24fe0446 100644 --- a/src/plugins/position/simulator/qlocationdata_simulator.cpp +++ b/src/plugins/position/simulator/qlocationdata_simulator.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage diff --git a/src/plugins/position/simulator/qlocationdata_simulator_p.h b/src/plugins/position/simulator/qlocationdata_simulator_p.h index 8ac7dcd7..d148e2b4 100644 --- a/src/plugins/position/simulator/qlocationdata_simulator_p.h +++ b/src/plugins/position/simulator/qlocationdata_simulator_p.h @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage diff --git a/src/plugins/position/simulator/simulator.pro b/src/plugins/position/simulator/simulator.pro index 944907f7..e1105f17 100644 --- a/src/plugins/position/simulator/simulator.pro +++ b/src/plugins/position/simulator/simulator.pro @@ -1,5 +1,5 @@ TARGET = qtposition_simulator -QT += location gui +QT += positioning gui PLUGIN_TYPE = position load(qt_plugin) diff --git a/src/location/doc/images/example-weatherinfo.png b/src/positioning/doc/images/example-weatherinfo.png Binary files differindex 6557b57b..6557b57b 100644 --- a/src/location/doc/images/example-weatherinfo.png +++ b/src/positioning/doc/images/example-weatherinfo.png diff --git a/src/location/doc/images/qml-flickr-1.jpg b/src/positioning/doc/images/qml-flickr-1.jpg Binary files differindex 14fc5c92..14fc5c92 100644 --- a/src/location/doc/images/qml-flickr-1.jpg +++ b/src/positioning/doc/images/qml-flickr-1.jpg diff --git a/src/positioning/doc/qtpositioning.qdocconf b/src/positioning/doc/qtpositioning.qdocconf new file mode 100644 index 00000000..182cb7a8 --- /dev/null +++ b/src/positioning/doc/qtpositioning.qdocconf @@ -0,0 +1,56 @@ +include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) + +project = QtPositioning +description = Qt Positioning Reference Documentation +url = http://qt-project.org/doc/qt-$QT_VER/qtpositioning +version = $QT_VERSION + + + +qhp.projects = QtPositioning + +qhp.QtPositioning.file = qtpositioning.qhp +qhp.QtPositioning.namespace = org.qt-project.qtpositioning.$QT_VERSION_TAG +qhp.QtPositioning.virtualFolder = qtpositioning +qhp.QtPositioning.indexTitle = Qt Positioning +qhp.QtPositioning.indexRoot = + +qhp.QtPositioning.filterAttributes = qtpositioning $QT_VERSION qtrefdoc +qhp.QtPositioning.customFilters.Qt.name = QtPositioning $QT_VERSION +qhp.QtPositioning.customFilters.Qt.filterAttributes = qtpositioning $QT_VERSION +qhp.QtPositioning.subprojects = overviews classes qml examples +qhp.QtPositioning.subprojects.classes.title = C++ Classes +qhp.QtPositioning.subprojects.classes.indexTitle = Qt Positioning C++ Classes +qhp.QtPositioning.subprojects.classes.selectors = class fake:headerfile +qhp.QtPositioning.subprojects.classes.sortPages = true +qhp.QtPositioning.subprojects.qml.title = QML Types +qhp.QtPositioning.subprojects.qml.indexTitle = Qt Positioning QML Types +qhp.QtPositioning.subprojects.qml.selectors = fake:headerfile +qhp.QtPositioning.subprojects.qml.sortPages = true +qhp.QtPositioning.subprojects.overviews.title = Overviews +qhp.QtPositioning.subprojects.overviews.indexTitle = Qt Positioning Overview +qhp.QtPositioning.subprojects.overviews.selectors = fake:page,group,module +qhp.QtPositioning.subprojects.examples.title = Qt Positioning Examples +qhp.QtPositioning.subprojects.examples.indexTitle = Qt Positioning Examples +qhp.QtPositioning.subprojects.examples.selectors = fake:example + +tagfile = ../../../doc/qtpositioning/qtpositioning.tags + +depends += qtcore qtdoc qtquick qtqml qtnetwork + +headerdirs += .. \ + ../../imports/positioning + +sourcedirs += .. \ + ../../imports/positioning + +exampledirs += ../../../examples \ + ../../../examples/declarative \ + snippets/ + + +imagedirs += images + +navigation.landingpage = "Qt Positioning" +navigation.cppclassespage = "Qt Positioning C++ Classes" +navigation.qmltypespage = "Qt Positioning QML Types" diff --git a/src/positioning/doc/snippets/cpp/cpp.pro b/src/positioning/doc/snippets/cpp/cpp.pro new file mode 100644 index 00000000..47401e90 --- /dev/null +++ b/src/positioning/doc/snippets/cpp/cpp.pro @@ -0,0 +1,8 @@ +TEMPLATE = app +TARGET = positioning_cppsnippet +QT = core positioning + +SOURCES += \ + main.cpp \ + cppqml.cpp + diff --git a/src/positioning/doc/snippets/cpp/cppqml.cpp b/src/positioning/doc/snippets/cpp/cppqml.cpp new file mode 100644 index 00000000..5ab23513 --- /dev/null +++ b/src/positioning/doc/snippets/cpp/cppqml.cpp @@ -0,0 +1,64 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtPositioning module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include <QtCore/QObject> +#include <QtCore/QVariant> +#include <QtPositioning/QGeoAddress> +#include <QtPositioning/QGeoLocation> + +void cppQmlInterface(QObject *qmlObject) +{ + //! [Address get] + QGeoAddress geoAddress = qmlObject->property("address").value<QGeoAddress>(); + //! [Address get] + + //! [Address set] + qmlObject->setProperty("address", QVariant::fromValue(geoAddress)); + //! [Address set] + + //! [Location get] + QGeoLocation geoLocation = qmlObject->property("location").value<QGeoLocation>(); + //! [Location get] + + //! [Location set] + qmlObject->setProperty("location", QVariant::fromValue(geoLocation)); + //! [Location set] +} + diff --git a/src/positioning/doc/snippets/cpp/main.cpp b/src/positioning/doc/snippets/cpp/main.cpp new file mode 100644 index 00000000..bc78207f --- /dev/null +++ b/src/positioning/doc/snippets/cpp/main.cpp @@ -0,0 +1,45 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtPositioning module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +int main(int /*argc*/, char ** /*argv*/) +{ + return 0; +} + diff --git a/src/positioning/doc/snippets/doc_src_qtpositioning.qml b/src/positioning/doc/snippets/doc_src_qtpositioning.qml new file mode 100644 index 00000000..cc9547b7 --- /dev/null +++ b/src/positioning/doc/snippets/doc_src_qtpositioning.qml @@ -0,0 +1,47 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +//! [import] +import QtPositioning 5.0 +//! [import] + +Item { +} + diff --git a/src/location/doc/src/position.qdoc b/src/positioning/doc/src/cpp-position.qdoc index 75f54c31..75c2e30e 100644 --- a/src/location/doc/src/position.qdoc +++ b/src/positioning/doc/src/cpp-position.qdoc @@ -184,8 +184,8 @@ images from Flickr relevant to the current location. -\section1 Location Position Classes +\section1 Positioning Classes -\annotatedlist QtLocation-positioning +\annotatedlist QtPositioning-positioning */ diff --git a/src/positioning/doc/src/cpp-qml-positioning.qdoc b/src/positioning/doc/src/cpp-qml-positioning.qdoc new file mode 100644 index 00000000..4ccd8510 --- /dev/null +++ b/src/positioning/doc/src/cpp-qml-positioning.qdoc @@ -0,0 +1,55 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** 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. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: http://www.gnu.org/copyleft/fdl.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! +\page positioning-cpp-qml.html +\title Interfaces between C++ and QML Code in Qt Positioning + +\brief Some of the providing QtPositioning QML types providing interfaces to access and modify properties in C++. + +\section2 Address - QGeoAddress +\target geoaddress +The \l {QtPositioning5::Address::address} {Address.address} property is used to provide an interface between C++ and QML code. First a pointer to a +Address object must be obtained from C++, then use the \l {QObject::property()}{property()} and +\l {QObject::setProperty()}{setProperty()} functions to get and set the \c address property. +The following gets the QGeoAddress representing this object from C++: +\snippet cpp/cppqml.cpp Address get +The following sets the properties of this object based on a QGeoAddress object from C++: +\snippet cpp/cppqml.cpp Address set + + +\section2 Location - QGeoLocation +\target location +The \l {Location::location} {Location.location} property is used to provide an interface between C++ and QML code. First a pointer to a +Location object must be obtained from C++, then use the \l {QObject::property()}{property()} and +\l {QObject::setProperty()}{setProperty()} functions to get and set the \c location property. +The following gets the QGeoLocation representing this object from C++: +\snippet cpp/cppqml.cpp Location get +The following sets the properties of this object based on a QGeoLocation object from C++: +\snippet cpp/cppqml.cpp Location set + +*/ diff --git a/src/location/doc/src/examples/declarative-flickr.qdoc b/src/positioning/doc/src/examples/declarative-flickr.qdoc index 99c2792d..c68797b0 100644 --- a/src/location/doc/src/examples/declarative-flickr.qdoc +++ b/src/positioning/doc/src/examples/declarative-flickr.qdoc @@ -28,28 +28,28 @@ /*! \example declarative/flickr \title Flickr (QML) - \ingroup qtlocation-examples + \ingroup qtpositioning-examples - \brief The Flickr example shows how to use the user's current location to + \brief The Flickr example shows how to use the user's current position to fetch local content from a web service. This is a small example, illustrating one of the very core parts of the - Qt Location API: the ability to retrieve and use the user's current - geographic location. + Qt Positioning API: the ability to retrieve and use the user's current + geographic position. Key QML types shown in this example: \list - \li \l{QtLocation5::PositionSource}{PositionSource} + \li \l{QtPositioning5::PositionSource}{PositionSource} \li \l{XmlListModel}{XmlListModel} \endlist \image qml-flickr-1.jpg - \section2 Retrieving the Current Location + \section2 Retrieving the Current Position - Retrieving the user's current location is achieved using the PositionSource + Retrieving the user's current position is achieved using the PositionSource type. In this example, we instantiate the PositionSource as part of the - GeoTab component (the floating "window" describing current location and + GeoTab component (the floating "window" describing current position and status). \snippet flickr/flickrmobile/GeoTab.qml possrc @@ -67,13 +67,15 @@ \snippet flickr/flickrmobile/GeoTab.qml props + \section2 Using the Current Position + The longitude and latitude values retrieved here are eventually set on in properties on the RestModel component. The RestModel is an XmlListModel, which retrieves XML data from a URL and creates a data model by performing XPath queries on it. In this case, it retrieves data from the Flickr REST API online, based on - our current location + our current position \snippet flickr/flickrcommon/RestModel.qml restmodel diff --git a/src/location/doc/src/examples/logfilepositionsource.qdoc b/src/positioning/doc/src/examples/logfilepositionsource.qdoc index 0e7ac773..f69c1dd1 100644 --- a/src/location/doc/src/examples/logfilepositionsource.qdoc +++ b/src/positioning/doc/src/examples/logfilepositionsource.qdoc @@ -28,7 +28,7 @@ /*! \example logfilepositionsource \title Log File Position Source (C++) -\ingroup qtlocation-examples +\ingroup qtpositioning-examples \brief The Logfile Position Source shows how to create and work with a custom NMEA position source, for platforms without GPS. @@ -37,8 +37,8 @@ The data is read from a file which has positional data in NMEA format. The resul position information is then displayed to the screen as simple text in date/time and latitude/longitude format. -This example class reads location data from a text file, \e log.txt. The file specifies location -data using a simple text format: it contains one location update per line, where each line contains +This example class reads position data from a text file, \e log.txt. The file specifies position +data using a simple text format: it contains one position update per line, where each line contains a date/time, a latitude and a longitude, separated by spaces. The date/time is in ISO 8601 format and the latitude and longitude are in degrees decimal format. Here is an excerpt from \e log.txt: diff --git a/src/positioning/doc/src/examples/qtpositioning-examples.qdoc b/src/positioning/doc/src/examples/qtpositioning-examples.qdoc new file mode 100644 index 00000000..ac1d79ec --- /dev/null +++ b/src/positioning/doc/src/examples/qtpositioning-examples.qdoc @@ -0,0 +1,38 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** 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. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: http://www.gnu.org/copyleft/fdl.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \group qtpositioning-examples + \title Qt Positioning Examples + \brief Examples for the Qt Positioning module + \ingroup all-examples + \ingroup qtpositioning + + These are the Qt Positioning examples. + +*/ + diff --git a/src/location/doc/src/examples/weatherinfo.qdoc b/src/positioning/doc/src/examples/weatherinfo.qdoc index ad5ad5d5..0c98cc04 100644 --- a/src/location/doc/src/examples/weatherinfo.qdoc +++ b/src/positioning/doc/src/examples/weatherinfo.qdoc @@ -32,9 +32,9 @@ \brief The Weather Info example shows how to use the user's current position to retrieve local content from a web service in a C++ plugin for QML. - \ingroup qtlocation-examples + \ingroup qtpositioning-examples - Key Qt Location classes used in this example: + Key Qt Positioning classes used in this example: \list \li \l{QGeoPositionInfo} @@ -64,7 +64,7 @@ \snippet weatherinfo/appmodel.cpp 2 - If no default source is available, we take a static location and fetch + If no default source is available, we take a static position and fetch weather for that. If, however, we do have a position source, we connect its positionUpdated() signal to a slot on the AppModel and call startUpdates(), which begins regular updates of device position. diff --git a/src/location/doc/src/qml-position.qdoc b/src/positioning/doc/src/qml-position.qdoc index 9553f6d2..850bdd35 100644 --- a/src/location/doc/src/qml-position.qdoc +++ b/src/positioning/doc/src/qml-position.qdoc @@ -98,39 +98,10 @@ sourced from a logfile which is in NMEA format. \l {http://en.wikipedia.org/wiki/NMEA}{NMEA} is a common text-based protocol for specifying navigational data. For convenience, the \l {PositionSource::nmeaSource}{nmeaSource} property is provided to enable QML applications to read NMEA data from a log file, the source will emit updates according to the time stamp of each NMEA sentence to produce a "replay" of the recorded data. -\section2 Example: Centering the Map on the Current Position - -Here is an example of a client that uses a \l{PositionSource}{position source} -to center a \l{Map}{map} on the current position: - -\code -Rectangle { - - import QtLocation 5.0 - ... - - map : Map { - // initialize map - ... - } - - PositionSource { - onPositionChanged: { - // center the map on the current position - map.center = position.coordinate - } - } -} -\endcode - \section2 \b{Flickr Example} The \l{Flickr (QML)}{Flickr Example} uses the Location to download thumbnail images from Flickr relevant to the current location. - -\section1 Position QML Components - -\annotatedlist qml-QtLocation5-positioning */ diff --git a/src/positioning/doc/src/qtpositioning-plugins.qdoc b/src/positioning/doc/src/qtpositioning-plugins.qdoc new file mode 100644 index 00000000..1ed1be1a --- /dev/null +++ b/src/positioning/doc/src/qtpositioning-plugins.qdoc @@ -0,0 +1,82 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** 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. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: http://www.gnu.org/copyleft/fdl.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! +\page qtpositioning-plugins.html +\title Qt Positioning service plugins +\brief Implementing Qt Positioning plugins + +Qt Positioning provides the majority of its functionality through plugins. This +document outlines how to develop a new position plugin. + +\section1 Plugin description + +Each plugin is described by a json file. The json describes the plugins capabilities and +version. Below is an example of a json file used by the postionpoll plugin: + +\quotefile ../../../plugins/position/positionpoll/plugin.json + +The entries have the following meaning: + +\table + \header + \li Key + \li Description + \row + \li Keys + \li The unique name/key of the plugin. Each position plugin must have a unique name. + \row + \li Provider + \li The provider name of the services. Multiple plugins may have the same name. + In such cases the Version string will be used to further distinguish the plugins. + \row + \li Position + \li Set to \c true if the plugin implements a \l QGeoPositionInfoSource. + \row + \li Satellite + \li Set to \c true if the plugin implements a \l QGeoSatelliteInfoSource. + \row + \li Monitor + \li Set to \c true if the plugin implements a \l QGeoAreaMonitor. + \row + \li Priority + \li The plugin priority. If multiple plugins have the same provider name, the plugin + with the higest priority will be used. +\endtable + +\section1 Implementing Plugins + +A plugin implementer needs to subclass \l QGeoPositionInfoSourceFactory and override one or more of +its functions. If a plugin does not support a specific feature the function should return 0 or +utilize the default implementation. + +\list + \li \l QGeoPositionInfoSourceFactory::areaMonitor() + \li \l QGeoPositionInfoSourceFactory::positionInfoSource() + \li \l QGeoPositionInfoSourceFactory::satelliteInfoSource() +\endlist +*/ diff --git a/src/positioning/doc/src/qtpositioning-qml.qdoc b/src/positioning/doc/src/qtpositioning-qml.qdoc new file mode 100644 index 00000000..ba35cb89 --- /dev/null +++ b/src/positioning/doc/src/qtpositioning-qml.qdoc @@ -0,0 +1,65 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** 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. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: http://www.gnu.org/copyleft/fdl.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \qmlmodule QtPositioning 5.0 + \title Qt Positioning QML Types + \ingroup qmlmodules + \brief Provides QML types for position information + +\section1 Overview + +The identifying string for this module is \e QtPositioning. To use include the following import +statement in the QML file. + +\snippet doc_src_qtpositioning.qml import + +\section2 Positioning QML Concepts + +Position information can come from a variety of sources including satellites, +wifi, text files and so on. The position is described by the latitude, +the longitude, and the altitude in meters. For more information see +\l {http://en.wikipedia.org/wiki/Geographic_coordinate}{Geographic Coordinate}. + +The QML position is stored in a \l {coordinate} which contains the +latitude, longitude and altitude of the device. The \l {QtPositioning5::Location}{Location} contains +this \l {coordinate} and adds an address, it also has a bounding box which +defines the recommended viewing region when displaying the location. + +Now that the device has a position, with regular updates the API can determine +the speed and heading of the device. It can also define a box or a circle that can +produce a notification when the device either leaves or enters that region. + +More detailed information retrieving the current position can be found under +{Positioning (QML)}{Location Positioning via QML} + +\section1 Basic Types + +\annotatedlist qml-QtPositioning5-basictypes + +\section1 Alphabetical Listing of all QML Types +*/ diff --git a/src/positioning/doc/src/qtpositioning.qdoc b/src/positioning/doc/src/qtpositioning.qdoc new file mode 100644 index 00000000..95b3fecc --- /dev/null +++ b/src/positioning/doc/src/qtpositioning.qdoc @@ -0,0 +1,124 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** 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. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: http://www.gnu.org/copyleft/fdl.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + + + + +/*! + \module QtPositioning + \title Qt Positioning C++ Classes + \ingroup modules + \qtvariable location + + \brief The Positioning module provides positioning information via QML and C++ interfaces. + + To load the Qt Positioning module, add the following statement to your .qml files + + \code + import QtPositioning 5.0 + \endcode + + For C++ projects include the header appropriate for the current use case, + for example applications using routes may use + + \code #include <QGeoCoordinate> \endcode + + The .pro file should have the \e positioning keyword added + + \code QT += positioning \endcode + + + See more in the \l{Qt Positioning}{Qt Positioning Overview}. + +*/ + + + +/*! +\page qtpositioning-index.html +\title Qt Positioning +\brief The Qt Positioning API provides positioning information via QML and C++ interfaces. +\ingroup technology-apis + +The Qt Positioning API provides positioning information via QML and C++ interfaces. + +\section1 Overview + +The Qt Positioning API gives developers the ability to determine a position by +using a variety of possible sources, including satellite, or wifi, or text file, +and so on. That information can then be used to for example determine a position +on a map. In addition satellite information can be retrieved and area based monitoring +can be performed. + +\section1 Getting Started + +To load the Qt Positioning module, add the following statement to your .qml files + +\code + import QtPositioning 5.0 +\endcode + +For C++ projects include the header appropriate for the current use case, +for example applications using routes may use + +\code #include <QGeoCoordinate> \endcode + +The .pro file should have the \e positioning keyword added + +\code QT += positioning \endcode + +\section1 Related information +\section2 Overview + +Positioning includes all the functionality necessary to find and work with geographic +coordinates. It can use a variety of external sources of information, including GPS. This +provides us with a coordinate and altitude for the device with additional features +such as speed and direction. This provides the fundamental location information used in the API. + +\section2 References +\table +\row + \li Positioning introduction: + \li \l{Positioning (QML)}{for QML} + \li \l{Positioning (C++)}{for C++} +\row + \li API references: + \li \l {Qt Positioning QML Types}{for QML} + \li \l {Qt Positioning C++ Classes}{for C++} +\row + \li Position plugins: + \li \l {Qt Positioning service plugins} +\endtable + +\section2 Examples + +\list + \li \l {Flickr (QML)} + \li \l {Log File Position Source (C++)} + \li \l {Weather Info (C++/QML)} +\endlist +*/ diff --git a/src/positioning/positioning.pro b/src/positioning/positioning.pro new file mode 100644 index 00000000..da1186bf --- /dev/null +++ b/src/positioning/positioning.pro @@ -0,0 +1,58 @@ +TARGET = QtPositioning +QT = core-private +QT += qml # the dependecy should be removed, see QTBUG-22330 + + +QMAKE_DOCS = $$PWD/doc/qtpositioning.qdocconf +OTHER_FILES += doc/src/*.qdoc # show .qdoc files in Qt Creator + +PUBLIC_HEADERS += \ + qgeoaddress.h \ + qgeoareamonitor.h \ + qgeoshape.h \ + qgeorectangle.h \ + qgeocircle.h \ + qgeocoordinate.h \ + qgeolocation.h \ + qgeopositioninfo.h \ + qgeopositioninfosource.h \ + qgeosatelliteinfo.h \ + qgeosatelliteinfosource.h \ + qnmeapositioninfosource.h \ + qgeopositioninfosourcefactory.h \ + qpositioningglobal.h + +PRIVATE_HEADERS += \ + qgeoaddress_p.h \ + qgeoshape_p.h \ + qgeorectangle_p.h \ + qgeocircle_p.h \ + qgeolocation_p.h \ + qlocationutils_p.h \ + qnmeapositioninfosource_p.h \ + qgeocoordinate_p.h \ + qgeopositioninfosource_p.h \ + qdeclarativegeoaddress_p.h \ + qdeclarativegeolocation_p.h + +SOURCES += \ + qgeoaddress.cpp \ + qgeoareamonitor.cpp \ + qgeoshape.cpp \ + qgeorectangle.cpp \ + qgeocircle.cpp \ + qgeocoordinate.cpp \ + qgeolocation.cpp \ + qgeopositioninfo.cpp \ + qgeopositioninfosource.cpp \ + qgeosatelliteinfo.cpp \ + qgeosatelliteinfosource.cpp \ + qlocationutils.cpp \ + qnmeapositioninfosource.cpp \ + qgeopositioninfosourcefactory.cpp \ + qdeclarativegeoaddress.cpp \ + qdeclarativegeolocation.cpp + +HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS + +load(qt_module) diff --git a/src/imports/location/qdeclarativegeoaddress.cpp b/src/positioning/qdeclarativegeoaddress.cpp index 3244cfc8..d061db10 100644 --- a/src/imports/location/qdeclarativegeoaddress.cpp +++ b/src/positioning/qdeclarativegeoaddress.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -46,9 +46,8 @@ QT_BEGIN_NAMESPACE /*! \qmltype Address \instantiates QDeclarativeGeoAddress - \inqmlmodule QtLocation 5.0 - \ingroup qml-QtLocation5-positioning - \since Qt Location 5.0 + \inqmlmodule QtPositioning 5.0 + \since Qt Positioning 5.0 \brief The Address QML type represents a specific location as a street address. @@ -83,9 +82,8 @@ QT_BEGIN_NAMESPACE } \endcode - This could then be used, for example, as the value of a \l{GeocodeModel}'s - \l{GeocodeModel::query}{query} property, to get an exact longitude and - latitude for the address. + This could then be used, for example, as the value of a geocoding query, + to get an exact longitude and latitude for the address. \sa {QGeoAddress} */ @@ -101,10 +99,10 @@ QDeclarativeGeoAddress::QDeclarativeGeoAddress(const QGeoAddress &address, QObje } /*! - \qmlproperty QGeoAddress QtLocation5::Address::address + \qmlproperty QGeoAddress QtPositioning5::Address::address For details on how to use this property to interface between C++ and QML see - "\l {location-cpp-qml.html#geoaddress} {Interfaces between C++ and QML Code}". + "\l {positioning-cpp-qml.html#geoaddress} {Interfaces between C++ and QML Code}". */ QGeoAddress QDeclarativeGeoAddress::address() const { @@ -127,7 +125,7 @@ void QDeclarativeGeoAddress::setAddress(const QGeoAddress &address) } /*! - \qmlproperty string QtLocation5::Address::text + \qmlproperty string QtPositioning5::Address::text This property holds the address as a single formatted string. It is the recommended string to use to display the address to the user. It typically takes the format of @@ -164,7 +162,7 @@ void QDeclarativeGeoAddress::setText(const QString &address) } /*! - \qmlproperty string QtLocation5::Address::country + \qmlproperty string QtPositioning::Address::country This property holds the country of the address as a single formatted string. */ @@ -186,7 +184,7 @@ void QDeclarativeGeoAddress::setCountry(const QString &country) } /*! - \qmlproperty string QtLocation5::Address::countryCode + \qmlproperty string QtPositioning::Address::countryCode This property holds the country code of the address as a single formatted string. */ @@ -208,7 +206,7 @@ void QDeclarativeGeoAddress::setCountryCode(const QString &countryCode) } /*! - \qmlproperty string QtLocation5::Address::state + \qmlproperty string QtPositioning::Address::state This property holds the state of the address as a single formatted string. */ @@ -230,7 +228,7 @@ void QDeclarativeGeoAddress::setState(const QString &state) } /*! - \qmlproperty string QtLocation5::Address::county + \qmlproperty string QtPositioning::Address::county This property holds the county of the address as a single formatted string. */ @@ -252,7 +250,7 @@ void QDeclarativeGeoAddress::setCounty(const QString &county) } /*! - \qmlproperty string QtLocation5::Address::city + \qmlproperty string QtPositioning::Address::city This property holds the city of the address as a single formatted string. */ @@ -274,7 +272,7 @@ void QDeclarativeGeoAddress::setCity(const QString &city) } /*! - \qmlproperty string QtLocation5::Address::district + \qmlproperty string QtPositioning::Address::district This property holds the district of the address as a single formatted string. */ @@ -296,7 +294,7 @@ void QDeclarativeGeoAddress::setDistrict(const QString &district) } /*! - \qmlproperty string QtLocation5::Address::street + \qmlproperty string QtPositioning::Address::street This property holds the street of the address but may also contain things like a unit number, a building @@ -321,7 +319,7 @@ void QDeclarativeGeoAddress::setStreet(const QString &street) } /*! - \qmlproperty string QtLocation5::Address::postalCode + \qmlproperty string QtPositioning::Address::postalCode This property holds the postal code of the address as a single formatted string. */ @@ -343,7 +341,7 @@ void QDeclarativeGeoAddress::setPostalCode(const QString &postalCode) } /*! - \qmlproperty bool QtLocation5::Address::isTextGenerated + \qmlproperty bool QtPositioning::Address::isTextGenerated This property holds a boolean that if true, indicates that \l text is automatically generated from address properties. If false, it indicates that the \l text has been diff --git a/src/imports/location/qdeclarativegeoaddress_p.h b/src/positioning/qdeclarativegeoaddress_p.h index 660145be..c3904a4f 100644 --- a/src/imports/location/qdeclarativegeoaddress_p.h +++ b/src/positioning/qdeclarativegeoaddress_p.h @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE -class QDeclarativeGeoAddress : public QObject +class Q_POSITIONING_EXPORT QDeclarativeGeoAddress : public QObject { Q_OBJECT diff --git a/src/imports/location/qdeclarativegeolocation.cpp b/src/positioning/qdeclarativegeolocation.cpp index 404a821d..95ba3113 100644 --- a/src/imports/location/qdeclarativegeolocation.cpp +++ b/src/positioning/qdeclarativegeolocation.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -46,9 +46,8 @@ QT_USE_NAMESPACE /*! \qmltype Location \instantiates QDeclarativeGeoLocation - \inqmlmodule QtLocation 5.0 - \ingroup qml-QtLocation5-positioning - \since Qt Location 5.0 + \inqmlmodule QtPositioning 5.0 + \since Qt Positioning 5.0 \brief The Location type holds location data. @@ -96,10 +95,10 @@ QDeclarativeGeoLocation::~QDeclarativeGeoLocation() } /*! - \qmlproperty QGeoLocation QtLocation5::Location::location + \qmlproperty QGeoLocation QtPositioning::Location::location For details on how to use this property to interface between C++ and QML see - "\l {location-cpp-qml.html#location} {Interfaces between C++ and QML Code}". + "\l {positioning-cpp-qml.html#location} {Interfaces between C++ and QML Code}". */ void QDeclarativeGeoLocation::setLocation(const QGeoLocation &src) { @@ -124,7 +123,7 @@ QGeoLocation QDeclarativeGeoLocation::location() const } /*! - \qmlproperty Address QtLocation5::Location::address + \qmlproperty Address QtPositioning::Location::address This property holds the address of the location which can be use to retrieve address details of the location. */ @@ -146,7 +145,7 @@ QDeclarativeGeoAddress *QDeclarativeGeoLocation::address() const } /*! - \qmlproperty coordinate QtLocation5::Location::coordinate + \qmlproperty coordinate QtPositioning::Location::coordinate This property holds the exact geographical coordinate of the location which can be used to retrieve the latitude, longitude and altitude of the location. @@ -168,7 +167,7 @@ QGeoCoordinate QDeclarativeGeoLocation::coordinate() const } /*! - \qmlproperty GeoRectangle QtLocation5::Location::boundingBox + \qmlproperty georectangle QtPositioning::Location::boundingBox This property holds the recommended region to use when displaying the location. For example, a building's location may have a region centered around the building, diff --git a/src/imports/location/qdeclarativegeolocation_p.h b/src/positioning/qdeclarativegeolocation_p.h index 4435eeec..1352d827 100644 --- a/src/imports/location/qdeclarativegeolocation_p.h +++ b/src/positioning/qdeclarativegeolocation_p.h @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -42,16 +42,16 @@ #ifndef QDECLARATIVEGEOLOCATION_P_H #define QDECLARATIVEGEOLOCATION_P_H -#include "qdeclarativegeoaddress_p.h" #include <QtCore/QObject> -#include <QtQml/QQmlListProperty> -#include <QtLocation/QGeoLocation> -#include <QtLocation/QGeoRectangle> +#include <QtQml/qqml.h> +#include <QtPositioning/QGeoLocation> +#include <QtPositioning/QGeoRectangle> +#include <QtPositioning/private/qdeclarativegeoaddress_p.h> QT_BEGIN_NAMESPACE -class QDeclarativeGeoLocation : public QObject +class Q_POSITIONING_EXPORT QDeclarativeGeoLocation : public QObject { Q_OBJECT diff --git a/src/location/qgeoaddress.cpp b/src/positioning/qgeoaddress.cpp index 31cec9ab..b62e3431 100644 --- a/src/location/qgeoaddress.cpp +++ b/src/positioning/qgeoaddress.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -313,11 +313,11 @@ QGeoAddressPrivate::~QGeoAddressPrivate() /*! \class QGeoAddress - \inmodule QtLocation - \ingroup QtLocation-positioning + \inmodule QtPositioning + \ingroup QtPositioning-positioning \ingroup QtLocation-places-data \ingroup QtLocation-places - \since Qt Location 5.0 + \since Qt Positioning 5.0 \brief The QGeoAddress class represents an address of a \l QGeoLocation. diff --git a/src/location/qgeoaddress.h b/src/positioning/qgeoaddress.h index c82f824b..1aedd1a5 100644 --- a/src/location/qgeoaddress.h +++ b/src/positioning/qgeoaddress.h @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -44,13 +44,13 @@ #include <QtCore/QMetaType> #include <QtCore/QSharedDataPointer> -#include <QtLocation/qlocationglobal.h> +#include <QtPositioning/qpositioningglobal.h> QT_BEGIN_NAMESPACE class QString; class QGeoAddressPrivate; -class Q_LOCATION_EXPORT QGeoAddress +class Q_POSITIONING_EXPORT QGeoAddress { public: QGeoAddress(); diff --git a/src/location/qgeoaddress_p.h b/src/positioning/qgeoaddress_p.h index 5135e8c2..fa499d8b 100644 --- a/src/location/qgeoaddress_p.h +++ b/src/positioning/qgeoaddress_p.h @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage diff --git a/src/location/qgeoareamonitor.cpp b/src/positioning/qgeoareamonitor.cpp index 7462e1df..5ad69e9a 100644 --- a/src/location/qgeoareamonitor.cpp +++ b/src/positioning/qgeoareamonitor.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -44,9 +44,9 @@ /*! \class QGeoAreaMonitor - \inmodule QtLocation - \ingroup QtLocation-positioning - \since Qt Location 5.0 + \inmodule QtPositioning + \ingroup QtPositioning-positioning + \since Qt Positioning 5.0 \brief The QGeoAreaMonitor class enables the detection of proximity changes for a specified set of coordinates. diff --git a/src/location/qgeoareamonitor.h b/src/positioning/qgeoareamonitor.h index 62438d0b..1aed8b6b 100644 --- a/src/location/qgeoareamonitor.h +++ b/src/positioning/qgeoareamonitor.h @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -41,7 +41,7 @@ #ifndef QGEOAREAMONITOR_H #define QGEOAREAMONITOR_H -#include <QtLocation/QGeoCoordinate> +#include <QtPositioning/QGeoCoordinate> #include <QObject> #include <QStringList> @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE class QGeoPositionInfo; class QGeoAreaMonitorPrivate; -class Q_LOCATION_EXPORT QGeoAreaMonitor : public QObject +class Q_POSITIONING_EXPORT QGeoAreaMonitor : public QObject { Q_OBJECT Q_PROPERTY(QGeoCoordinate center READ center WRITE setCenter) diff --git a/src/location/qgeocircle.cpp b/src/positioning/qgeocircle.cpp index 6c77d934..f9c43c1c 100644 --- a/src/location/qgeocircle.cpp +++ b/src/positioning/qgeocircle.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -49,9 +49,9 @@ QT_BEGIN_NAMESPACE /*! \class QGeoCircle - \inmodule QtLocation - \ingroup QtLocation-positioning - \since Qt Location 5.0 + \inmodule QtPositioning + \ingroup QtPositioning-positioning + \since Qt Positioning 5.0 \brief The QGeoCircle class defines a circular geographic area. diff --git a/src/location/qgeocircle.h b/src/positioning/qgeocircle.h index 158a48a6..0a265460 100644 --- a/src/location/qgeocircle.h +++ b/src/positioning/qgeocircle.h @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -42,14 +42,14 @@ #ifndef QGEOCIRCLE_H #define QGEOCIRCLE_H -#include <QtLocation/QGeoShape> +#include <QtPositioning/QGeoShape> QT_BEGIN_NAMESPACE class QGeoCoordinate; class QGeoCirclePrivate; -class Q_LOCATION_EXPORT QGeoCircle : public QGeoShape +class Q_POSITIONING_EXPORT QGeoCircle : public QGeoShape { public: QGeoCircle(); diff --git a/src/location/qgeocircle_p.h b/src/positioning/qgeocircle_p.h index 065a1276..e8e4a2c0 100644 --- a/src/location/qgeocircle_p.h +++ b/src/positioning/qgeocircle_p.h @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage diff --git a/src/location/qgeocoordinate.cpp b/src/positioning/qgeocoordinate.cpp index c2b2bb50..e3392487 100644 --- a/src/location/qgeocoordinate.cpp +++ b/src/positioning/qgeocoordinate.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -89,9 +89,9 @@ QGeoCoordinatePrivate::~QGeoCoordinatePrivate() /*! \class QGeoCoordinate - \inmodule QtLocation - \ingroup QtLocation-positioning - \since Qt Location 5.0 + \inmodule QtPositioning + \ingroup QtPositioning-positioning + \since Qt Positioning 5.0 \brief The QGeoCoordinate class defines a geographical position on the surface of the Earth. diff --git a/src/location/qgeocoordinate.h b/src/positioning/qgeocoordinate.h index 4948ad97..23001ad1 100644 --- a/src/location/qgeocoordinate.h +++ b/src/positioning/qgeocoordinate.h @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -45,7 +45,7 @@ #include <QtCore/QMetaType> #include <QtCore/QString> #include <QSharedDataPointer> -#include <QtLocation/qlocationglobal.h> +#include <QtPositioning/qpositioningglobal.h> QT_BEGIN_NAMESPACE @@ -53,7 +53,7 @@ class QDebug; class QDataStream; class QGeoCoordinatePrivate; -class Q_LOCATION_EXPORT QGeoCoordinate +class Q_POSITIONING_EXPORT QGeoCoordinate { public: enum CoordinateType { @@ -112,12 +112,12 @@ private: Q_DECLARE_TYPEINFO(QGeoCoordinate, Q_MOVABLE_TYPE); #ifndef QT_NO_DEBUG_STREAM -Q_LOCATION_EXPORT QDebug operator<<(QDebug, const QGeoCoordinate &); +Q_POSITIONING_EXPORT QDebug operator<<(QDebug, const QGeoCoordinate &); #endif #ifndef QT_NO_DATASTREAM -Q_LOCATION_EXPORT QDataStream &operator<<(QDataStream &stream, const QGeoCoordinate &coordinate); -Q_LOCATION_EXPORT QDataStream &operator>>(QDataStream &stream, QGeoCoordinate &coordinate); +Q_POSITIONING_EXPORT QDataStream &operator<<(QDataStream &stream, const QGeoCoordinate &coordinate); +Q_POSITIONING_EXPORT QDataStream &operator>>(QDataStream &stream, QGeoCoordinate &coordinate); #endif QT_END_NAMESPACE diff --git a/src/location/qgeocoordinate_p.h b/src/positioning/qgeocoordinate_p.h index 86bb4820..6685d464 100644 --- a/src/location/qgeocoordinate_p.h +++ b/src/positioning/qgeocoordinate_p.h @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage diff --git a/src/location/qgeolocation.cpp b/src/positioning/qgeolocation.cpp index 1b43881e..2dc5a8b2 100644 --- a/src/location/qgeolocation.cpp +++ b/src/positioning/qgeolocation.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -79,11 +79,11 @@ bool QGeoLocationPrivate::isEmpty() const /*! \class QGeoLocation - \inmodule QtLocation - \ingroup QtLocation-positioning + \inmodule QtPositioning + \ingroup QtPositioning-positioning \ingroup QtLocation-places \ingroup QtLocation-places-data - \since Qt Location 5.0 + \since Qt Positioning 5.0 \brief The QGeoLocation class represents basic information about a location. diff --git a/src/location/qgeolocation.h b/src/positioning/qgeolocation.h index d3f1718a..395f83f1 100644 --- a/src/location/qgeolocation.h +++ b/src/positioning/qgeolocation.h @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -44,7 +44,7 @@ #include <QtCore/QSharedDataPointer> #include <QtCore/QMetaType> -#include <QtLocation/qlocationglobal.h> +#include <QtPositioning/qpositioningglobal.h> QT_BEGIN_NAMESPACE @@ -53,7 +53,7 @@ class QGeoCoordinate; class QGeoRectangle; class QGeoLocationPrivate; -class Q_LOCATION_EXPORT QGeoLocation +class Q_POSITIONING_EXPORT QGeoLocation { public: QGeoLocation(); diff --git a/src/location/qgeolocation_p.h b/src/positioning/qgeolocation_p.h index 8fc814cb..86befce3 100644 --- a/src/location/qgeolocation_p.h +++ b/src/positioning/qgeolocation_p.h @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -43,9 +43,9 @@ #define QGEOLOCATION_P_H #include <QtCore/QSharedData> -#include <QtLocation/QGeoAddress> -#include <QtLocation/QGeoCoordinate> -#include <QtLocation/QGeoRectangle> +#include <QtPositioning/QGeoAddress> +#include <QtPositioning/QGeoCoordinate> +#include <QtPositioning/QGeoRectangle> QT_BEGIN_NAMESPACE diff --git a/src/location/qgeopositioninfo.cpp b/src/positioning/qgeopositioninfo.cpp index 7cd5be32..75a676a2 100644 --- a/src/location/qgeopositioninfo.cpp +++ b/src/positioning/qgeopositioninfo.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -56,9 +56,9 @@ public: /*! \class QGeoPositionInfo - \inmodule QtLocation - \ingroup QtLocation-positioning - \since Qt Location 5.0 + \inmodule QtPositioning + \ingroup QtPositioning-positioning + \since Qt Positioning 5.0 \brief The QGeoPositionInfo class contains information gathered on a global position, direction and velocity at a particular point in time. diff --git a/src/location/qgeopositioninfo.h b/src/positioning/qgeopositioninfo.h index ac2f51ba..d56c2cbb 100644 --- a/src/location/qgeopositioninfo.h +++ b/src/positioning/qgeopositioninfo.h @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -41,7 +41,7 @@ #ifndef QGEOPOSITIONINFO_H #define QGEOPOSITIONINFO_H -#include <QtLocation/QGeoCoordinate> +#include <QtPositioning/QGeoCoordinate> #include <QDateTime> @@ -51,7 +51,7 @@ class QDebug; class QDataStream; class QGeoPositionInfoPrivate; -class Q_LOCATION_EXPORT QGeoPositionInfo +class Q_POSITIONING_EXPORT QGeoPositionInfo { public: enum Attribute { @@ -90,22 +90,22 @@ public: private: #ifndef QT_NO_DEBUG_STREAM - friend Q_LOCATION_EXPORT QDebug operator<<(QDebug dbg, const QGeoPositionInfo &info); + friend Q_POSITIONING_EXPORT QDebug operator<<(QDebug dbg, const QGeoPositionInfo &info); #endif #ifndef QT_NO_DATASTREAM - friend Q_LOCATION_EXPORT QDataStream &operator<<(QDataStream &stream, const QGeoPositionInfo &info); - friend Q_LOCATION_EXPORT QDataStream &operator>>(QDataStream &stream, QGeoPositionInfo &info); + friend Q_POSITIONING_EXPORT QDataStream &operator<<(QDataStream &stream, const QGeoPositionInfo &info); + friend Q_POSITIONING_EXPORT QDataStream &operator>>(QDataStream &stream, QGeoPositionInfo &info); #endif QGeoPositionInfoPrivate *d; }; #ifndef QT_NO_DEBUG_STREAM -Q_LOCATION_EXPORT QDebug operator<<(QDebug dbg, const QGeoPositionInfo &info); +Q_POSITIONING_EXPORT QDebug operator<<(QDebug dbg, const QGeoPositionInfo &info); #endif #ifndef QT_NO_DATASTREAM -Q_LOCATION_EXPORT QDataStream &operator<<(QDataStream &stream, const QGeoPositionInfo &info); -Q_LOCATION_EXPORT QDataStream &operator>>(QDataStream &stream, QGeoPositionInfo &info); +Q_POSITIONING_EXPORT QDataStream &operator<<(QDataStream &stream, const QGeoPositionInfo &info); +Q_POSITIONING_EXPORT QDataStream &operator>>(QDataStream &stream, QGeoPositionInfo &info); #endif QT_END_NAMESPACE diff --git a/src/location/qgeopositioninfosource.cpp b/src/positioning/qgeopositioninfosource.cpp index 15f65f46..4fa7a4ca 100644 --- a/src/location/qgeopositioninfosource.cpp +++ b/src/positioning/qgeopositioninfosource.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -60,9 +60,9 @@ Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader, /*! \class QGeoPositionInfoSource - \inmodule QtLocation - \ingroup QtLocation-positioning - \since Qt Location 5.0 + \inmodule QtPositioning + \ingroup QtPositioning-positioning + \since Qt Positioning 5.0 \brief The QGeoPositionInfoSource class is an abstract base class for the distribution of positional updates. diff --git a/src/location/qgeopositioninfosource.h b/src/positioning/qgeopositioninfosource.h index 931316ce..3e1d54c8 100644 --- a/src/location/qgeopositioninfosource.h +++ b/src/positioning/qgeopositioninfosource.h @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -41,14 +41,14 @@ #ifndef QGEOPOSITIONINFOSOURCE_H #define QGEOPOSITIONINFOSOURCE_H -#include <QtLocation/QGeoPositionInfo> +#include <QtPositioning/QGeoPositionInfo> #include <QObject> QT_BEGIN_NAMESPACE class QGeoPositionInfoSourcePrivate; -class Q_LOCATION_EXPORT QGeoPositionInfoSource : public QObject +class Q_POSITIONING_EXPORT QGeoPositionInfoSource : public QObject { Q_OBJECT Q_PROPERTY(int updateInterval READ updateInterval WRITE setUpdateInterval) diff --git a/src/location/qgeopositioninfosource_p.h b/src/positioning/qgeopositioninfosource_p.h index 97baadbf..3d844ae5 100644 --- a/src/location/qgeopositioninfosource_p.h +++ b/src/positioning/qgeopositioninfosource_p.h @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage diff --git a/src/location/qgeopositioninfosourcefactory.cpp b/src/positioning/qgeopositioninfosourcefactory.cpp index 0c0a0404..a113a4aa 100644 --- a/src/location/qgeopositioninfosourcefactory.cpp +++ b/src/positioning/qgeopositioninfosourcefactory.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -45,9 +45,8 @@ QT_BEGIN_NAMESPACE /*! \class QGeoPositionInfoSourceFactory - \inmodule QtLocation - \ingroup QtLocation-impl - \since Qt Location 5.0 + \inmodule QtPositioning + \since Qt Positioning 5.0 \brief The QGeoPositionInfoSourceFactory class is a factory class used as the plugin interface for external providers of positioning data. diff --git a/src/location/qgeopositioninfosourcefactory.h b/src/positioning/qgeopositioninfosourcefactory.h index 7ddb801d..32e0bc00 100644 --- a/src/location/qgeopositioninfosourcefactory.h +++ b/src/positioning/qgeopositioninfosourcefactory.h @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -42,14 +42,14 @@ #ifndef QGEOPOSITIONINFOSOURCEFACTORY_H #define QGEOPOSITIONINFOSOURCEFACTORY_H -#include <QtLocation/QGeoPositionInfoSource> -#include <QtLocation/QGeoSatelliteInfoSource> -#include <QtLocation/QGeoAreaMonitor> +#include <QtPositioning/QGeoPositionInfoSource> +#include <QtPositioning/QGeoSatelliteInfoSource> +#include <QtPositioning/QGeoAreaMonitor> #include <QList> QT_BEGIN_NAMESPACE -class Q_LOCATION_EXPORT QGeoPositionInfoSourceFactory +class Q_POSITIONING_EXPORT QGeoPositionInfoSourceFactory { public: virtual ~QGeoPositionInfoSourceFactory(); diff --git a/src/location/qgeorectangle.cpp b/src/positioning/qgeorectangle.cpp index 4ee4f16f..354bdb1c 100644 --- a/src/location/qgeorectangle.cpp +++ b/src/positioning/qgeorectangle.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -49,9 +49,9 @@ QT_BEGIN_NAMESPACE /*! \class QGeoRectangle - \inmodule QtLocation - \ingroup QtLocation-positioning - \since Qt Location 5.0 + \inmodule QtPositioning + \ingroup QtPositioning-positioning + \since Qt Positioning 5.0 \brief The QGeoRectangle class defines a rectangular geographic area. diff --git a/src/location/qgeorectangle.h b/src/positioning/qgeorectangle.h index 5d0ab579..cd91c1d7 100644 --- a/src/location/qgeorectangle.h +++ b/src/positioning/qgeorectangle.h @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -42,14 +42,14 @@ #ifndef QGEORECTANGLE_H #define QGEORECTANGLE_H -#include <QtLocation/QGeoShape> +#include <QtPositioning/QGeoShape> QT_BEGIN_NAMESPACE class QGeoCoordinate; class QGeoRectanglePrivate; -class Q_LOCATION_EXPORT QGeoRectangle : public QGeoShape +class Q_POSITIONING_EXPORT QGeoRectangle : public QGeoShape { public: QGeoRectangle(); diff --git a/src/location/qgeorectangle_p.h b/src/positioning/qgeorectangle_p.h index f61a2a91..136d4be4 100644 --- a/src/location/qgeorectangle_p.h +++ b/src/positioning/qgeorectangle_p.h @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage diff --git a/src/location/qgeosatelliteinfo.cpp b/src/positioning/qgeosatelliteinfo.cpp index acb2ce75..1c19f295 100644 --- a/src/location/qgeosatelliteinfo.cpp +++ b/src/positioning/qgeosatelliteinfo.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -58,9 +58,9 @@ public: /*! \class QGeoSatelliteInfo - \inmodule QtLocation - \ingroup QtLocation-positioning - \since Qt Location 5.0 + \inmodule QtPositioning + \ingroup QtPositioning-positioning + \since Qt Positioning 5.0 \brief The QGeoSatelliteInfo class contains basic information about a satellite. diff --git a/src/location/qgeosatelliteinfo.h b/src/positioning/qgeosatelliteinfo.h index e2afb4ff..fb13157d 100644 --- a/src/location/qgeosatelliteinfo.h +++ b/src/positioning/qgeosatelliteinfo.h @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -41,7 +41,7 @@ #ifndef QGEOSATELLITEINFO_H #define QGEOSATELLITEINFO_H -#include <QtLocation/qlocationglobal.h> +#include <QtPositioning/qpositioningglobal.h> QT_BEGIN_NAMESPACE @@ -49,7 +49,7 @@ class QDebug; class QDataStream; class QGeoSatelliteInfoPrivate; -class Q_LOCATION_EXPORT QGeoSatelliteInfo +class Q_POSITIONING_EXPORT QGeoSatelliteInfo { public: enum Attribute { @@ -91,22 +91,22 @@ public: private: #ifndef QT_NO_DEBUG_STREAM - friend Q_LOCATION_EXPORT QDebug operator<<(QDebug dbg, const QGeoSatelliteInfo &info); + friend Q_POSITIONING_EXPORT QDebug operator<<(QDebug dbg, const QGeoSatelliteInfo &info); #endif #ifndef QT_NO_DATASTREAM - friend Q_LOCATION_EXPORT QDataStream &operator<<(QDataStream &stream, const QGeoSatelliteInfo &info); - friend Q_LOCATION_EXPORT QDataStream &operator>>(QDataStream &stream, QGeoSatelliteInfo &info); + friend Q_POSITIONING_EXPORT QDataStream &operator<<(QDataStream &stream, const QGeoSatelliteInfo &info); + friend Q_POSITIONING_EXPORT QDataStream &operator>>(QDataStream &stream, QGeoSatelliteInfo &info); #endif QGeoSatelliteInfoPrivate *d; }; #ifndef QT_NO_DEBUG_STREAM -Q_LOCATION_EXPORT QDebug operator<<(QDebug dbg, const QGeoSatelliteInfo &info); +Q_POSITIONING_EXPORT QDebug operator<<(QDebug dbg, const QGeoSatelliteInfo &info); #endif #ifndef QT_NO_DATASTREAM -Q_LOCATION_EXPORT QDataStream &operator<<(QDataStream &stream, const QGeoSatelliteInfo &info); -Q_LOCATION_EXPORT QDataStream &operator>>(QDataStream &stream, QGeoSatelliteInfo &info); +Q_POSITIONING_EXPORT QDataStream &operator<<(QDataStream &stream, const QGeoSatelliteInfo &info); +Q_POSITIONING_EXPORT QDataStream &operator>>(QDataStream &stream, QGeoSatelliteInfo &info); #endif QT_END_NAMESPACE diff --git a/src/location/qgeosatelliteinfosource.cpp b/src/positioning/qgeosatelliteinfosource.cpp index 509d4781..faf8dad8 100644 --- a/src/location/qgeosatelliteinfosource.cpp +++ b/src/positioning/qgeosatelliteinfosource.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -51,9 +51,9 @@ QT_BEGIN_NAMESPACE /*! \class QGeoSatelliteInfoSource - \inmodule QtLocation - \ingroup QtLocation-positioning - \since Qt Location 5.0 + \inmodule QtPositioning + \ingroup QtPositioning-positioning + \since Qt Positioning 5.0 \brief The QGeoSatelliteInfoSource class is an abstract base class for the distribution of satellite information updates. diff --git a/src/location/qgeosatelliteinfosource.h b/src/positioning/qgeosatelliteinfosource.h index c7f734b6..35aa2b33 100644 --- a/src/location/qgeosatelliteinfosource.h +++ b/src/positioning/qgeosatelliteinfosource.h @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -41,7 +41,7 @@ #ifndef QGEOSATELLITEINFOSOURCE_H #define QGEOSATELLITEINFOSOURCE_H -#include <QtLocation/QGeoSatelliteInfo> +#include <QtPositioning/QGeoSatelliteInfo> #include <QObject> #include <QList> @@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE class QGeoSatelliteInfoSourcePrivate; -class Q_LOCATION_EXPORT QGeoSatelliteInfoSource : public QObject +class Q_POSITIONING_EXPORT QGeoSatelliteInfoSource : public QObject { Q_OBJECT Q_PROPERTY(int updateInterval READ updateInterval WRITE setUpdateInterval) diff --git a/src/location/qgeoshape.cpp b/src/positioning/qgeoshape.cpp index 5481b1cf..53799738 100644 --- a/src/location/qgeoshape.cpp +++ b/src/positioning/qgeoshape.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -70,9 +70,9 @@ bool QGeoShapePrivate::operator==(const QGeoShapePrivate &other) const /*! \class QGeoShape - \inmodule QtLocation - \ingroup QtLocation-positioning - \since Qt Location 5.0 + \inmodule QtPositioning + \ingroup QtPositioning-positioning + \since Qt Positioning 5.0 \brief The QGeoShape class defines a geographic area. diff --git a/src/location/qgeoshape.h b/src/positioning/qgeoshape.h index 8be73aeb..f1cb4cf2 100644 --- a/src/location/qgeoshape.h +++ b/src/positioning/qgeoshape.h @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -43,14 +43,14 @@ #define QGEOSHAPE_H #include <QtCore/QSharedDataPointer> -#include <QtLocation/QGeoCoordinate> +#include <QtPositioning/QGeoCoordinate> QT_BEGIN_NAMESPACE class QDebug; class QGeoShapePrivate; -class Q_LOCATION_EXPORT QGeoShape +class Q_POSITIONING_EXPORT QGeoShape { public: QGeoShape(); @@ -87,12 +87,12 @@ private: Q_DECLARE_TYPEINFO(QGeoShape, Q_MOVABLE_TYPE); #ifndef QT_NO_DEBUG_STREAM -Q_LOCATION_EXPORT QDebug operator<<(QDebug, const QGeoShape &); +Q_POSITIONING_EXPORT QDebug operator<<(QDebug, const QGeoShape &); #endif #ifndef QT_NO_DATASTREAM -Q_LOCATION_EXPORT QDataStream &operator<<(QDataStream &stream, const QGeoShape &shape); -Q_LOCATION_EXPORT QDataStream &operator>>(QDataStream &stream, QGeoShape &shape); +Q_POSITIONING_EXPORT QDataStream &operator<<(QDataStream &stream, const QGeoShape &shape); +Q_POSITIONING_EXPORT QDataStream &operator>>(QDataStream &stream, QGeoShape &shape); #endif QT_END_NAMESPACE diff --git a/src/location/qgeoshape_p.h b/src/positioning/qgeoshape_p.h index 497df8d2..ec0b8283 100644 --- a/src/location/qgeoshape_p.h +++ b/src/positioning/qgeoshape_p.h @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage diff --git a/src/location/qlocationutils.cpp b/src/positioning/qlocationutils.cpp index accb8373..5d6cfbb2 100644 --- a/src/location/qlocationutils.cpp +++ b/src/positioning/qlocationutils.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage diff --git a/src/location/qlocationutils_p.h b/src/positioning/qlocationutils_p.h index 700bfa64..4b42695c 100644 --- a/src/location/qlocationutils_p.h +++ b/src/positioning/qlocationutils_p.h @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage diff --git a/src/location/qnmeapositioninfosource.cpp b/src/positioning/qnmeapositioninfosource.cpp index 6232a8bb..14b0f257 100644 --- a/src/location/qnmeapositioninfosource.cpp +++ b/src/positioning/qnmeapositioninfosource.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -427,9 +427,9 @@ void QNmeaPositionInfoSourcePrivate::emitUpdated(const QGeoPositionInfo &update) /*! \class QNmeaPositionInfoSource - \inmodule QtLocation - \ingroup QtLocation-positioning - \since Qt Location 5.0 + \inmodule QtPositioning + \ingroup QtPositioning-positioning + \since Qt Positioning 5.0 \brief The QNmeaPositionInfoSource class provides positional information using a NMEA data source. diff --git a/src/location/qnmeapositioninfosource.h b/src/positioning/qnmeapositioninfosource.h index fd1abd57..605a5696 100644 --- a/src/location/qnmeapositioninfosource.h +++ b/src/positioning/qnmeapositioninfosource.h @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -41,14 +41,14 @@ #ifndef QNMEAPOSITIONINFOSOURCE_H #define QNMEAPOSITIONINFOSOURCE_H -#include <QtLocation/QGeoPositionInfoSource> +#include <QtPositioning/QGeoPositionInfoSource> QT_BEGIN_NAMESPACE class QIODevice; class QNmeaPositionInfoSourcePrivate; -class Q_LOCATION_EXPORT QNmeaPositionInfoSource : public QGeoPositionInfoSource +class Q_POSITIONING_EXPORT QNmeaPositionInfoSource : public QGeoPositionInfoSource { Q_OBJECT public: diff --git a/src/location/qnmeapositioninfosource_p.h b/src/positioning/qnmeapositioninfosource_p.h index b231d72f..ec9ebeaf 100644 --- a/src/location/qnmeapositioninfosource_p.h +++ b/src/positioning/qnmeapositioninfosource_p.h @@ -3,7 +3,7 @@ ** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtLocation module of the Qt Toolkit. +** This file is part of the QtPositioning module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage diff --git a/src/positioning/qpositioningglobal.h b/src/positioning/qpositioningglobal.h new file mode 100644 index 00000000..e0de618b --- /dev/null +++ b/src/positioning/qpositioningglobal.h @@ -0,0 +1,61 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtPositioning module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** 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. +** +** 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. +** +** 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. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ +#ifndef QPOSITIONINGGLOBAL_H +#define QPOSITIONINGGLOBAL_H + +#include <QtCore/qglobal.h> + +QT_BEGIN_NAMESPACE + +#ifndef QT_STATIC +# if defined(QT_BUILD_POSITIONING_LIB) +# define Q_POSITIONING_EXPORT Q_DECL_EXPORT +# else +# define Q_POSITIONING_EXPORT Q_DECL_IMPORT +# endif +#else +# define Q_POSITIONING_EXPORT +#endif + +QT_END_NAMESPACE + +#endif // QPOSITIONINGGLOBAL_H + diff --git a/src/src.pro b/src/src.pro index 8895e83a..bb05e39f 100644 --- a/src/src.pro +++ b/src/src.pro @@ -1,6 +1,6 @@ TEMPLATE = subdirs CONFIG += ordered -SUBDIRS += 3rdparty location plugins +SUBDIRS += 3rdparty positioning location plugins qtHaveModule(quick): SUBDIRS += imports diff --git a/sync.profile b/sync.profile index 9abbeb50..694df7e6 100644 --- a/sync.profile +++ b/sync.profile @@ -1,5 +1,6 @@ %modules = ( # path to module name map "QtLocation" => "$basedir/src/location", + "QtPositioning" => "$basedir/src/positioning", ); %moduleheaders = ( # restrict the module headers to those found in relative path ); diff --git a/tests/applications/declarative_map/map3d.qml b/tests/applications/declarative_map/map3d.qml index 6edbbf09..c9fc4e83 100644 --- a/tests/applications/declarative_map/map3d.qml +++ b/tests/applications/declarative_map/map3d.qml @@ -39,6 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 +import QtPositioning 5.0 import QtLocation 5.0 import QtLocation.test 5.0 import "common" as Common diff --git a/tests/applications/declarative_map/map3d_mousetest.qml b/tests/applications/declarative_map/map3d_mousetest.qml index 2d1e706c..bd317216 100644 --- a/tests/applications/declarative_map/map3d_mousetest.qml +++ b/tests/applications/declarative_map/map3d_mousetest.qml @@ -39,6 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 +import QtPositioning 5.0 import QtLocation 5.0 import QtLocation.test 5.0 import "common" as Common diff --git a/tests/auto/cmake/cmake.pro b/tests/auto/cmake/cmake.pro index bf2dbcb7..8e4dae9f 100644 --- a/tests/auto/cmake/cmake.pro +++ b/tests/auto/cmake/cmake.pro @@ -3,3 +3,5 @@ TEMPLATE = subdirs CONFIG += ctest_testcase + +CONFIG+=insignificant_test # QTBUG-33259 diff --git a/tests/auto/declarative_core/tst_address.qml b/tests/auto/declarative_core/tst_address.qml index c3fc5d28..2348e345 100644 --- a/tests/auto/declarative_core/tst_address.qml +++ b/tests/auto/declarative_core/tst_address.qml @@ -40,7 +40,7 @@ ****************************************************************************/ import QtTest 1.0 -import QtLocation 5.0 +import QtPositioning 5.0 TestCase { id: testCase diff --git a/tests/auto/declarative_core/tst_coordinate.qml b/tests/auto/declarative_core/tst_coordinate.qml index a9e205e8..b704176e 100644 --- a/tests/auto/declarative_core/tst_coordinate.qml +++ b/tests/auto/declarative_core/tst_coordinate.qml @@ -41,20 +41,74 @@ import QtQuick 2.0 import QtTest 1.0 -import QtLocation 5.0 +import QtPositioning 5.0 Item { id: item - property variant empty: QtLocation.coordinate() - property variant base: QtLocation.coordinate(1.0, 1.0, 5.0) - property variant zero: QtLocation.coordinate(0, 0) - property variant plusone: QtLocation.coordinate(0, 1) - property variant minusone: QtLocation.coordinate(0, -1) - property variant north: QtLocation.coordinate(3, 0) + property variant empty: QtPositioning.coordinate() + property variant base: QtPositioning.coordinate(1.0, 1.0, 5.0) + property variant zero: QtPositioning.coordinate(0, 0) + property variant plusone: QtPositioning.coordinate(0, 1) + property variant minusone: QtPositioning.coordinate(0, -1) + property variant north: QtPositioning.coordinate(3, 0) SignalSpy { id: coordSpy; target: item; signalName: "baseChanged" } + property variant inside: QtPositioning.coordinate(0.5, 0.5) + property variant outside: QtPositioning.coordinate(2, 2) + property variant tl: QtPositioning.coordinate(1, 0) + property variant br: QtPositioning.coordinate(0, 1) + property variant box: QtPositioning.rectangle(tl, br) + + + Address { + id: validTestAddress + street: "53 Brandl St" + city: "Eight Mile Plains" + country: "Australia" + countryCode: "AUS" + } + + Location { + id: testLocation + coordinate: inside + boundingBox: box + address: validTestAddress + } + + Location { + id: invalidLocation + } + + TestCase { + name: "GeoLocation" + + function test_Location_complete() { + compare (testLocation.coordinate.longitude, inside.longitude) + compare (testLocation.coordinate.latitude, inside.latitude) + + compare (testLocation.boundingBox.contains(inside), true) + compare (testLocation.boundingBox.contains(outside), false) + compare (testLocation.boundingBox.bottomRight.longitude, br.longitude) + compare (testLocation.boundingBox.bottomRight.latitude, br.latitude) + compare (testLocation.boundingBox.topLeft.longitude, tl.longitude) + compare (testLocation.boundingBox.topLeft.latitude, tl.latitude) + + compare (testLocation.address.country, "Australia") + compare (testLocation.address.countryCode, "AUS") + compare (testLocation.address.city, "Eight Mile Plains") + compare (testLocation.address.street, "53 Brandl St") + } + + function test_Location_invalid() { + compare(invalidLocation.coordinate.isValid, false) + compare(invalidLocation.boundingBox.isEmpty, true) + compare(invalidLocation.boundingBox.isValid, false) + compare(invalidLocation.address.city, "") + } + } + TestCase { name: "Coordinate" diff --git a/tests/auto/declarative_core/tst_geoshape.qml b/tests/auto/declarative_core/tst_geoshape.qml index c4f9dba4..df03125f 100644 --- a/tests/auto/declarative_core/tst_geoshape.qml +++ b/tests/auto/declarative_core/tst_geoshape.qml @@ -41,17 +41,17 @@ import QtQuick 2.0 import QtTest 1.0 -import QtLocation 5.0 +import QtPositioning 5.0 Item { id: testCase - property variant coordinate1: QtLocation.coordinate(1, 1) - property variant coordinate2: QtLocation.coordinate(2, 2) - property variant coordinate3: QtLocation.coordinate(80, 80) + property variant coordinate1: QtPositioning.coordinate(1, 1) + property variant coordinate2: QtPositioning.coordinate(2, 2) + property variant coordinate3: QtPositioning.coordinate(80, 80) - property variant emptyCircle: QtLocation.circle() - property variant circle1: QtLocation.circle(coordinate1, 200000) + property variant emptyCircle: QtPositioning.circle() + property variant circle1: QtPositioning.circle(coordinate1, 200000) SignalSpy { id: circleChangedSpy; target: testCase; signalName: "emptyCircleChanged" } @@ -84,16 +84,16 @@ Item { } // coordinate unit square - property variant bl: QtLocation.coordinate(0, 0) - property variant tl: QtLocation.coordinate(1, 0) - property variant tr: QtLocation.coordinate(1, 1) - property variant br: QtLocation.coordinate(0, 1) - property variant ntr: QtLocation.coordinate(3, 3) + property variant bl: QtPositioning.coordinate(0, 0) + property variant tl: QtPositioning.coordinate(1, 0) + property variant tr: QtPositioning.coordinate(1, 1) + property variant br: QtPositioning.coordinate(0, 1) + property variant ntr: QtPositioning.coordinate(3, 3) - property variant inside: QtLocation.coordinate(0.5, 0.5) - property variant outside: QtLocation.coordinate(2, 2) + property variant inside: QtPositioning.coordinate(0.5, 0.5) + property variant outside: QtPositioning.coordinate(2, 2) - property variant box: QtLocation.rectangle(tl, br) + property variant box: QtPositioning.rectangle(tl, br) // C++ auto test exists for basics of bounding box, testing here // only added functionality diff --git a/tests/auto/declarative_core/tst_map_routing.qml b/tests/auto/declarative_core/tst_map_routing.qml index 5dd24489..056026e7 100644 --- a/tests/auto/declarative_core/tst_map_routing.qml +++ b/tests/auto/declarative_core/tst_map_routing.qml @@ -42,16 +42,17 @@ import QtQuick 2.0 import QtTest 1.0 import QtLocation 5.0 +import QtPositioning 5.0 Item { Plugin { id: testPlugin; name: "qmlgeo.test.plugin"; allowExperimental: true } Plugin { id: invalidPlugin; name: "invalid"} - property variant coordinate1: QtLocation.coordinate(51, 0) - property variant coordinate2: QtLocation.coordinate(52, 0) + property variant coordinate1: QtPositioning.coordinate(51, 0) + property variant coordinate2: QtPositioning.coordinate(52, 0) - property variant boundingBox1: QtLocation.rectangle() - property variant boundingBox2: QtLocation.rectangle() + property variant boundingBox1: QtPositioning.rectangle() + property variant boundingBox2: QtPositioning.rectangle() Component.onCompleted: { boundingBox1.topLeft = coordinate1; @@ -63,13 +64,13 @@ Item { boundingBox2.width = 20; } - property variant bl: QtLocation.coordinate(0, 0) - property variant tl: QtLocation.coordinate(1, 0) - property variant tr: QtLocation.coordinate(1, 1) - property variant br: QtLocation.coordinate(0, 1) - property variant ntr: QtLocation.coordinate(3, 3) + property variant bl: QtPositioning.coordinate(0, 0) + property variant tl: QtPositioning.coordinate(1, 0) + property variant tr: QtPositioning.coordinate(1, 1) + property variant br: QtPositioning.coordinate(0, 1) + property variant ntr: QtPositioning.coordinate(3, 3) - property variant unitBox: QtLocation.rectangle(tl, br) + property variant unitBox: QtPositioning.rectangle(tl, br) Route {id: emptyRoute} TestCase { @@ -80,9 +81,9 @@ Item { // TODO enable when we have map route //MapRoute {id: emptyMapRoute} - property variant emptyBox: QtLocation.rectangle() + property variant emptyBox: QtPositioning.rectangle() - property variant emptyCoordinate: QtLocation.coordinate() + property variant emptyCoordinate: QtPositioning.coordinate() // TODO enable when we have map route /* @@ -487,21 +488,21 @@ Item { ] } - property variant rcoordinate1: QtLocation.coordinate(50, 50) - property variant rcoordinate2: QtLocation.coordinate(51, 52) - property variant rcoordinate3: QtLocation.coordinate(53, 54) - property variant rcoordinate4: QtLocation.coordinate(55, 56) - property variant rcoordinate5: QtLocation.coordinate(57, 58) + property variant rcoordinate1: QtPositioning.coordinate(50, 50) + property variant rcoordinate2: QtPositioning.coordinate(51, 52) + property variant rcoordinate3: QtPositioning.coordinate(53, 54) + property variant rcoordinate4: QtPositioning.coordinate(55, 56) + property variant rcoordinate5: QtPositioning.coordinate(57, 58) - property variant fcoordinate1: QtLocation.coordinate(60, 60) - property variant fcoordinate2: QtLocation.coordinate(61, 62) - property variant fcoordinate3: QtLocation.coordinate(63, 64) - property variant fcoordinate4: QtLocation.coordinate(65, 66) - property variant fcoordinate5: QtLocation.coordinate(67, 68) + property variant fcoordinate1: QtPositioning.coordinate(60, 60) + property variant fcoordinate2: QtPositioning.coordinate(61, 62) + property variant fcoordinate3: QtPositioning.coordinate(63, 64) + property variant fcoordinate4: QtPositioning.coordinate(65, 66) + property variant fcoordinate5: QtPositioning.coordinate(67, 68) - property variant f2coordinate1: QtLocation.coordinate(60, 60) - property variant f2coordinate2: QtLocation.coordinate(61, 62) - property variant f2coordinate3: QtLocation.coordinate(63, 64) + property variant f2coordinate1: QtPositioning.coordinate(60, 60) + property variant f2coordinate2: QtPositioning.coordinate(61, 62) + property variant f2coordinate3: QtPositioning.coordinate(63, 64) RouteQuery {id: routeQuery} RouteQuery { @@ -775,7 +776,7 @@ Item { } function test_route_query_handles_destroyed_qml_objects() { - var coordinate = QtLocation.coordinate(11, 52); + var coordinate = QtPositioning.coordinate(11, 52); routeQuery.addWaypoint(coordinate); wait(300); routeQuery.clearWaypoints(); diff --git a/tests/auto/declarative_core/tst_place.qml b/tests/auto/declarative_core/tst_place.qml index 73f1fbfc..b8ed6b6b 100644 --- a/tests/auto/declarative_core/tst_place.qml +++ b/tests/auto/declarative_core/tst_place.qml @@ -42,6 +42,7 @@ import QtQuick 2.0 import QtTest 1.0 import QtLocation 5.0 +import QtPositioning 5.0 import "utils.js" as Utils TestCase { @@ -92,7 +93,7 @@ TestCase { } boundingBox { - center: QtLocation.coordinate(10, 10, 100) + center: QtPositioning.coordinate(10, 10, 100) width: 100 height: 100 } @@ -402,7 +403,7 @@ TestCase { } function test_location() { - var location = Qt.createQmlObject('import QtLocation 5.0; Location { coordinate: QtLocation.coordinate(10.0, 20.0) }', testCase, "Location1"); + var location = Qt.createQmlObject('import QtPositioning 5.0; Location { coordinate: QtPositioning.coordinate(10.0, 20.0) }', testCase, "Location1"); var signalSpy = Qt.createQmlObject('import QtTest 1.0; SignalSpy {}', testCase, "SignalSpy"); signalSpy.target = testPlace; diff --git a/tests/auto/declarative_core/tst_placesearchmodel.qml b/tests/auto/declarative_core/tst_placesearchmodel.qml index bb034710..3af24adc 100644 --- a/tests/auto/declarative_core/tst_placesearchmodel.qml +++ b/tests/auto/declarative_core/tst_placesearchmodel.qml @@ -42,6 +42,7 @@ import QtQuick 2.0 import QtTest 1.0 import QtLocation 5.0 +import QtPositioning 5.0 import "utils.js" as Utils TestCase { @@ -95,11 +96,11 @@ TestCase { } function test_setAndGet_data() { - var testSearchArea = QtLocation.circle(QtLocation.coordinate(10, 20), 5000); + var testSearchArea = QtPositioning.circle(QtPositioning.coordinate(10, 20), 5000); return [ { tag: "plugin", property: "plugin", signal: "pluginChanged", value: testPlugin }, - { tag: "searchArea", property: "searchArea", signal: "searchAreaChanged", value: testSearchArea, reset: QtLocation.shape() }, + { tag: "searchArea", property: "searchArea", signal: "searchAreaChanged", value: testSearchArea, reset: QtPositioning.shape() }, { tag: "offset", property: "offset", signal: "offsetChanged", value: 10, reset: 0 }, { tag: "limit", property: "limit", signal: "limitChanged", value: 10, reset: -1 }, diff --git a/tests/auto/declarative_core/tst_placesearchsuggestionmodel.qml b/tests/auto/declarative_core/tst_placesearchsuggestionmodel.qml index 156fae71..0222eecc 100644 --- a/tests/auto/declarative_core/tst_placesearchsuggestionmodel.qml +++ b/tests/auto/declarative_core/tst_placesearchsuggestionmodel.qml @@ -42,6 +42,7 @@ import QtQuick 2.0 import QtTest 1.0 import QtLocation 5.0 +import QtPositioning 5.0 import "utils.js" as Utils TestCase { @@ -69,10 +70,10 @@ TestCase { } function test_setAndGet_data() { - var testSearchArea = QtLocation.circle(QtLocation.coordinate(10, 20), 5000); + var testSearchArea = QtPositioning.circle(QtPositioning.coordinate(10, 20), 5000); return [ { tag: "plugin", property: "plugin", signal: "pluginChanged", value: testPlugin }, - { tag: "searchArea", property: "searchArea", signal: "searchAreaChanged", value: testSearchArea, reset: QtLocation.shape() }, + { tag: "searchArea", property: "searchArea", signal: "searchAreaChanged", value: testSearchArea, reset: QtPositioning.shape() }, { tag: "offset", property: "offset", signal: "offsetChanged", value: 10, reset: 0 }, { tag: "limit", property: "limit", signal: "limitChanged", value: 10, reset: -1 }, diff --git a/tests/auto/declarative_core/tst_position.qml b/tests/auto/declarative_core/tst_position.qml index 48a35796..65172d62 100644 --- a/tests/auto/declarative_core/tst_position.qml +++ b/tests/auto/declarative_core/tst_position.qml @@ -41,7 +41,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtLocation 5.0 +import QtPositioning 5.0 TestCase { id: testCase diff --git a/tests/auto/declarative_core/tst_positionsource.qml b/tests/auto/declarative_core/tst_positionsource.qml index 46540fcf..82c25c52 100644 --- a/tests/auto/declarative_core/tst_positionsource.qml +++ b/tests/auto/declarative_core/tst_positionsource.qml @@ -41,7 +41,7 @@ import QtQuick 2.0 import QtTest 1.0 -import QtLocation 5.0 +import QtPositioning 5.0 TestCase { id: testCase diff --git a/tests/auto/declarative_ui/tst_map.qml b/tests/auto/declarative_ui/tst_map.qml index 7c07d93e..38be06b5 100644 --- a/tests/auto/declarative_ui/tst_map.qml +++ b/tests/auto/declarative_ui/tst_map.qml @@ -42,6 +42,7 @@ import QtQuick 2.0 import QtTest 1.0 import QtLocation 5.0 +import QtPositioning 5.0 Item { width:100 @@ -62,12 +63,12 @@ Item { ] } - property variant coordinate1: QtLocation.coordinate(10, 11) - property variant coordinate2: QtLocation.coordinate(12, 13) - property variant coordinate3: QtLocation.coordinate(50, 50, 0) - property variant coordinate4: QtLocation.coordinate(80, 80, 0) - property variant invalidCoordinate: QtLocation.coordinate() - property variant altitudelessCoordinate: QtLocation.coordinate(50, 50) + property variant coordinate1: QtPositioning.coordinate(10, 11) + property variant coordinate2: QtPositioning.coordinate(12, 13) + property variant coordinate3: QtPositioning.coordinate(50, 50, 0) + property variant coordinate4: QtPositioning.coordinate(80, 80, 0) + property variant invalidCoordinate: QtPositioning.coordinate() + property variant altitudelessCoordinate: QtPositioning.coordinate(50, 50) Map {id: map; plugin: testPlugin; center: coordinate1; width: 100; height: 100} Map {id: coordinateMap; plugin: nokiaPlugin; center: coordinate3; width: 1000; height: 1000; zoomLevel: 15} diff --git a/tests/auto/declarative_ui/tst_map_geocoding.qml b/tests/auto/declarative_ui/tst_map_geocoding.qml index ca7e93c0..a61c993b 100644 --- a/tests/auto/declarative_ui/tst_map_geocoding.qml +++ b/tests/auto/declarative_ui/tst_map_geocoding.qml @@ -42,22 +42,23 @@ import QtQuick 2.0 import QtTest 1.0 import QtLocation 5.0 +import QtPositioning 5.0 Item { Plugin { id: nokiaPlugin; name: "qmlgeo.test.plugin"} Plugin { id: invalidPlugin; name: "invalid"} - property variant coordinate1: QtLocation.coordinate(51, 41) - property variant coordinate2: QtLocation.coordinate(52, 42) - property variant coordinate3: QtLocation.coordinate(53, 43) - property variant emptyCoordinate: QtLocation.coordinate() + property variant coordinate1: QtPositioning.coordinate(51, 41) + property variant coordinate2: QtPositioning.coordinate(52, 42) + property variant coordinate3: QtPositioning.coordinate(53, 43) + property variant emptyCoordinate: QtPositioning.coordinate() - property variant boundingBox1: QtLocation.rectangle(coordinate1, coordinate2) - property variant boundingBox2: QtLocation.rectangle(coordinate1, coordinate3) - property variant boundingCircle1: QtLocation.circle(coordinate1, 100) - property variant boundingCircle2: QtLocation.circle(coordinate2, 100) + property variant boundingBox1: QtPositioning.rectangle(coordinate1, coordinate2) + property variant boundingBox2: QtPositioning.rectangle(coordinate1, coordinate3) + property variant boundingCircle1: QtPositioning.circle(coordinate1, 100) + property variant boundingCircle2: QtPositioning.circle(coordinate2, 100) - property variant emptyBox: QtLocation.rectangle() + property variant emptyBox: QtPositioning.rectangle() GeocodeModel {id: emptyModel} @@ -124,7 +125,7 @@ Item { compare(boundsSpy.count, 2) compare(emptyModel.bounds.topLeft.latitude, boundingBox2.topLeft.latitude) compare(emptyModel.bounds.bottomRight.longitude, boundingBox2.bottomRight.longitude) - emptyModel.bounds = QtLocation.rectangle(); + emptyModel.bounds = QtPositioning.rectangle(); compare(boundsSpy.count, 3) @@ -139,7 +140,7 @@ Item { emptyModel.bounds = boundingCircle2 compare(boundsSpy.count, 2) compare(emptyModel.bounds.center.latitude, coordinate2.latitude) - var dynamicCircle = QtLocation.circle(QtLocation.coordinate(8, 9)); + var dynamicCircle = QtPositioning.circle(QtPositioning.coordinate(8, 9)); emptyModel.bounds = dynamicCircle compare(boundsSpy.count, 3) compare(emptyModel.bounds.center.latitude, dynamicCircle.center.latitude) @@ -194,12 +195,12 @@ Item { Address {id: address1; street: "wellknown street"; city: "expected city"; county: "2"} Address {id: errorAddress1; street: "error"; county: "2"} // street is the error reason - property variant rcoordinate1: QtLocation.coordinate(51, 2) - property variant errorCoordinate1: QtLocation.coordinate(73, 2) // (latiude mod 70) is the error code - property variant slackCoordinate1: QtLocation.coordinate(60, 3) + property variant rcoordinate1: QtPositioning.coordinate(51, 2) + property variant errorCoordinate1: QtPositioning.coordinate(73, 2) // (latiude mod 70) is the error code + property variant slackCoordinate1: QtPositioning.coordinate(60, 3) Address {id: slackAddress1; street: "Slacker st"; city: "Lazy town"; county: "4"} - property variant automaticCoordinate1: QtLocation.coordinate(60, 3) + property variant automaticCoordinate1: QtPositioning.coordinate(60, 3) Address {id: automaticAddress1; street: "Auto st"; city: "Detroit"; county: "4"} Plugin { diff --git a/tests/auto/declarative_ui/tst_map_item.qml b/tests/auto/declarative_ui/tst_map_item.qml index 99aae6ed..16ee16b4 100644 --- a/tests/auto/declarative_ui/tst_map_item.qml +++ b/tests/auto/declarative_ui/tst_map_item.qml @@ -75,9 +75,9 @@ Item { height: 240 Plugin { id: testPlugin; name : "qmlgeo.test.plugin"; allowExperimental: true } - property variant mapDefaultCenter: QtLocation.coordinate(20, 20) - property variant someCoordinate1: QtLocation.coordinate(15, 15) - property variant someCoordinate2: QtLocation.coordinate(16, 16) + property variant mapDefaultCenter: QtPositioning.coordinate(20, 20) + property variant someCoordinate1: QtPositioning.coordinate(15, 15) + property variant someCoordinate2: QtPositioning.coordinate(16, 16) Route { id: someRoute; path: [ diff --git a/tests/auto/declarative_ui/tst_map_item_details.qml b/tests/auto/declarative_ui/tst_map_item_details.qml index 50be77fe..0182bb8d 100644 --- a/tests/auto/declarative_ui/tst_map_item_details.qml +++ b/tests/auto/declarative_ui/tst_map_item_details.qml @@ -51,11 +51,11 @@ Item { height: 240 Plugin { id: testPlugin; name : "qmlgeo.test.plugin"; allowExperimental: true } - property variant mapDefaultCenter: QtLocation.coordinate(20, 20) + property variant mapDefaultCenter: QtPositioning.coordinate(20, 20) - property variant datelineCoordinate: QtLocation.coordinate(20, 180) - property variant datelineCoordinateLeft: QtLocation.coordinate(20, 170) - property variant datelineCoordinateRight: QtLocation.coordinate(20, -170) + property variant datelineCoordinate: QtPositioning.coordinate(20, 180) + property variant datelineCoordinateLeft: QtPositioning.coordinate(20, 170) + property variant datelineCoordinateRight: QtPositioning.coordinate(20, -170) MapPolygon { id: extMapPolygon @@ -75,7 +75,7 @@ Item { SignalSpy {id: extMapPolygonBorderColorChanged; target: parent.border; signalName: "colorChanged"} } - property variant polyCoordinate: QtLocation.coordinate(15, 6) + property variant polyCoordinate: QtPositioning.coordinate(15, 6) MapPolygon { id: extMapPolygon0 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 334c0853..d0af06be 100644 --- a/tests/auto/declarative_ui/tst_map_item_fit_viewport.qml +++ b/tests/auto/declarative_ui/tst_map_item_fit_viewport.qml @@ -42,6 +42,7 @@ import QtQuick 2.0 import QtTest 1.0 import QtLocation 5.0 +import QtPositioning 5.0 import QtLocation.test 5.0 /* @@ -75,11 +76,11 @@ Item { height: 240 Plugin { id: testPlugin; name : "qmlgeo.test.plugin"; allowExperimental: true } - property variant mapDefaultCenter: QtLocation.coordinate(20, 20) - property variant preMapRectangleDefaultTopLeft: QtLocation.coordinate(20, 20) - property variant preMapRectangleDefaultBottomRight: QtLocation.coordinate(10, 30) - property variant preMapCircleDefaultCenter: QtLocation.coordinate(10, 30) - property variant preMapQuickItemDefaultCoordinate: QtLocation.coordinate(35, 3) + property variant mapDefaultCenter: QtPositioning.coordinate(20, 20) + property variant preMapRectangleDefaultTopLeft: QtPositioning.coordinate(20, 20) + property variant preMapRectangleDefaultBottomRight: QtPositioning.coordinate(10, 30) + property variant preMapCircleDefaultCenter: QtPositioning.coordinate(10, 30) + property variant preMapQuickItemDefaultCoordinate: QtPositioning.coordinate(35, 3) property variant preMapPolygonDefaultPath: [ { latitude: 25, longitude: 5 }, @@ -99,19 +100,19 @@ Item { { latitude: 15, longitude: 15 } ] - property variant mapCircleTopLeft: QtLocation.coordinate(0, 0) - property variant mapCircleBottomRight: QtLocation.coordinate(0, 0) - property variant mapQuickItemTopLeft: QtLocation.coordinate(0, 0) - property variant mapQuickItemBottomRight: QtLocation.coordinate(0, 0) - property variant mapPolygonTopLeft: QtLocation.coordinate(0, 0) - property variant mapPolygonBottomRight: QtLocation.coordinate(0, 0) - property variant mapPolylineTopLeft: QtLocation.coordinate(0, 0) - property variant mapPolylineBottomRight: QtLocation.coordinate(0, 0) - property variant mapRouteTopLeft: QtLocation.coordinate(0, 0) - property variant mapRouteBottomRight: QtLocation.coordinate(0, 0) + property variant mapCircleTopLeft: QtPositioning.coordinate(0, 0) + property variant mapCircleBottomRight: QtPositioning.coordinate(0, 0) + property variant mapQuickItemTopLeft: QtPositioning.coordinate(0, 0) + property variant mapQuickItemBottomRight: QtPositioning.coordinate(0, 0) + property variant mapPolygonTopLeft: QtPositioning.coordinate(0, 0) + property variant mapPolygonBottomRight: QtPositioning.coordinate(0, 0) + property variant mapPolylineTopLeft: QtPositioning.coordinate(0, 0) + property variant mapPolylineBottomRight: QtPositioning.coordinate(0, 0) + property variant mapRouteTopLeft: QtPositioning.coordinate(0, 0) + property variant mapRouteBottomRight: QtPositioning.coordinate(0, 0) - property variant boundingBox: QtLocation.rectangle(QtLocation.coordinate(0, 0), - QtLocation.coordinate(0, 0)) + property variant boundingBox: QtPositioning.rectangle(QtPositioning.coordinate(0, 0), + QtPositioning.coordinate(0, 0)) Map { id: map; @@ -468,7 +469,7 @@ Item { point.y = maxY var itemBottomRight = map.toCoordinate(point) - return QtLocation.rectangle(itemTopLeft, itemBottomRight); + return QtPositioning.rectangle(itemTopLeft, itemBottomRight); } function verify_visibility_all_items(){ diff --git a/tests/auto/declarative_ui/tst_map_itemview.qml b/tests/auto/declarative_ui/tst_map_itemview.qml index d8cc5ff5..27b3c660 100644 --- a/tests/auto/declarative_ui/tst_map_itemview.qml +++ b/tests/auto/declarative_ui/tst_map_itemview.qml @@ -42,6 +42,7 @@ import QtQuick 2.0 import QtTest 1.0 import QtLocation 5.0 +import QtPositioning 5.0 import QtLocation.test 5.0 Item { @@ -51,7 +52,7 @@ Item { // General-purpose elements for the test: Plugin { id: testPlugin; name : "qmlgeo.test.plugin"; allowExperimental: true } - property variant mapDefaultCenter: QtLocation.coordinate(10, 30) + property variant mapDefaultCenter: QtPositioning.coordinate(10, 30) Map { id: map @@ -216,8 +217,8 @@ Item { anchors.fill: parent; zoomLevel: 2 - property variant firstItemCoord: QtLocation.coordinate(11, 31) - property variant secondItemCoord: QtLocation.coordinate(12, 32) + property variant firstItemCoord: QtPositioning.coordinate(11, 31) + property variant secondItemCoord: QtPositioning.coordinate(12, 32) MapItemView { id: listModelItemView diff --git a/tests/auto/declarative_ui/tst_map_mouse.qml b/tests/auto/declarative_ui/tst_map_mouse.qml index d01b310b..87f5638b 100644 --- a/tests/auto/declarative_ui/tst_map_mouse.qml +++ b/tests/auto/declarative_ui/tst_map_mouse.qml @@ -42,6 +42,7 @@ import QtQuick 2.0 import QtTest 1.0 import QtLocation 5.0 +import QtPositioning 5.0 import QtLocation.test 5.0 /* diff --git a/tests/auto/declarative_ui/tst_map_pinch_and_flick.qml b/tests/auto/declarative_ui/tst_map_pinch_and_flick.qml index fa21db6c..8ef97b43 100644 --- a/tests/auto/declarative_ui/tst_map_pinch_and_flick.qml +++ b/tests/auto/declarative_ui/tst_map_pinch_and_flick.qml @@ -42,6 +42,7 @@ import QtQuick 2.0 import QtTest 1.0 import QtLocation 5.0 +import QtPositioning 5.0 import QtLocation.test 5.0 Item { @@ -51,7 +52,7 @@ Item { height: 100 Plugin { id: testPlugin; name: "qmlgeo.test.plugin"; allowExperimental: true } - property variant coordinate1: QtLocation.coordinate(10, 11) + property variant coordinate1: QtPositioning.coordinate(10, 11) Map { id: map diff --git a/tests/auto/geotestplugin/qgeocodingmanagerengine_test.h b/tests/auto/geotestplugin/qgeocodingmanagerengine_test.h index 08c77360..19d61629 100644 --- a/tests/auto/geotestplugin/qgeocodingmanagerengine_test.h +++ b/tests/auto/geotestplugin/qgeocodingmanagerengine_test.h @@ -45,10 +45,10 @@ #include <qgeoserviceprovider.h> #include <qgeocodingmanagerengine.h> #include <QLocale> -#include <qgeoaddress.h> -#include <qgeolocation.h> +#include <QtPositioning/qgeoaddress.h> +#include <QtPositioning/qgeolocation.h> #include <qgeocodereply.h> -#include <QtLocation/QGeoShape> +#include <QtPositioning/QGeoShape> #include <QTimer> #include <QDebug> diff --git a/tests/auto/geotestplugin/qplacemanagerengine_test.h b/tests/auto/geotestplugin/qplacemanagerengine_test.h index 6dfcb3a2..6096ffe1 100644 --- a/tests/auto/geotestplugin/qplacemanagerengine_test.h +++ b/tests/auto/geotestplugin/qplacemanagerengine_test.h @@ -48,8 +48,8 @@ #include <QtCore/QJsonObject> #include <QtCore/QJsonArray> #include <QtCore/QUuid> -#include <QtLocation/QGeoCoordinate> -#include <QtLocation/QGeoLocation> +#include <QtPositioning/QGeoCoordinate> +#include <QtPositioning/QGeoLocation> #include <QtLocation/QPlaceContentReply> #include <QtLocation/QPlaceManager> #include <QtLocation/QPlaceManagerEngine> diff --git a/tests/auto/nokia_services/places_semiauto/tst_places.cpp b/tests/auto/nokia_services/places_semiauto/tst_places.cpp index 65d64ae2..e6e7859f 100644 --- a/tests/auto/nokia_services/places_semiauto/tst_places.cpp +++ b/tests/auto/nokia_services/places_semiauto/tst_places.cpp @@ -44,7 +44,7 @@ #include <QtTest/QtTest> #include <QtCore/QProcessEnvironment> -#include <QtLocation/QGeoCircle> +#include <QtPositioning/QGeoCircle> #include <QtLocation/QGeoServiceProvider> #include <QtLocation/QPlaceEditorial> #include <QtLocation/QPlaceImage> diff --git a/tests/auto/nokia_services/routing/tst_routing.cpp b/tests/auto/nokia_services/routing/tst_routing.cpp index fdbb8571..b64202a6 100644 --- a/tests/auto/nokia_services/routing/tst_routing.cpp +++ b/tests/auto/nokia_services/routing/tst_routing.cpp @@ -48,7 +48,7 @@ #include <QtLocation/QGeoRouteReply> #include <QtLocation/QGeoServiceProvider> #include <QtLocation/QGeoRoutingManager> -#include <QtLocation/QGeoRectangle> +#include <QtPositioning/QGeoRectangle> #include <QtLocation/QGeoManeuver> #include <QtLocation/QGeoRouteSegment> diff --git a/tests/auto/positionplugin/positionplugin.pro b/tests/auto/positionplugin/positionplugin.pro index 72918415..768e6864 100644 --- a/tests/auto/positionplugin/positionplugin.pro +++ b/tests/auto/positionplugin/positionplugin.pro @@ -1,5 +1,5 @@ TARGET = qtposition_testplugin -QT += location +QT += positioning PLUGIN_TYPE = position load(qt_plugin) diff --git a/tests/auto/positionplugintest/positionplugintest.pro b/tests/auto/positionplugintest/positionplugintest.pro index 4dbf36d9..da68f966 100644 --- a/tests/auto/positionplugintest/positionplugintest.pro +++ b/tests/auto/positionplugintest/positionplugintest.pro @@ -4,5 +4,5 @@ TARGET=tst_positionplugin SOURCES += tst_positionplugin.cpp -QT += location testlib +QT += positioning testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qgeoaddress/qgeoaddress.pro b/tests/auto/qgeoaddress/qgeoaddress.pro index 692fe86c..57274cdf 100644 --- a/tests/auto/qgeoaddress/qgeoaddress.pro +++ b/tests/auto/qgeoaddress/qgeoaddress.pro @@ -4,5 +4,5 @@ TARGET = tst_qgeoaddress SOURCES += tst_qgeoaddress.cpp -QT += location testlib +QT += positioning testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qgeocircle/qgeocircle.pro b/tests/auto/qgeocircle/qgeocircle.pro index 5d132475..91437b76 100644 --- a/tests/auto/qgeocircle/qgeocircle.pro +++ b/tests/auto/qgeocircle/qgeocircle.pro @@ -5,5 +5,5 @@ TARGET = tst_qgeocircle SOURCES += \ tst_qgeocircle.cpp -QT += location testlib +QT += positioning testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qgeocircle/tst_qgeocircle.cpp b/tests/auto/qgeocircle/tst_qgeocircle.cpp index 908ccaff..dde256bd 100644 --- a/tests/auto/qgeocircle/tst_qgeocircle.cpp +++ b/tests/auto/qgeocircle/tst_qgeocircle.cpp @@ -40,9 +40,9 @@ ****************************************************************************/ #include <QtTest/QtTest> -#include <QtLocation/QGeoCoordinate> -#include <QtLocation/QGeoCircle> -#include <QtLocation/QGeoRectangle> +#include <QtPositioning/QGeoCoordinate> +#include <QtPositioning/QGeoCircle> +#include <QtPositioning/QGeoRectangle> QT_USE_NAMESPACE diff --git a/tests/auto/qgeocodereply/tst_qgeocodereply.h b/tests/auto/qgeocodereply/tst_qgeocodereply.h index 23409ecc..62286e91 100644 --- a/tests/auto/qgeocodereply/tst_qgeocodereply.h +++ b/tests/auto/qgeocodereply/tst_qgeocodereply.h @@ -54,7 +54,7 @@ #include <qgeolocation.h> #include <qgeoaddress.h> #include <qgeocoordinate.h> -#include <QtLocation/QGeoRectangle> +#include <QtPositioning/QGeoRectangle> QT_USE_NAMESPACE class SubGeocodeReply : public QGeocodeReply diff --git a/tests/auto/qgeocodingmanager/tst_qgeocodingmanager.h b/tests/auto/qgeocodingmanager/tst_qgeocodingmanager.h index ea2d1e02..065d5134 100644 --- a/tests/auto/qgeocodingmanager/tst_qgeocodingmanager.h +++ b/tests/auto/qgeocodingmanager/tst_qgeocodingmanager.h @@ -51,7 +51,7 @@ #include <qgeoserviceprovider.h> #include <qgeocodingmanager.h> #include <qgeocodereply.h> -#include <QtLocation/QGeoRectangle> +#include <QtPositioning/QGeoRectangle> #include <qgeoaddress.h> #include <qgeocoordinate.h> diff --git a/tests/auto/qgeocodingmanagerplugins/qgeocodingmanagerengine_test.h b/tests/auto/qgeocodingmanagerplugins/qgeocodingmanagerengine_test.h index e03702cf..49ce3215 100644 --- a/tests/auto/qgeocodingmanagerplugins/qgeocodingmanagerengine_test.h +++ b/tests/auto/qgeocodingmanagerplugins/qgeocodingmanagerengine_test.h @@ -48,7 +48,7 @@ #include <qgeoaddress.h> #include <qgeolocation.h> #include <qgeocodereply.h> -#include <QtLocation/QGeoCoordinate> +#include <QtPositioning/QGeoCoordinate> QT_USE_NAMESPACE diff --git a/tests/auto/qgeocoordinate/qgeocoordinate.pro b/tests/auto/qgeocoordinate/qgeocoordinate.pro index 0a0ee195..7f29a28a 100644 --- a/tests/auto/qgeocoordinate/qgeocoordinate.pro +++ b/tests/auto/qgeocoordinate/qgeocoordinate.pro @@ -5,5 +5,5 @@ HEADERS += ../utils/qlocationtestutils_p.h SOURCES += tst_qgeocoordinate.cpp \ ../utils/qlocationtestutils.cpp -QT += location testlib +QT += positioning testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qgeolocation/qgeolocation.pro b/tests/auto/qgeolocation/qgeolocation.pro index 7f3f650e..cd951c7b 100644 --- a/tests/auto/qgeolocation/qgeolocation.pro +++ b/tests/auto/qgeolocation/qgeolocation.pro @@ -6,5 +6,5 @@ HEADERS += ../utils/qlocationtestutils_p.h \ SOURCES += tst_qgeolocation.cpp \ ../utils/qlocationtestutils.cpp -QT += location testlib +QT += positioning testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qgeolocation/tst_qgeolocation.h b/tests/auto/qgeolocation/tst_qgeolocation.h index 9ba81a44..0d34f982 100644 --- a/tests/auto/qgeolocation/tst_qgeolocation.h +++ b/tests/auto/qgeolocation/tst_qgeolocation.h @@ -48,10 +48,10 @@ #include <QMetaType> #include "../utils/qlocationtestutils_p.h" -#include <qgeoaddress.h> -#include <qgeocoordinate.h> -#include <qgeolocation.h> -#include <QtLocation/QGeoRectangle> +#include <QtPositioning/qgeoaddress.h> +#include <QtPositioning/qgeocoordinate.h> +#include <QtPositioning/qgeolocation.h> +#include <QtPositioning/QGeoRectangle> QT_USE_NAMESPACE diff --git a/tests/auto/qgeorectangle/qgeorectangle.pro b/tests/auto/qgeorectangle/qgeorectangle.pro index bb3d5362..6837d0a4 100644 --- a/tests/auto/qgeorectangle/qgeorectangle.pro +++ b/tests/auto/qgeorectangle/qgeorectangle.pro @@ -5,5 +5,5 @@ TARGET = tst_qgeorectangle SOURCES += \ tst_qgeorectangle.cpp -QT += location testlib +QT += positioning testlib DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qgeorectangle/tst_qgeorectangle.cpp b/tests/auto/qgeorectangle/tst_qgeorectangle.cpp index f600ff72..d0c9672d 100644 --- a/tests/auto/qgeorectangle/tst_qgeorectangle.cpp +++ b/tests/auto/qgeorectangle/tst_qgeorectangle.cpp @@ -42,9 +42,9 @@ //TESTED_COMPONENT=src/location #include <QtTest/QtTest> -#include <QtLocation/QGeoCoordinate> -#include <QtLocation/QGeoCircle> -#include <QtLocation/QGeoRectangle> +#include <QtPositioning/QGeoCoordinate> +#include <QtPositioning/QGeoCircle> +#include <QtPositioning/QGeoRectangle> QT_USE_NAMESPACE diff --git a/tests/auto/qgeoroute/tst_qgeoroute.h b/tests/auto/qgeoroute/tst_qgeoroute.h index 5b05e2f4..25ea06e6 100644 --- a/tests/auto/qgeoroute/tst_qgeoroute.h +++ b/tests/auto/qgeoroute/tst_qgeoroute.h @@ -47,7 +47,7 @@ #include <QMetaType> #include <qgeoroute.h> -#include <QtLocation/QGeoRectangle> +#include <QtPositioning/QGeoRectangle> #include <qgeocoordinate.h> #include <qgeorouterequest.h> #include <qgeoroutesegment.h> diff --git a/tests/auto/qgeorouterequest/tst_qgeorouterequest.cpp b/tests/auto/qgeorouterequest/tst_qgeorouterequest.cpp index ffcde9d8..7cfd3ff0 100644 --- a/tests/auto/qgeorouterequest/tst_qgeorouterequest.cpp +++ b/tests/auto/qgeorouterequest/tst_qgeorouterequest.cpp @@ -41,7 +41,7 @@ #include "tst_qgeorouterequest.h" -#include <QtLocation/QGeoRectangle> +#include <QtPositioning/QGeoRectangle> QT_USE_NAMESPACE diff --git a/tests/auto/qgeorouterequest/tst_qgeorouterequest.h b/tests/auto/qgeorouterequest/tst_qgeorouterequest.h index 5706a885..2c7bd2e2 100644 --- a/tests/auto/qgeorouterequest/tst_qgeorouterequest.h +++ b/tests/auto/qgeorouterequest/tst_qgeorouterequest.h @@ -47,7 +47,7 @@ #include <QMetaType> #include <qgeocoordinate.h> -#include <QtLocation/QGeoRectangle> +#include <QtPositioning/QGeoRectangle> #include <qgeorouterequest.h> diff --git a/tests/auto/qgeoshape/qgeoshape.pro b/tests/auto/qgeoshape/qgeoshape.pro index 9c3b1f64..03b01b65 100644 --- a/tests/auto/qgeoshape/qgeoshape.pro +++ b/tests/auto/qgeoshape/qgeoshape.pro @@ -1,6 +1,6 @@ load(testcase) TARGET = tst_qgeoshape -QT += testlib location +QT += testlib positioning SOURCES = \ tst_qgeoshape.cpp DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qgeoshape/tst_qgeoshape.cpp b/tests/auto/qgeoshape/tst_qgeoshape.cpp index 24d51003..594d4fd5 100644 --- a/tests/auto/qgeoshape/tst_qgeoshape.cpp +++ b/tests/auto/qgeoshape/tst_qgeoshape.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ #include <QtTest/QtTest> -#include <QtLocation/QGeoShape> +#include <QtPositioning/QGeoShape> class tst_qgeoshape : public QObject { diff --git a/tests/auto/qmlinterface/tst_qmlinterface.cpp b/tests/auto/qmlinterface/tst_qmlinterface.cpp index ba80833d..1919a817 100644 --- a/tests/auto/qmlinterface/tst_qmlinterface.cpp +++ b/tests/auto/qmlinterface/tst_qmlinterface.cpp @@ -43,11 +43,11 @@ #include <QtQml/QQmlEngine> #include <QtQml/QQmlComponent> #include <QtQml/QQmlListReference> -#include <QtLocation/QGeoCoordinate> -#include <QtLocation/QGeoAddress> -#include <QtLocation/QGeoRectangle> -#include <QtLocation/QGeoCircle> -#include <QtLocation/QGeoLocation> +#include <QtPositioning/QGeoCoordinate> +#include <QtPositioning/QGeoAddress> +#include <QtPositioning/QGeoRectangle> +#include <QtPositioning/QGeoCircle> +#include <QtPositioning/QGeoLocation> #include <QtLocation/QPlaceCategory> #include <QtLocation/QPlace> #include <QtLocation/QPlaceIcon> diff --git a/tests/auto/qnmeapositioninfosource/dummynmeapositioninfosource/dummynmeapositioninfosource.pro b/tests/auto/qnmeapositioninfosource/dummynmeapositioninfosource/dummynmeapositioninfosource.pro index 7fbf31e1..b8338f90 100644 --- a/tests/auto/qnmeapositioninfosource/dummynmeapositioninfosource/dummynmeapositioninfosource.pro +++ b/tests/auto/qnmeapositioninfosource/dummynmeapositioninfosource/dummynmeapositioninfosource.pro @@ -1,6 +1,6 @@ TEMPLATE = app CONFIG+=testcase -QT += network location testlib +QT += network positioning testlib TARGET = tst_dummynmeapositioninfosource INCLUDEPATH += .. diff --git a/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_realtime/qnmeapositioninfosource_realtime.pro b/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_realtime/qnmeapositioninfosource_realtime.pro index 73b12dff..83e6bf16 100644 --- a/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_realtime/qnmeapositioninfosource_realtime.pro +++ b/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_realtime/qnmeapositioninfosource_realtime.pro @@ -1,6 +1,6 @@ TEMPLATE = app CONFIG+=testcase -QT += network location testlib +QT += network positioning testlib TARGET = tst_qnmeapositioninfosource_realtime INCLUDEPATH += .. diff --git a/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_realtime_generic/qnmeapositioninfosource_realtime_generic.pro b/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_realtime_generic/qnmeapositioninfosource_realtime_generic.pro index 200cb8b4..ca1c258f 100644 --- a/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_realtime_generic/qnmeapositioninfosource_realtime_generic.pro +++ b/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_realtime_generic/qnmeapositioninfosource_realtime_generic.pro @@ -1,7 +1,7 @@ TEMPLATE = app CONFIG+=testcase testcase.timeout = 400 # this test is slow -QT += network location testlib +QT += network positioning testlib TARGET = tst_qnmeapositioninfosource_realtime_generic INCLUDEPATH += .. diff --git a/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_simulation/qnmeapositioninfosource_simulation.pro b/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_simulation/qnmeapositioninfosource_simulation.pro index 2f03484a..655a5f10 100644 --- a/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_simulation/qnmeapositioninfosource_simulation.pro +++ b/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_simulation/qnmeapositioninfosource_simulation.pro @@ -1,6 +1,6 @@ TEMPLATE = app CONFIG+=testcase -QT += network location testlib +QT += network positioning testlib TARGET = tst_qnmeapositioninfosource_simulation INCLUDEPATH += .. diff --git a/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_simulation_generic/qnmeapositioninfosource_simulation_generic.pro b/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_simulation_generic/qnmeapositioninfosource_simulation_generic.pro index 7bc48a32..cf94e7f8 100644 --- a/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_simulation_generic/qnmeapositioninfosource_simulation_generic.pro +++ b/tests/auto/qnmeapositioninfosource/qnmeapositioninfosource_simulation_generic/qnmeapositioninfosource_simulation_generic.pro @@ -1,7 +1,7 @@ TEMPLATE = app CONFIG+=testcase testcase.timeout = 400 # this test is slow -QT += network location testlib +QT += network positioning testlib TARGET = tst_qnmeapositioninfosource_simulation_generic INCLUDEPATH += .. diff --git a/tests/auto/qplacesearchreply/tst_qplacesearchreply.cpp b/tests/auto/qplacesearchreply/tst_qplacesearchreply.cpp index 94d28ad9..24a76bc7 100644 --- a/tests/auto/qplacesearchreply/tst_qplacesearchreply.cpp +++ b/tests/auto/qplacesearchreply/tst_qplacesearchreply.cpp @@ -44,7 +44,7 @@ #include <QtLocation/QPlaceSearchReply> #include <QtLocation/QPlaceResult> -#include <QtLocation/QGeoCircle> +#include <QtPositioning/QGeoCircle> QT_USE_NAMESPACE diff --git a/tests/auto/qplacesearchrequest/tst_qplacesearchrequest.cpp b/tests/auto/qplacesearchrequest/tst_qplacesearchrequest.cpp index 5753ddd3..318e8353 100644 --- a/tests/auto/qplacesearchrequest/tst_qplacesearchrequest.cpp +++ b/tests/auto/qplacesearchrequest/tst_qplacesearchrequest.cpp @@ -42,8 +42,8 @@ #include <QtCore/QString> #include <QtTest/QtTest> #include <QtLocation/QPlaceSearchRequest> -#include <QtLocation/QGeoCircle> -#include <QtLocation/QGeoRectangle> +#include <QtPositioning/QGeoCircle> +#include <QtPositioning/QGeoRectangle> QT_USE_NAMESPACE diff --git a/tests/plugins/declarativetestplugin/qdeclarativelocationtestmodel_p.h b/tests/plugins/declarativetestplugin/qdeclarativelocationtestmodel_p.h index 7a3b925e..a0a596b4 100644 --- a/tests/plugins/declarativetestplugin/qdeclarativelocationtestmodel_p.h +++ b/tests/plugins/declarativetestplugin/qdeclarativelocationtestmodel_p.h @@ -47,7 +47,7 @@ #include <QTimer> #include <QDebug> #include <QList> -#include <QtLocation/QGeoCoordinate> +#include <QtPositioning/QGeoCoordinate> class DataObject: public QObject { |
