summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/doc/src/animation.qdoc2
-rw-r--r--src/corelib/io/qdatastream.cpp1
-rw-r--r--src/corelib/tools/qcommandlineoption.cpp2
-rw-r--r--src/corelib/tools/qdatetime.cpp10
-rw-r--r--src/corelib/tools/qstring.cpp6
5 files changed, 16 insertions, 5 deletions
diff --git a/src/corelib/doc/src/animation.qdoc b/src/corelib/doc/src/animation.qdoc
index 4e71ed4268..0c1b2aed17 100644
--- a/src/corelib/doc/src/animation.qdoc
+++ b/src/corelib/doc/src/animation.qdoc
@@ -121,7 +121,7 @@
As mentioned in the previous section, the QPropertyAnimation class can
interpolate over Qt properties. It is often this class that should be used
for animation of values; in fact, its superclass, QVariantAnimation, has an
- empty implementation of \l{QAbstractAnimation::}{updateCurrentValue()}, and
+ empty implementation of \l{QVariantAnimation::}{updateCurrentValue()}, and
does not change any value unless we change it ourselves on the
\l{QVariantAnimation::valueChanged()}{valueChanged signal}.
diff --git a/src/corelib/io/qdatastream.cpp b/src/corelib/io/qdatastream.cpp
index de1fc18cd0..b4eb98e062 100644
--- a/src/corelib/io/qdatastream.cpp
+++ b/src/corelib/io/qdatastream.cpp
@@ -556,6 +556,7 @@ void QDataStream::setByteOrder(ByteOrder bo)
\value Qt_5_5 Same as Qt_5_4
\value Qt_5_6 Version 17 (Qt 5.6)
\value Qt_5_7 Same as Qt_5_6
+ \value Qt_5_8 Same as Qt_5_6
\omitvalue Qt_DefaultCompiledVersion
\sa setVersion(), version()
diff --git a/src/corelib/tools/qcommandlineoption.cpp b/src/corelib/tools/qcommandlineoption.cpp
index 1f7f9cc33b..7482315909 100644
--- a/src/corelib/tools/qcommandlineoption.cpp
+++ b/src/corelib/tools/qcommandlineoption.cpp
@@ -433,7 +433,7 @@ QCommandLineOption::Flags QCommandLineOption::flags() const
}
/*!
- Set the set of flags that affect this command-line option.
+ Set the set of flags that affect this command-line option to \a flags.
\since 5.8
\sa flags(), QCommandLineOption::Flags
diff --git a/src/corelib/tools/qdatetime.cpp b/src/corelib/tools/qdatetime.cpp
index adb539c388..57de7a8f6e 100644
--- a/src/corelib/tools/qdatetime.cpp
+++ b/src/corelib/tools/qdatetime.cpp
@@ -4261,6 +4261,16 @@ bool QDateTime::operator<(const QDateTime &other) const
\sa currentDateTime(), currentDateTimeUtc(), toTime_t(), toTimeSpec()
*/
+/*!
+ \fn qint64 QDateTime::currentSecsSinceEpoch()
+ \since 5.8
+
+ Returns the number of seconds since 1970-01-01T00:00:00 Universal
+ Coordinated Time.
+
+ \sa currentMSecsSinceEpoch()
+*/
+
#if defined(Q_OS_WIN)
static inline uint msecsFromDecomposed(int hour, int minute, int sec, int msec = 0)
{
diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp
index 8cabb3c5d2..55390189b6 100644
--- a/src/corelib/tools/qstring.cpp
+++ b/src/corelib/tools/qstring.cpp
@@ -8338,7 +8338,7 @@ QString &QString::setRawData(const QChar *unicode, int size)
\a start in this object.
\note This function performs no error checking.
- The behavior is undefined when \a start < 0, \length < 0,
+ The behavior is undefined when \a start < 0, \a length < 0,
or \a start + \a length > size().
\sa left(), right()
@@ -8351,7 +8351,7 @@ QString &QString::setRawData(const QChar *unicode, int size)
0 in this object.
\note This function performs no error checking.
- The behavior is undefined when \length < 0 or \a length > size().
+ The behavior is undefined when \a length < 0 or \a length > size().
\sa mid(), right()
*/
@@ -8363,7 +8363,7 @@ QString &QString::setRawData(const QChar *unicode, int size)
size() - \a length in this object.
\note This function performs no error checking.
- The behavior is undefined when \length < 0 or \a length > size().
+ The behavior is undefined when \a length < 0 or \a length > size().
\sa mid(), left()
*/