From 0445e84888cd0d2f9a8c90f3a88317ab05c690d7 Mon Sep 17 00:00:00 2001 From: Nico Vertriest Date: Fri, 16 Jan 2015 11:54:36 +0100 Subject: Doc: Moved the example documentation to correct locations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit And fix the \snippet commands to use the correct paths. Also edited dependencies qdocconf files Task-number: QTBUG-43810 Change-Id: I3c2fb6d2a48900a9b5651225381707c9ec25065a Reviewed-by: Martin Smith Reviewed-by: Topi Reiniö --- src/scripttools/doc/qtscripttools.qdocconf | 11 ++--------- src/scripttools/doc/src/qtscripttools-index.qdoc | 2 +- src/scripttools/doc/src/qtscripttools-module.qdoc | 2 +- 3 files changed, 4 insertions(+), 11 deletions(-) (limited to 'src/scripttools') diff --git a/src/scripttools/doc/qtscripttools.qdocconf b/src/scripttools/doc/qtscripttools.qdocconf index 95ebf8a..4eae186 100644 --- a/src/scripttools/doc/qtscripttools.qdocconf +++ b/src/scripttools/doc/qtscripttools.qdocconf @@ -3,20 +3,13 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) # Name of the project which must match the outputdir. Determines the .index file project = QtScriptTools -# Directories in which to search for files to document and images. -# By default set to the root directory of the project for sources -# and headers and qdoc will therefore generate output for each file. -# Images should be placed in /dic/images and examples in -# /examples. -# Paths are relative to the location of this file. -exampledirs += ../../../examples \ - snippets +exampledirs += snippets headerdirs += .. imagedirs += images sourcedirs += .. -depends += qtcore qtlinguist qtscript qtdoc +depends += qtcore qtlinguist qtscript qtdoc qtwidgets qtqml qmake # The following parameters are for creating a qhp file, the qhelpgenerator # program can convert the qhp file into a qch file which can be opened in diff --git a/src/scripttools/doc/src/qtscripttools-index.qdoc b/src/scripttools/doc/src/qtscripttools-index.qdoc index 1817753..435ad6b 100644 --- a/src/scripttools/doc/src/qtscripttools-index.qdoc +++ b/src/scripttools/doc/src/qtscripttools-index.qdoc @@ -42,7 +42,7 @@ \snippet doc_src_qtscripttools.cpp 0 - To link against the module, add this line to your \l qmake \c .pro file: + To link against the module, add this line to your \l {qmake Manual}{qmake} \c .pro file: \snippet doc_src_qtscripttools.pro 1 diff --git a/src/scripttools/doc/src/qtscripttools-module.qdoc b/src/scripttools/doc/src/qtscripttools-module.qdoc index fea9a99..f5e3b17 100644 --- a/src/scripttools/doc/src/qtscripttools-module.qdoc +++ b/src/scripttools/doc/src/qtscripttools-module.qdoc @@ -44,7 +44,7 @@ \snippet doc_src_qtscripttools.cpp 0 - To link against the module, add this line to your \l qmake \c .pro file: + To link against the module, add this line to your \l {qmake Manual}{qmake} \c .pro file: \snippet doc_src_qtscripttools.pro 1 */ -- cgit v1.2.1