diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-29 01:00:48 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-29 01:00:59 +0200 |
| commit | ce8ab39a0897600fabde9001961bc2baa1ada726 (patch) | |
| tree | 017ee885249c7e7d04b718068299d6d72cf3bc83 /config_help.txt | |
| parent | 9c132004b0b34f8d07a58b75c207e2fc7d695727 (diff) | |
| parent | a31d1af59189fe865e7c1efd00627384874cb015 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.14' into dev"
Diffstat (limited to 'config_help.txt')
| -rw-r--r-- | config_help.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config_help.txt b/config_help.txt index 19991becb6..614c395f90 100644 --- a/config_help.txt +++ b/config_help.txt @@ -203,8 +203,8 @@ Build environment: -android-ndk-platform Set Android platform -android-ndk-host .... Set Android NDK host (linux-x86, linux-x86_64, etc.) [$ANDROID_NDK_HOST] - -android-arch ........ Set Android architecture (armeabi, armeabi-v7a, - arm64-v8a, x86, x86_64) + -android-abis ....... Comma separated Android abis, default is: + armeabi-v7a,arm64-v8a,x86,x86_64 -android-toolchain-version ... Set Android toolchain version -android-style-assets Automatically extract style assets from the device at run time. This option makes the Android style behave |