Move QWebEngineDownloadItem to QtWebEngineCore

Use QWebEngineDownloadItem class in qml instead of
QQuickWebEngineDonloadItem.

Change-Id: I0fc9595f8675c9b082be873adead6de3df1e669d
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

1 files changed, 74 insertions, 75 deletions

diff --git a/tests/auto/quick/publicapi/tst_publicapi.cpp b/tests/auto/quick/publicapi/tst_publicapi.cpp
index 47ba7b2de..3e24632e0 100644
--- a/tests/auto/quick/publicapi/tst_publicapi.cpp
+++ b/tests/auto/quick/publicapi/tst_publicapi.cpp
@@ -41,11 +41,11 @@
 #include <QtWebEngineCore/QWebEngineQuotaRequest>
 #include <QtWebEngineCore/QWebEngineRegisterProtocolHandlerRequest>
 #include <QtWebEngineCore/QWebEngineContextMenuRequest>
+#include <QtWebEngineCore/QWebEngineDownloadItem>
 #include <private/qquickwebengineview_p.h>
 #include <private/qquickwebengineaction_p.h>
 #include <private/qquickwebengineclientcertificateselection_p.h>
 #include <private/qquickwebenginedialogrequests_p.h>
-#include <private/qquickwebenginedownloaditem_p.h>
 #include <private/qquickwebenginehistory_p.h>
 #include <private/qquickwebengineloadrequest_p.h>
 #include <private/qquickwebenginenavigationrequest_p.h>
@@ -64,7 +64,7 @@ static const QList<const QMetaObject *> typesToCheck = QList<const QMetaObject *
     << &QQuickWebEngineAction::staticMetaObject
     << &QQuickWebEngineClientCertificateOption::staticMetaObject
     << &QQuickWebEngineClientCertificateSelection::staticMetaObject
-    << &QQuickWebEngineDownloadItem::staticMetaObject
+    << &QWebEngineDownloadItem::staticMetaObject
     << &QQuickWebEngineHistory::staticMetaObject
     << &QQuickWebEngineHistoryListModel::staticMetaObject
     << &QQuickWebEngineLoadRequest::staticMetaObject
@@ -199,77 +199,76 @@ static const QStringList expectedAPI = QStringList()
     << "QWebEngineContextMenuRequest.selectedText --> QString"
     << "QWebEngineContextMenuRequest.spellCheckerSuggestions --> QStringList"
     << "QWebEngineContextMenuRequest.position --> QPoint"
-    << "QQuickWebEngineDownloadItem.Attachment --> DownloadType"
-    << "QQuickWebEngineDownloadItem.CompleteHtmlSaveFormat --> SavePageFormat"
-    << "QQuickWebEngineDownloadItem.DownloadAttribute --> DownloadType"
-    << "QQuickWebEngineDownloadItem.DownloadCancelled --> DownloadState"
-    << "QQuickWebEngineDownloadItem.DownloadCompleted --> DownloadState"
-    << "QQuickWebEngineDownloadItem.DownloadInProgress --> DownloadState"
-    << "QQuickWebEngineDownloadItem.DownloadInterrupted --> DownloadState"
-    << "QQuickWebEngineDownloadItem.DownloadRequested --> DownloadState"
-    << "QQuickWebEngineDownloadItem.FileAccessDenied --> DownloadInterruptReason"
-    << "QQuickWebEngineDownloadItem.FileBlocked --> DownloadInterruptReason"
-    << "QQuickWebEngineDownloadItem.FileFailed --> DownloadInterruptReason"
-    << "QQuickWebEngineDownloadItem.FileHashMismatch --> DownloadInterruptReason"
-    << "QQuickWebEngineDownloadItem.FileNameTooLong --> DownloadInterruptReason"
-    << "QQuickWebEngineDownloadItem.FileNoSpace --> DownloadInterruptReason"
-    << "QQuickWebEngineDownloadItem.FileSecurityCheckFailed --> DownloadInterruptReason"
-    << "QQuickWebEngineDownloadItem.FileTooLarge --> DownloadInterruptReason"
-    << "QQuickWebEngineDownloadItem.FileTooShort --> DownloadInterruptReason"
-    << "QQuickWebEngineDownloadItem.FileTransientError --> DownloadInterruptReason"
-    << "QQuickWebEngineDownloadItem.FileVirusInfected --> DownloadInterruptReason"
-    << "QQuickWebEngineDownloadItem.MimeHtmlSaveFormat --> SavePageFormat"
-    << "QQuickWebEngineDownloadItem.NetworkDisconnected --> DownloadInterruptReason"
-    << "QQuickWebEngineDownloadItem.NetworkFailed --> DownloadInterruptReason"
-    << "QQuickWebEngineDownloadItem.NetworkInvalidRequest --> DownloadInterruptReason"
-    << "QQuickWebEngineDownloadItem.NetworkServerDown --> DownloadInterruptReason"
-    << "QQuickWebEngineDownloadItem.NetworkTimeout --> DownloadInterruptReason"
-    << "QQuickWebEngineDownloadItem.NoReason --> DownloadInterruptReason"
-    << "QQuickWebEngineDownloadItem.SavePage --> DownloadType"
-    << "QQuickWebEngineDownloadItem.ServerBadContent --> DownloadInterruptReason"
-    << "QQuickWebEngineDownloadItem.ServerCertProblem --> DownloadInterruptReason"
-    << "QQuickWebEngineDownloadItem.ServerFailed --> DownloadInterruptReason"
-    << "QQuickWebEngineDownloadItem.ServerForbidden --> DownloadInterruptReason"
-    << "QQuickWebEngineDownloadItem.ServerUnauthorized --> DownloadInterruptReason"
-    << "QQuickWebEngineDownloadItem.ServerUnreachable --> DownloadInterruptReason"
-    << "QQuickWebEngineDownloadItem.SingleHtmlSaveFormat --> SavePageFormat"
-    << "QQuickWebEngineDownloadItem.UnknownSaveFormat --> SavePageFormat"
-    << "QQuickWebEngineDownloadItem.UserCanceled --> DownloadInterruptReason"
-    << "QQuickWebEngineDownloadItem.UserRequested --> DownloadType"
-    << "QQuickWebEngineDownloadItem.accept() --> void"
-    << "QQuickWebEngineDownloadItem.cancel() --> void"
-    << "QQuickWebEngineDownloadItem.id --> uint"
-    << "QQuickWebEngineDownloadItem.interruptReason --> DownloadInterruptReason"
-    << "QQuickWebEngineDownloadItem.interruptReasonChanged() --> void"
-    << "QQuickWebEngineDownloadItem.interruptReasonString --> QString"
-    << "QQuickWebEngineDownloadItem.isFinished --> bool"
-    << "QQuickWebEngineDownloadItem.isFinishedChanged() --> void"
-    << "QQuickWebEngineDownloadItem.isPaused --> bool"
-    << "QQuickWebEngineDownloadItem.isPausedChanged() --> void"
-    << "QQuickWebEngineDownloadItem.isSavePageDownload --> bool"
-    << "QQuickWebEngineDownloadItem.mimeType --> QString"
-    << "QQuickWebEngineDownloadItem.mimeTypeChanged() --> void"
-    << "QQuickWebEngineDownloadItem.path --> QString"
-    << "QQuickWebEngineDownloadItem.pathChanged() --> void"
-    << "QQuickWebEngineDownloadItem.pause() --> void"
-    << "QQuickWebEngineDownloadItem.receivedBytes --> qlonglong"
-    << "QQuickWebEngineDownloadItem.receivedBytesChanged() --> void"
-    << "QQuickWebEngineDownloadItem.resume() --> void"
-    << "QQuickWebEngineDownloadItem.savePageFormat --> SavePageFormat"
-    << "QQuickWebEngineDownloadItem.savePageFormatChanged() --> void"
-    << "QQuickWebEngineDownloadItem.state --> DownloadState"
-    << "QQuickWebEngineDownloadItem.stateChanged() --> void"
-    << "QQuickWebEngineDownloadItem.totalBytes --> qlonglong"
-    << "QQuickWebEngineDownloadItem.totalBytesChanged() --> void"
-    << "QQuickWebEngineDownloadItem.type --> DownloadType"
-    << "QQuickWebEngineDownloadItem.typeChanged() --> void"
-    << "QQuickWebEngineDownloadItem.view --> QQuickWebEngineView*"
-    << "QQuickWebEngineDownloadItem.url --> QUrl"
-    << "QQuickWebEngineDownloadItem.suggestedFileName --> QString"
-    << "QQuickWebEngineDownloadItem.downloadDirectory --> QString"
-    << "QQuickWebEngineDownloadItem.downloadDirectoryChanged() --> void"
-    << "QQuickWebEngineDownloadItem.downloadFileName --> QString"
-    << "QQuickWebEngineDownloadItem.downloadFileNameChanged() --> void"
+    << "QWebEngineDownloadItem.Attachment --> DownloadType"
+    << "QWebEngineDownloadItem.CompleteHtmlSaveFormat --> SavePageFormat"
+    << "QWebEngineDownloadItem.DownloadAttribute --> DownloadType"
+    << "QWebEngineDownloadItem.DownloadCancelled --> DownloadState"
+    << "QWebEngineDownloadItem.DownloadCompleted --> DownloadState"
+    << "QWebEngineDownloadItem.DownloadInProgress --> DownloadState"
+    << "QWebEngineDownloadItem.DownloadInterrupted --> DownloadState"
+    << "QWebEngineDownloadItem.DownloadRequested --> DownloadState"
+    << "QWebEngineDownloadItem.FileAccessDenied --> DownloadInterruptReason"
+    << "QWebEngineDownloadItem.FileBlocked --> DownloadInterruptReason"
+    << "QWebEngineDownloadItem.FileFailed --> DownloadInterruptReason"
+    << "QWebEngineDownloadItem.FileHashMismatch --> DownloadInterruptReason"
+    << "QWebEngineDownloadItem.FileNameTooLong --> DownloadInterruptReason"
+    << "QWebEngineDownloadItem.FileNoSpace --> DownloadInterruptReason"
+    << "QWebEngineDownloadItem.FileSecurityCheckFailed --> DownloadInterruptReason"
+    << "QWebEngineDownloadItem.FileTooLarge --> DownloadInterruptReason"
+    << "QWebEngineDownloadItem.FileTooShort --> DownloadInterruptReason"
+    << "QWebEngineDownloadItem.FileTransientError --> DownloadInterruptReason"
+    << "QWebEngineDownloadItem.FileVirusInfected --> DownloadInterruptReason"
+    << "QWebEngineDownloadItem.MimeHtmlSaveFormat --> SavePageFormat"
+    << "QWebEngineDownloadItem.NetworkDisconnected --> DownloadInterruptReason"
+    << "QWebEngineDownloadItem.NetworkFailed --> DownloadInterruptReason"
+    << "QWebEngineDownloadItem.NetworkInvalidRequest --> DownloadInterruptReason"
+    << "QWebEngineDownloadItem.NetworkServerDown --> DownloadInterruptReason"
+    << "QWebEngineDownloadItem.NetworkTimeout --> DownloadInterruptReason"
+    << "QWebEngineDownloadItem.NoReason --> DownloadInterruptReason"
+    << "QWebEngineDownloadItem.SavePage --> DownloadType"
+    << "QWebEngineDownloadItem.ServerBadContent --> DownloadInterruptReason"
+    << "QWebEngineDownloadItem.ServerCertProblem --> DownloadInterruptReason"
+    << "QWebEngineDownloadItem.ServerFailed --> DownloadInterruptReason"
+    << "QWebEngineDownloadItem.ServerForbidden --> DownloadInterruptReason"
+    << "QWebEngineDownloadItem.ServerUnauthorized --> DownloadInterruptReason"
+    << "QWebEngineDownloadItem.ServerUnreachable --> DownloadInterruptReason"
+    << "QWebEngineDownloadItem.SingleHtmlSaveFormat --> SavePageFormat"
+    << "QWebEngineDownloadItem.UnknownSaveFormat --> SavePageFormat"
+    << "QWebEngineDownloadItem.UserCanceled --> DownloadInterruptReason"
+    << "QWebEngineDownloadItem.UserRequested --> DownloadType"
+    << "QWebEngineDownloadItem.accept() --> void"
+    << "QWebEngineDownloadItem.cancel() --> void"
+    << "QWebEngineDownloadItem.id --> uint"
+    << "QWebEngineDownloadItem.interruptReason --> DownloadInterruptReason"
+    << "QWebEngineDownloadItem.interruptReasonChanged() --> void"
+    << "QWebEngineDownloadItem.interruptReasonString --> QString"
+    << "QWebEngineDownloadItem.isFinished --> bool"
+    << "QWebEngineDownloadItem.isFinishedChanged() --> void"
+    << "QWebEngineDownloadItem.isPaused --> bool"
+    << "QWebEngineDownloadItem.isPausedChanged() --> void"
+    << "QWebEngineDownloadItem.isSavePageDownload --> bool"
+    << "QWebEngineDownloadItem.mimeType --> QString"
+    << "QWebEngineDownloadItem.path --> QString"
+    << "QWebEngineDownloadItem.pathChanged() --> void"
+    << "QWebEngineDownloadItem.pause() --> void"
+    << "QWebEngineDownloadItem.receivedBytes --> qlonglong"
+    << "QWebEngineDownloadItem.receivedBytesChanged() --> void"
+    << "QWebEngineDownloadItem.resume() --> void"
+    << "QWebEngineDownloadItem.savePageFormat --> SavePageFormat"
+    << "QWebEngineDownloadItem.savePageFormatChanged() --> void"
+    << "QWebEngineDownloadItem.state --> DownloadState"
+    << "QWebEngineDownloadItem.stateChanged(QWebEngineDownloadItem::DownloadState) --> void"
+    << "QWebEngineDownloadItem.totalBytes --> qlonglong"
+    << "QWebEngineDownloadItem.totalBytesChanged() --> void"
+    << "QWebEngineDownloadItem.type --> DownloadType"
+    // FIXME << "QWebEngineDownloadItem.view --> QQuickWebEngineView*"
+    << "QWebEngineDownloadItem.url --> QUrl"
+    << "QWebEngineDownloadItem.suggestedFileName --> QString"
+    << "QWebEngineDownloadItem.downloadDirectory --> QString"
+    << "QWebEngineDownloadItem.downloadDirectoryChanged() --> void"
+    << "QWebEngineDownloadItem.downloadFileName --> QString"
+    << "QWebEngineDownloadItem.downloadFileNameChanged() --> void"
+    << "QWebEngineDownloadItem.downloadProgress(qlonglong,qlonglong) --> void" // FIXME
     << "QQuickWebEngineFileDialogRequest.FileModeOpen --> FileMode"
     << "QQuickWebEngineFileDialogRequest.FileModeOpenMultiple --> FileMode"
     << "QQuickWebEngineFileDialogRequest.FileModeSave --> FileMode"
@@ -341,8 +340,8 @@ static const QStringList expectedAPI = QStringList()
     << "QQuickWebEngineProfile.cachePath --> QString"
     << "QQuickWebEngineProfile.cachePathChanged() --> void"
     << "QQuickWebEngineProfile.clearHttpCache() --> void"
-    << "QQuickWebEngineProfile.downloadFinished(QQuickWebEngineDownloadItem*) --> void"
-    << "QQuickWebEngineProfile.downloadRequested(QQuickWebEngineDownloadItem*) --> void"
+    << "QQuickWebEngineProfile.downloadFinished(QWebEngineDownloadItem*) --> void"
+    << "QQuickWebEngineProfile.downloadRequested(QWebEngineDownloadItem*) --> void"
     << "QQuickWebEngineProfile.downloadPath --> QString"
     << "QQuickWebEngineProfile.downloadPathChanged() --> void"
     << "QQuickWebEngineProfile.presentNotification(QWebEngineNotification*) --> void"