summaryrefslogtreecommitdiff
path: root/CMakeLists.txt
Commit message (Collapse)AuthorAgeFilesLines
* Add the use of the qt_internal_project_setup functionAlexey Edelev2023-05-101-0/+1
| | | | | | | | | The function sets the required CMake variables and policies. Pick-to: 6.5 Task-number: QTBUG-112685 Change-Id: I7dd03ec53ae4eb21fce3f968c0bc773df71f35cc Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io>
* Skip -no-gui build, instead of erroring outKai Köhne2023-03-311-4/+14
| | | | | | | | | | This currently breaks a top-level -no-gui build. Fixes: QTBUG-112477 Pick-to: 6.5 Change-Id: Idd45751bcfaf5cb275e9b2ca52995556141ff90a Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* Implement all four map items with ShapeLaszlo Agocs2023-02-081-1/+1
| | | | | | | | | | | | | With a master switch in qdeclarativegeomapitembase_p.h, this is enabled by default. For now the old method is still available by just commenting out the define. The old path can be removed in follow-up patches; for now keeping both so one can compare and debug if further issues arise. Pick-to: 6.5 Change-Id: I01c44ee8a07d7d5f7eb018be33ac5d161ba90e2a Reviewed-by: Matthias Rauter <matthias.rauter@qt.io> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* Build system: fix requirementsVolker Hilsheimer2022-09-261-17/+5
| | | | | | | | | ShaderTools are strictly speaking required as well, but we might be able to make them optional if the RHI based item implementations get moved out. Change-Id: I3daa5ebbc8218f85fc18f608b94667de14601096 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Manual fixes in CMake files for examplesLauri Laanmets2022-07-261-0/+5
| | | | | | | | | | | 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>
* 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>
* Finalize QtLocation CMake buildIvan Solovev2022-02-281-2/+2
| | | | | | | | | | | | | | | | | | | 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>
* Add required libraries to fix QNX buildAndreas Buhr2022-02-111-2/+2
| | | | | Change-Id: I5fdffe2826c0aa981c9fb3c1cb76be763559f34e Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
* Build minimal subset of QtLocation with unit-testsIvan Solovev2021-11-091-1/+12
| | | | | | | | | | | | Build src/location/maps and src/location/places with a minimum subset of required src/location/declarativemaps files. Also build all plugins except mapbox-gl. Enable all non-QML unit-tests. Task-number: QTBUG-97769 Change-Id: I7c70584376c688efd2e1d046186732a7399e12d9 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Remove QtPositioning module from qtlocation.gitIvan Solovev2021-10-271-2/+6
| | | | | | | | | | | | | | | Turns out that our CI does not support repos without any tests. This is treated like an error and leads to integration failure. This patch fixes it by disabling tests in coin/module_config.yaml. This config should be fixed when QtLocation tests are enabled Pick-to: 6.2 Task-number: QTBUG-97084 Change-Id: Ib06e865fe2836806bbbee34345f06b471dd48660 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Use fixed qt_add_resource BASE argumentJoerg Bornemann2021-05-221-0/+3
| | | | | | | Task-number: QTBUG-86726 Change-Id: I8372086c40043a6bd1d306b6bfb711e96ddc7cb7 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* QtPositioning: refactor unit testsIvan Solovev2021-02-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Some of the QtPositioning QML unit tests can be separated from the QtLocation tests, and run with QtPositioning and QtPositioningQuick only. This patch moves such unit tests into separate subdirectory. It also updated the tests to reflect the changes in Qt6: Since Qt6 the variant type behaves as var, so the tests that rely on the obsolete behavior need to be updated. The QGeoShape::center() method is no longer marked Q_INVOKABLE, because with updated Qt6 behavior it overrides the center properties of the child classes (like QGeoCircle or QGeoRectangle). It's marked as a read-only property instread, so that it could still be accessed from QML code. [ChangeLog][QtPositioning][QGeoShape] center is now a read-only property. The center() function is no longer a Q_INVOKABLE. Task-number: QTBUG-90491 Task-number: QTBUG-90836 Change-Id: I3c7993aa8abe1199e825d46ab19ccfb53902018f Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* Use api-version 3 in QtPositioning CMake scriptsAndreas Buhr2021-01-261-1/+1
| | | | | | | Change-Id: I7ea14860952f085f8b9a3dc43bbc531b3acad26d Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Ivan Solovev <ivan.solovev@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* QtPositioning: port to cmakeIvan Solovev2021-01-201-0/+21
Switching QtPositioning, its tests and examples to cmake. QtLocation is not covered by this patch. Task-number: QTBUG-89854 Change-Id: Ic971f7fd4c576eac9b662641aae77d68c062712d Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
View Lorry Controller Status