diff options
author | Pierre Rossi <pierre.rossi@digia.com> | 2013-11-25 15:38:24 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-15 18:26:51 +0100 |
commit | c34b72183e85e7c615ca65381d8591cdca23faf2 (patch) | |
tree | d5359c75cc8178e1f0e07c56aa52f88daba3fa23 /src/webengine | |
parent | 0b611c393e8208af717bd1c5e6c1aed1379d03ca (diff) |
[Widgets] wire the file pickers
Introduce a new version of chooseFiles in QWebEnginePage.
The existing API in WebKit1 seemed a bit dusty in any case (multiple
only supported via extensions).
Changes are:
* oldFile becomes oldFiles, so that we could at a later stage expose
the already selected files in the "multiple" case.
* a type is introduced, for now limited to multiple selection, but
over time, we might consider additions such as directory upload.
Change-Id: I14cfea64ce95e892a0a1877c8cb914c5a421409f
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'src/webengine')
-rw-r--r-- | src/webengine/api/qquickwebengineview_p_p.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h index f43bb17fa..110a1b9b6 100644 --- a/src/webengine/api/qquickwebengineview_p_p.h +++ b/src/webengine/api/qquickwebengineview_p_p.h @@ -46,6 +46,8 @@ #include "web_contents_adapter_client.h" #include <QScopedPointer> +#include <QSharedData> +#include <QtCore/qcompilerdetection.h> #include <QtQuick/private/qquickitem_p.h> class WebContentsAdapter; @@ -125,6 +127,7 @@ public: virtual void close() Q_DECL_OVERRIDE; virtual bool contextMenuRequested(const WebEngineContextMenuData &) Q_DECL_OVERRIDE { return false;} virtual bool javascriptDialog(JavascriptDialogType type, const QString &message, const QString &defaultValue = QString(), QString *result = 0) Q_DECL_OVERRIDE { return false; } + virtual void runFileChooser(FileChooserMode, const QString &defaultFileName, const QStringList &acceptedMimeTypes) { Q_UNUSED(defaultFileName); Q_UNUSED(acceptedMimeTypes);} void setDevicePixelRatio(qreal); |