summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add changes file for 5.7.1v5.7.15.7.1Jani Heikkinen2016-10-311-0/+45
| | | | | | Change-Id: I5eb41501cd090e43fc454224ee75a487c33fcc25 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Merge remote-tracking branch 'origin/5.6' into 5.7.1Liang Qi2016-10-1213-326/+1903
|\ | | | | | | | | | | | | Conflicts: src/location/maps/maps.pri Change-Id: I08158c8ba03d9345097cc4017556971ba3ec0dc6
| * Return only one route from osm pluginPaolo Angelelli2016-10-101-1/+1
| | | | | | | | | | | | | | | | | | | | Until we figure out a way to deliver also the id of the route from the RouteModel, it's better to return only the first route or otherwise it's hard, in the mapItemView to either create only one delegate or treat delegates after the first differently Change-Id: Ibaa92ce93349619a31c105546ee9c3ff760c5b0b Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Add OSRMv5 support in osm pluginPaolo Angelelli2016-10-0613-325/+1902
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds support for the OSRMv5 protocol (the only one currently available on the OSRM demo server router.project.osrm.org). Support for the old v4 protocol is retained, in case of users who supply their own osm.routing.host parameter pointing at a self hosted OSRMv4 server. The support for OSRMv4 and v5 has been moved away from the osm plugin and into the location module because this should be used in the mapbox plugin in a subsequent patch (the routing support in the mapbox plugin currently uses the text direction coming from the server, which does not support i18n) Task-number: QTBUG-56119 Change-Id: Id30fd536c7fd434011795f643221f55becfc9e18 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-10-013-16/+20
|\ \ | |/ | | | | Change-Id: I0880e4aa40fbf9fe0bb639f7fd77a52044e91a6e
| * Fix error status for QGeoPositionInfoSourceAndroidVyacheslav Koscheev2016-09-302-15/+19
| | | | | | | | | | | | Task-number: QTBUG-54844 Change-Id: I8abdbb47c883099e7749c57e5010be1aa999e373 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Update here plugin routing base addressPaolo Angelelli2016-09-221-1/+1
| | | | | | | | | | | | | | | | | | This patch updates the routing base address from the old @nokia.com address to the current @here.com one Change-Id: Ibd8cb1671776cfad57484328d1e636a7ac190ebe Task-number: QTBUG-56099 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Fix for Map polygon not working on zoomPaolo Angelelli2016-09-191-6/+6
| | | | | | | | | | | | | | | | | | | | This patch fixes a bug in the calculation of the geoleftbound of map polylines/polygons Task-number: QTBUG-55535 Change-Id: I11c2d2cecfdb183944d2f2766180938efa3deef6 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | Fix for polylines and polygon rendering wrong at the edge of the mapPaolo Angelelli2016-09-192-0/+11
| | | | | | | | | | | | | | | | | | | | This patch fixes a bug in rendering (re)created polylines/polygons right at the edge of a map, due to not setting preserve geometry to true on geometry modifying methods (addCoordinate/setPath/etc) Task-number: QTBUG-55964 Change-Id: I94bc86e8c908bc0ab4a949d96094988ed7ea26a7 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-09-175-27/+4209
|\ \ | |/ | | | | Change-Id: Ie8986d40efc5a241cb94ba743e343cbb35f66611
| * Merge remote-tracking branch 'origin/5.6.2' into 5.6Liang Qi2016-09-161-0/+55
| |\ | | | | | | | | | Change-Id: Idb1702345cd3a51edae3846883cab8ea1eaebd68
| | * Add changes file for 5.6.2v5.6.25.6.2Paolo Angelelli2016-09-121-0/+55
| | | | | | | | | | | | | | | Change-Id: I73c236a4de87801995890cf66b9d934f0f46ec15 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
| * | BC data files for QtLocation for Qt 5.6Milla Pohjanheimo2016-09-141-0/+4118
| |/ | | | | | | | | | | | | Added binary compatibility data files for tst_bic test Change-Id: Ia6b466a9d521178abde67720c73a841fbe9a5670 Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
| * Fix for multiple city tags mapping to the same fieldPaolo Angelelli2016-08-291-26/+31
| | | | | | | | | | | | | | | | | | This patch adds support for both "city" and "town" as Json document candidates for QGeoAddress::city Task-number: QTBUG-55371 Change-Id: I468207d81d61b16ea06034ea143bd3fd34df09b1 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Fix for broken geocoding in mapviewer with OSM pluginPaolo Angelelli2016-08-262-1/+5
| | | | | | | | | | | | | | | | | | OSM Nominatim blocks user agents for default libraries. This patch adds a specific user agent to the mapviewer example if one isn't provided by the user Change-Id: I9bc598eec6f53b0990c7cd0fb42cf3ef7807bedb Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | BC data files added for QtLocation (5.7)Milla Pohjanheimo2016-09-151-0/+4400
| | | | | | | | | | | | | | | | Added the generated data files for the binary compatibility tests for QtLocation for Qt 5.7. Change-Id: I254403dcbce854602afd8b4c163bdcd20c47f6b5 Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
* | Fix for wrong map center at startup in mapviewer examplePaolo Angelelli2016-09-053-4/+6
| | | | | | | | | | | | | | | | | | | | This patches fixes an incorrect behavior (that is also a regression) introduced as a side effect of the no gray bands patch in the map viewer example Task-number: QTBUG-55085 Change-Id: I2078ba72e1d1588357bb2002d0c8e38b2f59253c Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Doc: Remove references to Windows CEVenugopal Shivashankar2016-08-181-3/+0
| | | | | | | | | | | | | | | | The platform is not supported since Qt 5.7 Task-number: QTBUG-55331 Change-Id: Iba1146abaa8b17537453c367aed2a7c58e0aacda Reviewed-by: Martin Smith <martin.smith@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-164-4/+10
|\ \ | |/ | | | | Change-Id: I1903c3a181663c424f0ff13abcc9fb7a5bdb784e
| * Doc: Change instances of 'OS X' to 'macOS'Topi Reinio2016-08-151-1/+1
| | | | | | | | | | | | | | | | | | | | As of version 10.12 (Sierra), the name of Apple's desktop operating system will be macOS. Change all occurrences where the platform is discussed to use the macro \macos (defined in the documentation configuration in qtbase). Change-Id: Iea1581dc1929e53d710a2fc5eedbdf560a2d225f Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * Fix for wrong std::copy in QGeoTileProviderOsm::TileProviderPaolo Angelelli2016-08-101-1/+1
| | | | | | | | | | | | | | | | This patch fixes a bug that shows up at least on osX and iOS devices caused by an incorrect offset used in std::copy Change-Id: I09f106ddf63983365d4462e2f18a10ce44f1200a Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
| * Fix for invisible copyright notice with Holo theme on androidPaolo Angelelli2016-08-051-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The copyright notice is currently rendered using the default application palette. This patch forces the text and link colors to black and blue, since the notice is always shown on top of the map and other colors may not work. Task-number: QTBUG-54964 Change-Id: Icc8832124cd64d5326e0aa7540e3287c4325d31d Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io> Reviewed-by: Johan Helsing <johan.helsing@qt.io> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| * Fix accessing a MapPolyline delegate before it is handed over to MapPaolo Angelelli2016-08-041-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | QDeclarativePolylineMapItem::path() currently retrieves a QQmlContext with contextForObject(parent). This can return a null context if the parent is null. This patch changes the parameter to the this pointer, returning the context for the object itself. Task-number: QTBUG-55081 Change-Id: I48d6abd8be1b3d9505e37338da2b64812375374c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-0110-12/+103
|\ \ | |/ | | | | Change-Id: I4f29307985225a723304783e00a6844a1b9ee825
| * Enable dynamic addition/removal of map types by the mapping managerPaolo Angelelli2016-07-2910-12/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Map types are currently fixed in the constructor, regardless of whether they were available, or, now, whether they are enabled or not. This patch makes the geomappingmanager notify (e.g., emit a signal) when the available map types change at runtime. This is used in the OSM mappingmanagerengine, which can now disable map types if provider records turn out to be invalid or disabled after they have been fetched. Change-Id: I8e0e75504c882609f91c6d1ceb88424eee656f26 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Michal Klocek2016-07-2846-326/+1667
|\ \ | |/ | | | | Change-Id: I37542960aa091ab2074914a2cebb8c5114237a26
| * Add minimal map qml exampleMichal Klocek2016-07-289-23/+235
| | | | | | | | | | | | | | | | | | | | QtLocation was missnig basic example to show maps, the one you can simply jump in and start hacking. Change-Id: I0aec90ae25aa703d84f7e52e4dd523931819e79c Reviewed-by: Paolo Angelelli <paolo.angelelli@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * Fix the fitViewportToGeoShape calculationMichal Klocek2016-07-285-102/+217
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current implementation is calculating the bounding box of a geocircle based on moving along a circle of latitude by the distance of a circle's radius. Unfortunately the distances on a small circle of a sphere are greater than great circle distances. Reimplement the calculation using tangential points between a geocircle and meridians. Do not center the viewport in the center of the geoshape, use the center of the bounding box instead. Simplify zoom level adjustment calculations, use the reference world plane to get rid of longitude wrapping and rounding erros. Finally update a viewport unit test, adjust the minimum map size to 256x256, so fitToViewport calls have chance to succeed. Fix out of order test execution. Task-number: QTBUG-54337 Change-Id: I61726a4eb7183470c493ceb03d101f3a75305121 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Add indirection for osm providersPaolo Angelelli2016-07-2715-109/+897
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To prevent furter breakage of qtlocation osm provider in existing qt versions, this patch introduces one level of indirection in resolving OSM providers, fetching the tile server address from files hosted at http://maps-redirect.qt.io/osm/5.6/ The content of the files requested for the server address resolution must be in JSON format, containing (currently) the following fields: { "Enabled" : bool, (optional) "UrlTemplate" : "<url template>", (mandatory) "ImageFormat" : "<image format>", (mandatory) "MapCopyRight" : "<copyright>", (mandatory) "DataCopyRight" : "<copyright>", (mandatory) "MinimumZoomLevel" : <minimumZoomLevel>, (optional) "MaximumZoomLevel" : <maximumZoomLevel>, (optional) } Enabled is optional, and allows us to temporarily disable tile providers if they go offline without firing requests to them. Default is true. MinimumZoomLevel and MaximumZoomLevel are also optional, and allow us to prevent tile requests to the providers, if they do not support the specific ZL. Default is 0 and 19, respectively. <server address template> is required, and is the tile url template, with %x, %y and %z as placeholders for the actual parameters. Example: http://localhost:8080/maps/%z/%x/%y.png <image format> is required, and is the format of the tile. Example: "png" or "jpg" <MapCopyRight> is required and is the string that will be displayed in the "Map (c)" part of the on-screen copyright notice. example: "<a href='http://www.mapquest.com/'>MapQuest</a>" <DataCopyRight> is required and is the string that will be displayed in the "Data (c)" part of the on-screen copyright notice. example: "a href= 'http://www.openstreetmap.org/copyright'>OpenStreetMap</a> contributors" The patch also adds four additional OSM plugin parameters, modifies an existing ones, and removes another existing one. Removed: - osm.mapping.copyright, now removed and replaced by two other parameters (see below). New: - osm.mapping.providersrepository.address, allowing to change the hardcoded http://maps-redirect.qt.io/osm/5.6/ The implication of this parameter is that it becomes possible to use file:// urls or even qrc:, allowing to ship custom providers with the applicarions - osm.mapping.providersrepository.disabled, allowing to disable the indirection and go with hardcoded URLs by default. - osm.mapping.custom.mapcopyright replaces the old osm.mapping.copyright, and contains the copyright notice to be displayed next to the "Map (c)" part of the copyright, to be consistent with the way the copyright notice coming from the provider data is handled - osm.mapping.custom.datacopyright replaces the old osm.mapping.copyright, and contains the copyright notice to be displayed next to the "Data (c)" part of the copyright, to be consistent with the way the copyright notice coming from the provider data is handled Modified: - osm.mapping.host now became osm.mapping.custom.host, improving the naming consistency. Task-number: QTBUG-54599 Change-Id: Iee88883572a198c00bcf54cf2bc33fbcc0498a68 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * Fix for qgeocirclemapitem generation with invalid radiusPaolo Angelelli2016-07-261-1/+1
| | | | | | | | | | | | | | | | | | this patch adds a validity check on radius_ before proceeding to updatePolish() Task-number: QTBUG-19929 Change-Id: I4a1d79761b77ed27846be249c685ad94dc47a028 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * Make sure JNI_OnLoad is not called more than onceBogDan Vatra2016-07-201-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | Since Android 5.0 Google introduce a nasty bug[1] which calls JNI_OnLoad more than once. Basically every time when a library is loaded JNI_OnLoad is called if found, but it calls *again* JNI_OnLoad of its .so dependencies! [1] Workaround https://code.google.com/p/android/issues/detail?id=215069 Change-Id: I0401553f80c10b14b837a96dc979d0e7341396ea Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| * Fix potential memory leak in QGeoTiledMappingManagerEnginePaolo Angelelli2016-07-181-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | Currently setTileFetcher and setTileCache behave in two different ways, while the former relies on having the parent set properly for the destruction, the latter is deleted on destruction With this patch handles both pointers are handled in the same way: they are parented in the setter, and the destruction is left to the qobject destructor. Change-Id: Iaf11a12cd95088fd2268817b39fb9d58311b1812 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * A fix for not working setVisibleRegionMichal Klocek2016-06-243-3/+39
| | | | | | | | | | | | | | | | | | | | | | Setting the visibleRegion, than changing the map center or zoom and than setting it again does not work. Fix the issue by invalidating the region on the zoom or center change. Task-number: QTBUG-54141 Change-Id: I4e680f146312e3a3aa90e27fae213042cc2b2a42 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * Delay removal/readd of map items until incubation completion on resetPaolo Angelelli2016-06-247-81/+259
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the model is reset, QDeclarativeGeoMapItemView currently removes all map items and then begins recreating new delegates for model items. This causes flickering since the mapitems are removed at once, but the repopulation is asynchronous and allows the scene graph to repaint in the meanwhile. This patch delays the removal of current map items until all the new items have been all incubated, so that removal and readd happen at the same point. The patch also adds additional checks to methods like itemModelRowsRemoved, to verify if an item is still incubating. Task-number: QTBUG-52301 Task-number: QTBUG-54188 Change-Id: I2f27114c3898bd61b1282b1f27b5f062bed1fe35 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * Android: Reduce the minimum update interval to 50msAlex Blasche2016-06-243-4/+4
| | | | | | | | | | | | | | | | | | The previous 1000ms were to high for satellite and position updates. Task-number: QTBUG-54026 Change-Id: I35f6452cfb714a8d69d55dd126067de8d2c3b30c Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * Expand license scope from "Qt GUI Toolkit" to "Qt Toolkit"Sze Howe Koh2016-06-184-4/+4
| | | | | | | | | | | | | | See http://comments.gmane.org/gmane.comp.lib.qt.devel/25771 Change-Id: I706e291a1f928a04368894e679971d95d4868f2f Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | This module doesn't need an Activity to work, a Context object is enoughBogDan Vatra2016-07-261-3/+2
| | | | | | | | | | | | Task-number: QTBUG-54506 Change-Id: Ic1fd0d3bc63e9fcdf24a29b26a3be3746bbf45ab Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Remove obsolete WinCE doc from QGeoPositionInfoSourceAlex Blasche2016-07-191-3/+0
| | | | | | | | | | Change-Id: Ie5c08b9a4bf9a4adc7c02ff81eb94b547c305dba Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Doc: corrected link issues to coordinate qml typeNico Vertriest2016-06-292-5/+5
| | | | | | | | | | Change-Id: Ifa6fba19f79385d4806fad5ac58b36bada6e3df2 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* | Fix for wandering QGeoMapPolylineGeometryPaolo Angelelli2016-06-288-67/+186
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QGeoMapPolylineGeometry is currently erratic due to the semi-randomly varying geoLeftBound, that basically defines how the line will be drawn. This patch uses a consistent way to calculate this value in all the QDeclarativeGeo-items, at coordinate-definition time. The new approach implies that each pair of points in a polyline are connected in the longitudinal direction of the shortest path. The patch attempts to optimize the common addCoordinate path by incrementally searching for the left bound. The patch also makes the other geoshapes (GeoPolygon, GeoCircle) behave in the same way. Task-number: QTBUG-43107 Task-number: QTBUG-52610 Change-Id: I7a0f6c4370fd6c50999fd2e5b1a7aa5954c8a8fc Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
* | Remove support for MSVC < 2010Thiago Macieira2016-06-211-1/+1
| | | | | | | | | | | | | | We don't support MSVC < 2013 in Qt 5.7 anyway. Change-Id: Ib57b52598e2f452985e9fffd1459e5d17283a6b3 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* | Merge remote-tracking branch 'origin/5.7.0' into 5.7Liang Qi2016-06-161-2/+18
|\ \ | | | | | | | | | Change-Id: I7ebeeddd648006a73eae81c734519e098cd1b91c
| * | Mention license change in 5.7.0 changelog.v5.7.05.7.0Kai Koehne2016-06-081-2/+18
| | | | | | | | | | | | | | | | | | | | | Change-Id: Ife380abb5256a1f93329f3e94b8dd55b007d37b0 Task-number: QTBUG-53913 Reviewed-by: Sami Makkonen <sami.makkonen@qt.io> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | | Fix for crash on tessellation of self-intersectiong GeoPolygonsPaolo Angelelli2016-06-1513-22/+5565
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QtLocation makes use of a 3rd party library for polygon tessellation, poly2tri. This library is known to be weak in handling complex input, like, for example, polygons with self intersecting edges. Sanitizing the input data through clipper solves the problem, and it has already been implemented in the clip2tri library, which this patch includes and uses. Task-number: QTBUG-52076 Change-Id: I071a58e202345bc71da583995f7245361f00e8c4 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-06-105-10/+66
|\ \ \ | | |/ | |/| | | | Change-Id: I36abd2a91a470360c87f23a6d8084f908d93e7e0
| * | Merge remote-tracking branch 'origin/5.6.1' into 5.6Liang Qi2016-06-091-0/+38
| |\ \ | | | | | | | | | | | | Change-Id: If8b85643cdf6957afde44e8eeee8f5ad06083928
| | * | Add change log for Qt 5.6.1 releasev5.6.1-1v5.6.15.6.1Alex Blasche2016-05-201-0/+38
| | | | | | | | | | | | | | | | | | | | Change-Id: I44b002342d6e147b43885151d88cb2e9e59af8e3 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
| * | | fix for losing map item focus while dragging themPaolo Angelelli2016-06-022-7/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QDeclarativeGeoMapItemBase::childMouseEventFilter currently does a contain() check on the clicks but also on the mouse move events. by not doing it on mouse move events the problem seems fixed, but the autotests get broken because it seems that the map doesn't get panned anymore but the element gets dragged instead. Task-number: QTBUG-52075 Change-Id: I5ce340ca591ec924eebed1fe7acda18d31301fc5 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * | | Polish and update map elements on window resizePaolo Angelelli2016-05-312-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the a map element gets resized, the center stays the same, meaning that map estate gets added (or removed) on each side of the element in equal amount. This means that the old screen coordinates of a map element change, and therefore it must be repolished and updated. Task-number: QTBUG-53128 Change-Id: Id26b111e8e33075082fa599e6eac92cb8089f5e4 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * | | Include childItems among the elements to check in populateMap()Paolo Angelelli2016-05-311-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QDeclarativeGeoMap::populateMap() currently considers only the children() of the map when populating the map. QQuickItems like the Repeater do not add the generated objects among the QObject children, but only to the QQuickItem childItems. Therefore populateMap() should consider both lists together. Task-number: QTBUG-52514 Change-Id: Ic919bc91c70242d6f5c4e67a63ff01482abed0ca Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
View Lorry Controller Status