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
Pick-to: 6.1
Task-number: QTQAINFRA-4325
Change-Id: I1a06cc002ca1da4f723c2b9d1ddfb7fb2e25fe34
Reviewed-by: Toni Saario <toni.saario@qt.io>
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
Pick-to: 6.1
Task-number: QTBUG-90901
Change-Id: I991516a804875475991e27c7265693b3a7adec5d
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
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.
Pick-to: 6.1
Task-number: QTBUG-90583
Change-Id: I33e2ebc6b04f87027e039d0ae951179f5b2d5530
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
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: I7068865a66a368c36485ca495629b3ca40b2053e
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit ee6e01e58b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Iikka Eklund
Jani Heikkinen