qt4: compile fix
authorMichael Büsch <mb@bu3sch.de>
Wed, 18 Aug 2010 19:29:24 +0000 (19:29 +0000)
committerMichael Büsch <mb@bu3sch.de>
Wed, 18 Aug 2010 19:29:24 +0000 (19:29 +0000)
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.

SVN-Revision: 22707

Xorg/lib/qt4/patches/300-compile-fixes.patch [new file with mode: 0644]

diff --git a/Xorg/lib/qt4/patches/300-compile-fixes.patch b/Xorg/lib/qt4/patches/300-compile-fixes.patch
new file mode 100644 (file)
index 0000000..fc37917
--- /dev/null
@@ -0,0 +1,14 @@
+---
+ 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>());
+ }