summaryrefslogtreecommitdiff
path: root/src/imports
Commit message (Collapse)AuthorAgeFilesLines
* Add ; to Q_UNUSEDLars Schmertmann2020-06-291-2/+2
| | | | | | | | 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-293-3/+3
| | | | | Change-Id: Ieae01bc4669cdd503f97399c622989795a0ad734 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-04-071-5/+5
|\ | | | | | | Change-Id: If3ebc0821be0d0206522adf8ff10040e80e34414
| * 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 5.15 to dev and fix resulting compile issuesQt Forward Merge Bot2020-04-021-0/+8
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Add geometry simplification to MapPolyline/MapPolylineObjectQSGPaolo Angelelli2020-02-121-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * Enable mercator-to-screen projection in GLSLPaolo Angelelli2020-02-111-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Bot2019-12-032-3/+3
|\ \ | |/ | | | | Change-Id: Iea2f0f612ee83e3d7bd1dfed47de296f4cc34038
| * 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-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | 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.15' into devQt Forward Merge Bot2019-11-193-24/+356
|\ \ | |/ | | | | Change-Id: I2d19d8340a70760e8d545582fd7c966263e958bd
| * 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.15' into devQt Forward Merge Bot2019-10-261-4/+3
|\ \ | |/ | | | | Change-Id: I01b84e7523be32815e618a7f512160de467d3bea
| * Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-10-011-4/+3
| |\ | | | | | | | | | Change-Id: Id543d32c49c8efd1d7798d41bbee0e28c1742e12
| | * Doc: Fix link errors and complete parameter specsNico Vertriest2019-09-301-4/+3
| | | | | | | | | | | | | | | Change-Id: I786ab35a0e9c8dfa2c8124692289d98e8eee4a8d Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | | Merge remote-tracking branch 'origin/wip/qt6' into devSimon Hausmann2019-10-102-4/+6
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I206cf010f01d2acdad05357e992a2703e5392aab
| * | Fix Qt6 buildwip/qt6wip/cmakeAlexandru Croitor2019-08-062-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modify all the qmlRegisterModule calls to use minor version 15 because minor version zero from 6.0.0 would make tests fail. This is similar to what was done in qtdeclarative in c147b20a2c1299b2d659fe7c9472ae3866b6a425. Change-Id: Ia363f9e36afbee734c1991916bbdd48fbd20e989 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Add autoFadeIn property to map itemsPaolo Angelelli2019-08-211-0/+2
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | This property allows a user to disable the until now built-in behavior that makes map items fade in or fade out between zoom levels 1.5 and 2.5. By default the old behavior is kept. [ChangeLog][Location][MapItems] Added property to disable the automatic fade-in/fade-out behavior on low zoom levels Change-Id: Id764f12d34db528f533f14fd561604507681f216 Fixes: QTBUG-76867 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Move PluginParameter into PositioningQuick, expose also in QtPositioningPaolo Angelelli2019-06-213-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With this patch the QDeclarativeGeoServiceProviderParameter in the location-private module becomes QDeclarativePluginParameter in the positioningquick-private module. This renamed class is then registered, under the same QML typename "PluginParameter" both in QtPositioning and QtLocation qml plugins. In this way it will become possible to use the same type both inside QtLocation "Plugin" and inside QtPositioning "PositionSource", and regardless of which is the QML plugin that provides "PluginParameter", this will translate into the same cpp type. [ChangeLog][QtPositioning] Exposed PluginParameter also from QtPositioning qml plugin, to be used in PositionSource as replacement of environment variables. Task-number: QTBUG-66304 Change-Id: I1d982ff689130ae896c616480567aa12d9b49c3a Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Add notification signal to Map.visibleRegion propertyPaolo Angelelli2019-04-101-0/+3
|/ | | | | | | [ChangeLog] Added notification signal to Map.visibleRegion property. Change-Id: I77d5e1f086a94a677d452644bb82ada1b765c617 Reviewed-by: Alex Blasche <alexander.blasche@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>
* Introduce Qt.labs.location QtLocationLabs singleton typePaolo Angelelli2019-03-116-2/+175
| | | | | | | | | | | 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-071-0/+3
| | | | | | | | | | | | | | | | | 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>
* Add departure time attribute to route queriesv5.13.0-alpha1Paolo Angelelli2019-02-061-0/+3
| | | | | | | | | So that it can be used to improve the route calculation based on traffic information or other time-based information (ferries etc.) Change-Id: I8bdc81046484cc4f0ebfaffbdf6f034c555d7781 Fixes: QTBUG-70503 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* Expose QAbstractNavigatorPaolo Angelelli2019-02-011-0/+2
| | | | | | | | | | | | This change exposes the QAbstractNavigator instantiated by QDeclarativeNavigator. By doing so, it is possible to expose to the user engine-specific features and data via properties, signals and methods added to the QAbstractNavigator subclass. However, while this approach greatly simplifies the exposure of such features, it also leads to writing non-cross-plugin code. Change-Id: I03be9b6d0868d940dc0ac80520f3b507bec2953a Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Provide additional navigation information via NavigatorPaolo Angelelli2019-02-011-0/+2
| | | | | | | | | | | | | | | | | With this patch, Navigator becomes able to expose additional running navigation information such as distance to next maneuver, traveled distance, and so on. This information must be made available by the engines by emitting the related signals and implement the related methods, in QAbstractNavigator subclasses. This patch also groups all navigation read-only progress information into a property group inside Navigator, called directions. Change-Id: I00baf64bafe88cd21d4fef06dae0e7331a40ff70 Fixes: QTBUG-70238 Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Unify semicolon usage in Q_UNUSEDJesus Fernandez2019-01-231-2/+2
| | | | | Change-Id: I36dd6881b6f6f028869d63b6311cba7f52a99cc4 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Fix LocationSingleton::path documentationPaolo Angelelli2018-12-111-0/+8
| | | | | | | | Documentation for the overload was missing. Change-Id: Ie852661ca34ed93a62ad0ca7bf6b0b9adac72d8a Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Move declarative positioning classes to positioningquick, fix exportsPaolo Angelelli2018-12-041-2/+2
| | | | | | | | | | | | | | QDeclarativeGeoLocation and QDeclarativeGeoAddress were incorrectly publicly exported (Q_POSITIONING_EXPORT) in QtPositioning, for using them in QtLocation (geocodemodel, declarativeplace), although they are private classes. This patch moves them into positioningquick, that, now that is available, is supposed to contain all the declarative positioning types. The patch also correctly privately export these types. Change-Id: I1bde17026fe122860e8977a98262c0707939c227 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-11-034-466/+1
|\ | | | | | | Change-Id: I219444e81a9b304b11b0cecce84415acdb3ade57
| * Move qquickcoordinateanimation to positioningquickPaolo Angelelli2018-10-294-466/+1
| | | | | | | | | | | | | | | | | | So plugins can use it, also stand alone ones, and no ugly "import ../" anymore. Change-Id: I4e53815e041e13d495026d60a826a31bccaef2b4 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Bramastyo Harimukti Santoso <bramastyo.harimukti.santoso@pelagicore.com>
* | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-10-065-26/+172
|\ \ | |/ | | | | Change-Id: Ibe88e68076fc3a722432c07fe4c0358f0bb032ea
| * Update plugins.qmltypesAlex Blasche2018-09-245-26/+172
| | | | | | | | | | | | Task-number: QTBUG-70264 Change-Id: I2922b855d08e42bbd771cc959ea9b6e97eed60b9 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Fix namespaced buildLiang Qi2018-10-053-6/+6
|/ | | | | | | | | It is not allowed to include files within Qt namespace. See 5b99f3a3 in qtbase dev. Change-Id: Ic86986ebe5d6beafa32c7634ffb1d4631c411bf9 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
* Add support for route legsPaolo Angelelli2018-08-241-0/+2
| | | | | | | | | | | | | | | | | | This patch adds support for route legs, that are the portions of a route between one waypoint and the next. QGeoRouteLeg in particular can be seen as an API addition to QGeoRoute in that it uses and exposes additional methods added to QGeoRoutePrivate but not used in QGeoRoute. Currently the request for legs is set to be the same as the request for the entire route. Finding the related bounding waypoints has to be done programmatically using the legIndex property. Change-Id: If462b1dc6348be16dc96b167db5500f079fe0a64 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Add QGeoPolygon holes support to LocationSingletonJulian Sherollari2018-08-202-0/+35
| | | | | Change-Id: I877e9c8e9d11c40ac302ceeaa9c8c85da958f038 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
* Introduce Map.visibleAreaPaolo Angelelli2018-07-261-0/+1
| | | | | | | | | | This will allow moving the visible map area to a subregion of the viewport, allowing to maintain the desired visible region visible when overlaying controls on top of the map. Task-number: QTBUG-68966 Change-Id: Idf4b30f7c1e4062e5e1c0ddc01a31bc856c0bc0c Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-07-072-4/+4
|\ | | | | | | Change-Id: Ib9f54662206dd80389fa211cf650eb3599938fbb
| * Fix return type of LocationSingleton::polygonPaolo Angelelli2018-07-032-4/+4
| | | | | | | | | | | | | | Previously returning QGeoPath Change-Id: Id4de95918038d5efeefbd44034265f3a3a34d9fa Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Enable incremental updates in PlaceSearchModelPaolo Angelelli2018-07-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | This way pages can be changed without resetting the model. To achieve this, new members into QPlaceSearchRequestPrivate are introduced, to keep the relationship between a request for one page, and the previous or the next page. In this way sparse population of the model becomes possible. Change-Id: Ic8db0281408f3500ba83f78c7e152ee0b68cd099 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Expose add/remove transitions in MapItemViewPaolo Angelelli2018-07-041-0/+4
| | | | | | | | | | | | | | | | In this way these transitions can now be customized by the user. Change-Id: I949d0caab65b0e71012bf77baee9c847c8f415a0 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devPaolo Angelelli2018-05-163-20/+53
|\ \ | |/ | | | | Change-Id: Ied604f4c229a976749457034eba8ae2f2a385c06
| * QDeclarativeGeoMap::copyrightsVisibleChanged() was not added in Qt 5.11Alex Blasche2018-04-241-1/+0
| | | | | | | | | | | | Change-Id: Id80bf6b1919f0c6d6f96a315289f67ddad220f2f Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io>
| * Update qmltypes and revision for Qt 5.11 in Location and PositioningAlex Blasche2018-04-223-20/+54
| | | | | | | | | | Change-Id: Ie7493cbb33e656c270ef522fa26460461215e145 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Expose mercatorToCoord and coordToMercator to QMLPaolo Angelelli2018-05-042-0/+32
| | | | | | | | | | | | | | Handy to manipulate geo-geometries in JS. Change-Id: I9866849a8b94e8fb8a9ebc24a0a2d93f2c4cbaf5 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Remove the code to manually initialize resources in static buildsSimon Hausmann2018-04-273-24/+3
|/ | | | | | | | | After commit be9a56e5e3ced5d0d668fa24e4c65ae928f2e25a in qtbase, this is not needed anymore. Instead the resource system injects the plugin entry point with a reference to all resources. Change-Id: I03294a3ee43097ce535ef7c2805ee33a99e7dd25 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Register QGeoPolygon in QMLPaolo Angelelli2018-04-181-0/+2
| | | | | Change-Id: I67aeb266ee17304de7aad7a0106901079fab5de5 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Merge remote-tracking branch 'origin/wip/navigation' into 5.11Paolo Angelelli2018-04-173-12/+20
|\ | | | | | | | | | | | | | | | | Conflicts: src/location/declarativemaps/qgeomapobject.cpp src/location/declarativemaps/qgeomapobject_p_p.h src/plugins/geoservices/itemsoverlay/qgeomapitemsoverlay.h Change-Id: Iab847e16011b2095d307e2a3610bf9157ae7b92d
| * Introduce Navigator QML typePaolo Angelelli2018-04-171-3/+5
| | | | | | | | | | | | | | | | | | A new QML type, Navigator, is introduced in Qt.labs.location Its intended purpose is to be a front-end for the functionalities offered by NavigationManagerEngines. Change-Id: Ic93bed0bfaaf32453e759b12a348fa6ef1ae2c93 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
View Lorry Controller Status