diff options
author | Michael Brasser <michael.brasser@nokia.com> | 2009-12-03 22:59:58 (GMT) |
---|---|---|
committer | Michael Brasser <michael.brasser@nokia.com> | 2009-12-03 22:59:58 (GMT) |
commit | 436b0fff9d9ba95c0fe582f3b71d15d5a9a8535f (patch) | |
tree | 9fa98ed5eea2a806ef4e949f8d95a0f25e6c4be1 /src/declarative/util/qmlanimation_p_p.h | |
parent | 5ec35c0756464ec512de0961c2ae41bec39ac2f7 (diff) | |
parent | 4621061e8c32e234a0d7688e226e92d87172f99b (diff) | |
download | Qt-436b0fff9d9ba95c0fe582f3b71d15d5a9a8535f.zip Qt-436b0fff9d9ba95c0fe582f3b71d15d5a9a8535f.tar.gz Qt-436b0fff9d9ba95c0fe582f3b71d15d5a9a8535f.tar.bz2 |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/util/qmlanimation_p_p.h')
-rw-r--r-- | src/declarative/util/qmlanimation_p_p.h | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/declarative/util/qmlanimation_p_p.h b/src/declarative/util/qmlanimation_p_p.h index e7163c4..0b65c27 100644 --- a/src/declarative/util/qmlanimation_p_p.h +++ b/src/declarative/util/qmlanimation_p_p.h @@ -53,19 +53,23 @@ // We mean it. // -#include <private/qobject_p.h> -#include <private/qmlnullablevalue_p_p.h> -#include <private/qvariantanimation_p.h> +#include "qmlanimation_p.h" + +#include "qmlnullablevalue_p_p.h" +#include "qmltimeline_p_p.h" + +#include <qml.h> +#include <qmlcontext.h> + #include <QtCore/QPauseAnimation> #include <QtCore/QVariantAnimation> #include <QtCore/QAnimationGroup> #include <QtGui/QColor> -#include <private/qmlanimation_p.h> -#include <qml.h> -#include <qmlcontext.h> -#include <private/qmltimeline_p_p.h> #include <QDebug> +#include <private/qobject_p.h> +#include <private/qvariantanimation_p.h> + QT_BEGIN_NAMESPACE //interface for classes that provide animation actions for QActionAnimation |