diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-08-31 00:16:40 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-08-31 00:16:40 (GMT) |
| commit | 9dade8d2e57655019ed4dc2fcdc4e226401138a2 (patch) | |
| tree | 6aa3520f525b2ab923b4238079f1012756fa2488 /doc/src/images | |
| parent | e1dd37f6b54881aef3b9e1e686dc56bb96fc14ed (diff) | |
| parent | d23863952b0c13ccd8b2989d24153d94b3d3f83d (diff) | |
| download | Qt-9dade8d2e57655019ed4dc2fcdc4e226401138a2.zip Qt-9dade8d2e57655019ed4dc2fcdc4e226401138a2.tar.gz Qt-9dade8d2e57655019ed4dc2fcdc4e226401138a2.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts:
src/gui/graphicsview/qgraphicsitem.cpp
src/gui/graphicsview/qgraphicsitem.h
src/gui/graphicsview/qgraphicsitem_p.h
src/gui/graphicsview/qgraphicsscene.cpp
Diffstat (limited to 'doc/src/images')
| -rw-r--r-- | doc/src/images/graphicseffect-blur.png | bin | 0 -> 41433 bytes |
| -rw-r--r-- | doc/src/images/graphicseffect-colorize.png | bin | 0 -> 35062 bytes |
| -rw-r--r-- | doc/src/images/graphicseffect-drop-shadow.png | bin | 0 -> 38770 bytes |
| -rw-r--r-- | doc/src/images/graphicseffect-effects.png | bin | 0 -> 112462 bytes |
| -rw-r--r-- | doc/src/images/graphicseffect-grayscale.png | bin | 0 -> 35056 bytes |
| -rw-r--r-- | doc/src/images/graphicseffect-opacity.png | bin | 0 -> 33879 bytes |
| -rw-r--r-- | doc/src/images/graphicseffect-pixelize.png | bin | 0 -> 23577 bytes |
| -rw-r--r-- | doc/src/images/graphicseffect-widget.png | bin | 0 -> 16693 bytes |
| -rw-r--r-- | doc/src/images/inputpanel-example.png | bin | 0 -> 7899 bytes |
9 files changed, 0 insertions, 0 deletions
diff --git a/doc/src/images/graphicseffect-blur.png b/doc/src/images/graphicseffect-blur.png Binary files differnew file mode 100644 index 0000000..3fa403b --- /dev/null +++ b/doc/src/images/graphicseffect-blur.png diff --git a/doc/src/images/graphicseffect-colorize.png b/doc/src/images/graphicseffect-colorize.png Binary files differnew file mode 100644 index 0000000..96fbfe4 --- /dev/null +++ b/doc/src/images/graphicseffect-colorize.png diff --git a/doc/src/images/graphicseffect-drop-shadow.png b/doc/src/images/graphicseffect-drop-shadow.png Binary files differnew file mode 100644 index 0000000..c02415a --- /dev/null +++ b/doc/src/images/graphicseffect-drop-shadow.png diff --git a/doc/src/images/graphicseffect-effects.png b/doc/src/images/graphicseffect-effects.png Binary files differnew file mode 100644 index 0000000..422ae19 --- /dev/null +++ b/doc/src/images/graphicseffect-effects.png diff --git a/doc/src/images/graphicseffect-grayscale.png b/doc/src/images/graphicseffect-grayscale.png Binary files differnew file mode 100644 index 0000000..2bd0c93 --- /dev/null +++ b/doc/src/images/graphicseffect-grayscale.png diff --git a/doc/src/images/graphicseffect-opacity.png b/doc/src/images/graphicseffect-opacity.png Binary files differnew file mode 100644 index 0000000..de15859 --- /dev/null +++ b/doc/src/images/graphicseffect-opacity.png diff --git a/doc/src/images/graphicseffect-pixelize.png b/doc/src/images/graphicseffect-pixelize.png Binary files differnew file mode 100644 index 0000000..047c452 --- /dev/null +++ b/doc/src/images/graphicseffect-pixelize.png diff --git a/doc/src/images/graphicseffect-widget.png b/doc/src/images/graphicseffect-widget.png Binary files differnew file mode 100644 index 0000000..27245d1 --- /dev/null +++ b/doc/src/images/graphicseffect-widget.png diff --git a/doc/src/images/inputpanel-example.png b/doc/src/images/inputpanel-example.png Binary files differnew file mode 100644 index 0000000..0dd9325 --- /dev/null +++ b/doc/src/images/inputpanel-example.png |
