diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-09-26 15:39:35 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-10-12 14:26:15 +0000 |
| commit | c593492d1678a2ec08f1bfffcb572459b3bc6c00 (patch) | |
| tree | a9427b13e0f3aa252d68decc862de5acb4dc3b17 /src/widgets/styles/qcommonstyle_p.h | |
| parent | 0509383cf2852f2aebd1efd75413835747c8f341 (diff) | |
Modernize the "animation" feature
Change-Id: Ibc164b3df3cf87db569ef4813de458a9067b7f7d
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src/widgets/styles/qcommonstyle_p.h')
| -rw-r--r-- | src/widgets/styles/qcommonstyle_p.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/widgets/styles/qcommonstyle_p.h b/src/widgets/styles/qcommonstyle_p.h index 93db75ac2d..b347c8563a 100644 --- a/src/widgets/styles/qcommonstyle_p.h +++ b/src/widgets/styles/qcommonstyle_p.h @@ -43,8 +43,9 @@ #include <QtWidgets/private/qtwidgetsglobal_p.h> #include "qcommonstyle.h" #include "qstyle_p.h" +#if QT_CONFIG(animation) #include "qstyleanimation_p.h" - +#endif #include "qstyleoption.h" QT_BEGIN_NAMESPACE @@ -76,7 +77,7 @@ public: ~QCommonStylePrivate() { -#ifndef QT_NO_ANIMATION +#if QT_CONFIG(animation) qDeleteAll(animations); #endif #if QT_CONFIG(itemviews) @@ -115,7 +116,7 @@ public: #endif int animationFps; -#ifndef QT_NO_ANIMATION +#if QT_CONFIG(animation) void _q_removeAnimation(); QList<const QObject*> animationTargets() const; @@ -125,7 +126,7 @@ public: private: mutable QHash<const QObject*, QStyleAnimation*> animations; -#endif // QT_NO_ANIMATION +#endif // animation }; QT_END_NAMESPACE |