summaryrefslogtreecommitdiff
path: root/src/plugins/geoservices/nokia
Commit message (Collapse)AuthorAgeFilesLines
* qtlocation: remove uses of the deprecated member-functionTimur Pocheptsov2020-01-159-13/+13
| | | | | | | | | Which is QNetworkReply::error(). Use QNetworkReply::networkError() instead. Task-number: QTBUG-80369 Change-Id: Id41166a72c0d14bc77d9ec853db2f665617195ee Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Unify semicolon usage in Q_UNUSEDJesus Fernandez2019-01-234-7/+7
| | | | | Change-Id: I36dd6881b6f6f028869d63b6311cba7f52a99cc4 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Port Nokia geo service plugin to QRegularExpressionSamuel Gaist2018-12-041-4/+6
| | | | | | | | | This patch updates the Nokia geo service plugin code to use QRegularExpression in place of QRegExp which is to be considered deprecated. Change-Id: Idc7459351c6f1a1b12ba1528c426fced324039a1 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Fix HERE route parsingv5.12.0-beta1Paolo Angelelli2018-09-243-229/+51
| | | | | | | | | | We were previously not requesting all relevant attributes, and deriving some required info by ourself, in the wrong way. So just request what's needed and use it. Task-number: QTBUG-70499 Change-Id: I6e0d4b28da1412a4c13460d25e16e383f0aca9a0 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Fix HERE qgeoroutexmlparser and add legs supportPaolo Angelelli2018-09-052-74/+297
| | | | | | | | | | All route segments after the second waypoint contain broken paths. This patch fixes it refactoring the parsing logic, also adding support for route legs. Change-Id: I30ec9e889a5e16bf81c4a0caf1b59fc895b7ea5e Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Enable incremental updates in PlaceSearchModelPaolo Angelelli2018-07-051-0/+10
| | | | | | | | | | | This way pages can be changed without resetting the model. To achieve this, new members into QPlaceSearchRequestPrivate are introduced, to keep the relationship between a request for one page, and the previous or the next page. In this way sparse population of the model becomes possible. Change-Id: Ic8db0281408f3500ba83f78c7e152ee0b68cd099 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Remove the code to manually initialize resources in static buildsSimon Hausmann2018-04-271-6/+0
| | | | | | | | | After commit be9a56e5e3ced5d0d668fa24e4c65ae928f2e25a in qtbase, this is not needed anymore. Instead the resource system injects the plugin entry point with a reference to all resources. Change-Id: I03294a3ee43097ce535ef7c2805ee33a99e7dd25 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Merge remote-tracking branch 'origin/wip/navigation' into 5.11Paolo Angelelli2018-04-175-5/+14
|\ | | | | | | | | | | | | | | | | Conflicts: src/location/declarativemaps/qgeomapobject.cpp src/location/declarativemaps/qgeomapobject_p_p.h src/plugins/geoservices/itemsoverlay/qgeomapitemsoverlay.h Change-Id: Iab847e16011b2095d307e2a3610bf9157ae7b92d
| * Introduce map objects reference implementationPaolo Angelelli2018-04-173-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * 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>
* | Doc: Fix all documentation warningsTopi Reinio2018-03-271-1/+1
|/ | | | | | | | | | | | | | | | | | | | Fix multiple warnings caused by invalid documentation configuration, missing QML module specifiers, wrong QML type names, incorrect arguments for the \fn command, and missing documentation. Remove incorrect statement from the example usage of the Waypoint QML type. Use 'QtLocation' as the name for the module throughout the docs. Clang (used as the parser for QDoc in Qt 5.11) was unable to resolve the path for qlocation.h, causing QDoc to omit the QLocation namespace documentation. Fix this by including the file explicitly from qlocationglobal.h for documentation builds. Change-Id: I2bd790db1ff5ad96f0cdb415a682b97593b3a6dc Reviewed-by: Martin Smith <martin.smith@qt.io>
* Replace Q_DECL_OVERRIDE with overrideKevin Funk2018-02-052-18/+18
| | | | | Change-Id: Iaa670de181255ea570fcf7bcbe465987ef7fc2fc Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Make QPlace extensiblePaolo Angelelli2018-01-272-0/+2
| | | | | | | | This change makes it possible to subclass QPlace with custom private implementations. Change-Id: I363c0e8b7db41d9a8400ce6dbddf5405c619eeef Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Use QGeoShapes properly throughout the modulePaolo Angelelli2018-01-091-13/+13
| | | | | | | | Adds proper support to other valid shapes and use ::boundingGeoRectangle where appropriate. Change-Id: Ibba4cb18f5cca08df62d15b76fa0e1f249dc6fbb Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Support waypoints bearing in the HERE backendPaolo Angelelli2017-12-051-4/+15
| | | | | Change-Id: I9246b648da809672510460273c2cc21aa478c550 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Update to new QRandomGenerator APIv5.10.0-beta4Thiago Macieira2017-11-031-1/+1
| | | | | Change-Id: I69f37f9304f24709a823fffd14e676c097712329 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Add camera capabilities + metadata to QGeoMapType/QDeclarativeGeoMapTypePaolo Angelelli2017-07-311-21/+22
| | | | | | | | | | | | | | This patch enriches QGeoMapType/QDeclarativeGeoMapType embedding into this object the camera capabilities for this type, that are then exposed via a new QML Type, CameraCapabilities, and custom metadata in form of a QVariantMap, that can be accessed via the new metadata property. [ChangeLog][QtLocation][QDeclarativeGeoMapType] Added CameraCapabilities and metadata properties to QDeclarativeGeoMapType. Task-number: QTBUG-58931 Change-Id: I97a8852fbb3bbac88fdbf0d47e8247ea7ed1f31e Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Use QRandomGenerator instead of q?randThiago Macieira2017-06-301-1/+2
| | | | | Change-Id: Icd0e0d4b27cb4e5eb892fffd14b5285d43f4afbf Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Add TrafficFeature to QGeoRouteRequest/RouteQueryPaolo Angelelli2017-06-071-0/+1
| | | | | | | | [ChangeLog][QtLocation][QGeoRouteRequest/RouteQuery] Add TrafficFeature to the query features. Change-Id: I50243865da97e302943f43b0eda430e9d8383880 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Fix resources not loading on static buildsThiago Marcos P. Santos2017-05-204-1/+13
| | | | | | | | | | | | | Explicitly call Q_INIT_RESOURCE, otherwise the resources are not found and the plugins using resources are broken when building Qt with -static. This patch also adds a prefix to these resources to avoid collision, since they are very generic like "logo.png" or "maps.json". Task-number: QTBUG-60007 Change-Id: Ifb73e9b97af107f2e24f5478f3de534bbd40e158 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Fix for mobile maps from the HERE plugin not showing in low-dpiPaolo Angelelli2017-05-081-1/+8
| | | | | | | | Apparently these maps support only 250ppi or more. Task-number: QTBUG-60545 Change-Id: Iadb59c4f034cbfd94a825048358583f3a978315f Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Add pluginName to QGeoMapType and check against it in setActiveMapTypePaolo Angelelli2017-05-071-22/+23
| | | | | | | | | | | This patch adds a QByteArray member to QGeoMapType with the name of the plugin providing that map type. This value is then used to validate what is passed to QDeclarativeGeoMap::setActiveMapType to see if it's a map type for the currently set plugin. Change-Id: If15b67c32150f0c3c2815d28e26fc37138d4cf71 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Allow overzooming when setting zoomLevel directly in a MapPaolo Angelelli2017-04-121-0/+1
| | | | | | | | | | | | | This patch moves the lower/upper bound check on setZoom from QDeclarativeGeoMap to the gesture area, allowing to set higher zoom levels than the maximumZoomLevel when setting Map.zoomLevel directly, for the map types that support overzoom. This is now safe as the bound check is introduced in the tile fetcher, so no invalid tiles will be requested, and is beneficial when combining layers supporting different maximum zoom levels. Change-Id: I08ee9c282ee2ebc1dafa3c68a238b93ffbc1ba02 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Add parameter to control prefetching in tile-based geoservice pluginsPaolo Angelelli2017-03-271-1/+14
| | | | | Change-Id: I18fc1788f7af0efe76f97257ffe739eb1a96e6cc Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-02-141-7/+12
|\ | | | | | | | | | | | | Conflicts: src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp Change-Id: I2428d360c07b55ec5ee61f81c6f97b3d7b20f363
| * Fix HERE Plugin requesting invalid range when on high dpi modePaolo Angelelli2017-02-081-8/+12
| | | | | | | | | | | | | | Apparently HERE does not support ZL 0 and 20 when using 512x512 tiles Change-Id: Ic52f98648243ce866646d921e3fc70b494fed62c Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Default style for the copyright defined on the pluginThiago Marcos P. Santos2017-02-132-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | The Mapbox GL plugin defines a logo image on the copyright notice that needs styling in order to have an appealing look and feel. The default style is empty, so we need to fetch one for the plugin to make this work. Task-number: QTBUG-58601 Change-Id: Ib3f7d7d7fcb2797c6381fc862ce7513b516c9ff5 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Add rotation/tilting support to QGeoTiledMapScene/QGeoCameraTilesPaolo Angelelli2017-01-261-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | This patch adds rotation and tilting support to QGeoTiledMapScene and QGeoCameraTiles. It also adds the related capabilities to the geoservice plugins mapping managers QML Api is added in a separate patch Change-Id: I3de1b52a9928c4856f6ee57ad39191acebe0f770 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Rename QGeoProjection to QWebMercatorPaolo Angelelli2017-01-161-2/+3
| | | | | | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'gerrit/5.8' into devAlex Blasche2016-12-0513-679/+617
|\ \ | |/ | | | | | | | | | | | | | | | | | | 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-2811-675/+577
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/position/winrt/qgeopositioninfosource_winrt.cpp Change-Id: I44fd4bd47f97acd7ca5a0bdb235a701a59497528
| | * Merge remote-tracking branch 'origin/5.6' into 5.75.7Liang Qi2016-11-2411-675/+577
| | |\ | | | | | | | | | | | | Change-Id: I49b1b3fc94819b5a7f2fd1ab2481a1d8ea41586b
| | | * Update "nokia" geoservices plugin to use HERE APIsChris Adams2016-11-1611-675/+577
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old Nokia URL endpoints are being deprecated. This commit updates the "nokia" plugin to use the modern HERE API endpoints. It also removes the (now nonexistent) China-specific URLs. Change-Id: Ieaf75cef1538d0ebb6a22623fc041ab504cf491f Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | | Add cache cost strategy parameters to all geoservice pluginsPaolo Angelelli2016-11-241-2/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds the possibility to change the cost strategy on all the geoservice plugins Change-Id: I0903d931ea228cc468216780fb87b466bc383063 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | | Renaming QGeoMapPrivate::changeMapSize to changeViewportSizePaolo Angelelli2016-11-221-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | Refactoring: removing m_reply from GeoReply classesPaolo Angelelli2016-11-2914-266/+187
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge remote-tracking branch 'gerrit/5.7' into 5.8Alex Blasche2016-11-021-1/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: tests/auto/declarative_ui/BLACKLIST Change-Id: I0f6c9228c899c4d1d55fffc596c661ee0f6c2b66
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-10-011-1/+1
| |\ \ | | |/ | | | | | | Change-Id: I0880e4aa40fbf9fe0bb639f7fd77a52044e91a6e
| | * 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>
* | | Set lowDPI tiles to be the defaultPaolo Angelelli2016-08-261-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since HighDPI tiles are currently causing severe performance penalties on mobile devices (at least iOS devices), this patch sets the default mode to highdpi = false. Change-Id: I2f99e3955ecccd905e8962d005421d1b5276ea84 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Remove QtSystemInfo dependency from QtLocationAlex Blasche2016-08-263-46/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was done to detect a Chinese network operator. In such cases a different places and geocoding manager is required which takes into account the shifting of map coordinates. This requirement still exists in China but QtSystemInfo is not even a released API. It makes no sense to keep the depending symbols around. QGeoUriProvider will remain though in case Chinese customers may want to adjust this behavior. Change-Id: I5ee0edbf00cd561923457b449c5c9de675aa41d1 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Version tile cache with qt version and evict obsolete data on init()Paolo Angelelli2016-08-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch changes the base cache directory to a new scheme containing the qt version. At the time of commit, this would be "QtLocation/5.8/tiles/" This versioning does not have to change at every release, but when there are changes in the caching scheme. The reason for this is that, otherwise, it becomes difficult to clean up old cache data. QGeoFileTileCache::init already clean up old tile cache from 5.4 or older, where the cache data wasn't organized under a directory for each plugin. In 5.8 different naming scheme are introduced for mapbox tiles (with @1x,@2x) , here maps (with ppi), and soon for OSM too (with an identifier for the actual provider, not only the mapId). With this patch it will become easier and cleaner to upgrade the cache data without leaving residues. Change-Id: I89aeac0aaf1408d119cde5792fc69a64d5d89c3a Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Differentiate cached tiles by dpiPaolo Angelelli2016-07-194-4/+190
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch uses separate filenames for tiles downloaded at different resolutions/dpi. For the HERE plugin, the dpi is appeneded to the filename. For the mapbox plugin, @1x or @2x is used due to the different approach to High DPI tiles. Change-Id: I0dcda088dae84e98c0e73bdc24435d7e2a3f43f7 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | | Fix for caching after mapbox improvement/highdpi-supportPaolo Angelelli2016-07-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the qgeofiletilecache/qgeofiletilecachemapbox contains a bug in that it makes use of virtual functions in the constructor. This patch fixes it by moving those calls into a virtual init() method that is called by QGeoTiledMappingManagerEngine::setTileCache() Change-Id: Icf7932dfbae7d99eef22c67e034246a834212a03 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | | Use HiDpi tiles to produce crisper maps at fractional zoom levelsPaolo Angelelli2016-07-013-15/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current QtLocation renderer uses geotiles of specified size for each specific zoom level, and show them using nearest neighbor interpolation when the camera is at that specific zoom level. Interpolation is changed to linear when the zoom level is in between two neighboring tile layers, but hasn't reached the next yet, so that the previous layer can be magnified smoothly. While this is the correct approach, it produces blurry images most of the time, while the previous camera mechanics, not allowing continuous zoom, was able to show crisp images all the time. To retain the continuous zoom and produce crisp images, this patch makes use of HiDpi tiles from providers that offer them (HERE and mapbox). The way these two providers offer HiDpi is different: HERE scales the map elements (text, mostly), to address a specific dpi (supported dpis are 72, the standard, 250, 320, 500), while mapbox returns the same tile at double resolution. The way the patch deals with this is by taking the image requested as is, but setting the tile size in the renderer to be half of that, while at the same time enabling mip mapping for QSGImageNodes. In this way, at integer zoom level, texture LOD 1 is shown, that is an OpenGL-scaled-down version of the downloaded tile, while at the other fractional zoom levels trilinear interpolation is used to produce a good image. This approach was not possible for the openstreetmap geoservice provider because mapquest (the currently used data provider) does not offer HiDpi tiles, and a scaled version of the standard tile would make the text unreadable half of the times. Further scaling would be possible, e.g., with HERE maps, offering 500ppi maps, to look good during scaling also on HiDpi devices. This can be addressed in a future patch. Task-number: QTBUG-53318 Task-number: QTBUG-48868 Task-number: QTBUG-36949 Change-Id: Iaa6f5b1ece9d37a0c85e73efaf1bd3b50b1d5950 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | | Improving error reporting of HERE geoservice pluginPaolo Angelelli2016-06-281-1/+5
|/ / | | | | | | | | | | | | | | This patch makes the QGeoServiceProviderFactoryNokia spit clearer error messages if the mandatory parameters are present but incorrect Change-Id: I7d46409e7ea7d7517dd6c28f3679d60ebf619d5b Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Remove QGeoMapController from QGeoMapMichal Klocek2016-03-171-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor code to use QGeoCameraData directly. All functionality related to zoom, center boundary checks are now handled in QDeclaratvieGeoMap class. This makes handling of center and zoomLevel properties much simpler and less error prone, since camera data can not be modified along the call stack. As result we avoid forwarding change signals back and forth: * qgeodeclarativegeomap::setCenter -> qgeomapcontroller::setCenter * qgeomapcontroller::setCenter -> qgeomap::setCameraData * qgeomap::setCameraData -> qgeomacontroller::cameraDataChanged * qgeomapcontroller::cameraDataChanged -> emit qdecalartivegeomap::centerChanged Call always setCenter and setZoomLevel on qdeclarativegeomap instance instead. Introduce initialize() method to handle cases where map plugin is loaded and scenegraph geometery is not yet set. This is required to correctly handle new boundary checks to limit grey areas. Change-Id: I6066cefd4a648dc76333dc241d1f261451a32e9c Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-03-081-4/+4
|\ \ | |/ | | | | Change-Id: I18bb1c341e7d87cd1d649f2c3fc9c50141c6a1a9
| * consistently put {qt,qml}_{module,plugin} at the end of project filesOswald Buddenhagen2016-02-251-4/+4
| | | | | | | | | | | | | | | | this fixes static builds by ensuring that all dependencies are exported. Task-number: QTBUG-51071 Change-Id: Ia0fcc7b40cbd80bde8edddcf8253b3136ed851ff Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | fix expensive iteration over QMap::keys(), QHash::keys()Anton Kudryavtsev2016-01-153-12/+12
|/ | | | | | | ... and QJsonObject::keys() Change-Id: I9a8ba44406a1e2cbdfffd266d2b5cb664f7440fc Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>