1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Conan: Fix invalid options for package_id checksum

Browse Source 
The android specific options were plain wrong:
  - android_sdk_path -> android_sdk
  - android_ndk_path -> android_ndk

These reflect the Qt configure options.

Change-Id: I0b9283b6603aff8243208216baffe263d37b6541
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
(cherry picked from commit 66b1b8064224824e7fff4022daa27f53acecc7ae)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Iikka Eklund 2021-09-15 14:06:30 +03:00 committed by Qt Cherry-pick Bot
parent 3c7840904f
commit 5673fb1f9f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
conanfile.py
View File

@ -448,8 +448,8 @@ class QtBase(ConanFile):
# as those probably differ on each machine
rm_list = [
"sdk",
"android_sdk_path",
"android_ndk_path",
"android_sdk",
"android_ndk",
"android_ndk_platform",
"android_abis",
"android_javac_target",