diff options
| author | Tobias Hunger <tobias.hunger@qt.io> | 2019-04-16 16:32:08 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@qt.io> | 2019-04-16 16:32:08 +0200 |
| commit | 6630937e63ae5797487b86743a7733c8ae5cc42c (patch) | |
| tree | 3d53dacf6430f9099e1fb20835881205de674961 /src/widgets/configure.cmake | |
| parent | 37ed6dae00640f9cc980ffda05347c12a7eb5d7e (diff) | |
| parent | c7af193d2e49e9f10b86262e63d8d13abf72b5cf (diff) | |
Merge commit 'dev' into 'wip/cmake-merge'
Change-Id: I176c40d031be26a1dd1cf08843e448a660598783
Diffstat (limited to 'src/widgets/configure.cmake')
| -rw-r--r-- | src/widgets/configure.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/configure.cmake b/src/widgets/configure.cmake index f703a03b79..fead6b60b5 100644 --- a/src/widgets/configure.cmake +++ b/src/widgets/configure.cmake @@ -26,14 +26,14 @@ qt_feature("style_fusion" PRIVATE ) qt_feature("style_mac" PRIVATE LABEL "macOS" - CONDITION APPLE_OSX + CONDITION APPLE_OSX AND QT_FEATURE_animation ) qt_feature("style_windows" PRIVATE LABEL "Windows" ) qt_feature("style_windowsvista" PRIVATE LABEL "WindowsVista" - CONDITION QT_FEATURE_style_windows AND WIN32 AND NOT WINRT AND tests.uxtheme OR FIXME + CONDITION QT_FEATURE_style_windows AND QT_FEATURE_animation AND WIN32 AND NOT WINRT AND tests.uxtheme OR FIXME ) qt_feature("style_android" PRIVATE LABEL "Android" |