diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-12-04 01:57:05 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-12-04 01:57:05 (GMT) |
| commit | c37cdb5a8e8eea672fa59a3cb427b74d6a928a30 (patch) | |
| tree | 89dde1623a991a24a9287de1e6ed4ea3bece103e /src/declarative/util/qmlspringfollow.cpp | |
| parent | 261c8600253ad17f41c3b4830b9086a8a034fa4a (diff) | |
| parent | b664d980f4c3b6fb379d68e54b6087b83a4c26b0 (diff) | |
| download | Qt-c37cdb5a8e8eea672fa59a3cb427b74d6a928a30.zip Qt-c37cdb5a8e8eea672fa59a3cb427b74d6a928a30.tar.gz Qt-c37cdb5a8e8eea672fa59a3cb427b74d6a928a30.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/util/qmlspringfollow.cpp')
| -rw-r--r-- | src/declarative/util/qmlspringfollow.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/declarative/util/qmlspringfollow.cpp b/src/declarative/util/qmlspringfollow.cpp index d6961b0..29dcf91 100644 --- a/src/declarative/util/qmlspringfollow.cpp +++ b/src/declarative/util/qmlspringfollow.cpp @@ -39,12 +39,16 @@ ** ****************************************************************************/ +#include "qmlspringfollow_p.h" + +#include "qmlanimation_p_p.h" + +#include <QtCore/qdebug.h> + +#include <private/qobject_p.h> + #include <limits.h> #include <math.h> -#include <QtCore/qdebug.h> -#include "private/qobject_p.h" -#include "qmlspringfollow_p.h" -#include "private/qmlanimation_p_p.h" QT_BEGIN_NAMESPACE |