diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-12-15 17:23:25 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2025-12-15 17:23:25 +0200 |
| commit | 0482fa7b259f4c6ab89f3fb5b6433314a0ca79e4 (patch) | |
| tree | 710b8a87cc5d2d532989ee15f8f173f0da560e07 /src/interfaceframework | |
| parent | 6523109822ec2ef01aa48f183c10fc26b292a31c (diff) | |
| parent | b848f955224da2406abb9e8c23066a5d3db05fc2 (diff) | |
Merge tag 'v6.5.8-lts-lgpl' into 6.56.5
Qt 6.5.8-lts-lgpl release
Change-Id: Ib04d5dd6c7c7469cfa70b5de6679de07a1812135
Diffstat (limited to 'src/interfaceframework')
| -rw-r--r-- | src/interfaceframework/doc/src/ifcodegen/generator-usage.qdoc | 2 | ||||
| -rw-r--r-- | src/interfaceframework/qifpendingreply.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/interfaceframework/doc/src/ifcodegen/generator-usage.qdoc b/src/interfaceframework/doc/src/ifcodegen/generator-usage.qdoc index 45644c51..ff5d09cc 100644 --- a/src/interfaceframework/doc/src/ifcodegen/generator-usage.qdoc +++ b/src/interfaceframework/doc/src/ifcodegen/generator-usage.qdoc @@ -393,7 +393,7 @@ \target config_simulator_defaultServerMode \code config_simulator: - defaultApplicationMode: "gui" + defaultServerMode: "gui" \endcode \li Accompanying YAML file \li Module diff --git a/src/interfaceframework/qifpendingreply.cpp b/src/interfaceframework/qifpendingreply.cpp index a1b50432..90188acb 100644 --- a/src/interfaceframework/qifpendingreply.cpp +++ b/src/interfaceframework/qifpendingreply.cpp @@ -774,7 +774,7 @@ void QIfPendingReplyBase::setSuccessNoCheck(const QVariant &value) */ /*! - \fn template <class T> QIfPendingReply<T>::createFailedReply() + \fn template <class T> QIfPendingReply<T> QIfPendingReply<T>::createFailedReply() Creates a reply object which is marked as failed. This is convenient in error cases inside functions returning a reply e.g. @@ -808,7 +808,7 @@ void QIfPendingReplyBase::setSuccessNoCheck(const QVariant &value) */ /*! - \fn template <class T> QIfPendingReply<T>::reply() const + \fn template <class T> T QIfPendingReply<T>::reply() const Returns the result of the reply. If no result has been set yet or when the reply is marked as failed, a default constructed value is returned. @@ -817,7 +817,7 @@ void QIfPendingReplyBase::setSuccessNoCheck(const QVariant &value) */ /*! - \fn template <class T> QIfPendingReply<T>::setSuccess(const T &val) + \fn template <class T> void QIfPendingReply<T>::setSuccess(const T &val) Sets the result of the reply to \a val and marks the reply as succeeded. @@ -827,7 +827,7 @@ void QIfPendingReplyBase::setSuccessNoCheck(const QVariant &value) */ /*! - \fn template <class T> QIfPendingReply<T>::then(const std::function<void (const T &)> &success, const std::function<void ()> &failed) + \fn template <class T> void QIfPendingReply<T>::then(const std::function<void (const T &)> &success, const std::function<void ()> &failed) Sets the C++ callbacks to be called once a result is delivered. If the reply succeeds \a success is called; otherwise \a failed is called. |