diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-24 06:47:37 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-24 06:47:37 +0200 |
| commit | 712c1078dc8008445b95e09611f10670ae3d307f (patch) | |
| tree | 6449248f027a943ca88190d888aea8ed417e85a6 /src/webengine/api/qquickwebenginedownloaditem.cpp | |
| parent | a301473c4bd2a2956ea4986679b4a80f01bce2d9 (diff) | |
| parent | 36feb681a97b3dd690a54d2eafd58081036992f1 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/webengine/api/qquickwebenginesettings.cpp
Change-Id: Ib7e2a7558c685410c49c455218d3b9c30f32358f
Diffstat (limited to 'src/webengine/api/qquickwebenginedownloaditem.cpp')
| -rw-r--r-- | src/webengine/api/qquickwebenginedownloaditem.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/webengine/api/qquickwebenginedownloaditem.cpp b/src/webengine/api/qquickwebenginedownloaditem.cpp index a8467d656..9f0c747f9 100644 --- a/src/webengine/api/qquickwebenginedownloaditem.cpp +++ b/src/webengine/api/qquickwebenginedownloaditem.cpp @@ -162,7 +162,7 @@ void QQuickWebEngineDownloadItem::cancel() } /*! - \qmlproperty quint32 WebEngineDownloadItem::id + \qmlproperty int WebEngineDownloadItem::id Holds the download item's ID. */ @@ -221,7 +221,7 @@ qint64 QQuickWebEngineDownloadItem::receivedBytes() const } /*! - \qmlproperty QString WebEngineDownloadItem::mimeType + \qmlproperty string WebEngineDownloadItem::mimeType \since QtWebEngine 1.2 Holds the MIME type of the download. @@ -234,7 +234,7 @@ QString QQuickWebEngineDownloadItem::mimeType() const } /*! - \qmlproperty QString WebEngineDownloadItem::path + \qmlproperty string WebEngineDownloadItem::path Holds the full target path where data is being downloaded to. |