From 1022944a35acf9fd5de49bda249a3717aefade26 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Wed, 12 Aug 2020 16:36:04 +0200 Subject: Document qmake variable ANDROID_TARGET_ARCH ANDROID_ABI is only available in CMake. In qmake, the variable is called ANDROID_TARGET_ARCH. Fixes: QTBUG-85542 Change-Id: I0f3f7320b08a4fe6448dd40c294254c644cfb3ee Reviewed-by: Joerg Bornemann --- qmake/doc/src/qmake-manual.qdoc | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'qmake/doc') diff --git a/qmake/doc/src/qmake-manual.qdoc b/qmake/doc/src/qmake-manual.qdoc index 5d77e74dcf..5f672f3377 100644 --- a/qmake/doc/src/qmake-manual.qdoc +++ b/qmake/doc/src/qmake-manual.qdoc @@ -907,14 +907,6 @@ to specify a list of libraries that each project needs to link against, and \c QMAKE_LIBS_X11 would be used to extend this list. - \target ANDROID_ABI - \section1 ANDROID_ABI - - \note This variable applies only to Android targets. - - Specifies the Android target ABI. Valid values are: armeabi-v7a, arm64-v8a, - x86, x86_64. - \target ANDROID_ABIS \section1 ANDROID_ABIS @@ -1082,6 +1074,14 @@ Specifies the target Android API level for the project. By default, this variable is set to API level 28. + \target ANDROID_TARGET_ARCH + \section1 ANDROID_TARGET_ARCH + + \note This variable applies only to Android targets. + + Specifies the Android target ABI. Valid values are: armeabi-v7a, arm64-v8a, + x86, x86_64. + \target ANDROID_VERSION_CODE \section1 ANDROID_VERSION_CODE -- cgit v1.2.3