From f6fab6e40a44b28bf908fb7e89d7c47dfb87bf43 Mon Sep 17 00:00:00 2001
From: Szabolcs David <davidsz@inf.u-szeged.hu>
Date: Fri, 2 Jun 2017 11:51:36 +0200
Subject: [PATCH] Fix cancellation of UploadFolder dialogs
Remove the extra "/" element from the list of results and pass
an empty file list to the backend.
Task-number: QTBUG-61186
Change-Id: Ib2c577c15502e8d1506948e9683921ed211b9c48
Reviewed-by: Viktor Engelmann <viktor.engelmann@qt.io>
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
src/webenginewidgets/api/qwebenginepage.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp
index 416b3a5a2..0045cc7f9 100644
--- a/src/webenginewidgets/api/qwebenginepage.cpp
+++ b/src/webenginewidgets/api/qwebenginepage.cpp
@@ -1896,7 +1896,7 @@ QStringList QWebEnginePage::chooseFiles(FileSelectionMode mode, const QStringLis
break;
// Chromium extension, not exposed as part of the public API for now.
case FilePickerController::UploadFolder:
- str = QFileDialog::getExistingDirectory(view(), tr("Select folder to upload")) + QLatin1Char('/');
+ str = QFileDialog::getExistingDirectory(view(), tr("Select folder to upload"));
if (!str.isNull())
ret << str;
break;
--
GitLab