diff options
| author | Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com> | 2009-09-15 09:44:27 (GMT) |
|---|---|---|
| committer | Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com> | 2009-09-15 09:44:27 (GMT) |
| commit | edf7c7c045559b1d03f1d64d2334adac7da88527 (patch) | |
| tree | b17960099bed14a06d53510ac13de0e6255a3e14 /doc/src/images | |
| parent | 2795a73158280ddce4eec57c643d367bb402a03d (diff) | |
| parent | c8bf9bd17a4520eefe4306b7b1bb4f93fb296d80 (diff) | |
| download | Qt-edf7c7c045559b1d03f1d64d2334adac7da88527.zip Qt-edf7c7c045559b1d03f1d64d2334adac7da88527.tar.gz Qt-edf7c7c045559b1d03f1d64d2334adac7da88527.tar.bz2 | |
Merge commit 'qt-mainline/4.6' into kinetic-declarativeui
Conflicts:
src/gui/graphicsview/qgraphicsitem.cpp
src/gui/graphicsview/qgraphicsitem.h
src/gui/graphicsview/qgraphicsscene.cpp
tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
Diffstat (limited to 'doc/src/images')
| -rw-r--r-- | doc/src/images/qt-embedded-architecture.png | bin | 37198 -> 22388 bytes |
| -rw-r--r-- | doc/src/images/qt-embedded-linux-architecture.png | bin | 0 -> 22979 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/doc/src/images/qt-embedded-architecture.png b/doc/src/images/qt-embedded-architecture.png Binary files differindex 97a29d0..d3f8edc 100644 --- a/doc/src/images/qt-embedded-architecture.png +++ b/doc/src/images/qt-embedded-architecture.png diff --git a/doc/src/images/qt-embedded-linux-architecture.png b/doc/src/images/qt-embedded-linux-architecture.png Binary files differnew file mode 100644 index 0000000..abf5bd8 --- /dev/null +++ b/doc/src/images/qt-embedded-linux-architecture.png |
