summaryrefslogtreecommitdiff
path: root/conanfile.py
Commit message (Collapse)AuthorAgeFilesLines
* Conan: Use "scm" revision mode when exporting from .git repositoryIikka Eklund2021-04-131-1/+3
| | | | | | | | | | | | | | | | We have two use cases where the conan export is being executed: - Conan export from src tar ball - .git directory is not present - Coin/CI: conan export from git repository The "scm" feature will not work if the ".git" repository does not exist. If this is the case then use the default "hash" mode for the recipe revision. Change-Id: Ic7b74cc1f1d2f47852e6fba96dbcfe80f90e57d0 Reviewed-by: Toni Saario <toni.saario@qt.io> (cherry picked from commit 8af546ecf90d00895543882ead2d4133cab1f57f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add "scm" attribute to conanfile.pyIikka Eklund2021-03-301-0/+1
| | | | | | | | | | | | | | We want to match the commit ID along with the RREV (recipe revision). This way we can pin exact Conan packages to known sha1/tag which makes releasing easier. https://docs.conan.io/en/latest/reference/conanfile/attributes.html#revision-mode Task-number: QTQAINFRA-4325 Change-Id: I0e34081429c545b73f549a2aea739dcaee98c11e Reviewed-by: Toni Saario <toni.saario@qt.io> (cherry picked from commit e2bed44b317951494d30feb2910a05ba87ea1b63) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* conanfile.py: Use QTDIR instead of QT_PATHIikka Eklund2021-01-291-4/+4
| | | | | | | | | | | | | There's an established environment variable for this though, QTDIR. This environment variable is also set by Qt Creator by default. So the Conan recipes should accept this environment variable instead. This requires a change in the matching conan profile files where the path to Qt installation is injected to env. Task-number: QTBUG-90583 Change-Id: I14408ba952dd5de652a52db26e85b8ca01dcfc88 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* Bump version number to 6.1.0Jani Heikkinen2021-01-191-2/+2
| | | | | | Change-Id: I2ab0003172256ee83ea089691210a74c0a70ce59 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io> Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
* Add conanfile.py to support builds with ConanIikka Eklund2021-01-171-0/+129
Support building with Conan against Qt6 base binary package. The build recipe expects to locate QT_PATH from env. The 'qt-cmake(.bat)' is used for the build. 'CMAKE_TOOLCHAIN_FILE' is used to pick the toolchain file for cross compilations. For Android builds 'ANDROID_SDK_ROOT' and 'ANDROID_NDK_ROOT' need to be passed from env. Change-Id: I2552410c5c6a01f49fb43b25fa542bc7c2bcbf78 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit 53df4adce413b50b128e54aee925b1011d3b53a1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
View Lorry Controller Status