qt5base-lts/mkspecs
Fab Stz 979a21dc4e Add support for MultiABI with custom install dir of the android-build
Right now, "multi abi builds" of android projects works only if the
android-build installation doesn't use custom install dirs
(INSTALL_PREFIX, INSTALL_BINDIR...)

At the same time, it fixes QTBUG-106533. The patches are the same as the
ones in that bugreport.

Add new items to android-*-deployment-settings.json:

    qtDataDirectory
    qtLibsDirectory
    qtLibExecsDirectory
    qtPluginsDirectory
    qtQmlDirectory

Update androiddeployqt to be able to get files from their install location

BTW (fixes QTBUG-106533):
    Install src/android/templates into INSTALL_DATADIR
    Install src/3rdparty/gradle into INSTALL_DATADIR
    Install src/android/java files into INSTALL_DATADIR
    Install all jars into INSTALL_DATADIR

Add missing path to target_qt.conf
    Update target_qt.conf to have all path. Otherwise qmake wouldn't have
    the path when installing the android-build with custom install dirs
    like INSTALL_LIBDIR & friends

Add support for a new cmake variable that can be set at build time of the
android projects: QT_ANDROID_PATH_CMAKE_DIR_${abi} (Name chosen as
brother of QT_HOST_PATH_CMAKE_DIR)

Pick-to: 6.5
Fixes: QTBUG-106533
Fixes: QTBUG-107207
Change-Id: Ia3751362ab1b5f877ecafbe02f263feac167119c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2023-01-30 14:08:14 +01:00
..
aix-g++ Use SPDX license identifiers 2022-05-16 16:37:38 +02:00
aix-g++-64 Use SPDX license identifiers 2022-05-16 16:37:38 +02:00
android-clang Use SPDX license identifiers 2022-05-16 16:37:38 +02:00
common wasm: Fix qmake build 2022-12-09 12:21:54 +01:00
cygwin-g++ Use SPDX license identifiers 2022-05-16 16:37:38 +02:00
darwin-g++ Use SPDX license identifiers 2022-05-16 16:37:38 +02:00
devices Suppress warnings from Integrity builds 2023-01-09 10:34:33 +02:00
dummy move all target spec handling to qmake-based configure system 2016-12-13 18:56:34 +00:00
features Add support for MultiABI with custom install dir of the android-build 2023-01-30 14:08:14 +01:00
freebsd-clang Use SPDX license identifiers 2022-05-16 16:37:38 +02:00
freebsd-g++ Use SPDX license identifiers 2022-05-16 16:37:38 +02:00
haiku-g++ Use SPDX license identifiers 2022-05-16 16:37:38 +02:00
hpuxi-g++-64 Use SPDX license identifiers 2022-05-16 16:37:38 +02:00
hurd-g++ Use SPDX license identifiers 2022-05-16 16:37:38 +02:00
integrity-armv7 Use SPDX license identifiers 2022-05-16 16:37:38 +02:00
integrity-armv7-imx6 Use SPDX license identifiers 2022-05-16 16:37:38 +02:00
integrity-armv8-rcar Use SPDX license identifiers 2022-05-16 16:37:38 +02:00
integrity-x86 Use SPDX license identifiers 2022-05-16 16:37:38 +02:00
linux-aarch64-gnu-g++ Use SPDX license identifiers 2022-05-16 16:37:38 +02:00
linux-arm-gnueabi-g++ Use SPDX license identifiers 2022-05-16 16:37:38 +02:00
linux-clang Use SPDX license identifiers 2022-05-16 16:37:38 +02:00
linux-clang-32 Use SPDX license identifiers 2022-05-16 16:37:38 +02:00
linux-clang-libc++ Use SPDX license identifiers 2022-05-16 16:37:38 +02:00
linux-clang-libc++-32 Use SPDX license identifiers 2022-05-16 16:37:38 +02:00
linux-g++ Use SPDX license identifiers 2022-05-16 16:37:38 +02:00
linux-g++-32 Use SPDX license identifiers 2022-05-16 16:37:38 +02:00
linux-g++-64 Use SPDX license identifiers 2022-05-16 16:37:38 +02:00
linux-icc Use SPDX license identifiers 2022-05-16 16:37:38 +02:00
linux-icc-32 Use SPDX license identifiers 2022-05-16 16:37:38 +02:00
linux-icc-64 Use SPDX license identifiers 2022-05-16 16:37:38 +02:00
linux-icc-k1om Use SPDX license identifiers 2022-05-16 16:37:38 +02:00
linux-llvm Use SPDX license identifiers 2022-05-16 16:37:38 +02:00
linux-lsb-g++ Use SPDX license identifiers 2022-05-16 16:37:38 +02:00
lynxos-g++ Use SPDX license identifiers 2022-05-16 16:37:38 +02:00
macx-clang Apple: Add CFBundleAllowMixedLocalizations=YES to Info.plist files 2022-10-25 10:06:59 +00:00
macx-g++ Use SPDX license identifiers 2022-05-16 16:37:38 +02:00
macx-icc Use SPDX license identifiers 2022-05-16 16:37:38 +02:00
macx-ios-clang Apple: Add CFBundleAllowMixedLocalizations=YES to Info.plist files 2022-10-25 10:06:59 +00:00
macx-xcode Apple: Add CFBundleAllowMixedLocalizations=YES to Info.plist files 2022-10-25 10:06:59 +00:00
modules Adjust wiki links to the new redirect 2015-03-04 15:36:12 +00:00
netbsd-g++ Use SPDX license identifiers 2022-05-16 16:37:38 +02:00
openbsd-g++ Use SPDX license identifiers 2022-05-16 16:37:38 +02:00
qnx-aarch64le-qcc Use SPDX license identifiers 2022-05-16 16:37:38 +02:00
qnx-armle-v7-qcc Use SPDX license identifiers 2022-05-16 16:37:38 +02:00
qnx-x86-64-qcc Use SPDX license identifiers 2022-05-16 16:37:38 +02:00
qnx-x86-qcc Use SPDX license identifiers 2022-05-16 16:37:38 +02:00
solaris-cc Use SPDX license identifiers 2022-05-16 16:37:38 +02:00
solaris-cc-64 Use SPDX license identifiers 2022-05-16 16:37:38 +02:00
solaris-cc-64-stlport Use SPDX license identifiers 2022-05-16 16:37:38 +02:00
solaris-cc-stlport Use SPDX license identifiers 2022-05-16 16:37:38 +02:00
solaris-g++ Use SPDX license identifiers 2022-05-16 16:37:38 +02:00
solaris-g++-64 Use SPDX license identifiers 2022-05-16 16:37:38 +02:00
unsupported Apple: Add CFBundleAllowMixedLocalizations=YES to Info.plist files 2022-10-25 10:06:59 +00:00
wasm-emscripten wasm: add support for wasm64 build 2022-12-07 08:30:46 +10:00
wasm-emscripten-64 wasm: add support for wasm64 build 2022-12-07 08:30:46 +10:00
win32-arm64-msvc Use SPDX license identifiers 2022-05-16 16:37:38 +02:00
win32-clang-g++ Use SPDX license identifiers 2022-05-16 16:37:38 +02:00
win32-clang-msvc Use SPDX license identifiers 2022-05-16 16:37:38 +02:00
win32-g++ Use SPDX license identifiers 2022-05-16 16:37:38 +02:00
win32-icc Use SPDX license identifiers 2022-05-16 16:37:38 +02:00
win32-icc-k1om Use SPDX license identifiers 2022-05-16 16:37:38 +02:00
win32-msvc Use SPDX license identifiers 2022-05-16 16:37:38 +02:00