diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-31 19:18:11 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-31 19:18:11 (GMT) |
| commit | 6750d0dcbf5a2e88fab2e127dc3e057f0d68bf71 (patch) | |
| tree | e79c09594e34f23c0769948bd53d1e0b72563921 /doc/src/examples/pixelator.qdoc | |
| parent | afef0789d8dd3ac2611f0c136e026d7d9cfa68f6 (diff) | |
| parent | 1537036175c0cfedf013e5b47a801a4dc6983a00 (diff) | |
| download | Qt-6750d0dcbf5a2e88fab2e127dc3e057f0d68bf71.zip Qt-6750d0dcbf5a2e88fab2e127dc3e057f0d68bf71.tar.gz Qt-6750d0dcbf5a2e88fab2e127dc3e057f0d68bf71.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (21 commits)
Doc: Fixed an off-by-one error in an example.
Fix QT_NO_TEXTHTMLPARSER
Fix QT_NO_DOM
Fix QT_NO_TEXTSTREAM compilation errors.
Fix QT_NO_VALIDATOR compilation.
Doc: Removed a misleading sentence about a class constructor.
Doc: correcting docs in QDrag::exec
Doc: Adding note about QDrag::exec()
Revert behavior of QTextLayout::boundingRect() when line width is set
Fix unreasonably large width of QTextLayout::boundingRect()
Doc: replacing old image
Fix compilation with stricts compilers.
Fix QT_NO_DIRMODEL build error in QtDeclarative.
Revert "Added native key support to QSharedMemory API."
Revert "Improved documentation for QSharedMemory's key/setKey functions."
Fix a simple mistake in QXmlStreamReader::atEnd() docs.
Improved documentation for QSharedMemory's key/setKey functions.
Added native key support to QSharedMemory API.
Make test work with shadow builds again.
Doc: Corrected the documentation about the compression threshold.
...
Diffstat (limited to 'doc/src/examples/pixelator.qdoc')
| -rw-r--r-- | doc/src/examples/pixelator.qdoc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/doc/src/examples/pixelator.qdoc b/doc/src/examples/pixelator.qdoc index 09ae3e8..95099e1 100644 --- a/doc/src/examples/pixelator.qdoc +++ b/doc/src/examples/pixelator.qdoc @@ -80,8 +80,6 @@ functions to indicate the dimensions of the image and supply data to other components. - For convenience, the image to be used is passed in the constructor. - \section1 ImageModel Class Implementation The constructor is trivial: @@ -89,7 +87,7 @@ \snippet examples/itemviews/pixelator/imagemodel.cpp 0 The \c setImage() function sets the image that will be used by the model: - + \snippet examples/itemviews/pixelator/imagemodel.cpp 1 The QAbstractItemModel::reset() call tells the view(s) that the model @@ -233,7 +231,7 @@ This enables the items to be drawn without any gaps between them. Removing the headers also prevents the user from adjusting the sizes of individual rows and columns. - + We also set the minimum section size to 1 on the headers. If we didn't, the headers would default to a larger size, preventing us from displaying really small items (which can be specified |