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 /src/widgets/styles/qcommonstyle.cpp | |
| 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 'src/widgets/styles/qcommonstyle.cpp')
| -rw-r--r-- | src/widgets/styles/qcommonstyle.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/widgets/styles/qcommonstyle.cpp b/src/widgets/styles/qcommonstyle.cpp index 3ee3e856bc..66f5f4876e 100644 --- a/src/widgets/styles/qcommonstyle.cpp +++ b/src/widgets/styles/qcommonstyle.cpp @@ -105,7 +105,9 @@ #include <qsettings.h> #include <qvariant.h> #include <qpixmapcache.h> +#if QT_CONFIG(animation) #include <private/qstyleanimation_p.h> +#endif #include <limits.h> @@ -1193,7 +1195,7 @@ void QCommonStylePrivate::tabLayout(const QStyleOptionTab *opt, const QWidget *w } #endif // QT_CONFIG(tabbar) -#ifndef QT_NO_ANIMATION +#if QT_CONFIG(animation) /*! \internal */ QList<const QObject*> QCommonStylePrivate::animationTargets() const { |