diff options
| author | Iikka Eklund <iikka.eklund@qt.io> | 2022-04-07 15:57:15 +0300 |
|---|---|---|
| committer | Iikka Eklund <iikka.eklund@qt.io> | 2022-05-06 07:52:47 +0000 |
| commit | 71684763b7c397e23ec997361d8daa30bcddb147 (patch) | |
| tree | 2c53562d472c47889bdf69769534add158a97f73 /src/plugins/platforms/xcb/qxcbconnection.cpp | |
| parent | 948e1f9d82c18ea1428384d86791647067927330 (diff) | |
Conan: Use 'android_sdk_version' and 'android_ndk_version' for package_id
We can not alter the value of 'android_sdk' and 'android_ndk' options
when qtbase's package_id is being calculated. We have attempted to
convert the option values (paths to file system) to actual version
strings.
While the conversion itself works the usage of Conan lock files in CI
fails: "Locked options do not match computed options".
Exclude 'android_sdk' and 'android_ndk' from package_id. Instead the
'android_sdk_version' and 'android_ndk_version' will be used for
package_id which affects the binary compatibility.
Pick-to: 6.3
Change-Id: Ia99a69d9b91cebb8dea821fd8b9c6c59091f1a41
Reviewed-by: Toni Saario <toni.saario@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbconnection.cpp')
0 files changed, 0 insertions, 0 deletions