summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Update all FDL licensesAlex Blasche2015-02-1829-143/+143
| | | | | | | | Changes the copyright owner to The Qt Company and sets the copyright year to 2015. Change-Id: Iad6d74044968befe94c2824af2f7f9273bed843a Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
* Update BSD and LGPLv2.1 licensesAlex Blasche2015-02-18131-374/+374
| | | | | | | | - Removes subsidiary extension from Qt Company - Replaces remaining occurrences of Digia in BSD and LGPLv2.1 Change-Id: I7467a6744af7d1c3aef3c29118f219399162a18c Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
* Add Q_DECL_OVERRIDE where missingAlex Blasche2015-02-1710-56/+65
| | | | | | | | | | | | | | | | clang 3.6 and later print a warning for such cases. This patch fixes all override warnings caused by the content of the qtlocation itself. The remaining cases are triggered by headers outside of the qtlocation repo. This patch only fixes cases which clang on Linux can reach. It is possible that some of the platform specific plugins still have some ovveride related cases. Change-Id: I9f93062511d38cba4449b7fc70e65c93d4251a8b Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Prepare QtLocation & QtPositioning QML type definition for Qt 5.5Alex Blasche2015-02-174-33/+48
| | | | | | | | | | | | | The GeoShape is compatibile as the class name changes but the functionality and naming is the same in QML. The QtLocation changes are additions which become available and Qt 5.5. is the first official release anyway. Hence the normal rules about \since do not apply. Change-Id: I41d8afea955001845ab143535f6653fce715b9d8 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* Use separate cache dir per geoservice/mapping pluginAlex Blasche2015-02-174-8/+36
| | | | | | | | | | | | | | | This has the advantage that concurrent use of multiple plugins doesn't force one plugin to load the tiles and queues of another plugin into its tile cache. QGeoTileCache could potentially separate the non-relevant tiles as well but that's even more effort and requires the QGeoTileCache instance to know to which QGeoMappingManagerEngine it belongs. Task-number: QTBUG-40780 Change-Id: I342168c30a424b9f66d9c4e07694c1e3a9f2a412 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Update all LGPLv2.1 license headers in source to latest versionAlex Blasche2015-02-15116-477/+461
| | | | | | | | | | | This affects all QtPositioning related code and the test code in the entire repository. The Qt Company is set as new copyright owner and the copyright year is bumped to 2015. Change-Id: Iee0e990680683c20f5920e49cc1063ea9349e2cd Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* QGeoMapScenePrivate::setVisibleTiles(): remove unused local variableMaks Naumov2015-02-131-1/+0
| | | | | Change-Id: Id44ead67cc98f558cb8b2fc0c311b4d90fc77764 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* Merge remote-tracking branch 'gerrit/5.4' into devAlex Blasche2015-02-1133-70/+67
|\ | | | | | | Change-Id: I5ef7649f02455269a8e2caa2f2d2241503586be3
| * Fix non-building geoservices pluginsAlex Blasche2015-02-091-1/+1
| | | | | | | | | | Change-Id: I2f0e896e3fff64ddf69d91a8053f98f3424f3747 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * Use single-char QString operations for efficiencySergio Ahumada2015-02-094-8/+8
| | | | | | | | | | Change-Id: I45cf92e81e94cf62a21de2e01d9f8039ec1f2672 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * Remove duplicate includesSergio Ahumada2015-02-092-3/+0
| | | | | | | | | | Change-Id: I52374c69558c550504b56927501a9b3b337dcc6d Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * Add the QtCore/ library prefix in public headersSergio Ahumada2015-02-0921-45/+45
| | | | | | | | | | | | Change-Id: I538f0de4d2fca50e42114934f12dfd0ee51088e9 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * Rename positioning/flickr example to geoflickrAlex Blasche2015-01-276-13/+13
| | | | | | | | | | | | | | | | | | | | This makes it more compliant with standard naming conventions and more easily distinguishes this example from flickr examples in other modules. Task-number: QTBUG-41831 Change-Id: Id4953777326a0463d57d52df92c70860addc61ff Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Change default maximum zoomlevel change per inch for MapAlex Blasche2015-02-102-2/+2
| | | | | | | | | | | | | | | | | | This means the pinch gesture zooms much quicker which brings it roughly in line with mouse wheel gestures. Change-Id: I0908b309c8ad60bfd520c9ed150982d9ca69e4fd Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Doc: Fixed a few issues with the qdocconfVenugopal Shivashankar2015-02-101-5/+2
| | | | | | | | | | | | | | | | | | - Removed the overviews subproject due to lack of landing page - Changed the qml subproject selector to qmlclass instead of fake:headerfile Change-Id: I41a9153abcbfd140e93b8f49c409ce6ccb14e3f1 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Improve filtering of touch and mouse events.Aaron McCarthy2015-02-064-80/+195
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change is based on b34bee26c932b9f7579e99d1dca632cb8c47d85f which was reverted by 7f1067c97f55da45ffe3da7ec91ad32a2bcef255 as it introduced regressions on some platforms. All synthesized mouse events are now ignored, map handles touch events directly. Improve mouse and touch id grabbing in gesture state machines. Only accept left mouse button. Only accept one type of input at a time. Touch input is preferred. If mouse input is started before touch it will be cancelled. If mouse input is started after it will be ignored. Change-Id: I31c1c30a49fc747875d37a9e643c118f05d78772 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Fix places_map exampleAlex Blasche2015-02-061-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1.) Use qrc to avoid errors where the binary is started from outside its binary directory and cannot find the png and qml files. 2.) Use OSM as place provider to avoid non-working example due to missing Nokia credentials 3.) Improve documentation 4.) Add locality element to the example. This shifts the search area to the current location rather than Brisbane/Australia. Brisbane is still the default location. 5.) Avoid that Brisbane is shown but the pizza search is done at the GoldCoast. Change-Id: I4845de04abd8ea4be2081bb24bdae27e470cb918 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* | Remove obsolete define from QtPositioning QML pluginAlex Blasche2015-02-061-1/+0
| | | | | | | | | | Change-Id: I68011b5546c51eaf5a2fc5ccae40c53536ddb62c Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* | Make Open Street Maps the default plugin used in Qt Location examples.Aaron McCarthy2015-02-045-6/+6
| | | | | | | | | | | | | | | | | | The Nokia plugin requires application authentication codes before it can be used. The OSM plugin does not. Use the OSM plugin by default so that the examples work out of the box. Change-Id: I4c965dc35b0ae6b643ee14f64c0758fee2bb958d Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Add support for places to Open Street Map plugin.Aaron McCarthy2015-02-0212-18/+859
| | | | | | | | | | | | | | | | | | | | | | | | | | Implement basic places support based on the Open Street Map Nominatim service. Support for read only categories and place searching is supported. The plugin does not support getting place details, getting place content, search suggestions, saving/removing places or saving/removing categories. Change-Id: I5a185cdf25b50d5b377be4d2c3c53c8f1e807288 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Doc: Language editsVenugopal Shivashankar2015-02-022-85/+75
| | | | | | | | | | | | | | | | | | - Restructured the overview a bit - Reduced content duplication to certain extent Change-Id: I5cc686848298d1a87de7c566eb01345121ffe377 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Doc: Few updates to the qdocconfVenugopal Shivashankar2015-02-021-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | - Changed the qml.selectors to qmlclass so that the tree in the qch has a node entry for each qml type page. - Removed the overviews subproject as there is no leading page that groups all the overviews under it. The overviews are linked from the main index page anyways. Change-Id: Ib0af74787cd6557823f130892fd5ed87943b3090 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Remove connection to non-existing slotAlex Blasche2015-01-291-1/+0
| | | | | | | | | | | | | | This is a cleanup after d8d9c4fbb6047b59b98108d6e3221206aa926ccd Change-Id: I99007e78ad47c68445e219e79d56bd2336ff6738 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* | Add support for more tile types to OSM plugin.Aaron McCarthy2015-01-287-32/+189
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In addition to the existing MapQuest tile set make the ThunderForest tile set also available as additional supported map types. This change adds the following map types to the OSM plugin: StreetMap - from MapQuest SatelliteMapDay - from MapQueset CycleMap - from ThunderForest TransitMap (day) - from ThunderForest TransitMap (night) - from ThunderForest TerrainMap - from ThunderForest PedestrianMap - from ThunderForeset Change-Id: I663b275689ee55929d0afa7da20ed3c57c78e037 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Add cycle map type.Aaron McCarthy2015-01-283-0/+3
| | | | | | | | | | | | | | Defines CycleMap type which is optimised for cyclists. Change-Id: Ib9076307a7ba0d5ac103220fc3cc816dec53148a Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Allow HTML based copyright notices.Aaron McCarthy2015-01-279-38/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In addition to the image based map copyright/attribution notice allow a geo service provider to provide a HTML string which is rendered and displayed. Add copyrightLinkActivated signal to the map to enable the application to launch the url in an external browser. The geo service providers are no longer in control of the position of the copyright notice. For the time being it will be placed at the bottom left of the map. Change-Id: I49bfc58a70e9254220903d5103c714c08f327e8b Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Cleanup QtQml header includes in Positioning and LocationAlex Blasche2015-01-278-23/+0
| | | | | | | | | | | | Change-Id: Ib79de53b05cc5a9edf4ed84021b90809c9816052 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com> Reviewed-by: Michal Klocek <michal.klocek@digia.com>
* | Avoid map polyline/route/polygon draw around half the worldAlex Blasche2015-01-273-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is triggered when the longitude difference between two coordinates is 0 which causes an artificial wrap around half the world. The already existing fuzzyness check between the coordinate's pixel positions is not sufficient. The conversion from geo coordinates into pixels involves math which can trigger larger pixel differences despite relatively tiny longitude differences. On the other hand the to be called geoDistanceToScreenWidth() function already wraps when the longitudes have a close enough value. Task-number: QTBUG-43107 Change-Id: I0b1432e47240e9911e77a0e53e74f560356eee4b Reviewed-by: Michal Klocek <michal.klocek@digia.com> Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* | Export QDoubleVector?D streaming operatorsAlex Blasche2015-01-272-6/+6
| | | | | | | | | | | | | | | | This was missing during a previous debugging session. Change-Id: I9b78b88ffcffa0ae0a327ee82f57e9b754af2a65 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Ensure QtPositioning value types don't change QDebug spacing policyAlex Blasche2015-01-275-32/+36
| | | | | | | | | | | | Change-Id: I1a98df26582957b0df136e98acf5d2754fe45295 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Don't reparent network replies away from their owning network managerLars Knoll2015-01-266-28/+6
| | | | | | | | | | | | | | | | | | | | | | | | This can cause bad things to happen when the network manager owning the replies gets deleted. The network manager destructor usually cleans up it's own replies. When reparenting them away that won't happen, but the replies might still have pending events and have pointers back into the network manager. Change-Id: I1d8330a198e9225a557d127f4a91247bcfa4812f Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Make compile QtLocation after changes to QValuePrivateAlex Blasche2015-01-265-6/+6
| | | | | | | | | | Change-Id: I0ff4814d1615226140144a6185abc793f35ebab0 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | Fix OSM routing service. It sends route instructions with nine entries.Alex Blasche2015-01-211-1/+1
| | | | | | | | | | | | | | | | | | | | I have not been able to find documentation what the 9th entry represents but in 99% of all cases there is a 9th entry. Right new we don't need it though and the OSM plugin should be permissive of additional route instructions anyway. Change-Id: I9ef81bc9059de1b634e94705b76c7c9643153435 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* | Better names for incorrectly named Map functions.Aaron McCarthy2015-01-2019-89/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The functions to transform between coordinates and position on screen were incorrect. Documentation and function names did not match implementation. New functions with better names have been added and documentation updated to match implementation. Old invalid functions have been deprecated. Related private symbols have been renamed to match their purpose. [ChangeLog][QtLocation][Important Behavior Changes] Functions in Map item which are used transform between coordinates and screen position have been deprecated due to confusing naming. Change-Id: Ic501cd81220414800bc2247eae9f510954ee469f Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Merge "Merge remote-tracking branch 'origin/5.4' into dev" into refs/staging/devFrederik Gladhorn2015-01-192-13/+15
|\ \
| * \ Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-01-192-13/+15
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I13d7ceaae445a4f2d006031b870bd8b29a900e30
| | * Remove "qrc:/" if it is the start of the nmea source urlAndy Shaw2015-01-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a relative path is given and the source of the qml file is inside the qrc then it will cause "qrc:/" to be prepended causing it to fail to find the file. Therefore it should also remove "qrc:/" from the start of the url if that exists. Change-Id: I369ae933d77511a8f7b9db7585922b8ad70ef571 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| | * Fix touch event handling in transformed map.Aaron McCarthy2015-01-151-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | Transform the scene position of the touch event to maps coordinate system. Fixes panning behavior in map displayed on device in a non-default orientation. Change-Id: I1db7b64666ca61932954bcebbabd30c168e00cc1 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | | Don't override user's Map.zoomLevel when initializing QGeoCameraDataAlex Blasche2015-01-191-1/+4
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The user-chosen zoom level was reset during QGeoMap initialization. This was caused by the construction of the QGeoMapController which in turn constructed the first QGeoCameraData instance which had a default initialised zoom level of 9. This default zoom level was immidiately set as the maps zoom level which in turn invalidated the user's choice. [ChangeLog][QtLocation][QML Map] Prevents overriding of user chosen map zoom level during initialization. Task-number: QTBUG-40779 Change-Id: I074632111738ffad041a7c54040168abca018fa2 Reviewed-by: Michal Klocek <michal.klocek@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Fix connecting copyrightsChanged to not existing map object.Michal Klocek2015-01-161-1/+1
| | | | | | | | | | | | | | | | | | | | When map is not initialized and onMapChildrenChanged() is called, QDeclarativeGeoMapCopyrightNotice tries to connect slot to not existing map. Change-Id: I2a083a4251114442dba48ce971e7acd7b59cdd2c Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com> Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* | Fix empty map on screen issue when map initialized or map type changedMichal Klocek2015-01-161-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | When map is created, tiles are pre fetched for other zoom levels. Function setTileBounds does not work correctly, since tileSet after prefetching can contain tiles for different zoom levels. Wrong tiles bounds lead to wrong center setup in cameraSetup() call. Add a check if tile belongs to current zoom level when calculating tilesBounds. Change-Id: Id3ed35939d16034fa4262f5015eb183a17104699 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Re-add removed docs for QtPositioning QML value typesAlex Blasche2015-01-151-0/+417
| | | | | | | | | | | | | | | | | | | | | | The documentation was removed by 8bf0a15bfc124fbb664592d4c3f29973fc23262e The change includes and update of the content as well. Change-Id: I2200d989d0de343f9b2776388a4bc3a989851f1f Reviewed-by: Michal Klocek <michal.klocek@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Cleanup qRegisterMetaType<T>() callsAlex Blasche2015-01-154-16/+16
| | | | | | | | | | | | | | The non-parameter version is much more secure. Change-Id: I70612c60d780a972bbf9c852f50f7b0c6f2a0402 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
* | Remove temporary operator< for QtPositioning value typesAlex Blasche2015-01-155-36/+4
| | | | | | | | | | | | | | | | | | | | | | | | The operators were added by 8bf0a15bfc124fbb664592d4c3f29973fc23262e. They were required to enable QML comparison of those value types. This requirement was removed by the introduction of QMetaType::registerEqualsComparator() in Qt 5.5. Change-Id: I3950726c26144420157f12b59b9c15cc1f5ffc40 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com> Reviewed-by: Michal Klocek <michal.klocek@digia.com>
* | Fix crash when mouse area in uninitialized map receives eventMichal Klocek2015-01-131-0/+1
| | | | | | | | | | | | | | | | | | User can click mouse area over the map. If the location plugin does not initialize the map in time, this leads to crash. Adds a check that qdeclarativegeomapgesturearea has a valid map object. Change-Id: I0cafff23d35ed2434028e6c3ed361165773edad5 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Adds mapping manager error handling to qmlMichal Klocek2015-01-139-28/+88
| | | | | | | | | | | | | | | | When map is created, plugins can report errors in case of missing required parameters. Expose error message to qml. Change-Id: I014e55cd4aad5ba15ffd0a15bc1f414c21feacc8 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Make compile on QNX 6.6Alex Blasche2015-01-122-12/+12
| | | | | | | | | | Change-Id: I922a856f2dbde1da544b6c30586dc0107d1c0b3a Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | Remove V8 references from QtLocationAlex Blasche2015-01-1210-30/+15
| | | | | | | | | | | | | | | | This fixes the current build break in dev too. Change-Id: Id35f4411c228e4365042ab370c7c505f611cb694 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Michal Klocek <michal.klocek@digia.com>
* | Add Mapbox plugin.Robert Ancell2015-01-0912-1/+747
| | | | | | | | | | | | | | | | Allow Mapbox (https://www.mapbox.com) maps to be used. This requires the user to set the mapbox.map_id and mapbox.access_token parameters for the Map object. Change-Id: I3095df260dd0c9d49d84d45385c5a530fcffee0b Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Merge remote-tracking branch 'gerrit/5.4' into devAlex Blasche2015-01-0914-174/+119
|\ \ | |/ | | | | Change-Id: I784619fd03371ec90e42b79dbb68afdda5dc5530
View Lorry Controller Status