diff options
| author | Ariya Hidayat <ariya.hidayat@nokia.com> | 2009-06-29 11:25:11 (GMT) |
|---|---|---|
| committer | Ariya Hidayat <ariya.hidayat@nokia.com> | 2009-06-29 12:27:38 (GMT) |
| commit | 9733307cf64ec665cded191675a424b02c39ab38 (patch) | |
| tree | 71c14e38581e2c2691d726b9859e2fe4207a7c98 /doc/src/snippets/code/src_gui_image_qbitmap.cpp | |
| parent | e873cbdec9098856df2c2b584cee73ea0c5563ff (diff) | |
| parent | c026747724f8120e40831096dfcd1e241de72779 (diff) | |
| download | Qt-9733307cf64ec665cded191675a424b02c39ab38.zip Qt-9733307cf64ec665cded191675a424b02c39ab38.tar.gz Qt-9733307cf64ec665cded191675a424b02c39ab38.tar.bz2 | |
Merge commit 'master/master' into kinetic-graphicseffect
Conflicts:
src/gui/graphicsview/graphicsview.pri
src/gui/graphicsview/qgraphicsitem_p.h
src/gui/graphicsview/qgraphicsscene.cpp
src/gui/graphicsview/qgraphicsview.cpp
Diffstat (limited to 'doc/src/snippets/code/src_gui_image_qbitmap.cpp')
0 files changed, 0 insertions, 0 deletions