diff options
| author | Nico Vertriest <nico.vertriest@digia.com> | 2015-01-19 10:24:50 +0100 |
|---|---|---|
| committer | Nico Vertriest <nico.vertriest@digia.com> | 2015-01-19 14:10:44 +0100 |
| commit | d00475360391a267f72847818a563ae9b941335a (patch) | |
| tree | b8116cdcf70ae53fe61261a508be813781756d9e | |
| parent | 9a00d1a01b1f7dc89ebe19adfa539af1fd1d3ecd (diff) | |
| download | qttools-d00475360391a267f72847818a563ae9b941335a.tar.gz | |
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>
| -rw-r--r-- | src/assistant/assistant/doc/qtassistant.qdocconf | 2 | ||||
| -rw-r--r-- | src/assistant/help/doc/qthelp.qdocconf | 2 | ||||
| -rw-r--r-- | src/designer/src/lib/sdk/abstractformwindow.cpp | 3 | ||||
| -rw-r--r-- | src/linguist/linguist/doc/qtlinguist.qdocconf | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/src/assistant/assistant/doc/qtassistant.qdocconf b/src/assistant/assistant/doc/qtassistant.qdocconf index a63e20bf0..320186225 100644 --- 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 ddba40ba9..0b4223e93 100644 --- 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 af18da0cf..5b57a5184 100644 --- 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 d1c9f497f..121404ba7 100644 --- 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" |