diff options
| author | Szabolcs David <davidsz@inf.u-szeged.hu> | 2017-06-02 11:51:36 +0200 |
|---|---|---|
| committer | Szabolcs David <davidsz@inf.u-szeged.hu> | 2017-06-16 08:14:43 +0000 |
| commit | f6fab6e40a44b28bf908fb7e89d7c47dfb87bf43 (patch) | |
| tree | 9cf82f7dfd30f741505d1f6c88eec6f2724461ce /src/webenginewidgets | |
| parent | bb3f7ba2f6d10abde885904eea8bca9bee8554d6 (diff) | |
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>
Diffstat (limited to 'src/webenginewidgets')
| -rw-r--r-- | src/webenginewidgets/api/qwebenginepage.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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; |