diff options
| author | Pierre Rossi <pierre.rossi@digia.com> | 2014-01-21 15:42:56 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-19 15:48:07 +0100 |
| commit | 548c7eb37456c13fa16ca286016434cdcbdcf96a (patch) | |
| tree | ca7f3e538fa36206638955f908df6565d67a95d0 /src/webengine/api/qquickwebengineview_p_p.h | |
| parent | 09910d11219b7b17d6044671f51a769335c4797e (diff) | |
QtQuick: add runJavaScript.
Much like the widgets version.
This should be helpful to start testing QWebChannel integration.
Includes a very basic autotest that checks both approaches (with or
without callback) through the view's title property.
Change-Id: Id9c3e3736f36d53cecf1dd52e8811c4b921dcf08
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'src/webengine/api/qquickwebengineview_p_p.h')
| -rw-r--r-- | src/webengine/api/qquickwebengineview_p_p.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h index ce8b64001..5c75f7780 100644 --- a/src/webengine/api/qquickwebengineview_p_p.h +++ b/src/webengine/api/qquickwebengineview_p_p.h @@ -87,12 +87,13 @@ class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineViewExperimental : public QObjec public: void setIsFullScreen(bool fullscreen); bool isFullScreen() const; - -public Q_SLOTS: QQuickWebEngineViewport *viewport() const; void setExtraContextMenuEntriesComponent(QQmlComponent *); QQmlComponent *extraContextMenuEntriesComponent() const; +public Q_SLOTS: + void runJavaScript(const QString&, const QJSValue & = QJSValue()); + Q_SIGNALS: void newViewRequested(QQuickWebEngineNewViewRequest *request); void fullScreenRequested(bool fullScreen); @@ -138,7 +139,7 @@ public: virtual bool contextMenuRequested(const WebEngineContextMenuData &) Q_DECL_OVERRIDE; virtual void javascriptDialog(QSharedPointer<JavaScriptDialogController>) Q_DECL_OVERRIDE; virtual void runFileChooser(FileChooserMode, const QString &defaultFileName, const QStringList &acceptedMimeTypes) Q_DECL_OVERRIDE; - virtual void didRunJavaScript(quint64, const QVariant&) Q_DECL_OVERRIDE { } + virtual void didRunJavaScript(quint64, const QVariant&) Q_DECL_OVERRIDE; virtual void didFetchDocumentMarkup(quint64, const QString&) Q_DECL_OVERRIDE { } virtual void didFetchDocumentInnerText(quint64, const QString&) Q_DECL_OVERRIDE { } virtual void didFindText(quint64, int) Q_DECL_OVERRIDE { } @@ -158,6 +159,7 @@ public: bool m_isLoading; bool m_isFullScreen; qreal devicePixelRatio; + QMap<quint64, QJSValue> m_callbacks; private: QScopedPointer<UIDelegatesManager> m_uIDelegatesManager; |