diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-08-19 03:19:32 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-08-19 03:19:32 (GMT) |
| commit | 9f7f71160053b64a23abc472d9d9ddd5d9bb8b3d (patch) | |
| tree | 22f60abbc45a5ef8e1beab0af8d9980134d914ad /doc/src/tutorials | |
| parent | f792bae5b13ad68f846a2be1f002d8376f2daef8 (diff) | |
| parent | af98f27a847688e53ab1d34b4a9c04bdc63fe3e1 (diff) | |
| download | Qt-9f7f71160053b64a23abc472d9d9ddd5d9bb8b3d.zip Qt-9f7f71160053b64a23abc472d9d9ddd5d9bb8b3d.tar.gz Qt-9f7f71160053b64a23abc472d9d9ddd5d9bb8b3d.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts:
doc/src/index.qdoc
doc/src/topics.qdoc
src/gui/graphicsview/qgraphicsitem.cpp
src/gui/graphicsview/qgraphicsitem.h
src/gui/graphicsview/qgraphicsitem_p.h
tests/auto/auto.pro
Diffstat (limited to 'doc/src/tutorials')
| -rw-r--r-- | doc/src/tutorials/addressbook-fr.qdoc | 3 | ||||
| -rw-r--r-- | doc/src/tutorials/addressbook.qdoc | 3 | ||||
| -rw-r--r-- | doc/src/tutorials/widgets-tutorial.qdoc | 15 |
3 files changed, 9 insertions, 12 deletions
diff --git a/doc/src/tutorials/addressbook-fr.qdoc b/doc/src/tutorials/addressbook-fr.qdoc index 3ce2987..990e06e 100644 --- a/doc/src/tutorials/addressbook-fr.qdoc +++ b/doc/src/tutorials/addressbook-fr.qdoc @@ -43,11 +43,10 @@ \page tutorials-addressbook-fr.html \startpage {index.html}{Qt Reference Documentation} + \contentspage Tutorials \nextpage {tutorials/addressbook-fr/part1}{Chapitre 1} \title Tutoriel "Carnet d'adresses" - \ingroup howto - \ingroup tutorials \brief Une introduction à la programation d'interface graphique montrant comment construire une application simple avec Qt. Ce tutoriel est une introduction à la programmation de GUI (interface utilisateur) diff --git a/doc/src/tutorials/addressbook.qdoc b/doc/src/tutorials/addressbook.qdoc index d27b95c..4623aaa 100644 --- a/doc/src/tutorials/addressbook.qdoc +++ b/doc/src/tutorials/addressbook.qdoc @@ -43,11 +43,10 @@ \page tutorials-addressbook.html \startpage {index.html}{Qt Reference Documentation} + \contentspage Tutorials \nextpage {tutorials/addressbook/part1}{Chapter 1} \title Address Book Tutorial - \ingroup howto - \ingroup tutorials \brief An introduction to GUI programming, showing how to put together a simple yet fully-functioning application. diff --git a/doc/src/tutorials/widgets-tutorial.qdoc b/doc/src/tutorials/widgets-tutorial.qdoc index 39f6b00..3c0220e 100644 --- a/doc/src/tutorials/widgets-tutorial.qdoc +++ b/doc/src/tutorials/widgets-tutorial.qdoc @@ -41,15 +41,15 @@ /*! \page widgets-tutorial.html - \startpage {index.html}{Qt Reference Documentation} - \nextpage {tutorials/widgets/toplevel}{Creating a Window} - \title Widgets Tutorial - \ingroup tutorials - \brief This tutorial covers basic usage of widgets and layouts, showing how they are used to build GUI applications. + \startpage {index.html}{Qt Reference Documentation} + \contentspage Tutorials + \nextpage {tutorials/widgets/toplevel}{Creating a Window} + + \section1 Introduction Widgets are the basic building blocks of graphical user interface (GUI) @@ -94,7 +94,7 @@ example. For example, the GUI for a main window may be set up in the constructor of a QMainWindow subclass. - The \l{Qt Examples#Widgets}{Widgets examples} are a good place to look for + The \l{Widgets examples} are a good place to look for more complex and complete examples and applications. \section1 Building Examples and Tutorials @@ -279,6 +279,5 @@ \snippet tutorials/widgets/nestedlayouts/main.cpp set up the model The use of models and views is covered in the - \l{Qt Examples#Item Views}{item view examples} and in the - \l{Model/View Programming} overview. + \l{Item Views Examples} and in the \l{Model/View Programming} overview. */ |