diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-05-18 05:06:40 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-05-18 05:06:40 (GMT) |
| commit | 3769beacd9126b567f6a42e6c357a7eda004a602 (patch) | |
| tree | aa32717de1ccf0cae336e9682d81e5a9d7e845e5 /doc/src/images | |
| parent | 0ed3e397eaebd1220d745c61cb3433998cbd9dd9 (diff) | |
| parent | 9aba165d0ca970949bcc5fc590569ea58d992626 (diff) | |
| download | Qt-3769beacd9126b567f6a42e6c357a7eda004a602.zip Qt-3769beacd9126b567f6a42e6c357a7eda004a602.tar.gz Qt-3769beacd9126b567f6a42e6c357a7eda004a602.tar.bz2 | |
Merge branch 'kinetic-animations' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/corelib/animation/qanimationgroup.cpp
src/corelib/animation/qvariantanimation.cpp
src/gui/graphicsview/qgraphicsitem.cpp
Diffstat (limited to 'doc/src/images')
| -rw-r--r-- | doc/src/images/animations-architecture.png | bin | 0 -> 27619 bytes |
| -rw-r--r-- | doc/src/images/factorial-example.png | bin | 0 -> 4032 bytes |
| -rw-r--r-- | doc/src/images/pingpong-example.png | bin | 0 -> 7843 bytes |
| -rw-r--r-- | doc/src/images/statemachine-button-history.png | bin | 91677 -> 8493 bytes |
| -rw-r--r-- | doc/src/images/statemachine-button-nested.png | bin | 73774 -> 7051 bytes |
| -rw-r--r-- | doc/src/images/statemachine-button.png | bin | 32767 -> 4233 bytes |
| -rw-r--r-- | doc/src/images/statemachine-customevents.png | bin | 0 -> 2544 bytes |
| -rw-r--r-- | doc/src/images/statemachine-customevents2.png | bin | 0 -> 6713 bytes |
| -rw-r--r-- | doc/src/images/statemachine-finished.png | bin | 37907 -> 5518 bytes |
| -rw-r--r-- | doc/src/images/statemachine-nonparallel.png | bin | 68482 -> 5350 bytes |
| -rw-r--r-- | doc/src/images/statemachine-parallel.png | bin | 99587 -> 8631 bytes |
| -rw-r--r-- | doc/src/images/tankgame-example.png | bin | 0 -> 16089 bytes |
| -rw-r--r-- | doc/src/images/trafficlight-example1.png | bin | 0 -> 3694 bytes |
| -rw-r--r-- | doc/src/images/trafficlight-example2.png | bin | 0 -> 7257 bytes |
14 files changed, 0 insertions, 0 deletions
diff --git a/doc/src/images/animations-architecture.png b/doc/src/images/animations-architecture.png Binary files differnew file mode 100644 index 0000000..9b581af --- /dev/null +++ b/doc/src/images/animations-architecture.png diff --git a/doc/src/images/factorial-example.png b/doc/src/images/factorial-example.png Binary files differnew file mode 100644 index 0000000..8fb1cc6 --- /dev/null +++ b/doc/src/images/factorial-example.png diff --git a/doc/src/images/pingpong-example.png b/doc/src/images/pingpong-example.png Binary files differnew file mode 100644 index 0000000..af707e4 --- /dev/null +++ b/doc/src/images/pingpong-example.png diff --git a/doc/src/images/statemachine-button-history.png b/doc/src/images/statemachine-button-history.png Binary files differindex cd66478..7f51cae 100644 --- a/doc/src/images/statemachine-button-history.png +++ b/doc/src/images/statemachine-button-history.png diff --git a/doc/src/images/statemachine-button-nested.png b/doc/src/images/statemachine-button-nested.png Binary files differindex 60360d1..762ac14 100644 --- a/doc/src/images/statemachine-button-nested.png +++ b/doc/src/images/statemachine-button-nested.png diff --git a/doc/src/images/statemachine-button.png b/doc/src/images/statemachine-button.png Binary files differindex 75d9e53..10102bd 100644 --- a/doc/src/images/statemachine-button.png +++ b/doc/src/images/statemachine-button.png diff --git a/doc/src/images/statemachine-customevents.png b/doc/src/images/statemachine-customevents.png Binary files differnew file mode 100644 index 0000000..62a4222 --- /dev/null +++ b/doc/src/images/statemachine-customevents.png diff --git a/doc/src/images/statemachine-customevents2.png b/doc/src/images/statemachine-customevents2.png Binary files differnew file mode 100644 index 0000000..57b37ef --- /dev/null +++ b/doc/src/images/statemachine-customevents2.png diff --git a/doc/src/images/statemachine-finished.png b/doc/src/images/statemachine-finished.png Binary files differindex 802621e..0ac081d 100644 --- a/doc/src/images/statemachine-finished.png +++ b/doc/src/images/statemachine-finished.png diff --git a/doc/src/images/statemachine-nonparallel.png b/doc/src/images/statemachine-nonparallel.png Binary files differindex 1fe60d8..f9850a7 100644 --- a/doc/src/images/statemachine-nonparallel.png +++ b/doc/src/images/statemachine-nonparallel.png diff --git a/doc/src/images/statemachine-parallel.png b/doc/src/images/statemachine-parallel.png Binary files differindex 1868792..a65c297 100644 --- a/doc/src/images/statemachine-parallel.png +++ b/doc/src/images/statemachine-parallel.png diff --git a/doc/src/images/tankgame-example.png b/doc/src/images/tankgame-example.png Binary files differnew file mode 100644 index 0000000..9e17e30 --- /dev/null +++ b/doc/src/images/tankgame-example.png diff --git a/doc/src/images/trafficlight-example1.png b/doc/src/images/trafficlight-example1.png Binary files differnew file mode 100644 index 0000000..ec8c7ff --- /dev/null +++ b/doc/src/images/trafficlight-example1.png diff --git a/doc/src/images/trafficlight-example2.png b/doc/src/images/trafficlight-example2.png Binary files differnew file mode 100644 index 0000000..a12e4db --- /dev/null +++ b/doc/src/images/trafficlight-example2.png |
