aboutsummaryrefslogtreecommitdiffstats
path: root/conanfile.py
Commit message (Collapse)AuthorAgeFilesLines
* Use SPDX license identifiersLucie GĂ©rard2022-06-111-27/+2
| | | | | | | | | | | | Replace the current license disclaimer in files by a SPDX-License-Identifier. Files that have to be modified by hand are modified. License files are organized under LICENSES directory. Pick-to: 6.4 Task-number: QTBUG-67283 Change-Id: I63563bbeb6f60f89d2c99660400dca7fab78a294 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Conan: Update recipe optionsIikka Eklund2022-05-191-0/+9
| | | | | | | | | Add missing 'qt-configure-module' features into recipe which should be available for consumers. Pick-to: 6.3 Change-Id: Icc498d16e8f962abcc9c89ebf8570288c86fbc2d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Conan: Enable recipe exclude options passed to qt-configure-moduleIikka Eklund2022-05-121-3/+3
| | | | | | | | | | | | | | | | | | | | Current implementation allows only to enable a leaf module feature and when setting the option/feature to 'no' it gets translated to not being passed at all to qt-configure-module. This change calls 'convert_qt_features_to_conan_options()' from qt-conan-common module which can correctly translate the given recipe options so that: -o option1=True -> qt-configure-module -feature-option1 -o option1=False -> qt-configure-module -no-feature-option1 Task-number: QTBUG-100073 Pick-to: 6.3 Change-Id: Id32f451ec029ced1ad17a6e4258d885baa5d3661 Reviewed-by: Toni Saario <toni.saario@qt.io>
* Remove the qml_sequence_object feature flagUlf Hermann2022-01-151-1/+0
| | | | | | | | | | | | | | | | | | | QML sequences are required for named lists of value types. The original reason for the introduction of this feature was the template code explosion caused by the way the sequence types were registered in Qt5. As we register them differently now, the code size overhead should be smaller. It makes very little sense to switch sequence types off these days. [ChangeLog][QtQml][Important Behavior Changes] The qml_sequence_object feature flag has been removed. Omitting sequences from the QML language does not make much sense now that we use them for lists of value types. The original reason to allow it was that the sequence support took up a lot of space in the binary. This is not the case anymore since 6.0. Change-Id: I2f1d43cdd29ba63853316b06113cb49ed30aa410 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* quick: add qquicktreeviewRichard Moe Gustavsen2021-12-041-0/+1
| | | | | | | | | | | | | This patch adds TreeView to Qt Quick. It is more or less a copy from the TreeView in Marketplace, but with some modifications to make it more equal to the already existing TableView, ListView, and GridView. [ChangeLog][Item Views] A new view is added: TreeView Fixes: QTBUG-61630 Change-Id: Ibb9d22cf9c9df021e77d03287872134c2682682a Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Conan: Inherit recipe class from QtLeafModule for common functionalityIikka Eklund2021-08-261-45/+17
| | | | | | | | | | | | The qt-conan-common package implements a base class for Qt leaf module recipes. The build steps in leaf modules are mostly identical so it makes sense to put those in the base class. Dependencies are read by the base class from the 'dependencies.yaml' which is the same file the CI system uses. Change-Id: I2b9f9f449eb8a855f7e8109c7268063e006bd3e2 Reviewed-by: Toni Saario <toni.saario@qt.io>
* Conan: Split version string interpolation into separate functionIikka Eklund2021-06-281-1/+5
| | | | | | | | Make the readibility and syntax highlighting a bit cleaner. Pick-to: 6.2 Change-Id: I46f0eed30124e1155b746c2e9c9e2c272a5a3d59 Reviewed-by: Toni Saario <toni.saario@qt.io>
* Add conanfile.py to support builds with ConanIikka Eklund2021-06-211-0/+127
The build recipe uses the qtbase's 'bin/qt-configure-module' script directly which is recommended when building other Qt modules ouside the qtbase's -prefix. The recipe uses functionality from qt-conan-common Conan package via 'python_requires'. This recipe sets it's own Conan options that match with the module configure options. The recipe sets it's version number based on QT_REPO_MODULE_VERSION and QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT in .cmake.conf file. The dependency to qtbase, qtsvg and qtshadertools is declared using semantic versioning so that it will pick the latest available prerelease or final version of the major.minor.patch. Task-number: QTBUG-94384 Pick-to: 6.2 Change-Id: I1f12434521d11f63c31a102bfbfaf923cb262965 Reviewed-by: Toni Saario <toni.saario@qt.io>