diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-07-30 07:25:01 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-07-30 07:25:01 (GMT) |
| commit | 6e6a3dba2336b158bcb3db633f429edc85534b3d (patch) | |
| tree | 65ebeb098fb7feff01ab5bdee833d9de889c9e44 /doc/src/tutorials | |
| parent | 606aee01d1f23a5baceb4bd888b2a9d4716fcc34 (diff) | |
| parent | f5acc7b83f79c0bce554a6e4fe2d9e6ebb4b582b (diff) | |
| download | Qt-6e6a3dba2336b158bcb3db633f429edc85534b3d.zip Qt-6e6a3dba2336b158bcb3db633f429edc85534b3d.tar.gz Qt-6e6a3dba2336b158bcb3db633f429edc85534b3d.tar.bz2 | |
Merge branch 'master' of ../qt into kinetic-declarativeui
Conflicts:
src/gui/widgets/qlinecontrol_p.h
Diffstat (limited to 'doc/src/tutorials')
| -rw-r--r-- | doc/src/tutorials/addressbook-fr.qdoc | 2 | ||||
| -rw-r--r-- | doc/src/tutorials/addressbook.qdoc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/src/tutorials/addressbook-fr.qdoc b/doc/src/tutorials/addressbook-fr.qdoc index 78f6821..739f047 100644 --- a/doc/src/tutorials/addressbook-fr.qdoc +++ b/doc/src/tutorials/addressbook-fr.qdoc @@ -220,7 +220,7 @@ On remarque que le label \c AddressLabel est positionné en utilisant Qt::AlignTop comme argument optionnel. Ceci est destiné à assurer qu'il ne sera pas centré verticalement dans la cellule (1,0). Pour un aperçu rapide des layouts de Qt, - consultez la section \l{Layout Classes}. + consultez la section \l{Layout Management}. Afin d'installer l'objet layout dans un widget, il faut appeler la méthode \l{QWidget::setLayout()}{setLayout()} du widget en question: diff --git a/doc/src/tutorials/addressbook.qdoc b/doc/src/tutorials/addressbook.qdoc index 95394eb..fd08bfe 100644 --- a/doc/src/tutorials/addressbook.qdoc +++ b/doc/src/tutorials/addressbook.qdoc @@ -222,8 +222,8 @@ Notice that \c addressLabel is positioned using Qt::AlignTop as an additional argument. This is to make sure it is not vertically centered in - cell (1,0). For a basic overview on Qt Layouts, refer to the \l{Layout Classes} - document. + cell (1,0). For a basic overview on Qt Layouts, refer to the + \l{Layout Management} documentation. In order to install the layout object onto the widget, we have to invoke the widget's \l{QWidget::setLayout()}{setLayout()} function: |