summaryrefslogtreecommitdiff
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* Examples: set minimal_map fullscreen on Android devicesAssam Boudjelthia2020-02-181-3/+3
| | | | | | | | | If running minimal_map example on Android, the map view is shown on a small view on top of the screen only, with all the remaining view as blank, this is not desirable. Change-Id: I727247428c9a33e0281083abef672379f479c5be Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-10-011-23/+23
|\ | | | | | | Change-Id: Id543d32c49c8efd1d7798d41bbee0e28c1742e12
| * Doc: Fix link errors and complete parameter specsNico Vertriest2019-09-301-23/+23
| | | | | | | | | | Change-Id: I786ab35a0e9c8dfa2c8124692289d98e8eee4a8d Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | Fix the build with -no-widgets in examplesLiang Qi2019-08-072-3/+4
|/ | | | | | Task-number: QTBUG-76780 Change-Id: I543ec1e89c8b9e8ba66524345d230c5e4dd7c08b Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Doc: Fix documentation issuesTopi Reinio2019-05-162-1/+1
| | | | | | | | | | | Fix various documentation-related issues, including missing parameter documentation, broken links, and typos. Do some minor language editing. Change-Id: I0a8f8457e0d1ab56b4fc4670376509adf1fd26a3 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-04-301-0/+6
|\ | | | | | | Change-Id: I3753abe2e06c0f310abda87dc688b22a02959887
| * Check that SSL support is available at compile time before using itAndy Shaw2019-04-291-0/+6
| | | | | | | | | | Change-Id: Id0e7e14a06306a2d8c2098bcb6de6c53d28ca88f Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | GeoFlickr uses QtXmlPatternAlex Blasche2019-04-251-1/+1
| | | | | | | | | | | | | | The QML dependency ought to be reflected by the project file. Change-Id: I1dbd83bf610957850267d7027e8f41264b6f3a61 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Reduce QtXmlPattern dependencyv5.13.0-beta2Alex Blasche2019-04-021-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | QtLocation and QtPositioning don't depend on it and QtXmlPatterns is about to be deprecated in Qt 5.13. The only existing dependency is the geoflickr example. The most likely resolution is to remove the example once QtXmlPatterns is removed for good. This change makes QtXmlPatterns an optional build dependency. Change-Id: Ibcd9e48604cff4d5e52a63164b30616b0eb100f2 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-04-012-0/+16
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I5700c90ee86873599b5e7c9ccb6cef7ca48153e7
| * Display a notice when requesting a SSL map type without SSL supportPaolo Angelelli2019-03-252-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some plugins request map data for some map types over HTTPS. Without SSL support (Qt built without SSL support, or missing OpenSSL libraries) this typically translates into blank maps. This is very evident on the MapViewer example. This patch makes sure that the example displays a notice when this situation happens. [ChangeLog] Added a notice to the MapViewer example to inform when a HTTPS-based map is selected without SSL support. Change-Id: I85428bb0536f33089a0e6045301c089fafe69d74 Fixes: QTBUG-74195 Fixes: QTBUG-74294 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Improve GeoJson Viewer examplePaolo Angelelli2019-01-255-52/+72
| | | | | | | | | | | | | | | | Switches to Qt.labs.platform FileDialog and sets the proper initial directory, as well as handles command line argument Change-Id: I2ae4fc3244d1e2566556d3966aedf273ac98e3d1 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | Add QGeoJson: a GeoJSON parserJulian Sherollari2019-01-1818-1/+47072
|/ | | | | | | | | | | | | Add a Class to convert a GeoJSON document to a QVariantList ready to be used as Model in a MapItemView. It comes with autotests, example and detailed documentation. [ChangeLog][QtLocation] Added a GeoJSON parser which can be used to annotate maps with tracks, polygonal boundaries, etc. Fixes: QTBUG-64111 Change-Id: Ib06d3902a052f69f75ae40be5c9ab56023cad916 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Document source of icons in weatherinfo exampleKai Koehne2018-07-252-0/+40
| | | | | | Task-number: QTBUG-62053 Change-Id: Ia3eadc5594127a5289e37255541d641f6f1ba40a Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Expose add/remove transitions in MapItemViewPaolo Angelelli2018-07-047-0/+13813
| | | | | | | | In this way these transitions can now be customized by the user. Change-Id: I949d0caab65b0e71012bf77baee9c847c8f415a0 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Doc: Add missing dots (qtlocation)Paul Wicking2018-06-212-2/+2
| | | | | | Task-number: QTBUG-68933 Change-Id: Ie7863b196363022c0bb7c1fa4f258c4700b5abb3 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Merge remote-tracking branch 'origin/5.10' into 5.11Liang Qi2018-02-191-1/+0
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/location/declarativemaps/qdeclarativegeomap.cpp src/location/maps/qgeomap.cpp src/location/maps/qgeomap_p_p.h src/location/maps/qgeorouteparserosrmv5.cpp src/location/maps/qgeotiledmap.cpp src/positioning/positioning.pro Change-Id: I42f8b176a8f3e824c7fe5b067a958735173f0dbb
| * Remove forcing the qtquickcompiler on the mapviewer example5.10Paolo Angelelli2018-02-021-1/+0
| | | | | | | | | | | | | | | | Or else it prevents QML debugging. Task-number: QTBUG-64827 Change-Id: I7a31b6a575ed7a4f96368b87aaa883fd3ba2b940 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | Replace Q_DECL_OVERRIDE with overrideKevin Funk2018-02-051-1/+1
| | | | | | | | | | Change-Id: Iaa670de181255ea570fcf7bcbe465987ef7fc2fc Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Merge remote-tracking branch 'origin/5.10' into devPaolo Angelelli2018-01-071-0/+5
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: .qmake.conf src/imports/location/location.cpp src/plugins/geoservices/mapbox/qgeoroutereplymapbox.cpp Change-Id: I0c1ce33cff7bb1a65e65b8adafd2b31eb936d515
| * Merge remote-tracking branch 'origin/5.9' into 5.10Paolo Angelelli2017-12-151-0/+5
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I8300f5fcbbe3064049e11d2b04c10e35c9945c8d
| | * Add plugin dependencies to the mapviewer examplesPaolo Angelelli2017-11-151-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | This is a workaround for QTBUG-38735. Task-number: QTBUG-58589 Change-Id: I8e9031657d04f192b64581ea060dfc91bce3fada Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | QtLocation mapviewer example MiniMap improvementPaolo Angelelli2017-11-291-11/+47
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | The mapviewer example currently uses the minimap to show a red MapRectangle sized 10 degrees in latitude and 10 degrees in longitude. This patch makes the minimap visualize the actual displayed area in the main map as a red rectangle in the minimap. The minimap zoom level is also now gently bound to the main map zoom level. There's one bug left, though, but not related to this qml component, which causes the border of the red MapRectangle of the minimap to often be drawn on the left of the rectangle. Change-Id: I6ba332bf72f0489f5ada765c85f6890a09ca1a98 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta3Liang Qi2017-10-26112-356/+1377
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I9a3d7ec0bb203ac8b5bd483af3973510ca33c4a9
| * Fix outdated BSD license headerKai Koehne2017-10-17102-305/+1325
| | | | | | | | | | | | | | Use new version with commercial exception. Change-Id: I11058c94138615f7df2f99b6c3245ab075cd8222 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Fix outdated FDL headerKai Koehne2017-10-1710-50/+50
| | | | | | | | | | Change-Id: Ie9771204ea1aa46e333d96ab0f392c795c512946 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Fix mapviewer example build with -no-feature-libraryJake Petroules2017-09-151-1/+2
| | | | | | | | | | Change-Id: I4d2d430a1315afb1b5cbbaf254b08691579d28f2 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into 5.10Paolo Angelelli2017-09-053-2/+3
|\ \ | |/ | | | | Change-Id: Ibfd8b430011abb0a7174bbcc158b03f8e26492eb
| * Fix places_map example view on AndroidAlex Blasche2017-08-312-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | The previous setup enforced a small 360x640 view size on Android which makes no sense on the platform's full screen premise. This patch tells the QML rectangle to adjust to the parent's size and shifts the size limitation to the surrounding QuickView. At the same time the QuickView will automatically change to full screen as per platform requirement. Change-Id: I2dcd0fc345f6c1ef7520bb10116d9f2fe0722dff Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * Revert places_map.png to the pre-mapboxgl versionPaolo Angelelli2017-08-291-0/+0
| | | | | | | | | | | | | | | | The new screenshot did not match the code (showing Helsinki's pizzerias, not Oslo's) Change-Id: Ie51ca95c3e554e8a353d57e7a7db8f36521eef83 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-06-0711-10/+11
|\ \ | |/ | | | | | | | | | | | | Conflicts: .qmake.conf src/plugins/geoservices/geoservices.pro Change-Id: Ie82dd22c588e5cba409fc1ef31a65968ce9f719b
| * Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-04-182-2/+3
| |\ | | | | | | | | | Change-Id: I8ce0a0994d57fb077be4b6771f219bfc4134aa22
| | * example: use the compiler5.8Shawn Rutledge2017-04-101-0/+1
| | | | | | | | | | | | | | | | | | Change-Id: I18e750713befae9a30b052cc001cec8577349479 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| | * Doc: corrected link to Models and Views in Qt QuickNico Vertriest2017-03-141-2/+2
| | | | | | | | | | | | | | | Change-Id: I8a6e6a34ea22b5ba96b46f05e970cdaa91dbc6b4 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| * | MapViewer example: make double clicks zoom to integral zoom levelsPaolo Angelelli2017-04-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | In this way there's a way to easily get to a zoom level where the map is sharp Change-Id: I176cf3870d9c3fe970191d46c804e13daab674fa Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | Update location screenshotsThiago Marcos P. Santos2017-04-068-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | Better rendering using Mapbox GL plugin. Change-Id: I3ef1862988e652c1caad62920c2f3b5775f18552 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io> Reviewed-by: Bruno de Oliveira Abinader <brunoabinader@gmail.com>
* | | weatherinfo example: use lambdas instead of QSignalMapperAlexander Volkov2017-04-032-31/+12
|/ / | | | | | | | | | | | | | | QSignalMapper is deprecated since Qt 5.10. Besides code looks clearer with lambdas. Change-Id: I7e4681e0d6b354cd8da9a4506dad917799688dc9 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Polish MapViewer examplePaolo Angelelli2017-03-134-23/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch does some improvements to the MapViewer example. Namely: - sliders, which have been problematic in many ways, are now from QtQuickControls 2, and this solves a couple of glitches. - changing map provider now retains tilt, bearing and field of view, if possible. - High DPI scaling is enabled by default in main() - the slider panel is open at start Change-Id: I1cc380e3d05b89aa547139d912c142e4f0d266c9 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-03-102-1/+5
|\ \ | |/ | | | | Change-Id: Ibd6d68ced4edbd96fb67fe61244b83d597df5775
| * Don't build weatherinfo example without bearermanagementUlf Hermann2017-03-062-1/+5
| | | | | | | | | | | | | | | | | | bearermanagement is a platform-driven feature as lack of QLibrary disables it. We should thus check for it. Change-Id: Ia8c44f85293e528b54bef90c689bc409bc04aa86 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Default to 45degrees FoV if possiblePaolo Angelelli2017-03-011-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | The new MapSliders.qml component introduced a different way of binding the sliders properties. This makes the slider change the value in the map when these bindings kick in. This change explicitly sets a sensible default at map initialization time. Change-Id: I90d977003a571c2226c2dd6d5b66bc67a246e754 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Add rotation/tilt/fov sliders to the map viewer examplePaolo Angelelli2017-02-104-15/+333
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds a new qml element, MapSliders, that consist of a set of sliders to control camera parameters. This element can be hidden/shown using the included semitransparent button. The element can also be ported to the other examples to offer the same controls. This element can be positioned on the left or the right of the map, and for this example it has been moved to the left to not occlude the minimap. Change-Id: Icc56d90b181c2481727e73e3d332a66c05352f57 Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | 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
View Lorry Controller Status