summaryrefslogtreecommitdiffstats
path: root/src/webenginewidgets
diff options
context:
space:
mode:
authorAndras Becsi <andras.becsi@theqtcompany.com>2015-02-02 16:41:04 +0100
committerAndras Becsi <andras.becsi@theqtcompany.com>2015-02-02 16:36:30 +0000
commit2ad0c1e8c134a8d4f60593b7747450bba8319bb0 (patch)
tree912b70daacf3ce32921b3eec7d7a540d8a6b5e51 /src/webenginewidgets
parent315f3ccf1e8ee697688d50012307a1cb6747a6b7 (diff)
Fix widgets download state update
Since the DownloadState enum of core does not match the DownloadState enum of QWebEngineDownloadItem we should never directly compare it, instead we should convert with the toDownloadState() function, to fix the missing emission of the finished() signal. This patch also adds static asserts to verify the match of chromium's DownloadItem::DownloadState and our core DownloadState. Change-Id: I51110f55598230e380e15948f75219976d3a68a0 Reviewed-by: Michael BrĂ¼ning <michael.bruning@theqtcompany.com>
Diffstat (limited to 'src/webenginewidgets')
-rw-r--r--src/webenginewidgets/api/qwebenginedownloaditem.cpp2
-rw-r--r--src/webenginewidgets/api/qwebengineprofile.cpp1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/webenginewidgets/api/qwebenginedownloaditem.cpp b/src/webenginewidgets/api/qwebenginedownloaditem.cpp
index f97b25431..9bfe1f9fd 100644
--- a/src/webenginewidgets/api/qwebenginedownloaditem.cpp
+++ b/src/webenginewidgets/api/qwebenginedownloaditem.cpp
@@ -91,7 +91,7 @@ void QWebEngineDownloadItemPrivate::update(const BrowserContextAdapterClient::Do
Q_ASSERT(downloadState != QWebEngineDownloadItem::DownloadRequested);
- if (info.state != downloadState) {
+ if (toDownloadState(info.state) != downloadState) {
downloadState = toDownloadState(info.state);
Q_EMIT q->stateChanged(downloadState);
}
diff --git a/src/webenginewidgets/api/qwebengineprofile.cpp b/src/webenginewidgets/api/qwebengineprofile.cpp
index eceee0fd3..8c4dcb59f 100644
--- a/src/webenginewidgets/api/qwebengineprofile.cpp
+++ b/src/webenginewidgets/api/qwebengineprofile.cpp
@@ -91,6 +91,7 @@ QT_BEGIN_NAMESPACE
cancelled by default.
The download item is parented by the profile, but if not accepted
will be deleted immediately after the signal emission.
+ This signal can not be used with a queued connection.
\sa QWebEngineDownloadItem
*/