| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
|
|
|
|
|
|
| |
Replace the current license disclaimer in files by
a SPDX-License-Identifier.
License files are organized under LICENSES directory.
Pick-to: 6.4
Task-number: QTBUG-67283
Change-Id: I775d4a0c07b2b82a097d36649203e7f6223fdc51
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
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.
Pick-to: 6.2
Task-number: QTBUG-94822
Change-Id: I73e7906e1b24ddad7fd808e30e22c5015eb9aa4a
Reviewed-by: Toni Saario <toni.saario@qt.io>
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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.
Pick-to: 6.1
Change-Id: Ic7b74cc1f1d2f47852e6fba96dbcfe80f90e57d0
Reviewed-by: Toni Saario <toni.saario@qt.io>
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
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: I0e34081429c545b73f549a2aea739dcaee98c11e
Reviewed-by: Toni Saario <toni.saario@qt.io>
|
| |
|
|
| |
Change-Id: Ibe1491f6c54a9aa003444b73e35817abd19c2087
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
Change-Id: I6bdc6fe729999dfb88c31861d427c99195e24662
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@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.
Task-number: QTBUG-90583
Change-Id: I14408ba952dd5de652a52db26e85b8ca01dcfc88
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
|
| |
|
|
|
|
| |
Change-Id: I2ab0003172256ee83ea089691210a74c0a70ce59
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
Reviewed-by: Iikka Eklund <iikka.eklund@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: 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>
|
