summaryrefslogtreecommitdiff
path: root/src/location/declarativemaps/qdeclarativegeoroutemodel.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Fix documentation warningsTopi Reinio2019-11-141-9/+13
| | | | | | | | | | | | | Fix missing/incorrect parameter documentation, linking warnings, and \instantiates references to undocumented/internal classes. Remove mention of Navigator::currentRoute, as such a property no longer exists. Fixes: QTBUG-79811 Change-Id: I048a13109aa19f3db75e76611473d60a2396f028 Reviewed-by: Topi Reiniƶ <topi.reinio@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-10-011-13/+16
|\ | | | | | | Change-Id: Id543d32c49c8efd1d7798d41bbee0e28c1742e12
| * Doc: Fix link errors and complete parameter specsNico Vertriest2019-09-301-13/+16
| | | | | | | | | | Change-Id: I786ab35a0e9c8dfa2c8124692289d98e8eee4a8d Reviewed-by: Topi Reiniƶ <topi.reinio@qt.io>
* | Fix compilation after recent declarative internal header changesSimon Hausmann2019-07-171-0/+2
|/ | | | | | | | | | Some types of the private declarative API became visible through implicit header file inclusion from qqmlengine_p.h. This was changed in declarative and requires fixing here, but it's backwards build compatible to before the changes in declarative. Change-Id: I3553fada4363e88191c127f9cabae2169916ae46 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Doc: Fix documentation issuesTopi Reinio2019-05-161-11/+11
| | | | | | | | | | | Fix various documentation-related issues, including missing parameter documentation, broken links, and typos. Do some minor language editing. Change-Id: I0a8f8457e0d1ab56b4fc4670376509adf1fd26a3 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Reduce QtXmlPattern dependencyv5.13.0-beta2Alex Blasche2019-04-021-2/+2
| | | | | | | | | | | | QtLocation and QtPositioning don't depend on it and QtXmlPatterns is about to be deprecated in Qt 5.13. The only existing dependency is the geoflickr example. The most likely resolution is to remove the example once QtXmlPatterns is removed for good. This change makes QtXmlPatterns an optional build dependency. Change-Id: Ibcd9e48604cff4d5e52a63164b30616b0eb100f2 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Add departure time attribute to route queriesv5.13.0-alpha1Paolo Angelelli2019-02-061-0/+25
| | | | | | | | | So that it can be used to improve the route calculation based on traffic information or other time-based information (ferries etc.) Change-Id: I8bdc81046484cc4f0ebfaffbdf6f034c555d7781 Fixes: QTBUG-70503 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* Unify semicolon usage in Q_UNUSEDJesus Fernandez2019-01-231-1/+1
| | | | | Change-Id: I36dd6881b6f6f028869d63b6311cba7f52a99cc4 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Expose manager-specific errors from QGeoServiceProviderPaolo Angelelli2019-01-141-3/+3
| | | | | | | | | So that there's no risk to mix failures when creating multiple managers. Task-number: QTBUG-72180 Change-Id: I5c3b18ba17094e1480b2376e37b58d47029ca8f4 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Remove usage of deprecated, internal QML APILars Knoll2018-08-031-4/+0
| | | | | Change-Id: I4c9a27532f96a885d8baa7a790b2b983b2eb3bb3 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Adjust to internal API changes in qtdeclarativeLars Knoll2018-07-031-0/+4
| | | | | | Change-Id: I37fd81cfaf2599859581e2a359f87f15b772db98 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Fix QDeclarativeGeoRouteModel::get docPaolo Angelelli2018-05-091-1/+1
| | | | | Change-Id: I4bba86863bb902b26f493bd0104dbe87579de9e6 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Doc: Remove \since tag from Waypoint::metadataKai Koehne2018-04-221-2/+0
| | | | | | | The whole type got introduced only in 5.11. Change-Id: I4368c95dc6c0d39da0088e0aed6b72d3b34c2bc9 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* API Fix: remove QGeoCoordinate <-> QGeoCoordinateObjectPaolo Angelelli2018-04-171-1/+1
| | | | | | | | | | This was some code needed for supporting something that eventually did not get in. So we can as well remove it altogether from the API. Change-Id: Ibbfc50fb950c316308ce1d666e39da33527faa9e Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Doc: Fix all documentation warningsTopi Reinio2018-03-271-43/+61
| | | | | | | | | | | | | | | | | | | | Fix multiple warnings caused by invalid documentation configuration, missing QML module specifiers, wrong QML type names, incorrect arguments for the \fn command, and missing documentation. Remove incorrect statement from the example usage of the Waypoint QML type. Use 'QtLocation' as the name for the module throughout the docs. Clang (used as the parser for QDoc in Qt 5.11) was unable to resolve the path for qlocation.h, causing QDoc to omit the QLocation namespace documentation. Fix this by including the file explicitly from qlocationglobal.h for documentation builds. Change-Id: I2bd790db1ff5ad96f0cdb415a682b97593b3a6dc Reviewed-by: Martin Smith <martin.smith@qt.io>
* API Fix: Expose Waypoint metadata and RouteQuery extraParametersPaolo Angelelli2018-03-141-0/+49
| | | | | | | | | | | | | | Both RouteQuery and Waypoint are currently intended to be a one-way interface to push data into a route request. With the upcoming navigation support, there is need for these to become also a way to report to the user updated request info. This patch fixes the problem by adding two read only qml properties, a Waypoint.metadata, that can also be used to read all of what is being set via Map Parameters, and a RouteQuery.extraParameters, intended to be used in the same way. Change-Id: I65e484d96d50e89f44271781cb21e58dfe7badf8 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* API Fix: change QGeoRouteRequest::extraParameters into QVariantMapv5.11.0-beta2Paolo Angelelli2018-03-081-1/+1
| | | | | | | | | | | | | | | | Needed as it turns out the QGeoRouteRequest associated with a QGeoRoute has to be exposed also through the declarative API (so QDeclarativeGeoRoute must expose an associated QDeclarativeGeoRouteRequest). QDeclarativeGeoRouteRequest was, until now, intended to be only a one-way API (to feed data into the plugin). Now that it has also to expose data coming from the plugin, including the associated extraParameters that do would come anymore from nested MapParameters but from the QGeoRouteRequest itself. For this reason the type has to be a QML-friently type. Change-Id: I083e0fe97ad1088f6084665037003e24edb54371 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Introduce WaypointPaolo Angelelli2017-11-301-61/+528
| | | | | | | | | | | | | | | | | | This patch replaces QGeoCoordinate with Waypoint as mean to specify waypoints in a RouteQuery. This patch also adds a new invokable to RouteQuery, waypointObjects, to return QDeclarativeGeoWaypoints instead of QGeoCooordinates. NOTE: If, by 5.11, support to perform implicit conversions in method invocations based on converters registered in the metatype system will be added, this method could/should be removed, and QDeclarativeGeoWaypoint objects should be return as QVariants from the waypoints() getter, as they could be used in place of QGeoCoordinate when passing them as arguments. Task-number: QTBUG-64066 Change-Id: I77747f53cdcbabe6430580b60fa59d4afe8c650a Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Allow to specify extra parameters in RouteQuery using MapParametersPaolo Angelelli2017-11-291-2/+76
| | | | | | | | | | | | | This patch works on top of the previous one, and passes the content of the map parameters as a QMap<QString, QVariantMap>, where the key is the parameter type and the value is a map<property name, property value> of all properties of the map parameter except for the property "type". To achieve this, a new list property, quickChildren, has been added to RouteQuery, to pick up Map Parameters declared inside the query Change-Id: I364f5438e8f4cfc42430bfe448d96519c407eb74 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Add TrafficFeature to QGeoRouteRequest/RouteQueryPaolo Angelelli2017-06-071-0/+1
| | | | | | | | [ChangeLog][QtLocation][QGeoRouteRequest/RouteQuery] Add TrafficFeature to the query features. Change-Id: I50243865da97e302943f43b0eda430e9d8383880 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Fix documentation for return types from QJSValue to the actual QML typePaolo Angelelli2017-05-311-1/+1
| | | | | Change-Id: I6db1f0db07de3bb9446f0b04ea95f34b56acf805 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Make error_messages.h privatePaolo Angelelli2017-05-021-1/+1
| | | | | Change-Id: Iba33d12fad113b64cb071f0542a2c92034ff755d Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-04-181-1/+1
| | | | Change-Id: I8ce0a0994d57fb077be4b6771f219bfc4134aa22
* Remove moc_* inclusions from source filesPaolo Angelelli2017-02-141-2/+0
| | | | | | Change-Id: I7385348d7b6ec22fa92ed1be65f89e262c38b5c0 Reviewed-by: Michal Klocek <michal.klocek@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* QDeclarativeGeoRouteModel: Add missing tr()Friedemann Kleint2017-02-131-1/+1
| | | | | | | Fix warning about constructing a QString from const char *. Change-Id: Ic5d4322fb8beec9645072bbc029ddff5e646eb90 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Moving location qml implementation to location/declarative*Paolo Angelelli2017-01-261-0/+1308
QtLocation quick classes and headers are moved out of the import directory. The location quick classes are now in a subdirectory inside the main qtlocation module. This is necessary in order to privately export certain classes, such as Map Items classes, and create an API to inject these objects into QGeoMap to let plugins render the Map Items directly Change-Id: Ia6ba5f07c4eddd3c4c2ce54bf34f1afcd42c2558 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>