1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix animations in static builds

Browse Source 
Make sure qRegisterGuiGetInterpolator is called even for static builds.

Task-number: QTBUG-37341
Change-Id: I65735a558d5bbfaa02fa4ec47d55ddf33ca1991a
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
This commit is contained in:
Kai Koehne 2014-06-17 13:13:18 +02:00
parent c92ece4518
commit bdd60463da
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/animation/qguivariantanimation.cpp
View File

@ -64,7 +64,7 @@ template<> Q_INLINE_TEMPLATE QQuaternion _q_interpolate(const QQuaternion &f,con
return QQuaternion::slerp(f, t, progress); return QQuaternion::slerp(f, t, progress);
} }
static void qRegisterGuiGetInterpolator() void qRegisterGuiGetInterpolator()
{ {
qRegisterAnimationInterpolator<QColor>(_q_interpolateVariant<QColor>); qRegisterAnimationInterpolator<QColor>(_q_interpolateVariant<QColor>);
qRegisterAnimationInterpolator<QVector2D>(_q_interpolateVariant<QVector2D>); qRegisterAnimationInterpolator<QVector2D>(_q_interpolateVariant<QVector2D>);

4
src/gui/kernel/qguiapplication.cpp
View File

@ -171,6 +171,7 @@ bool QGuiApplicationPrivate::noGrab = false;
static qreal fontSmoothingGamma = 1.7; static qreal fontSmoothingGamma = 1.7;
extern void qRegisterGuiVariant(); extern void qRegisterGuiVariant();
extern void qRegisterGuiGetInterpolator();
extern void qInitDrawhelperAsm(); extern void qInitDrawhelperAsm();
extern void qInitImageConversions(); extern void qInitImageConversions();
@ -1274,6 +1275,9 @@ void QGuiApplicationPrivate::init()
// trigger registering of QVariant's GUI types // trigger registering of QVariant's GUI types
qRegisterGuiVariant(); qRegisterGuiVariant();
// trigger registering of animation interpolators
qRegisterGuiGetInterpolator();
QWindowSystemInterfacePrivate::eventTime.start(); QWindowSystemInterfacePrivate::eventTime.start();
is_app_running = true; is_app_running = true;