diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-11-29 19:45:38 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-12-03 13:38:08 +0000 |
| commit | 715465a93b1d1ec1f290821db88adeb705cf57f8 (patch) | |
| tree | 5ecafde66da5a018cacc31c3c2a5d6d98ffb20db /src/widgets | |
| parent | 461020a86aa5822325edba9ec565db39e5df8092 (diff) | |
Regenerate configure.json files after changes
Use all the original non-normalized feature names, and normalize them
in CMake land rather than Python. This gives us the necessary
original name information for further usage when generating qmake
pri and prl files.
Change-Id: If9db9028dac6175b8f6971e4b91558d76b8e9296
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/widgets')
| -rw-r--r-- | src/widgets/configure.cmake | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/widgets/configure.cmake b/src/widgets/configure.cmake index e07d023dad..c508e2dbf4 100644 --- a/src/widgets/configure.cmake +++ b/src/widgets/configure.cmake @@ -20,31 +20,31 @@ qt_feature("gtk3" PRIVATE AUTODETECT NOT APPLE CONDITION QT_FEATURE_glib AND GTK3_FOUND ) -qt_feature("style_fusion" PRIVATE +qt_feature("style-fusion" PRIVATE LABEL "Fusion" ) -qt_feature("style_mac" PRIVATE +qt_feature("style-mac" PRIVATE LABEL "macOS" CONDITION APPLE_OSX AND QT_FEATURE_animation ) -qt_feature("style_windows" PRIVATE +qt_feature("style-windows" PRIVATE LABEL "Windows" ) -qt_feature("style_windowsvista" PRIVATE +qt_feature("style-windowsvista" PRIVATE LABEL "WindowsVista" CONDITION QT_FEATURE_style_windows AND QT_FEATURE_animation AND WIN32 AND NOT WINRT AND tests.uxtheme OR FIXME ) -qt_feature("style_android" PRIVATE +qt_feature("style-android" PRIVATE LABEL "Android" AUTODETECT ANDROID ) -qt_feature("style_stylesheet" PUBLIC +qt_feature("style-stylesheet" PUBLIC SECTION "Styles" LABEL "QStyleSheetStyle" PURPOSE "Provides a widget style which is configurable via CSS." CONDITION QT_FEATURE_style_windows AND QT_FEATURE_properties AND QT_FEATURE_cssparser ) -qt_feature_definition("style_stylesheet" "QT_NO_STYLE_STYLESHEET" NEGATE VALUE "1") +qt_feature_definition("style-stylesheet" "QT_NO_STYLE_STYLESHEET" NEGATE VALUE "1") qt_feature("effects" PRIVATE SECTION "Kernel" LABEL "Effects" |