summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add q pointer to QDeclarativeNavigatorPrivatewip/navigationPaolo Angelelli2018-04-172-1/+10
| | | | | | | | | Since QDeclarativeNavigatorPrivate is what gets passed to the engine, a QParameterizableObject *q becomes necessary in order to extract and connect the QGeoMapParameters in the engines. Change-Id: Id4a8a99f2287faab9c7e67e5355e9c90c33eaa8f Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Introduce map objects reference implementationPaolo Angelelli2018-04-1739-35/+2183
| | | | | | | | | | | | | | | | This patch introduces a reference implementation for the QGeoMapObject subclasses in the locationlabs module. If this module is built, all current plugins, with the exception of mapboxgl, will also be able to render map objects. The current reference implementation of map objects is not optimized, but it can be useful for both testing and feature parity (so that switching between plugins will give the same result). Change-Id: I830ebb3813f219e42c085f450952a2b4327361cd Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Add documentation for QDeclarativeNavigatorPaolo Angelelli2018-04-171-6/+110
| | | | | Change-Id: I8dd9a35b05b7015c8f4fc6badfa0b0909c669e62 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Introduce Navigator QML typePaolo Angelelli2018-04-178-16/+597
| | | | | | | | | A new QML type, Navigator, is introduced in Qt.labs.location Its intended purpose is to be a front-end for the functionalities offered by NavigationManagerEngines. Change-Id: Ic93bed0bfaaf32453e759b12a348fa6ef1ae2c93 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Add documentation for QMapPolylineObjectPaolo Angelelli2018-04-171-0/+32
| | | | | Change-Id: I2112ae3aa2bb5b9c8dc18552c7643039c37a694e Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Add documentation for QMapRouteObjectPaolo Angelelli2018-04-171-0/+18
| | | | | Change-Id: I0b78ec63e3474db9343094661932cb6a1f31728e Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Add documentation for QMapPolygonObjectPaolo Angelelli2018-04-171-0/+38
| | | | | Change-Id: I02eb18655f1c32842465addf5c937028af39f5bb Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Add documentation for QMapCircleObjectPaolo Angelelli2018-04-171-0/+44
| | | | | Change-Id: I41e792a7c8d0b707ca087c20a4a5dc5e906bd124 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Add documentation for QMapIconObjectPaolo Angelelli2018-04-171-0/+40
| | | | | Change-Id: I36f2cc5d8fe71c0a3446b8572203bd2e032e9541 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Add documentation for QMapObjectViewPaolo Angelelli2018-04-161-2/+32
| | | | | Change-Id: I6cc147892b1fe2fce18df52335b0ffeaa56e2c6f Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Compile windowsJan Arve Sæther2018-04-162-3/+3
| | | | | | | | | | | | | | | | | | Don't use "interface" keyword unless really needed. The interface keyword is defined as a preprocessor macro: #define interface struct This was done by MS in order to be able to write this (which adds more semantic): interface { HRESULT foo() = 0; [...] } Change-Id: I95c6396158971220299cdc0ded6ffb11c677990c Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Move locationlabs code into locationPaolo Angelelli2018-03-2326-58/+46
| | | | | | | | | | The labs feature will still be controlled by location-labs-plugin config option. They will simply come from the QtLocation module, and be exposed to QML via the additional qml plugin in imports/locationlabs. Change-Id: I133d625708e78ba5d8121a95e45142aae5ec274b Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Introduce MapPolylineObject and MapPolygonObjectPaolo Angelelli2018-03-217-0/+801
| | | | | Change-Id: I95b21a8df6e1de600b31ce2fbea55d0a31b31c7f Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Introduce MapCircleObjectPaolo Angelelli2018-03-214-0/+455
| | | | | Change-Id: Ic8b2ae65f461b55c3f655af66865c4e8bbf50d14 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Merge remote-tracking branch 'origin/5.11' into wip/navigationPaolo Angelelli2018-03-2027-61/+242
|\ | | | | | | Change-Id: I558b3b2de394b946d70f484a19d0c1f7bef25515
| * QGeoServiceProviderFactory: Restore binary compatibility to Qt 5.10Paolo Angelelli2018-03-204-8/+51
| | | | | | | | | | | | | | | | | | | | | | | | Added a new QGeoServiceProviderFactoryV2 to load plugins offering a navigation manager engine. To be able to still load plugins compiled against Qt 5.10, both factories are considered when loading plugins, using the pointer to the V2 only when accessing the newly exposed functionality. Change-Id: I8e5e868737c77142e77caaacef278686565928df Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Fix export for QDoubleVector2D and QDoubleVector3DPaolo Angelelli2018-03-192-4/+4
| | | | | | | | | | Change-Id: I422b4e67843fe1910f85299cec437a5c7c24814d Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * API Fix: expose the RouteQuery used to produce a RoutePaolo Angelelli2018-03-192-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, Route is intended to be a one-way interface to push data into a route request. With the upcoming navigation support, there is need for this to become also a way to report to the user the updated request info, for example when, Navigator.currentRoute changes. This patch introduces a RouteQuery read-only qml property so it would be possible to access the related query data in a route, and use it in the UI. Change-Id: Ibea8cb724313606feae614c61736ee14105d1045 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * QDeclarativeGeoWaypoint: Declare QQmlParserStatus interfaceFriedemann Kleint2018-03-191-0/+1
| | | | | | | | | | | | | | | | Fix warning: declarativemaps\qdeclarativegeoroutemodel_p.h(270): Warning: Class QDeclarativeGeoWaypoint implements the interface QQmlParserStatus but does not list it in Q_INTERFACES. qobject_cast to QQmlParserStatus will not work! Change-Id: I3e9d8e6a68a5bb644a9d6ded8982daffaf985c53 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * qgeopositioninfo_p.h: Add "We mean it" commentFriedemann Kleint2018-03-191-0/+11
| | | | | | | | | | | | | | | | Fix warning: QtPositioning: WARNING: .../qtlocation/src/positioning/qgeopositioninfo_p.h does not have the "We mean it." warning Change-Id: I1f36f5505316b06b22522877bf53660fdfee79b1 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * Don't start panning on mouse releaseShawn Rutledge2018-03-162-1/+12
| | | | | | | | | | | | Task-number: QTBUG-66534 Change-Id: I72aee2235c50273fde809e67c83e0c2195db88b4 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * Fix warning: usage of deprecated QString()Paolo Angelelli2018-03-161-1/+6
| | | | | | | | | | Change-Id: I584483bfce276132f167f2344ea731bb9d6da894 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * API Fix: Expose Waypoint metadata and RouteQuery extraParametersPaolo Angelelli2018-03-142-0/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-086-13/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * Fix infinite loop in QGeoRouteSegmentPrivateDefault::operator ==Paolo Angelelli2018-03-071-1/+1
| | | | | | | | | | | | Change-Id: I7b92ecd1862866c3f065447d23957993057f7b8c Reviewed-by: Helio Chissini de Castro <helio@kde.org> Reviewed-by: Sérgio Martins <sergio.martins@kdab.com>
| * Add .mm to DISTFILES if not on MacPaolo Angelelli2018-03-051-0/+4
| | | | | | | | | | | | | | So that the files can be found by qtcreator. Change-Id: I00b0cbcd711b413221a4486234aba8b1c5757cb6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
| * Fix re-set map items rendering stale geometryPaolo Angelelli2018-03-014-8/+31
| | | | | | | | | | | | | | | | Geometries are now cleared if data is invalid, before early return. Task-number: QTBUG-66758 Change-Id: Ie89248f78b5fd817a33ed5d6ff56b3547d64a50b Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * qlocationlabsglobal_p.h: Add missing "We mean it" commentFriedemann Kleint2018-03-011-0/+11
| | | | | | | | | | | | | | | | Fix: WARNING: qtlocation/src/locationlabs/qlocationlabsglobal_p.h does not have the "We mean it." warning Change-Id: Iae44606739fce82d113dfdd228a44e1911593598 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * Silence a GCC 8 warning in qquickgeocoordinateanimationVille Voutilainen2018-03-011-3/+3
| | | | | | | | | | | | | | | | | | qtlocation/src/imports/positioning/qquickgeocoordinateanimation.cpp:278:106: error: cast between incompatible function types from ‘QVariant (*)(const QGeoCoordinate&, const QGeoCoordinate&, qreal)’ {aka ‘QVariant (*)(const QGeoCoordinate&, const QGeoCoordinate&, double)’} to ‘QVariantAnimation::Interpolator’ {aka ‘QVariant (*)(const void*, const void*, double)’} [-Werror=cast-function-type] d->interpolator = reinterpret_cast<QVariantAnimation::Interpolator>(&q_coordinateWestInterpolator); Change-Id: If8728c01782177aeeb0f64a8637093d0c4c4ee2d Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Use mouse instead of arguments[0] in signal handlersv5.11.0-beta1Kari Oikarinen2018-02-211-21/+18
| | | | | | | | | | | | | | | | | | Couldn't reproduce the bug that was the explained cause and based on the bug comments it hasn't been reproducible in Qt 5.2+ in 2014 either. Task-number: QTBUG-36560 Change-Id: I198bbba5a3f00bf49a7efbfde30af1696011efd8 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * Fix declarative_ui::MouseArea::test_enabled failing in CIKari Oikarinen2018-02-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test in the headline failed in CI on first runs, but succeeded in repeats when it is run alone. This was because the previous test declarative_ui::MouseArea::test_basic_press_release led to a situation where the mouseClick() does not actually lead to a click event. QTBUG-66534 was created to track that bug. Skip the part of the test that leads to the failure for now. Task-number: QTBUG-66533 Task-number: QTBUG-66534 Task-number: QTBUG-66216 Change-Id: Iadf3844e97603414594aceafcb1f36cf40653073 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Introduce MapIconObjectPaolo Angelelli2018-03-014-3/+401
| | | | | | | | | | Change-Id: I3ce8956ed77d4307521cb6b5e9b53fb4cc5fed7c Reviewed-by: Michael Brasser <michael.brasser@live.com>
* | Prepare for dual mode item creation in MapObjectViewPaolo Angelelli2018-02-231-7/+10
| | | | | | | | | | | | | | Put variables in place to switch between sync/async incubation. Change-Id: Iabe2d0af4b6a4c5f4c4a8e840333bba44926db3f Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | Add virtual QGeoMap::removeMapObjectPaolo Angelelli2018-02-212-0/+9
| | | | | | | | | | | | | | | | this can be called in ~QGeoMapObjectPrivate overrides to delete themselves from the map. Change-Id: I715491728a60b3d1bd60944a51dfa0ba07a3b29e Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Assign QGeoMapObjectPrivate::m_map after creating the new implementationPaolo Angelelli2018-02-211-1/+13
| | | | | | | | | | | | | | | | Or else it will be null, as no copy constructor for QGeoMapPrivate is defined (and used). Change-Id: I6045ccd4ec15c775a6ae0f9c55107103dfe28e9e Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | Change QDeclarativeGeoMapItemBase::map_ into a QPointerPaolo Angelelli2018-02-211-1/+1
| | | | | | | | | | | | | | | | Or else it may cause crashes on shutdown due to map_ not being parented with QDeclarativeGeoMap and potentially being deleted earlier. Change-Id: I2bed1c884eb556e48261371e889aae5e190476bc Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into wip/navigationPaolo Angelelli2018-02-2033-263/+685
|\ \ | |/ | | | | Change-Id: If8c2766bc6cd2ef7c424f92212ed8db2a4824d09
| * Merge remote-tracking branch 'origin/wip/navigation' into 5.11Paolo Angelelli2018-02-207-9/+69
| |\ | |/ |/| | | Change-Id: Ie32717a594ad7a82d1c8eee238ce378bcfadc2ac
* | Enable Qt.labs.location and locationlabs modules by defaultPaolo Angelelli2018-02-191-1/+0
| | | | | | | | | | | | | | | | | | These are experimental anyway, and to be used they have to be explicitly imported or added in a pro file. Change-Id: I7ab4391db5d3f22d8cd4c1819ca0610b8739ff7f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | Fix warning C4138: '*/' found outside of commentPaolo Angelelli2018-02-171-2/+2
| | | | | | | | | | Change-Id: I9be01a84ed70daaa47e2d13619060d815d6b9f3c Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | Use Q_LOCATIONLABS_PRIVATE_EXPORT in locationlabs modulePaolo Angelelli2018-02-145-6/+67
| | | | | | | | | | | | | | Currently it is incorrectly using Q_LOCATION_PRIVATE_EXPORT Change-Id: Ie7e92fa5ca0379c0bf89055f975da6cf958e049e Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| * Merge "Merge remote-tracking branch 'origin/5.9' into 5.11" into ↵Liang Qi2018-02-202-5/+31
| |\ | | | | | | | | | refs/staging/5.11
| | * Merge remote-tracking branch 'origin/5.9' into 5.11Liang Qi2018-02-202-5/+31
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I0786d8c91141c245f337c31ddcdfcb39e4b8ca41
| | | * Fix zoomLevel being emitted when the value has not changedPaolo Angelelli2018-02-121-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Map.setZoomLevel currently clamps the user-set value to a valid range. The current implementation emits zoomLevelChanged every time the user-set value is different from the current value. This patch restrict emission to when the actual value has really changed. Change-Id: I2096b666d2a5b1849c9022cad028b826cfee2a78 Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
| | | * Fix Map.zoomLevel not honoring user-set valuesPaolo Angelelli2018-02-122-3/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apparently m_userMinimumZoomLevel is set but not used when setting the zoom level. With this patch, the minimumZoomLevelChanged signal is still emitted when the "implicit" minimumZoomLevel of the map changes (the one derived from the map size), but only if no user minimum zoom level is explicitly set. Task-number: QTBUG-66107 Change-Id: Id7f87cbd237407b255deea90dad80eeadd2d2f0d Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
| | | * Bump versionOswald Buddenhagen2018-02-021-1/+1
| | | | | | | | | | | | | | | | Change-Id: Ic476c5cdd495d546c9421ccae2ebf15b591475ac
| * | | Fix regression: gesture area not honoring maximum center latitudePaolo Angelelli2018-02-202-1/+11
| |/ / | | | | | | | | | | | | | | | | | | Introduced in 69a42c4a5c37a5a74c4b285c64328bc88ed8e059 Change-Id: I3cace297e0494bdb4da5e6d4d1a634877c66f916 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | Merge "Merge remote-tracking branch 'origin/5.10.1' into 5.11" into ↵Paolo Angelelli2018-02-202-0/+26
| |\ \ | | | | | | | | | | | | refs/staging/5.11
| | * \ Merge remote-tracking branch 'origin/5.10.1' into 5.11Liang Qi2018-02-192-0/+26
| | |\ \ | | | | | | | | | | | | | | | Change-Id: I9a9bfd9474ff4b578367cea3d7697173ec287ca9
| | | * | Bump Mapbox GL to fix issue on Windowsv5.10.15.10.1Bruno de Oliveira Abinader2018-02-081-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mapbox-gl-native @ 8757164ac8f2b033b2b12d4baf075ed18cfeb2b4 Task-number: QTBUG-64632 Change-Id: I00038790fcfbaa3b91aee6c23e46b654b7e71ad1 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
View Lorry Controller Status