summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@qt.io>2016-07-14 08:45:56 +0200
committerKai Koehne <kai.koehne@qt.io>2016-07-18 10:21:09 +0000
commitfa92853d0355eb9f41b09d6626e963d7ea0012db (patch)
tree97b28e23762fe0348c2e709963783f6fa8778538
parent75481443f2d51c63ac86da540e1e75111374cba2 (diff)
downloadqtdoc-fa92853d0355eb9f41b09d6626e963d7ea0012db.tar.gz
Remove references to Qt WebEngine Wiki
Change-Id: I031b2ce80e5a58a06691b44567b72afb3c14fd83 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
-rw-r--r--doc/src/external-resources.qdoc8
-rw-r--r--doc/src/platforms/linux.qdoc11
-rw-r--r--doc/src/platforms/windows.qdoc5
3 files changed, 4 insertions, 20 deletions
diff --git a/doc/src/external-resources.qdoc b/doc/src/external-resources.qdoc
index 7573d611..a88a7947 100644
--- a/doc/src/external-resources.qdoc
+++ b/doc/src/external-resources.qdoc
@@ -276,14 +276,6 @@
\title Emulator
*/
/*!
- \externalpage http://wiki.qt.io/QtWebEngine
- \title Qt WebEngine Wiki
-*/
-/*!
- \externalpage http://wiki.qt.io/QtWebEngineOnWindows
- \title Qt WebEngine on Windows
-*/
-/*!
\externalpage http://doc.qt.io/archives/qt-5.3/qtwebkit-index.html
\title Qt WebKit
*/
diff --git a/doc/src/platforms/linux.qdoc b/doc/src/platforms/linux.qdoc
index a0f14a53..b2c37c34 100644
--- a/doc/src/platforms/linux.qdoc
+++ b/doc/src/platforms/linux.qdoc
@@ -344,15 +344,8 @@
\section1 Qt WebEngine Dependencies
- \l{Qt WebEngine} depends on some extra development tools in addition to
- those required for the rest of Qt.
-
- \note These dependencies are only needed if you use a source version of Qt.
- They are not required when using a prebuilt library.
-
- For the most up-to-date information about \l{Qt WebEngine} dependencies,
- see the \l{Qt WebEngine Wiki}{Qt WebEngine} wiki.
-
+ \l{Qt WebEngine} has additional build requirements which are listed in the
+ \l{Qt WebEngine Platform Notes}.
*/
/*!
diff --git a/doc/src/platforms/windows.qdoc b/doc/src/platforms/windows.qdoc
index c4ba7e56..699e1683 100644
--- a/doc/src/platforms/windows.qdoc
+++ b/doc/src/platforms/windows.qdoc
@@ -430,9 +430,8 @@
\endlist
- For the most up-to-date information about the \l{Qt WebEngine} dependencies,
- see the \l{Qt WebEngine on Windows}{Qt WebEngine} wiki for Windows.
-
+ \l{Qt WebEngine} has additional build requirements which are listed in the
+ \l{Qt WebEngine Platform Notes}.
*/
/*!