diff options
Diffstat (limited to 'src')
| m--------- | src/3rdparty | 0 | ||||
| -rw-r--r-- | src/core/gyp_run.pro | 1 | ||||
| -rw-r--r-- | src/webenginewidgets/api/qwebenginepage.cpp | 13 |
3 files changed, 11 insertions, 3 deletions
diff --git a/src/3rdparty b/src/3rdparty -Subproject 41a1a031cd69e187a9608359ffe56652dcaaa6c +Subproject 85827b2c3db3c4cb6308ce8a4c2069c0e403cd9 diff --git a/src/core/gyp_run.pro b/src/core/gyp_run.pro index 4c6eb8c56..3f631302c 100644 --- a/src/core/gyp_run.pro +++ b/src/core/gyp_run.pro @@ -19,6 +19,7 @@ cross_compile { GYP_CONFIG += disable_glibcxx_debug=1 !webcore_debug: GYP_CONFIG += remove_webcore_debug_symbols=1 +!v8base_debug: GYP_CONFIG += remove_v8base_debug_symbols=1 linux:contains(QT_CONFIG, separate_debug_info): GYP_CONFIG += linux_dump_symbols=1 diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp index 1b5a243df..6207a2b30 100644 --- a/src/webenginewidgets/api/qwebenginepage.cpp +++ b/src/webenginewidgets/api/qwebenginepage.cpp @@ -1050,20 +1050,27 @@ QStringList QWebEnginePage::chooseFiles(FileSelectionMode mode, const QStringLis // can work with) and mimetypes ranging from text/plain or images/* to application/vnd.openxmlformats-officedocument.spreadsheetml.sheet Q_UNUSED(acceptedMimeTypes); QStringList ret; + QString str; switch (static_cast<WebContentsAdapterClient::FileChooserMode>(mode)) { case WebContentsAdapterClient::OpenMultiple: ret = QFileDialog::getOpenFileNames(view(), QString()); break; // Chromium extension, not exposed as part of the public API for now. case WebContentsAdapterClient::UploadFolder: - ret << QFileDialog::getExistingDirectory(view(), tr("Select folder to upload")) + QLatin1Char('/'); + str = QFileDialog::getExistingDirectory(view(), tr("Select folder to upload")) + QLatin1Char('/'); + if (!str.isNull()) + ret << str; break; case WebContentsAdapterClient::Save: - ret << QFileDialog::getSaveFileName(view(), QString(), (QStandardPaths::writableLocation(QStandardPaths::DownloadLocation) + oldFiles.first())); + str = QFileDialog::getSaveFileName(view(), QString(), (QStandardPaths::writableLocation(QStandardPaths::DownloadLocation) + oldFiles.first())); + if (!str.isNull()) + ret << str; break; default: case WebContentsAdapterClient::Open: - ret << QFileDialog::getOpenFileName(view(), QString(), oldFiles.first()); + str = QFileDialog::getOpenFileName(view(), QString(), oldFiles.first()); + if (!str.isNull()) + ret << str; break; } return ret; |