Doc: linking issues qttools

Added qmake to qdocconf files
Removed link to internal function

Task-number: QTBUG-43810
Change-Id: Ic371681ddff95f09a31b305056997ff76e9c80f3
Reviewed-by: Martin Smith <martin.smith@digia.com>

diff --git a/src/assistant/assistant/doc/qtassistant.qdocconf b/src/assistant/assistant/doc/qtassistant.qdocconf
index a63e20b..3201862 100644 (file)
--- a/src/assistant/assistant/doc/qtassistant.qdocconf
+++ b/src/assistant/assistant/doc/qtassistant.qdocconf
@@ -34,6 +34,6 @@ imagedirs               = images
 
 outputdir               = $QT_INSTALL_DOCS/qtassistant
 
-depends                 += qtdoc
+depends                 += qtdoc qmake
 
 navigation.landingpage = "Qt Assistant Manual"

diff --git a/src/assistant/help/doc/qthelp.qdocconf b/src/assistant/help/doc/qthelp.qdocconf
index ddba40b..0b4223e 100644 (file)
--- a/src/assistant/help/doc/qthelp.qdocconf
+++ b/src/assistant/help/doc/qthelp.qdocconf
@@ -25,7 +25,7 @@ qhp.QtHelp.subprojects.classes.sortPages = true
 
 language                = Cpp
 
-depends                 += qtdoc qtcore qtassistant qtwidgets
+depends                 += qtdoc qtcore qtassistant qtwidgets qmake
 
 headerdirs += ..
 

diff --git a/src/designer/src/lib/sdk/abstractformwindow.cpp b/src/designer/src/lib/sdk/abstractformwindow.cpp
index af18da0..5b57a51 100644 (file)
--- a/src/designer/src/lib/sdk/abstractformwindow.cpp
+++ b/src/designer/src/lib/sdk/abstractformwindow.cpp
@@ -558,7 +558,6 @@ void QDesignerFormWindowInterface::activateResourceFilePaths(const QStringList &
     Returns the form the widget containing the main container widget.
 
     \since 5.0
-    \sa mainContainer()
 */
 
 /*!
@@ -567,7 +566,7 @@ void QDesignerFormWindowInterface::activateResourceFilePaths(const QStringList &
     Sets the main container widget on the form to the specified \a
     mainContainer.
 
-    \sa mainContainer(), mainContainerChanged()
+    \sa mainContainerChanged()
 */
 
 /*!

diff --git a/src/linguist/linguist/doc/qtlinguist.qdocconf b/src/linguist/linguist/doc/qtlinguist.qdocconf
index d1c9f49..121404b 100644 (file)
--- a/src/linguist/linguist/doc/qtlinguist.qdocconf
+++ b/src/linguist/linguist/doc/qtlinguist.qdocconf
@@ -34,6 +34,6 @@ imagedirs               = images
 
 outputdir               = $QT_INSTALL_DOCS/qtlinguist
 
-depends                 += qtdoc qtqml qtquick qtcore qtgui
+depends                 += qtdoc qtqml qtquick qtcore qtgui qmake
 
 navigation.landingpage = "Qt Linguist Manual"