diff options
author | Michael Brasser <michael.brasser@nokia.com> | 2009-05-29 03:08:40 (GMT) |
---|---|---|
committer | Michael Brasser <michael.brasser@nokia.com> | 2009-05-29 03:08:40 (GMT) |
commit | 2eb60d000f3666fc42ba2b7305ca52556497c86a (patch) | |
tree | 95e1821e89fcbfa5ccaa4bcbd5673127ee801243 /doc/src | |
parent | 9065cdc07a6745fc269d7ec3aba457d48858267c (diff) | |
parent | 9088aeae9daf02546769377853824397458ba822 (diff) | |
download | Qt-2eb60d000f3666fc42ba2b7305ca52556497c86a.zip Qt-2eb60d000f3666fc42ba2b7305ca52556497c86a.tar.gz Qt-2eb60d000f3666fc42ba2b7305ca52556497c86a.tar.bz2 |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts:
tools/qdoc3/doc.cpp
Diffstat (limited to 'doc/src')
-rw-r--r-- | doc/src/designer-manual.qdoc | 19 | ||||
-rw-r--r-- | doc/src/images/rgbController-configure-connection1.png | bin | 29210 -> 23241 bytes |
2 files changed, 8 insertions, 11 deletions
diff --git a/doc/src/designer-manual.qdoc b/doc/src/designer-manual.qdoc index 8d3ae71..ee240b5 100644 --- a/doc/src/designer-manual.qdoc +++ b/doc/src/designer-manual.qdoc @@ -58,7 +58,8 @@ and custom plugins allow you to use your own components with \QD. If you are new to \QD, you can take a look at the - \l{Getting To Know Qt Designer} document. + \l{Getting To Know Qt Designer} document. For a quick tutorial on how to + use \QD, refer to \l{A Quick Start to Qt Designer}. Qt Designer 4.5 boasts a long list of improvements. For a detailed list of what is new, refer \l{What's New in Qt Designer 4.5}. @@ -499,7 +500,7 @@ correct signal and slot and click \gui OK. \endtable - \image rgbController-configureConnection1.png + \image rgbController-configure-connection1.png Repeat the step (in reverse order), clicking on the spin box and dragging the cursor towards the slider, to connect the spin box's @@ -531,15 +532,11 @@ process for the remaining spin boxes and sliders. \endtable - Now, we preview your form to see how it would look in your application. To - preview your form, press \key{Ctrl + R} or select \gui Preview from the - \gui Form menu. - - \image rgbController-preview.png - - Try dragging the slider - the spin box will mirror its value too (and vice - versa). Also, you can resize it to see how the layouts used to manage the - child widgets respond to different window sizes. + Now, we preview your form to see how it would look in your application - + press \key{Ctrl + R} or select \gui Preview from the \gui Form menu. Try + dragging the slider - the spin box will mirror its value too (and vice + versa). Also, you can resize it to see how the layouts that are used to + manage the child widgets, respond to different window sizes. */ diff --git a/doc/src/images/rgbController-configure-connection1.png b/doc/src/images/rgbController-configure-connection1.png Binary files differindex 0798184..4e5dcf2 100644 --- a/doc/src/images/rgbController-configure-connection1.png +++ b/doc/src/images/rgbController-configure-connection1.png |