diff options
author | Liang Qi <liang.qi@qt.io> | 2016-08-16 07:25:49 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-08-16 07:25:49 +0200 |
commit | 6e4d1a0cf21ee18d6584042cd9bea3a7d1d24a56 (patch) | |
tree | 57afb359e42aa922c4ca31666aab1ee7d49c9212 /src/webengine/doc/src | |
parent | 765f9c6630afcd9d022e30ffdbe909fbf1ea9549 (diff) | |
parent | b7fde78d7822ed7f2221acfd9db15b3ff579e29d (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/3rdparty
src/webengine/api/qquickwebenginecertificateerror.cpp
src/webengine/doc/src/webengineview.qdoc
tools/qmake/config.tests/libcap/libcap.cpp
Change-Id: I2a2cfc904a8d6b561fb71ef7a0cc4bfb860124db
Diffstat (limited to 'src/webengine/doc/src')
-rw-r--r-- | src/webengine/doc/src/qtwebengine-overview.qdoc | 25 | ||||
-rw-r--r-- | src/webengine/doc/src/qtwebengine-qmlmodule.qdoc | 1 | ||||
-rw-r--r-- | src/webengine/doc/src/webengineview.qdoc | 136 |
3 files changed, 105 insertions, 57 deletions
diff --git a/src/webengine/doc/src/qtwebengine-overview.qdoc b/src/webengine/doc/src/qtwebengine-overview.qdoc index f34b4514b..6b5ccaa14 100644 --- a/src/webengine/doc/src/qtwebengine-overview.qdoc +++ b/src/webengine/doc/src/qtwebengine-overview.qdoc @@ -203,6 +203,31 @@ If a proxy requires authentication, QWebEnginePage::proxyAuthenticationRequired is emitted. For Qt Quick, a dialog is shown. + \section1 High DPI Support + + To support High DPI devices, it is recommended that the application attribute + Qt::AA_EnableHighDpiScaling is set to enable automatic scaling based on the + pixel density of the monitor. In Qt WebEngine applications, the scaling + affects the default zooming factor and scrollbar size. + + For example: + + \code + int main(int argc, char *argv[]) + { + QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); + QApplication app(argc, argv); + // ... + } + \endcode + + Qt WebEngine bundles images for normal and high-dpi resolutions into + \e qtwebengine_resources_100p.pak and \e qtwebengine_resources_200p.pak + files. Depending on the target resolutions, one or both of these files need + to be deployed. + + For more information, see \l{High DPI Displays}. + \section1 Using WebEngine Core Qt WebEngine Core provides an API shared by Qt WebEngine and Qt WebEngine Widgets for handling diff --git a/src/webengine/doc/src/qtwebengine-qmlmodule.qdoc b/src/webengine/doc/src/qtwebengine-qmlmodule.qdoc index 87022262d..8549e7664 100644 --- a/src/webengine/doc/src/qtwebengine-qmlmodule.qdoc +++ b/src/webengine/doc/src/qtwebengine-qmlmodule.qdoc @@ -28,6 +28,7 @@ \title Qt WebEngine QML Types \brief Provides QML types for rendering web content within a QML application \ingroup qtwebengine-modules + \ingroup qmlmodules The QML types can be imported into your application using the following import statements in your .qml file: diff --git a/src/webengine/doc/src/webengineview.qdoc b/src/webengine/doc/src/webengineview.qdoc index 9ab972806..19804a141 100644 --- a/src/webengine/doc/src/webengineview.qdoc +++ b/src/webengine/doc/src/webengineview.qdoc @@ -642,18 +642,18 @@ Describes various high-level error types: - \value WebEngineView::NoErrorDomain - \value WebEngineView::InternalErrorDomain + \value WebEngineView.NoErrorDomain + \value WebEngineView.InternalErrorDomain Content fails to be interpreted by Qt WebEngine. - \value WebEngineView::ConnectionErrorDomain + \value WebEngineView.ConnectionErrorDomain Error results from faulty network connection. - \value WebEngineView::CertificateErrorDomain + \value WebEngineView.CertificateErrorDomain Error related to the SSL/TLS certficate. - \value WebEngineView::HttpErrorDomain + \value WebEngineView.HttpErrorDomain Error related to the HTTP connection. - \value WebEngineView::FtpErrorDomain + \value WebEngineView.FtpErrorDomain Error related to the FTP connection. - \value WebEngineView::DnsErrorDomain + \value WebEngineView.DnsErrorDomain Error related to the DNS connection. */ @@ -662,11 +662,11 @@ Indicates the severity of a JavaScript console message: - \value InfoMessageLevel + \value WebEngineView.InfoMessageLevel Message is purely informative and can safely be ignored. - \value WarningMessageLevel + \value WebEngineView.WarningMessageLevel Message indicates there might be a problem that may need attention. - \value ErrorMessageLevel + \value WebEngineView.ErrorMessageLevel Message indicates there has been an error. */ @@ -675,11 +675,11 @@ Reflects a page's load status: - \value LoadStartedStatus + \value WebEngineView.LoadStartedStatus Page is currently loading. - \value LoadSucceededStatus + \value WebEngineView.LoadSucceededStatus Page has successfully loaded, and is not currently loading. - \value LoadFailedStatus + \value WebEngineView.LoadFailedStatus Page has failed to load, and is not currently loading. */ @@ -688,16 +688,16 @@ Describes how to open a new view: - \value WebEngineView::NewViewInWindow + \value WebEngineView.NewViewInWindow In a separate Window. - \value WebEngineView::NewViewInTab + \value WebEngineView.NewViewInTab In a tab of the same window. - \value WebEngineView::NewViewInDialog + \value WebEngineView.NewViewInDialog In a Window without a tab bar, toolbar, or URL bar. - \value WebEngineView::NewViewInBackgroundTab + \value WebEngineView.NewViewInBackgroundTab In a tab of the same window, without hiding the currently visible web engine view. - \sa WebEngineNewViewRequest::destination + \sa {WebEngineNewViewRequest::destination}{WebEngineNewViewRequest.destination} */ /*! @@ -706,8 +706,10 @@ Describes the options available to the findText() function. The options can be OR-ed together from the following list: - \value FindBackward Searches backwards instead of forwards. - \value FindCaseSensitively By default findText() works case insensitive. Specifying + \value WebEngineView.FindBackward + Searches backwards instead of forwards. + \value WebEngineView.FindFlags FindCaseSensitively + By default findText() works case insensitive. Specifying this option changes the behavior to a case sensitive find operation. \sa findText() @@ -719,13 +721,13 @@ Describes the status with which the render process terminated: - \value NormalTerminationStatus + \value WebEngineView.NormalTerminationStatus The render process terminated normally. - \value AbnormalTerminationStatus + \value WebEngineView.AbnormalTerminationStatus The render process terminated with a non-zero exit status. - \value CrashedTerminationStatus + \value WebEngineView.CrashedTerminationStatus The render process crashed, for example because of a segmentation fault. - \value KilledTerminationStatus + \value WebEngineView.KilledTerminationStatus The render process was killed, for example by \c SIGKILL or task manager kill. */ @@ -735,68 +737,68 @@ Describes the types of action that can be performed on a web page: - \value NoWebAction + \value WebEngineView.NoWebAction No action is triggered. - \value Back + \value WebEngineView.Back Navigate back in the history of navigated links. - \value Forward + \value WebEngineView.Forward Navigate forward in the history of navigated links. - \value Stop + \value WebEngineView.Stop Stop loading the current page. - \value Reload + \value WebEngineView.Reload Reload the current page. - \value ReloadAndBypassCache + \value WebEngineView.ReloadAndBypassCache Reload the current page, but do not use any local cache. - \value Cut + \value WebEngineView.Cut Cut the content currently selected into the clipboard. - \value Copy + \value WebEngineView.Copy Copy the content currently selected into the clipboard. - \value Paste + \value WebEngineView.Paste Paste content from the clipboard. - \value Undo + \value WebEngineView.Undo Undo the last editing action. - \value Redo + \value WebEngineView.Redo Redo the last editing action. - \value SelectAll + \value WebEngineView.SelectAll Select all content. - \value PasteAndMatchStyle + \value WebEngineView.PasteAndMatchStyle Paste content from the clipboard with current style. - \value OpenLinkInThisWindow + \value WebEngineView.OpenLinkInThisWindow Open the current link in the current window. (Added in Qt 5.6) - \value OpenLinkInNewWindow + \value WebEngineView.OpenLinkInNewWindow Open the current link in a new window. (Added in Qt 5.6) - \value OpenLinkInNewTab + \value WebEngineView.OpenLinkInNewTab Open the current link in a new tab. (Added in Qt 5.6) - \value CopyLinkToClipboard + \value WebEngineView.CopyLinkToClipboard Copy the current link to the clipboard. (Added in Qt 5.6) - \value CopyImageToClipboard + \value WebEngineView.CopyImageToClipboard Copy the clicked image to the clipboard. (Added in Qt 5.6) - \value CopyImageUrlToClipboard + \value WebEngineView.CopyImageUrlToClipboard Copy the clicked image's URL to the clipboard. (Added in Qt 5.6) - \value CopyMediaUrlToClipboard + \value WebEngineView.CopyMediaUrlToClipboard Copy the hovered audio or video's URL to the clipboard. (Added in Qt 5.6) - \value ToggleMediaControls + \value WebEngineView.ToggleMediaControls Toggle between showing and hiding the controls for the hovered audio or video element. (Added in Qt 5.6) - \value ToggleMediaLoop + \value WebEngineView.ToggleMediaLoop Toggle whether the hovered audio or video should loop on completetion or not. (Added in Qt 5.6) - \value ToggleMediaPlayPause + \value WebEngineView.ToggleMediaPlayPause Toggle the play/pause state of the hovered audio or video element. (Added in Qt 5.6) - \value ToggleMediaMute + \value WebEngineView.ToggleMediaMute Mute or unmute the hovered audio or video element. (Added in Qt 5.6) - \value DownloadLinkToDisk + \value WebEngineView.DownloadLinkToDisk Download the current link to the disk. To implement download actions, connect to the QWebEngineProfile::downloadRequested signal. (Added in Qt 5.6) - \value DownloadImageToDisk + \value WebEngineView.DownloadImageToDisk Download the highlighted image to the disk. (Added in Qt 5.6) - \value DownloadMediaToDisk + \value WebEngineView.DownloadMediaToDisk Download the hovered audio or video to the disk. (Added in Qt 5.6) - \value InspectElement + \value WebEngineView.InspectElement Trigger any attached Web Inspector to inspect the highlighed element. (Added in Qt 5.6) - \value ExitFullScreen + \value WebEngineView.ExitFullScreen Exit the fullscreen mode. (Added in Qt 5.6) \value SavePage Save the current web page to disk. (Added in Qt 5.7) @@ -810,13 +812,13 @@ Describes the platform feature access categories that the user may be asked to grant or deny access to: - \value Geolocation + \value WebEngineView.Geolocation Location hardware or service. - \value MediaAudioCapture + \value WebEngineView.MediaAudioCapture Audio capture devices, such as microphones. - \value MediaVideoCapture + \value WebEngineView.MediaVideoCapture Video devices, such as cameras. - \value MediaAudioVideoCapture + \value WebEngineView.MediaAudioVideoCapture Both audio and video capture devices. \sa featurePermissionRequested(), grantFeaturePermission() @@ -982,6 +984,26 @@ */ /*! + \qmlproperty bool WebEngineView::activeFocusOnPress + \since QtWebEngine 1.2 + + Specifies whether the view should gain active focus when pressed. + The default value is \c true. +*/ + +/*! + \qmlproperty bool WebEngineView::backgroundColor + \since QtWebEngine 1.2 + + Changes the color of the WebEngineView's background, behind the document's + body. Can be set to \c "transparent" or to a translucent color to see + through the document or to match the web content in a hybrid app to prevent + the white flashes that may appear during loading. + + The default value is white. +*/ + +/*! \qmltype WebEngineFullScreenRequest \instantiates QQuickWebEngineFullScreenRequest \inqmlmodule QtWebEngine |