summaryrefslogtreecommitdiff
path: root/src/plugins
Commit message (Collapse)AuthorAgeFilesLines
* 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-072-5/+11
|\ | | | | | | Change-Id: If3ebc0821be0d0206522adf8ff10040e80e34414
| * Merge remote-tracking branch 'origin/5.14' into 5.15v5.15.0-beta3Qt Forward Merge Bot2020-03-312-5/+11
| |\ | | | | | | | | | 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-241-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | 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-0229-64/+70
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: 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>
| * | 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>
| * | Enable mercator-to-screen projection in GLSLPaolo Angelelli2020-02-111-3/+4
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.14' into 5.15Qt Forward Merge Bot2020-02-012-28/+34
|\ \ | |/ | | | | Change-Id: Iae2b08cdf4f64d69bedeabf4633fd34b44a02ad0
| * Android: request permissions before location requests or updatesAssam Boudjelthia2020-01-292-28/+34
| | | | | | | | | | | | | | | | | | 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>
* | 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>
* | 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>
* | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-12-301-10/+15
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Iccbd3c3f2162973d407a31b02ea6911f3c1d5b31
| * 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>
* | Avoid initializing QFlags with 0 or nullptrFriedemann Kleint2019-11-251-1/+1
|/ | | | | | | It is being deprecated. Change-Id: I33a411f9b2fc18feabd3cc8d7f3a44b353e25639 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Add image source support to Mapbox GL pluginTadej Novak2019-11-091-1/+5
| | | | | | | [ChangeLog][QtLocation][MapboxGL] Added support for image sources Change-Id: I5334f36e033d26824300d90ad8d9aacf3ac75ac3 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-11-012-2/+2
|\ | | | | | | | | | | | | 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>
| * 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>
* | Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-08-311-0/+6
|\ \ | |/ | | | | Change-Id: Ic431a95117ee8290a5b91937a756e9f9cfc37c7a
| * Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-08-241-0/+6
| |\ | | | | | | | | | Change-Id: If3fd3389c3e2eed55daf342d1bde1899d2fe01a2
| | * Improve debugging in mapboxgl plugin when running without opengl backendPaolo Angelelli2019-08-201-0/+6
| | | | | | | | | | | | | | | Change-Id: I252c163ad9296b52f14b83710fda0a469f882d73 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* | | Add Satellite support to serialnmea pluginPaolo Angelelli2019-08-154-5/+720
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a new class, QNmeaSatelliteInfoSource, locally to the plugin, that behaves similarly to QNmeaPositionInfoSource in the way of handling the IODevice and producing the updates. Change-Id: Id594152dd70514974ac79c7757ce6f0da4631191 Fixes: QTBUG-59274 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* | | Introduce QIOPipe and use it in serialnmea pluginPaolo Angelelli2019-08-094-23/+397
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows the plugin to pipe the input stream into multiple, independent processing pipelines. Good for allowing multiple position sources from the same serial port, and will allow supporting satellite info source in the nmea plugin too. Change-Id: I21e3cd2c78e7138ca49821c68b55ce96eb83e986 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Port from QMutex::Recursive to QRecursiveMutexMarc Mutz2019-08-031-12/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | Also port from QMutexLocker to std::lock_guard, as the former will not support QRecursiveMutex going forward, and port the remaining ctor-init-list to NSDMI to avoid additional churn going forward. Change-Id: I0645f4b2ffad455c41c12b94af56de800c6d1773 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | Support specifying serial port via PluginParameter in serialnmea pluginPaolo Angelelli2019-07-182-8/+33
| | | | | | | | | | | | | | | | | | | | | | | | This patch supports the serialnmea.serial_port plugin parameter. Task-number: QTBUG-66304 Change-Id: I1d1e3083f50c25e2ba2fd24ddb300e73b1f883f9 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Add correct header for QSGPlainTextureLiang Qi2019-07-071-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Guard with QT_HAS_INCLUDE, because the header isn't there, yet, but adding it is blocked by the missing include here. Task-number: QTBUG-76928 Change-Id: Iaa4e67a73662de26b600207852e4668762cf5d96 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-06-291-1/+4
|\ \ \ | |/ / | | | | | | Change-Id: Ia8e0d53bff9f4df0897bb77e75f427acb65f5da7
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Liang Qi2019-06-251-1/+4
| |\ \ | | |/ | | | | | | | | | | | | | | | 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>
* | | Remove usages of deprecated APIs from QDateTimeSona Kurazyan2019-06-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Replaced the deprecated QDateTime::fromTime_t() with QDateTime::fromSecsSinceEpoch(). Task-number: QTBUG-76491 Change-Id: I45c5d1816da553e9eaf5cb085ea32087931e10bf Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | QGeoPositionInfoSourceCL: Initialize location timestamp with UTC time specAndrew Dolby2019-06-141-3/+1
|/ / | | | | | | | | | | Fixes: QTBUG-73651 Change-Id: Ie1955e8f524ef828a7407995fc14586ff54f660c Reviewed-by: Alex Blasche <alexander.blasche@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-014-18/+48
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I5700c90ee86873599b5e7c9ccb6cef7ca48153e7
| * Display a notice when requesting a SSL map type without SSL supportPaolo Angelelli2019-03-253-17/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 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>
* | 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>
* | Introduce Qt.labs.location QtLocationLabs singleton typePaolo Angelelli2019-03-112-0/+40
| | | | | | | | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-02-161-2/+2
|\ \ | |/ | | | | 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>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-02-021-3/+1
|\ \ | |/ | | | | Change-Id: Ia0a66c229f249532e70b1548f5e618e4db4bc5ad
| * winrt: Remove incorrect asserts and fix incorrect conditionOliver Wolff2019-01-311-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setPreferredPositioningMethods and setUpdateInterval are called by init so these functions should not assert in initializing state. Additionally the early exit condition in setPreferredPositioningMethods has to be the same as in setUpdateInterval. Both cases have to return early if the locator has not been initialized. This initialization happens in init, so both states, Initializing and Initialized, are fine for further handling. Change-Id: I4ef8db7178c38299328041a8d163a1b9bbecc5b1 Reviewed-by: Andre de la Rocha <andre.rocha@qt.io> Reviewed-by: Miguel Costa <miguel.costa@qt.io>
* | Unify semicolon usage in Q_UNUSEDJesus Fernandez2019-01-2330-63/+63
| | | | | | | | | | Change-Id: I36dd6881b6f6f028869d63b6311cba7f52a99cc4 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
View Lorry Controller Status