diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-05-04 12:21:10 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-05-04 12:21:10 (GMT) |
| commit | 4a079000243ed05ce37d3c7055b5bd56c7ccf85d (patch) | |
| tree | 3bb9bf991e13a8e211cd9c56c0adb249ebe1a697 /doc/src/examples | |
| parent | 5dec3808ed6724a096e5dfc579d37e8528de75e0 (diff) | |
| parent | c368a8ed6badab846c8e63c26d48b95788c12163 (diff) | |
| download | Qt-4a079000243ed05ce37d3c7055b5bd56c7ccf85d.zip Qt-4a079000243ed05ce37d3c7055b5bd56c7ccf85d.tar.gz Qt-4a079000243ed05ce37d3c7055b5bd56c7ccf85d.tar.bz2 | |
Merge commit 'origin/4.5'
Conflicts:
src/gui/itemviews/qabstractitemview.cpp
Diffstat (limited to 'doc/src/examples')
| -rw-r--r-- | doc/src/examples/flowlayout.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/src/examples/flowlayout.qdoc b/doc/src/examples/flowlayout.qdoc index 5fdafe2..3e7ec22 100644 --- a/doc/src/examples/flowlayout.qdoc +++ b/doc/src/examples/flowlayout.qdoc @@ -53,7 +53,7 @@ The Flowlayout class mainly uses QLayout and QWidgetItem, while the Window uses QWidget and QLabel. We will only document the definition - and implementation of \cFlowLayout below. + and implementation of \c FlowLayout below. \section1 FlowLayout Class Definition @@ -156,4 +156,4 @@ the parent is a QLayout, will be determined by querying the spacing of the parent layout. -*/
\ No newline at end of file +*/ |