summaryrefslogtreecommitdiffstats
path: root/src/imports/location/qdeclarativepolygonmapitem.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Moving location qml implementation to location/declarative*Paolo Angelelli2017-01-261-741/+0
| | | | | | | | | | | | 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-261-75/+56
| | | | | | | | | | | | | | | | | 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>
* Add clipping for rotated/tilted Map ItemsPaolo Angelelli2017-01-261-62/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-261-15/+20
| | | | | | | | | | | | | | | | | | | 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 rotation and tilt controls to QDeclarativeGeoMapPaolo Angelelli2017-01-251-11/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-161-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* QtLocation: Use the newly-introduced qmlWarning instead of qmlInfoRobin Burchell2017-01-131-1/+1
| | | | | | | | 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>
* Merge remote-tracking branch 'gerrit/5.8' into devAlex Blasche2016-12-051-2/+2
|\ | | | | | | | | | | | | | | | | | | | | 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
| * 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>
* | 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.7' into 5.8Alex Blasche2016-11-021-0/+6
|\ | | | | | | | | | | | | Conflicts: tests/auto/declarative_ui/BLACKLIST Change-Id: I0f6c9228c899c4d1d55fffc596c661ee0f6c2b66
| * Fix for polylines and polygon rendering wrong at the edge of the mapPaolo Angelelli2016-09-191-0/+6
| | | | | | | | | | | | | | | | | | | | 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 'gerrit/5.7' into devAlex Blasche2016-07-291-31/+39
|\| | | | | | | Change-Id: I6a1a72547077c628429ee9a0781070ad3ae787f1
| * Fix for wandering QGeoMapPolylineGeometryPaolo Angelelli2016-06-281-10/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * Fix for crash on tessellation of self-intersectiong GeoPolygonsPaolo Angelelli2016-06-151-21/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Enable building with QT_NO_OPENGL defined by using QSGGeometry EnumsAndy Nichols2016-06-241-1/+1
|/ | | | | | | | | | | | Rather than use OpenGL Enums directly in the code, now it is possible to use graphics system agnostic defines for building geometry for when the OpenGL headers are not available. QtLocation has been ported to use these new Enums. Change-Id: Ica6793e33cb7df1c9568681e478974aa9fefe156 Reviewed-by: Paolo Angelelli <paolo.angelelli@theqtcompany.com> Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Improve map item rendering performanceMichal Klocek2015-11-271-10/+9
| | | | | | | | | | | | A flood of input events, such as when pinch, triggers multiple map item geometry updates to occur per frame. These geometry updates are potentially expensive and only the last generated geometry is used. Mark items to be polished to make geometry updates once per frame when updatePolish() is called. Done-with: Aaron McCarthy <aaron.mccarthy@jollamobile.com> Change-Id: I0af40e2d0b09c8364382d4b4c018988f3986f7f0 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Remove incorrect string construction in QML debug outputAaron McCarthy2015-09-021-11/+4
| | | | | | | | | | The original string had a "%1" expecting to be replaced by the arg() function, which was not used. Removed the output altogether, silently do nothing if the coordinate is not in the path. Remove dead code trusting that QList::lastIndexOf() will returned -1 or a valid index. Change-Id: Iffa7e663a439696cff6a6aa73d714f1259f4ea69 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Fix doc issues around MapPolylineAlex Blasche2015-05-291-1/+1
| | | | | | | | | | | | 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-291-1/+1
| | | | | | | | 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>
* Document return types for invokable functions in QtLocation QMLAlex Blasche2015-05-291-2/+2
| | | | | | Change-Id: I94aa0e16ff316e791f071ed1c299a717d74ce792 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Remove LGPLv2.1 and add GPLv2+ from/to QtLocationAlex Blasche2015-02-191-14/+17
| | | | | | 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-181-1/+1
| | | | | Change-Id: Ia1e333be7fec8898de609d9b9303b1ad7687632e Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
* Cleanup QtQml header includes in Positioning and LocationAlex Blasche2015-01-271-3/+0
| | | | | | Change-Id: Ib79de53b05cc5a9edf4ed84021b90809c9816052 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com> Reviewed-by: Michal Klocek <michal.klocek@digia.com>
* Avoid map polyline/route/polygon draw around half the worldAlex Blasche2015-01-271-1/+3
| | | | | | | | | | | | | | | | | This is triggered when the longitude difference between two coordinates is 0 which causes an artificial wrap around half the world. The already existing fuzzyness check between the coordinate's pixel positions is not sufficient. The conversion from geo coordinates into pixels involves math which can trigger larger pixel differences despite relatively tiny longitude differences. On the other hand the to be called geoDistanceToScreenWidth() function already wraps when the longitudes have a close enough value. Task-number: QTBUG-43107 Change-Id: I0b1432e47240e9911e77a0e53e74f560356eee4b Reviewed-by: Michal Klocek <michal.klocek@digia.com> Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* Make compile QtLocation after changes to QValuePrivateAlex Blasche2015-01-261-1/+1
| | | | | Change-Id: I0ff4814d1615226140144a6185abc793f35ebab0 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Better names for incorrectly named Map functions.Aaron McCarthy2015-01-201-5/+5
| | | | | | | | | | | | | | | | | | | The functions to transform between coordinates and position on screen were incorrect. Documentation and function names did not match implementation. New functions with better names have been added and documentation updated to match implementation. Old invalid functions have been deprecated. Related private symbols have been renamed to match their purpose. [ChangeLog][QtLocation][Important Behavior Changes] Functions in Map item which are used transform between coordinates and screen position have been deprecated due to confusing naming. Change-Id: Ic501cd81220414800bc2247eae9f510954ee469f Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Remove V8 references from QtLocationAlex Blasche2015-01-121-4/+2
| | | | | | | | This fixes the current build break in dev too. Change-Id: Id35f4411c228e4365042ab370c7c505f611cb694 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Michal Klocek <michal.klocek@digia.com>
* Make QtLocation work after internal valuetype changes in QtQMLAlex Blasche2015-01-081-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The value type wrapper code was completely removed. Instead QGeoShape & derived classes and QGeoCoordinate use Q_GADGET to advertise their meta data which in turn allows QtQML to dynamically discover the types when needed. This implies that the above C++ classes become larger as the meta data is permanently added. On the positive side all QML value type wrapper were removed which reduces the QML plugin size. At the same time it becomes significantly easier to use those types in other QML plugins such as the QtLocation one. Unfortunately this change comes with an unavoidable behavior change as well. Previously is was possible to set a width and height on an invalid QML rectangle. In the case of an invalid rect it was made valid (setting center to 0,0) before setting the height or width. The QGeoRectangle class explicitly aborts calls to setHeight() and setWidth() in case of an invalid rect. From now on the C++ class behavior is used in QML too. This was the reason for the change to tst_map_routing.qml in this patch. Incidentally the documentation always referred to the QGeoRectangle documentation and thus always stated the now new behavior. Documentation for the value types and the relevant behavior changes will be re-added in a later commit. Each Gadget must be registered using QMetaType::registerComparators<T>() to enable == and != operators in QML. Unfortunately QMetaType requires the operator< which does not make any sense for the value types touched by this patch. Right now, a warning is printed. Attempts will be made to remove the operator< requirement in QMetaType. Otherwise the warning has to be removed before the release as they are printed very often. [ChangeLog][QtPositioning][Important Behavior Changes] The QML rectangle type ignores setting of the height and width if the rectangle is invalid. Previously the property setter changed the rectangle center to QGeoCoordinate(0,0) before setting the height and width of a previously invalid rectangle. Change-Id: Iab98ede58066ce03b2b4e0ce03ed85ba7ecb1020 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Update license headers and add new license filesAntti Kokko2014-08-241-19/+11
| | | | | | | | | - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 & LICENSE.GPLv2 - Removed LICENSE.GPL Change-Id: Iedee2507ab1bd46788409a98505d7be510253110 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* Remove unnecessary code.Aaron McCarthy2014-02-261-1/+1
| | | | | | | | I don't see much point in using custom Point classes. QPointF is already fully inline and constexpr. Change-Id: Ie7a854831e78d8e3ce4777a558d203765b53c9f0 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Map item geometry do not need to be QObjects.Aaron McCarthy2014-02-261-2/+2
| | | | | Change-Id: I078c9eb57ad5a2aa70fde8900ec46958aa1882e1 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Fix translatable strings and cleanup unnecessary stringsAlex Blasche2014-02-261-2/+2
| | | | | | | | | | | | 1.) Reduces the amount of translatable strings as console/qmlInfo() output is not translated. 2.) Unused error messages have been removed 3.) Additional translation hints have been added. Change-Id: I59ef36bd75ab1f6d4878657212884e1251b8a04e Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* Fix declarative_ui tests.Aaron McCarthy2014-02-111-15/+13
| | | | | | | | | | | | | | | | | | | Coordinates for map items located outside the view port cannot be converted to and from screen coordinates. During tests pan the map so that the items under tests are inside the view port. Tests for panning the map and dragging map items were failing because mapping between coordinates and screen position only works for visible screen positions. The MouseAreas under test did not have preventStealing set, which was causing the map to pan slightly prior to item drag being detected. Stop gesture detection for a touch point when the mouse is grabbed by a child item. Task-number: QTBUG-31797 Change-Id: I42a801d50c194c6fe9629f3b0de606b406ad8b8c Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Fix documentation errors.Aaron McCarthy2014-02-101-1/+1
| | | | | Change-Id: I16b4f9116a651edaebc54957daf528278785bc55 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Fix map item behavior when used with a MouseArea.Aaron McCarthy2014-02-071-14/+15
| | | | | | | Update the geo coordinate properties when the map items are moved. Change-Id: I32918571379d81c651e652513b63945ee23e3fd9 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Remove the GeoMapMouseAreaFabian Bumberger2014-02-061-1/+1
| | | | | | | | | | | | | | | | | I don't see a reason for keeping this. First of all, only half of it is implemented. Second we can have the same behavior with a normal MouseArea. The only advantage a MapMouseArea has is that mouse events are only received in the boundaries of the parent map item. However with a bit of work in the parent map item we can have this behavior as well for a normal mouse area. The only thing we are eventually loosing is the geocoordinate property of the MapMouseEvent. But this can be easily obtained with the "toCoordinate" function in the Map item. Change-Id: Icb176ee7d7c2881df714ab3191fa1f7f5c8915e2 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Always use double point precision for geo lookups internallyErik Mattsson2013-11-061-12/+14
| | | | | | | | | | | | | | | | | | | | | | | | | This patch is to remedy rounding errors on ARM devices where qreal is defined as a float instead of double. The main change is to replace QPointF with QDoubleVector2D when using screenPositionToCoordinate and coordinateToScreenPosition. In many cases the QDoubleVector2D is converted to QPointF when the increased precision is not used. This because many of the surounding classes uses qreal so the precsision would be lost anyway. These classes include QVectorPath, QPainterPath and QQuickItem. The most important change is in polyline and polygon map item in the updateSourcePoints methods. Using floating point precision here resulted in many precision errors that caused for example route lines to be chopped of as the method erroneously thought it needed to wrap to the other side of the datum line. The external uses of the coordinate lookup functions in declarative geo map has been left untouched so they still use QPointF for compatibility reasons. Not sure how the process goes when updating externally visible parts of the API Change-Id: I01ed67a0563cfb5c4ff2db6395b7a62eaa8e4a19 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* Make QtLocation QML module compile after QJSValuePrivate constructor changeAlex Blasche2013-10-011-1/+1
| | | | | Change-Id: Ib38ebdbed68689cca035cefa46e02e68bf63ae0b Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Doc: Removed version from "\inqmlmodule QtLocation"Jerome Pasion2013-09-251-1/+1
| | | | | | | | | | -QDoc ignores these and uses the "\qmlmodule QtLocation 5.0" to determine the import statement. -Better to remove now to avoid confusion. Task-number: QTBUG-32172 Change-Id: I63e468d8e8e5ef672527dc427f02378d0d269ad9 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Make compile after recent V4 API changesAlex Blasche2013-09-191-3/+4
| | | | | Change-Id: Ib14d670e51c256d52ad6c62a6091b470ed3c95e7 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fix broken polygonline and polygonitem for ARM.Albin Olsson2013-09-041-1/+1
| | | | | | | | | | | | Routes drawn on map became broken after pinch-zooming. Root cause was inconsistent use of floating point types that only affects ARM architecture. Fix is to switch double to qreal declarations. I believe a more thorough review of the uses of doubles in QtLocation needs to be done. See QTBUG-33331. Change-Id: I72411d304d2e9183d415c2afdf0a31b80a4ad2a6 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Split QtLocation into QtPositioning and QtLocationAlex Blasche2013-09-021-4/+7
| | | | | | | | | | | | QtPositioning is not dependent on any gui component and mostly covers everything around the retrieval of position information. QtLocation covers place, map and navigation APIs. Several documentation issues were fixed during the process. Change-Id: I98e2a53065549a2fc43f93a75b4f65b5bc884c92 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Fix compilation after the qml engine changesLars Knoll2013-08-121-5/+7
| | | | | | | | | Fix compilation after the QML engine moved over to v4 as it's JS engine. Change-Id: Ie37f56aa59279888a2e7fa5902093f41069677ee Reviewed-by: Alex Blasche <alexander.blasche@digia.com> Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* Fix QtLocation documentationAlex Blasche2013-07-121-3/+3
| | | | | | | | | | This moves the docs to its proper place and fixes content as well as broken links. There are still some warnings left. Change-Id: Ie83086f4feabab5f3b3d6c92eb6b401a5ff43e29 Reviewed-by: Alex <alexander.blasche@digia.com>
* Update copyright year to 2013Sergio Ahumada2013-06-131-1/+1
| | | | | Change-Id: I5b0cb7d56997ad7b91c073b3e02b31d0368fdcfa Reviewed-by: Alex <alexander.blasche@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-241-24/+24
| | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: Ic1390da64a219642fa1e1482a7677a4c2db15cbc Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Convert GeoShape, GeoRectangle and GeoCircle into QML value types.v5.0.0-beta1Aaron McCarthy2012-08-281-15/+3
| | | | | | | | | | | | | This replaces the GeoShape, GeoRectangle and GeoCircle QML elements with value types. A value type is a better fit for shape types. It is very similar to a rect with some utility functions. Declare QGeoShape, QGeoRectangle and QGeoCircle as movable types. Update documentation. Change-Id: Id6c48e1e841c68f2f0c5c6a9c4a6580a57e2dfb6 Reviewed-by: abcd <amos.choy@nokia.com>
* Fix compiler warnings with MSVC.Friedemann Kleint2012-08-281-1/+1
| | | | | | | | | - Unused variables. - 64bit truncations. Change-Id: I358a1378e875fea4a0790db3c30e422a0b9eba40 Reviewed-by: abcd <amos.choy@nokia.com> Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
* Convert Coordinate into a QML coordinate value type.Aaron McCarthy2012-08-241-115/+82
| | | | | | | | | | | | | | This replaces the Coordinate QML element with a value type. A value type is a better fit for a coordinate. It is very similar to a vector3d except it has an explicit coordinate system and some utility functions. Declare QGeoCoordinate as a movable type. Update documentation. Change-Id: I758fa9dfd7154a4d60fb791fe553b9fee3164c2c Reviewed-by: abcd <amos.choy@nokia.com>