diff options
author | Liang Qi <liang.qi@qt.io> | 2018-10-25 07:21:05 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-10-25 07:21:53 +0200 |
commit | e28e91ae99b8c3859899e04cc9370534c7c7b86d (patch) | |
tree | cca81b1e745be4f25aab78e8e917c2324594e539 /src/widgets/configure.json | |
parent | 5ea233ca6782eb27adf596515cb66ef3dadc1d5e (diff) | |
parent | ebfad73b4e44fe6db8059200da105b4b87888718 (diff) |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
src/corelib/animation/qpropertyanimation.cpp
src/gui/image/qicon.cpp
tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
Change-Id: I3698172b7b44ebb487cb38f50fd2c4a9f8a35b21
Diffstat (limited to 'src/widgets/configure.json')
-rw-r--r-- | src/widgets/configure.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/configure.json b/src/widgets/configure.json index b3a5227d26..cc9019dfdd 100644 --- a/src/widgets/configure.json +++ b/src/widgets/configure.json @@ -47,7 +47,7 @@ }, "style-mac": { "label": "macOS", - "condition": "config.osx", + "condition": "config.osx && features.animation", "output": [ "privateFeature", "styles" ] }, "style-windows": { @@ -56,7 +56,7 @@ }, "style-windowsvista": { "label": "WindowsVista", - "condition": "features.style-windows && config.win32 && !config.winrt && tests.uxtheme", + "condition": "features.style-windows && features.animation && config.win32 && !config.winrt && tests.uxtheme", "output": [ "privateFeature", "styles" ] }, "style-android": { |