diff options
| -rw-r--r-- | .prev_qt_cmdline.cmake | 2 | ||||
| -rw-r--r-- | qt_cmdline.cmake | 2 | ||||
| -rw-r--r-- | src/corelib/.prev_configure.cmake | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/.prev_qt_cmdline.cmake b/.prev_qt_cmdline.cmake index ce0f087983..2ec0d18d13 100644 --- a/.prev_qt_cmdline.cmake +++ b/.prev_qt_cmdline.cmake @@ -35,6 +35,8 @@ 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) +qt_commandline_option(android-javac-source TYPE string) qt_commandline_option(android-style-assets TYPE boolean) qt_commandline_option(appstore-compliant TYPE boolean) qt_commandline_option(avx TYPE boolean) diff --git a/qt_cmdline.cmake b/qt_cmdline.cmake index 8c0f2c5257..3a0d427511 100644 --- a/qt_cmdline.cmake +++ b/qt_cmdline.cmake @@ -35,6 +35,8 @@ 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) +qt_commandline_option(android-javac-source TYPE string) qt_commandline_option(android-style-assets TYPE boolean) qt_commandline_option(android-javac-target TYPE string) qt_commandline_option(android-javac-source TYPE string) diff --git a/src/corelib/.prev_configure.cmake b/src/corelib/.prev_configure.cmake index b410879c45..40cbaa7ec8 100644 --- a/src/corelib/.prev_configure.cmake +++ b/src/corelib/.prev_configure.cmake @@ -930,7 +930,7 @@ qt_feature("etw" PRIVATE DISABLE INPUT_trace STREQUAL 'lttng' OR INPUT_trace STREQUAL 'no' ) qt_feature("forkfd_pidfd" PRIVATE - LABEL "pidfd support in forkfd" + LABEL "CLONE_PIDFD support in forkfd" CONDITION LINUX ) qt_feature("win32_system_libs" |