summaryrefslogtreecommitdiffstats
path: root/conanfile.py
Commit message (Collapse)AuthorAgeFilesLines
* Bump versionJani Heikkinen2021-06-081-1/+1
| | | | Change-Id: I54ea10463427ebe2b01795ca758242ac717e25a3
* Bump versionJani Heikkinen2021-05-071-1/+1
| | | | Change-Id: If3a8f0033cf7b3408c842db38c44cf9876d02003
* 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: I61bd68b60e616ba5107643996b345cdf37b63522 Reviewed-by: Toni Saario <toni.saario@qt.io> (cherry picked from commit 0d12b5359800727dde28ddcd92892fdc5c2a736a) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add "scm" attribute to conanfile.pyIikka Eklund2021-03-161-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: I0cd1ff15115fab31af41fd32d2c75ea0b945adc1 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> (cherry picked from commit 2b605d7bb6f5a91bed0cbee338b5bf52b66fa88e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add conanfile.py to support builds with ConanOliver Wolff2021-02-231-0/+112
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. Fixes: QTBUG-90421 Change-Id: I82522898332ac1f71d297a28e6a99644b219489c Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit 65f35825d53ef125367f798f1e59820dc4f3df45)