AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qdoc: Let default output subdir be html

Browse Source 
When you want qdoc to output the docs in a
single output subdirectory, you would add
these lines to your qdocconf file:

HTML.nosubdirs            = "true"
HTML.outputsubdir         = "html"

The name of the output subdir can be anything.
But if you leave out the second line, qdoc now
defaults to using "html" as the single output
subdir.

Task-number: QTBUG-32580
Change-Id: Ibfb2a0c578515ef934e816b2d7a516b64f0f9dcf
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
This commit is contained in:
Martin Smith 2013-08-09 14:41:10 +02:00 committed by The Qt Project
parent 865b43dbf3
commit b3a56454c3
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/tools/qdoc/config.cpp
View File

@ -286,7 +286,10 @@ QString Config::getOutputDir() const
t = overrideOutputDir;
if (!Generator::useOutputSubdirs()) {
t = t.left(t.lastIndexOf('/'));
t += QLatin1Char('/') + getString("HTML.outputsubdir");
QString singleOutputSubdir = getString("HTML.outputsubdir");
if (singleOutputSubdir.isEmpty())
singleOutputSubdir = "html";
t += QLatin1Char('/') + singleOutputSubdir;
}
return t;
}

2
src/tools/qdoc/main.cpp
View File

@ -170,6 +170,8 @@ static void loadIndexFiles(Config& config)
if (config.getBool(QString("HTML.nosubdirs"))) {
noOutputSubdirs = true;
singleOutputSubdir = config.getString("HTML.outputsubdir");
if (singleOutputSubdir.isEmpty())
singleOutputSubdir = "html";
}
// Allow modules and third-party application/libraries to link