diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-03-14 13:22:09 +0100 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-03-18 15:34:43 +0000 |
commit | 4f1a155909dfcba7353ebe9eee669d65336bd943 (patch) | |
tree | bbb0dac09548c61b119b92827a6fcbfd41fdc442 /src/gui/configure.cmake | |
parent | 37b154858f41c0aa32ad124878fae96c39563d39 (diff) |
Regenerate cmake files from configure.json files
The new files represent the json features more closely.
This helps with various build issues as well, like dynamicgl
feature not being present before.
Change-Id: I433592f48e0550700226a635492a3ce15af743c1
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/gui/configure.cmake')
-rw-r--r-- | src/gui/configure.cmake | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake index 03a3734691..157898953e 100644 --- a/src/gui/configure.cmake +++ b/src/gui/configure.cmake @@ -562,12 +562,18 @@ qt_feature("opengl_desktop" ENABLE INPUT_opengl STREQUAL 'desktop' DISABLE INPUT_opengl STREQUAL 'es2' OR INPUT_opengl STREQUAL 'dynamic' OR INPUT_opengl STREQUAL 'no' ) -qt_feature("opengl_dynamic" PUBLIC +qt_feature("opengl_dynamic" LABEL "Dynamic OpenGL" AUTODETECT OFF CONDITION WIN32 AND NOT WINRT ENABLE INPUT_opengl STREQUAL 'dynamic' ) +qt_feature("dynamicgl" PUBLIC + LABEL "Dynamic OpenGL: dynamicgl" + AUTODETECT OFF + CONDITION WIN32 AND NOT WINRT + ENABLE INPUT_opengl STREQUAL 'dynamic' +) qt_feature_definition("opengl_dynamic" "QT_OPENGL_DYNAMIC") qt_feature("opengl" PUBLIC LABEL "OpenGL" @@ -632,7 +638,7 @@ qt_feature("eglfs_openwfd" PRIVATE LABEL "EGLFS OpenWFD" CONDITION INTEGRITY AND QT_FEATURE_eglfs AND TEST_egl_openwfd ) -qt_feature("gif" PUBLIC PRIVATE +qt_feature("gif" PRIVATE LABEL "GIF" CONDITION QT_FEATURE_imageformatplugin ) @@ -642,13 +648,13 @@ qt_feature("ico" PUBLIC PRIVATE CONDITION QT_FEATURE_imageformatplugin ) qt_feature_definition("ico" "QT_NO_ICO" NEGATE VALUE "1") -qt_feature("jpeg" PUBLIC PRIVATE +qt_feature("jpeg" PRIVATE LABEL "JPEG" CONDITION QT_FEATURE_imageformatplugin AND JPEG_FOUND DISABLE INPUT_libjpeg STREQUAL 'no' ) qt_feature_definition("jpeg" "QT_NO_IMAGEFORMAT_JPEG" NEGATE) -qt_feature("png" PUBLIC PRIVATE +qt_feature("png" PRIVATE LABEL "PNG" DISABLE INPUT_libpng STREQUAL 'no' ) |