CMake: Regenerate configure.cmake files

Change-Id: I165c633d7c052fb80419d4b2c57561de40217ade Reviewed-by: Joerg Bornemann <[email protected]>
Stmen · Sep 28, 2020 · a9f352c · a9f352c
1 parent 7bb9139
commit a9f352c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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"