diff options
| author | Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> | 2015-10-07 14:24:58 +0200 |
|---|---|---|
| committer | Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> | 2015-10-07 13:55:27 +0000 |
| commit | 3483e35635d24e8373ecb86114c9820093041df3 (patch) | |
| tree | 088ab911904ade42a7bc23aeaf1769dce0c5a212 | |
| parent | e4a3ca84fdfd854e1df157697f4c9ba05ded982a (diff) | |
Doc: edit link to Qt WebKit docs to point to archive
The Qt WebKit docs are not part of Qt 5.6 documentation.
Change-Id: Iac913b2b94f899b0c14398c5a864b647c56995c5
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| -rw-r--r-- | src/webengine/doc/src/qtwebengine-overview.qdoc | 3 | ||||
| -rw-r--r-- | src/webenginewidgets/doc/src/qtwebkitportingguide.qdoc | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/webengine/doc/src/qtwebengine-overview.qdoc b/src/webengine/doc/src/qtwebengine-overview.qdoc index 656dd13f1..fb2db9501 100644 --- a/src/webengine/doc/src/qtwebengine-overview.qdoc +++ b/src/webengine/doc/src/qtwebengine-overview.qdoc @@ -39,7 +39,8 @@ made fully editable by the user through the use of the \c{contenteditable} attribute on HTML elements. - Qt WebEngine supercedes the \l{Qt WebKit Widgets}{Qt WebKit} module, which is based on the + Qt WebEngine supercedes the \l{http://doc.qt.io/archives/qt-5.3/qtwebkit-index.html}{Qt WebKit} + module, which is based on the WebKit project, but has not been actively synchronized with the upstream WebKit code since Qt 5.2 and has been deprecated in Qt 5.5. For tips on how to change a Qt WebKit widgets application to use Qt WebEngine widgets, see \l{Porting from Qt WebKit to Qt WebEngine}. For new diff --git a/src/webenginewidgets/doc/src/qtwebkitportingguide.qdoc b/src/webenginewidgets/doc/src/qtwebkitportingguide.qdoc index 174f59d83..927b08cb5 100644 --- a/src/webenginewidgets/doc/src/qtwebkitportingguide.qdoc +++ b/src/webenginewidgets/doc/src/qtwebkitportingguide.qdoc @@ -31,8 +31,10 @@ \brief This guide gives an overview of the differences between the Qt WebKit and Qt WebEngine APIs in applications. - This provides rough steps to follow when porting an application using - Qt WebKit's QWebView API to use Qt WebEngine's QWebEngineView. + This guide provides rough steps to follow when porting an application that uses the + \l{http://doc.qt.io/archives/qt-5.3/qtwebkit-index.html}{Qt WebKit} + \l{http://doc.qt.io/archives/qt-5.3/qml-qtwebkit-webview.html}{QWebView API} to use the + \l{Qt WebEngine} QWebEngineView. \section1 Class Names |