summaryrefslogtreecommitdiff
path: root/src/imports
Commit message (Collapse)AuthorAgeFilesLines
* Fix PositionSource never turning active on androidPaolo Angelelli2017-08-301-9/+8
| | | | | | | | | It seems that if m_positionSource gets created too late, PositionSource never becomes active so it never starts pushing position updates. Task-number: QTBUG-62778 Change-Id: I7b375e9f9f1fbe546dfc27fa6bf0c431df393e65 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Update QtPositioning qmltypes definitionPaolo Angelelli2017-06-091-3/+27
| | | | | Change-Id: Ic45f7c8aa819d373e96cf60082fcda95a63f79b8 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Fix for non-existing QtPositioning 5.9Paolo Angelelli2017-06-081-4/+4
| | | | | | Change-Id: I5190564ef3e4a25f1e387c8918ec269a0a52bbea Task-number: QTBUG-61266 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Update QtLocation qmltypes definitionAlex Blasche2017-06-061-3/+163
| | | | | Change-Id: I675167f90579f9999d3e1d3cba42951bd5b7ea3b Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Add mean to create qgeopath in locationsingletonPaolo Angelelli2017-06-052-0/+44
| | | | | | | | | As currently there is no way to create a pre-filled qgeopath, this patch adds an overload to QtPositioning.geopath() to pass parameters to the constructor. Change-Id: I05af4dbef07bd62e9e2eace7105b5255e8a392fa Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Make error_messages.h privatePaolo Angelelli2017-05-021-1/+0
| | | | | Change-Id: Iba33d12fad113b64cb071f0542a2c92034ff755d Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* Doc: correct link issueNico Vertriest2017-04-261-2/+2
| | | | | | | positioning.cpp: cannot link to 'geoshape.contains' Change-Id: I610dfe90432a224b2e20825c68d24c795774ae09 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* Fix includeStephan Binner2017-04-201-1/+1
| | | | | Change-Id: Ie7885751121944544465d7efbf38c6744f9e30da Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Add geopath qml basic type documentationPaolo Angelelli2017-04-101-0/+32
| | | | | | | Change-Id: I4f0b09cb8aac0b4d4f2d27cf350a30b7ed800f11 Reviewed-by: Nico Vertriest <nico.vertriest@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Remove moc_* inclusions from source filesPaolo Angelelli2017-02-142-4/+0
| | | | | | Change-Id: I7385348d7b6ec22fa92ed1be65f89e262c38b5c0 Reviewed-by: Michal Klocek <michal.klocek@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-02-024-11/+11
|\ | | | | | | Change-Id: I07a2f4160750b548dfee882cb9b5b057d83236e2
| * Update QtLocation and QtPositioning QML versions for 5.8 releasev5.8.0-rc1v5.8.05.8.0Alex Blasche2016-12-074-11/+11
| | | | | | | | | | | | Change-Id: I780c23ae48c548e799c853cd3a5ac1aa77586839 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | Allow to create maps with groups of map itemsPaolo Angelelli2017-01-311-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | This patch lets a user create an external qml file, and put multiple map items inside a parent MapItemGroup{}, and add that element to a Map item. QDeclarativeGeoMap gets also two associated methods: addMapItemGroup and removeMapItemGroup to deal with item groups at runtime. Additionally, clearMapItems now clears also added item groups. Task-number: QTBUG-55211 Change-Id: Ie4e602e4bda65fb56422b721be5fd34c54eb7954 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* | Expose QDeclarativeGeoMapCopyrightNotice in QMLPaolo Angelelli2017-01-301-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change allows the user to create a separate MapCopyrightsNotice, and source the notice from a Map element. The purpose is to allow the user to stack multiple Map elements and have a cleanly arranged set of copyright notices on top of this stack. To do so it is now possible to setCopyrightsVisible(false) on all the Map elements, then declare one notice per map, and arrange it appropriately on top of the stack. As for any other QQuickItem, a MapCopyrightsNotice cannot be declared inside a Map {} element, and if done so, a a warning will be produced. Change-Id: Ie38dec40cf25f0c44d1da39fd74469944eb79eba Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Moving location qml implementation to location/declarative*Paolo Angelelli2017-01-2683-23318/+31
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Use geoshapes as geo-model in qdeclarativegeomapitemsPaolo Angelelli2017-01-2612-338/+213
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch uses QGeoShapes as data model inside the QDeclarativeMapItemBase subclasses. Advantages: - avoids duplication of implementation for geo-related methods (now only inside QGeoShapes). - provides map items a bounding box, usable for area based item searching ,or simple viewport fitting - allows to follow the graphics-view pattern, and have the same items visualized in different Maps (not yet supported). Change-Id: I6eec738fef5d753d90bdeeb4b109be89155b25f8 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Make QDeclarativeGeoMap::setVisibleRegion support all QGeoShapesPaolo Angelelli2017-01-262-88/+18
| | | | | | | | | | | | | | | | | | | | This patch uses QGeoShape::boundingGeoRectangle to set the visible region, supporting the new QGeoShapes, simplifying the logic in ::fitViewportToGeoShape, and not requiring updates if new QGeoShapes are added. Change-Id: I4f4c21bc0b62aae9432024d8f20db774d191255b Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Change the Map items opacity ramp valuesPaolo Angelelli2017-01-261-3/+5
| | | | | | | | | | | | | | | | | | | | This patch changes the ramp values from being [2.0,3.0] to [1.5, 2.5]. These ranges are the ranges in which the opacity is linearly dimmed. Reducing this value allows items to be visible for half a zoom level more, easing debugging of items that have to be viewed at full map. Change-Id: I973e7bcac7ec6cfb545e9c68ffd8966b1203a9cf Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Add clipping for rotated/tilted Map ItemsPaolo Angelelli2017-01-2610-377/+527
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds proper rotation/tilting support to Map Items. To do so, clipping is now performed in wrapped mercator space instead of screen space. This prevents projection of geo coordinates that ended behind the camera, and that would be projected incorrectly by the projection transformation. This patch therefore does not use the screen clipping code any longer (clipPathToRect), since the geometry has already been clipped. The downside is that updateSourcePoints is now necessary for any viewport change. This would be necessary anyway in presence of tilt or rotation. NB: Handling of MapQuickItems with zoomLevel set is still TODO. Future work: 1) Optimize updateSourcePoints by pre-computing the mercator projection of the geometry, and let updateSourcePoints do only the wrapping/clipping/projection-to-screen operations. 2) Remove updateScreenPoints altogether Change-Id: Ie0d3dbef68d48ac97a596d40240d0ac126c0efaf Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Position map items on their geoLeftBoundPaolo Angelelli2017-01-263-25/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently map items are positioned based on their "first" coordinate. This was because the leftbound was updated at every point update. Now that the geo left bound is data-driven, it is possible to use it to position elements on map. So that polylines and polygons won't wrap around based on their first coordinate (wherever it is), but on their geoLeftBound. This means that two identical polygon with the coordinate list starting at different offset will wrap around in the same way. Same for polylines. And circles won't wrap around anymore on their topmost point, but based on their leftbound too. Change-Id: I04dd04633b878f85e605af8fa84c3cd477a76e32 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Add field of view support to QtLocation mappingPaolo Angelelli2017-01-262-0/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch introduces a new camera parameter, field of view, used in QGeoCameraCapabilities, QGeoCameraData and QDeclarativeGeoMap. This is necessary as now QtLocation supports map tilting, and different QGeoMap implementations support different ranges for the field of view of the camera. Through this API it becomes possible to query the supported range and current value, and to stack Map elements using different plugins while keeping a consistent camera projection across all of them. Change-Id: Ie061142bea090ec223d842efbe7924f924430496 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Add rotation and tilt controls to QDeclarativeGeoMapPaolo Angelelli2017-01-259-72/+197
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QDeclarativeGeoMap currently does not provide any mean to set bearing and tilt into qgeocameradata. It has been not a problem since QGeoTiledMap and sons did not support it. External renderers however support it, so this patch adds QML api calls to control these parameters, and adapt the existing logic to take them into consideration in camera-related calls, as well as in the afterViewportChange handlers of the Map Items. This patch also sligthly modifies the QML api to make the handling of all the bounded camera property more homogeneous. Minimum and maximum zoom levels prior plugin initialization aren't -1 anymore, but are some valid lower and upper bounds for this property, that is 0 and 30. in this way all the 2 bounded properties (zoomLevel and tilt) behave the same, in that they can be freely set before plugin initialization, within reasonable predefined bounds, and, after that, they may be clamped depending on the actual plugin capabilities. Autotests for the QML part of the API included. Change-Id: I9d09e32698a7330388e465e8ea7523ee39577d34 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Move the coordinate <-> item position conversion to QGeoProjectionPaolo Angelelli2017-01-169-47/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch simplifies the QGeoMap API removing all the API necessary to convert to and from screen. This is now demanded to a specific QGeoProjection class, that will be independent of the map, except for using the same Geo projection (currently only WebMercator, or EPSG:3857, although we use a sphere instead of an ellipsoid, i believe) The benefits are - This relieves subclasses of QGeoMap from implementing a GeoProjection API, especially since QtLocation currently supports only WebMercator, and reimplementations would have to anyway produce the same results as the inbuilt one. - This avoids the several indirection steps previously necessary to perform a map projection (qgeotiledmap -> private->mapscene-> private). Since these operation are quite frequent one per map item coordinate at every redraw, shortening the indirection chain is beneficial - It simplifies the highly complex QGeoTiledMapScene, separating all the logic that is not needed to draw the scene, but only to perform geo coordinate <-> screen coordinate conversion Change-Id: I9e3ca5280166f2d6430a32deb44c030d02d9d4e1 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Make zoomLevel refer to a default 256^2 tile sizePaolo Angelelli2017-01-161-8/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the zoomLevel is the power of 2 reflecting how many tiles are in a map edge. This means that two plugins with two different tileSize will show a map of different size at the same zoomLevel. With this patch the zoomLevel is "normalized" upon a tileSize of 256, regardless of the tile size in use. In this way, the new 256 based zoom level can be a consistent parameter also for plugins that are not tile based. CameraCapabilities therefore now offers two new methods, m[in,ax]imumZoomLevelAt256, that return the respective value for the normalized 256^2 tilesize. It also gets a setTileSize, which is currently not used as all our plugins use a tile size of 256 (which is the camera capabilities default tilesize value). Change-Id: Ib12092fd14faf7fc85f8be5fb799dbd5496b760b Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Rename QGeoProjection to QWebMercatorPaolo Angelelli2017-01-164-10/+10
| | | | | | | | | | | | | | | | | | | | QGeoProjection is currently a class containing only static methods for WebMercator conversion/interpolation. This patch renames it to QWebMercator, effectively freeing the QGeoProjection name for a real projection class Change-Id: I15b71d04f7d1d21a1d26f46687ed33aa277f6deb Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | QtLocation: Use the newly-introduced qmlWarning instead of qmlInfoRobin Burchell2017-01-1312-24/+24
| | | | | | | | | | | | | | | | qmlInfo will shortly be returning info-level messages (as the name hints), rather than warning level messages. Change-Id: I941f716c4fbe0566e1e5b0ecf673faa7283cde10 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Refactor QGeoMap API: split coordinate <-> itemPosition callsPaolo Angelelli2016-12-071-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch splits the two calls coordinateToItemPosition and itemPositionToCoordinate into 3 separate steps: - coordinate to map projection. Map projection has always to be in [0,1] [0,1] range. In case of QGeoTiledMap, the only map projection supported is WebMercator, thus this call is currently equivalent to coordinateToMercator. - wrap map projection. Due to the longitude-wrapping-around nature of QGeoMap/QDeclarativeGeoMap, coordinates which are greater than others might end up before the others on the X axis of the projection. This stage takes care of this aspect - finally wrapped map projection to item position. this maps a wrapped coordinate to screen. Equivalent calls to do the inverse conversion are also provided. The benefits of splitting the conversion in 3 are: - possibility to precompute the map projection of item coordinates, thus having to simply re-wrap them (2 ifs and one sum) upon camera change. - Possibility to bake the last step into a 4x4 matrix and offload this to GPU - support for rotation and tilting cameras. Without, it would be impossible to "unwrapBelowX" item coordinates in presence of rotation and tilt, while now it would be possible to do this before the final projection to screen that peforms the tilting/rotation. Change-Id: I9b6a06ff051bbfd09e6d3584485acdcebdceb7bd Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Merge remote-tracking branch 'gerrit/5.8' into devAlex Blasche2016-12-056-22/+23
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: src/imports/location/qdeclarativegeomap.cpp src/location/maps/maps.pri src/location/maps/qgeomap_p_p.h src/plugins/geoservices/nokia/qgeocodereply_nokia.cpp src/plugins/geoservices/osm/qgeoroutereplyosm.cpp Change-Id: I18d31cff9233648178fe3e2636ce294026dfaeb7
| * Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-281-0/+3
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp Change-Id: I44fd4bd47f97acd7ca5a0bdb235a701a59497528
| | * Merge remote-tracking branch 'origin/5.6' into 5.75.7Liang Qi2016-11-241-0/+3
| | |\ | | | | | | | | | | | | Change-Id: I49b1b3fc94819b5a7f2fd1ab2481a1d8ea41586b
| | | * Fix for QDeclarativeGeoMap::fitViewportToGeoShape and QGeoRectanglePaolo Angelelli2016-11-111-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current implementation fails to fit if the QGeoRectangle shape crosses the dateline. The problem does not happen with QGeoCircle. This patch fixes the problem. Change-Id: I043e9ff433f81a07f434112fe19449aec7ec94f6 Task-number: QTBUG-57027 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | | Renaming QGeoMapPrivate::changeMapSize to changeViewportSizePaolo Angelelli2016-11-226-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current name of this method generate confusion, as what it does is changing the size of the final element in the application, and not the actual map size. This patch renames this method to changeDisplaySize It also renames QGeoMap::setSize to setViewportSize, as well as ::size to viewportSize , width to viewportWidth and height to viewportHeight, to make everything consistent and self-explanatory. Finally it also renames minimumZoomAtMapSize to minimumZoomAtViewportSize. Change-Id: I7c1ca8bb3ca3d6f6b0fe6fc881b9300db7110527 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | | Remove unused local variable from qdeclarativepolylinemapitemPaolo Angelelli2016-11-151-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lastPoint is currently unused in QDeclarativePolylineMapItem::updateSourcePoints. This patch removes it. Change-Id: I03c2f188aa417d4dc199cf0f8abd0618c19232d1 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | | MapParameters for accessing specific features of custom QGeoMapsPaolo Angelelli2016-12-016-2/+344
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds a new MapParameter object to give users access to specific features of a custom QGeoMap otherwise not accessible through the standard API. A MapParameter is implemented by a QDeclarativeGeoMapParameter, which, in turns, inherits from QGeoMapParameter in the location module. In this way QGeoMap & subclasses won't depend on declarative, from this side, still allowing a QMapWidget someday. The implementation is based, on both sides, on the dynamic properties of QObjects for defining the MapProperty data. This allows high flexibility in defining various types of MapParameters (essentially by duck typing them), and therefore each plugin which makes use of them must document each of them. Change-Id: I5f3a8c18e996f290beb8e4ff37d3c2c655eefc6c Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | | Add support for QGeoPathPaolo Angelelli2016-12-013-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds an addition qgeoshapes, QGeoPath. This represents a geographical path where each consecutive geopoints are connected along the shortest line of constant bearing (rhumb line). The path has a width, in meters, that is used in the contains() method to decide whether a coordinate is or not on the path, based on shortest distance to the rhumb line segments. Change-Id: Ia02780e3c8ac6c6d63a6083f53ea0677f8a21a1d Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | | Checking for map presence before fitting to geoshapePaolo Angelelli2016-12-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With this patch, m_pendingFitViewport is set also if m_map is not yet set. Otherwise fitViewportToGeoShape() fails silently, but the flag doesn't get set, and when the map will finally be set, the fitting operation won't be performed Change-Id: Ibfb147d89510e6512fed2d711bb31b12b4a39657 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | | Removing m_serviceProvider from QDeclarativeGeoMapPaolo Angelelli2016-12-012-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | m_serviceProvider appears not to be used anymore. Removing it from the class members. Change-Id: I05de7dee5549b87efbf375fce4ed8a4830284164 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | | Use QLocationUtils::wrapLong thoughout the codePaolo Angelelli2016-11-302-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch remove if-else used to wrap longitude in the codebase, replacing with the existing utility method wrapLong Change-Id: I7a6eefa6f40b3dd0f47fec987c9197e294303873 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | | Refactoring: removing m_reply from GeoReply classesPaolo Angelelli2016-11-292-32/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch tries to simplify the code removing the contained m_reply from all the Geo[Map,Route,Geocode,Places]Reply classes. The need for m_reply was associated to the "abort" method, but this can be solved by emitting a signal in the superclass abort() method, and connecting that to QNetworkReply::abort() in the constructor. Since QNetworkReplyHttpImpl always sends an OperationCanceledError it should then be safe to call deleteLater() on the network reply in the slot connected to QNetworkReply::error This patch also prevents the series of "QCoreApplication::postEvent: Unexpected null receiver" warnings that are generated due to deletingLater already deleted objects (abort() emits an error, the reply is destroyed inside the onError slot, but also in the abort() method). Finally, this patch removes the setFinished() call in QGeoRouteReply::abort() since the documentation does not mention this, and all the subclasses do not perform this operation and emit the corresponding signal. tst_qgeoroutereply has been adapted accordingly. Change-Id: I226ee163e7bed784dd7f0da1522e651459543bca Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | | | Do not update geoLeftBound in Declarative Polygon updateSourcePointsPaolo Angelelli2016-11-151-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The left bound of map items is now precomputed when the data is set (setPath/addCoordinate/etc.). Updating the left bound of a polyline or polygon every time that the source points have to be updated (that is projected to screen) is therefore to be avoided. Change-Id: Id3e25477ea022943abcc32649885eaf89f2e0794 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | | Merge remote-tracking branch 'gerrit/5.8' into devAlex Blasche2016-11-034-10/+20
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I3598004c8d947f42c499137c7767cfcb91643082
| * | | Merge remote-tracking branch 'gerrit/5.7' into 5.8Alex Blasche2016-11-023-8/+18
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/declarative_ui/BLACKLIST Change-Id: I0f6c9228c899c4d1d55fffc596c661ee0f6c2b66
| | * | Merge remote-tracking branch 'gerrit/5.6' into 5.7Alex Blasche2016-11-021-2/+1
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/imports/location/qdeclarativegeomap.cpp src/location/maps/maps.pri Change-Id: I346d7351e98f4a1aa67c9c0401d41b6da9099f48
| | | * Compilation fixVyacheslav Koscheev2016-10-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | minimumZoomLevel() returns qreal, qreal can be float Task-number: QTBUG-56715 Change-Id: I7a5b5667b1c50518a216c401d97104b1909632df Reviewed-by: Michal Klocek <michal.klocek@qt.io> Reviewed-by: Ola Røer Thorsen <ola@silentwings.no>
| | * | 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>
| * | | Fix compilationMaurice Kalinowski2016-10-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6df6c10e1af827d06a387e7422176dd310cf83be in qtdeclarative changed enum values. Change-Id: I55ffa6a2e55a63aec455db533e9d7b08a44978bb Reviewed-by: Michal Klocek <michal.klocek@qt.io> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* | | | Fix for occasional gray bands appearing upon window resizingPaolo Angelelli2016-10-191-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QDeclarativeGeoMap::geometryChanged missed recomputing the latitudinal bounds for the map center upon resize. This may have resulted in center values too far north or far south for certain window sizes. Change-Id: Id306cdaf1c943655da5e40c18379f0b4f1c7b256 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | | | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-10-074-35/+17
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I611a0246be70787c541a24a136e332314c3ff3a7
| * | | Fix panActive state when last touch point is releasedFrederik Gladhorn2016-10-051-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a touch interaction ends, the map would only consider the number of points, not their state. Thus when pan was active, it would always stay active, because in the release event, the number of points is still at least one. This also requires a reset of the synthetic mouse point, since otherwise the mouse point will be copied into the list of touch points, preventing the number of points to ever go down to zero. Change-Id: I9821d09d75f883d01eb38b741e2b5658036be334 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
View Lorry Controller Status