| 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: I5678b086dc1da06fc2045a82b5678949b40f267e
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-94872
Change-Id: I113ab7efb49cea5c437ad99f0890f85f327686b7
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
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: I0ffe13353e4d9b8da0eca7021da3f54288c5c99e
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: I766e5a67af11a4457cc8f060aa84531f84df6117
Reviewed-by: Toni Saario <toni.saario@qt.io>
|
| |
|
|
| |
Change-Id: I4015c3e0024d8acb70ff9bcb1610319d1eaab945
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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: Ic71ac82b8b4bda0ae508680094bafc2d6c00ea13
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: I2776b21a0c4385781ae0e6aeaafda1f8fcc9a855
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: Ia1349f775c63718dc66866905591b44fb3dccec1
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
(cherry picked from commit c396933a0c0741950efebc6550a198bbff982692)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
