summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJan-Arve Sæther <jan-arve.saether@nokia.com>2009-04-21 10:06:22 (GMT)
committerJan-Arve Sæther <jan-arve.saether@nokia.com>2009-04-22 07:30:14 (GMT)
commit6504e06561b9127eb6179b5a5deb8f6cd1fff491 (patch)
tree1a89b8d9141e9688f033b90e90d808ed23f1a7ba /src
parent3f39c3380f97339a1ffb9d13d7b184a8315d3821 (diff)
downloadQt-6504e06561b9127eb6179b5a5deb8f6cd1fff491.zip
Qt-6504e06561b9127eb6179b5a5deb8f6cd1fff491.tar.gz
Qt-6504e06561b9127eb6179b5a5deb8f6cd1fff491.tar.bz2
Fixes for solution package.
Diffstat (limited to 'src')
-rw-r--r--src/gui/animation/qguivariantanimation.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/animation/qguivariantanimation.cpp b/src/gui/animation/qguivariantanimation.cpp
index 46ba251..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 @@ QT_BEGIN_NAMESPACE
#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)
{