diff options
author | Liang Qi <liang.qi@qt.io> | 2018-10-17 10:35:28 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2018-10-17 10:35:28 +0200 |
commit | ccf26f6a88e116abdf8e53acdc02dbd98a4a8dc4 (patch) | |
tree | 40aaca99471edc709d38e6f82153576bad86747f /examples/widgets/widgets.pro | |
parent | 8ff1ae89bfa32c586e3b44b71dfc49d294a3e043 (diff) | |
parent | 3eebadc1734463afa469dcd08eab8c5d2557dec6 (diff) |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
src/plugins/platformthemes/platformthemes.pro
src/printsupport/kernel/qplatformprintdevice.cpp
Change-Id: Iac01729ad954bb1c7af5867d982eb243b2139ee6
Diffstat (limited to 'examples/widgets/widgets.pro')
-rw-r--r-- | examples/widgets/widgets.pro | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/examples/widgets/widgets.pro b/examples/widgets/widgets.pro index 8bd85bfe6b..d975ea8307 100644 --- a/examples/widgets/widgets.pro +++ b/examples/widgets/widgets.pro @@ -28,4 +28,5 @@ qtHaveModule(gui):qtConfig(opengl): \ contains(DEFINES, QT_NO_CURSOR): SUBDIRS -= mainwindows !qtConfig(draganddrop): SUBDIRS -= draganddrop +!qtConfig(animation): SUBDIRS -= animation mac:SUBDIRS += mac |