2 files changed, 17 insertions, 4 deletions
diff --git a/src/webengine/api/qquickwebenginedownloaditem.cpp b/src/webengine/api/qquickwebenginedownloaditem.cpp
index b69e6b7da..7d1382876 100644
--- a/src/webengine/api/qquickwebenginedownloaditem.cpp
+++ b/src/webengine/api/qquickwebenginedownloaditem.cpp
@@ -185,10 +185,8 @@ void QQuickWebEngineDownloadItemPrivate::update(const ProfileAdapterClient::Down
         Q_EMIT q->totalBytesChanged();
     }
 
-    if (info.done != downloadFinished) {
-        downloadFinished = info.done;
-        Q_EMIT q->isFinishedChanged();
-    }
+    if (info.done)
+        setFinished();
 
     if (info.paused != downloadPaused) {
         downloadPaused = info.paused;
@@ -206,6 +204,17 @@ void QQuickWebEngineDownloadItemPrivate::updateState(QQuickWebEngineDownloadItem
     }
 }
 
+void QQuickWebEngineDownloadItemPrivate::setFinished()
+{
+    Q_Q(QQuickWebEngineDownloadItem);
+
+    if (downloadFinished)
+        return;
+
+    downloadFinished = true;
+    Q_EMIT q->isFinishedChanged();
+}
+
 /*!
     \qmlmethod void WebEngineDownloadItem::accept()
 
@@ -255,6 +264,7 @@ void QQuickWebEngineDownloadItem::cancel()
         return;
 
     d->updateState(QQuickWebEngineDownloadItem::DownloadCancelled);
+    d->setFinished();
 
     // We directly cancel the download if the user cancels before
     // it even started, so no need to notify the profile here.
@@ -617,6 +627,8 @@ QQuickWebEngineDownloadItem::QQuickWebEngineDownloadItem(QQuickWebEngineDownload
 
 QQuickWebEngineDownloadItem::~QQuickWebEngineDownloadItem()
 {
+    if (!isFinished())
+        cancel();
     if (d_ptr->profile)
         d_ptr->profile->d_ptr->profileAdapter()->removeDownload(d_ptr->downloadId);
 }
diff --git a/src/webengine/api/qquickwebenginedownloaditem_p_p.h b/src/webengine/api/qquickwebenginedownloaditem_p_p.h
index 4b89335bd..f444c04a5 100644
--- a/src/webengine/api/qquickwebenginedownloaditem_p_p.h
+++ b/src/webengine/api/qquickwebenginedownloaditem_p_p.h
@@ -85,6 +85,7 @@ public:
 
     void update(const QtWebEngineCore::ProfileAdapterClient::DownloadItemInfo &info);
     void updateState(QQuickWebEngineDownloadItem::DownloadState newState);
+    void setFinished();
 };
 
 QT_END_NAMESPACE