| 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: Iaeb3cb05cd781031a35e40f712805fa265116076
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-94879
Change-Id: I445ebbd389d160e32a70769f81f710a9836b2fae
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Reviewed-by: Luca Di Sera <luca.disera@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
|
|
|
|
| |
Change-Id: Ib92149e1b73d7457307d109d5d23e1f7152674a9
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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: I8fb37fec1b7b05b116377d169c835117801c5f45
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: I9925ce9aa764e7c9b931ab27afbaff3534293c16
Reviewed-by: Toni Saario <toni.saario@qt.io>
|
|
Support building with Conan against Qt6 base binary package.
Default the 'shared' option to the value of the Qt build.
The build recipe expects to locate QTDIR 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.
Pick-to: 6.1
Change-Id: I6a22bb20fd72afa00564d19c35a3c3b6b8966116
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
|