diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-11 12:22:47 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-11 12:22:47 +0200 |
commit | 7af0066e50aa4c73cadafe2d47bc368a5b0187f6 (patch) | |
tree | fe14e48add32c08ef4b5559a798caf99e449a29a | |
parent | 22b7690e45c776d01d4d8b52fb13d52c99f2abaa (diff) | |
parent | 8bbdfa215c81869a1b23a1d882a58bb5734f6b2d (diff) | |
download | qtwebengine-7af0066e50aa4c73cadafe2d47bc368a5b0187f6.tar.gz |
Merge remote-tracking branch 'origin/5.9.5' into 5.9
Change-Id: I0a7859721eb178cc774f89c7196406f54bed9a40
-rw-r--r-- | dist/changes-5.9.5 | 85 | ||||
m--------- | src/3rdparty | 0 | ||||
-rw-r--r-- | src/core/download_manager_delegate_qt.cpp | 20 | ||||
-rw-r--r-- | src/core/download_manager_delegate_qt.h | 2 |
4 files changed, 107 insertions, 0 deletions
diff --git a/dist/changes-5.9.5 b/dist/changes-5.9.5 new file mode 100644 index 000000000..ff07eb586 --- /dev/null +++ b/dist/changes-5.9.5 @@ -0,0 +1,85 @@ +Qt 5.9.5 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.9.0. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + +http://doc.qt.io/qt-5/index.html + +The Qt version 5.9 series is binary compatible with the 5.8.x series. +Applications compiled for 5.9 will continue to run with 5.9. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + +https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + +**************************************************************************** +* Qt 5.9.5 Changes * +**************************************************************************** + +Chromium +-------- + + - SharedWorkers have been disabled as they have been changed in the newest + spec for security reasons. + - Security fixes from Chromium up to version 65.0.3325.146 + + * CVE-2017-15429 + * CVE-2018-6031 + * CVE-2018-6033 + * CVE-2018-6034 + * CVE-2018-6037 + * CVE-2018-6038 + * CVE-2018-6040 + * CVE-2018-6047 + * CVE-2018-6048 + * CVE-2018-6051 + * CVE-2018-6052 + * CVE-2018-6054 + * CVE-2018-6060 + * CVE-2018-6062 + * CVE-2018-6064 + * CVE-2018-6069 + * CVE-2018-6071 + * CVE-2018-6073 + * CVE-2018-6076 + * CVE-2018-6079 + * CVE-2018-6081 + * CVE-2018-6082 + * Security Bug 770734 + * Security Bug 774833 + * Security Bug 798410 + * Security Bug 789764 + * Security Bug 806122 + +General +------- + + - [QTBUG-65942] Fixed crash when accessing WebEngineView properties too early. + - [QTBUG-62640] Changed value of QWebEngineDownloadItem::downloadType() for + explicit downloads to QWebEngineDownloadItem::UserRequested. + - [QTBUG-66081] Fixed crashes on shutdown. + +Build System +------------ + + - [QTBUG-62944] Rename "icu" feature to "webengine-icu" to avoid a clash with + the qtbase feature of the same name. + - Fixed order problem that could result in missing toolchain generated files + when building the module. + +Platform Specific Changes +------------------------- + + - Linux + * [QTBUG-66346] Fixed an issue with packaging of QtWebEngineProcess executable + using an qt.conf file. + * Fixed incorrect GLX pbuffer attributes terminator that was causing issues + with mesa driver. + + - Windows + * [QTBUG-60705] Fixed issues with too large scrollbars on Hi-DPI monitors. diff --git a/src/3rdparty b/src/3rdparty -Subproject 1886901d4cbe2b0e041ceb1e405ff66eec2c54f +Subproject 4f2e755be232c9083108e55a30876a19b67e25d diff --git a/src/core/download_manager_delegate_qt.cpp b/src/core/download_manager_delegate_qt.cpp index 0eabd340c..33faa361c 100644 --- a/src/core/download_manager_delegate_qt.cpp +++ b/src/core/download_manager_delegate_qt.cpp @@ -270,6 +270,26 @@ void DownloadManagerDelegateQt::ChooseSavePath(content::WebContents *web_content m_weakPtrFactory.GetWeakPtr())); } +bool DownloadManagerDelegateQt::IsMostRecentDownloadItemAtFilePath(content::DownloadItem *download) +{ + content::BrowserContext *context = download->GetBrowserContext(); + std::vector<content::DownloadItem*> all_downloads; + + content::DownloadManager* manager = + content::BrowserContext::GetDownloadManager(context); + if (manager) + manager->GetAllDownloads(&all_downloads); + + for (const auto* item : all_downloads) { + if (item->GetGuid() == download->GetGuid() || + item->GetTargetFilePath() != download->GetTargetFilePath()) + continue; + if (item->GetState() == content::DownloadItem::IN_PROGRESS) + return false; + } + return true; +} + void DownloadManagerDelegateQt::savePackageDownloadCreated(content::DownloadItem *item) { OnDownloadUpdated(item); diff --git a/src/core/download_manager_delegate_qt.h b/src/core/download_manager_delegate_qt.h index d23a78b0b..7eaf4bafe 100644 --- a/src/core/download_manager_delegate_qt.h +++ b/src/core/download_manager_delegate_qt.h @@ -81,6 +81,8 @@ public: const base::FilePath::StringType &default_extension, bool can_save_as_complete, const content::SavePackagePathPickedCallback &callback) override; + bool IsMostRecentDownloadItemAtFilePath(content::DownloadItem* download) override; + void cancelDownload(quint32 downloadId); |