summaryrefslogtreecommitdiffstats
path: root/conanfile.py
Commit message (Collapse)AuthorAgeFilesLines
* Bump versionJani Heikkinen2021-05-071-1/+1
| | | | Change-Id: I83ecf31da55d37c4f0edbc1e6cf24d7c749da359
* Add "scm" attribute to conanfile.pyIikka Eklund2021-03-151-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: I866e9fc20cc82dbf03b818f7f3502e3e0991b440 Reviewed-by: Toni Saario <toni.saario@qt.io> (cherry picked from commit e9abaa440fa7447d12f38a9e1976747ca1804346) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* conanfile.py: Use QTDIR instead of QT_PATHIikka Eklund2021-02-151-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: I128cc1390f0a8525ee4490393cb63338bf511c16 Reviewed-by: Simo Fält <simo.falt@qt.io> (cherry picked from commit 64dada44e1cd0f15da0cc12105aebe83210cbdfe) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Conan: Use the 'shared' option value of the Qt buildIikka Eklund2021-02-151-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Default to the value of the prebuilt Qt build. The 'default' needs to be added as valid option in the list which will be used by default if no value is given by the user or via the conan profile. The user is still able to override this via the profile or from command line if needed: "conan install ... -o shared=False" CMakeCache.txt: - "conan install ..." - BUILD_SHARED_LIBS:BOOL=ON - "conan install ... -o shared=True" - BUILD_SHARED_LIBS:BOOL=ON - "conan install ... -o shared=False" - BUILD_SHARED_LIBS:BOOL=OFF Task-number: QTBUG-90901 Change-Id: I59db7a92cfe8f37bdf0f2f4df9408386aacfac82 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> (cherry picked from commit fe9b50df1545216c08aba0443988d3e3130da62b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Add conanfile.py to enable Conan buildsTomi Korpipaa2021-01-291-0/+130
Fixes: QTBUG-90432 Change-Id: I7715a66bfaea1a6929e7b4589d5954623829838d Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-01 19:57:52 +0000