diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2020-10-19 09:16:44 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2020-11-20 15:52:40 +0100 |
| commit | e3381218acdbec1e9c207ef3eb35371e22941257 (patch) | |
| tree | e8bf073b707c51f7cdd5efe55f7e4962de90980f /src | |
| parent | a54d219c3e3cb7c73be03413741bf8d2ef70c9fa (diff) | |
Remove qwebengineview setter from qwebenginepage
Change-Id: Ifaac7287d24e38e04e217cae65f6e5294e8bdd9e
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/webenginewidgets/api/qwebenginepage.cpp | 24 | ||||
| -rw-r--r-- | src/webenginewidgets/api/qwebenginepage.h | 3 |
2 files changed, 6 insertions, 21 deletions
diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp index 546a1593f..c18da80b6 100644 --- a/src/webenginewidgets/api/qwebenginepage.cpp +++ b/src/webenginewidgets/api/qwebenginepage.cpp @@ -831,15 +831,15 @@ QWebEnginePage::QWebEnginePage(QObject* parent) */ /*! - \fn QWebEnginePage::registerProtocolHandlerRequested(QWebEngineRegisterProtocolHandlerRequest request) - \since 5.11 + \fn QWebEnginePage::registerProtocolHandlerRequested(QWebEngineRegisterProtocolHandlerRequest + request) \since 5.11 This signal is emitted when the web page tries to register a custom protocol using the \l registerProtocolHandler API. The request object \a request can be used to accept or reject the request: - \snippet webenginewidgets/simplebrowser/webpage.cpp registerProtocolHandlerRequested + \snippet webenginewidgets/simplebrowser/webview.cpp registerProtocolHandlerRequested */ /*! @@ -1125,17 +1125,6 @@ qint64 QWebEnginePage::renderProcessPid() const return d->adapter->renderProcessPid(); } -void QWebEnginePage::setView(QWidget *newViewBase) -{ - QWebEnginePagePrivate::bindPageAndView(this, qobject_cast<QWebEngineView *>(newViewBase)); -} - -QWidget *QWebEnginePage::view() const -{ - Q_D(const QWebEnginePage); - return d->view; -} - /*! Returns the web engine profile the page belongs to. \since 5.5 @@ -1756,10 +1745,9 @@ QObject *QWebEnginePagePrivate::dragSource() const bool QWebEnginePagePrivate::isEnabled() const { - const Q_Q(QWebEnginePage); - const QWidget *view = q->view(); - if (view) - return view->isEnabled(); + const QWidget *widget = view; + if (widget) + return widget->isEnabled(); return true; } diff --git a/src/webenginewidgets/api/qwebenginepage.h b/src/webenginewidgets/api/qwebenginepage.h index b0b447c22..b67caf806 100644 --- a/src/webenginewidgets/api/qwebenginepage.h +++ b/src/webenginewidgets/api/qwebenginepage.h @@ -239,9 +239,6 @@ public: ~QWebEnginePage(); QWebEngineHistory *history() const; - void setView(QWidget *view); - QWidget *view() const; - bool hasSelection() const; QString selectedText() const; |