summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/corelib/io/qfiledevice.cpp8
-rw-r--r--src/corelib/io/qfileinfo.cpp2
-rw-r--r--src/corelib/kernel/qcoreapplication.cpp2
-rw-r--r--src/gui/opengl/qopenglfunctions.cpp6
-rw-r--r--src/sql/models/qsqlquerymodel.cpp2
5 files changed, 10 insertions, 10 deletions
diff --git a/src/corelib/io/qfiledevice.cpp b/src/corelib/io/qfiledevice.cpp
index 8533602d63..b642add7f6 100644
--- a/src/corelib/io/qfiledevice.cpp
+++ b/src/corelib/io/qfiledevice.cpp
@@ -749,7 +749,7 @@ bool QFileDevice::unmap(uchar *address)
\value FileAccessTime When the file was most recently accessed (e.g.
read or written to).
- \sa setFileName(), fileTime()
+ \sa setFileTime(), fileTime()
*/
static inline QAbstractFileEngine::FileTime FileDeviceTimeToAbstractFileEngineTime(QFileDevice::FileTime time)
@@ -775,7 +775,7 @@ static inline QAbstractFileEngine::FileTime FileDeviceTimeToAbstractFileEngineTi
If the time cannot be determined return QDateTime() (an invalid
date time).
- \sa setFileName(), FileTime, QDateTime::isValid()
+ \sa setFileTime(), FileTime, QDateTime::isValid()
*/
QDateTime QFileDevice::fileTime(QFileDevice::FileTime time) const
{
@@ -789,8 +789,8 @@ QDateTime QFileDevice::fileTime(QFileDevice::FileTime time) const
/*!
\since 5.10
- Sets the file \a time to \a newDate, returning true if successful;
- otherwise returns false.
+ Sets the file time specified by \a fileTime to \a newDate, returning true
+ if successful; otherwise returns false.
\note The file must be open to use this function.
diff --git a/src/corelib/io/qfileinfo.cpp b/src/corelib/io/qfileinfo.cpp
index d301b10004..77349d511d 100644
--- a/src/corelib/io/qfileinfo.cpp
+++ b/src/corelib/io/qfileinfo.cpp
@@ -1347,7 +1347,7 @@ QDateTime QFileInfo::lastRead() const
If the time cannot be determined return QDateTime() (an invalid
date time).
- \sa FileTime, QDateTime::isValid()
+ \sa QFile::FileTime, QDateTime::isValid()
*/
QDateTime QFileInfo::fileTime(QFile::FileTime time) const
{
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp
index 1f736d7bf6..6b6009d757 100644
--- a/src/corelib/kernel/qcoreapplication.cpp
+++ b/src/corelib/kernel/qcoreapplication.cpp
@@ -2037,7 +2037,7 @@ static void replacePercentN(QString *result, int n)
This function is not virtual. You can use alternative translation
techniques by subclassing \l QTranslator.
- \sa QObject::tr(), installTranslator(), removeTranslator(), translate(), isTranslatorInstalled()
+ \sa QObject::tr(), installTranslator(), removeTranslator(), translate()
*/
QString QCoreApplication::translate(const char *context, const char *sourceText,
const char *disambiguation, int n)
diff --git a/src/gui/opengl/qopenglfunctions.cpp b/src/gui/opengl/qopenglfunctions.cpp
index 17ac249380..5e3537e47b 100644
--- a/src/gui/opengl/qopenglfunctions.cpp
+++ b/src/gui/opengl/qopenglfunctions.cpp
@@ -4469,7 +4469,7 @@ QT_OPENGL_IMPLEMENT(QOpenGLFunctionsPrivate, QT_OPENGL_FUNCTIONS)
*/
/*!
- \fn void QOpenGLExtraFunctions::glBlendBarrier()
+ \fn void QOpenGLExtraFunctions::glBlendBarrier(void)
Convenience function that calls glBlendBarrier().
@@ -4690,7 +4690,7 @@ QT_OPENGL_IMPLEMENT(QOpenGLFunctionsPrivate, QT_OPENGL_FUNCTIONS)
*/
/*!
- \fn void QOpenGLExtraFunctions::glGetGraphicsResetStatus()
+ \fn void QOpenGLExtraFunctions::glGetGraphicsResetStatus(void)
Convenience function that calls glGetGraphicsResetStatus().
@@ -4898,7 +4898,7 @@ QT_OPENGL_IMPLEMENT(QOpenGLFunctionsPrivate, QT_OPENGL_FUNCTIONS)
*/
/*!
- \fn void QOpenGLExtraFunctions::glPopDebugGroup()
+ \fn void QOpenGLExtraFunctions::glPopDebugGroup(void)
Convenience function that calls glPopDebugGroup().
diff --git a/src/sql/models/qsqlquerymodel.cpp b/src/sql/models/qsqlquerymodel.cpp
index b9c7c3993a..c0b1061c6b 100644
--- a/src/sql/models/qsqlquerymodel.cpp
+++ b/src/sql/models/qsqlquerymodel.cpp
@@ -214,7 +214,7 @@ bool QSqlQueryModel::canFetchMore(const QModelIndex &parent) const
/*!
\since 5.10
- \override
+ \reimp
Returns the model's role names.