diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-05-27 21:04:41 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-05-27 21:04:41 (GMT) |
| commit | fcfdccc03b6dd26a82e87a6b6a0ca48d67f78cf6 (patch) | |
| tree | 2cdd417bc0be39b12674f33052462d19d9e38ef9 /doc/src/images | |
| parent | 7b1f8c542bc9f41408f0a54b853d75d0c09a2775 (diff) | |
| parent | d0bc0a26f8ac4c2f02819c262b8aa7c3dd1cad3b (diff) | |
| download | Qt-fcfdccc03b6dd26a82e87a6b6a0ca48d67f78cf6.zip Qt-fcfdccc03b6dd26a82e87a6b6a0ca48d67f78cf6.tar.gz Qt-fcfdccc03b6dd26a82e87a6b6a0ca48d67f78cf6.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts:
tests/auto/qtreeview/tst_qtreeview.cpp
Diffstat (limited to 'doc/src/images')
| -rw-r--r-- | doc/src/images/designer-choosing-form.png | bin | 38078 -> 39080 bytes |
| -rw-r--r-- | doc/src/images/rgbController-arrangement.png | bin | 0 -> 10813 bytes |
| -rw-r--r-- | doc/src/images/rgbController-configure-connection1.png | bin | 0 -> 29210 bytes |
| -rw-r--r-- | doc/src/images/rgbController-configure-connection2.png | bin | 0 -> 28655 bytes |
| -rw-r--r-- | doc/src/images/rgbController-final-layout.png | bin | 0 -> 11275 bytes |
| -rw-r--r-- | doc/src/images/rgbController-form-gridLayout.png | bin | 0 -> 11235 bytes |
| -rw-r--r-- | doc/src/images/rgbController-property-editing.png | bin | 0 -> 9158 bytes |
| -rw-r--r-- | doc/src/images/rgbController-screenshot.png | bin | 0 -> 8995 bytes |
| -rw-r--r-- | doc/src/images/rgbController-selectForLayout.png | bin | 0 -> 20981 bytes |
| -rw-r--r-- | doc/src/images/rgbController-signalsAndSlots.png | bin | 0 -> 10050 bytes |
10 files changed, 0 insertions, 0 deletions
diff --git a/doc/src/images/designer-choosing-form.png b/doc/src/images/designer-choosing-form.png Binary files differindex fa6e470..bee4b29 100644 --- a/doc/src/images/designer-choosing-form.png +++ b/doc/src/images/designer-choosing-form.png diff --git a/doc/src/images/rgbController-arrangement.png b/doc/src/images/rgbController-arrangement.png Binary files differnew file mode 100644 index 0000000..d9e8bab --- /dev/null +++ b/doc/src/images/rgbController-arrangement.png diff --git a/doc/src/images/rgbController-configure-connection1.png b/doc/src/images/rgbController-configure-connection1.png Binary files differnew file mode 100644 index 0000000..0798184 --- /dev/null +++ b/doc/src/images/rgbController-configure-connection1.png diff --git a/doc/src/images/rgbController-configure-connection2.png b/doc/src/images/rgbController-configure-connection2.png Binary files differnew file mode 100644 index 0000000..f3fcc62 --- /dev/null +++ b/doc/src/images/rgbController-configure-connection2.png diff --git a/doc/src/images/rgbController-final-layout.png b/doc/src/images/rgbController-final-layout.png Binary files differnew file mode 100644 index 0000000..d32a93e --- /dev/null +++ b/doc/src/images/rgbController-final-layout.png diff --git a/doc/src/images/rgbController-form-gridLayout.png b/doc/src/images/rgbController-form-gridLayout.png Binary files differnew file mode 100644 index 0000000..c8f3dcf --- /dev/null +++ b/doc/src/images/rgbController-form-gridLayout.png diff --git a/doc/src/images/rgbController-property-editing.png b/doc/src/images/rgbController-property-editing.png Binary files differnew file mode 100644 index 0000000..64fc500 --- /dev/null +++ b/doc/src/images/rgbController-property-editing.png diff --git a/doc/src/images/rgbController-screenshot.png b/doc/src/images/rgbController-screenshot.png Binary files differnew file mode 100644 index 0000000..6019233 --- /dev/null +++ b/doc/src/images/rgbController-screenshot.png diff --git a/doc/src/images/rgbController-selectForLayout.png b/doc/src/images/rgbController-selectForLayout.png Binary files differnew file mode 100644 index 0000000..7a8e184 --- /dev/null +++ b/doc/src/images/rgbController-selectForLayout.png diff --git a/doc/src/images/rgbController-signalsAndSlots.png b/doc/src/images/rgbController-signalsAndSlots.png Binary files differnew file mode 100644 index 0000000..2ba3aba --- /dev/null +++ b/doc/src/images/rgbController-signalsAndSlots.png |
