summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Small improvements and fixes in different examples projectsLauri Laanmets2022-07-264-12/+12
| | | | | | | | | All examples except 'places' are ported now and work as much as I could test manually. Task-number: QTBUG-96795 Pick-to: 6.2 Change-Id: Icebe6b1c222c68ee2a2881ae442b255360af2fae Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Migrate mapviewer to Qt 6Ivan Solovev2022-07-2629-146/+174
| | | | | | | Task-number: QTBUG-96795 Pick-to: 6.2 Change-Id: Iac955b1018d7092a7d684718bf89bb2908ee3c16 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Migrate geojson_viewer example to Qt 6Ivan Solovev2022-07-265-43/+58
| | | | | | | | | | This includes using QuickControls2 instead of QC1 and also refactoring of the code for android permission requests. Task-number: QTBUG-96795 Pick-to: 6.2 Change-Id: I2986d5f1572d5889b15ee6b5d031d51a7b6a3da9 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Manual fixes in CMake files for examplesLauri Laanmets2022-07-265-19/+18
| | | | | | | | | | | Improvements in CMake files after they have been generated from .pro files by script. All examples except 'places' are included because 'places' example doesn't start (not ported yet). Task-number: QTBUG-96795 Pick-to: 6.2 Change-Id: I1fab82821f499f51337440274d0b66082f614fca Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Manual update of dependencies on 'dev' in qt/qtlocationVolker Hilsheimer2022-07-261-3/+3
| | | | | Change-Id: I7ae87be54a22f55e7ff78312b72ea8a8c6e65850 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Doc: Remove obsolete modules from dependenciesVolker Hilsheimer2022-07-261-1/+1
| | | | | | | Task-number: QTBUG-96795 Pick-to: 6.2 Change-Id: Ie4e793975aef01199dae7fc56a071ea04987df71 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Bump version number to 6.5.0Volker Hilsheimer2022-07-261-1/+1
| | | | | Change-Id: I87b0bff0c3d04fee46465c0d5f9e627ee1592cdb Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Remove expectFail again from passing testVolker Hilsheimer2022-07-261-4/+0
| | | | | | | The test passes locally and has XPASSed in CI as well. Change-Id: I27b0041a3233793827cc3dd7271e6def7482e714 Reviewed-by: Doris Verria <doris.verria@qt.io>
* Blacklist tests that are flaky on macOS ARM in CIVolker Hilsheimer2022-07-261-0/+11
| | | | | | | | | Our ARM macOS machines in CI might not be configured correctly. Ignore them for now. Pick-to: 6.2 Change-Id: Id3b4554c3795283d38b731a0a2c30f409cb25d9b Reviewed-by: Doris Verria <doris.verria@qt.io>
* Replace foreach with ranged for and set QT_NO_FOREACHVolker Hilsheimer2022-07-2635-109/+116
| | | | | | | | | | Make containers const where they obviously should be, iterate over references where it's clearly possible. Cherry-pick of 2c8c5dca44aba5612cc67b04dd3c7e5fc4919b19. Change-Id: Ie55a58873b48bbb60ac49790db612f85777e6ceb Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Porting Examples: use CMake replace qmakeZhang Hao2022-07-2246-107/+653
| | | | | | | | | | | | | | | | | | | | This commit re-enables follow examples: * places * places_list * places_map * minimal_map * itemview_transitions * planespotter Since mapviewer and geojson_viewer example need refactoring for Qt6,so this patch ignore them, but this patch will create them's CMakeList.txt file. Task-number: QTBUG-96795 Done-with: Lauri Laanmets <lauri.laanmets@eesti.ee> Pick-to: 6.2 Change-Id: Ib1385b978b243165163729668ca5d5504e81d9f9 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Update dependencies manuallyVolker Hilsheimer2022-07-111-3/+3
| | | | | | Change-Id: I90c3fb3117ae8805f8619fb8a082d5bdb4acb23f Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Enable tests on APPLEVolker Hilsheimer2022-07-111-2/+0
| | | | | | | They pass locally on macOS, so perhaps they only won't work on iOS. Change-Id: I79f59e4c67aca8842ae18e8cf5a237c3976bb3d1 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Mark tests failing after dependency update as expectFailVolker Hilsheimer2022-07-111-0/+4
| | | | | | | | Qt Quick changes to flicking/panning behavior seem to break this test. Change-Id: I5f79355addde3a2d0815142dd9b035080b7d46e8 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* In static builds, ignore tests depending on pluginsVolker Hilsheimer2022-07-111-16/+21
| | | | | | Change-Id: If98f86af595d2b05bbed28f10fbbc5e056f5c56e Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
* Update use of HTTP to HTTPS in esri pluginMilo Kerr2022-06-177-34/+43
| | | | | | | | | | | | | | | | | When accessed via HTTP, the arcgis.com endpoints return: {"error":{"code":400,"message":"HTTP not supported","details":[]}} With this change the esri plugin now accesses them via HTTPS. [ChangeLog][plugins][esri] Pick-to: 5.15 Fixes: QTBUG-92111 Change-Id: I7be0295f8c65853ab214bc11d7e6008f3137403a Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Guillaume Belz <gbelz@esri.com>
* Skip Qt Location build for now on INTEGRITYVolker Hilsheimer2022-06-161-0/+5
| | | | | | | | | | Build errors in CI blocking progress, needs to be built locally by someone with access to the toolchain. Change-Id: Ic7b369dc99a5bda0b26c2721400fdd58e24bca68 Reviewed-by: Kimmo Ollila <kimmo.ollila@qt.io> Reviewed-by: Tatiana Borisova <tatiana.borisova@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Fix build of tests in static configsVolker Hilsheimer2022-06-162-3/+15
| | | | | | | | The nokia geoservice plugin is linked in, which already defines the relevant symbols. Change-Id: I58ac5b268b2aa2c2dcb0d46ae83b3502daea60fa Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Silence build warnings, fix build errorsVolker Hilsheimer2022-06-1645-101/+98
| | | | | | | | | | Replace various deprecated APIs with their supported Qt 6 versions. Most notably, replace QScopedPointer with std::unique_ptr, as the code frequently use deprecated QScopedPointer::swap. Change-Id: If9cb0be89423fd310073709eb390401d74240153 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Update dependencies manuallyVolker Hilsheimer2022-06-161-3/+3
| | | | | | Change-Id: I191d15a605ecfe850c10bedcbe86f88ef52e79d6 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Migrate to autogenerated cpp exportsAlexey Edelev2022-03-153-21/+4
| | | | | | | | | Replace the hardcoded cpp exports with a generated one where it's applicable. Task-number: QTBUG-90492 Change-Id: I5cd8ca3db6a6c715e065d3559fa89d3b64e06f61 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Make sure all private headers include at least one otherThiago Macieira2022-03-0925-25/+50
| | | | | | | | | | See script in qtbase/util/includeprivate for the rules. Since these files are being touched anyway, I also ran the updatecopyright.pl script too. Change-Id: Ib056b47dde3341ef9a52ffff13ef677e471674b6 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Enable QML unit-testsIvan Solovev2022-02-2857-175/+235
| | | | | | | | | This commit re-enables all QML-related unit tests. Task-number: QTBUG-96795 Change-Id: I43f5e8b7d7cadc9e4ea975275b5154a499eeabb4 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Andreas Buhr <andreas.buhr@qt.io>
* QDeclarativeGeoMap: reorder new parameters application after camera ↵Ivan Solovev2022-02-281-16/+16
| | | | | | | | | | | | | | | | | | capabilities change When the camera capabilities are changed, we try to re-apply such parameters as zoom, tilt and FOV. Each of this parameters has min and max supported values. Before this patch we first applied the maximum value, and then the minimum. This was triggering an assert in the unit tests. With this patch we will first apply the minimum value. It will help to unblock the CI, but still may trigger asserts under some conditions. So a more general fix is required. Task-number: QTBUG-96795 Change-Id: I7671981377e5a3c4f47fdbd4cf05aa540581b45f Reviewed-by: Lauri Laanmets <lauri.laanmets@eesti.ee> Reviewed-by: Andreas Buhr <andreas.buhr@qt.io>
* Fix warnings for Windows buildIvan Solovev2022-02-287-14/+16
| | | | | | | Task-number: QTBUG-96795 Change-Id: Ia5fe6f24f06f18141923d9466d7b2d7651fd464b Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Finalize QtLocation CMake buildIvan Solovev2022-02-2813-5/+180
| | | | | | | | | | | | | | | | | | | Add missing files from declarativemaps and declarativeplaces. Reintroduce Qt.labs.location feature (currently always enabled, as I'm not sure that OpenGL is strictly required for now). Build Qt.location.labs as part of QtLocation lib when this feature is enabled. Also update build files for plugins to take this feature into account. Build QML plugins as two separate QML modules. This still requires some improvements because the code does not use QML_* macros, but an old-style qmlRegister* approach. Task-number: QTBUG-96795 Change-Id: Ib835848ca3ad551cc6d858d2bae10b9aa4df5160 Reviewed-by: Andreas Buhr <andreas.buhr@qt.io> Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
* Fix appendChildNode() callIvan Solovev2022-02-281-1/+1
| | | | | | | | | | | | | | The QSGNode::appendChildNode() method checks that its parameter must not have a parent. Before this patch we always called appendChildNode() on a node that already had parent, which was always leading to ASSERT in a debug build. Seems that the right approach would be to call this method, if the node *does not* have a parent. Task-number: QTBUG-96795 Change-Id: I10e17d17eeadec41f8da8939f4a0009176bbbdbb Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Lauri Laanmets <lauri.laanmets@eesti.ee>
* CoordinateAnimation East/West now swapped in Qt 6Lauri Laanmets2022-02-281-2/+2
| | | | | | | | | | | | Seems that there was a confusion about it and now swapped with commit 965c80c5db88dd94b666228d432b226c496c9d30. So, making necessary changes on the QtLocatino side as well. Task-number: QTBUG-96795 Change-Id: I1adf149a6e43dc9c80c5d07557a2378ef08a8453 Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> Reviewed-by: Andreas Buhr <andreas.buhr@qt.io>
* Port OpenGL dependent code to Qt6 updated graphics APILauri Laanmets2022-02-2817-408/+331
| | | | | | | | | | | | All 'old' map object ported to new Qt6 API and tested (almost). Labs project is not tested. This is part of a bigger work to port QtLocation maps to Qt6. Task-number: QTBUG-96795 Change-Id: I0b748a7f4c37f4fcc0cad038e2846b7c86dec84e Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
* Adapt QDeclarativeGeoWaypoint to use bindable coordinate propertyLauri Laanmets2022-02-281-13/+22
| | | | | | | | | | | QObjectBindableProperty returns only const value and object based properties like QGeoCoordinate cannot be modified, they have to be replaced totally. This is part of a bigger work to port QtLocation maps to Qt6. Task-number: QTBUG-96795 Change-Id: I39e9d9a97d65af7daf2dca30a00d563b2bf6aa80 Reviewed-by: Andreas Buhr <andreas.buhr@qt.io> Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
* Switch examples to build as isolated sub-builds part 2Alexandru Croitor2022-02-111-1/+1
| | | | | | | | | | | | | | | qt_examples_build_begin needs the EXTERNAL_BUILD flag to know that it's safe to build examples as ExternalProjects. It still won't do it in CI until we enable building examples as ExternalProjects for prefix builds. This is preparation for that. Pick-to: 6.2 6.3 Task-number: QTBUG-90820 Change-Id: I4851a3d8b1b23d2aa1ef7135c08ae83c5276e737 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
* Add required libraries to fix QNX buildAndreas Buhr2022-02-112-2/+5
| | | | | Change-Id: I5fdffe2826c0aa981c9fb3c1cb76be763559f34e Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
* Bump version to 6.4.0Andreas Buhr2022-02-112-12/+1
| | | | | Change-Id: Id5c7eb4794f0e62e8df15e74e55f1827b812219b Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
* Update dependencies on 'dev' in qt/qtlocationAndreas Buhr2022-02-111-3/+3
| | | | | Change-Id: I792e0a2ac977af7964dba3c252b52ce3e029f7ff Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
* constructRoute: remove segmentPathLengthCountShawn Rutledge2022-01-191-4/+0
| | | | | | | | | | | It was causing a (fatal) warning: error: variable 'segmentPathLengthCount' set but not used [-Werror,-Wunused-but-set-variable] Pick-to: 6.3 Change-Id: Ia6ce5861539f878c307630182eb671c442d14a62 Reviewed-by: Lauri Laanmets <lauri.laanmets@eesti.ee> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* QDeclarativeGeoMap: Fix warning about missing breakThiago Macieira2022-01-171-0/+1
| | | | | | | | | | | | Introduced in commit 18aae46a744adb4510a2b04c7322c3f66bded474 ("Mouse/touch input handling re-work"). Found by GCC 11: qdeclarativegeomap.cpp:2577:9: warning: this statement may fall through [-Wimplicit-fallthrough=] Change-Id: I0e5f6bec596a4a78bd3bfffd16c99623de12e6ec Reviewed-by: Lauri Laanmets <lauri.laanmets@eesti.ee> Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
* Use up-to date LGPL license headerKai Köhne2021-12-02389-5118/+5418
| | | | | | | | Remove usages of outdated LGPL3 header that references LICENSES.LGPLv3 instead of LICENSES.LGPL3. Change-Id: Ied647fc10d2bf051cccc8b38d75570b7caef1f28 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* replace int by qsizetypeLauri Laanmets2021-11-0912-28/+28
| | | | | | | | | | | For "count" and "at" methods, the parameter or return type int was replaced by qsizetype. This patch adapts the code to this change. Task-number: QTBUG-96795 Change-Id: Id409ab573cce886649a72538584dfa57264e7dac Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Change 'geometryChanged' to 'geometryChange'Lauri Laanmets2021-11-0912-25/+25
| | | | | | | | | | | | | As stated by the documentation: https://doc.qt.io/qt-6/quick-changes-qt6.html#changes-to-qquickitem This is part of a bigger work to port QtLocation maps to Qt6. Task-number: QTBUG-96795 Change-Id: I9dcf2e454d949dfbf3a9861b98eb949be6e6df56 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Andreas Buhr <andreas.buhr@qt.io>
* Change 'setBoundingBox' to 'setBoundingShape'Lauri Laanmets2021-11-099-9/+9
| | | | | | | | | | | | https://doc.qt.io/qt-6/qtpositioning-changes-qt6.html#c This is part of a bigger work to port QtLocation maps to Qt6. Task-number: QTBUG-96795 Change-Id: I9c14bd39d2da95a0be6542be432b79e26906c5ed Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Andreas Buhr <andreas.buhr@qt.io>
* Change QGeoPolygon 'path' to 'perimeter'Lauri Laanmets2021-11-097-28/+28
| | | | | | | | | | | | https://doc.qt.io/qt-6/qtpositioning-changes-qt6.html#rename-qgeopolygon-path This is part of a bigger work to port QtLocation maps to Qt6. Task-number: QTBUG-96795 Change-Id: I34f27f7e21a3e4243b7fc08a93bc6e95d0541814 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Andreas Buhr <andreas.buhr@qt.io>
* Correct string literal comparison and concatenationLauri Laanmets2021-11-093-40/+42
| | | | | | | | | | This is part of a bigger work to port QtLocation maps to Qt6. Task-number: QTBUG-96795 Change-Id: Ib4c845679a9dcdd9994603076d9ba7d06c2d1c47 Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Andreas Buhr <andreas.buhr@qt.io>
* Mouse/touch input handling re-workLauri Laanmets2021-11-094-173/+109
| | | | | | | | | | | Mouse and touch input part is re-written to support new 'exclusiveGrabber' and to be able to share different touch points between different child items. For example, one finger can pan the map and another finger can scroll child ListView or pinch can be started even when first finger touched child mouse area but started moving together with the second finger. This is part of a bigger work to port QtLocation maps to Qt6. Fixes: QTBUG-68771 Task-number: QTBUG-96795 Change-Id: Ie4022350156ab0129b6cbba0a442a19bb1ee74d9 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Code clean-up to be able to compile for Qt 6Lauri Laanmets2021-11-098-8/+4
| | | | | | | | | | | | Various minor changes about includes and re-definitions, etc, to make the compiler happy. Leaving QGeoRoutingManager doc sample code Q_OBJECT AutoMoc error for a separate patch. This is part of a bigger work to port QtLocation maps to Qt6. Task-number: QTBUG-96795 Change-Id: Ic1d22cec18660a7a01dbafe89f134bdd04574851 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Remove QAbstractDeclarativeData::parentChangedLauri Laanmets2021-11-093-10/+9
| | | | | | | | | | | | | | | | | This method was removed from qtbase in e8b7e4e96a23b87011abeb1e4f5f694654866e3f. This commit removes the usage of this method from qtlocation and attempts to achieve the same behavior by introducing a custom setParentAndNotify() method which emits the parentChanged() signal. The code is also updated to make use of the new method. This is part of a bigger work to port QtLocation maps to Qt6. Task-number: QTBUG-96795 Change-Id: I4523cf567b4510fc17473a37c689c689ee53130e Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* QGeoRoutingManager doc example into snippet fileLauri Laanmets2021-11-092-72/+122
| | | | | | | | | | QGeoRoutingManager documentation has and example code with full C++ class. This also contains Q_OBJECT macro. But this macro is checked by AutoMoc (doesn't care if it's in a comment) and gives build error that moc_ file is not included. So, moving this example code into snippet file to get over that. This is part of a bigger work to port QtLocation maps to Qt6. Task-number: QTBUG-96795 Change-Id: I581ed5df55a49ce761423eba3353b683f2e2409b Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
* Fix QGeoJson import/exportIvan Solovev2021-11-091-2/+3
| | | | | | | | | | | | The qgeojson test was actually failing. The following fixes to the class were done: - Improved check for invalid QVariant when importing 'bbox' object - Handle the fact that 'id' field is optional in the 'Feature' object Task-number: QTBUG-97769 Task-number: QTBUG-96795 Change-Id: I99696fc90b02f5deb5c438cf7ae93fcefd08882e Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Update dependency on QtPositioningIvan Solovev2021-11-091-3/+3
| | | | | | | | | Use the proper version of QtPositioning module. Have to do it manually because QtLocation is not handled by submodule update bot Task-number: QTBUG-97769 Change-Id: I1e205732123aba1eb371924e76e6f48f6cafcdce Reviewed-by: Andreas Buhr <andreas.buhr@qt.io>
* Fix warnings that break Windows buildIvan Solovev2021-11-099-23/+23
| | | | | | | | | | Windows machines in the CI have more strict rules for dealing with warnings. Most of them are treated as errors. This patch fixes such warnings. Task-number: QTBUG-97769 Change-Id: I9432d266a0b019512c38009ff2395b51071c59bf Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Plugins: port to QPluginParsedMetaData and CBORIvan Solovev2021-11-092-17/+17
| | | | | | | | | | | QFactoryLoader now no longer converts its internal metadata to JSON, so we may as well not do it here either. All of this is internal API, so we can change. Task-number: QTBUG-97769 Change-Id: I91f9fd5a3a843befff2fb29be7659b7520be16bc Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
View Lorry Controller Status