diff options
author | Liang Qi <[email protected]> | 2016-10-05 19:32:12 +0200 |
---|---|---|
committer | Liang Qi <[email protected]> | 2016-10-05 19:32:12 +0200 |
commit | fff4477661ae240c43088fa6d9069ccf969dbee8 (patch) | |
tree | d654a5f841cc6abe758c8626bbf51be6bdcdea26 /src/quick/util/qquickimageprovider.cpp | |
parent | 3a205800c6ea0a88ae2ab35edabf6883e54a334b (diff) | |
parent | 59e48836e207aff52b2727cc4f3733209475e8bb (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I081d9b15796b4133d2ba6f1a862f15b873a4846d
Diffstat (limited to 'src/quick/util/qquickimageprovider.cpp')
-rw-r--r-- | src/quick/util/qquickimageprovider.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/quick/util/qquickimageprovider.cpp b/src/quick/util/qquickimageprovider.cpp index f6a90cb70a..0c245d2b23 100644 --- a/src/quick/util/qquickimageprovider.cpp +++ b/src/quick/util/qquickimageprovider.cpp @@ -187,6 +187,8 @@ QString QQuickImageResponse::errorString() const This method is used to communicate that the response is no longer required by the engine. It may be reimplemented to cancel a request in the provider side, however, it is not mandatory. + + A cancelled QQuickImageResponse still needs to emit finished(). */ void QQuickImageResponse::cancel() { |