AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Various documentation fixes ported from Qt 4.8

Browse Source 
Selected fixes for qtbase from 4.8 commit
3826203f744a2147bebf5f088de0d524156f59fd

Task-number: QTBUG-9466
Task-number: QTBUG-7924
Task-number: QTBUG-20355
Task-number: QTBUG-19367
Task-number: QTBUG-14554

Change-Id: I551251dd8a87d7dd837e5927050ffd14bce9a97c
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
This commit is contained in:
Teemu Katajisto 2012-02-02 12:29:54 +02:00 committed by Qt by Nokia
parent a71d956013
commit ea8e048e1d
5 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/statemachine/qstatemachine.cpp
View File

@ -2346,7 +2346,7 @@ QStateMachine::SignalEvent::~SignalEvent()
/*!
\class QStateMachine::WrappedEvent
\brief The WrappedEvent class holds a clone of an event associated with a QObject.
\brief The WrappedEvent class inherits QEvent and holds a clone of an event associated with a QObject.
\since 4.6
\ingroup statemachine

2
src/corelib/tools/qdatetime.cpp
View File

@ -398,7 +398,7 @@ int QDate::day() const
}
/*!
Returns the weekday (1 to 7) for this date.
Returns the weekday (1 = Monday to 7 = Sunday) for this date.
Returns 0 if the date is invalid.

2
src/corelib/tools/qelapsedtimer.cpp
View File

@ -230,7 +230,7 @@ void QElapsedTimer::invalidate()
}
/*!
Returns true if this object was invalidated by a call to invalidate() and
Returns false if this object was invalidated by a call to invalidate() and
has not been restarted since.
\sa invalidate(), start(), restart()

5
src/sql/kernel/qsqlrecord.cpp
View File

@ -243,8 +243,9 @@ int QSqlRecord::indexOf(const QString& name) const
}
/*!
Returns the field at position \a index. If the position is out of
range, an empty field is returned.
Returns the field at position \a index. If the \a index
is out of range, function returns
a \l{default-constructed value}.
*/
QSqlField QSqlRecord::field(int index) const
{

4
src/widgets/widgets/qmenubar.cpp
View File

@ -1785,6 +1785,8 @@ QWidget *QMenuBar::cornerWidget(Qt::Corner corner) const
The default is to follow whether the Qt::AA_DontUseNativeMenuBar attribute
is set for the application. Explicitly settings this property overrides
the presence (or abscence) of the attribute.
\sa void-qt-mac-set-native-menubar-bool-enable
*/
void QMenuBar::setNativeMenuBar(bool nativeMenuBar)
@ -1882,6 +1884,8 @@ QAction *QMenuBar::defaultAction() const
is triggered as a result of a mouse click; \a action is the action that
caused the signal to be emitted.
\note QMenuBar has to have ownership of the QMenu in order this signal to work.
Normally, you connect each menu action to a single slot using
QAction::triggered(), but sometimes you will want to connect
several items to a single slot (most often if the user selects