From 1044074a49ecb66565c19a9e212b322fd6341d25 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 24 Jul 2017 16:52:15 +0200 Subject: Fix some qdoc warnings for 5.10 src/corelib/io/qfiledevice.cpp:741: warning: Can't link to 'setFileName()' src/corelib/io/qfiledevice.cpp:772: warning: Can't link to 'setFileName()' src/corelib/io/qfiledevice.cpp:790: warning: No such parameter 'time' in QFileDevice::setFileTime() src/corelib/io/qfiledevice.cpp:790: warning: Undocumented parameter 'fileTime' in QFileDevice::setFileTime() src/corelib/io/qfileinfo.cpp:1344: warning: Can't link to 'FileTime' src/corelib/kernel/qcoreapplication.cpp:2007: warning: Can't link to 'isTranslatorInstalled()' src/gui/opengl/qopenglextrafunctions.h:468: warning: No documentation for 'QOpenGLExtraFunctions::glBlendBarrier(void )' src/gui/opengl/qopenglextrafunctions.h:494: warning: No documentation for 'QOpenGLExtraFunctions::glGetGraphicsResetStatus(void )' src/gui/opengl/qopenglextrafunctions.h:475: warning: No documentation for 'QOpenGLExtraFunctions::glPopDebugGroup(void )' src/sql/models/qsqlquerymodel.cpp:217: warning: Unknown command '\override' Change-Id: Ide0ce911f6faf964fda8f32fac433da7d2cb11de Reviewed-by: Thiago Macieira --- src/corelib/io/qfiledevice.cpp | 8 ++++---- src/corelib/io/qfileinfo.cpp | 2 +- src/corelib/kernel/qcoreapplication.cpp | 2 +- src/gui/opengl/qopenglfunctions.cpp | 6 +++--- src/sql/models/qsqlquerymodel.cpp | 2 +- 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. -- cgit v1.2.3