diff options
| author | Martin Smith <martin.smith@digia.com> | 2013-08-09 14:41:10 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-12 09:10:15 +0200 |
| commit | b3a56454c35e14217d62ea95b3244f6c37b2e88b (patch) | |
| tree | f28091b8cdb26143d51befe426be51c5a89b3abf /src | |
| parent | 865b43dbf3f220cce61d245b7042e777e834952c (diff) | |
qdoc: Let default output subdir be html
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/qdoc/config.cpp | 5 | ||||
| -rw-r--r-- | src/tools/qdoc/main.cpp | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/tools/qdoc/config.cpp b/src/tools/qdoc/config.cpp index c63dba7a01..8729bf387f 100644 --- a/src/tools/qdoc/config.cpp +++ b/src/tools/qdoc/config.cpp @@ -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; } diff --git a/src/tools/qdoc/main.cpp b/src/tools/qdoc/main.cpp index e163246e84..912cdad7eb 100644 --- a/src/tools/qdoc/main.cpp +++ b/src/tools/qdoc/main.cpp @@ -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 |