diff --git a/dist/changes-5.0.1 b/dist/changes-5.0.1
index fa12d6434a19355439ac9f68a59282155a141789..f476e80bc0e7aaaadf61dc124cd5ba821be75ac2 100644
--- a/dist/changes-5.0.1
+++ b/dist/changes-5.0.1
@@ -22,14 +22,13 @@ information about a particular change.
General Improvements
--------------------
+ - [QTBUG-28633] Fix bogus include paths in some pkg-config files
+ - [QTBUG-28689] Fix help URLs in tools.
+ - [QTBUG-28579] Doc: Correcting qhp links to the Linguist and Assistant examples
+
Third party components
----------------------
-****************************************************************************
-* Library *
-****************************************************************************
-
-
****************************************************************************
* Platform Specific Changes *
****************************************************************************
@@ -44,9 +43,22 @@ Third party components
* Tools *
****************************************************************************
+Qt Assistant
+------------
+
+ - Fix warnings found by the headersclean test
+ - Move functions from an anonymous namespace in a header
+
+Qt DBus Viewer
+--------------
+
+ - Try harder in matching the method signature
+
Qt Designer
-----------
+ - Fix warning about hidden overloaded virtual, found by Clang
+
Qt Help
-------
diff --git a/src/assistant/assistant/doc/qtassistant.qdocconf b/src/assistant/assistant/doc/qtassistant.qdocconf
index 76e65903dfb9c3f6b23647599b3e2dd783faf2ad..3c2689e49254f276305750603a3627057cefbaab 100644
--- a/src/assistant/assistant/doc/qtassistant.qdocconf
+++ b/src/assistant/assistant/doc/qtassistant.qdocconf
@@ -7,7 +7,7 @@ url = http://qt-project.org/doc/qtassistant
qhp.projects = QtAssistant
qhp.QtAssistant.file = qtassistant.qhp
-qhp.QtAssistant.namespace = org.qt-project.assistant.500
+qhp.QtAssistant.namespace = org.qt-project.assistant.501
qhp.QtAssistant.virtualFolder = assistant
qhp.QtAssistant.indexTitle = Qt Assistant Manual
diff --git a/src/assistant/help/doc/qthelp.qdocconf b/src/assistant/help/doc/qthelp.qdocconf
index 2d05db5a5d5061061772e116816790d496027493..b2072adc6b2d0523b822c22a6f07115cb3a1b084 100644
--- a/src/assistant/help/doc/qthelp.qdocconf
+++ b/src/assistant/help/doc/qthelp.qdocconf
@@ -10,7 +10,7 @@ examplesinstallpath = help
qhp.projects = QtHelp
qhp.QtHelp.file = qthelp.qhp
-qhp.QtHelp.namespace = org.qt-project.qthelp.500
+qhp.QtHelp.namespace = org.qt-project.qthelp.501
qhp.QtHelp.virtualFolder = qthelp
qhp.QtHelp.indexTitle = Qt Help
qhp.QtHelp.indexRoot =
diff --git a/src/designer/src/designer/doc/qtdesigner.qdocconf b/src/designer/src/designer/doc/qtdesigner.qdocconf
index 5130ae5b07d474b2dede39694ed763eadc3d10e7..dc04cae4fbcf95b6fbf90b3463f4a680cf7433ad 100644
--- a/src/designer/src/designer/doc/qtdesigner.qdocconf
+++ b/src/designer/src/designer/doc/qtdesigner.qdocconf
@@ -7,7 +7,7 @@ url = http://qt-project.org/doc/qtdesigner
qhp.projects = QtDesigner
qhp.QtDesigner.file = qtdesigner.qhp
-qhp.QtDesigner.namespace = org.qt-project.designer.500
+qhp.QtDesigner.namespace = org.qt-project.designer.501
qhp.QtDesigner.virtualFolder = qtdesigner
qhp.QtDesigner.indexTitle = Qt Designer Manual
diff --git a/src/designer/src/designer/doc/src/designer-manual.qdoc b/src/designer/src/designer/doc/src/designer-manual.qdoc
index 3540d687bed0bbe5495b64c9f80cec9a78d2e3eb..6c852df2959db360756d917cecc1096e505b3e32 100644
--- a/src/designer/src/designer/doc/src/designer-manual.qdoc
+++ b/src/designer/src/designer/doc/src/designer-manual.qdoc
@@ -2534,7 +2534,7 @@ pixmap property in the property editor.
with specific plugin support for \QD. This is done with the following
declarations:
- \snippet customwidgetplugin/customwidgetplugin.pro 1
+ \snippet customwidgetplugin/customwidgetplugin.pro 3
If Qt is configured to build in both debug and release modes, \QD will be
built in release mode. When this occurs, it is necessary to ensure that
diff --git a/src/designer/src/lib/uilib/formbuilder.cpp b/src/designer/src/lib/uilib/formbuilder.cpp
index fe4df79d0c49590ef4f22bb1c456e60de07d0931..dfa10807da114b1ad2d8cfcad7ecb3bb0ce03aa8 100644
--- a/src/designer/src/lib/uilib/formbuilder.cpp
+++ b/src/designer/src/lib/uilib/formbuilder.cpp
@@ -94,7 +94,7 @@ namespace QFormInternal {
dynamically generate user interfaces at run-time use the
QUiLoader class, found in the QtUiTools module.
- \sa QAbstractFormBuilder, {QtUiTools Module}
+ \sa QAbstractFormBuilder, {Qt UI Tools}
*/
/*!
diff --git a/src/designer/src/plugins/plugins.pro b/src/designer/src/plugins/plugins.pro
index 44f5e34e92485dac643638df21ebd6c2489e71f1..7cd16f2da4ceba430a8fa418425aa356a19a3aa1 100644
--- a/src/designer/src/plugins/plugins.pro
+++ b/src/designer/src/plugins/plugins.pro
@@ -1,7 +1,6 @@
TEMPLATE = subdirs
CONFIG += ordered
-REQUIRES = !CONFIG(static,shared|static)
# qtHaveModule(opengl): SUBDIRS += tools/view3d
qtHaveModule(webkitwidgets): SUBDIRS += qwebview
-# win32: contains(QT_CONFIG, activeqt): SUBDIRS += activeqt
+# win32: qtHaveModule(activeqt): SUBDIRS += activeqt
diff --git a/src/designer/src/src.pro b/src/designer/src/src.pro
index 9802c653db783b7b044e2f0aecf51b73373a2f97..64d1c37081f1e962e886a5b11bc5c0f9c7cd67af 100644
--- a/src/designer/src/src.pro
+++ b/src/designer/src/src.pro
@@ -7,4 +7,4 @@ SUBDIRS = \
components \
designer
-CONFIG(shared,shared|static):SUBDIRS += plugins
+contains(QT_CONFIG, shared): SUBDIRS += plugins
diff --git a/src/designer/src/uitools/doc/qtuitools.qdocconf b/src/designer/src/uitools/doc/qtuitools.qdocconf
index 34407302b8c7b89ffba598abcd429041682df2ca..793847f19016a77611811514605b8c0b57c30e22 100644
--- a/src/designer/src/uitools/doc/qtuitools.qdocconf
+++ b/src/designer/src/uitools/doc/qtuitools.qdocconf
@@ -10,7 +10,7 @@ examplesinstallpath = uitools
qhp.projects = QtUiTools
qhp.QtUiTools.file = qtuitools.qhp
-qhp.QtUiTools.namespace = org.qt-project.qtuitools.500
+qhp.QtUiTools.namespace = org.qt-project.qtuitools.501
qhp.QtUiTools.virtualFolder = qtuitools
qhp.QtUiTools.indexTitle = Qt UI Tools
qhp.QtHelp.indexRoot =
diff --git a/src/linguist/linguist/doc/qtlinguist.qdocconf b/src/linguist/linguist/doc/qtlinguist.qdocconf
index c09f52b63983124b67497a6442c84c8b4b807e29..6699f317381969d05f78886b1077b145b6b30484 100644
--- a/src/linguist/linguist/doc/qtlinguist.qdocconf
+++ b/src/linguist/linguist/doc/qtlinguist.qdocconf
@@ -7,7 +7,7 @@ url = http://qt-project.org/doc/qtlinguist
qhp.projects = QtLinguist
qhp.QtLinguist.file = qtlinguist.qhp
-qhp.QtLinguist.namespace = org.qt-project.linguist.500
+qhp.QtLinguist.namespace = org.qt-project.linguist.501
qhp.QtLinguist.virtualFolder = qtlinguist
qhp.QtLinguist.indexTitle = Qt Linguist Manual