summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* 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.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>
| | * | | Add changes file for Qt 5.10.1Antti Kokko2018-02-051-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I73ae8b057b819b822cf3a5e19ce4b62f8dd85f67 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | | | | Fix crash calling Map.clearMapItems before Map is initializedPaolo Angelelli2018-02-191-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-66315 Change-Id: I18af392a00303b3b4c515c8f557e9c3fa09657eb Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | | | Properly namespace labs plugin configure featurePaolo Angelelli2018-02-192-4/+4
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also changes underscore with dashes, so that only dashes have to be used in enabling a feature in a configure line. Change-Id: I83d3412382ed2530dcd574a1c4b7bff9f20cfd6a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | | Merge remote-tracking branch 'origin/5.10' into 5.11Liang Qi2018-02-1929-250/+599
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/location/declarativemaps/qdeclarativegeomap.cpp src/location/maps/qgeomap.cpp src/location/maps/qgeomap_p_p.h src/location/maps/qgeorouteparserosrmv5.cpp src/location/maps/qgeotiledmap.cpp src/positioning/positioning.pro Change-Id: I42f8b176a8f3e824c7fe5b067a958735173f0dbb
| * | | | Remove forcing the qtquickcompiler on the mapviewer example5.10Paolo Angelelli2018-02-021-1/+0
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Or else it prevents QML debugging. Task-number: QTBUG-64827 Change-Id: I7a31b6a575ed7a4f96368b87aaa883fd3ba2b940 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| * | | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2018-01-2628-249/+599
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/qgeotiledmap/tst_qgeotiledmap.cpp tests/plugins/declarativetestplugin/testhelper.h Change-Id: Ie218ab1dc68642a6922e05e5688c20b90440b72e
| | * | Clarify operation of QDeclarativeGeoMapItemBase::childMouseEventFilterPaolo Angelelli2018-01-251-3/+8
| | | | | | | | | | | | | | | | | | | | Change-Id: I06353153980659bf9370705b2d7f4263d066bdad Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| | * | Merge remote-tracking branch 'origin/5.9.4' into 5.9Liang Qi2018-01-181-0/+31
| | |\ \ | | | | | | | | | | | | | | | Change-Id: I8b6caa31bf605220ed024c784fa361d0e77dce06
| | | * | Add changes file for Qt 5.9.4v5.9.4Antti Kokko2018-01-111-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If621d6bbfcf4380d8155da0453b97be2e535760e Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| | * | | Fix copyright notice performance when adding/removing itemsPaolo Angelelli2018-01-164-70/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change avoids rescanning the list of map items every time an item is added or removed, to recompute the Z value at which the copyright notice should go. Task-number: QTBUG-64880 Change-Id: Ieea77669f0140e43085a76dfd9dfdee40a335f5a Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| | * | | Fix performance issue with copyright noticePaolo Angelelli2018-01-159-43/+141
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Skip evaluating copyrights when the notice is not visible. The implication of this patch is that copyright information won't be up to date or even available unless there is an "attached" copyright notice that has the visible property set to true. Task-number: QTBUG-64880 Change-Id: I3750b61913becb0cbf31273ad9a76ae1a2b6a393 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| | * | | Fix GeocodeModel getting stuck in Loading statusPaolo Angelelli2018-01-121-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Caused by a signal emitted before nulling a member Task-number: QTBUG-65498 Change-Id: Iad7ab8b2c6cfc290953191eab71ca9aa645ff499 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| | * | | Fix fitViewportToMapItems in presence of MapQuickItems with zoomLevelPaolo Angelelli2018-01-112-22/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Map.fitViewportToMapItems currently uses the screen geometries of the items to calculate the new values for zoom level and center. When the zoomLevel property is set on MapQuickItems, their on-screen geometry is affected by a hidden transformation within the item. This patch considers that transformation in the calculations. Task-number: QTBUG-63093 Change-Id: I328028f1901b31225866aa3d749849815d59a2a1 Reviewed-by: Vlad Seryakov <vseryakov@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| | * | | Fix documented property types for Map propertiesPaolo Angelelli2018-01-101-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-65564 Change-Id: I9c52d0bdbbdd2eb0e41ff21741423aa7e22f3e28 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| | * | | Fix NmeaPositionInfoSource not combining sentences - simulation modePaolo Angelelli2018-01-108-83/+320
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch is the first half of a fix to prevent NmeaPositionInfoSource to push an update per sentence instead of combining all sentences with the same timestamp into one QGeoPositionInfo. This patch fixes only the source in simulation mode. Additional work is needed for standard mode. Task-number: QTBUG-64699 Change-Id: I39d9905331c5a1f646b7465f4d7d155834bec815 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| | * | | Use custom namespace in QtLocation's earcutBruno de Oliveira Abinader2018-01-093-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The custom namespace avoids clashes with mapbox-gl-native's own earcut.hpp dependency. Task-number: QTBUG-65262 Change-Id: Ic5121e88dca45c01af7ce26e38a99a0cd2d1c88e Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| | * | | Increase lat/lon precision in OSRMv5::requestUrlPaolo Angelelli2018-01-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1ca0565640c639419796cf32d8cefea99bd21a88 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| | * | | Document that WinRT plugin can be used for Win32 env (if platform is Win10)Alex Blasche2018-01-091-1/+3
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-65325 Change-Id: I46bbca4d90ef9d96be91ffbb2346f8f4e6da8855 Reviewed-by: Mika Salmela <mika.salmela@qt.io> Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
| | * | Apple platforms: properly guard API access when requesting location infoJake Petroules2018-01-022-14/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | requestAlwaysAuthorization and requestWhenInUseAuthorization are prohibited APIs on macOS, and the former is also prohibited API on tvOS. This means they are akin to private APIs and must not be called under any circumstances. The respondsToSelector calls are also removed as Qt no longer supports OS versions where thee methods are not available, and in any case such uses should be replaced with __builtin_available. Background location updates are also now made available on watchOS 4 and above. Change-Id: I817d69f4ec71b96f03dda42635d675499e8908c0 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
| | * | Fix license headersJani Heikkinen2017-12-192-28/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Old header.LGPL21 header was used at some files. Replase those with new header.LGPL one Task-number: QTBUG-57147 Change-Id: Ib35bd7aa0fd5c5334e35097257ba64ece45bcd5a Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | | | Fix positioning projectPaolo Angelelli2018-02-192-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove a non-existing header, and add the we mean it disclaimer on a private header missing it. Change-Id: I47847f0cf86693298fc1e778979ecfa3d1f9cc34 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | | Merge remote-tracking branch 'origin/wip/navigation' into 5.11Paolo Angelelli2018-02-1421-27/+1038
|\ \ \ \ | | |_|/ | |/| | | | | | Change-Id: I1fd99fb629e18cc9dba5eae0f1373a01560e272a
| * | | Add override to MapPolygonNode/MapPolylineNode::isSubtreeBlockedPaolo Angelelli2018-02-142-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I30ffbe559af8cf911a3525b578a875b5dab69c51 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
| * | | Add begin/end namespace to qmapobjectview_p/_p_p.hPaolo Angelelli2018-02-132-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fix the include guards Change-Id: I5ae5125d64fd059b9ab62e7671972c1e00758bba Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| * | | Change m_map into a QPointerPaolo Angelelli2018-02-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Or else it may become a dangling pointer when Plugin {} gets destroyed before Map {} Change-Id: I30d4e1887502d0288d56a4208b338b59116009e6 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| * | | Use qAsConst to iterate m_mapParametersPaolo Angelelli2018-02-121-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I7fb4e263d49b12adf260c71ca99ed8476125b3a6 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| * | | Make QGeoMap::createMapObjectImplementation virtualPaolo Angelelli2018-02-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Needed, for example, to emit an sgNodeChanged or similar upon addition of a new map object, *after* the pimpl has been properly injected. Change-Id: I1442e54aad94c465b0b7b17f1ed92f4900ca1d29 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| * | | Update location qmltypesBogDan Vatra2018-02-121-3/+45
| | | | | | | | | | | | | | | | | | | | Change-Id: I376c28b3bcc1116c87481020a0ee2aaa0476f950 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * | | Add qmltypes for locationlabsBogDan Vatra2018-02-121-0/+77
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-66263 Change-Id: I62d9c99ce80c8968057ee0488dac413c312c1b20 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * | | Initialize navigationManager and navigationErrorBogDan Vatra2018-02-082-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | delete navigationManager when is not needed anymore Change-Id: I2bff91ef13369a32e86fba375f7f158b95cf520d Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * | | Fix double deletion in QMapRouteObject::setMapPaolo Angelelli2018-02-081-2/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I615cc136fc8542f731bc305028aff6dd15fa2c6c Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * | | Preemptively release pendingMapObjects upon Map destructionPaolo Angelelli2018-02-081-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In this way QGeoMap::mapObjects doesn't have to return all map objects, as the user added ones should be covered by m_pendingMapObjects. Change-Id: I5c850f2fb820629e0c4dd941d13f04cb3684b898 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| * | | Introduce MapObjectViewPaolo Angelelli2018-02-084-2/+546
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also adds addMapObject/removeMapObject to MapObjectView With this patch, MapObjectView becomes the intended way to programmatically populate a map with map objects. Objects can still be declared inside a Map{} element, but to programmatically add them it is necessary to add them to a MapObjectView that is added to the map. MapObjectView has then 3 ways to populate the map: via nested map objects, via a model, and via programmatically added map objects. All these 3 ways can be used simultaneously. Change-Id: Ic7712355fa5e5787a0b83d9547693e288cba1960 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| * | | Introduce MapRouteObjectPaolo Angelelli2018-02-074-4/+334
| | | | | | | | | | | | | | | | | | | | Change-Id: I3680550ae22ef4b143f2e545f672905737a41df2 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| * | | Set QGeoMapObjectPrivate::m_visible to true by defaultPaolo Angelelli2018-02-071-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I64ff6c1da227ff4da75944612badc646c5cba3c4 Reviewed-by: BogDan Vatra <bogdan@kdab.com>