diff options
| author | Frans Englich <frans.englich@nokia.com> | 2009-10-02 08:48:52 (GMT) |
|---|---|---|
| committer | Frans Englich <frans.englich@nokia.com> | 2009-10-02 08:48:52 (GMT) |
| commit | c006edf9b186c4a8a56e888e8f5d1b692e29f1d8 (patch) | |
| tree | e105f4e2389cd17a5392478160d37230f4118960 /doc/src/images | |
| parent | fd5e86e65adfdecd7bf8a49764d9c9410d877e44 (diff) | |
| parent | 2d003378ff5e7621d5dcc810408039cfe13a8c0a (diff) | |
| download | Qt-c006edf9b186c4a8a56e888e8f5d1b692e29f1d8.zip Qt-c006edf9b186c4a8a56e888e8f5d1b692e29f1d8.tar.gz Qt-c006edf9b186c4a8a56e888e8f5d1b692e29f1d8.tar.bz2 | |
Merge commit 'qt/4.6' into mmfphonon
Conflicts:
src/gui/kernel/qwidget_s60.cpp
Diffstat (limited to 'doc/src/images')
| -rw-r--r-- | doc/src/images/gradient.png | bin | 0 -> 222 bytes |
| -rw-r--r-- | doc/src/images/graphicseffect-bloom.png | bin | 0 -> 79982 bytes |
| -rw-r--r-- | doc/src/images/graphicseffect-effects.png | bin | 395669 -> 486123 bytes |
| -rw-r--r-- | doc/src/images/graphicseffect-plain.png | bin | 0 -> 68763 bytes |
| -rw-r--r-- | doc/src/images/pbuffers-example.png | bin | 203754 -> 192554 bytes |
5 files changed, 0 insertions, 0 deletions
diff --git a/doc/src/images/gradient.png b/doc/src/images/gradient.png Binary files differnew file mode 100644 index 0000000..2ef36ed --- /dev/null +++ b/doc/src/images/gradient.png diff --git a/doc/src/images/graphicseffect-bloom.png b/doc/src/images/graphicseffect-bloom.png Binary files differnew file mode 100644 index 0000000..dace7eb --- /dev/null +++ b/doc/src/images/graphicseffect-bloom.png diff --git a/doc/src/images/graphicseffect-effects.png b/doc/src/images/graphicseffect-effects.png Binary files differindex 3709014..609bef9 100644 --- a/doc/src/images/graphicseffect-effects.png +++ b/doc/src/images/graphicseffect-effects.png diff --git a/doc/src/images/graphicseffect-plain.png b/doc/src/images/graphicseffect-plain.png Binary files differnew file mode 100644 index 0000000..8b4c1c4 --- /dev/null +++ b/doc/src/images/graphicseffect-plain.png diff --git a/doc/src/images/pbuffers-example.png b/doc/src/images/pbuffers-example.png Binary files differindex bafb05a..c34a6fd 100644 --- a/doc/src/images/pbuffers-example.png +++ b/doc/src/images/pbuffers-example.png |
