diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-04-22 23:23:33 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-04-22 23:23:33 (GMT) |
| commit | c41be719a15cd8d702dd1064fee2b224f657c067 (patch) | |
| tree | 6cb88f763194a66e4c5c7bf5797614f47b3d4671 /src/gui | |
| parent | a1458a0426caa71bab4527ca079c3004bb2b5abd (diff) | |
| parent | ebda84cd06faaf440a096bda7966fa795ca86318 (diff) | |
| download | Qt-c41be719a15cd8d702dd1064fee2b224f657c067.zip Qt-c41be719a15cd8d702dd1064fee2b224f657c067.tar.gz Qt-c41be719a15cd8d702dd1064fee2b224f657c067.tar.bz2 | |
Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/gui/animation/qguivariantanimation.cpp
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/animation/qguivariantanimation.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gui/animation/qguivariantanimation.cpp b/src/gui/animation/qguivariantanimation.cpp index fab377a..ed18caa 100644 --- a/src/gui/animation/qguivariantanimation.cpp +++ b/src/gui/animation/qguivariantanimation.cpp @@ -41,8 +41,6 @@ #ifndef QT_NO_ANIMATION -/*QT_BEGIN_NAMESPACE - #ifdef QT_EXPERIMENTAL_SOLUTION # include "qvariantanimation.h" # include "qvariantanimation_p.h" @@ -51,6 +49,9 @@ #include <private/qvariantanimation_p.h> #endif +#include <QtGui/qcolor.h> + +QT_BEGIN_NAMESPACE template<> Q_INLINE_TEMPLATE QColor _q_interpolate(const QColor &f,const QColor &t, qreal progress) { @@ -74,6 +75,6 @@ static int qUnregisterGuiGetInterpolator() } Q_DESTRUCTOR_FUNCTION(qUnregisterGuiGetInterpolator) -QT_END_NAMESPACE*/ +QT_END_NAMESPACE #endif //QT_NO_ANIMATION |