summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Disable Esri/Nokia/MapBox pluginslts-6.2Volker Hilsheimer2022-10-267-89/+113
| | | | | | | | | | | | | | | As a first step, put them behind feature flags that are always false. Remove mapbox-gl-native as a submodule - there's no reason why people wanting to build that can't clone and build that repo themselves. Don't test the respective providers unless they are available, and use the osm plugin when testing the basic plugin framework. Change-Id: I53429878e53294dce52ee830a4b4613f372898c6 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alex Blasche <alexander.blasche@qt.io> (cherry picked from commit 1fa828b7aba04fa0c2449b490894ddb409a4e2d9) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Document more type changesVolker Hilsheimer2022-10-131-7/+12
| | | | | | | | | | | | | Add routeManeuver and cameraCapabilities to the list of types that are now value types. Clarify language - in Qt 6.5, value types can be instantiated through properties. Complete unfinished statement about MapObjects being gone. Change-Id: I0828d5af7823d7d907bf5fa21a7250ebd70189d1 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> (cherry picked from commit e8ef11967a4fe30a22a20193af1da9436b61f88c) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Remove leftover labs things from build systemVolker Hilsheimer2022-10-131-7/+0
| | | | | | | Change-Id: I934f07b0bb1f35fdae295ec57e760ebbaa64fe2e Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> (cherry picked from commit f1619fdb4064c3057d78f3ba0041cfca6c31f862) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Remove unneeded qmake file for zlib dependencyVolker Hilsheimer2022-10-131-6/+0
| | | | | | | Change-Id: I3b9e9277a8a49159d3c6668d79ffc0292cb15967 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> (cherry picked from commit 82d2a2e01168f976ed21981ab8d7d5745003590d) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Doc: we don't guarantee compatibility for backend classesVolker Hilsheimer2022-10-126-5/+33
| | | | | | | | | | | | Similar to QPA, we want to continue to develop the backend APIs between minor releases. Loading a plugin that uses a different Qt version than the application is anyway a bad idea (if supported at all), and for Qt Location specifically we don't want to support this. Change-Id: Ib8b159e1df391bc5a474ddccb6933ab80529264f Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> (cherry picked from commit 2aea02b53c90a72988edcbb3d7572d2f8fd29ac9) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Update changes documentationVolker Hilsheimer2022-10-121-1/+7
| | | | | | | | | Labs functionality has been removed, and RouteLeg is folded into Route. Change-Id: I3a5003d1f35482637391cb37b88b4a5afd68ea93 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> (cherry picked from commit f75c6bc83c59bb43939374e4634649da761a7ccb) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Fix typo in exampleVolker Hilsheimer2022-10-121-1/+1
| | | | | | | | | | Amend d8f03e5e71de3d951f86f0b0413fd75d554b2039. Change-Id: I4b2c652f73d1fd5fb5ffecc621f0a7e94fb70498 Reviewed-by: Santhosh Kumar <santhosh.kumar.selvaraj@qt.io> Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> (cherry picked from commit 7f58426e9cac20ae72269633867210f56d7dbf7e) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Disable copy and move for private, polymorph typesVolker Hilsheimer2022-10-118-73/+27
| | | | | | | | Change-Id: I373e324cbe96d0ae34cba62a105bea8a7fdb83dd Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit c151504c6d061d82bf0e3631b66c44749b9cadf2) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Move the RHI implementation into separate folderVolker Hilsheimer2022-10-1127-2282/+2951
| | | | | | | | | | | Makes it easier to work with the code, the implementations have little in common that is not anyway abstracted into the common private base class. Change-Id: I4d957833f5a881e1b445ff6e912ffa036d10321a Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> (cherry picked from commit 26a2e42c34b0effac4ffcba59a07df238980282e) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* tst_QGeoTiledMap: fix memory leakIvan Solovev2022-10-111-4/+6
| | | | | | | | | | Use std::unique_ptr to manage QGeoServiceProvider object's lifetime. We cannot create the provider on the stack because it must outlive the child QGeoTiledMap instance. Change-Id: Ic2275fda394175bcb2a7782f887c10326f4c72a0 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 04320df9f53eae8b5895a9a5767e8434ff36be8d)
* tst_QPlaceSearchRequest: fix memory leakIvan Solovev2022-10-111-5/+5
| | | | | | | | No need to dynamically create the QPlaceSearchRequest instance. Change-Id: If82213b2019741ae302be2b67b71d56187822bda Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 9cc2d3f33152796a922bb4a1d8f43a8821499cd5)
* Clean up: move code into right place, remove dead codeVolker Hilsheimer2022-10-117-61/+35
| | | | | | | | | | | | | QGeoMapItemGeometry::geoDistanceToScreenWidth was unused, so remove it. Move path/pathMercator projection helpers to QGeoMapItemGeometry, they are used in items other than the rectangle items. In mapbox plugin, call static helper from correct class. Change-Id: I5645f503a24e23e295211da32e98f995b8c17b56 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> (cherry picked from commit c40b5fdffaa4ff23c27974665eebdeacefa5b03a) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Cleanup: move CPU item implementation into cpp fileVolker Hilsheimer2022-10-118-363/+403
| | | | | | | | | | This will make it easier to split the RHI implementation out into separate files. Change-Id: I4173b46871ba1e84310f9f6bebaae7754879b70b Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> (cherry picked from commit f92b88e99f2802f85af10e6e19c9c5e6800ee75c) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Mark documentation for item's backend property as internalVolker Hilsheimer2022-10-114-0/+4
| | | | | | | | | We don't want to support selecting backends. Change-Id: Ie95877fe647f237dd834fdcd22cbb3ed52dcacac Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> (cherry picked from commit 8b9bd24556214074d0930716e1cfe918471f42b6) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Fix dependencies.yaml syntaxVolker Hilsheimer2022-10-111-1/+2
| | | | | Change-Id: If14526c4b37d5612ff4b4c4c5b5677e1faaf6d4d Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Cleanup: QGeoServiceProviderVolker Hilsheimer2022-09-272-77/+57
| | | | | | | | | | | | | | Use member initialization and std::unique_ptr instead of explicitly initializing pointers. Clean up the creating helper template, it doesn't need a pointer to the existing manager, but don't call it if the manager is already created. Change-Id: Ia45587cbd36838f1fcdfbb0407100391f0977300 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Santhosh Kumar <santhosh.kumar.selvaraj@qt.io> (cherry picked from commit 49a72acedbe4f66c94aca39f8ce9b2ea1e694366) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Remove turn-by-turn navigationVolker Hilsheimer2022-09-2718-2179/+0
| | | | | | | | | | | | | It is unfinished and untested, with no support from any backend. This was the last bit of functionality in the labs module, so remove that entirely, including the QML plugin and the now unused QParameterizableObject type. Change-Id: Ic448e643cb345d1da877137a673ab572c836b3fe Reviewed-by: Alex Blasche <alexander.blasche@qt.io> (cherry picked from commit df7fddf600bed1dab77299b02c0bc98bb540bc28) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Simplify Q(Declarative)GeoMapParameterVolker Hilsheimer2022-09-2711-151/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the initialPropertyCount to the QGeoMapParameter class, where previously the 2 was hardcoded. Don't make type/setType virtual, as the subclass doesn't override those methods anyway. Remove the unused constructor taking a list of property names and values. In QDeclarativeGeoMapParameter, optimize the dynamic connections between property notification signals and the generic forwarder. Connect between QMetaMethods, which avoids the repeated lookups, and give the SignalMapper instances the QMetaProperty as a data member so that we avoid the lookup of the signal for each signal emission, and only need one connection per property, rather than two. Also, remove the empty destructor and apply const where appropriate. QDeclarativeGeoMapParameter is used only by QDeclarativePolyLineMapItem, where support for the respective parameters, penStyle and penCap, is not implemented in the rendering code. None of the other map items support any such dynamic parameters, their support is not documented, and only used in the mappolyline manual test. So remove all that code. If we want to support more properties, then the QDeclarativeMapLineProperties type gives us that infrastructure already. Change-Id: Iddaac568a7dc09deb0bb5085b5b90c3cca0fa5ca Reviewed-by: Alex Blasche <alexander.blasche@qt.io> (cherry picked from commit 64906d7dcba7702e7a36acfb5984410f7d91ac24) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Remove MapObjects from labsVolker Hilsheimer2022-09-2760-6746/+8
| | | | | | | | | | | | | | | | | The feature was designed to enable map backends to implement their own rendering of the map, and map items. It was never really used by any of the backends we supported, and introduced a lot of complexity to the code base. The idea as such has perhaps merit, but for now we focus on the basic functionality of Qt Location. Support for Qt Location when the Qt Quick scene graph is not used is not a part of that. Change-Id: I08e460043a0bd2600bad79b6ce2bb18e40e19eb6 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit fdbbfa4a6723b816478ee011ab4098e5332dc2f5) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Reorganize code for map items into separate folderVolker Hilsheimer2022-09-2743-43/+43
| | | | | | | | | | | Splitting the code that only provides declarative wrappers around types from the implementations of the map and item rendering makes it easier to work with the code base and identify dependencies. Change-Id: I00064f928043dfa77f22e68b1efe54f414cb62f7 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> (cherry picked from commit 9f7df0d5c58f24f5c27e6e641e8332d71f719220) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Improve QEvent::UngrabMouse handling in map gesture areaLauri Laanmets2022-09-271-13/+3
| | | | | | | | | | | | | | | | | | | Replace deprecated QQuickWindow::mouseGrabberItem() check and pass on all QEvent::UngrabMouse events into general 'QQuickGeoMapGestureArea::handleTouchEvent' handler. This will handle 'exclusiveGrabber' and 'QEventPoint::Released' events separately for all points. This will now correctly handle the situation where child MouseArea: 1. Grabs first touch point with 'press and hold' 2. Second finger is pressed. 3. First finger is released and 'ungrabbed'. 4. Second finger will start panning the map. Task-number: QTBUG-96795 Change-Id: Ieb3418787e89aadd1a7c0c8ab9b1f965a4484c24 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit a94cefd446dd192172f47f183b56bbb719e95ee4)
* Move the GeoJSON parser out of labsVolker Hilsheimer2022-09-273-1/+1
| | | | | | | | | | | It's used in the OSM plugin and has been built as part of the core library for a while. It's not public API, but there is a dedicated geojson viewer example demonstrating the functionality. Change-Id: I8f26906d9d1c601d481fec0d503af4dae34ada4d Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> (cherry picked from commit f7dd8156e735e28630ab18b98cd18ca7d2ccc459) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Clean up CMakeListsVolker Hilsheimer2022-09-271-86/+72
| | | | | | | | | Put header and implementation files together. Change-Id: Ie8644fbd16a5a8cbe21b9a534bed48524e60c943 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> (cherry picked from commit 49361a1c73a81bf6365d28dab8c4a1000b99f8ec) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Remove duplicate type registrationVolker Hilsheimer2022-09-271-3/+0
| | | | | | | | | | QML types are registered through location.h, and there with the correct capitalization. Change-Id: I6dca39c0f28cfb6bcfcbc70eee7ddbca11638c57 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> (cherry picked from commit 4d82a14c24451d2877364dbff3a5d481c6ac46e7) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Rename Nokia HERE specific testVolker Hilsheimer2022-09-271-1/+1
| | | | | | | | | | Analog to tst_nokia_routing, call this test tst_nokia_places although there is also a tst_qplacemanager_nokia test that is not semi-automatic). Change-Id: I03ed29463b4877acfbd87953faaca1fd9b1cdfe7 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> (cherry picked from commit e2db0c7dcf256fa6e6df6fb0b3f0836c61b1f65f) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* GeoJSON: don't crash when operating on empty dataVolker Hilsheimer2022-09-232-1/+6
| | | | | | | | | | | Fix crashes in "geojson_viewer" example when trying to print or store debug data without loading a file first. Change-Id: I7b2955d072af8d2a1f39bfca196ffc309e9b4234 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Santhosh Kumar <santhosh.kumar.selvaraj@qt.io> (cherry picked from commit 7c7248206907bcb0d65a4810ac5e52faf8da4ec8) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Stabilize flaky testsVolker Hilsheimer2022-09-231-2/+1
| | | | | | | | | | When testing model resets, wait until it reports data using tryVerify instead of a hardcoded single milisecond. Change-Id: Id3f3464f54a2b05e25c602594357e767eb8bbdba Reviewed-by: Alex Blasche <alexander.blasche@qt.io> (cherry picked from commit ee7e5de79f83625df1adfb244b0d608dae480728) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Fix warning in manual testsVolker Hilsheimer2022-09-233-6/+6
| | | | | | | | | ... and fix usability for rotation testing. Nice to get back to 0 again! Change-Id: I9985721b0af993ff19d0808c29ac7ab617d3559a Reviewed-by: Alex Blasche <alexander.blasche@qt.io> (cherry picked from commit 1ca6c7522bbd6ee9ea711e17f98d8c96c8e8c45a) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Cleanup: Move PlaceCategoryNode into only class using itVolker Hilsheimer2022-09-231-8/+7
| | | | | | | Change-Id: I4815b70b6b514c668fb8316da1ffa01b1ca2a3b9 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> (cherry picked from commit 8af951a0832d3262459c6e75ef2522ca0077c29e) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Remove save/remove implementations from Nokia engineVolker Hilsheimer2022-09-237-198/+3
| | | | | | | | | | | | The default implementation returns the special "Unsupported" reply when saving/removing categories or places, and the Nokia implementation did essentially the same thing, setting the UnsupportedError through a queued connection. Change-Id: I5eca2d1efe19f603b0151fc74e2815aba1d9781b Reviewed-by: Alex Blasche <alexander.blasche@qt.io> (cherry picked from commit 45887d30ba78aad8a4e57dcc0c56cd91d842eae8) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Port place example from qtquick1 to qtquick2Santhosh Kumar2022-09-2124-183/+195
| | | | | | | | | | Modified places (location/examples/location/place) example to use qtquick control 2 and its properties. Fixes: QTBUG-105827 Change-Id: I78ddd50655bc914fdc10002caed154ee5aa19bcf Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit d8f03e5e71de3d951f86f0b0413fd75d554b2039)
* Fix mapviewer example issues and modernize codeVolker Hilsheimer2022-09-2111-131/+159
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the example away from imperative coding style, and fix code that didn't following Qt 6 practices or caused warnings to be emitted to the console: Populate all menus consistently through items that bind their enabled state to relevant properties. This avoids that we have to clear and recreate the menus when switching provider. Don't print debug output when updating the position of the minimap. Capture parameters of signals correctly in the handlers. Fix some UI issues: We cannot replace the background of a styled button, so use AbstractButton instead, otherwise the example will generate runtime warnings with some styles, e.g. qrc:/qt-project.org/imports/QtQuick/Controls/macOS/Button.qml:44: TypeError: Property 'styleFont' of object QQuickRectangle(0x7fdfaa4e7bd0) is not a function Also don't squeeze the sliders by setting the spacing to -10, styled sliders will overlap, and don't use anchors on items managed by layouts. Change-Id: I118a52ae3d2ece77c662fd42bb868c9bbcf30e7a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit ab4b06741ee2dbb70e43ae1660d6ccca4913a32c) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Start with changes and porting documentationVolker Hilsheimer2022-09-213-79/+88
| | | | | | | Change-Id: I69531689995323ecbfd4014ff71e3d19858afbfc Reviewed-by: Alex Blasche <alexander.blasche@qt.io> (cherry picked from commit 31c94ac5a7d905312e4459d44c24cbe5f105dc9d) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Cleanup: use member initialization for QGeoTiledMapScenePrivateVolker Hilsheimer2022-09-202-29/+17
| | | | | | | | | Remove unused member m_mapEdgeSize (only set, but never read). Change-Id: I2442ba3fd4fa3f1ebff26ea0a6d604d700f6896c Reviewed-by: Alex Blasche <alexander.blasche@qt.io> (cherry picked from commit 4017f0ad8ccbade2121f24da3d82794272d56ade) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Cleanup: More nullptr instead of 0Volker Hilsheimer2022-09-2069-94/+102
| | | | | | | Change-Id: I6316384be07f1d0634860c3ddcbe85455e218fed Reviewed-by: Alex Blasche <alexander.blasche@qt.io> (cherry picked from commit 8f057784da92ee46c0fc64220aeb19aec0a6389e) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Cleanup: de-virtualize QGeoCodeReplyPrivateVolker Hilsheimer2022-09-208-111/+19
| | | | | | | | | | | | | | | | The only call to the single virtual function, extraData(), was commented out. The subclass in the OSM plugin only wrote extra data for debug runs and the subclass in the mock plugin is never used to test anything anyway. So remove all this overhead. As a drive-by, refactor to member initialization and use qsizetype for members that refer to indices in a QList. Change-Id: I600b4637bc367ae45d51b2a7f9a3ae0b78fb77c4 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Santhosh Kumar <santhosh.kumar.selvaraj@qt.io> (cherry picked from commit ff4207b1a41db4d23d4d0183152776e73f252a3a) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Cleanup: de-virtualize QPlaceAttributePrivateVolker Hilsheimer2022-09-202-19/+1
| | | | | | | | | | | | | | The possibility to override this type in plugins is not used anywhere, and overcomplicates the code. There isn't even a way to create a QPlaceAttribute with a reimplementation of the private. So remove this; if this is really needed for anything, then we can bring it back later. Change-Id: I4881583b87b775a4bcaf36bc972248b321e0ef2b Reviewed-by: Alex Blasche <alexander.blasche@qt.io> (cherry picked from commit 29bf63108f954119a0df6c70dd283367777a7e23) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Cleanup: de-virtualize QGeoManeuverPrivateVolker Hilsheimer2022-09-202-185/+41
| | | | | | | | | | | | | | | The possibility to override this type in plugins is not used anywhere, and overcomplicates the code. There isn't even a way to create a QGeoManeuver with a reimplementation of the private. So remove this; if this is really needed for anything, then we can bring it back later. Change-Id: I4edf78a21f53593e609f6e86e04464d4e974b0df Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Santhosh Kumar <santhosh.kumar.selvaraj@qt.io> (cherry picked from commit 87eb1a45b83e6044d7d0c83f98f419c8fbd5e007) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Cleanup: de-virtualize QGeoRouteSegmentPrivateVolker Hilsheimer2022-09-202-198/+40
| | | | | | | | | | | | | | The possibility to override this type in plugins is not used anywhere, and overcomplicates the code. There isn't even a way to create a QGeoRouteSegment with a reimplementation of the private. So remove this; if this is really needed for anything, then we can bring it back later. Change-Id: I34ad55d0ddf29cafc53e90e2a987c3faf904b437 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> (cherry picked from commit 69e0dea5de987d5b6e684b721b322b0495921981) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Cleanup: apply rule of zeroVolker Hilsheimer2022-09-2012-60/+14
| | | | | | | | | | | | Remove empty destructors, use std::unique_ptr where destructors only deleted a pointer member. This also closes the memory leak where the tile cache was never destroyed. Change-Id: I55007475b7f13a97d8399dd6d4234382106db05b Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Santhosh Kumar <santhosh.kumar.selvaraj@qt.io> (cherry picked from commit 88018b488a26bf3657960aed75c633bc13eb7aab) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Refactor: make QGeoJson a namespaceVolker Hilsheimer2022-09-202-30/+33
| | | | | | | | | It only has static methods. Change-Id: I706bd5131959cc67ace785bd1fd22e30ebb7202e Reviewed-by: Alex Blasche <alexander.blasche@qt.io> (cherry picked from commit e70c655366a9c30fcb15e7ed11a73623c7ee9b0c) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Add CMakeLists.txt for manual tests subdirectoryIvan Solovev2022-09-201-0/+6
| | | | | | | | ... so that they are shown in the build tree Change-Id: Ib073c8792d8ca938e55281321cd0b728e87c261d Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit b709bbc26a6685adb94e90a965072f704c36d324)
* Refactor: for loopsVolker Hilsheimer2022-09-1433-308/+276
| | | | | | | | | | | Replace indexed for loops with ranged for, replace int with qsizetype otherwise as appropriate. Apply const and line breaks in surrounding code. Change-Id: I1c2ee372545b8ab2cbb84c4b4b97ae52dedff1d0 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> (cherry picked from commit 366a6379fb80e8c223ae57b2fd791ffdfeacdbf3) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Refactor: remove duplicated codeVolker Hilsheimer2022-09-144-54/+10
| | | | | | | | | | | | | Use the existing helper implementation to convert QJSValue to QList<QGeoCoordinate>. Remove parseCircle helper function that is not used anywhere, and unexport the helper function that is only used by another helper. Change-Id: Ie01cca3e5a7bd09a88be67225185b54e0f28e773 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> (cherry picked from commit 22c3c1d155f817324ed535ba599633cad0e49b5e) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Refactor QDeclarativeGeoMapItemUtils into a namespaceVolker Hilsheimer2022-09-142-58/+67
| | | | | | | | | | | | | | The class was exported, but none of the static members or nested types are used outside the library, including tests. So turn the class into a namespace. Fix coding style issues, and convert to ranged-for loops. Change-Id: I57bc78eb91be721943608bacfc1b54ecd5b272a8 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit 3af758a4cf133a1d8b465a23e4967d64f0e52237) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Cleanup: use nullptr instead of 0Volker Hilsheimer2022-09-1431-92/+91
| | | | | | | Change-Id: I2f713a9a88023c5e2b3d779ebe73c821c72dd0e3 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> (cherry picked from commit a3204868017d1c7638412bf94257f754151e42e7) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Cleanup: Don't pass 0 to QSharedPointer constructorVolker Hilsheimer2022-09-143-4/+4
| | | | | | | | | Use the default constructor. Change-Id: Id9b5b9809cc2d247e50c7b37c370e9c13a19b513 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> (cherry picked from commit 8791d66b4116b4f4a942416ca290274da3653dee) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Refactor QGeoSimplify into a namespace, simplify, remove dead codeVolker Hilsheimer2022-09-142-297/+73
| | | | | | | | | | | | | | | The class had only static functions, with the internal helpers declared as protected. Move those helpers into an anonymous namespace inside the translation unit. This helped identify significant amounts of dead code. Remove it, simplify the remaining function, and fix the coding style, including replacing int with qsizetype. Change-Id: I4936b8c5f53323e06db082b5378fa185c562a948 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> (cherry picked from commit 42e4a7df150a96ef94166837c59bcbf167ff5be8) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Merge the factory versions into oneVolker Hilsheimer2022-09-145-115/+57
| | | | | | | Change-Id: I24ebd31750c95163d099c6f2daad2c96f468a515 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> (cherry picked from commit 6786f0fc1505d5a1b9ef3341e06bc209e463304a) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Constructor cleanupVolker Hilsheimer2022-09-1494-803/+352
| | | | | | | | | | Use member initialization, and remove unneeded implementations of special member functions. Fix coding style in related code. Change-Id: I3326e3f331762a9c1ad3c3baac0de02fc5bb2b44 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> (cherry picked from commit 48eb0a642688f792eb285ec56082b8f3c09d6605) Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>