summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add changes file for 5.6.2v5.6.25.6.2Paolo Angelelli2016-09-121-0/+55
| | | | | Change-Id: I73c236a4de87801995890cf66b9d934f0f46ec15 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Fix for multiple city tags mapping to the same fieldPaolo Angelelli2016-08-291-26/+31
| | | | | | | | | This patch adds support for both "city" and "town" as Json document candidates for QGeoAddress::city Task-number: QTBUG-55371 Change-Id: I468207d81d61b16ea06034ea143bd3fd34df09b1 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Fix for broken geocoding in mapviewer with OSM pluginPaolo Angelelli2016-08-262-1/+5
| | | | | | | | | OSM Nominatim blocks user agents for default libraries. This patch adds a specific user agent to the mapviewer example if one isn't provided by the user Change-Id: I9bc598eec6f53b0990c7cd0fb42cf3ef7807bedb Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Doc: Change instances of 'OS X' to 'macOS'Topi Reinio2016-08-151-1/+1
| | | | | | | | | | As of version 10.12 (Sierra), the name of Apple's desktop operating system will be macOS. Change all occurrences where the platform is discussed to use the macro \macos (defined in the documentation configuration in qtbase). Change-Id: Iea1581dc1929e53d710a2fc5eedbdf560a2d225f Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Fix for wrong std::copy in QGeoTileProviderOsm::TileProviderPaolo Angelelli2016-08-101-1/+1
| | | | | | | | This patch fixes a bug that shows up at least on osX and iOS devices caused by an incorrect offset used in std::copy Change-Id: I09f106ddf63983365d4462e2f18a10ce44f1200a Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
* Fix for invisible copyright notice with Holo theme on androidPaolo Angelelli2016-08-051-1/+5
| | | | | | | | | | | | | | The copyright notice is currently rendered using the default application palette. This patch forces the text and link colors to black and blue, since the notice is always shown on top of the map and other colors may not work. Task-number: QTBUG-54964 Change-Id: Icc8832124cd64d5326e0aa7540e3287c4325d31d Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io> Reviewed-by: Johan Helsing <johan.helsing@qt.io> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Fix accessing a MapPolyline delegate before it is handed over to MapPaolo Angelelli2016-08-041-1/+3
| | | | | | | | | | | | QDeclarativePolylineMapItem::path() currently retrieves a QQmlContext with contextForObject(parent). This can return a null context if the parent is null. This patch changes the parameter to the this pointer, returning the context for the object itself. Task-number: QTBUG-55081 Change-Id: I48d6abd8be1b3d9505e37338da2b64812375374c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Enable dynamic addition/removal of map types by the mapping managerPaolo Angelelli2016-07-2910-12/+103
| | | | | | | | | | | | | | | Map types are currently fixed in the constructor, regardless of whether they were available, or, now, whether they are enabled or not. This patch makes the geomappingmanager notify (e.g., emit a signal) when the available map types change at runtime. This is used in the OSM mappingmanagerengine, which can now disable map types if provider records turn out to be invalid or disabled after they have been fetched. Change-Id: I8e0e75504c882609f91c6d1ceb88424eee656f26 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Add minimal map qml exampleMichal Klocek2016-07-289-23/+235
| | | | | | | | | | QtLocation was missnig basic example to show maps, the one you can simply jump in and start hacking. Change-Id: I0aec90ae25aa703d84f7e52e4dd523931819e79c Reviewed-by: Paolo Angelelli <paolo.angelelli@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Fix the fitViewportToGeoShape calculationMichal Klocek2016-07-285-102/+217
| | | | | | | | | | | | | | | | | | | | | | | | The current implementation is calculating the bounding box of a geocircle based on moving along a circle of latitude by the distance of a circle's radius. Unfortunately the distances on a small circle of a sphere are greater than great circle distances. Reimplement the calculation using tangential points between a geocircle and meridians. Do not center the viewport in the center of the geoshape, use the center of the bounding box instead. Simplify zoom level adjustment calculations, use the reference world plane to get rid of longitude wrapping and rounding erros. Finally update a viewport unit test, adjust the minimum map size to 256x256, so fitToViewport calls have chance to succeed. Fix out of order test execution. Task-number: QTBUG-54337 Change-Id: I61726a4eb7183470c493ceb03d101f3a75305121 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Add indirection for osm providersPaolo Angelelli2016-07-2715-109/+897
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To prevent furter breakage of qtlocation osm provider in existing qt versions, this patch introduces one level of indirection in resolving OSM providers, fetching the tile server address from files hosted at http://maps-redirect.qt.io/osm/5.6/ The content of the files requested for the server address resolution must be in JSON format, containing (currently) the following fields: { "Enabled" : bool, (optional) "UrlTemplate" : "<url template>", (mandatory) "ImageFormat" : "<image format>", (mandatory) "MapCopyRight" : "<copyright>", (mandatory) "DataCopyRight" : "<copyright>", (mandatory) "MinimumZoomLevel" : <minimumZoomLevel>, (optional) "MaximumZoomLevel" : <maximumZoomLevel>, (optional) } Enabled is optional, and allows us to temporarily disable tile providers if they go offline without firing requests to them. Default is true. MinimumZoomLevel and MaximumZoomLevel are also optional, and allow us to prevent tile requests to the providers, if they do not support the specific ZL. Default is 0 and 19, respectively. <server address template> is required, and is the tile url template, with %x, %y and %z as placeholders for the actual parameters. Example: http://localhost:8080/maps/%z/%x/%y.png <image format> is required, and is the format of the tile. Example: "png" or "jpg" <MapCopyRight> is required and is the string that will be displayed in the "Map (c)" part of the on-screen copyright notice. example: "<a href='http://www.mapquest.com/'>MapQuest</a>" <DataCopyRight> is required and is the string that will be displayed in the "Data (c)" part of the on-screen copyright notice. example: "a href= 'http://www.openstreetmap.org/copyright'>OpenStreetMap</a> contributors" The patch also adds four additional OSM plugin parameters, modifies an existing ones, and removes another existing one. Removed: - osm.mapping.copyright, now removed and replaced by two other parameters (see below). New: - osm.mapping.providersrepository.address, allowing to change the hardcoded http://maps-redirect.qt.io/osm/5.6/ The implication of this parameter is that it becomes possible to use file:// urls or even qrc:, allowing to ship custom providers with the applicarions - osm.mapping.providersrepository.disabled, allowing to disable the indirection and go with hardcoded URLs by default. - osm.mapping.custom.mapcopyright replaces the old osm.mapping.copyright, and contains the copyright notice to be displayed next to the "Map (c)" part of the copyright, to be consistent with the way the copyright notice coming from the provider data is handled - osm.mapping.custom.datacopyright replaces the old osm.mapping.copyright, and contains the copyright notice to be displayed next to the "Data (c)" part of the copyright, to be consistent with the way the copyright notice coming from the provider data is handled Modified: - osm.mapping.host now became osm.mapping.custom.host, improving the naming consistency. Task-number: QTBUG-54599 Change-Id: Iee88883572a198c00bcf54cf2bc33fbcc0498a68 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Fix for qgeocirclemapitem generation with invalid radiusPaolo Angelelli2016-07-261-1/+1
| | | | | | | | | this patch adds a validity check on radius_ before proceeding to updatePolish() Task-number: QTBUG-19929 Change-Id: I4a1d79761b77ed27846be249c685ad94dc47a028 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Make sure JNI_OnLoad is not called more than onceBogDan Vatra2016-07-201-0/+5
| | | | | | | | | | | | | Since Android 5.0 Google introduce a nasty bug[1] which calls JNI_OnLoad more than once. Basically every time when a library is loaded JNI_OnLoad is called if found, but it calls *again* JNI_OnLoad of its .so dependencies! [1] Workaround https://code.google.com/p/android/issues/detail?id=215069 Change-Id: I0401553f80c10b14b837a96dc979d0e7341396ea Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Fix potential memory leak in QGeoTiledMappingManagerEnginePaolo Angelelli2016-07-181-2/+10
| | | | | | | | | | | | | Currently setTileFetcher and setTileCache behave in two different ways, while the former relies on having the parent set properly for the destruction, the latter is deleted on destruction With this patch handles both pointers are handled in the same way: they are parented in the setter, and the destruction is left to the qobject destructor. Change-Id: Iaf11a12cd95088fd2268817b39fb9d58311b1812 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* A fix for not working setVisibleRegionMichal Klocek2016-06-243-3/+39
| | | | | | | | | | | Setting the visibleRegion, than changing the map center or zoom and than setting it again does not work. Fix the issue by invalidating the region on the zoom or center change. Task-number: QTBUG-54141 Change-Id: I4e680f146312e3a3aa90e27fae213042cc2b2a42 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Delay removal/readd of map items until incubation completion on resetPaolo Angelelli2016-06-247-81/+259
| | | | | | | | | | | | | | | | | | | | | When the model is reset, QDeclarativeGeoMapItemView currently removes all map items and then begins recreating new delegates for model items. This causes flickering since the mapitems are removed at once, but the repopulation is asynchronous and allows the scene graph to repaint in the meanwhile. This patch delays the removal of current map items until all the new items have been all incubated, so that removal and readd happen at the same point. The patch also adds additional checks to methods like itemModelRowsRemoved, to verify if an item is still incubating. Task-number: QTBUG-52301 Task-number: QTBUG-54188 Change-Id: I2f27114c3898bd61b1282b1f27b5f062bed1fe35 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Android: Reduce the minimum update interval to 50msAlex Blasche2016-06-243-4/+4
| | | | | | | | | The previous 1000ms were to high for satellite and position updates. Task-number: QTBUG-54026 Change-Id: I35f6452cfb714a8d69d55dd126067de8d2c3b30c Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Expand license scope from "Qt GUI Toolkit" to "Qt Toolkit"Sze Howe Koh2016-06-184-4/+4
| | | | | | | See http://comments.gmane.org/gmane.comp.lib.qt.devel/25771 Change-Id: I706e291a1f928a04368894e679971d95d4868f2f Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Merge remote-tracking branch 'origin/5.6.1' into 5.6Liang Qi2016-06-091-0/+38
|\ | | | | | | Change-Id: If8b85643cdf6957afde44e8eeee8f5ad06083928
| * Add change log for Qt 5.6.1 releasev5.6.1-1v5.6.15.6.1Alex Blasche2016-05-201-0/+38
| | | | | | | | | | Change-Id: I44b002342d6e147b43885151d88cb2e9e59af8e3 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* | fix for losing map item focus while dragging themPaolo Angelelli2016-06-022-7/+22
| | | | | | | | | | | | | | | | | | | | | | | | QDeclarativeGeoMapItemBase::childMouseEventFilter currently does a contain() check on the clicks but also on the mouse move events. by not doing it on mouse move events the problem seems fixed, but the autotests get broken because it seems that the map doesn't get panned anymore but the element gets dragged instead. Task-number: QTBUG-52075 Change-Id: I5ce340ca591ec924eebed1fe7acda18d31301fc5 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Polish and update map elements on window resizePaolo Angelelli2016-05-312-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | When the a map element gets resized, the center stays the same, meaning that map estate gets added (or removed) on each side of the element in equal amount. This means that the old screen coordinates of a map element change, and therefore it must be repolished and updated. Task-number: QTBUG-53128 Change-Id: Id26b111e8e33075082fa599e6eac92cb8089f5e4 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Include childItems among the elements to check in populateMap()Paolo Angelelli2016-05-311-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | QDeclarativeGeoMap::populateMap() currently considers only the children() of the map when populating the map. QQuickItems like the Repeater do not add the generated objects among the QObject children, but only to the QQuickItem childItems. Therefore populateMap() should consider both lists together. Task-number: QTBUG-52514 Change-Id: Ic919bc91c70242d6f5c4e67a63ff01482abed0ca Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Replace waitForRendering calls in qml unit testsMichal Klocek2016-05-2611-152/+215
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes eea315187d1add70aaf69745c031b8d6342b2303 moved map items final position calculation to "polish" call of sg. In unit testing "waitForRendering" was introduced to sync between input events processing and items being polished. Unfortunately this approach is race condition prone, since render can run in separate thread and frame swapped signals are emitted from render thread. Replace waitForRendering with waitForPolished instead. Improve test execution by providing init() and intTestCase() functions for map items unit tests, so test can be run "out of order" manner. Add missing namespace macros for location test qml plugin. Task-number: QTBUG-31797 Task-number: QTBUG-53455 Change-Id: Iec083143ae621e5be603d03f43d6ef260b056d0f Reviewed-by: Paolo Angelelli <paolo.angelelli@theqtcompany.com> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | do not enable example installs explicitly any moreOswald Buddenhagen2016-05-251-1/+0
| | | | | | | | | | | | | | it's done centrally now. Change-Id: Idbf9bf3cf304240ef6c28217199b2a32c68d581d Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | QtLocation autotest fixPaolo Angelelli2016-05-201-1/+1
| | | | | | | | | | | | | | Apparently this test passed until now for mysterious reasons Change-Id: I9597c13bc7b3d8fee148d6e1095b7a09ea3b37dc Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Bump versionOswald Buddenhagen2016-05-191-1/+1
| | | | | | | | Change-Id: I883d4601a05a9e07b101af10c1301e77085966b6
* | Merge remote-tracking branch 'origin/5.6.1' into 5.6Simon Hausmann2016-05-183-2/+6
|\ \ | |/ | | | | Change-Id: Iabc9a23154eb3dae2323e7a715b202dcaa382f8d
| * Doc: Remove repository name from examplesinstallpathTopi Reinio2016-05-182-2/+2
| | | | | | | | | | | | | | | | Examples in binary packages now directly match the install path. Change-Id: I9315d395c4546adfa58e264f66d98fb443ab1e72 Task-number: QTBUG-52953 Reviewed-by: Antti Kokko <antti.kokko@qt.io>
| * Windows: Skip flaky tests in declarative_ui.Friedemann Kleint2016-05-181-0/+4
|/ | | | | | | Task-number: QTBUG-53455 Change-Id: Ib65496de7e59341fe4ed8a443aed10fe4b2a63d4 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* decruft project fileOswald Buddenhagen2016-05-101-6/+0
| | | | | | | the "created by qt creator" header is not supposed to be checked in. Change-Id: Ib5cc25c57d3d096f818d67169ec98c9f3cb75c47 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* make use of COPIESOswald Buddenhagen2016-04-281-6/+3
| | | | | Change-Id: Ie1fe505d7b07a66e41ed7968275feaa98abe46d2 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* fix example installsOswald Buddenhagen2016-04-282-2/+2
| | | | | Change-Id: Ie482e84b0552608239a032ec95b44665997a0c01 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* A new QGeoPositionInfoSourceCL should be initialized with NoError.Alexandru Croitor2016-04-281-1/+1
| | | | | | Change-Id: Ide4ccacd9d7d6a8fe86d190723fcd94ddab9f6d6 Task-number: QTBUG-53059 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* winrt: add default capabilitiesMaurice Kalinowski2016-04-081-0/+2
| | | | | | | | | | A module compiled for WinRT should define a default set of capabilities to enable all features specified by the module. Task-number: QTBUG-38802 Change-Id: Icaf02178eeb81c76128c1fc886aa6363d74e07ee Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com> Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
* Fix crash when no items available and DataChanged is called.Marko Kangas2016-04-061-0/+3
| | | | | | | | Added check to do nothing if no items available to avoid crash. Task-number: QTBUG-52174 Change-Id: Ibe870480b24129733b051c4b2b172b554a3c9602 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Purge sRGB chunks from PNGs in documentation.Edward Welbourne2016-03-221-0/+0
| | | | | | | | Subjects each *.png file that (still) matched grep -law "sRGB" to: pngcrush -ow -brute -rem allb -reduce -force Change-Id: I75a34e5cc3ddc0add55bfd5b0bc0cbe6610a8025 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* Purge sRGB chunks from PNGs in examples.Edward Welbourne2016-03-2221-0/+0
| | | | | | | | | Subjects each *.png file that matched grep -law "sRGB" to: pngcrush -ow -brute -rem allb -reduce (Some of them needed -force but did get smaller.) Change-Id: Ib92045f3e0fb34aac1061fbc3dbb77d998228808 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* Merge remote-tracking branch 'gerrit/5.6.0' into 5.6Alex Blasche2016-03-080-0/+0
|\ | | | | | | Change-Id: I6d5e9cb8897063a599840f22961b166c89bfedc2
| * Fixes a compile error on linux/gcc-4.8 when using C++98v5.6.05.6.0Xander Burgerhout2016-03-031-6/+6
| | | | | | | | | | | | | | | | | | | | | | Removed GeoMapGesture:: prefix where appropriate, as referring to an enum value in this manner is not allowed in C++98. Task-number: QTBUG-51541 Change-Id: I374d1c8db530d34766772345761fdc899b57d7fe Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com> (cherry picked from commit 3d8a8799cc97aedb28f5046f096d4d35da6ef8ef) Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | Add explicit and make public headers compile with ↵Marc Mutz2016-03-0316-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Wzero-as-null-pointer-constant ... or equivalent. QtBase 5.6 headers already compile that way, so let the other modules follow suit. Added explicit where it was missing. This is not a source- incompatible change, because code that breaks by this is a bug. Let's not have this sitting around in an LTS. Task-number: QTBUG-45291 Change-Id: I279fd100b61d3e2b2e46e7cbd30cc6b4bfb4d10e Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Fixes a compile error on linux/gcc-4.8 when using C++98Xander Burgerhout2016-03-021-6/+6
| | | | | | | | | | | | | | | | | | Removed GeoMapGesture:: prefix where appropriate, as referring to an enum value in this manner is not allowed in C++98. Task-number: QTBUG-51541 Change-Id: I374d1c8db530d34766772345761fdc899b57d7fe Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Doc: Add plugin parameter info to qtlocation-examples.Michal Klocek2016-02-261-1/+8
| | | | | | | | | | Change-Id: Iebbcbf2bae7545bceab69d30d9edebb1640486cb Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | Update examples documentation locationMichal Klocek2016-02-2623-7/+7
| | | | | | | | | | | | | | | | | | | | The current way of documenting examples is to include qdoc and images source into example directory. Fix examples in location and positioning. Replace planespotter.jpg with png. Change-Id: I4eeacbfa575e7ae3ef747703348f2f201899e548 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* | consolidate dependency listOswald Buddenhagen2016-02-251-2/+2
| | | | | | | | | | Change-Id: I48c946c3aacbfabd69de1982c1aabd8529c8012e Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | consistently put {qt,qml}_{module,plugin} at the end of project filesOswald Buddenhagen2016-02-2511-44/+51
| | | | | | | | | | | | | | | | this fixes static builds by ensuring that all dependencies are exported. Task-number: QTBUG-51071 Change-Id: Ia0fcc7b40cbd80bde8edddcf8253b3136ed851ff Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6.0' into 5.6Liang Qi2016-02-151-0/+69
|\ \ | |/ | | | | Change-Id: I81fdbab1aa97819b9744eaa29c2237184defecb3
| * Add 5.6.0 change log for QtLocation and QtPositioningv5.6.0-rc1Alex Blasche2016-02-121-0/+69
| | | | | | | | | | | | Change-Id: I16b07f0d84d34665f6f7159046e94aad2392c8fb Reviewed-by: Paolo Angelelli <paolo.angelelli@theqtcompany.com> Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
* | Update QTBUG reference for qmlRegisterUncreatableType template functionAlex Blasche2016-02-121-2/+2
| | | | | | | | | | | | | | | | | | The previous bug references a slightly different problem in the same template function. A new bug was filed to reflect that difference. Change-Id: I2d0f952efae3d4e0763e430db04d6ac76a8fa998 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Update gitignore to adjust for recent changes in the build systemAlex Blasche2016-02-111-1/+22
| | | | | | | | | | | | Change-Id: Ibb30a155a27c849a35d84d8ceb242bac75c17f3c Reviewed-by: Paolo Angelelli <paolo.angelelli@theqtcompany.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>