summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Adapt to the Q(Multi)Hash split-upEdward Welbourne2020-07-273-6/+6
| | | | | | | | Make some variables auto so that we no longer care whether they're QHash or QMultiHash. Change-Id: Idbefdbd6134ac862d44403f8ba1dcbf8bf5cd761 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Adapt to QLocale(QString) now being explicitEdward Welbourne2020-07-271-2/+2
| | | | | | | | Various things passed a string to a function expecting a locale. That no longer works; the QLocale() wrapping must be overtly present. Change-Id: Ide5ede5237d8fd4badab7d6a919b08c1883c809a Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Convert QRegExp to QRegularExpressionEdward Welbourne2020-07-271-3/+3
| | | | | Change-Id: I0f6918b18816975b91c28d3426c63d9a399aa274 Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
* Purge uses of legacy cruft before qtbase removes itEdward Welbourne2020-07-221-2/+0
| | | | | | | | | | A use of deprecated qrand() was in a comment, so remove it. A use of QT_BEGIN_HEADER wasn't matched by QT_END_HEADER and it's now a no-op anyway. Pick-to: 5.15 Change-Id: Ie79c181e5f194c00949bfd7d2372f2d246b53180 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Add ; to Q_UNUSEDLars Schmertmann2020-06-298-10/+10
| | | | | | | | This is required to remove the ; from the macro with Qt 6. Task-number: QTBUG-82978 Change-Id: I1aaf36e893b8f947abd0770acd9d3007cffdcb10 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Add missing overrideAlexander Volkov2020-06-2953-125/+125
| | | | | Change-Id: Ieae01bc4669cdd503f97399c622989795a0ad734 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Use QList instead of QVectorJarek Kobus2020-06-2534-173/+157
| | | | | | Task-number: QTBUG-84469 Change-Id: Iefd2fb627602ef4744d80858eee72a089ef5f4ec Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Qt6: Port QtLocation to QStringViewKarsten Heimrich2020-06-102-6/+6
| | | | | | | Task-number: QTBUG-84319 Change-Id: I48cfafbf0a489947468b4b4e3fcf851e459cdfd3 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Fix incorrect iteration over a C arrayThiago Macieira2020-05-081-3/+1
| | | | | | | | | | | | | | | Found by Clang 10: error: expression does not compute the number of elements in this array; element type is 'const MapStyleData', not 'QGeoMapType::MapStyle' [- Werror,-Wsizeof-array-div] Instead, just use range-for. Task-number: QTBUG-83666 Pick-To: 5.15 Change-Id: I99ab0f318b1c43b89888fffd160b589c5543b9d4 Coverity-Id: 226105 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Fix warning about QString::SkipEmptyParts being deprecatedThiago Macieira2020-05-063-3/+3
| | | | | | | | /home/tjmaciei/src/qt/qt5/qtlocation/src/plugins/geoservices/mapbox/qplacesearchreplymapbox.cpp:107:98: warning: ‘QString::SkipEmptyParts’ is deprecated [-Wdeprecated-declarations] Pick-To: 5.15 Change-Id: Ib3333a58f37746f3b935fffd1607e152af50f386 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* Fix Clang 10 warnings about deprecated copy constructorsThiago Macieira2020-05-051-1/+1
| | | | | | | | | qgeocodereplyosm.cpp:115:21: error: loop variable 'k' of type 'const QString' creates a copy from type 'const QString' [-Werror,-Wrange-loop- construct] Task-number: QTBUG-83666 Pick-To: 5.15 Change-Id: I99ab0f318b1c43b89888fffd160b4a12bee11723 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-04-079-24/+34
|\ | | | | | | Change-Id: If3ebc0821be0d0206522adf8ff10040e80e34414
| * Change QQmlListProperty ctor expecting a QList ptrv5.15.0-beta4Alex Blasche2020-04-031-1/+1
| | | | | | | | | | | | | | This was introduced by 5a4ffa0de0ecc666a514ef60f0149a76d25b040d Change-Id: Icccf0c8cd3154c102fd93b79e81199e043f7d0bb Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
| * Fix QHash/QMultiHash related deprecations warningsAlex Blasche2020-04-024-13/+13
| | | | | | | | | | Change-Id: I5ec9c700a0b69a556512efbd0bfd79c4c2119f9a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * Make use of qRegisterAnonymousType where possibleAlex Blasche2020-04-021-5/+5
| | | | | | | | | | | | | | | | Conincidentally the patch fixes a few other minor deprecation warnings in the same file too. Change-Id: Iaf6221cd35cca95415b7d5383477b8c2bcfe92b0 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
| * 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>
* | | Merge 5.15 to dev and fix resulting compile issuesQt Forward Merge Bot2020-04-0288-1100/+5869
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/imports/location/location.cpp The change fixes the bare minimum of what needs to be done to compile and run. This includes the following issues: 1. Fix build failures as a result of QMetaType changes in qtbase moc now stores the QMetaType of properties as a result of 46f407126ef3e94d59254012cdc34d6a4ad2faf2 in qtbase, which requires full type information about the property type inside the moc generated source file. Many of the property types were forward-declared, and this resulted in build errors like: "invalid application of 'sizeof' to an incomplete type 'QDeclarativeGeoMap'" 2. Adopts QtQML API changes. A private QJSValue ctor was removed. The "replacement" is QJSValuePrivate::fromReturnedValue(..). 3. The mapboxgl 3rdparty backend does not compile at this point in time and seems unmaintained. For the time being, the mapboxgl backend is disabled in the interest of keeping qtlocation closer to dev HEAD of other Qt modules. Change-Id: I756e1c2effb29eaaf96a61a28c1c17338774b77c
| * | 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>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-02-086-52/+117
|\| | | | | | | | | | | Change-Id: If5c3274ecf7e19b55ca54db21405d2908d8b14ae
| * | 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>
* | | Remove the unused include of QLinkedListSona Kurazyan2020-02-031-1/+0
| | | | | | | | | | | | | | | Change-Id: Ibbf013f247254ac5fd01071b1e90da648532eec3 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Replace MapParameter with DynamicParameter in mapboxgl docTasuku Suzuki2020-02-011-7/+7
| | | | | | | | | | | | | | | Change-Id: I9a01c76474a0ca9d8a06f9c768f3d16ef97d3be7 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-02-0136-116/+222
|\| | | | | | | | | | | Change-Id: I453207cbd09ee4901def858193f33d8cef80a2dc
| * | 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>
* | | Fix build with latest qtbase and qtdeclarativeQt Submodule Update Bot2020-01-272-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Bump the submodule to include the one build fix for sqlite3. * Rename VisualDataModel to DelegateModel (it's been the latter for many years and now the old name vanished) * Fix dangling pointers into QList. In clearMapItems() we iterate over m_mapItems and call removeMapItems(), which also removes from the same QList (now vector). The same goes for m_mapItemGroups. Change-Id: I4c229fd2cf1bce76d6ad5ffae4bdbda7fe8e6a18 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 08:41:06 +0000