diff --git a/doc/qtcreator/config/qtcreator-project.qdocconf b/doc/qtcreator/config/qtcreator-project.qdocconf
index 479d17ed8b2..096548517da 100644
--- a/doc/qtcreator/config/qtcreator-project.qdocconf
+++ b/doc/qtcreator/config/qtcreator-project.qdocconf
@@ -68,7 +68,8 @@ depends +=    qtandroidextras\
               qttestlib \
               qtuitools \
               qtxml \
-              qtlocation
+              qtlocation \
+              qtvirtualkeyboard
 
 include(../../config/macros.qdocconf)
 include(../../config/qt-cpp-ignore.qdocconf)
diff --git a/doc/qtcreator/src/overview/creator-only/creator-tech-support.qdoc b/doc/qtcreator/src/overview/creator-only/creator-tech-support.qdoc
index fb06269199e..90c9c8959de 100644
--- a/doc/qtcreator/src/overview/creator-only/creator-tech-support.qdoc
+++ b/doc/qtcreator/src/overview/creator-only/creator-tech-support.qdoc
@@ -47,9 +47,9 @@
 
         \row
             \li View examples of what you can do with Qt
-            \li \l{https://doc.qt.io/qt-5/all-examples.html}{List of Qt Examples}
+            \li \l{https://doc.qt.io/qt/all-examples.html}{List of Qt Examples}
 
-                \l{https://doc.qt.io/qt-5/qtquick-codesamples.html}
+                \l{https://doc.qt.io/qt/qtquick-codesamples.html}
                 {List of Qt Quick Examples}
 
         \row
diff --git a/doc/qtcreator/src/qtquick/creator-only/qtquick-creating.qdoc b/doc/qtcreator/src/qtquick/creator-only/qtquick-creating.qdoc
index 4841ee2023c..f5a70f9e8c4 100644
--- a/doc/qtcreator/src/qtquick/creator-only/qtquick-creating.qdoc
+++ b/doc/qtcreator/src/qtquick/creator-only/qtquick-creating.qdoc
@@ -52,18 +52,15 @@
                 target platforms.
 
             \li \uicontrol {Qt Quick Application - Scroll} uses the
-                \l{http://doc.qt.io/qt-5/qml-qtquick-controls2-scrollview.html}
-                {ScrollView} type to implement a scrollable list view
+                \l{ScrollView} type to implement a scrollable list view
                 (requires Qt 5.9 or later).
 
             \li \uicontrol {Qt Quick Application - Stack} uses the
-                \l{http://doc.qt.io/qt-5/qml-qtquick-controls2-stackview.html}
-                {StackView} type to implement a set of pages with a stack-based
+                \l{StackView} type to implement a set of pages with a stack-based
                 navigation model (requires Qt 5.7 or later).
 
             \li \uicontrol {Qt Quick Application - Swipe} uses the
-                \l{http://doc.qt.io/qt-5/qml-qtquick-controls2-swipeview.html}
-                {SwipeWiew} type to implement a set of pages with a swipe-based
+                \l{SwipeView} type to implement a set of pages with a swipe-based
                 navigation model (requires Qt 5.7 or later).
 
             \endlist
@@ -138,8 +135,7 @@
             that are used in the QML files.
 
         \li Select the \uicontrol {Use Qt Virtual Keyboard} check box to add
-            support for \l{http://doc.qt.io/qt-5/qtvirtualkeyboard-index.html}
-            {Qt Virtual Keyboard} to the application.
+            support for \l{Qt Virtual Keyboard} to the application.
 
             \note If you have not installed the Qt Virtual Keyboard module when
             you installed Qt, an error message will appear when you try to open
@@ -236,8 +232,7 @@
             since Qt 5.1).
 
         \li Select the \uicontrol {Use Qt Virtual Keyboard} check box to add
-            support for \l{http://doc.qt.io/qt-5/qtvirtualkeyboard-index.html}
-            {Qt Virtual Keyboard} to the application.
+            support for \l{Qt Virtual Keyboard} to the application.
 
             \note If you have not installed the Qt Virtual Keyboard module when
             you installed Qt, an error message will appear when you try to open
diff --git a/doc/qtcreator/src/qtquick/qtquick-from-qmlproject-to-pro.qdoc b/doc/qtcreator/src/qtquick/qtquick-from-qmlproject-to-pro.qdoc
index 6665902d3e9..c91b97bd71c 100644
--- a/doc/qtcreator/src/qtquick/qtquick-from-qmlproject-to-pro.qdoc
+++ b/doc/qtcreator/src/qtquick/qtquick-from-qmlproject-to-pro.qdoc
@@ -46,7 +46,7 @@
     \endlist
 
     For more information about integrating QML and C++, see
-    \l{https://doc.qt.io/qt-5/qtqml-cppintegration-overview.html}
+    \l{https://doc.qt.io/qt/qtqml-cppintegration-overview.html}
     {Overview - QML and C++ Integration}.
 
     You can use a Qt Creator wizard template to create a Qt Quick application
@@ -59,7 +59,7 @@
 
     The wizard automatically adds the \c QML_IMPORT_PATH option to the project
     file for specifying the required
-    \l{https://doc.qt.io/qt-5/qtqml-syntax-imports.html#qml-import-path}
+    \l{https://doc.qt.io/qt/qtqml-syntax-imports.html#qml-import-path}
     {QML import path}. The path is only needed if more than one subdirectory
     contains QML files.
 
diff --git a/doc/qtcreator/src/qtquick/qtquick-ui-forms.qdoc b/doc/qtcreator/src/qtquick/qtquick-ui-forms.qdoc
index b069337304b..9b398f476a6 100644
--- a/doc/qtcreator/src/qtquick/qtquick-ui-forms.qdoc
+++ b/doc/qtcreator/src/qtquick/qtquick-ui-forms.qdoc
@@ -112,7 +112,7 @@
     In addition, all functions of the \c Math and \c Date objects are supported.
 
     For more information, see
-    \l{https://doc.qt.io/qt-5/qtqml-javascript-functionlist.html}
+    \l{https://doc.qt.io/qt/qtqml-javascript-functionlist.html}
     {List of JavaScript Objects and Functions}.
 
     \section2 Qt QML Methods
@@ -159,7 +159,7 @@
     \endlist
 
     For more information about using the methods, see
-    \l{https://doc.qt.io/qt-5/qml-qtqml-qt.html}{Qt QML Methods}.
+    \l{https://doc.qt.io/qt/qml-qtqml-qt.html}{Qt QML Methods}.
 
     \section1 Using Qt Quick UI Forms
 
diff --git a/doc/qtcreatordev/src/distributing-plugins.qdoc b/doc/qtcreatordev/src/distributing-plugins.qdoc
index 1b38a58798d..64317868ef7 100644
--- a/doc/qtcreatordev/src/distributing-plugins.qdoc
+++ b/doc/qtcreatordev/src/distributing-plugins.qdoc
@@ -79,7 +79,7 @@
     that rely on external files, like the generic highlighter. You can still
     add \l{https://doc.qt.io/qtcreator/creator-project-wizards.html}{wizard
     templates} this way, by adding the
-    \l{https://doc.qt.io/qt-5/resources.html#using-resources-in-the-application}
+    \l{https://doc.qt.io/qt/resources.html#using-resources-in-the-application}
     {path to the resource directory} into your QRC file with
     ProjectExplorer::JsonWizardFactory::addWizardPath(). Registering
     documentation and translations can be done in similar ways.
diff --git a/doc/qtcreatordev/src/qtcreator-documentation.qdoc b/doc/qtcreatordev/src/qtcreator-documentation.qdoc
index 936163ad90d..4b6f1c205d8 100644
--- a/doc/qtcreatordev/src/qtcreator-documentation.qdoc
+++ b/doc/qtcreatordev/src/qtcreator-documentation.qdoc
@@ -345,7 +345,7 @@
     You can use number icons in screenshots to highlight parts of the screenshot
     (instead of using red arrows or borders, or something similar). You can then
     refer to the numbers in text. For and example, see the
-    \l{http://doc.qt.io/qt-5/topics-app-development.html}{Development Tools}
+    \l{https://doc.qt.io/qt/topics-app-development.html}{Development Tools}
     topic in the Qt reference documentation.
 
     This improves the consistency of the look and feel of Qt documentation,