summaryrefslogtreecommitdiff
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
...
* | 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>
* Remove obsolete calls to map.state in mapviewer exampleMichal Klocek2015-04-142-22/+3
| | | | | Change-Id: I6fe478f1e7fd3c243c1da9623eac0a80f693e1a8 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Remove not used marker hover functionality from mapviewer.Michal Klocek2015-04-143-2/+1
| | | | | Change-Id: I83511201db05298899dd1f9202cbe3c26b6b19ea Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Refactor code and fix documentation for mapviewer example.Michal Klocek2015-04-145-128/+133
| | | | | | | | | Refactor code so the MapComponent holds the most of revelant code for documenting. Rewrite mapviewer example documentation so it fits the current code snippets. Change-Id: Idf468d2025303a42cea6ca8d24ed541c509911c0 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Change slider orientation in mapviewer example.Michal Klocek2015-04-141-49/+43
| | | | | | | | Set zoom slider to be vertical and move map scale information to right bottom corner. Now it is easier to read map copyrights and scale. Change-Id: I5d76fabe2e7b3fc08a4274a3efb25435ebd1dc0d Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Clean up files in mapviewer example.Michal Klocek2015-04-1432-86/+90
| | | | | | | | | | | Rename files, move the subdirectories, remove obsolete dependencies to location examples plugin. Conflicts: examples/location/mapviewer/mapviewer.pro Change-Id: Id85dfffc32761eb9d2999b8e07b87f9912700659 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Reformat mapviewer example code.Michal Klocek2015-04-1313-635/+672
| | | | | | | | | Make code to follow qml coding conventions. Use switch instead of if-else statement. Add helper.js with common functions. Change-Id: Iba989d3677fa428b45609f24a82b26ef7cefe675 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Remove map's background in mapviewer example.Michal Klocek2015-04-132-40/+1
| | | | | Change-Id: I4010e9081d5718e18a05df6933a1297421ffccd7 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Change 'branding' of mapviewer example.Michal Klocek2015-04-132-49/+19
| | | | | | | | Remove not existing nokia POIs. Use The Qt Company POIs instead. Change-Id: Id16ada3ca977b7040047ec65c57217ef9633dc6b Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Replace route information list in mapviewer example.Michal Klocek2015-04-136-167/+308
| | | | | | | | | | Old implementation is hard to use with touch devices, since it requires drag from left edge of screen to see the route information. Show route info from item's menu instead. Use qtquickcontrols. Change-Id: I8dc73d13a9e2ed0b7730f1ecbde413f22e1c897b Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Replace route and point menus in mapviewer example.Michal Klocek2015-04-134-91/+110
| | | | | | | Use qtquickcontroles based one. Change-Id: I02f657cbb2b3f2728edd3287b0d7edf793c20aa7 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Replace item draw menu in mapviewer example.Michal Klocek2015-04-133-75/+42
| | | | | | | Use qtquickcontroles based one. Change-Id: I7d915e3c687ab46d8390681a12c4009043016092 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Replace language button in mapviewer example.Michal Klocek2015-04-135-96/+98
| | | | | | | Move language button fuctionality to tools menu. Change-Id: I29c9aa2594113b93995788b9938602537a293b9f Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Replace new coordinate dialog in mapviewer example.Michal Klocek2015-04-134-43/+21
| | | | | | | Use qtquickcontroles based one. Change-Id: Ib67e12d55bfba53997857210dea26a314ff827fd Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Replace marker popup menu in mapviewer example.Michal Klocek2015-04-135-77/+103
| | | | | | | Use qtquickcontrols based one. Change-Id: I36cb46aa9de076f0aea3e102802a87369d7195a7 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Replace map popup menu with qtquickcontrols based one.Michal Klocek2015-04-134-59/+97
| | | | | Change-Id: I1ce01528f260dfb7f735c2b2ab777404a5a4a5b4 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Replace reverse geocode dialog in mapviewer example.Michal Klocek2015-04-133-34/+79
| | | | | | | Reverse geocode dialog use qtquickcontrols now. Change-Id: Ifb231fbdaf70e972516980407218386329b083b3 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Replaces gecode dialog in mapviewer example.Michal Klocek2015-04-133-52/+103
| | | | | | | Geocode dialog use qtquickcontrols now. Change-Id: Ifeecf3c5d230e5feefb1383d2a177a3a5411715e Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Replace route search dialogs in mapviewer exampleMichal Klocek2015-04-136-591/+307
| | | | | | | Search dialogs use qtquickcontrols now. Change-Id: Ieb79ce5c58c3ac9fcd613fbfb89d395eb1982168 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Replace messagebox in mapviewer with message form.Michal Klocek2015-04-134-158/+62
| | | | | Change-Id: I19c5ac1e02aa9528c5390f4c8a934e2862400bbd Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Adds new qtquickcontrols based forms.Michal Klocek2015-04-137-0/+947
| | | | | Change-Id: If3a23177dad5eb46d634258fdcb7214f60a74a56 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Autoindent the code of mapviewer example.Michal Klocek2015-04-131-310/+310
| | | | | Change-Id: Ib2db2761f6a3f3a36d40869ec6be42b8ea7ec376 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Add StackView to mapviewer example.Michal Klocek2015-04-131-20/+31
| | | | | Change-Id: I1fbecdb94628f4ac1305b6e92382f2fd8094cf72 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Rewirte mapviewer main menu handling.Michal Klocek2015-04-134-186/+192
| | | | | | | Use qtquickcontrols for provider, maptypes and tools menu. Change-Id: I0805e9af7ed8eed2a0d4422e543c79dd3183c3af Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Replaces slider and language button with qtquickcontrols.Michal Klocek2015-04-132-25/+18
| | | | | Change-Id: I0371e55b59062d38a7bde46c0e7f0182e863d92f Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Add qtquickcontrols window to mapviewer.Michal Klocek2015-04-132-146/+153
| | | | | Change-Id: I0dfbb86eb2566a1a0f551b5f21abf6e4574a2de3 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Add explicit dependency list to QtLocation examplesAlex Blasche2015-03-304-4/+4
| | | | | | | | | | | | This is required for static builds so that qmake can work out which libs and plugins must be included. Task-number: QTBUG-43681 Task-number: QTBUG-45214 Change-Id: Ifc16b8147e1cf2ae39e3b626f2fd0dc19906b1e6 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>