1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix docs

Browse Source 
Change-Id: Id57b7932afb89fe9d3f4f6e6c3b558265475d77b
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
This commit is contained in:
Frederik Gladhorn 2012-08-29 19:45:16 +02:00 committed by Qt by Nokia
parent fa1738bddf
commit 812bad17df
4 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/itemmodels/qabstractitemmodel.cpp
View File

@ -1416,7 +1416,7 @@ QAbstractItemModel::~QAbstractItemModel()
For example: For example:
\snippet widgets/itemviews/simpledommodel/dommodel.cpp 2 \snippet itemviews/simpledommodel/dommodel.cpp 2
\note When implementing a table based model, columnCount() should return 0 \note When implementing a table based model, columnCount() should return 0
when the parent is valid. when the parent is valid.

4
src/corelib/itemmodels/qsortfilterproxymodel.cpp
View File

@ -1604,7 +1604,7 @@ void QSortFilterProxyModelPrivate::_q_sourceColumnsMoved(
QSortFilterProxyModel and reimplementing lessThan(), which is QSortFilterProxyModel and reimplementing lessThan(), which is
used to compare items. For example: used to compare items. For example:
\snippet widgets/itemviews/customsortfiltermodel/mysortfilterproxymodel.cpp 5 \snippet itemviews/customsortfiltermodel/mysortfilterproxymodel.cpp 5
(This code snippet comes from the (This code snippet comes from the
\l{itemviews/customsortfiltermodel}{Custom Sort/Filter Model} \l{itemviews/customsortfiltermodel}{Custom Sort/Filter Model}
@ -1647,7 +1647,7 @@ void QSortFilterProxyModelPrivate::_q_sourceColumnsMoved(
the \l{QSortFilterProxyModel::filterKeyColumn}{filterKeyColumn} property the \l{QSortFilterProxyModel::filterKeyColumn}{filterKeyColumn} property
and performs filtering on columns 0, 1, and 2: and performs filtering on columns 0, 1, and 2:
\snippet widgets/itemviews/customsortfiltermodel/mysortfilterproxymodel.cpp 3 \snippet itemviews/customsortfiltermodel/mysortfilterproxymodel.cpp 3
(This code snippet comes from the (This code snippet comes from the
\l{itemviews/customsortfiltermodel}{Custom Sort/Filter Model} \l{itemviews/customsortfiltermodel}{Custom Sort/Filter Model}

6
src/corelib/tools/qregularexpression.cpp
View File

@ -1007,11 +1007,7 @@ void QRegularExpressionPrivate::getPatternInfo()
} }
/*! /*
\class QPcreJitStackPointer
\inmodule QtCore
\internal
Simple "smartpointer" wrapper around a pcre_jit_stack, to be used with Simple "smartpointer" wrapper around a pcre_jit_stack, to be used with
QThreadStorage. QThreadStorage.
*/ */

14
src/corelib/tools/qsize.cpp
View File

@ -219,8 +219,11 @@ void QSize::transpose()
*/ */
/*! /*!
\overload \overload
\since 5.0 \since 5.0
Return a size scaled to a rectangle with the given size \a s,
according to the specified \a mode.
*/ */
QSize QSize::scaled(const QSize &s, Qt::AspectRatioMode mode) const QSize QSize::scaled(const QSize &s, Qt::AspectRatioMode mode) const
{ {
@ -648,8 +651,11 @@ void QSizeF::transpose()
*/ */
/*! /*!
\overload \overload
\since 5.0 \since 5.0
Returns a size scaled to a rectangle with the given size \a s,
according to the specified \a mode.
*/ */
QSizeF QSizeF::scaled(const QSizeF &s, Qt::AspectRatioMode mode) const QSizeF QSizeF::scaled(const QSizeF &s, Qt::AspectRatioMode mode) const
{ {