summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorartoka <arto.katajasalo@digia.com>2011-12-13 11:02:52 (GMT)
committerQt Commercial Integration <QtCommercial@digia.com>2012-01-31 10:25:07 (GMT)
commitb10d3383b8dcfafae5adad2f373cc986cc3e66cf (patch)
treef0170e50772e4152f10699a46699b8eddff507c9 /src/corelib
parent3e42111e96e18fd60ec6d6b8b386c2f4a4b401ac (diff)
downloadQt-b10d3383b8dcfafae5adad2f373cc986cc3e66cf.zip
Qt-b10d3383b8dcfafae5adad2f373cc986cc3e66cf.tar.gz
Qt-b10d3383b8dcfafae5adad2f373cc986cc3e66cf.tar.bz2
Various qt documentation fixes (wk 42)
Fixes for bugs: QTBUG-8673, QTBUG-18101, QTBUG-14194, QTBUG-9109, QTBUG-8331, QTBUG-8329, QTBUG-8786, QTBUG-8787, QTBUG-21295, QTBUG-14554, QTBUG-19367, QTBUG-8323, QTBUG-9466, QTBUG-7924 and QTBUG-20355.
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/statemachine/qstatemachine.cpp2
-rw-r--r--src/corelib/tools/qdatetime.cpp2
-rw-r--r--src/corelib/tools/qelapsedtimer.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/statemachine/qstatemachine.cpp b/src/corelib/statemachine/qstatemachine.cpp
index d2fef8e..b6e0c68 100644
--- a/src/corelib/statemachine/qstatemachine.cpp
+++ b/src/corelib/statemachine/qstatemachine.cpp
@@ -2340,7 +2340,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
diff --git a/src/corelib/tools/qdatetime.cpp b/src/corelib/tools/qdatetime.cpp
index 946e721..acd48be 100644
--- a/src/corelib/tools/qdatetime.cpp
+++ b/src/corelib/tools/qdatetime.cpp
@@ -387,7 +387,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.
\sa day(), dayOfYear(), Qt::DayOfWeek
*/
diff --git a/src/corelib/tools/qelapsedtimer.cpp b/src/corelib/tools/qelapsedtimer.cpp
index 61ec2c2..03e174a 100644
--- a/src/corelib/tools/qelapsedtimer.cpp
+++ b/src/corelib/tools/qelapsedtimer.cpp
@@ -223,7 +223,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()