diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-04-11 09:05:49 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-04-11 15:33:49 +0000 |
commit | 22a550303618202135e58f5673e7b8935d578687 (patch) | |
tree | 560918164edd7b76a2a8b6246f6dbca0ee69cf9a /src/webengine/api/qquickwebenginedownloaditem.cpp | |
parent | f8ed4ca51333157170f0fc94e2deff0d91cf4833 (diff) | |
parent | 7978feadee937299798372bced1680f52b4b1842 (diff) |
Merge "Merge branch '5.6' into 5.7" into refs/staging/5.7v5.7.0-beta1
Diffstat (limited to 'src/webengine/api/qquickwebenginedownloaditem.cpp')
-rw-r--r-- | src/webengine/api/qquickwebenginedownloaditem.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/webengine/api/qquickwebenginedownloaditem.cpp b/src/webengine/api/qquickwebenginedownloaditem.cpp index ffbff95f0..c26255e3a 100644 --- a/src/webengine/api/qquickwebenginedownloaditem.cpp +++ b/src/webengine/api/qquickwebenginedownloaditem.cpp @@ -222,6 +222,7 @@ qint64 QQuickWebEngineDownloadItem::receivedBytes() const /*! \qmlproperty QString WebEngineDownloadItem::mimeType + \since QtWebEngine 1.2 Holds the MIME type of the download. */ |