summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Fix some typosSergio Ahumada2014-03-0317-18/+18
| | | | | Change-Id: If46057e48040fda7b61b81e735c171daf2cc7d06 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Tile cache versioning for Nokia mapsAnders Gunnarsson2014-03-0320-23/+419
| | | | | | | | | | | | | | | | Added to avoid mixing of different map versions in map view. Generic cache versioning by adding an incremental version number to tile specs and filenames. Default version -1 falls back to not using version in file names for backward compatibility. Nokia specific version management by implementing the version request, comparing all version information and increment the version if anything has changed. Task-number: QTBUG-25559 Change-Id: I6820f2efbe7458701475cc833d3077022797b2df Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Prefer to use normalised signal/slot signaturesSergio Ahumada2014-03-034-58/+58
| | | | | | Change-Id: I8425c141add90f58aefcf2b9706f9d6328382644 Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Fix compile warningAlex Blasche2014-03-031-1/+1
| | | | | Change-Id: Ic00ce63f769e87e222759c5c896e7cc741e31795 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* Normalize signal & slot signatures in connectionThiago Macieira2014-02-2811-38/+38
| | | | | | | | Profiling shows Qt Creator spends 2% of its load time normalizing Change-Id: Ica52c45e34fe53823b31faaa7d77a633458549d5 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Position plug-ins don't need QtGuiOswald Buddenhagen2014-02-283-3/+3
| | | | | | | Task-number: QTBUG-36893 Change-Id: I54f71f3369e82edfadb679cb5ed27e3dd0a78c0e Reviewed-by: Alex Blasche <alexander.blasche@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Bump all qml code to QtLocation 5.3Alex Blasche2014-02-2678-134/+134
| | | | | | | It is the baseline for all subsequent additions. Change-Id: Ia56da45b8b92dd0224dbeff97976cd06aa25d943 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* Fix QtLocation QML API and its version.Alex Blasche2014-02-262-97/+84
| | | | | | | | | | Despite missing QtLocation 5.3 release we will fix the QML Location API as of 5.3 release time. This does not affect the C++ API. We keep the 5.0 version tag but 5.3 becomes the defacto standard. Change-Id: I93838a97a01c8b886a86e8b2bab3dedc595a2ee6 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* Use 512 pixel tiles from the Nokia/HERE service.Aaron McCarthy2014-02-262-9/+6
| | | | | | Task-number: QTBUG-36949 Change-Id: I80fe3762b7e8f4dc1b7d56a43d6ab22788c0b702 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Remove unnecessary code.Aaron McCarthy2014-02-265-21/+11
| | | | | | | | 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-2610-33/+13
| | | | | Change-Id: I078c9eb57ad5a2aa70fde8900ec46958aa1882e1 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Remove test code related to removed gestures.Aaron McCarthy2014-02-261-211/+4
| | | | | | | | Rotate and tilt gestures were recently removed. Some of the related test code was left in which is now failing. Change-Id: Iadb5b40cb5e2740f331453b673b89948fb829e51 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Fix unstable PositionInfo test.Aaron McCarthy2014-02-261-3/+2
| | | | | | | | The speed reported by the position source can vary due to the system load and scheduling during the test. Increase the tolerence. Change-Id: I26c0e6a9c19cfe73f7c1c24b133dbd3cc5abc04e Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Fix translatable strings and cleanup unnecessary stringsAlex Blasche2014-02-2616-211/+58
| | | | | | | | | | | | 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>
* Update QtPositioning QML API meta data including new 5.3 features.v5.3.0-alpha1Alex Blasche2014-02-251-2/+17
| | | | | | | Change-Id: Ic841572e3079c0f600c696b477d9f7220d130029 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com> Reviewed-by: Jim Ehrismann <jehrismann@blackberry.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Copy qmldir of test import to destination directory.Aaron McCarthy2014-02-252-0/+14
| | | | | | | | | | Test imports, used only during tests, are not installed prior to running tests. Copy the qmldir file to the output directory so that the tests can successfully load the import. Task-number: QTBUG-31797 Change-Id: I85095eb7532df6b1fc06f10e46ed8b4db41554a6 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* Add debug to test case.Aaron McCarthy2014-02-251-0/+1
| | | | | | | To help debug a test failure in CI. Change-Id: I2d8c8ac3e873c80bf6c4c317dfc0db19d7a1255a Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Frederik Gladhorn2014-02-1213-48/+159
|\ | | | | | | refs/staging/dev
| * Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-02-1213-48/+159
| |\ | | | | | | | | | Change-Id: I1de140f15e028425e888e6ef52d9f2ff11fd9d5b
| | * Add QML test for comparing QtPositioning base types.old/5.2Aaron McCarthy2014-02-112-2/+47
| | | | | | | | | | | | | | | | | | | | | | | | Tests added for comparing Coordinate, Shape, Rectangle and Circle. Task-number: QTBUG-33561 Change-Id: Ie826f670e75b26ac43ad7cea7c9b108b01008f3d Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| | * Mark QNmeaPositionInfoSource tests as insignificant on Windows.Alex Blasche2014-02-105-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | The local TCP socket required by these tests regularly fails on the Windows CI due to heavy load. Change-Id: I65e6150b8c735aec85e643cf1702344ff707723d Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| | * Fix documentation link to GeoShape::contains().Aaron McCarthy2014-02-101-1/+1
| | | | | | | | | | | | | | | Change-Id: I8e2a77a5daade3cc12da95ff12d28977af069e8c Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| | * Add index context property to QDeclarativeGeoMapItemBaseMichael Krasnyk2014-02-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | ... for indexing alternative routes in a delegate of QDeclarativeGeoMapItemView Change-Id: If40c40bcc4e89c92c473b98fddaad163c73c08c3 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| | * Report direction and vertical speed with Geoclue plugin.Aaron McCarthy2014-02-042-14/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Geoclude provides both direction and vertical speed information with the velocity interface. These values were previously being ignored. [ChangeLog][QtPositioning][Geoclue] The Geoclue plugin now reports direction of travel and vertical speed attributes, if supported by the active Geoclue provider. Task-number: QTBUG-36298 Change-Id: I9f99a64f3c2bd78a06a6c60e0ef3af6f75223e9f Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| | * Merge "Merge remote-tracking branch 'origin/release' into stable" into ↵Frederik Gladhorn2014-02-031-26/+12
| | |\ | | | | | | | | | | | | refs/staging/stable
| | | * Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2014-01-271-26/+12
| | | |\ | | | | | | | | | | | | | | | Change-Id: I3c7e65df05c1aa3eec86eaf81a7fa1d263f7a22b
| | | | * Update changelog for 5.2.1v5.2.1Thiago Macieira2014-01-241-26/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic9c96f04ee00ac04dc3f3c1abdb09deb129eb5a4 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| | * | | Update gitignore following the their source tree shiftAlex Blasche2014-01-291-5/+5
| | |/ / | | | | | | | | | | | | | | | | Change-Id: I039d02743cae469704f4815393a0c73b6444a660 Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* | / / Grab mouse when a gesture is detected.Aaron McCarthy2014-02-121-6/+10
|/ / / | | | | | | | | | | | | | | | | | | | | | If the mouse is not grabbed when a gesture is detected both the map and any MouseArea end up handling the same mouse events. Change-Id: I62d2a576250484f465b8c60f8ab60aad032b1490 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | | Remove bearing and tilt from the qml APIFabian Bumberger2014-02-114-230/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | Bearing and tilt are rather far away from a working state. This patch removes them from the public qml API and the documentation. Change-Id: I820fed3f1acf9a05e250e474bf3ac35fcb6fc19f Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | | Fix declarative_ui tests.Aaron McCarthy2014-02-119-44/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Add missing MODULE_PLUGIN_TYPES to location.proAlbin Olsson2014-02-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | MODULE_PLUGIN_TYPES was missing from location.pro It was needed to deploy QtLocation to Android device. Change-Id: Ic93a3711039d679fa2d859c6d54599b121464b82 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | | Test that the mapping manager engine pointer is still valid.Aaron McCarthy2014-02-1011-113/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QPointer holds a guarded pointer to a QObject. It must always be tested prior to use. Changed the parameter type to remove the need for the static_cast when setting the QPointer member. The root cause was that the tile fetcher object was not being destroyed when the mapping manager engine was. Which was because the two objects were in different threads. Some of the service specific tile fetchers were directly calling into the engine objects across thread. Gah. Since Qt 5 QNAM uses an application global thread for processing requests, there is no need to use threads in the tile fetcher. Change-Id: Id9df35ddfa78df2cbf334006fe5fc9726a75f92d Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | | Emit panFinished() when pan finishes without a flick.Aaron McCarthy2014-02-101-1/+3
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-32638 Change-Id: Idb49b6886993545667324a0c861d88ffefd29131 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | | Fix CoordinateAnimation documentation.Aaron McCarthy2014-02-101-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following issues were fixed: * The documentation was declaring that it was it QtLocation instead of QtPositioning. * Remove module prefix from properties. * Change property type to coordinate. * Add since tag. Task-number: QTBUG-36366 Change-Id: I6e3fd81b377f6c9afd188a2695601ab45485d007 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | | Simplify property change logic in Position type.Aaron McCarthy2014-02-103-215/+149
| | | | | | | | | | | | | | | | | | | | | | | | | | | Removes all member variables and replaces them with a QGeoPositionInfo. Uses the same value changed and validity changed logic for all properties. Change-Id: Ic0420ce7a26da2db12c3eabcad4beac83ea332fe Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | | Add direction and vertical speed properties to QML Position type.Aaron McCarthy2014-02-107-19/+183
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QML and C++ position types now provide the same functionality. Position attributes are always set/reset on every position update. This ensures that old values of speed, accuracy, direction, and vertical speed are not indefinitely reported in QML. Values are set to NaN and if appropriate the associated is valid property is set. [ChangeLog][QtPositioning][Position] Added direction and vertical speed properities. Change-Id: Ia02da8a5bc1cd68489eb58180986df512c24aa2f Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | | Fix documentation errors.Aaron McCarthy2014-02-104-6/+5
| | | | | | | | | | | | | | | Change-Id: I16b4f9116a651edaebc54957daf528278785bc55 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | | Remove dependency between MapStyle and Nokia map schemesAnders Gunnarsson2014-02-074-60/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makes it possible to add Nokia base schemes without adding new MapStyles. Removes the redundant collection of base schemes. Change-Id: Ia2189a3f10ba47cc40087b7d4fee9a2c5d84caad Reviewed-by: Alex Blasche <alexander.blasche@digia.com> Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* | | Nokia plug-in URL and tiler API updatesAnders Gunnarsson2014-02-0712-60/+130
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated URLs for places and map tiler to current ones. Added URL management for additional hosts for hybrid, terrain and satellite maps. Added new languages and map types available in the new tiler API. Bug fixes for code evaluating copyrights text to show. Now only copyrights related to viewed maps are shown and each name is shown only once. Updated drawing of copyright information to show HERE logo and copyrights text side by side. This is to avoid having logo jumping up and down. Change-Id: Ide18a95335c4299c8219c4dbcfb0cc60b43d46c3 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | | Add new Satellite Information exampleAlex Blasche2014-02-0710-1/+905
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][QtPositioning] New SatelliteInfo example added. The example displays the signal strength of surrounding satellites. The example employs a demo mode on those platforms which don't provide satellite information Change-Id: I573266c7a4429c0d2f1bcdfeb01af52ad02efba7 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | | Work around broken Map mouse tests.Aaron McCarthy2014-02-071-18/+23
| | | | | | | | | | | | | | | | | | | | | | | | Due to QTBUG-36560 some map mouse tests were failing. Implement a valid workaround until it is fix. Change-Id: Iec67f82d2e2a9792ed067b9cd956345ab38e7ab7 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | | Fix map item behavior when used with a MouseArea.Aaron McCarthy2014-02-0714-131/+143
| | | | | | | | | | | | | | | | | | | | | Update the geo coordinate properties when the map items are moved. Change-Id: I32918571379d81c651e652513b63945ee23e3fd9 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | | Add new markers at touched location.Aaron McCarthy2014-02-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New markers added in the mapviewer example were being placed at the top left hand corner of the displayed map, just out of view. The user had to pan the map to see the newly added marker. Changed to position new markers at the location touched by the user to activate the context menu. Change-Id: If328e04cfd651a75fb91d599bedbd1129e761c7b Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | | Prevent the map stealing mouse events from the zoom slider.Aaron McCarthy2014-02-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fixes using the slider to zoom the map. Task-number: QTBUG-34237 Change-Id: I78b005030c3d869e63b9391e41d05ff28caa3cf5 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | | Missing changes from MapMouseArea removal.Aaron McCarthy2014-02-066-374/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MapMouseArea has been removed. Remove MapMouseEvent, it is no longer required. Remove some remaining MapMouseArea instances in the tests. Change-Id: I12c534bb3360f6a19ec9e1dd40ecf7bb0d7b8e21 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | | Remove the GeoMapMouseAreaFabian Bumberger2014-02-0623-707/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Revert "Temporary workaround for failing unit test on win8 config in CI"Alex Blasche2014-02-051-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 93773ce48d3f884fbd71a6783d317bda1880bd37. The related bug was fixed in qtdeclarative (see c6da58a295235c89ee2a5847b15cb0b1dc66b2f4) Task-number: QTBUG-36519 Change-Id: I233d08f091fb3273f111d41c4743808d8aaf4637 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | | Attempt to crash in tile cache.Aaron McCarthy2014-02-051-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The tile cache can sometimes end up with null pointers which causes a crash when saving the state of the cache queues to disk. Fixed by skipping over these entries. Task-number: QTBUG-36486 Change-Id: Ifa359bd1f9dbe37da0d5b208a7c4ee7a26f8bd44 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | | Fix QGeoRouteXmlParser test.Aaron McCarthy2014-02-042-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | The TravelTime element is a double, which was failing to be parsed by QString::toInt(). Fixed by using QString::toDouble() and rounding the result. Change-Id: I012c277f1efdb3811a50eff96519a4d0d9959a67 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-08 04:20:45 +0000