summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.13.0' into 5.13Qt Forward Merge Bot2019-07-011-0/+46
|\ | | | | | | Change-Id: I9e43fd7c3d0e30c0f7279bea3290f48206990ac4
| * Add changes file for Qt 5.13.0v5.13.0-rc3v5.13.0-rc2v5.13.0-rc1v5.13.05.13.0Paolo Angelelli2019-05-161-0/+46
| | | | | | | | | | | | | | | | | | | | | | Change-Id: I3bd6c6c241326da331b2e7670e53dbec52f3a4ee Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Liang Qi2019-06-252-1/+24
|\ \
| * \ Merge remote-tracking branch 'origin/5.12' into 5.13Liang Qi2019-06-252-1/+24
| |\ \ |/ / / | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Id91b04d63ddfe46a44f377add670f704b536c183
| * | winrt: Do not assert if requesting access failedOliver Wolff2019-06-241-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | On Windows 8.1 accessing geolocation statics fails. If this happens, the function should not assert/crash, but just return false. Fixes: QTBUG-76344 Change-Id: I2dbd4734512f731ef065ec1e1e210fc22e057547 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | Merge "Merge remote-tracking branch 'origin/5.12.4' into 5.12"Qt Forward Merge Bot2019-06-1714-32/+34
| |\ \
| | * \ Merge remote-tracking branch 'origin/5.12.4' into 5.12Qt Forward Merge Bot2019-06-1714-32/+34
| | |\ \ | |/ / / | | | | | | | | Change-Id: I0e61ba5697177a8daf8808023ac0207b70f8571d
| | * | Add changes file for Qt 5.12.4v5.12.45.12.4Antti Kokko2019-05-231-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1817a1cb9e208af194fb1e8f416961d9c87815c1 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| | * | Fix crash when removing items from MapboxGL mapsPaolo Angelelli2019-05-2812-31/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Triggered by usage of a virtual method in superclass destructor. Change-Id: If99e523e42fd13686ae43c0083a74e1b68221fc7 Fixes: QTBUG-67638 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> (cherry picked from commit 1ac41150501d3c5cc4a9a6ed9c93729687666553) Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| | * | Bump versionFrederik Gladhorn2019-05-231-1/+1
| |/ / | | | | | | | | | Change-Id: I612c4c7887c9d1ed6efc43edb3a746be0d40de2d
* | | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-06-081-16/+23
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-06-081-16/+23
| |\ \ \ |/ / / / | | _ / | | / | | | | | | | | | Conflicts: tests/auto/auto.pro Change-Id: Ibb9c7c93a30d981f7e519eda495436c1c4873aa0
| * | Android: disable tests requiring plugins or local filesPaolo Angelelli2019-05-081-18/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While we develop a long term solution to deal with this. Fixes: QTBUG-73575 Fixes: QTBUG-73576 Fixes: QTBUG-73578 Fixes: QTBUG-73579 Fixes: QTBUG-73580 Fixes: QTBUG-73581 Change-Id: Ib70d8f084dcbafa8853e0c687d0a31c88eef991f Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Doc: Fix documentation issuesTopi Reinio2019-05-1614-91/+154
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix various documentation-related issues, including missing parameter documentation, broken links, and typos. Do some minor language editing. Change-Id: I0a8f8457e0d1ab56b4fc4670376509adf1fd26a3 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | | Compile fixJarek Kobus2019-05-131-1/+1
| |/ |/| | | | | | | | | | | | | | | | | It fixes the following issue: error: comparison of integer expressions of different signedness: ‘unsigned int’ and ‘int’ [-Werror=sign-compare] 115 | else if (searchArea.type() == qMetaTypeId<QObject *>()) { Change-Id: I67e4abd664c19bf3560023d9bd58127a6c97aa58 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta4Qt Forward Merge Bot2019-05-072-16/+24
|\ \ | |/ | | | | Change-Id: I28b2db32a10b2f70d8c3626d645d279cfedb49f5
| * Use network cache when fetching provider data in the OSM pluginPaolo Angelelli2019-05-062-16/+24
| | | | | | | | | | | | | | | | | | Otherwise it becomes problematic to start up applications in absence of network. Change-Id: Ia543b88bd56bb6c93c803a66e345be1610a4dfe0 Reviewed-by: Tuomas Vaarala <tuomas.vaarala@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-04-301-0/+6
|\ \ | |/ | | | | Change-Id: I3753abe2e06c0f310abda87dc688b22a02959887
| * Check that SSL support is available at compile time before using itAndy Shaw2019-04-291-0/+6
| | | | | | | | | | Change-Id: Id0e7e14a06306a2d8c2098bcb6de6c53d28ca88f Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | GeoFlickr uses QtXmlPatternAlex Blasche2019-04-251-1/+1
| | | | | | | | | | | | | | The QML dependency ought to be reflected by the project file. Change-Id: I1dbd83bf610957850267d7027e8f41264b6f3a61 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-04-201-0/+33
|\ \ | |/ | | | | Change-Id: I6c90c7d3543d46de4213a974537d3f0e4000cf15
| * Merge remote-tracking branch 'origin/5.12.3' into 5.12Qt Forward Merge Bot2019-04-171-0/+33
| |\ | | | | | | | | | Change-Id: I723fe44f13e52db9e02a2d9e5bc88a380f4d00b4
| | * Add changes file for Qt 5.12.3v5.12.35.12.3Alex Blasche2019-04-031-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + b7c2759118f4cc76a9cdded1e7626ac3342267e8 Print warning when QGeoFileTileCache::init fails creating the directory + 0f544f67042490e2a5448616601ed28322214c57 Fix incorrect indexing of Mapbox tiles in the cache + 2bf874e5e2b6a08ee12d0810d67d3c7ecf1e4bfa Document QGeoPath::length behavior + 6e02f895a8f3a74503971dd8df02cfafd46281f8 Bump version + 0af21b1f95180949f75ee2933d4147f610a29b6b Fix Map destructor incorrectly deleting MapItemViews + 5c3e3464c2ccf960ef3aaee4286f3d5b4cde12ac Display a notice when requesting a SSL map type without SSL support Change-Id: Ic5ca192808986433257de28261539801f65fc0ae Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta3Qt Forward Merge Bot2019-04-131-3/+3
|\ \ \ | |/ / | | | | | | Change-Id: I3f63ff19e947a440286f57bf4734780e8d05a5cd
| * | QDeclarativeGeoMapItemView: Silence MSVC warnings about commentsFriedemann Kleint2019-04-111-3/+3
| |/ | | | | | | | | | | | | | | | | | | Add space, fixing: declarativemaps\qdeclarativegeomapitemview.cpp(143): warning C4138: '*/' found outside of comment declarativemaps\qdeclarativegeomapitemview.cpp(148): warning C4138: '*/' found outside of comment declarativemaps\qdeclarativegeomapitemview.cpp(153): warning C4138: '*/' found outside of comment Change-Id: Ia63ebb4553661bac1af4dce1adf00befbaa34a87 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Minor fix in a table for Qt Location Mapbox GL PluginKavindra Palaraja2019-04-101-2/+2
| | | | | | | | | | | | | | * Removed an orphan cell, moved its contents to the correct cell. Change-Id: If411447b01d265f6103fe18129f734860c753b15 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | Diagnose flaky coordinate animation testPaolo Angelelli2019-04-101-12/+9
| | | | | | | | | | | | | | | | | | Add debug info to failing verify. Reviewed-by: Alex Blasche <alexander.blasche@qt.io> (cherry picked from commit 7e35bd3a31341b9593134808b08ee8dee6951c10) Change-Id: Ib0a01a31c6e5ae1ebd81cc48d73e995c06770826 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Reduce QtXmlPattern dependencyv5.13.0-beta2Alex Blasche2019-04-022-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | QtLocation and QtPositioning don't depend on it and QtXmlPatterns is about to be deprecated in Qt 5.13. The only existing dependency is the geoflickr example. The most likely resolution is to remove the example once QtXmlPatterns is removed for good. This change makes QtXmlPatterns an optional build dependency. Change-Id: Ibcd9e48604cff4d5e52a63164b30616b0eb100f2 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-04-0111-58/+176
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I5700c90ee86873599b5e7c9ccb6cef7ca48153e7
| * Display a notice when requesting a SSL map type without SSL supportPaolo Angelelli2019-03-255-17/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some plugins request map data for some map types over HTTPS. Without SSL support (Qt built without SSL support, or missing OpenSSL libraries) this typically translates into blank maps. This is very evident on the MapViewer example. This patch makes sure that the example displays a notice when this situation happens. [ChangeLog] Added a notice to the MapViewer example to inform when a HTTPS-based map is selected without SSL support. Change-Id: I85428bb0536f33089a0e6045301c089fafe69d74 Fixes: QTBUG-74195 Fixes: QTBUG-74294 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| * Fix Map destructor incorrectly deleting MapItemViewsPaolo Angelelli2019-03-253-40/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the views are explicitly destroyed, leading to issues, in particular for views declared inside the Map. Change it to simply remove these views from the map. Child views will be destroyed in ~QObject. [ChangeLog] Fixed crash when destroying Maps containing MapItemViews. Change-Id: Iff9b1afd6b17b55671b1f999b1bf69f172a05483 Fixes: QTBUG-69195 Fixes: QTBUG-74337 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| * Bump versionKari Oikarinen2019-03-211-1/+1
| | | | | | | | Change-Id: Ia5fa624a3c7491fb7b5533761cdb9c4aa58bb92e
| * Document QGeoPath::length behaviorPaolo Angelelli2019-03-191-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | By default, the method computes a closed-loop length. Being this public API, the only thing that can be done is to properly document the behavior. [ChangeLog][QtPositioning] Documented QGeoPath::length behavior properly. Change-Id: Ie48a51ab0d11ec68851c2ea26b8c6f6894be8b61 Fixes: QTBUG-71358 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Fix incorrect indexing of Mapbox tiles in the cachePaolo Angelelli2019-03-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | A missing '.' was causing to index the wrong tile specs for all map types. [ChangeLog] Fixed incorrect indexing of Mapbox tiles in the cache. Change-Id: Ic22dd60f4a608b31d071520bae750efddb48d59a Fixes: QTBUG-70438 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
| * Merge remote-tracking branch 'origin/5.12.2' into 5.12Qt Forward Merge Bot2019-03-151-0/+33
| |\ | | | | | | | | | Change-Id: I41b7d78671a38ea15f907d40f4a4012e6b96e139
| | * Add changes file for Qt 5.12.2v5.12.25.12.2Paolo Angelelli2019-02-271-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + be55fa95765c0d53fadddfce2e9aefa651cf791d Fix crash when assigning a Component to MapQuickItem.sourceItem + 41e2042acf4e312933c5d3e27f3b741b7892b8d0 Fix use_mapbox_text_instructions typo + c6cfb10b4eb8c227983fe7b4649cb0b691962743 Bump version + b544e2fe22333f0a5fbd24a1ee106c5501a6b886 Fix QGeoRectangle::operator|= + 952ab431d7fb9f660438da612d2b00485cce02f3 Fix MapObjectView removing wrong indices on model changes + ed13382f2aa1434ab4c75c6a5dd0896493bc6c69 winrt: React on position source status change events + ab3b9aa97eed760993ffa6908066aaf85ec77920 winrt: Minor changes to logging + 9dbd90e65b23d4b5fda883d03d24bedc5127229b winrt: Check access to location service on every call + 3d525338d5cb21f57e46bbbea86647055455a46e Set things up for logging in positioning test application + 17457ddb657ea94408ac581958b065dc2d8711ff winrt: Smaller code cleanups + 7bd6955fa1d1839f542fe6f83199e78e15f623b7 winrt: Do not emit error signal with NoError + d733cca4369f283dd0a070caf714f90a82bbced8 winrt: Initialize status and position tokens' values in constructor + e9489c97823e89feadb96df5e299b4e981ba667c winrt: Implement supportedPositioningMethodsChanged + 379f398ca56458e413cbebbebcbdfa1337cfb6e5 winrt: Depend on access to service for supportedPositioningMethods + b17c07dc0b947c979372fbaf558ce9acc07d1837 winrt: Initialize position source on first usage + c4aaa11d86d419d1aa216beaaf7424c713b78c8e test app: Improve status and error handling a bit + 34e7bd9bda35783d466dc4dd3cf6157a186f6295 Document Qt.labs.location qml module + dc384a2376a13ae2a8776ea0eda7d6e2fd088a64 winrt: Remove incorrect asserts and fix incorrect condition + 0481a5680622a3c75f41aab96a2afb48b0d6001e geoservices_mapboxgl depends on opengl and gui + 633b0f40ca82709863bad48e0ed6a1c92ad3b8b4 Re-enable geoclue plugins on BSD style Change-Id: I5bbfe2ec1fc96efc0bdab8bd6587d7785c85aa02 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | | Update Location QML importsAlex Blasche2019-03-252-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | the changed attributes should have a matching meta object export. Change-Id: I35cd3d5fabe1c4837bce9e64935850dba0501846 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | | Update plugins.qmltypes for Qt 5.13Paolo Angelelli2019-03-223-17/+134
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-73484 Change-Id: Ic6025449c74fcfa242545ffc82c9a74ceb2b5f6e Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Fix missing \row in osm.qdocPaolo Angelelli2019-03-191-0/+2
| | | | | | | | | | | | | | | Change-Id: I1b9a2298fbc1e4205924a1db2a78d71fabe3020d Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Import OSM GeoJSON when extended data is requestedPaolo Angelelli2019-03-181-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make use of QGeoJSON and import the Nominatim-returned geojson in geocode requests. Useful to get the shape of the geocode results. [ChangeLog] GeoJSON returned in Nominatim queries is now converted into the corresponding geoshapes using QGeoJson. Change-Id: Ie260e82d99363d55ed094e8dbf214d68c2ccadef Fixes: QTBUG-74248 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* | | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta1Qt Forward Merge Bot2019-03-121-1/+3
|\ \ \ | |/ / | | | | | | Change-Id: Ie1c74c3d6d89fbc715befa53c6fa6f85c0fdf0bc
| * | Print warning when QGeoFileTileCache::init fails creating the directoryPaolo Angelelli2019-03-101-1/+3
| | | | | | | | | | | | | | | Change-Id: I4369e71bbef0c218b35ef3449c5a1615fbf2cb4d Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Introduce Qt.labs.location QtLocationLabs singleton typePaolo Angelelli2019-03-1117-4/+281
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This singleton is meant to offer tech-preview map-related API. It starts with a mapObjectsAt invokable, that can be used to probe MapObjects at a specific coordinate of a map. Reference implementation for Q*ObjectQSG, based on QGeoShape::contains, included. Change-Id: Ief692eb5a43115ca02d4642c82023d1b2e217400 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Fix 5.13 API Review Issues for LocationPaolo Angelelli2019-03-073-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revision invokable fitViewportToGeoShape method. Q_REVISION was missing in the change that introduced this invokable method. Fix revision of Route.extendedAttribute. The revision for this property must be 13 as it has been introduced in 5.13. Register QDeclarativeGeoLocation with revision 13. So that the newly added extendedAttributes property, in 5.13, works. Fixes: QTBUG-74247 Change-Id: Idcddef92966308af118e96a3549ce9e2cf972d72 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | | Doc: Fix link error to XmlListModelNico Vertriest2019-02-271-1/+1
| | | | | | | | | | | | | | | Change-Id: I268b63dc705060607cf92ab39f8217a37617b66d Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* | | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-02-212-3/+3
|\ \ \ | |/ / | | | | | | Change-Id: If768f08fd6a7bc55dc65ebec9db1ccd23aa3bdf9
| * | Merge remote-tracking branch 'origin/5.12.2' into 5.12Qt Forward Merge Bot2019-02-212-3/+3
| |\ \ | | |/ | | | | | | Change-Id: I2d9e5f32cc238b9d2276ff85f12946a54bee2263
| | * Fix toCoordinate calls in qml testsPaolo Angelelli2019-02-212-3/+3
| |/ | | | | | | | | | | Task-number: QTBUG-73943 Change-Id: Ia6c008575d0415f5301d177114e4a906cdc7f2e9 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-02-164-2/+4897
|\ \ | |/ | | | | Change-Id: Ibf40dee29026002ce435e4b316ed999e320e73b6
| * Re-enable geoclue plugins on BSD styleAlex Blasche2019-02-121-2/+2
| | | | | | | | | | | | | | | | | | BSD was disabled by 5241d8c727d8e45d0266d486958e6e566563e1c8. Fixes: QTBUG-73714 Change-Id: I31ceb62caa19b231cbf6304138f68c8efdcc65db Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>