CMake: Fixup outdated configure.cmake files

Some outdated changes don't get removed when using special case preservation, so remove them manually. Change-Id: Iba1481ab9a924c3031bd5ce394d5183a5393f146 Reviewed-by: Joerg Bornemann <[email protected]>
fwcd · Nov 10, 2020 · 625bb2f · 625bb2f
1 parent 67693b6
commit 625bb2f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 10 deletions.
diff --git a/qt_cmdline.cmake b/qt_cmdline.cmake
@@ -38,8 +38,6 @@ 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)
 qt_commandline_option(appstore-compliant TYPE boolean)
 qt_commandline_option(avx TYPE boolean)
 qt_commandline_option(avx2 TYPE boolean)

diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake
@@ -779,7 +779,7 @@ qt_feature("openvg" PUBLIC
     LABEL "OpenVG"
     CONDITION libs.openvg OR FIXME
 )
-qt_feature("egl" PUBLIC PRIVATE
+qt_feature("egl" PUBLIC
     LABEL "EGL"
     CONDITION ( QT_FEATURE_opengl OR QT_FEATURE_openvg ) AND EGL_FOUND AND ( QT_FEATURE_dlopen OR NOT UNIX OR INTEGRITY )
 )
@@ -833,13 +833,6 @@ qt_feature("eglfs_x11" PRIVATE
     LABEL "EGLFS X11"
     CONDITION QT_FEATURE_eglfs AND QT_FEATURE_xcb_xlib AND QT_FEATURE_egl_x11
 )
-qt_feature("filesystemmodel" PUBLIC
-    SECTION "File I/O"
-    LABEL "QFileSystemModel"
-    PURPOSE "Provides a data model for the local filesystem."
-    CONDITION QT_FEATURE_itemmodel
-)
-qt_feature_definition("filesystemmodel" "QT_NO_FILESYSTEMMODEL" NEGATE VALUE "1")
 qt_feature("gif" PRIVATE
     LABEL "GIF"
     CONDITION QT_FEATURE_imageformatplugin