diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-04-22 23:23:33 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-04-22 23:23:33 (GMT) |
| commit | c41be719a15cd8d702dd1064fee2b224f657c067 (patch) | |
| tree | 6cb88f763194a66e4c5c7bf5797614f47b3d4671 /examples | |
| parent | a1458a0426caa71bab4527ca079c3004bb2b5abd (diff) | |
| parent | ebda84cd06faaf440a096bda7966fa795ca86318 (diff) | |
| download | Qt-c41be719a15cd8d702dd1064fee2b224f657c067.zip Qt-c41be719a15cd8d702dd1064fee2b224f657c067.tar.gz Qt-c41be719a15cd8d702dd1064fee2b224f657c067.tar.bz2 | |
Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/gui/animation/qguivariantanimation.cpp
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/animation/animatedtiles/main.cpp | 1 | ||||
| -rw-r--r-- | examples/animation/sub-attaq/boat.cpp | 1 | ||||
| -rw-r--r-- | examples/animation/sub-attaq/boat.h | 2 | ||||
| -rw-r--r-- | examples/animation/sub-attaq/qanimationstate.cpp | 3 | ||||
| -rw-r--r-- | examples/animation/sub-attaq/submarine.cpp | 9 |
5 files changed, 10 insertions, 6 deletions
diff --git a/examples/animation/animatedtiles/main.cpp b/examples/animation/animatedtiles/main.cpp index cfaa4ce..9b0b0a5 100644 --- a/examples/animation/animatedtiles/main.cpp +++ b/examples/animation/animatedtiles/main.cpp @@ -7,6 +7,7 @@ # include "qgraphicswidget.h" # include "qparallelanimationgroup.h" # include "qpropertyanimation.h" +# include "qsignaltransition.h" #else #include <QtCore/qstate.h> #endif diff --git a/examples/animation/sub-attaq/boat.cpp b/examples/animation/sub-attaq/boat.cpp index 633e1b1..5721485 100644 --- a/examples/animation/sub-attaq/boat.cpp +++ b/examples/animation/sub-attaq/boat.cpp @@ -56,6 +56,7 @@ # include "qhistorystate.h" # include "qfinalstate.h" # include "qstate.h" +# include "qpauseanimation.h" #include "qsequentialanimationgroup.h" #else #include <QPropertyAnimation> diff --git a/examples/animation/sub-attaq/boat.h b/examples/animation/sub-attaq/boat.h index 4c4a737..b8d5772 100644 --- a/examples/animation/sub-attaq/boat.h +++ b/examples/animation/sub-attaq/boat.h @@ -49,7 +49,7 @@ #include <QDebug> #if defined(QT_EXPERIMENTAL_SOLUTION) -# include "qgraphicswidget.h" +# include "qtgraphicswidget.h" #else # include <QtGui/QGraphicsWidget> #endif diff --git a/examples/animation/sub-attaq/qanimationstate.cpp b/examples/animation/sub-attaq/qanimationstate.cpp index 70285a8..3659657 100644 --- a/examples/animation/sub-attaq/qanimationstate.cpp +++ b/examples/animation/sub-attaq/qanimationstate.cpp @@ -43,11 +43,12 @@ #if defined(QT_EXPERIMENTAL_SOLUTION) # include "qstate.h" +# include "qstate_p.h" #else # include <QtCore/qstate.h> +# include <private/qstate_p.h> #endif -#include <private/qstate_p.h> QT_BEGIN_NAMESPACE diff --git a/examples/animation/sub-attaq/submarine.cpp b/examples/animation/sub-attaq/submarine.cpp index e64ffdd..555617c 100644 --- a/examples/animation/sub-attaq/submarine.cpp +++ b/examples/animation/sub-attaq/submarine.cpp @@ -50,10 +50,11 @@ #include "qanimationstate.h" #if defined(QT_EXPERIMENTAL_SOLUTION) -#include "qpropertyanimation.h" -#include "qstatemachine.h" -#include "qfinalstate.h" -#include "qsequentialanimationgroup.h" +# include "qpropertyanimation.h" +# include "qstatemachine.h" +# include "qfinalstate.h" +# include "qsequentialanimationgroup.h" +# include "qpauseanimation.h" #else #include <QPropertyAnimation> #include <QStateMachine> |