summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Bennett <nicholas.bennett@qt.io>2023-03-17 14:49:33 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2023-03-21 13:25:23 +0000
commit375cdba2ad4609b264f41fd7bf18c520efd694b5 (patch)
tree94a0b0f3bc1c22e5c460ff2494323ed5516a9a2f
parentbac763d36b7aff45904d395ebde76e58fdf55803 (diff)
downloadqtdoc-375cdba2ad4609b264f41fd7bf18c520efd694b5.tar.gz
Docs: Change armv7a to armeabi-v7a
When trying to configure a Qt for Android kit for armv7a ABI, if using the name as listed on https://doc.qt.io/qt-6/android-building.html#architectures "armv7a" it will result in an "unknown Android ABI" error. The actual name you need to pass to configure for android-abis is "armeabi-v7a". Fixes: QTBUG-111914 Change-Id: I3f185fa18eaab25a635e2f554a1b8e88c15a8ce4 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit 295a249546ead85a856dde9e917df5ceb4620aa2) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--doc/src/platforms/supported-platforms.qdocinc2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/platforms/supported-platforms.qdocinc b/doc/src/platforms/supported-platforms.qdocinc
index f100584f..3d6416b2 100644
--- a/doc/src/platforms/supported-platforms.qdocinc
+++ b/doc/src/platforms/supported-platforms.qdocinc
@@ -79,7 +79,7 @@ The following configurations are supported in this Qt release:
\table 80%
\header \li Distribution \li Architecture \li Compiler \li Notes
\row \li Android 8.0 or later (API level 26 or higher)
- \li \c armv7a, \c x86, \c arm64-v8, and \c x86_64
+ \li \c armeabi-v7a, \c x86, \c arm64-v8, and \c x86_64
\li Clang 14.0.6 (NDK r25b) as provided by Google
\li For JDK versions see \l{Java Development Kit (JDK)}
\endtable