summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Cleanup QGeoMap code.v5.5.0-beta1Michal Klocek2015-04-302-58/+29
| | | | | | | | | | This commit: * renames class members to use m_ naming convention * removes not required includes * removes not required forward declarations Change-Id: If1132ecf0413022ecfe4e781cb412bf8f8d6740e 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>
* Fix user interactions in mapviewer example.Michal Klocek2015-04-291-13/+16
| | | | | Change-Id: I73fb797f2b96198459214ea88f3b708fda53e543 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Unify the doc pages of all QtLocation examplesAlex Blasche2015-04-235-28/+39
| | | | | | | | | - Add the "Running the Example" section - Reorder existing information as a consequence of the new section - Reduce duplicated qdoc content Change-Id: I1df91a385ce17394da4f2debb4171ade63ce3fcc Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.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 incomplete category hierarchy in Here pluginAlex Blasche2015-04-172-3/+11
| | | | | | | | | The recent addition of a second level of categories failed to set the parent cat id for each child. Change-Id: Ib30050463b84c2f62972082c0a883bb96bc89c52 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* QtPositioning supports WinRTAlex Blasche2015-04-161-2/+3
| | | | | | | Make this obvious on module's index page. Change-Id: I5542d948bac6f92e4e0271435eabc226e5570efa Reviewed-by: Maurice Kalinowski <maurice.kalinowski@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>
* Fix missing doc link in positioning qml docsAlex Blasche2015-04-151-1/+1
| | | | | | Change-Id: Ibc0f5366f9e297ef1f2fd878a107ceb5d3633d0b 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 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-148-223/+205
| | | | | | | | | 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>
* Remove wheelAngleChanged signal from map apiMichal Klocek2015-04-023-28/+19
| | | | | Change-Id: Ifada1a0852fc431f48d8dbccbfa8555b90cb35f9 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Add new Here standard categoriesAlex Blasche2015-04-021-5/+32
| | | | | | | | | This is based on: http://places.api.here.com/places/static/doc/public/#topics/categories.html Change-Id: I13d5e35d769d80e3c5121bd0c2db5be3414fe099 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Use QDebugStateSaver to restore space setting in stream operators.Friedemann Kleint2015-04-012-2/+4
| | | | | | | | Returning dbg.space() breaks formatting on streams that already have nospace() set. Change-Id: I1ced3c46e18aba788298b6d9f60737b1004c6e9c Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Change mouse and touch handling in Map QML component.Michal Klocek2015-04-015-270/+270
| | | | | | | | | | | | | | | | | | | 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>
* 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>
* Avoid symbol clash between here and osm pluginAlex Blasche2015-03-3014-74/+75
| | | | | | | | | | This is of relevance for static Qt builds Task-number: QTBUG-43681 Task-number: QTBUG-45214 Change-Id: Iea9b4a7cad055dc47265bb51fe2654af80e356b7 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@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-2522-64/+82
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Adds a QGeoServiceProvider unit testsAlex Blasche2015-03-243-0/+211
| | | | | | | | | | | | Change-Id: I1f9ba929f28ef261eaab9d7ac0a96f6ca88c8767 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Do not build documentation snippets for androidMichal Klocek2015-03-231-1/+1
| | | | | | | | | | | | | | | | On andorid platform snippets are compiled as library, which results in failer during install. Change-Id: Ifca637710c11f121831e3185bf5e71bd04ef3e55 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.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>
* | Make Nokia/Here specific place test passAlex Blasche2015-03-181-1/+9
| | | | | | | | | | | | | | | | | | | | | | Retrieving of detailed place information is currently broken. This may be caused by an API or policy change on the here server. Further investigation is required. Change-Id: I43837c9a611f77cc70725cf42667a130136774e4 Task-number: QTBUG-44837 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-24 05:56:32 +0000