diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-09-15 23:21:11 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-09-15 23:21:11 (GMT) |
| commit | d3b03a7d6c4ad023572d7099ee9f9ec3f0711d04 (patch) | |
| tree | 5326031090ee5921eaf5c3259153194ddc352afc /doc/src/images | |
| parent | 45c13a0064281d0e2b9a10c7dfb0cef7f3b6720f (diff) | |
| parent | 669afa2337ad5791502fe3af2e3de648cb60ea9b (diff) | |
| download | Qt-d3b03a7d6c4ad023572d7099ee9f9ec3f0711d04.zip Qt-d3b03a7d6c4ad023572d7099ee9f9ec3f0711d04.tar.gz Qt-d3b03a7d6c4ad023572d7099ee9f9ec3f0711d04.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts:
configure.exe
Diffstat (limited to 'doc/src/images')
| -rw-r--r-- | doc/src/images/designer-action-editor.png | bin | 46233 -> 28378 bytes |
| -rw-r--r-- | doc/src/images/designer-adding-menu-action.png | bin | 6168 -> 9962 bytes |
| -rw-r--r-- | doc/src/images/designer-adding-toolbar-action.png | bin | 5644 -> 7428 bytes |
| -rw-r--r-- | doc/src/images/designer-creating-toolbar.png | bin | 0 -> 18194 bytes |
| -rw-r--r-- | doc/src/images/designer-removing-toolbar-action.png | bin | 0 -> 15500 bytes |
| -rw-r--r-- | doc/src/images/designer-removing-toolbar.png | bin | 0 -> 13074 bytes |
| -rw-r--r-- | doc/src/images/qt-embedded-linux-architecture.png | bin | 22979 -> 23199 bytes |
7 files changed, 0 insertions, 0 deletions
diff --git a/doc/src/images/designer-action-editor.png b/doc/src/images/designer-action-editor.png Binary files differindex 7d17573..1e99706 100644 --- a/doc/src/images/designer-action-editor.png +++ b/doc/src/images/designer-action-editor.png diff --git a/doc/src/images/designer-adding-menu-action.png b/doc/src/images/designer-adding-menu-action.png Binary files differindex cf2a9c9..595dd8e 100644 --- a/doc/src/images/designer-adding-menu-action.png +++ b/doc/src/images/designer-adding-menu-action.png diff --git a/doc/src/images/designer-adding-toolbar-action.png b/doc/src/images/designer-adding-toolbar-action.png Binary files differindex e2201cb..404ad0d 100644 --- a/doc/src/images/designer-adding-toolbar-action.png +++ b/doc/src/images/designer-adding-toolbar-action.png diff --git a/doc/src/images/designer-creating-toolbar.png b/doc/src/images/designer-creating-toolbar.png Binary files differnew file mode 100644 index 0000000..32a949a --- /dev/null +++ b/doc/src/images/designer-creating-toolbar.png diff --git a/doc/src/images/designer-removing-toolbar-action.png b/doc/src/images/designer-removing-toolbar-action.png Binary files differnew file mode 100644 index 0000000..12c68a1 --- /dev/null +++ b/doc/src/images/designer-removing-toolbar-action.png diff --git a/doc/src/images/designer-removing-toolbar.png b/doc/src/images/designer-removing-toolbar.png Binary files differnew file mode 100644 index 0000000..a65b170 --- /dev/null +++ b/doc/src/images/designer-removing-toolbar.png diff --git a/doc/src/images/qt-embedded-linux-architecture.png b/doc/src/images/qt-embedded-linux-architecture.png Binary files differindex abf5bd8..b5e3b6c 100644 --- a/doc/src/images/qt-embedded-linux-architecture.png +++ b/doc/src/images/qt-embedded-linux-architecture.png |
