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/gui | |
| 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/gui')
| -rw-r--r-- | src/gui/animation/qguivariantanimation.cpp | 4 | ||||
| -rw-r--r-- | src/gui/gui.pro | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qguiapplication.cpp | 4 |
3 files changed, 3 insertions, 7 deletions
diff --git a/src/gui/animation/qguivariantanimation.cpp b/src/gui/animation/qguivariantanimation.cpp index b72764e048..a5b6d8b95c 100644 --- a/src/gui/animation/qguivariantanimation.cpp +++ b/src/gui/animation/qguivariantanimation.cpp @@ -38,8 +38,6 @@ ****************************************************************************/ #include <QtGui/qtguiglobal.h> -#ifndef QT_NO_ANIMATION - #include <QtCore/qvariantanimation.h> #include <private/qvariantanimation_p.h> #include <QtGui/qcolor.h> @@ -90,5 +88,3 @@ static void qUnregisterGuiGetInterpolator() Q_DESTRUCTOR_FUNCTION(qUnregisterGuiGetInterpolator) QT_END_NAMESPACE - -#endif //QT_NO_ANIMATION diff --git a/src/gui/gui.pro b/src/gui/gui.pro index 759d6f3cbf..06c9cd3939 100644 --- a/src/gui/gui.pro +++ b/src/gui/gui.pro @@ -45,7 +45,7 @@ include(painting/painting.pri) include(util/util.pri) include(math3d/math3d.pri) include(opengl/opengl.pri) -include(animation/animation.pri) +qtConfig(animation): include(animation/animation.pri) include(itemmodels/itemmodels.pri) include(vulkan/vulkan.pri) diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index e81c88cc71..193712a7a7 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -204,7 +204,7 @@ QInputDeviceManager *QGuiApplicationPrivate::m_inputDeviceManager = 0; static qreal fontSmoothingGamma = 1.7; extern void qRegisterGuiVariant(); -#ifndef QT_NO_ANIMATION +#if QT_CONFIG(animation) extern void qRegisterGuiGetInterpolator(); #endif @@ -1517,7 +1517,7 @@ void QGuiApplicationPrivate::init() // trigger registering of QVariant's GUI types qRegisterGuiVariant(); -#ifndef QT_NO_ANIMATION +#if QT_CONFIG(animation) // trigger registering of animation interpolators qRegisterGuiGetInterpolator(); #endif |