AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unsupported host-related configure options

Browse Source 
The following host-related configure options were unsupported since Qt
6.0 and are now completely removed:
-hostprefix
-external-hostbindir
-host*dir (except -hostdatadir)
-android-ndk-host

Pick-to: 6.2
Change-Id: Ib69d90c40ef546f61bf87b1f443eb9d10f7a5a21
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Joerg Bornemann 2021-07-05 18:15:52 +02:00
parent 16e869bd01
commit d9a9eca54d
5 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmake/QtProcessConfigureArgs.cmake
View File

@ -76,12 +76,6 @@ while(NOT "${configure_args}" STREQUAL "")
elseif(arg STREQUAL "-skip")
list(POP_FRONT configure_args qtrepo)
push("-DBUILD_${qtrepo}=OFF")
elseif(arg STREQUAL "-hostprefix")
message(FATAL_ERROR "${arg} is not supported in the CMake build.")
elseif(arg STREQUAL "-external-hostbindir")
# This points to the bin directory of the Qt installation.
# This can be multiple levels deep and we cannot deduce the QT_HOST_PATH safely.
message(FATAL_ERROR "${arg} is not supported anymore. Use -qt-host-path <dir> instead.")
elseif(arg STREQUAL "-qt-host-path")
pop_path_argument()
push("-DQT_HOST_PATH=${path}")
@ -99,8 +93,6 @@ while(NOT "${configure_args}" STREQUAL "")
set(cmake_file_api TRUE)
elseif(arg STREQUAL "-no-cmake-file-api")
set(cmake_file_api FALSE)
elseif(arg MATCHES "^-host.*dir")
message(FATAL_ERROR "${arg} is not supported anymore.")
elseif(arg STREQUAL "--")
# Everything after this argument will be passed to CMake verbatim.
list(APPEND cmake_args "${configure_args}")
@ -800,12 +792,6 @@ translate_string_input(qpa_default_platform QT_QPA_DEFAULT_PLATFORM)
translate_path_input(android-sdk ANDROID_SDK_ROOT)
translate_path_input(android-ndk ANDROID_NDK_ROOT)
if(DEFINED INPUT_android-ndk-host)
drop_input(android-ndk-host)
qtConfAddWarning("The -android-ndk-host option is not supported with the CMake build. "
"Determining the right host platform is handled by the CMake toolchain file that is "
"located in your NDK.")
endif()
if(DEFINED INPUT_android-ndk-platform)
drop_input(android-ndk-platform)
string(REGEX REPLACE "^android-" "" INPUT_android-ndk-platform "${INPUT_android-ndk-platform}")

4
cmake/configure-cmake-mapping.md
View File

@ -4,11 +4,8 @@ The following table describes the mapping of configure options to CMake argument
|---------------------------------------|---------------------------------------------------|-----------------------------------------------------------------|
| -prefix /opt/qt6 | -DCMAKE_INSTALL_PREFIX=/opt/qta6 | |
| -extprefix /opt/qt6 | -DCMAKE_STAGING_PREFIX=/opt/qt6 | |
| -hostprefix /where/ever | n/a | When cross-building Qt, we do not build for host system anymore |
| -external-hostbindir /path/to/host/qt | -DQT_HOST_PATH=/path/to/host/qt | Can be set with configure -qt-host-path /path/to/host/qt. |
| -bindir <dir> | -DINSTALL_BINDIR=<dir> | similar for -headerdir -libdir and so on |
| -hostdatadir <dir> | -DINSTALL_MKSPECSDIR=<dir> | |
| -host*dir <dir> | n/a | |
| -help | n/a | Handled by configure[.bat]. |
| -verbose | | |
| -continue | | |
@ -95,7 +92,6 @@ The following table describes the mapping of configure options to CMake argument
| -android-sdk <path> | -DANDROID_SDK_ROOT=<path> | |
| -android-ndk <path> | -DCMAKE_TOOLCHAIN_PATH=<toolchain file in NDK> | |
| -android-ndk-platform android-23 | -DCMAKE_ANDROID_NATIVE_API_LEVEL=23 | |
| -android-ndk-host | n/a | determined by toolchain file |
| -android-abis <abi_1>,...,<abi_n> | -DANDROID_ABI=<abi_1> | only one ABI can be specified |
| -android-style-assets | -DFEATURE_android_style_assets=ON | |
| -android-javac-source | -DQT_ANDROID_JAVAC_SOURCE=7 | Set the javac build source version. |

2
config_help.txt
View File

@ -9,8 +9,6 @@ Top-level installation directories:
-developer-build]
-extprefix <dir> ... The installation directory, as seen on the host machine.
[SYSROOT/PREFIX]
-external-hostbindir <path> ... Path to Qt tools built for this machine.
This option is required when cross-compiling Qt.
Fine tuning of installation directory layout. Note that all directories
except -sysconfdir should be located under -prefix:

1
configure vendored
View File

@ -163,7 +163,6 @@ while [ "$#" -gt 0 ]; do
-hostlibdir| \
-extprefix| \
-sysroot| \
-external-hostbindir| \
-make| \
-nomake| \
-skip| \

5
qt_cmdline.cmake
View File

@ -10,18 +10,14 @@ qt_commandline_subconfig(src/testlib)
qt_commandline_subconfig(qmake) # special case
qt_commandline_custom(qmakeArgs)
qt_commandline_option(prefix TYPE string)
qt_commandline_option(hostprefix TYPE optionalString)
qt_commandline_option(extprefix TYPE string)
qt_commandline_option(archdatadir TYPE string)
qt_commandline_option(bindir TYPE string)
qt_commandline_option(datadir TYPE string)
qt_commandline_option(docdir TYPE string)
qt_commandline_option(examplesdir TYPE string)
qt_commandline_option(external-hostbindir TYPE string)
qt_commandline_option(headerdir TYPE string)
qt_commandline_option(hostbindir TYPE string)
qt_commandline_option(hostdatadir TYPE string)
qt_commandline_option(hostlibdir TYPE string)
qt_commandline_option(libdir TYPE string)
qt_commandline_option(libexecdir TYPE string)
qt_commandline_option(plugindir TYPE string)
@ -33,7 +29,6 @@ qt_commandline_option(translationdir TYPE string)
qt_commandline_option(android-arch TYPE string)
qt_commandline_option(android-abis TYPE string)
qt_commandline_option(android-ndk TYPE string)
qt_commandline_option(android-ndk-host TYPE string)
qt_commandline_option(android-ndk-platform TYPE string)
qt_commandline_option(android-sdk TYPE string)
qt_commandline_option(android-javac-target TYPE string)