summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix casting QGeoServiceProviderFactoryV2v5.11.0-rc2v5.11.0-rc1v5.11.05.11.0Paolo Angelelli2018-05-031-1/+4
| | | | | | | | | | | qobject_cast ing to QGeoServiceProviderFactory when the instance is a QGeoServiceProviderFactoryV2 returns 0. Use factoryV2 in this case. Task-number: QTBUG-68062 Change-Id: Ibed1902749b6d06c905d309514c3750e75b75626 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Bruno de Oliveira Abinader <brunoabinader@gmail.com>
* Let QDeclarativeNavigator::{start,stop} update m_activeBruno de Oliveira Abinader2018-05-031-8/+4
| | | | | | | | | | | QDeclarativeNavigator should call QNavigatorManager::start() inside QDeclarativeNavigator::start(), however because we were already updating m_active in QDeclarativeNavigator::setActive(), the call for QNavigationManager::start() never happens. Task-number: QTBUG-68066 Change-Id: I486381fdec7fc77ac977ee46683fabd2465cf799 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Fix build with clangAllan Sandfeld Jensen2018-04-292-1/+1
| | | | | | | | | | The code uses both deprecated C++98 std::auto_ptr and C++14 TR std::experimental::optional and thus depends rather heavily on being compiled with an exact C++ version. Task-number: QTBUG-67810 Change-Id: I599b4a16f93ded6a9fb8fcf24c43c25f83a9f2fd Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Add changes file for Qt 5.11.0Antti Kokko2018-04-261-0/+116
| | | | | | Change-Id: I0e017e06105ccbacc6fc77f51e544955d9d973d0 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* QDeclarativeGeoMap::copyrightsVisibleChanged() was not added in Qt 5.11Alex Blasche2018-04-242-2/+1
| | | | | | Change-Id: Id80bf6b1919f0c6d6f96a315289f67ddad220f2f Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Fix QGeoMapObject handling in reference implementationPaolo Angelelli2018-04-2231-369/+568
| | | | | | | | | | | | | | | | | setVisible was neither changing the visibility nor triggering repaint. Pimpls weren't removing themselves in their destructors when dynamically added/removed via QGeoMapObjectView add/removeMapObject. This patch also factors out the duplicated QGeoMapObject support from QGeoTiledMapLabs and QGeoMapObjectsOverlay and moves it into an own class, QGeoMapObjectQSGSupport. To properly flush the scene graph nodes upon object removal, a pointer to the QSGNode is added to the MapObject struct, now moved inside QGeoMapObjectQSGSupport. Change-Id: Ie8c6d54f8f340ba3867717d9620791d3fe8021cc Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@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>
* Update qmltypes and revision for Qt 5.11 in Location and PositioningAlex Blasche2018-04-228-27/+61
| | | | | Change-Id: Ie7493cbb33e656c270ef522fa26460461215e145 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Merge 5.11 into 5.11.0Oswald Buddenhagen2018-04-208-33/+41
|\ | | | | | | Change-Id: I93bd8e6bdd86795e5a52a9fc6e65fd3f0b9fc6ba
| * QPlaceManagerEngineMapbox: No longer use deprecated qSort()Friedemann Kleint2018-04-201-2/+4
| | | | | | | | | | | | | | | | | | | | Replace by std::sort(), fixing: qplacesearchreplymapbox.cpp:213:10: warning: 'void qSort(RandomAccessIterator, RandomAccessIterator, LessThan) [with RandomAccessIterator = QList<QPlaceSearchResult>::iterator; LessThan = QPlaceSearchReplyMapbox::onReplyFinished()::<lambda(const QPlaceResult&, const QPlaceResult&)>]' is deprecated: Use std::sort [-Wdeprecated-declarations] Amends 13189f0741c755bfbde889e91c67c168faa3709f. Change-Id: Ib5bab5a924e559f810754f44ebdd849915d70c43 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * Fix MapRectangle QQuickItem geometry to allow enabling layersPaolo Angelelli2018-04-191-3/+3
| | | | | | | | | | | | | | | | The geometry now considers the line width, so that, when enabling layers, the item won't be incorrectly clipped at the borders. Change-Id: I14578adb2fc393983a3c1be901241d78949c9dde Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| * Remove dead code in QGeoMapPolylineGeometry::updateScreenPointsPaolo Angelelli2018-04-191-8/+2
| | | | | | | | | | | | | | | | QTriangulatingStroker does apparently not use the clip argument, so the patch removes the code that calculates it. Change-Id: I14eeb2e7aac38e3f066d4d33c68ceae63555944d Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Add QGeoMapPolylineGeometry::containsPaolo Angelelli2018-04-193-13/+22
| | | | | | | | | | | | | | | | | | | | | | | | This patch makes QGeoMapItemGeometry::contains virtual, and overrides it in QGeoMapPolylineGeometry, so that it can be used in items that have QGeoMapPolylineGeometry for borders. This patch fixes the issue of map polygons not being interactive on their borders. Task-number: QTBUG-67765 Change-Id: I7c571e57b9f1d26203f3e5857d47e85380281b28 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| * Fix MapPolyline being drawn misplaced and moving when clippedPaolo Angelelli2018-04-195-7/+10
| | | | | | | | | | | | | | Regression introduced in f0bc0db15ed262a8f31bb07b3b46a5cdf9277e79 Change-Id: I4c4a3cb2302daeb825be21f9e2f6c235d2cb7c93 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Bump Qt Positioning and Location import versions to latest 5.11Alex Blasche2018-04-194-5/+5
| | | | | | | | | | Change-Id: I846f00703b2c6c173e445bf053a92098626db8e2 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Add QML revision info to new QML signals in geomapitembaseAlex Blasche2018-04-191-2/+2
| | | | | | | | | | Change-Id: I5c3e45a5d44f3f7f5c3ecda6823035aae07ae825 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Merge remote-tracking branch 'gerrit/5.11' into 5.11.0Alex Blasche2018-04-199-34/+18
|\ \ | |/ | | | | Change-Id: I8be04335a4e29877fb1d0a5029f5c5d60429de69
| * Fix MapPolygon being drawn misplaced and moving as it gets clippedPaolo Angelelli2018-04-182-6/+9
| | | | | | | | | | | | | | | | This patch fixes a regression introduced with commit f0bc0db15ed262a8f31bb07b3b46a5cdf9277e79 Change-Id: Ie974b7a95d8ecd5f6affafc070848d289f7afa06 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Remove dead codePaolo Angelelli2018-04-182-25/+0
| | | | | | | | | | | | | | Removing a method introduced in 5.9 and apparently never used. Change-Id: Ia1b8bf47630ca84ec2debb12e2e475efc6773ad9 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Add accessor for screenOutline in QGeoMapItemGeometryPaolo Angelelli2018-04-181-0/+4
| | | | | | | | | | Change-Id: I4e48d8e8b5c75bec620e7bdab3666a2f5c4e357e Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Increase expansion factor for expanded visible region to 1.2Paolo Angelelli2018-04-181-1/+1
| | | | | | | | | | | | | | | | This to adjust for potentially large item borders, whose extent is not considered when clipping the item itself. Change-Id: I9ec11fbc8ce48870608378e7618721899bc0b4dc Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Register QGeoPolygon in QMLPaolo Angelelli2018-04-181-0/+2
| | | | | | | | | | Change-Id: I67aeb266ee17304de7aad7a0106901079fab5de5 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Fix MapRectangle: Expression depends on non-NOTIFYable propertiesPaolo Angelelli2018-04-181-1/+1
| | | | | | | | | | | | | | | | Add the missing CONSTANT to the border property. Change-Id: Id70335511716e798247c0dfcb6dd4653e99af2c2 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * QGeoManeuver: Fix QVariantMap includeFriedemann Kleint2018-04-181-1/+1
|/ | | | | | | | | | Prepend module name, which is required for generating Qt for Python bindinds. Task-number: PYSIDE-487 Change-Id: I84614bae08efa74393c4048bc16196eb730f0e6b Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Merge remote-tracking branch 'origin/wip/navigation' into 5.11Paolo Angelelli2018-04-1776-99/+4801
|\ | | | | | | | | | | | | | | | | Conflicts: src/location/declarativemaps/qgeomapobject.cpp src/location/declarativemaps/qgeomapobject_p_p.h src/plugins/geoservices/itemsoverlay/qgeomapitemsoverlay.h Change-Id: Iab847e16011b2095d307e2a3610bf9157ae7b92d
| * 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
| * | 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
* | | | Fix MapItemView not setting context data upon item deletionPaolo Angelelli2018-04-179-502/+280
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current implementation does not properly re-set context data upon model item deletion/change. This patch uses a QQmlDelegateModel that does all the management internally. To accommodate for items disappearing/reappearing all at once, potentially introducing flickering, a fixed opacity transition 300msec long has been introduced as exit transition. In later Qt releases, new API can be added to let the user change it, as well as also adding an enter transition and possibly more. Task-number: QTBUG-62086 Task-number: QTBUG-65833 Change-Id: I59a8147a12f035d5c7f86c2546e9144b2e1a7b3c Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | | Fix coding style in QDeclarativeGeoMapItemViewPaolo Angelelli2018-04-173-59/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace trailing underscore with leading m_ Change-Id: I9c22beefa1819a33ff49dc26f4601af04eecaf58 Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | | Fix crash when calling Map.clearData at application startupPaolo Angelelli2018-04-171-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-67759 Change-Id: Ie14291ed099aef520ca158c7d146c46ad49625d7 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | | API Fix: remove QGeoCoordinate <-> QGeoCoordinateObjectPaolo Angelelli2018-04-173-60/+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>
View Lorry Controller Status