summaryrefslogtreecommitdiff
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
...
* | Mapbox GL plugin for QtLocationBruno de Oliveira Abinader2017-01-301-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Add Mapbox GL as a plugin for rendering vector tiles using OpenGL. Patch by: - Bruno de Oliveira Abinader <bruno@mapbox.com> - Thiago Marcos P. Santos <thiago@mapbox.com> Change-Id: I1671ae4dba0891e280a327543f15e73de1df385d Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Enable rotation and tilt gestures in the MapViewer examplePaolo Angelelli2017-01-301-2/+2
| | | | | | | | | | | | | | | | | | This patch adds RotationGesture and TiltGesture to the acceptedGestures in the mapviewer example, previously limited only to pan, pinch and flick. Change-Id: I4c47cfb669abe5433e4b9b3fc4bb0a9d6c596fc3 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2017-01-252-5/+5
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I786a0bff424afcb791a9aff68cc16df074153492
| * Do not use 'state' property in mapviewerMichal Klocek2016-12-202-5/+5
| | | | | | | | | | | | | | | | Using 'state' as property is considered bad practice and it can lead to undefined behavior. Change-Id: I3a77c4849a9e68334958216200d6c469b8f3d064 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | Rename QGeoProjection to QWebMercatorPaolo Angelelli2017-01-161-2/+2
| | | | | | | | | | | | | | | | | | | | 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>
* | Add support for additional library paths to the MapViewer examplePaolo Angelelli2016-12-061-0/+4
| | | | | | | | | | | | | | | | | | | | | | This patch makes the MapViewer example fetch and add additional library paths from the environment variable "QTLOCATION_EXTRA_LIBRARY_PATH". This path is colon separated, and can be used to add and test additional plugins easily, without the need to modify the example. Change-Id: I61563e1062d2ea860f4288ff17b54067b6bf9c8d Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Make mapviewer and places examples fetch tokens from the environmentPaolo Angelelli2016-10-192-0/+36
|/ | | | | | | | | | Add the ability in these two examples who let the user switch provider at runtime to fetch the tokens from environment variables. This makes it easier to test them without having to modify the code or to always run them with command line parameters Change-Id: I6469414ed70522bbf3481b73e1e43a82d18302c5 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-09-171-0/+2
|\ | | | | | | Change-Id: Ie8986d40efc5a241cb94ba743e343cbb35f66611
| * Fix for broken geocoding in mapviewer with OSM pluginPaolo Angelelli2016-08-261-0/+2
| | | | | | | | | | | | | | | | | | OSM Nominatim blocks user agents for default libraries. This patch adds a specific user agent to the mapviewer example if one isn't provided by the user Change-Id: I9bc598eec6f53b0990c7cd0fb42cf3ef7807bedb Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Fix for wrong map center at startup in mapviewer examplePaolo Angelelli2016-09-051-1/+2
| | | | | | | | | | | | | | | | | | | | This patches fixes an incorrect behavior (that is also a regression) introduced as a side effect of the no gray bands patch in the map viewer example Task-number: QTBUG-55085 Change-Id: I2078ba72e1d1588357bb2002d0c8e38b2f59253c Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Michal Klocek2016-07-288-0/+227
|\ \ | |/ | | | | Change-Id: I37542960aa091ab2074914a2cebb8c5114237a26
| * Add minimal map qml exampleMichal Klocek2016-07-287-0/+226
| | | | | | | | | | | | | | | | | | | | QtLocation was missnig basic example to show maps, the one you can simply jump in and start hacking. Change-Id: I0aec90ae25aa703d84f7e52e4dd523931819e79c Reviewed-by: Paolo Angelelli <paolo.angelelli@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * Add indirection for osm providersPaolo Angelelli2016-07-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To prevent furter breakage of qtlocation osm provider in existing qt versions, this patch introduces one level of indirection in resolving OSM providers, fetching the tile server address from files hosted at http://maps-redirect.qt.io/osm/5.6/ The content of the files requested for the server address resolution must be in JSON format, containing (currently) the following fields: { "Enabled" : bool, (optional) "UrlTemplate" : "<url template>", (mandatory) "ImageFormat" : "<image format>", (mandatory) "MapCopyRight" : "<copyright>", (mandatory) "DataCopyRight" : "<copyright>", (mandatory) "MinimumZoomLevel" : <minimumZoomLevel>, (optional) "MaximumZoomLevel" : <maximumZoomLevel>, (optional) } Enabled is optional, and allows us to temporarily disable tile providers if they go offline without firing requests to them. Default is true. MinimumZoomLevel and MaximumZoomLevel are also optional, and allow us to prevent tile requests to the providers, if they do not support the specific ZL. Default is 0 and 19, respectively. <server address template> is required, and is the tile url template, with %x, %y and %z as placeholders for the actual parameters. Example: http://localhost:8080/maps/%z/%x/%y.png <image format> is required, and is the format of the tile. Example: "png" or "jpg" <MapCopyRight> is required and is the string that will be displayed in the "Map (c)" part of the on-screen copyright notice. example: "<a href='http://www.mapquest.com/'>MapQuest</a>" <DataCopyRight> is required and is the string that will be displayed in the "Data (c)" part of the on-screen copyright notice. example: "a href= 'http://www.openstreetmap.org/copyright'>OpenStreetMap</a> contributors" The patch also adds four additional OSM plugin parameters, modifies an existing ones, and removes another existing one. Removed: - osm.mapping.copyright, now removed and replaced by two other parameters (see below). New: - osm.mapping.providersrepository.address, allowing to change the hardcoded http://maps-redirect.qt.io/osm/5.6/ The implication of this parameter is that it becomes possible to use file:// urls or even qrc:, allowing to ship custom providers with the applicarions - osm.mapping.providersrepository.disabled, allowing to disable the indirection and go with hardcoded URLs by default. - osm.mapping.custom.mapcopyright replaces the old osm.mapping.copyright, and contains the copyright notice to be displayed next to the "Map (c)" part of the copyright, to be consistent with the way the copyright notice coming from the provider data is handled - osm.mapping.custom.datacopyright replaces the old osm.mapping.copyright, and contains the copyright notice to be displayed next to the "Data (c)" part of the copyright, to be consistent with the way the copyright notice coming from the provider data is handled Modified: - osm.mapping.host now became osm.mapping.custom.host, improving the naming consistency. Task-number: QTBUG-54599 Change-Id: Iee88883572a198c00bcf54cf2bc33fbcc0498a68 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Doc: corrected link issues to coordinate qml typeNico Vertriest2016-06-291-3/+3
| | | | | | | | | | Change-Id: Ifa6fba19f79385d4806fad5ac58b36bada6e3df2 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Simon Hausmann2016-05-182-2/+2
|\ \ | |/ | | | | Change-Id: Ifed3a326085bd4aaff069007966efd6932c2be3b
| * fix example installsOswald Buddenhagen2016-04-282-2/+2
| | | | | | | | | | Change-Id: Ie482e84b0552608239a032ec95b44665997a0c01 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-04-0821-0/+0
|\ \ | |/ | | | | Change-Id: I9e85d2002151f7c53d2edbb4d8a078816aff693e
| * Purge sRGB chunks from PNGs in examples.Edward Welbourne2016-03-2221-0/+0
| | | | | | | | | | | | | | | | | | Subjects each *.png file that matched grep -law "sRGB" to: pngcrush -ow -brute -rem allb -reduce (Some of them needed -force but did get smaller.) Change-Id: Ib92045f3e0fb34aac1061fbc3dbb77d998228808 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-03-0817-0/+1001
|\ \ | |/ | | | | Change-Id: I18bb1c341e7d87cd1d649f2c3fc9c50141c6a1a9
| * Update examples documentation locationMichal Klocek2016-02-2617-0/+1001
| | | | | | | | | | | | | | | | | | | | The current way of documenting examples is to include qdoc and images source into example directory. Fix examples in location and positioning. Replace planespotter.jpg with png. Change-Id: I4eeacbfa575e7ae3ef747703348f2f201899e548 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2016-01-263-0/+13
|\ \ | |/ | | | | Change-Id: I23c874c5dcd0452142c3cf8abff65415ad31a1e7
| * Add clearData() call to map qml apiMichal Klocek2015-12-072-0/+8
| | | | | | | | | | | | | | | | | | | | | | Add clearData call to clear texture, memory and disk cache. Update mapviewer example and add "prefetchData" and "clearData" to Tools menu. Task-number: QTBUG-47292 Change-Id: Ifc71a3652688d1403f5b011ef231b59381c17ee3 Reviewed-by: Harald Meyer <dev@meh.at> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * Fix broken weatherinfo exampleAlex Blasche2015-12-071-0/+5
| | | | | | | | | | | | | | | | | | openweathermap.org requires an appid these days. The free plan permits usage for commercial and non-commercial cases. Task-number: QTBUG-49772 Change-Id: I28be90709b4879df515346e03372d494d94a4f01 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
* | Fixes for the mapviewer QtLocation examplePaolo Angelelli2016-01-261-12/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently identified problems with this example are: - the map element loses focus upon provider switch, or opening some other page (geocoding page, for example) - caused by changes in the StackView. Solved by forcing the focus upon map change - selecting minimap causes segfault - caused by dereferencing a null pointer (m_flick.m_animation) in qquickgeomapgesturearea.cpp - occasional (random) crashes with "QVector index out of bound" error - the menus show up on the wrong screen most of the time if the window spans multiple screens (but this is a broader qtquick problem) This patch fixes the first two issues Task-number: QTBUG-50519 Change-Id: Ic6b4a35e62e4651bd8003f47fade45f44a99d81c Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-12-011-1/+1
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/imports/location/qdeclarativegeomap.cpp src/imports/location/qdeclarativegeomap_p.h Change-Id: Iaf232acbe9098eb1b57f571638dd37f75b2ff345
| * Fix MapGestureArea APIMichal Klocek2015-11-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qmlfy map gesture area API: * do not use "is" for properties (panActive,pinchActive) * do not use "active" for accepted gestures (acceptedGestures) * do not use "ZoomGestures" (PinchGesture) * make private panEnabled, pinchEnabled * remove pan/pinchEnabled signals * update documentation * fix order of emitting panFinished, flickFinished [ChangeLog][MapGestureArea] Improve QML API including renaming and removal of obsolete elements. Change-Id: I643c923dcd94388475feb402b29ce3df916037a7 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-10-1630-30/+30
|\ \ | |/ | | | | Change-Id: I48858c7a8b57b1ad2bd8aa5bea578dd12113b24b
| * Bump all QtLocation 5.5 tags to 5.6Alex Blasche2015-09-2330-30/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5.5 was a tech preview release. The real release is 5.6. Some 5.5 interfaces did change. It is possible that there are apps in existence which are based on the 5.5 API's. To avoid miscommunication we bump all version tags to the real first release version. The existing 5.5 QML imports will continue to work but apps may encounter API changes when they move from 5.5 to 5.6. The API changes are listed in the QtLocation documentation. Change-Id: Ia7000e871a5ee6b09234e5d58d4fc8927e93b154 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devFrederik Gladhorn2015-09-061-0/+9
|\ \ | |/ | | | | Change-Id: Ia305efe8c4b616ed70309dfcae47f39cd1a4c4da
| * Make it a bit easier to detect problems when using GeoFlickr exampleAlex Blasche2015-09-031-0/+9
| | | | | | | | | | | | | | Prints the error and reports the failure back to the user. Change-Id: Ic11d3e1fdb54f411c1802de448017155b1a08df5 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
* | Added parameter to hide map copyrights notice.Harald Meyer2015-09-021-0/+1
|/ | | | | | | | | In some cases (for instance a helper mini map) the copyright notice is displayed multiple times. The new parameter allows to hide the copyright notice in such cases. Change-Id: I659c1ac019b8c21545c410a38cdc840f93d928ce Task-number: QTBUG-47025 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-08-199-21/+85
|\ | | | | | | | | | | | | Conflicts: src/imports/location/qquickgeomapgesturearea.cpp Change-Id: If115a052678b140eee46b8c0d9471b7d96953915
| * Update places-list and places-map examplesMichal Klocek2015-07-139-21/+85
| | | | | | | | | | | | | | | | | | | | | | Change position used in examples to Oslo. Update marker icons to be the same as in mapviewer example. Update screenshots, so they contain osm map. Add marker icon to places_list, so it does not look so boring. Add places title to places_map, so it is more readable. Change-Id: Ia321aa8577e77f76468c504cd4e6ce877712089c Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Do not rely on synthesized MouseReleseEvent when tracking mouse pointMichal Klocek2015-07-131-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A map pan is based on synthesized events due to the fact that rest of qt (qtcontrols , mouse area etc) depend on it in case of touch handling. However when there are two touch points on the screen pinch handling is activated. After accepting the touch event, mouse synthesized events are no longer generated for the first touch point, what's more as a result we might not get even mouseUngrabEvent nor mouseReleaseEvent. This breaks internal tracking of mouse position. This workaround resets mouse tracking point in case of getting touchUngrabEvent. Remove dummy extra MouseArea from places example. TODO: fix broken mouse area state in pinch unit tests Task-number: QTBUG-46388 Change-Id: I5588fbd4dbf0c5d25c44f994292c1aae7b3d70d4 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Improved zooming and map movement behavior.Harald Meyer2015-07-131-7/+31
| | | | | | | | | | | | | | | | | | | | | | Improved: Double tapping/mouse wheel based zooming keeps the map at the current geo location. Added: Left/Right/Up/Down keys can be used to move the map. Task-number: QTBUG-47020 Task-number: QTBUG-47019 Change-Id: I63859319b282e7738a173b0d3917433860fc8969 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Remove Blackberry 10 support from QtPositioningAlex Blasche2015-06-171-4/+0
|/ | | | | | | | | [ChangeLog][QtPositioning][Platform Specific Behavior] Removed BlackBerry 10 support from QtPositioning. Change-Id: If4e24831a0830c8744f51e912f6f37e198362923 Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* Missing import in 'mapviewer' exampleMichal Klocek2015-06-081-0/+1
| | | | | | | This was discovered when testing on Windows. Change-Id: I6e61f13e4dc6900a97234e5c8950875967446243 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Fix documenation in 'places' exampleMichal Klocek2015-05-293-33/+31
| | | | | Change-Id: Id224d73d2b68a947bc6c7121175a2f83bd0059fa 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>
* 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>
* 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>
* 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>
* 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>
* Add visible region support to MapAlex Blasche2015-05-261-9/+1
| | | | | | Change-Id: I340f1ad3a623a04a1846c5a57ad2bbcb9e253556 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@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>
* Provide new planespotter exampleAlex Blasche2015-05-077-1/+561
| | | | | | | | | | | | | | | | This diversifies the location examples as it adds a relatively small example. Short of the places examples there is only one large demo-like mapviewer example. This new example demonstrates the following features: - integration of C++ types into QML - coordinate animations - fitting viewport of maps Change-Id: Id0b5b9669cfd1d98bb5dce7d7d42d220efd60142 Task-number: QTBUG-45415 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
* Fix user interactions in mapviewer example.Michal Klocek2015-04-291-13/+16
| | | | | Change-Id: I73fb797f2b96198459214ea88f3b708fda53e543 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
View Lorry Controller Status