diff options
author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-04-11 15:12:26 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-15 13:55:53 +0200 |
commit | 4d1d33022a431c3108c4eb33a60d23b0f013d9b8 (patch) | |
tree | 926d53c30f686371a01c6d08e318efccb070aed2 /src/webengine/api/qquickwebenginenewviewrequest_p.h | |
parent | 57df12f215cb02e05ee8f197e0843bebd4574a53 (diff) |
Fix how NewPopupDisposition is exposed in QQuickWebEngineView
I initially misintepreted the meaning of the enum, assuming that it
meant that the window should possibly be blocked. The user_gesture
parameter in WebContentsDelegate::AddNewContents is actually doing
this, while the popup disposition means that JavaScript requested
the window to be opened without one of the standard decoration (i.e.
status bar, menu bar, tool bar, etc.).
Update the QtQuick API to reflect this, renaming the "isPopup"
parameter to a more familiar "isUserInitiated".
The popup disposition is named "dialog" to match the previous
QWebPage::WebModalDialog enum.
Change-Id: Ib0c4bc53671fcf0dd9499aa1be2bbc8c494ba49e
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
Diffstat (limited to 'src/webengine/api/qquickwebenginenewviewrequest_p.h')
-rw-r--r-- | src/webengine/api/qquickwebenginenewviewrequest_p.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/webengine/api/qquickwebenginenewviewrequest_p.h b/src/webengine/api/qquickwebenginenewviewrequest_p.h index ed762cd39..390ca278b 100644 --- a/src/webengine/api/qquickwebenginenewviewrequest_p.h +++ b/src/webengine/api/qquickwebenginenewviewrequest_p.h @@ -52,18 +52,18 @@ QT_BEGIN_NAMESPACE class Q_WEBENGINE_PRIVATE_EXPORT QQuickWebEngineNewViewRequest : public QObject { Q_OBJECT Q_PROPERTY(QQuickWebEngineView::NewViewDestination destination READ destination CONSTANT FINAL) - Q_PROPERTY(bool popup READ isPopup CONSTANT FINAL) + Q_PROPERTY(bool userInitiated READ isUserInitiated CONSTANT FINAL) public: ~QQuickWebEngineNewViewRequest(); QQuickWebEngineView::NewViewDestination destination() const; - bool isPopup() const; + bool isUserInitiated() const; Q_INVOKABLE void openIn(QQuickWebEngineView *view); private: QQuickWebEngineNewViewRequest(); QQuickWebEngineView::NewViewDestination m_destination; - bool m_isPopup; + bool m_isUserInitiated; QExplicitlySharedDataPointer<WebContentsAdapter> m_adapter; friend class QQuickWebEngineViewPrivate; }; |