diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-11-10 09:38:41 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-11-10 14:23:09 +0100 |
| commit | 625bb2f76a0453780cb0faecc91ec84f8f31e7dc (patch) | |
| tree | 683e80a82c2ade8e30513a9c78415f3bd8c44f27 | |
| parent | 67693b6cf860ee456108304a0d39b51d98a31b80 (diff) | |
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 <joerg.bornemann@qt.io>
| -rw-r--r-- | qt_cmdline.cmake | 2 | ||||
| -rw-r--r-- | src/gui/configure.cmake | 9 |
2 files changed, 1 insertions, 10 deletions
diff --git a/qt_cmdline.cmake b/qt_cmdline.cmake index c853d98c48..ee580bd930 100644 --- 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 index 40bf652f43..8b239617af 100644 --- 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 |