1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Doc: Simplify qtbase qdocconfs.

Browse Source 
We should be using the global qdocconf for the common variables. This
change also allows you to just specify -installdir without using a
templatedir.

Change-Id: I207d279d9b5199212e896fc5ccab5c212b1896c6
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
This commit is contained in:
Casper van Donderen 2012-08-30 17:51:30 +02:00 committed by Qt by Nokia
parent 244e3e2aa0
commit 2e7f06c9bc
13 changed files with 41 additions and 170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
doc/global/qt-html-templates-offline.qdocconf
View File

@ -1,3 +1,14 @@
HTML.generatemacrefs = "true"
HTML.nobreadcrumbs = "true"
HTML.stylesheets = global/style/offline.css
HTML.headerstyles = \
" <link rel=\"stylesheet\" type=\"text/css\" href=\"style/offline.css\" />\n"
HTML.endheader = \
"</head>\n" \
HTML.footer = \
"<div class=\"footer\">\n" \
" <p>\n" \

17
src/concurrent/doc/qtconcurrent.qdocconf
View File

@ -1,5 +1,5 @@
include(../../../doc/global/qt-html-templates-offline.qdocconf)
include(../../../doc/global/qt-cpp-ignore.qdocconf)
include(global/qt-html-templates-offline.qdocconf)
include(global/qt-cpp-ignore.qdocconf)
project = QtConcurrent
description = Qt Concurrent Reference Documentation
@ -48,19 +48,6 @@ examples.imageextensions = "*.png"
outputdir = ../../../doc/qtconcurrent
tagfile = ../../../doc/qtconcurrent/qtconcurrent.tags
HTML.generatemacrefs = "true"
HTML.nobreadcrumbs = "true"
HTML.templatedir = .
HTML.stylesheets = ../../../doc/global/style/offline.css
HTML.headerstyles = \
" <link rel=\"stylesheet\" type=\"text/css\" href=\"style/offline.css\" />\n"
HTML.endheader = \
"</head>\n" \
defines = Q_QDOC \
QT_.*_SUPPORT \
QT_.*_LIB \

17
src/corelib/doc/qtcore.qdocconf
View File

@ -1,5 +1,5 @@
include(../../../doc/global/qt-html-templates-offline.qdocconf)
include(../../../doc/global/qt-cpp-ignore.qdocconf)
include(global/qt-html-templates-offline.qdocconf)
include(global/qt-cpp-ignore.qdocconf)
project = QtCore
description = Qt Core Reference Documentation
@ -48,19 +48,6 @@ examples.imageextensions = "*.png"
outputdir = ../../../doc/qtcore
tagfile = ../../../doc/qtcore/qtcore.tags
HTML.generatemacrefs = "true"
HTML.nobreadcrumbs = "true"
HTML.templatedir = .
HTML.stylesheets = ../../../doc/global/style/offline.css
HTML.headerstyles = \
" <link rel=\"stylesheet\" type=\"text/css\" href=\"style/offline.css\" />\n"
HTML.endheader = \
"</head>\n" \
defines = Q_QDOC \
QT_.*_SUPPORT \
QT_.*_LIB \

17
src/dbus/doc/qtdbus.qdocconf
View File

@ -1,5 +1,5 @@
include(../../../doc/global/qt-html-templates-offline.qdocconf)
include(../../../doc/global/qt-cpp-ignore.qdocconf)
include(global/qt-html-templates-offline.qdocconf)
include(global/qt-cpp-ignore.qdocconf)
project = QtDBus
description = Qt DBus Reference Documentation
@ -48,19 +48,6 @@ examples.imageextensions = "*.png"
outputdir = ../../../doc/qtdbus
tagfile = ../../../doc/qtdbus/qtdbus.tags
HTML.generatemacrefs = "true"
HTML.nobreadcrumbs = "true"
HTML.templatedir = .
HTML.stylesheets = ../../../doc/global/style/offline.css
HTML.headerstyles = \
" <link rel=\"stylesheet\" type=\"text/css\" href=\"style/offline.css\" />\n"
HTML.endheader = \
"</head>\n" \
defines = Q_QDOC \
QT_.*_SUPPORT \
QT_.*_LIB \

17
src/gui/doc/qtgui.qdocconf
View File

@ -1,5 +1,5 @@
include(../../../doc/global/qt-html-templates-offline.qdocconf)
include(../../../doc/global/qt-cpp-ignore.qdocconf)
include(global/qt-html-templates-offline.qdocconf)
include(global/qt-cpp-ignore.qdocconf)
project = QtGui
description = Qt GUI Reference Documentation
@ -48,19 +48,6 @@ examples.imageextensions = "*.png"
outputdir = ../../../doc/qtgui
tagfile = ../../../doc/qtgui/qtgui.tags
HTML.generatemacrefs = "true"
HTML.nobreadcrumbs = "true"
HTML.templatedir = .
HTML.stylesheets = ../../../doc/global/style/offline.css
HTML.headerstyles = \
" <link rel=\"stylesheet\" type=\"text/css\" href=\"style/offline.css\" />\n"
HTML.endheader = \
"</head>\n" \
defines = Q_QDOC \
QT_.*_SUPPORT \
QT_.*_LIB \

17
src/network/doc/qtnetwork.qdocconf
View File

@ -1,5 +1,5 @@
include(../../../doc/global/qt-html-templates-offline.qdocconf)
include(../../../doc/global/qt-cpp-ignore.qdocconf)
include(global/qt-html-templates-offline.qdocconf)
include(global/qt-cpp-ignore.qdocconf)
project = QtNetwork
description = Qt Network Reference Documentation
@ -48,19 +48,6 @@ examples.imageextensions = "*.png"
outputdir = ../../../doc/qtnetwork
tagfile = ../../../doc/qtnetwork/qtnetwork.tags
HTML.generatemacrefs = "true"
HTML.nobreadcrumbs = "true"
HTML.templatedir = .
HTML.stylesheets = ../../../doc/global/style/offline.css
HTML.headerstyles = \
" <link rel=\"stylesheet\" type=\"text/css\" href=\"style/offline.css\" />\n"
HTML.endheader = \
"</head>\n" \
defines = Q_QDOC \
QT_.*_SUPPORT \
QT_.*_LIB \

17
src/opengl/doc/qtopengl.qdocconf
View File

@ -1,5 +1,5 @@
include(../../../doc/global/qt-html-templates-offline.qdocconf)
include(../../../doc/global/qt-cpp-ignore.qdocconf)
include(global/qt-html-templates-offline.qdocconf)
include(global/qt-cpp-ignore.qdocconf)
project = QtOpenGL
description = Qt OpenGL Reference Documentation
@ -48,19 +48,6 @@ examples.imageextensions = "*.png"
outputdir = ../../../doc/qtopengl
tagfile = ../../../doc/qtopengl/qtopengl.tags
HTML.generatemacrefs = "true"
HTML.nobreadcrumbs = "true"
HTML.templatedir = .
HTML.stylesheets = ../../../doc/global/style/offline.css
HTML.headerstyles = \
" <link rel=\"stylesheet\" type=\"text/css\" href=\"style/offline.css\" />\n"
HTML.endheader = \
"</head>\n" \
defines = Q_QDOC \
QT_.*_SUPPORT \
QT_.*_LIB \

17
src/printsupport/doc/qtprintsupport.qdocconf
View File

@ -1,5 +1,5 @@
include(../../../doc/global/qt-html-templates-offline.qdocconf)
include(../../../doc/global/qt-cpp-ignore.qdocconf)
include(global/qt-html-templates-offline.qdocconf)
include(global/qt-cpp-ignore.qdocconf)
project = QtPrintSupport
description = Qt Print Support Reference Documentation
@ -48,19 +48,6 @@ examples.imageextensions = "*.png"
outputdir = ../../../doc/qtprintsupport
tagfile = ../../../doc/qtprintsupport/qtprintsupport.tags
HTML.generatemacrefs = "true"
HTML.nobreadcrumbs = "true"
HTML.templatedir = .
HTML.stylesheets = ../../../doc/global/style/offline.css
HTML.headerstyles = \
" <link rel=\"stylesheet\" type=\"text/css\" href=\"style/offline.css\" />\n"
HTML.endheader = \
"</head>\n" \
defines = Q_QDOC \
QT_.*_SUPPORT \
QT_.*_LIB \

17
src/sql/doc/qtsql.qdocconf
View File

@ -1,5 +1,5 @@
include(../../../doc/global/qt-html-templates-offline.qdocconf)
include(../../../doc/global/qt-cpp-ignore.qdocconf)
include(global/qt-html-templates-offline.qdocconf)
include(global/qt-cpp-ignore.qdocconf)
project = QtSql
description = Qt SQL Reference Documentation
@ -48,19 +48,6 @@ examples.imageextensions = "*.png"
outputdir = ../../../doc/qtsql
tagfile = ../../../doc/qtsql/qtsql.tags
HTML.generatemacrefs = "true"
HTML.nobreadcrumbs = "true"
HTML.templatedir = .
HTML.stylesheets = ../../../doc/global/style/offline.css
HTML.headerstyles = \
" <link rel=\"stylesheet\" type=\"text/css\" href=\"style/offline.css\" />\n"
HTML.endheader = \
"</head>\n" \
defines = Q_QDOC \
QT_.*_SUPPORT \
QT_.*_LIB \

17
src/testlib/doc/qttest.qdocconf
View File

@ -1,5 +1,5 @@
include(../../../doc/global/qt-html-templates-offline.qdocconf)
include(../../../doc/global/qt-cpp-ignore.qdocconf)
include(global/qt-html-templates-offline.qdocconf)
include(global/qt-cpp-ignore.qdocconf)
project = QtTest
description = Qt Test Reference Documentation
@ -48,19 +48,6 @@ examples.imageextensions = "*.png"
outputdir = ../../../doc/qttest
tagfile = ../../../doc/qttest/qttest.tags
HTML.generatemacrefs = "true"
HTML.nobreadcrumbs = "true"
HTML.templatedir = .
HTML.stylesheets = ../../../doc/global/style/offline.css
HTML.headerstyles = \
" <link rel=\"stylesheet\" type=\"text/css\" href=\"style/offline.css\" />\n"
HTML.endheader = \
"</head>\n" \
defines = Q_QDOC \
QT_.*_SUPPORT \
QT_.*_LIB \

13
src/tools/qdoc/generator.cpp
View File

@ -1648,9 +1648,16 @@ void Generator::initialize(const Config &config)
QString templateDir = config.getString(
(*g)->format() + Config::dot + CONFIG_TEMPLATEDIR);
QStringList searchDirs;
if (!templateDir.isEmpty()) {
searchDirs.append(templateDir);
}
if (!Config::installDir.isEmpty()) {
searchDirs.append(Config::installDir);
}
if (!searchDirs.isEmpty()) {
QStringList noExts;
QStringList searchDirs = QStringList() << templateDir;
QStringList scripts =
config.getCleanPathList((*g)->format()+Config::dot+CONFIG_SCRIPTS);
e = scripts.constBegin();
@ -1671,10 +1678,6 @@ void Generator::initialize(const Config &config)
++e;
}
if (!Config::installDir.isEmpty()) {
searchDirs.append(Config::installDir);
}
QStringList styles =
config.getCleanPathList((*g)->format()+Config::dot+CONFIG_STYLESHEETS);
e = styles.constBegin();

17
src/widgets/doc/qtwidgets.qdocconf
View File

@ -1,5 +1,5 @@
include(../../../doc/global/qt-html-templates-offline.qdocconf)
include(../../../doc/global/qt-cpp-ignore.qdocconf)
include(global/qt-html-templates-offline.qdocconf)
include(global/qt-cpp-ignore.qdocconf)
project = QtWidgets
description = Qt Widgets Reference Documentation
@ -48,19 +48,6 @@ examples.imageextensions = "*.png"
outputdir = ../../../doc/qtwidgets
tagfile = ../../../doc/qtwidgets/qtwidgets.tags
HTML.generatemacrefs = "true"
HTML.nobreadcrumbs = "true"
HTML.templatedir = .
HTML.stylesheets = ../../../doc/global/style/offline.css
HTML.headerstyles = \
" <link rel=\"stylesheet\" type=\"text/css\" href=\"style/offline.css\" />\n"
HTML.endheader = \
"</head>\n" \
defines = Q_QDOC \
QT_.*_SUPPORT \
QT_.*_LIB \

17
src/xml/doc/qtxml.qdocconf
View File

@ -1,5 +1,5 @@
include(../../../doc/global/qt-html-templates-offline.qdocconf)
include(../../../doc/global/qt-cpp-ignore.qdocconf)
include(global/qt-html-templates-offline.qdocconf)
include(global/qt-cpp-ignore.qdocconf)
project = QtXml
description = Qt XML Reference Documentation
@ -48,19 +48,6 @@ examples.imageextensions = "*.png"
outputdir = ../../../doc/qtxml
tagfile = ../../../doc/qtxml/qtxml.tags
HTML.generatemacrefs = "true"
HTML.nobreadcrumbs = "true"
HTML.templatedir = .
HTML.stylesheets = ../../../doc/global/style/offline.css
HTML.headerstyles = \
" <link rel=\"stylesheet\" type=\"text/css\" href=\"style/offline.css\" />\n"
HTML.endheader = \
"</head>\n" \
defines = Q_QDOC \
QT_.*_SUPPORT \
QT_.*_LIB \