summaryrefslogtreecommitdiffstats
path: root/config_help.txt
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@qt.io>2019-05-07 14:51:25 +0200
committerFrederik Gladhorn <frederik.gladhorn@qt.io>2019-05-07 14:51:25 +0200
commit4f5b2733b6e8be08177de628da55b8b22db9f707 (patch)
treeae5c1f1ca36b070211920e8878c9c80e0b6fbda4 /config_help.txt
parentac68ef1efc27669e9c8fc255298345d72d198d68 (diff)
parent050e7bafad3b723fe5be6e981a32e708dbdc5150 (diff)
Merge 5.13 into 5.13.0
Diffstat (limited to 'config_help.txt')
-rw-r--r--config_help.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/config_help.txt b/config_help.txt
index 6b27529bdc..ebcfa3fb42 100644
--- a/config_help.txt
+++ b/config_help.txt
@@ -203,7 +203,7 @@ Build environment:
-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, mips, mips64)
+ 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