diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-21 18:09:08 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-21 18:09:08 +0100 |
| commit | b1153753221513aa5687001c84a1c9ed69925dc6 (patch) | |
| tree | 3569ad54e433fee8244effe558ca52e567b6890d /src/webenginewidgets/doc/src/qtwebkitportingguide.qdoc | |
| parent | 4d6b2dc88bda15ade9d04e54d80b7e4693d59832 (diff) | |
| parent | c2687689ba42d6021ae3f220d9fd240609489d3a (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/3rdparty
src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc
Change-Id: I90728e965399e51b626d538924de955f9abab5fe
Diffstat (limited to 'src/webenginewidgets/doc/src/qtwebkitportingguide.qdoc')
| -rw-r--r-- | src/webenginewidgets/doc/src/qtwebkitportingguide.qdoc | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/src/webenginewidgets/doc/src/qtwebkitportingguide.qdoc b/src/webenginewidgets/doc/src/qtwebkitportingguide.qdoc index 99723c105..e6236ec98 100644 --- a/src/webenginewidgets/doc/src/qtwebkitportingguide.qdoc +++ b/src/webenginewidgets/doc/src/qtwebkitportingguide.qdoc @@ -94,8 +94,17 @@ \section1 QWebFrame Has Been Merged into QWebEnginePage - It is not possible to access sub-frames. Methods of the main QWebFrame are - now available directly through the QWebEnginePage itself. + HTML frames can be used to divide web pages into several areas where the content can be + represented individually. + + In Qt WebKit, QWebFrame represents a frame inside a web page. Each QWebPage object contains at + least one frame, the main frame, obtained using QWebPage::mainFrame(). Additional frames will + be created for the HTML \c <frame> element, which defines the appearance and contents of a + single frame, or the \c <iframe> element, which inserts a frame within a block of text. + + In Qt WebEngine, frame handling has been merged into the QWebEnginePage class. All child frames + are now considered part of the content, and only accessible through JavaScript. Methods of the + QWebFrame class, such as \c load() are now available directly through the QWebEnginePage itself. \b {Qt WebKit} \code |