diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/kernel/qcoreapplication.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/serialization/qxmlstream.cpp | 14 | ||||
| -rw-r--r-- | src/corelib/text/qtliterals.qdoc | 4 | ||||
| -rw-r--r-- | src/network/kernel/qhostinfo.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/widgets/qcheckbox.cpp | 12 |
5 files changed, 8 insertions, 26 deletions
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp index 3b622961c18..36892b6f6cd 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp @@ -2768,7 +2768,7 @@ Qt::PermissionStatus QCoreApplication::checkPermission(const QPermission &permis /*! \fn template<typename Functor> void QCoreApplication::requestPermission( - const QPermission &permission, Functor functor) + const QPermission &permission, Functor &&functor) Requests the given \a permission. diff --git a/src/corelib/serialization/qxmlstream.cpp b/src/corelib/serialization/qxmlstream.cpp index 21590135dde..0c7c2196d27 100644 --- a/src/corelib/serialization/qxmlstream.cpp +++ b/src/corelib/serialization/qxmlstream.cpp @@ -3804,8 +3804,7 @@ void QXmlStreamWriter::writeCurrentToken(const QXmlStreamReader &reader) } /*! - \fn bool QXmlStreamAttributes::hasAttribute(const QString &qualifiedName) const - \since 4.5 + \fn bool QXmlStreamAttributes::hasAttribute(QAnyStringView qualifiedName) const Returns \c true if this QXmlStreamAttributes has an attribute whose qualified name is \a qualifiedName; otherwise returns \c false. @@ -3819,16 +3818,9 @@ void QXmlStreamWriter::writeCurrentToken(const QXmlStreamReader &reader) */ /*! - \fn bool QXmlStreamAttributes::hasAttribute(QLatin1StringView qualifiedName) const + \fn bool QXmlStreamAttributes::hasAttribute(QAnyStringView namespaceUri, + QAnyStringView name) const \overload - \since 4.5 -*/ - -/*! - \fn bool QXmlStreamAttributes::hasAttribute(const QString &namespaceUri, - const QString &name) const - \overload - \since 4.5 Returns \c true if this QXmlStreamAttributes has an attribute whose namespace URI and name correspond to \a namespaceUri and \a name; diff --git a/src/corelib/text/qtliterals.qdoc b/src/corelib/text/qtliterals.qdoc index b21de4f3585..99c478d6823 100644 --- a/src/corelib/text/qtliterals.qdoc +++ b/src/corelib/text/qtliterals.qdoc @@ -11,7 +11,7 @@ /*! \namespace Qt::Literals \inmodule QtCore - \headerfile QtLiterals + \inheaderfile QtLiterals \brief The Literals inline namespace declares literal operators for Qt types. */ @@ -19,7 +19,7 @@ /*! \namespace Qt::Literals::StringLiterals \inmodule QtCore - \headerfile QStringLiterals + \inheaderfile QStringLiterals \brief The StringLiterals namespace declares string literal operators for Qt types. diff --git a/src/network/kernel/qhostinfo.cpp b/src/network/kernel/qhostinfo.cpp index 1631e97652e..ea2ffedd4cb 100644 --- a/src/network/kernel/qhostinfo.cpp +++ b/src/network/kernel/qhostinfo.cpp @@ -252,7 +252,7 @@ int QHostInfo::lookupHost(const QString &name, QObject *receiver, const char *me */ /*! - \fn template<typename Functor> int QHostInfo::lookupHost(const QString &name, Functor functor) + \fn template<typename Functor> int QHostInfo::lookupHost(const QString &name, Functor &&functor) \since 5.9 diff --git a/src/widgets/widgets/qcheckbox.cpp b/src/widgets/widgets/qcheckbox.cpp index cc013c8c7eb..5b44271d48a 100644 --- a/src/widgets/widgets/qcheckbox.cpp +++ b/src/widgets/widgets/qcheckbox.cpp @@ -89,25 +89,15 @@ public: \sa QAbstractButton, QRadioButton */ -#if QT_VERSION < QT_VERSION_CHECK(7, 0, 0) /*! \fn void QCheckBox::stateChanged(int state) + //! Qt 7: \fn void QCheckBox::stateChanged(Qt::CheckState state) This signal is emitted whenever the checkbox's state changes, i.e., whenever the user checks or unchecks it. \a state contains the checkbox's new Qt::CheckState. */ -#else -/*! - \fn void QCheckBox::stateChanged(Qt::CheckState state) - - This signal is emitted whenever the checkbox's state changes, i.e., - whenever the user checks or unchecks it. - - \a state contains the checkbox's new Qt::CheckState. -*/ -#endif /*! \property QCheckBox::tristate |
