From e58576f8a293bce2e1c4b0582820163415d69bcf Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 3 Dec 2012 16:55:44 +0100 Subject: fix docs build: canonical naming of qdocconf file Change-Id: I062ee28a7729294a3d28a8051e66973dc29ffe6b Reviewed-by: hjk --- doc/qt5.qdocconf | 77 ----------------------------------------------- doc/qtfeedback.qdocconf | 77 +++++++++++++++++++++++++++++++++++++++++++++++ src/feedback/feedback.pro | 2 +- 3 files changed, 78 insertions(+), 78 deletions(-) delete mode 100644 doc/qt5.qdocconf create mode 100644 doc/qtfeedback.qdocconf diff --git a/doc/qt5.qdocconf b/doc/qt5.qdocconf deleted file mode 100644 index d1cf628..0000000 --- a/doc/qt5.qdocconf +++ /dev/null @@ -1,77 +0,0 @@ -include($QT_INSTALL_DOCS/global/qt-html-templates-offline.qdocconf) -include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) - -# Name of the project. -project = qtfeedback - -include(macros.qdocconf) -include(compat.qdocconf) -include(qt-cpp-ignore.qdocconf) -include(qt-defines.qdocconf) - -# 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 += src/snippets .. -headerdirs += .. -imagedirs += src/images -sourcedirs += .. - -# 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 -# Qt Assistant and/or Qt Creator. - -# Defines the name of the project. You cannot use operators (+, =, -) in -# the name. Properties for this project are set using a qhp..property -# format. -qhp.projects = qtfeedback - -# Sets the name of the output qhp file. -qhp.qtfeedback.file = qtfeedback.qhp - -# Namespace for the output file. This namespace is used to distinguish between -# different documentation files in Creator/Assistant. Normal format for MP -# projects should be: com.nokia.mp..version with version being -# a number containing a major, minor and revision element. E.g. version 1.0 -# becomes 100. -qhp.qtfeedback.namespace = com.nokia.mp.qtfeedback.100 - -# Title for the package, will be the main title for the package in -# Assistant/Creator. -qhp.qtfeedback.indexTitle = Qt Feedback Documentation - -# Extra files to add to the output which are not linked to from anywhere -# using a qdoc \l command. -qhp.qtfeedback.extraFiles = style/style.css \ - index.html - -# Only updtae the name of the project for the next variables. -qhp.qtfeedback.virtualFolder = qdoc -qhp.qtfeedback.subprojects = classes -qhp.qtfeedback.subprojects.classes.title = Classes -qhp.qtfeedback.subprojects.classes.selectors = class fake:headerfile -qhp.qtfeedback.subprojects.classes.sortPages = true - - - -# Do NOT change the variables after this line unless you know what you are doing. - -outputformats = HTML - -examples.fileextensions = "*.cpp *.h *.js *.svg *.xml *.ui *.qml" -examples.imageextensions = "*.png *.jpeg *.jpg *.gif *.mng" -headers.fileextensions = "*.h *.ch *.h++ *.hh *.hpp *.hxx" -sources.fileextensions = "*.cpp *.qdoc *.mm *.qml" - -HTML.nobreadcrumbs = "true" - -HTML.templatedir = . -HTML.stylesheets = style/style.css - -HTML.headerstyles = " \n" -HTML.endheader = "\n\n" - -HTML.footer = "\n" diff --git a/doc/qtfeedback.qdocconf b/doc/qtfeedback.qdocconf new file mode 100644 index 0000000..d1cf628 --- /dev/null +++ b/doc/qtfeedback.qdocconf @@ -0,0 +1,77 @@ +include($QT_INSTALL_DOCS/global/qt-html-templates-offline.qdocconf) +include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) + +# Name of the project. +project = qtfeedback + +include(macros.qdocconf) +include(compat.qdocconf) +include(qt-cpp-ignore.qdocconf) +include(qt-defines.qdocconf) + +# 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 += src/snippets .. +headerdirs += .. +imagedirs += src/images +sourcedirs += .. + +# 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 +# Qt Assistant and/or Qt Creator. + +# Defines the name of the project. You cannot use operators (+, =, -) in +# the name. Properties for this project are set using a qhp..property +# format. +qhp.projects = qtfeedback + +# Sets the name of the output qhp file. +qhp.qtfeedback.file = qtfeedback.qhp + +# Namespace for the output file. This namespace is used to distinguish between +# different documentation files in Creator/Assistant. Normal format for MP +# projects should be: com.nokia.mp..version with version being +# a number containing a major, minor and revision element. E.g. version 1.0 +# becomes 100. +qhp.qtfeedback.namespace = com.nokia.mp.qtfeedback.100 + +# Title for the package, will be the main title for the package in +# Assistant/Creator. +qhp.qtfeedback.indexTitle = Qt Feedback Documentation + +# Extra files to add to the output which are not linked to from anywhere +# using a qdoc \l command. +qhp.qtfeedback.extraFiles = style/style.css \ + index.html + +# Only updtae the name of the project for the next variables. +qhp.qtfeedback.virtualFolder = qdoc +qhp.qtfeedback.subprojects = classes +qhp.qtfeedback.subprojects.classes.title = Classes +qhp.qtfeedback.subprojects.classes.selectors = class fake:headerfile +qhp.qtfeedback.subprojects.classes.sortPages = true + + + +# Do NOT change the variables after this line unless you know what you are doing. + +outputformats = HTML + +examples.fileextensions = "*.cpp *.h *.js *.svg *.xml *.ui *.qml" +examples.imageextensions = "*.png *.jpeg *.jpg *.gif *.mng" +headers.fileextensions = "*.h *.ch *.h++ *.hh *.hpp *.hxx" +sources.fileextensions = "*.cpp *.qdoc *.mm *.qml" + +HTML.nobreadcrumbs = "true" + +HTML.templatedir = . +HTML.stylesheets = style/style.css + +HTML.headerstyles = " \n" +HTML.endheader = "\n\n" + +HTML.footer = "\n" diff --git a/src/feedback/feedback.pro b/src/feedback/feedback.pro index d044e4d..109f0d6 100644 --- a/src/feedback/feedback.pro +++ b/src/feedback/feedback.pro @@ -1,7 +1,7 @@ TARGET = QtFeedback QT = core -QMAKE_DOCS = $$PWD/../../doc/qt5.qdocconf +QMAKE_DOCS = $$PWD/../../doc/qtfeedback.qdocconf load(qt_module) -- cgit v1.2.3