diff options
Diffstat (limited to 'src/webenginewidgets')
8 files changed, 35 insertions, 29 deletions
diff --git a/src/webenginewidgets/api/qwebenginepage.cpp b/src/webenginewidgets/api/qwebenginepage.cpp index 9b0636696..e3ab2ec0d 100644 --- a/src/webenginewidgets/api/qwebenginepage.cpp +++ b/src/webenginewidgets/api/qwebenginepage.cpp @@ -197,7 +197,7 @@ void QWebEnginePagePrivate::titleChanged(const QString &title) void QWebEnginePagePrivate::urlChanged(const QUrl &url) { Q_Q(QWebEnginePage); - m_explicitUrl = QUrl(); + explicitUrl = QUrl(); Q_EMIT q->urlChanged(url); } @@ -257,7 +257,7 @@ void QWebEnginePagePrivate::loadFinished(bool success, const QUrl &url, int erro Q_UNUSED(errorDescription); isLoading = false; if (success) - m_explicitUrl = QUrl(); + explicitUrl = QUrl(); Q_EMIT q->loadFinished(success); updateNavigationActions(); } @@ -333,11 +333,11 @@ void QWebEnginePagePrivate::runMediaAccessPermissionRequest(const QUrl &security Q_Q(QWebEnginePage); QWebEnginePage::Feature requestedFeature; if (requestFlags.testFlag(WebContentsAdapterClient::MediaAudioCapture) && requestFlags.testFlag(WebContentsAdapterClient::MediaVideoCapture)) - requestedFeature = QWebEnginePage::MediaAudioVideoDevices; + requestedFeature = QWebEnginePage::MediaAudioVideoCapture; else if (requestFlags.testFlag(WebContentsAdapterClient::MediaAudioCapture)) - requestedFeature = QWebEnginePage::MediaAudioDevices; + requestedFeature = QWebEnginePage::MediaAudioCapture; else if (requestFlags.testFlag(WebContentsAdapterClient::MediaVideoCapture)) - requestedFeature = QWebEnginePage::MediaVideoDevices; + requestedFeature = QWebEnginePage::MediaVideoCapture; else return; Q_EMIT q->featurePermissionRequested(securityOrigin, requestedFeature); @@ -758,16 +758,16 @@ void QWebEnginePage::setFeaturePermission(const QUrl &securityOrigin, QWebEngine Q_D(QWebEnginePage); WebContentsAdapterClient::MediaRequestFlags flags = WebContentsAdapterClient::MediaNone; switch (feature) { - case MediaAudioVideoDevices: - case MediaAudioDevices: - case MediaVideoDevices: + case MediaAudioVideoCapture: + case MediaAudioCapture: + case MediaVideoCapture: if (policy != PermissionUnknown) { if (policy == PermissionDeniedByUser) flags = WebContentsAdapterClient::MediaNone; else { - if (feature == MediaAudioDevices) + if (feature == MediaAudioCapture) flags = WebContentsAdapterClient::MediaAudioCapture; - else if (feature == MediaVideoDevices) + else if (feature == MediaVideoCapture) flags = WebContentsAdapterClient::MediaVideoCapture; else flags = WebContentsAdapterClient::MediaRequestFlags(WebContentsAdapterClient::MediaVideoCapture | WebContentsAdapterClient::MediaAudioCapture); @@ -838,14 +838,14 @@ QString QWebEnginePage::title() const void QWebEnginePage::setUrl(const QUrl &url) { Q_D(QWebEnginePage); - d->m_explicitUrl = url; + d->explicitUrl = url; load(url); } QUrl QWebEnginePage::url() const { Q_D(const QWebEnginePage); - return d->m_explicitUrl.isValid() ? d->m_explicitUrl : d->adapter->activeUrl(); + return d->explicitUrl.isValid() ? d->explicitUrl : d->adapter->activeUrl(); } QUrl QWebEnginePage::requestedUrl() const diff --git a/src/webenginewidgets/api/qwebenginepage.h b/src/webenginewidgets/api/qwebenginepage.h index ecd8a5712..afb62ceda 100644 --- a/src/webenginewidgets/api/qwebenginepage.h +++ b/src/webenginewidgets/api/qwebenginepage.h @@ -122,7 +122,8 @@ public: FindBackward = 1, FindCaseSensitively = 2, }; - Q_DECLARE_FLAGS(FindFlags, FindFlag) + Q_DECLARE_FLAGS(FindFlags, FindFlag); + enum WebWindowType { WebBrowserWindow, WebBrowserTab, @@ -146,12 +147,15 @@ public: }; enum Feature { - Notifications, - Geolocation, - MediaAudioDevices, - MediaVideoDevices, - MediaAudioVideoDevices +#ifndef Q_QDOC + Notifications = 0, + Geolocation = 1, +#endif + MediaAudioCapture = 2, + MediaVideoCapture, + MediaAudioVideoCapture }; + // Ex-QWebFrame enum enum FileSelectionMode { diff --git a/src/webenginewidgets/api/qwebenginepage_p.h b/src/webenginewidgets/api/qwebenginepage_p.h index 57c44cacb..6424c3b0b 100644 --- a/src/webenginewidgets/api/qwebenginepage_p.h +++ b/src/webenginewidgets/api/qwebenginepage_p.h @@ -153,7 +153,7 @@ public: QWebEngineSettings *settings; QWebEngineView *view; QSize viewportSize; - QUrl m_explicitUrl; + QUrl explicitUrl; WebEngineContextMenuData m_menuData; bool isLoading; diff --git a/src/webenginewidgets/api/qwebenginesettings.cpp b/src/webenginewidgets/api/qwebenginesettings.cpp index 9ade311fc..729a09f56 100644 --- a/src/webenginewidgets/api/qwebenginesettings.cpp +++ b/src/webenginewidgets/api/qwebenginesettings.cpp @@ -67,6 +67,8 @@ static WebEngineSettings::Attribute toWebEngineAttribute(QWebEngineSettings::Web return WebEngineSettings::HyperlinkAuditingEnabled; case QWebEngineSettings::ScrollAnimatorEnabled: return WebEngineSettings::ScrollAnimatorEnabled; + case QWebEngineSettings::ErrorPageEnabled: + return WebEngineSettings::ErrorPageEnabled; default: return WebEngineSettings::UnsupportedInCoreSettings; } diff --git a/src/webenginewidgets/api/qwebenginesettings.h b/src/webenginewidgets/api/qwebenginesettings.h index 68c0a6031..d9f57a935 100644 --- a/src/webenginewidgets/api/qwebenginesettings.h +++ b/src/webenginewidgets/api/qwebenginesettings.h @@ -54,7 +54,8 @@ public: SpatialNavigationEnabled, LocalContentCanAccessFileUrls, HyperlinkAuditingEnabled, - ScrollAnimatorEnabled + ScrollAnimatorEnabled, + ErrorPageEnabled }; enum FontSize { diff --git a/src/webenginewidgets/doc/snippets/qtwebengine_qwebengineview_snippet.cpp b/src/webenginewidgets/doc/snippets/qtwebengine_qwebengineview_snippet.cpp index 20edd73c6..57e4a7047 100644 --- a/src/webenginewidgets/doc/snippets/qtwebengine_qwebengineview_snippet.cpp +++ b/src/webenginewidgets/doc/snippets/qtwebengine_qwebengineview_snippet.cpp @@ -36,22 +36,22 @@ void wrapInFunction() //! [2] - view->triggerAction(QWebPage::Copy); + view->triggerPageAction(QWebEnginePage::Copy); //! [2] //! [3] - view->page()->triggerPageAction(QWebPage::Stop); + view->page()->triggerAction(QWebEnginePage::Stop); //! [3] //! [4] - view->page()->triggerPageAction(QWebPage::GoBack); + view->page()->triggerAction(QWebEnginePage::Back); //! [4] //! [5] - view->page()->triggerPageAction(QWebPage::GoForward); + view->page()->triggerAction(QWebEnginePage::Forward); //! [5] //! [6] diff --git a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc index e254e6753..af435d170 100644 --- a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc +++ b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc @@ -166,11 +166,9 @@ This enum describes the platform feature access categories that the user may be asked to grant or deny access to. - \value Notifications Grants access to display notifications to the user. - \value Geolocation The geographic location devices that may be available. - \value MediaAudioDevices Audio devices such as speakers or microphones - \value MediaVideoDevices Video devices, e.g. cameras - \value MediaAudioVideoDevices Both Audio and Video devices. + \value MediaAudioCapture Audio capture devices such a microphones + \value MediaVideoCapture Video devices, e.g. cameras + \value MediaAudioVideoCapture Both Audio and Video capture devices. \sa featurePermissionRequested(), featurePermissionRequestCanceled(), setFeaturePermission(), PermissionPolicy diff --git a/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc index 3c420b805..ca9f0ca95 100644 --- a/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc +++ b/src/webenginewidgets/doc/src/qwebenginesettings_lgpl.qdoc @@ -115,6 +115,7 @@ about security origins and local vs. remote content see QWebEngineSecurityOrigin. \value HyperlinkAuditingEnabled This setting enables support for the ping attribute for hyperlinks. It is disabled by default. \value ScrollAnimatorEnabled This setting enables animated scrolling. It is disabled by default. + \value ErrorPageEnabled This setting enables built-in error pages of Chromium. It is enabled by default. */ /*! |