summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta3Qt Forward Merge Bot2020-03-313-5/+15
|\ | | | | | | Change-Id: I8b84b78bf234556b7162066b8401630da2afb311
| * winrt: Fix crash on exitOliver Wolff2020-03-271-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | Using a static ComPtr<IGeoLocationStatics> in requestAccess might cause a crash on exit as this pointer might be cleaned up after the application has exited. Make sure, that this pointer is deleted together with the rest by making it part of the d pointer. Fixes: QTBUG-80711 Change-Id: I93c09a4549967195101de07b3cef430f8cd52229 Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Support custom Mapbox API base URLsAlex Leung2020-03-242-0/+9
| | | | | | | | | | | | | | | | Added support for custom Mapbox API base URLs. Fixes: QTBUG-82655 Change-Id: Ieebcc834f8aeaeb223b036100e5edadd55749101 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | qtlocation - use errorOccured signal for QTcpSocketTimur Pocheptsov2020-03-241-1/+1
| | | | | | | | | | | | | | | | | | and remove ugly cast Task-number: QTBUG-82605 Change-Id: I8220ead34731b488f8350229447e7f2e723f9c11 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | QtLocation: get rid of now unneeded qOverloadsTimur Pocheptsov2020-03-2324-27/+25
| | | | | | | | | | | | | | | | | | | | | | In a preparation for final cleanup in dev/Qt6. This amends the recent change in QtNetwork where we deprecated ambiguous signal overload. Also, fix old SIGNAL to use the proper name. Task-number: QTBUG-82605 Change-Id: Ifc92ce4569ba15ac5429fe379f134a6dbe3a5f73 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* | serialnmea plugin construction connect() error fixJyrki Yli-Nokari2020-03-232-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | serialnmea QIOPipePrivate initialization accessed QIOPipe via q_ptr before the object was constructed. [ChangeLog][QtPositioning][serialnmea plugin] Fixed serialnmea plugin initialization when used with serial port. Fixes: QTBUG-82819 Change-Id: I3ff2de381a124f6b25f19327a39f1b001ef4899a Reviewed-by: Paolo Angelelli <paolo.angelelli.qt@gmail.com>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-03-211-2/+2
|\ \ | |/ | | | | Change-Id: I72fa0c1d41db884c752820a8d1fb5a7aa55762bc
| * Doc: Fix highlighing of importKai Koehne2020-03-131-2/+2
| | | | | | | | | | Change-Id: Ifc34a27c89d7d8a63e66e9858f8e6dd3cd9522ab Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta2Qt Forward Merge Bot2020-02-291-1/+1
|\ \ | |/ | | | | Change-Id: I66502770edaa22deb2644ce5071df4894c4d0f97
| * Fix return type of doc for qmlmethod MapPolyline.setPathShawn Rutledge2020-02-251-1/+1
| | | | | | | | | | | | | | Fixes: QTBUG-82417 Change-Id: Id9be6f9e248612bce3a17a65d5f73f7ec4c9f45f Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Revert "qtlocation: remove uses of the deprecated member-function"Timur Pocheptsov2020-02-2523-28/+28
| | | | | | | | | | | | | | | | This reverts commit b482674e51c097fccffa1e1cc32b4843ad393894. Reason for revert: naming in QProcess is considered to be the correct one. Change-Id: I6722adfc06b351c76fb432628a678c4ce887d594 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* | Fix segmentation fault due to null pointer usagePaolo Angelelli2020-02-172-28/+39
| | | | | | | | | | | | Change-Id: I3b030728b32af6e340738583f78b2cfb0d2df11a Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Fix crash with empty maps on constructionPaolo Angelelli2020-02-131-0/+2
| | | | | | | | | | Change-Id: I8716c94b2c3f1fb995e933fe5be736e94ff161ce Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Add geometry simplification to MapPolyline/MapPolylineObjectQSGPaolo Angelelli2020-02-1216-32/+854
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change introduces a metric-based implementation of the Ramer-Douglas-Peucker line simplification algorithm to generate a LOD pyramid for the polyline geometries. This comes with a related property (in MapItemBase), lodThreshold, that can be used to change the threshold after which no simplification will be used. By default the value of this property is 0, meaning that the behavior will be unchanged and no LOD will be used. This change also introduces LOD on map polyine objects QSG, for which no property is introduced, and there's a default threshold set to zoom level 12 (which appear to produce acceptable results). Finally, this patch makes use of a threadpool with 1 thread to enqueue geometry simplification tasks, which would otherwise freeze the UI when computing for the first time. Support for geometry simplification is currently added only to polylines. It might be of interest extending it to polygons as well, once a proper strategy for handling the simplification of inner holes has been identified. Finally, extending it to circles could be of interest, while potentially bringing only minor benefits, as circle geometries are currently fixed to 128 vertices. Also adds a MapObject-based delegate to the geojson viewer example. Task-number: QTBUG-46652 Task-number: QTBUG-38459 Task-number: QTBUG-49303 Change-Id: I64b5db4577962db17e5388812909285c9356ef0d Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* | Port Map*ObjectPrivateQSG to the shader-based projection geometriesv5.15.0-alpha1Paolo Angelelli2020-02-1111-196/+421
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch changes the implementation of the scenegraph-based mapobjects (those created by QGeoTiledMap) to be the recently introduced one sporting shader-based map projection. This is much faster than the previous, but may introduce small glitches at this time (mostly on minified polylines). Adding polyline LOD simplification will solve this problem. Compared to equivalent Map Items (that is, Map Items backed by the same underlying implementation), map objects now are approximately 1.5x faster. This measure has been gathered using medium-size polygons (contained in the file 10_countries.json from the geojson_viewer example). The difference is caused by the additional QtQuick geometry related operations (essentially projecting the bounding box for each item) present in MapItems. Smaller polygons may therefore yield larger improvements, larger polygons the opposite. Change-Id: I3fc92b02b74a3a4d001e69755949a98f80d8a3d3 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Fix Map*ObjectsQSG implementation triggering QSGBatchRenderer crashesPaolo Angelelli2020-02-116-24/+35
| | | | | | | | | | | | | | | | The new approach introduces a root node for all objects, that is repopulated at every repaint. Change-Id: I4562e1aaa18999a03e8c38fe3bf59fe41f14dd70 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Enable mercator-to-screen projection in GLSLPaolo Angelelli2020-02-1134-829/+4499
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With this change, all the geo-to-screen conversion, and the triangulation operations for geo polylines and geo polygon are performed either at set time or in the shader. A separate bounding box geometry is processed in the old way to provide a correct QtQuick Item geometry, that can be used for nesting mouse areas, performing translations, input event delivery, etc. With this approach, performance are improved by more than one order of magnitude in average, but complex geometries will of course benefit more. It also adds correct rendering support for polygons with holes, previously only rendered correctly by the MapboxGL plugin. The polyline shader has basic miter joins. The miter is skipped if the angle is too sharp to avoid complicating the implementation. This shader introduces some glitches when the polyline is minified, for which the real fix is to have LOD for the geometry, and render simplified geometries at low zoom levels (added in a subsequent patch). Note: this approach, at least in its current implementation, does not support enabling layers on individual items, only on the Map element. Task-number: QTBUG-49303 Task-number: QTBUG-38459 Change-Id: I0c2dc0bf364d32f74ca7c4014f6d66e6219c8ae4 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Fix QGeoPolygon translate not updating clipper cachePaolo Angelelli2020-02-033-23/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Problem resulting in failure when calling the contains() method. This patch caches the leftbound that is used in many other methods. This patch also fixes the copy constructor, now correctly converting rectangles and circles into polygons. Tests are added in a subsequent patch. [ChangeLog][QtPositioning][QGeoPolygon] Fixed contains method. Change-Id: I324e5a6e9bf981f830a8bb88e5f2abedb5ece5dd Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-02-013-29/+37
|\ \ | |/ | | | | Change-Id: Iae2b08cdf4f64d69bedeabf4633fd34b44a02ad0
| * Android: request permissions before location requests or updatesAssam Boudjelthia2020-01-293-29/+37
| | | | | | | | | | | | | | | | | | startSatelliteUpdates() and lastKnownPosition() were not checking Android permissions before trying to access positioning data. Task-number: QTBUG-81689 Change-Id: Ia4d75920b7b07c6782d80a483a3e3961ed9149f5 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Fix QGeoCoordinate::CoordinateFormat missing Q_ENUMPaolo Angelelli2020-01-301-0/+1
| | | | | | | | | | Change-Id: Iefab6ee7738f422de9d491f70e7461b30e73c624 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2020-01-251-2/+2
|\ \ | |/ | | | | Change-Id: I81acc98f1602d20d810e5d792fc670bdaa8b1821
| * Android: JNI_OnLoad return JNI_VERSION_1_6 instead of JNI_VERSION_1_4Assam Boudjelthia2020-01-201-2/+2
| | | | | | | | | | | | | | | | Update instance of old code using JNI_VERSION_1_4 to make the code consistent. Change-Id: Icdb8d152c69f32f1050b51bdb7985acc3364fbf4 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Update earcut 3rd party libraryPaolo Angelelli2020-01-231-70/+128
| | | | | | | | | | Change-Id: I1705757d3530ed595912dba726cab50f003f103d Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Fix MapObjectView not setting propertiesPaolo Angelelli2020-01-182-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | Set parent for incubated objects in MapObjectView to the view. Also properly set component completed when removing the view from a map and then readding it. Finally silence the useless warning about MapObjectView being unsupported, as the default MOV is basically what's wanted. Change-Id: Iecbc345ced99754d0d09112b4b30eaca2bb078e5 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Add parent property to QParametrizableObjectPaolo Angelelli2020-01-182-4/+41
| | | | | | | | | | | | | | | | | | | | | | Also emitting signals when the parent is changed internally (e.g., in a MapObjectView). Not revisioning it since it is used both in QtLocation and in Qt.labs.location, and setting it to 15 would break the property in map objects. Change-Id: Ib11b18b7fcc507b5a11481f84f2bf0bd8c9f558e Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | QDeclarativePositionSource::socketError - use deleteLaterTimur Pocheptsov2020-01-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | This is a slot directly connected to the socket's signal. This means, deleting the socket from the slot leaves the socket's code that was emitting with an invalid 'this' pointer. Fixes: QTBUG-81069 Change-Id: I5b915f8d103809b80d1af34655eaa5231bddc7a6 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | qtlocation: remove uses of the deprecated member-functionTimur Pocheptsov2020-01-1523-28/+28
| | | | | | | | | | | | | | | | | | Which is QNetworkReply::error(). Use QNetworkReply::networkError() instead. Task-number: QTBUG-80369 Change-Id: Id41166a72c0d14bc77d9ec853db2f665617195ee Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* | Fix MapObjects ::border property not properly initializedPaolo Angelelli2020-01-145-5/+5
| | | | | | | | | | | | | | This patch also parents it with the object also fixing memory leaks. Change-Id: I74a21176b1d2450b10a21f92321520ca2c6e88e0 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-301-10/+15
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Iccbd3c3f2162973d407a31b02ea6911f3c1d5b31
| * Merge remote-tracking branch 'origin/5.14.0' into 5.14Qt Forward Merge Bot2019-12-131-10/+15
| |\ | | | | | | | | | Change-Id: Ic904924227e0276e59381548fc54ee51117ddb5a
| | * Merge 5.14 into 5.14.0Frederik Gladhorn2019-11-2113-36/+33
| | |\ | | | | | | | | | | | | Change-Id: Id2e7b0a3d3ecefdee377094fa10a1bea4a71d06c
| | * | Re-request authorization after the authorization has changedAndy Shaw2019-11-151-10/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On iOS if an application is put into the background after it was authorized to allow location updates "Only Once" then when it is brought back it is no longer getting updates. Therefore we need to rerequest the authorization so that it can continue to get updates. Change-Id: I72804a7c7e82524e40aab049175e2d8f7dfee469 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-141-0/+1
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I0dc35c36208833779d26d5090859baf43199eb9a
| * | | Fix GCC 9 -Wdeprecated-copy warningThiago Macieira2019-12-111-0/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | error: implicitly-declared ‘QGeoRouteLeg& QGeoRouteLeg::operator=(const QGeoRouteLeg&)’ is deprecated [-Werror=deprecated-copy] note: because ‘QGeoRouteLeg’ has user-provided ‘QGeoRouteLeg::QGeoRouteLeg(const QGeoRouteLeg&)’ Change-Id: Iad959315ad374ef288f5fffd15d68cba005f9e01 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Avoid initializing QFlags with 0 or nullptrFriedemann Kleint2019-11-253-3/+3
| | | | | | | | | | | | | | | | | | | | | It is being deprecated. Change-Id: I33a411f9b2fc18feabd3cc8d7f3a44b353e25639 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-1913-36/+33
|\ \ \ | |/ / | | | | | | Change-Id: I95c7e221498d875eb407a3165c2b9e1be2a8b347
| * | Use qmlRegisterAnonnymousType for anonymous type registrationUlf Hermann2019-11-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | qmlRegisterType without uri and major version is deprecated. Change-Id: I772f7734301bec7cb0e20a6bbc1e4f7b513248b9 Fixes: QTBUG-80043 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * | Doc: Fix documentation warningsTopi Reinio2019-11-1412-34/+31
| |/ | | | | | | | | | | | | | | | | | | | | | | | | Fix missing/incorrect parameter documentation, linking warnings, and \instantiates references to undocumented/internal classes. Remove mention of Navigator::currentRoute, as such a property no longer exists. Fixes: QTBUG-79811 Change-Id: I048a13109aa19f3db75e76611473d60a2396f028 Reviewed-by: Topi Reiniö <topi.reinio@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-127-32/+377
|\ \ | |/ | | | | Change-Id: Ifa572a6e1c0835e0ca6d5bf85cde1db854604cf6
| * Add image source support to Mapbox GL pluginTadej Novak2019-11-092-2/+6
| | | | | | | | | | | | | | [ChangeLog][QtLocation][MapboxGL] Added support for image sources Change-Id: I5334f36e033d26824300d90ad8d9aacf3ac75ac3 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * QtLocation: Update mapbox-gl-native submoduleCristian Adam2019-11-081-0/+0
| | | | | | | | | | | | | | | | | | | | [qt] Fix building on Windows with Clang and libc++ [qt] Make image source url update possible Change-Id: Ie9a562dffc1389c864fc08b3157a45ebf061960b Reviewed-by: Tadej Novak <tadej@tano.si> Reviewed-by: Thiago Marcos P. Santos <tmpsantos@gmail.com> Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * Fix visibleRegionChanged signal emissionv5.14.0-beta3Paolo Angelelli2019-11-041-6/+15
| | | | | | | | | | | | | | Emit on mapReady changed, and do not emit before then. Change-Id: I1d5c657119cb63989cfa35f58ce57d24833f6438 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Update plugins.qmltypes for 5.14Kai Koehne2019-11-013-24/+356
| | | | | | | | | | | | Task-number: QTBUG-78690 Change-Id: Ica3ae02c5429167d41b0a332d448a4c9d9eb3bbd Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-017-29/+46
|\ \ | |/ | | | | Change-Id: Ia876d943c684fbefddd693f00a16b2f2cec18223
| * Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-11-015-28/+42
| |\ | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I21ae20734645fc34b302409163f7400015d8302c
| | * Fix MapPolygon::color not changing in mapboxgl5.13Paolo Angelelli2019-10-311-1/+1
| | | | | | | | | | | | | | | | | | Change-Id: Ie02e3ea6135e443bcb3143e74d5ca0460e6ab7a8 Fixes: QTBUG-79489 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| | * Improve DynamicParameter documentationPaolo Angelelli2019-10-311-6/+8
| | | | | | | | | | | | | | | | | | | | | Change-Id: I2900e1ccc5291148fdc7801c1b6af43ea611db28 Fixes: QTBUG-78712 (cherry picked from commit 9ac4e00e21f5fd7a1a53343d1cf9f4fcaeff01a5) Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| | * Fix OSM parsing of place_idPaolo Angelelli2019-10-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Something must have changed in Qt json API/parser, or in the return value of nominatim. Either way, place_id is now an int. Change-Id: Ic340bed9c556665ce1114966d6b9157a3f380ad3 (cherry picked from commit 7533c81ccef992b0e932b299cdb1257d21e012d2) Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| | * Fix slow Map.removeMapItemPaolo Angelelli2019-10-312-20/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes connections in map items to react on map changes. A further improvement could be replacing item lists with QSets. This might however have implications with plugins which might expect ordered items. Change-Id: I52dbd64ed22762b1e2d51d1bc38f496346e7a664 Fixes: QTBUG-76950 (cherry picked from commit 2bb07804f32e0c9cc7948a5cff0bcef81ae9d8c9) Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
View Lorry Controller Status