diff options
| author | Alexis Menard <alexis.menard@nokia.com> | 2009-05-12 12:51:15 (GMT) |
|---|---|---|
| committer | Alexis Menard <alexis.menard@nokia.com> | 2009-05-12 12:51:15 (GMT) |
| commit | 90d801f05f64c645f0899e3d81b23ecf53bf4835 (patch) | |
| tree | 14362a48f6c74709972ab1a92d7be81d910f788d /src/corelib/animation/qvariantanimation.h | |
| parent | 1898c46452beae9e28cf9be7851099b4b4d2779e (diff) | |
| parent | c6add575d50ee30b19580fc2c1ebda5316a2f51b (diff) | |
| download | Qt-90d801f05f64c645f0899e3d81b23ecf53bf4835.zip Qt-90d801f05f64c645f0899e3d81b23ecf53bf4835.tar.gz Qt-90d801f05f64c645f0899e3d81b23ecf53bf4835.tar.bz2 | |
Merge branch 'kinetic-statemachine' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-statemachine
Conflicts:
src/gui/graphicsview/qgraphicsitem.cpp
Diffstat (limited to 'src/corelib/animation/qvariantanimation.h')
| -rw-r--r-- | src/corelib/animation/qvariantanimation.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/corelib/animation/qvariantanimation.h b/src/corelib/animation/qvariantanimation.h index 7ce597f..69dbbf3 100644 --- a/src/corelib/animation/qvariantanimation.h +++ b/src/corelib/animation/qvariantanimation.h @@ -49,8 +49,7 @@ # include <QtCore/qeasingcurve.h> # include <QtCore/qabstractanimation.h> #endif -#include <QtCore/qlist.h> -#include <QtCore/qpoint.h> +#include <QtCore/qvector.h> #include <QtCore/qvariant.h> #include <QtCore/qpair.h> |