diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2010-04-14 13:32:22 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2010-04-14 13:32:22 (GMT) |
| commit | 0cc27cec860f46b1e349c428973cf4ce3331b285 (patch) | |
| tree | 801b2c1d8cb6b269f2b2f18e08e052cdc4f66749 /src/gui/animation/qguivariantanimation.cpp | |
| parent | 8a7199be73aea42eacf07c56a63d2b526204c8fb (diff) | |
| parent | b371999d3e9c207047be6afda89d008b6cf04763 (diff) | |
| download | Qt-0cc27cec860f46b1e349c428973cf4ce3331b285.zip Qt-0cc27cec860f46b1e349c428973cf4ce3331b285.tar.gz Qt-0cc27cec860f46b1e349c428973cf4ce3331b285.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7
Conflicts:
src/declarative/graphicsitems/qdeclarativeitemsmodule.cpp
Diffstat (limited to 'src/gui/animation/qguivariantanimation.cpp')
| -rw-r--r-- | src/gui/animation/qguivariantanimation.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gui/animation/qguivariantanimation.cpp b/src/gui/animation/qguivariantanimation.cpp index 52303f5..28cde3e 100644 --- a/src/gui/animation/qguivariantanimation.cpp +++ b/src/gui/animation/qguivariantanimation.cpp @@ -38,12 +38,11 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ - -#ifndef QT_NO_ANIMATION - #include <QtCore/qvariantanimation.h> #include <private/qvariantanimation_p.h> +#ifndef QT_NO_ANIMATION + #include <QtGui/qcolor.h> #include <QtGui/qvector2d.h> #include <QtGui/qvector3d.h> |