summaryrefslogtreecommitdiff
path: root/src/imports
Commit message (Collapse)AuthorAgeFilesLines
* Remove FIXME which is no longer relevantAaron McCarthy2015-06-301-2/+0
| | | | | | | | Gesture handling on rotated maps works as expected. Change-Id: I36dee2f3b933aa9c361694fc74f86868a882fc5d Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Fix activeMapType handlingMichal Klocek2015-06-101-3/+9
| | | | | | | | | | | * fix map type test to use geo test plugin * add test types to test plugin * rewrite map type test so it actually tests something * fix activeMapTypeChanged signal * create default map type as NoMap type Change-Id: I9398815fe42cbdeb392bd226de0c8764d3e0bc19 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Update qmltypes for QtLocationAlex Blasche2015-06-091-10/+424
| | | | | | Change-Id: I4cbb6ed7472a793924a9cca3c9e92a3996c6fcc1 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Update qmltypes for QtPositioningAlex Blasche2015-06-091-1/+83
| | | | | | Change-Id: I242622fbb6ba5f63b1fa76e2c01d75f978c8e98a 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-291-1/+1
| | | | | 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>
* 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-2926-30/+30
| | | | | | | | 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>
* Add "here" prefix to all Here geoservices parametersAlex Blasche2015-05-271-2/+2
| | | | | | | Task-number: QTBUG-42151 Change-Id: I3d71ee77327478dfdda23af709bee489f83bb9f6 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Provide means to convert GeoShape to appropriate subclass in QMLAlex Blasche2015-05-262-0/+29
| | | | | | Change-Id: I1f0d1540b07af8f385ef670990a8669ec8c973d8 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Add visible region support to MapAlex Blasche2015-05-262-5/+135
| | | | | | Change-Id: I340f1ad3a623a04a1846c5a57ad2bbcb9e253556 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Enable and update map flick and pinch autotest.Michal Klocek2015-05-221-2/+2
| | | | | | | | | | | | | 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>
* 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-2014-16/+16
| | | | | | | | | | 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-204-19/+16
| | | | | | | | | | | | | | | | | | 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>
* 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 OSM tilesWolfgang Bremer2015-05-081-0/+8
| | | | | | | | | | | | 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>
* Remove movementStopped from QDeclarativeGeoMapGestureAreaMichal Klocek2015-05-052-6/+3
| | | | | Change-Id: I8d8265dd51838bc61c3ea86c487cf5e6ff60a475 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Set shorter name for class names with 'MapData'Michal Klocek2015-05-043-3/+3
| | | | | | | | Rename all references and files with 'MapData' to use shorter name 'Map'. Change-Id: I8ab790146ee28e540e6866ba0218eea61bae6e64 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Remove QGeoMapData class.Michal Klocek2015-05-042-3/+3
| | | | | | | | | Since QGeoMap class does not have any subclasses, there is no need for keeping the bridge in form of QGeoMapData. This commit basically renames QGeoMapData to be QGeoMap. Change-Id: I6eb2f56f7ea83663034f4a8297e8e8f7f185d6a9 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Remove QLOC_TRACE macrosMichal Klocek2015-04-292-17/+1
| | | | | Change-Id: I580d066f2e83425eb471180fa323e77f6e21ed59 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Cleanup QDeclarativeGeoMap code.Michal Klocek2015-04-294-284/+232
| | | | | | | | | | | | | | This commit: * renames class members to use m_ naming convention * removes not required includes * removes not required forward declarations * adds Q_DECL_OVERRIDE * changes visibility of member functions * removes not used members: touchTimer_,zoomLevel_, bearing_, tillt_ Change-Id: Ice6f6a54ea3ca8be75a2427c93e872b697916463 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Remove duplicate code from QDeclarativeRouteMapItemWolfgang Bremer2015-04-204-148/+27
| | | | | | | | | The QDeclarativeRouteMapItem was more or less a copy of the QDeclarativePolylineMapItem. Now, the RouteMapItem directly inherits from the PolylineMapItem and adds only the route interface. Change-Id: I73e0dddf09ea893b1340c7606cda50de7dc573f1 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Fix broken doc links after recent mapviewer integrationAlex Blasche2015-04-151-4/+4
| | | | | | Change-Id: Ia74e7fb6bd5321af7d5f92e3e04c9ff0c5027f73 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Update QtLocation qmltypesAlex Blasche2015-04-142-4/+3
| | | | | | | | | | At the same time document a small API addition which was highlighted while the qmltypes were updated Change-Id: I935b18330e4d5a9d81ccbf3223387603b076a3dd Reviewed-by: Wolfgang Bremer <wolfgang.bremer@pelagicore.com> Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Remove wheelAngleChanged signal from map apiMichal Klocek2015-04-022-5/+2
| | | | | Change-Id: Ifada1a0852fc431f48d8dbccbfa8555b90cb35f9 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Change mouse and touch handling in Map QML component.Michal Klocek2015-04-014-269/+266
| | | | | | | | | | | | | | | | | | | Rewrite events handling in the map. This commit assumes, that first touch point is always synthesized to mouse event. Initial touch event is not handled, and map interaction is started by mouse event. This approach fits better for interaction with QML components, where mouse is primary way of control and simplifies mouse grabbing/ungrabbing. Moreover: * fixes issue, where grabbed synthesized mouse event is handled by top most element. * fixes correct value for previous zoomLevel in pinch update event. * fixes correct value for touch center in pinch end event. This commit on xcb platform depends on QTBUG-30417. Change-Id: Ic07dfa4bfaea20b4491135248abed44b25b2b950 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Merge remote-tracking branch 'gerrit/5.4' into 5.5Alex Blasche2015-03-271-0/+6
|\ | | | | | | Change-Id: I417d5faf3bb02b3c0936b36cbf54f9e9c67d3ea1
| * Add changed signals for maximum and minimum zoom level settingKimmo Leppälä2015-03-261-0/+6
| | | | | | | | | | | | | | | | | | Signals minimumZoomLevelChanged and maximumZoomLevelChanged were only emitted in initialization but not after setting new values for max/min zoom level. Change-Id: Ibae0b31df7d36af061fddf70b2bf144fdb8276f9 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Changes key of "nokia" geoservices plugin to "here"Alex Blasche2015-03-252-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | The old name is not advertised anymore but the plugin can still be loaded using the "nokia" key. This will be removed by later versions of Qt. Adds a QGeoServiceProvider unit tests Change-Id: I01f36f1bb19d31e0855e90c1605b99e61ee4450b Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com> Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* | Cleanup event handling function names in qdeclarativegeomapMichal Klocek2015-03-203-32/+24
| | | | | | | | | | Change-Id: Ia573741f19eab473d6978849ac9a9616d16a6726 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Add missing Q_DECL_OVERRIDE to qdeclarativegeomap_p.hMichal Klocek2015-03-201-7/+7
| | | | | | | | | | Change-Id: I979dafe7da3cde3d39381d70bf196f11e27f1a5d Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Fix duplicated link targetsAlex Blasche2015-03-038-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | The c++ to QML interaction document exists twice. Once for QtLocation and a second time for QtPositioning. Although the content is different the page title was same which created broken links. The very same pages also created hard links with \target which were named the same way the QML type was named. This created clashing link targets. Change-Id: Ie186217b11a606562a640b1e242fd73d8922327b Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Small update for location documentation.Michal Klocek2015-03-022-2/+9
| | | | | | | | | | | | | | | | Add mising documentation locationsChanged signal to GeocodeModel. Remove false note from MapGestureArea. Change-Id: I3a1eae6ecbf41cdf680ba5bc7fd074e88739c1a2 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Add updateTimeout() signal to QML PositionSource typeAlex Blasche2015-02-263-2/+50
| | | | | | | | | | | | | | | | | | | | QGeoPositionSource has such a signal which we need to forward to QML. Without it QML apps have no way to dertermine a timeout based failure situation. Task-number: QTBUG-44663 Change-Id: I1f8da6a61851b4a8302c9558dd2b4a9088be3de5 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* | Rename Nokia to HERE pluginAlex Blasche2015-02-261-2/+2
| | | | | | | | | | | | | | | | | | This only addresses the documentation. The source code still has plenty of references. The plugin name remains "nokia" as it is part of the API. Change-Id: I0c10226ac418f3045157247b0ca6e7ff598087f7 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* | Add missing documentation for QtPositioning and fix qdoc warningsAlex Blasche2015-02-251-2/+8
| | | | | | | | | | Change-Id: I396f937f945f158e7bb19f1f7e4633cfcdeffb72 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Fix QtLocation QML snippetsAlex Blasche2015-02-251-1/+3
| | | | | | | | | | | | | | | | Most of the snippets did not work and/or had outdated API usage. Change-Id: Ib8949ab6d007c4eaa3638fb40473bf6d217edd36 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Stop processing touch event on TouchCancelAaron McCarthy2015-02-242-0/+2
| | | | | | | | | | | | | | | | | | | | Reset the touch state machine on TouchCancel. Fixes an issue where old touch points are used by the touch state machine during the next touch sequence. Causing, for example, a zoom gesture when a pan gesture is expected. Change-Id: I549a90d97780f510384d21529bfa764b4d63a162 Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
* | Remove LGPLv2.1 and add GPLv2+ from/to QtLocationAlex Blasche2015-02-1976-1064/+1292
| | | | | | | | | | | | Change-Id: I3007aa04d3dbc0e00cb0a43987d64d01ddf91edd Reviewed-by: Lorn Potter <lorn.potter@gmail.com> Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
* | Update contact URL in all license headers to qt.ioAlex Blasche2015-02-1885-85/+85
| | | | | | | | | | Change-Id: Ia1e333be7fec8898de609d9b9303b1ad7687632e Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
* | Update BSD and LGPLv2.1 licensesAlex Blasche2015-02-189-27/+27
| | | | | | | | | | | | | | | | - Removes subsidiary extension from Qt Company - Replaces remaining occurrences of Digia in BSD and LGPLv2.1 Change-Id: I7467a6744af7d1c3aef3c29118f219399162a18c Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
* | Add Q_DECL_OVERRIDE where missingAlex Blasche2015-02-175-24/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | clang 3.6 and later print a warning for such cases. This patch fixes all override warnings caused by the content of the qtlocation itself. The remaining cases are triggered by headers outside of the qtlocation repo. This patch only fixes cases which clang on Linux can reach. It is possible that some of the platform specific plugins still have some ovveride related cases. Change-Id: I9f93062511d38cba4449b7fc70e65c93d4251a8b Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Prepare QtLocation & QtPositioning QML type definition for Qt 5.5Alex Blasche2015-02-174-33/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | The GeoShape is compatibile as the class name changes but the functionality and naming is the same in QML. The QtLocation changes are additions which become available and Qt 5.5. is the first official release anyway. Hence the normal rules about \since do not apply. Change-Id: I41d8afea955001845ab143535f6653fce715b9d8 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* | Update all LGPLv2.1 license headers in source to latest versionAlex Blasche2015-02-159-36/+36
| | | | | | | | | | | | | | | | | | | | | | This affects all QtPositioning related code and the test code in the entire repository. The Qt Company is set as new copyright owner and the copyright year is bumped to 2015. Change-Id: Iee0e990680683c20f5920e49cc1063ea9349e2cd Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | Merge remote-tracking branch 'gerrit/5.4' into devAlex Blasche2015-02-112-3/+3
|\ \ | |/ | | | | Change-Id: I5ef7649f02455269a8e2caa2f2d2241503586be3
View Lorry Controller Status