Commit bdc654a8 authored by Jocelyn Turcotte's avatar Jocelyn Turcotte
Browse files

Various doc tweaks


- Fix the example pages titles to match the qdocconf files
- Remove information not as relevant for QtWebEngine as it was for
  QtWebKit
- Fix the QtWebEngineWidgets snippet not to refer to webengine
- Remove the dead link and the reference to Arora from QtWebEngine

Change-Id: Ib3c57c8dd534330b3323c94fb2217374b3e52cf9
Reviewed-by: default avatarAndras Becsi <andras.becsi@digia.com>
Reviewed-by: default avatarJerome Pasion <jerome.pasion@digia.com>
Showing with 10 additions and 24 deletions
......@@ -34,7 +34,4 @@
providing a little Web browser application with support for tabs.
\image browser-demo.png
This browser is the foundation for the \l{Arora Browser}, a simple cross-platform
Web browser.
*/
......@@ -24,7 +24,7 @@ qhp.QtWebEngine.subprojects.qmltypes.indexTitle = Qt WebEngine QML Types
qhp.QtWebEngine.subprojects.qmltypes.selectors = fake:qmlclass
qhp.QtWebEngine.subprojects.qmltypes.sortPages = true
qhp.QtWebEngine.subprojects.examples.title = Examples
qhp.QtWebEngine.subprojects.examples.indexTitle = Qt WebEngine Code Samples
qhp.QtWebEngine.subprojects.examples.indexTitle = Qt WebEngine Examples
qhp.QtWebEngine.subprojects.examples.selectors = fake:example
tagfile = ../../../doc/qtwebengine/qtwebengine.tags
......
......@@ -24,7 +24,7 @@ qhp.QtWebEngineWidgets.subprojects.classes.indexTitle = Qt WebEngine Widgets C++
qhp.QtWebEngineWidgets.subprojects.classes.selectors = class fake:headerfile
qhp.QtWebEngineWidgets.subprojects.classes.sortPages = true
qhp.QtWebEngineWidgets.subprojects.examples.title = Examples
qhp.QtWebEngineWidgets.subprojects.examples.indexTitle = Qt WebEngine Widgets Code Samples
qhp.QtWebEngineWidgets.subprojects.examples.indexTitle = Qt WebEngine Widgets Examples
qhp.QtWebEngineWidgets.subprojects.examples.selectors = fake:example
tagfile = ../../../doc/qtwebenginewidgets/qtwebenginewidgets.tags
......
//! [0]
QT += webengine
QT += webenginewidgets
//! [0]
//! [1]
#include <QtWebEngine>
#include <QtWebEngineWidgets>
//! [1]
......@@ -54,7 +54,7 @@
content from the World Wide Web into your Qt application.
Qt WebEngine Widgets provides facilities for rendering of HyperText Markup
Language (HTML), Extensible HyperText Markup Language (XHTML) and Scalable
Language version 5 (HTML5), Extensible HyperText Markup Language (XHTML) and Scalable
Vector Graphics (SVG) documents, styled using Cascading Style Sheets (CSS)
and scripted with JavaScript.
......@@ -78,16 +78,11 @@
\snippet snippets/qtwebengine_build_snippet.qdoc 0
\section1 Notes
\note Web site icons, also known as "FavIcons", are currently not supported
on Windows. We plan to address this in a future release.
\section1 Architecture
The easiest way to render content is through the QWebEngineView class. As a
widget it can be embedded into your forms or a graphics view, and it
provides convenience functions for downloading and rendering web sites.
widget it can be embedded into your forms and it provides convenience functions
for downloading and rendering web sites.
\snippet snippets/simple/main.cpp Using QWebEngineView
......@@ -97,21 +92,15 @@
customization of handlers for specific events such as showing custom authentication
dialogs.
\section1 Examples
There are several Qt WebEngine Widgets examples located in the
\l{Qt WebEngine Widgets Examples} page.
\section1 License Information
This is a snapshot of the integration of Chromium into Qt. The exact version information
can be found in the \c{VERSION} file supplied with Qt.
This is a snapshot of the integration of Chromium into Qt.
Qt Commercial Edition licensees that wish to distribute applications that
use the Qt WebEngine module need to be aware of their obligations under the
GNU Library General Public License (LGPL).
GNU Library General Public License (LGPLv2).
Developers using the Open Source Edition can choose to redistribute
the module under the appropriate version of the GNU LGPL.
the module under the GNU LGPLv3.
\legalese
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment