diff options
Diffstat (limited to 'src/webengine/doc')
-rw-r--r-- | src/webengine/doc/qtwebengine.qdocconf | 1 | ||||
-rw-r--r-- | src/webengine/doc/src/external-resources.qdoc | 15 | ||||
-rw-r--r-- | src/webengine/doc/src/qtwebengine-platform-notes.qdoc | 4 | ||||
-rw-r--r-- | src/webengine/doc/src/qtwebengine-qmlmodule.qdoc | 4 | ||||
-rw-r--r-- | src/webengine/doc/src/webengineview.qdoc | 17 |
5 files changed, 37 insertions, 4 deletions
diff --git a/src/webengine/doc/qtwebengine.qdocconf b/src/webengine/doc/qtwebengine.qdocconf index 009902080..5e738f98d 100644 --- a/src/webengine/doc/qtwebengine.qdocconf +++ b/src/webengine/doc/qtwebengine.qdocconf @@ -66,6 +66,7 @@ exampledirs += . \ ../../core/doc/snippets \ ../../webenginewidgets/doc/snippets +examples.fileextensions += *.aff *.dic imagedirs += images diff --git a/src/webengine/doc/src/external-resources.qdoc b/src/webengine/doc/src/external-resources.qdoc index c4cfe24af..2ef88e8a4 100644 --- a/src/webengine/doc/src/external-resources.qdoc +++ b/src/webengine/doc/src/external-resources.qdoc @@ -90,6 +90,11 @@ \title Shaka Player */ +/*! + \externalpage https://sourceforge.net/projects/hunspell/ + \title Hunspell Project +*/ + /* This prevents autolinking of each occurrence of 'WebEngine' To link to the WebEngine QML type, use explicit linking: @@ -101,3 +106,13 @@ \title WebEngine \internal */ + +/*! + \externalpage https://www.w3.org/Protocols/rfc2616/rfc2616-sec19.html#sec19.5.1 + \title RFC 2616 section 19.5.1 +*/ + +/*! + \externalpage http://www.w3schools.com/tags/att_a_download.asp + \title HTML download Attribute +*/ diff --git a/src/webengine/doc/src/qtwebengine-platform-notes.qdoc b/src/webengine/doc/src/qtwebengine-platform-notes.qdoc index 66e733fa9..b66e7874d 100644 --- a/src/webengine/doc/src/qtwebengine-platform-notes.qdoc +++ b/src/webengine/doc/src/qtwebengine-platform-notes.qdoc @@ -117,8 +117,8 @@ On OS X, the following are required: \list - \li OS X 10.9 or later - \li Xcode 6.1 or later + \li OS X 10.10 or later + \li Xcode 6.3 or later \li OS X 10.10 SDK or later \endlist diff --git a/src/webengine/doc/src/qtwebengine-qmlmodule.qdoc b/src/webengine/doc/src/qtwebengine-qmlmodule.qdoc index 87022262d..9d22d3f36 100644 --- a/src/webengine/doc/src/qtwebengine-qmlmodule.qdoc +++ b/src/webengine/doc/src/qtwebengine-qmlmodule.qdoc @@ -24,7 +24,7 @@ */ /*! - \qmlmodule QtWebEngine 1.3 + \qmlmodule QtWebEngine 1.4 \title Qt WebEngine QML Types \brief Provides QML types for rendering web content within a QML application \ingroup qtwebengine-modules @@ -33,7 +33,7 @@ your .qml file: \badcode - import QtWebEngine 1.3 + import QtWebEngine 1.4 \endcode To link against the module, add the following QT variable to your qmake .pro diff --git a/src/webengine/doc/src/webengineview.qdoc b/src/webengine/doc/src/webengineview.qdoc index 63b6e30d1..6fd9ba45b 100644 --- a/src/webengine/doc/src/webengineview.qdoc +++ b/src/webengine/doc/src/webengineview.qdoc @@ -1117,3 +1117,20 @@ Also if the audio is paused, this signal is emitted with an approximate \b{2 second delay}, from the moment the audio is paused. */ + +/*! + \qmlmethod void WebEngineView::viewSource() + \since QtWebEngine 1.4 + + Shows the source of the current page in a new tab. + + \sa canViewSource +*/ + +/*! + \qmlproperty bool WebEngineView::canViewSource + \brief This property holds whether the source for the current page can be viewed. + \since QtWebEngine 1.4 + + \sa viewSource() +*/ |