6f4f506baf
qRegisterAnimationInterpolator() is a function defined in a header. It is not declared static inline. Under certain circumstances this may cause linker errors. Make it static inline. git-svn-id: svn://svn.openwrt.org/openwrt/packages@22707 3c298f89-4303-0410-b956-a3cf2f4a3e73
15 lines
566 B
Diff
15 lines
566 B
Diff
---
|
|
src/corelib/animation/qvariantanimation.h | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
--- qt-everywhere-opensource-src-4.7.0-beta2.orig/src/corelib/animation/qvariantanimation.h
|
|
+++ qt-everywhere-opensource-src-4.7.0-beta2/src/corelib/animation/qvariantanimation.h
|
|
@@ -117,6 +117,7 @@ private:
|
|
};
|
|
|
|
template <typename T>
|
|
+static inline
|
|
void qRegisterAnimationInterpolator(QVariant (*func)(const T &from, const T &to, qreal progress)) {
|
|
QVariantAnimation::registerInterpolator(reinterpret_cast<QVariantAnimation::Interpolator>(func), qMetaTypeId<T>());
|
|
}
|