summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add changelog file for 5.5.0 releasev5.5.0-rc1v5.5.05.5.0Alex Blasche2015-06-091-0/+40
| | | | | | Change-Id: I393be66275320dc6642d61fc7b2affce6363ae86 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Improve Polyline MapItemWolfgang Bremer2015-06-011-10/+28
| | | | | | | | | | | | | | | The old implementation used polygons added to a QPainterPath for the screenBounds and the "contains" area calculation on each screen update and thus had a huge performance impact when using more complex polyline map items with several hundred points. The new implementation only calculates the screenBounds on each screen update. However, the contains check uses a similar logic to the previous QPainterPath approach but is way more performant. This is achieved by testing only parts of the polyline and not the whole QPainterPath at once. Change-Id: Ia332343f40ff865079fc86f0241a3f46a650162d Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Fix documenation in 'places' exampleMichal Klocek2015-05-298-122/+72
| | | | | Change-Id: Id224d73d2b68a947bc6c7121175a2f83bd0059fa Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Double pan dragStartDistance in mapgestureareaMichal Klocek2015-05-291-1/+1
| | | | | | | | | Commit 929c9a46aaa75ec3c77a226eb9e8a2e956e4763c makes slider in mapviewer impossible to drag, double the drag distance for now Change-Id: Ie9aa8ca17c87b74dd0e22cdb4e5b0845ca652827 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Workaround for pinch in 'places' exampleMichal Klocek2015-05-291-0/+5
| | | | | | Task-number: QTBUG-46388 Change-Id: I4ba1eb18d86f92a9dd89c4b96a0ba963dc13493c Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Fix doc issues around MapPolylineAlex Blasche2015-05-293-2/+16
| | | | | | | | | | | | MapRoute inherits from MapPolyline but qdoc doesn't recognize QML inheritance and/or we don't really want to document protected MapPolyline properties in MapRoute. Fixes some broken links in the same area while we are at it. Change-Id: Icd4095d98dbf2555c601c4088c85e9a2a08b3186 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Fix QtLocation \since tags in QML and C++Alex Blasche2015-05-2967-71/+71
| | | | | | | | The first release is 5.5 and not 5.0 Change-Id: Ib659adf77293e10e8f3d117ce16bbc25858d6ab2 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Fix broken MapType enum linksAlex Blasche2015-05-291-3/+3
| | | | | | | | We use QML syntax and not C++. Change-Id: Ib08e74b0450d47d916d33ce3d1c674bc8124e615 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Document return types for invokable functions in QtLocation QMLAlex Blasche2015-05-298-36/+36
| | | | | | Change-Id: I94aa0e16ff316e791f071ed1c299a717d74ce792 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Improve 'mapviewer' example readabilityMichal Klocek2015-05-2928-131/+121
| | | | | | | | | * fix Map Component creation * same QML components version across the files * use "Proceed" instead of "Go !" for buttons Change-Id: Ia75b0663a8b08241c0f842dacf80da089a6ee841 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Don't use polygon but polygon_geojson for nominatim queriesNiels Weber2015-05-291-1/+1
| | | | | | | | According to osm this is the way to go. See https://trac.openstreetmap.org/ticket/5319 for reference. Change-Id: I77948719a0e5d2598517c6a3c84d73b589a3a03b Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Mark Qt Location as Tech Preview on its documentation front pageAlex Blasche2015-05-291-0/+3
| | | | | | Change-Id: I708421dad06bf68fd6da585ba4305e185be3c5ac Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Don't share provider specific parameters with unrelated pluginsAlex Blasche2015-05-292-5/+52
| | | | | | | | | | | | | As an example the HERE plugin requires the here.app_id and here.token parameter. There is no point in passing those parameters on to e.g. the mapbox plugin. The OSM, mapbox and here plugin were already converted in such a way that they only use prefixed parameter keys. Non-prefixed parameters continue to be shared among all plugins. Change-Id: I9bdc0dccb95160a842800b785916f18ed78fdcd7 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Change HERE tiles default size to 256Michal Klocek2015-05-281-1/+1
| | | | | | | | Zoom levels 0 and 20 are not supported for 512x512 tiles. Task-number: QTBUG-36949 QTBUG-45694 Change-Id: Id1622a77f1b1f15cb706ee78f2ca872200ba2d3d Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Cleanup QGeoCameraData classMichal Klocek2015-05-281-42/+37
| | | | | | | Renames class members to use m_ naming convention Change-Id: I5bebc9be7fc29cce15d2b198beb8e8216f9cae4b Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Cleanup QGeoMapScene classMichal Klocek2015-05-282-212/+189
| | | | | | | | | | This commit: * renames class members to use m_ naming convention * removes not required includes * updates PIMPL Change-Id: Id9d1087389df0a5e314353b4220330934910b364 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Allow custom URLs for OSM geocodingWolfgang Bremer2015-05-283-2/+14
| | | | | | | | | This enables the usage of another geocoding server than the default osm project. The api still needs to be the same, but it is possible to use another server. Change-Id: I72f3835f28b9c52c042b23e9c4fdf2e85c752c56 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Rewrite 'places' example to use qtquickcontrolsMichal Klocek2015-05-2791-2929/+2400
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a squash commit of: * add qtquickcontrols window to 'places' example * add MenuBar to 'places' example * replace Slider in 'places' example * add stackView and MessageForm to 'places' example * replace SearchBox in 'places' example * replace SearchCenter dialog in 'places' example * replace SearchBoundingBox dialog in 'places' example * replace SearchBoundingCircle dialog in 'places' example * tune up categoryDelegate in 'places' example * tune up SearchResultDelegate in 'places' example * tune up PlacesDelegate in 'places' example * replace OptionsDialog in 'places' example * remove 'common' controls from location * clean up filenames in 'places' example * update MapComponent in 'places' example * code style formating of places.qml * remove backgroundRect from 'places' example * tune up EditorialPage in 'places' example * tune up ImageView in 'places' example * tune up ReviewPage in 'places' example * tune up SuggestionView in 'places' example * update imports version numbers in 'places' example * change searchBox and busyIndicator * update design in 'places' example Change-Id: I680c8b88f26689cb9728ee61617f7d2d3aa2a172 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Document the new parameter prefixes for here an osm pluginAlex Blasche2015-05-271-0/+6
| | | | | | | | | | It is not an API break in the traditional sense but it is a break of some sort. Hence we need to document them. Task-number: QTBUG-42151 Change-Id: I9f0d11762239213f3104bf997d8a6fbd4af5e46e Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Use "osm" prefix for osm plugin parametersAlex Blasche2015-05-274-19/+23
| | | | | | | Task-number: QTBUG-42151 Change-Id: I58648bac947b19e675f129d78bec61e079a93d2c Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Add "here" prefix to all Here geoservices parametersAlex Blasche2015-05-2714-62/+69
| | | | | | | Task-number: QTBUG-42151 Change-Id: I3d71ee77327478dfdda23af709bee489f83bb9f6 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Remove some unused features from 'places' exampleMichal Klocek2015-05-2710-662/+0
| | | | | | | | | Current plugins do not support adding or removing place and category. Remove this support from 'places' example. Change-Id: I768697e0509c7ff74cc61c5a1ffc3709d28d0b6f Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Provide means to convert GeoShape to appropriate subclass in QMLAlex Blasche2015-05-263-0/+67
| | | | | | Change-Id: I1f0d1540b07af8f385ef670990a8669ec8c973d8 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Workaround for failing conversion between Q_GADGET'sAlex Blasche2015-05-263-0/+53
| | | | | | | | | | | | | | QGeoRectangle and QGeoCircle are subclasses of QGeoShape. Before this patch setting a QGeoShape property of a QML object is not possible because the QGeoRectangle/QGeoCircle cannot be converted to a QGeoShape. This patch addresses the problem by providing custom converters for the above classes. It enables QVariant::convert() for the classes above. Change-Id: I7daba5254dad0df598324432db3b1819e68648b6 Task-number: QTBUG-46232 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com> Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Tune up dialog transitions in 'mapviewer' exampleMichal Klocek2015-05-261-0/+5
| | | | | | | | If users reselects 'tools' dialog, rewind to map page immediately. Change-Id: Iefc3786c78e441ca765466c54d872ef475a80d59 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Fix typo and remove appPath from mapviewerMichal Klocek2015-05-262-15/+10
| | | | | | | | appDirPath was used by videoitem which was removed during earlier rewrite of the mapviewer example. Change-Id: I7ac49accbe93fd09c125a45fbeafde660beabf3a Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Add helper.js to project files in 'mapviewer' exampleMichal Klocek2015-05-262-0/+3
| | | | | Change-Id: Ia07c5741b52420ca8196121589ccc336193a65ca Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Update qt logo in mapviewer exampleMichal Klocek2015-05-261-0/+0
| | | | | Change-Id: Ic54f239cf26c8caef1e61d32eb06722643e89933 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Icon themes are no longer supported. Remove their documentation.Alex Blasche2015-05-261-36/+0
| | | | | | Change-Id: I93225819920eac912da3c3df9a7cad67bdef3a49 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Add visible region support to MapAlex Blasche2015-05-263-14/+136
| | | | | | Change-Id: I340f1ad3a623a04a1846c5a57ad2bbcb9e253556 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.4' into 5.5Liang Qi2015-05-251-0/+28
|\ | | | | | | Change-Id: I1117e0b1d8b09eb44b7186558c453e6a47adb970
| * Merge remote-tracking branch 'origin/5.4.2' into 5.45.4Liang Qi2015-05-181-0/+28
| |\ | | | | | | | | | Change-Id: I3f38216477c400a576571791aa253ea6e16d776e
| | * Add QtLocation changelog for Qt 5.4.2 releasev5.4.25.4.2Alex Blasche2015-04-241-0/+28
| | | | | | | | | | | | | | | | | | Change-Id: I1ecd0c44f3cc425e7455a8cc786e59fe98fe84c9 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | | Reanimate tests/auto/qmlinterface.Friedemann Kleint2015-05-235-24/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add CONFIG += testcase to tst_qmlinterface.cpp. Use QVERIFY2 to show QML load errors. Fix failures. Before this change, the test was not executed at all because "make check" was an empty target due to missing CONFIG += testcase. Change-Id: I6aa839fdbbbee6bdf316cbb5050fe5a5b53c12cd Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | | Enable and update map flick and pinch autotest.Michal Klocek2015-05-224-72/+155
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make pan drag distance inclusive in QDeclarativeGeoMapGestureArea which simplifies unit testing on different platforms. Use sceneCenter instead of lastPos for panning startup. lastPos is used with velocity sampling which makes it not reliable as a starting value. Change-Id: If0d98e834a5e2d4264a51d70c2c39846cd2a677b Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | | More fixes to geoshape.type qml documentationAlex Blasche2015-05-221-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add \since information. We cannot use \since directly as geoshape is not documentated by proper class doc style. - Add section heading. Change-Id: I0ea15617439454627a34ced78168cdb212beab5f Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | | Fix missing guarded pointers for mapping engineMichal Klocek2015-05-2113-125/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since mapping engine is going to be destroyed on geoseriveprovider change/plugin unload use QPointer to track engine existence before making calls. This commit refactors a bit QGeoTileRequestManager to handle all the calls to the enigne. Check for null pointer before calling the engine. Move registerMap method to base class. Update QGeoTiledMapNokia class accordingly. Change-Id: I886e85e660b2c515e4a617e98e9cc0c3c13781b6 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | | Unify zoom calculationsMichal Klocek2015-05-212-19/+9
| | | | | | | | | | | | | | | | | | | | | | | | Make camera calculations in qgeocameratiles and qgeomapscene more obvious. Use the same fractions. Change-Id: I4f156bb894eb2c606df97308ebd1b637408d9f2d Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | | Fix missing tiles on some zoomLevelsMichal Klocek2015-05-211-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When ratio between screen size and tile size was high, frustum far clipping plane was preventing intersection points calculations. Do not use magic value for far clipping plane, since frustum is not used in projection for int zoom level changes, simplify near clipping plane. Near clipping plane should be always smaller than possible altitude value. Far plane should always exceed altitude to allow intersections with z plane. Task-number: QTBUG-45508 Change-Id: I59693ace794de37f0ad3544c11eb0c5a471eeb04 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | | Refactor fetching calls in QGeoCameraTilesMichal Klocek2015-05-216-96/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce dirty flags, remove redundant getters. Change fetch ifdefs to switch case, so all code gets compiled. Change-Id: I610f20098c67089bd2c2684910283f165e1109e0 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | | Add QML API changes to documentationMichal Klocek2015-05-212-0/+53
| | | | | | | | | | | | | | | Change-Id: I597130a7cca150ab9f1afbd542efa7270f337019 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | | Rename cameraStopped to prefetchData in Map APIMichal Klocek2015-05-212-3/+3
| | | | | | | | | | | | | | | Change-Id: Ia875214b7233e05a7f430931a2ba7437c9a428e3 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | | Ensure that docs always import QtPositioning and QtLocation moduleAlex Blasche2015-05-2018-27/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At the same time we update the import versions and reduce the qdoc tag duplications. Change-Id: I894d163657734a4b3bbc2951462660571f340dfd Task-number: QTBUG-46147 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | | Fix crash when initiating map flick w/o QtPositioning importAlex Blasche2015-05-206-19/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A map flick requires a QPropertyAnimation for a QGeoCoordinate. The required animation interpolator is exported by the QtPositioning QML plugin. In general a QML Location app should always import QtPositioning as well. In this case the import was missing and subsequently the interpolator for the QGeoCoordinate was never registered. This patch ensures that the QtLocation QML code that requires the animation registers the interpolator in addition to the regular QtPositioning registration. Change-Id: I61759418f0cdf1cb30ff946cc325a112e90c1a2f Task-number: QTBUG-46147 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | | Updated WinRT license headers to use LGPLv3 instead of LGPLv21Jani Heikkinen2015-05-204-40/+52
| | | | | | | | | | | | | | | | | | | | | | | | From 5.5.0 -> WinRT port is licensed with LGPLv3, see http://blog.qt.io/blog/2015/04/29/windows-10-support-in-qt/ Change-Id: I267f2c70cd7f365464bc596ac5dcb8503219cdbd Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
* | | Update design in mapviewer exampleMichal Klocek2015-05-1217-47/+36
| | | | | | | | | | | | | | | | | | | | | | | | Update marker and change colors. Change-Id: Ia12ed0145367c5a086ec6b6828db602b4666403e Reviewed-by: Sami Makkonen <sami.makkonen@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | | Make geoclue plugin compile on RHEL 6.6Alex Blasche2015-05-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | G_VALUE_INIT was added by glib 2.30 and RHEL 6.6 uses 2.28. We expand the macro to fix the compile issue. Change-Id: I25d19858ad3035a266d9ddf4d9badc830071e943 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* | | Fix QDeclarativeSearchResultModel error processing.Michal Klocek2015-05-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | When QPlaceReply has an error do not process the reply futher. Change-Id: I373f1f2a25601516bf1cd022283ef1c5b06f8497 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | | Allow custom URLs for OSRM routingWolfgang Bremer2015-05-083-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | This enables the usage of another routing server than the default osrm project. The api still needs to be the same, but it is possible to drive your own server using the OSRM project sources. Change-Id: Ib335fdf97eb1e208caafb17783c22d9b423a40e2 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | | Allow custom URLs for OSM tilesWolfgang Bremer2015-05-088-1/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This enables the usage of various mapping services which use the OSM API for tile distribution. One only needs to set the urlprefix parameter to a correct url and the activeMapType to the "Custom URL Map". Task-number: QTBUG-32937 Change-Id: Ib24da19dc598ccc288047ce2651e6c1792ae2054 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com> Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>