diff options
| author | Balazs Egedi <egedib@inf.u-szeged.hu> | 2021-05-11 13:44:37 +0200 |
|---|---|---|
| committer | Balazs Egedi <egedib@inf.u-szeged.hu> | 2021-05-31 19:48:44 +0000 |
| commit | e648cd13290973ce30c5ff48574cb0f37f47c495 (patch) | |
| tree | 6f8620f855fb60853603aa8d7b415b37151b20fc /src | |
| parent | 3757bedc75d0d1fe6228d169dfd4e7865b6c0398 (diff) | |
Add missing FileSelectionMode enum value
FileSelectUploadFolder value is added.
Change-Id: Ie69782234bcbf3460d2999ac08ee9f88dea190c7
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/api/qwebenginepage.cpp | 1 | ||||
| -rw-r--r-- | src/core/api/qwebenginepage.h | 1 | ||||
| -rw-r--r-- | src/webenginewidgets/api/qwebengineview.cpp | 1 | ||||
| -rw-r--r-- | src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc | 2 |
4 files changed, 4 insertions, 1 deletions
diff --git a/src/core/api/qwebenginepage.cpp b/src/core/api/qwebenginepage.cpp index afb2eedda..e96763f5d 100644 --- a/src/core/api/qwebenginepage.cpp +++ b/src/core/api/qwebenginepage.cpp @@ -2130,6 +2130,7 @@ void QWebEnginePage::setDevToolsPage(QWebEnginePage *devToolsPage) ASSERT_ENUMS_MATCH(FilePickerController::Open, QWebEnginePage::FileSelectOpen) ASSERT_ENUMS_MATCH(FilePickerController::OpenMultiple, QWebEnginePage::FileSelectOpenMultiple) +ASSERT_ENUMS_MATCH(FilePickerController::UploadFolder, QWebEnginePage::FileSelectUploadFolder) // TODO: remove virtuals QStringList QWebEnginePage::chooseFiles(FileSelectionMode mode, const QStringList &oldFiles, const QStringList &acceptedMimeTypes) diff --git a/src/core/api/qwebenginepage.h b/src/core/api/qwebenginepage.h index 9ccf8c917..d1838e51c 100644 --- a/src/core/api/qwebenginepage.h +++ b/src/core/api/qwebenginepage.h @@ -206,6 +206,7 @@ public: enum FileSelectionMode { FileSelectOpen, FileSelectOpenMultiple, + FileSelectUploadFolder, }; Q_ENUM(FileSelectionMode) diff --git a/src/webenginewidgets/api/qwebengineview.cpp b/src/webenginewidgets/api/qwebengineview.cpp index 1d099aa30..96f1bd650 100644 --- a/src/webenginewidgets/api/qwebengineview.cpp +++ b/src/webenginewidgets/api/qwebengineview.cpp @@ -207,7 +207,6 @@ QStringList QWebEngineViewPrivate::chooseFiles(QWebEnginePage::FileSelectionMode filter.join(QStringLiteral(";;")), nullptr, QFileDialog::HideNameFilterDetails); break; - // Chromium extension, not exposed as part of the public API for now. case QtWebEngineCore::FilePickerController::UploadFolder: str = QFileDialog::getExistingDirectory(q, QObject::tr("Select folder to upload")); if (!str.isNull()) diff --git a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc index 9c9f40f74..56a352979 100644 --- a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc +++ b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc @@ -250,6 +250,8 @@ Return only one file name. \value FileSelectOpenMultiple Return multiple file names. + \value FileSelectUploadFolder + Allows users to specify a single existing folder for upload. \sa chooseFiles() */ |