AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CMake: Fixup outdated configure.cmake files

Browse Source 
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>
This commit is contained in:
Alexandru Croitor 2020-11-10 09:38:41 +01:00
parent 67693b6cf8
commit 625bb2f76a
2 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qt_cmdline.cmake
View File

@ -38,8 +38,6 @@ qt_commandline_option(android-sdk TYPE string)
qt_commandline_option(android-javac-target TYPE string) qt_commandline_option(android-javac-target TYPE string)
qt_commandline_option(android-javac-source TYPE string) qt_commandline_option(android-javac-source TYPE string)
qt_commandline_option(android-style-assets TYPE boolean) 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(appstore-compliant TYPE boolean)
qt_commandline_option(avx TYPE boolean) qt_commandline_option(avx TYPE boolean)
qt_commandline_option(avx2 TYPE boolean) qt_commandline_option(avx2 TYPE boolean)

9
src/gui/configure.cmake
View File

@ -779,7 +779,7 @@ qt_feature("openvg" PUBLIC
LABEL "OpenVG" LABEL "OpenVG"
CONDITION libs.openvg OR FIXME CONDITION libs.openvg OR FIXME
) )
qt_feature("egl" PUBLIC PRIVATE qt_feature("egl" PUBLIC
LABEL "EGL" LABEL "EGL"
CONDITION ( QT_FEATURE_opengl OR QT_FEATURE_openvg ) AND EGL_FOUND AND ( QT_FEATURE_dlopen OR NOT UNIX OR INTEGRITY ) 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" LABEL "EGLFS X11"
CONDITION QT_FEATURE_eglfs AND QT_FEATURE_xcb_xlib AND QT_FEATURE_egl_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 qt_feature("gif" PRIVATE
LABEL "GIF" LABEL "GIF"
CONDITION QT_FEATURE_imageformatplugin CONDITION QT_FEATURE_imageformatplugin