diff --git a/cmake/QtProcessConfigureArgs.cmake b/cmake/QtProcessConfigureArgs.cmake index 2a415454a8..c13c2dde35 100644 --- a/cmake/QtProcessConfigureArgs.cmake +++ b/cmake/QtProcessConfigureArgs.cmake @@ -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 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}") diff --git a/cmake/configure-cmake-mapping.md b/cmake/configure-cmake-mapping.md index 648262dc3d..e26380ff56 100644 --- a/cmake/configure-cmake-mapping.md +++ b/cmake/configure-cmake-mapping.md @@ -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 | -DINSTALL_BINDIR= | similar for -headerdir -libdir and so on | | -hostdatadir | -DINSTALL_MKSPECSDIR= | | -| -host*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 | -DANDROID_SDK_ROOT= | | | -android-ndk | -DCMAKE_TOOLCHAIN_PATH= | | | -android-ndk-platform android-23 | -DCMAKE_ANDROID_NATIVE_API_LEVEL=23 | | -| -android-ndk-host | n/a | determined by toolchain file | | -android-abis ,..., | -DANDROID_ABI= | 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. | diff --git a/config_help.txt b/config_help.txt index c89479252e..09c43a580b 100644 --- a/config_help.txt +++ b/config_help.txt @@ -9,8 +9,6 @@ Top-level installation directories: -developer-build] -extprefix ... The installation directory, as seen on the host machine. [SYSROOT/PREFIX] - -external-hostbindir ... 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: diff --git a/configure b/configure index b2c978b025..a0c07ded48 100755 --- a/configure +++ b/configure @@ -163,7 +163,6 @@ while [ "$#" -gt 0 ]; do -hostlibdir| \ -extprefix| \ -sysroot| \ - -external-hostbindir| \ -make| \ -nomake| \ -skip| \ diff --git a/qt_cmdline.cmake b/qt_cmdline.cmake index bef3523b7c..8c1bfad0b4 100644 --- a/qt_cmdline.cmake +++ b/qt_cmdline.cmake @@ -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)