diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-02-19 13:27:34 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-02-19 13:27:34 +0100 |
| commit | 1e204ff6e91227de3bd2f105a1efbaf47ee2b5aa (patch) | |
| tree | 1609ebd46902d5c568d3df08e593ff2b5919cbbc /src/core | |
| parent | 18b0081aeda8fcd5c2d756c47bdd63cb7f89e891 (diff) | |
| parent | 8b048ef2ba4e8414f4852f791964878a6dc3f00f (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Blacklisted one test requiring an update of qt5.git.
Conflicts:
.qmake.conf
Change-Id: I75e55a1c5f8840cde55ddb60d632287b2affadeb
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/file_picker_controller.cpp | 3 | ||||
| -rw-r--r-- | src/core/web_contents_delegate_qt.cpp | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/core/file_picker_controller.cpp b/src/core/file_picker_controller.cpp index 13e9437d2..62e02e126 100644 --- a/src/core/file_picker_controller.cpp +++ b/src/core/file_picker_controller.cpp @@ -172,6 +172,9 @@ QStringList FilePickerController::nameFilters(const QStringList &acceptedMimeTyp QStringList acceptedGlobs; QMimeDatabase mimeDatabase; + if (acceptedMimeTypes.isEmpty()) + return nameFilters; + for (QString type : acceptedMimeTypes) { if (type.startsWith(".")) { // A single suffix diff --git a/src/core/web_contents_delegate_qt.cpp b/src/core/web_contents_delegate_qt.cpp index 078b34d64..f409d8a7c 100644 --- a/src/core/web_contents_delegate_qt.cpp +++ b/src/core/web_contents_delegate_qt.cpp @@ -198,7 +198,10 @@ void WebContentsDelegateQt::NavigationStateChanged(content::WebContents* source, QString newTitle = toQt(source->GetTitle()); if (m_title != newTitle) { m_title = newTitle; - m_viewClient->titleChanged(m_title); + QTimer::singleShot(0, [delegate = AsWeakPtr(), title = newTitle] () { + if (delegate) + delegate->adapterClient()->titleChanged(title); + }); } } |