summaryrefslogtreecommitdiffstats
path: root/src/webengine/api/qquickwebengineview_p.h
diff options
context:
space:
mode:
authorJocelyn Turcotte <jocelyn.turcotte@digia.com>2014-02-05 14:01:54 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-02-13 12:50:43 +0100
commitb81a337a63710c4f109dc537f7d4b73acc282596 (patch)
tree204dbb36ba13ab2e97df3d04f114f0b5dd58d372 /src/webengine/api/qquickwebengineview_p.h
parent185e8a020212756d4e7adfbcd69e16232c8d7dfd (diff)
QQuickWebEngineView new window API refactoring
Improve the code and API in a few ways: - Expose a more discoverable "request" argument in the signal. - Use the request as the carrier of the backend WebContentsAdapter and get rid of our handle. - Put the adoption method (renamed to openIn) on the request object and keep the view API clean of a context-specific adoptHandle method. - Use an enum instead of strings for the new view destination. - Do not let JavaScript own the request object since it won't be necessary until we want to support asynchronous view attachment. We can create the request object on the heap and let the JavaScript engine own the object once we want to support it. - Move the request class to its own header. - Replace tabs.currentView by currentWebView in the quicknanobrowser qml code since we now need this property on the root object anyway. Change-Id: I40d7d15255f516ead9f3e414dd587bf345e6ca4b Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/webengine/api/qquickwebengineview_p.h')
-rw-r--r--src/webengine/api/qquickwebengineview_p.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/webengine/api/qquickwebengineview_p.h b/src/webengine/api/qquickwebengineview_p.h
index 77d5b982..66dc3762 100644
--- a/src/webengine/api/qquickwebengineview_p.h
+++ b/src/webengine/api/qquickwebengineview_p.h
@@ -62,6 +62,7 @@ class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineView : public QQuickItem {
Q_PROPERTY(bool inspectable READ inspectable WRITE setInspectable)
Q_ENUMS(LoadStatus);
Q_ENUMS(ErrorDomain);
+ Q_ENUMS(NewViewDestination);
public:
QQuickWebEngineView(QQuickItem *parent = 0);
@@ -95,6 +96,11 @@ public:
DnsErrorDomain
};
+ enum NewViewDestination {
+ NewViewInWindow,
+ NewViewInTab
+ };
+
public Q_SLOTS:
void loadHtml(const QString &html, const QUrl &baseUrl = QUrl(), const QUrl &unreachableUrl = QUrl());
void goBack();
@@ -118,6 +124,7 @@ private:
Q_DECLARE_PRIVATE(QQuickWebEngineView)
friend class QQuickWebEngineViewExperimental;
friend class QQuickWebEngineViewExperimentalExtension;
+ friend class QQuickWebEngineNewViewRequest;
};
QT_END_NAMESPACE