diff options
| author | Pierre Rossi <pierre.rossi@digia.com> | 2012-09-25 14:35:12 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-09-28 07:32:55 +0200 |
| commit | a1521579983860f4f7b02d6eddc478448715ac0b (patch) | |
| tree | 7e32adda9392b5511f8f3dca9ddd662944b72d1a /src/tools/qdoc/generator.cpp | |
| parent | e47faabe238d856ff6c1454a7fc9483461206b37 (diff) | |
QDoc: remove the experimental basedir variable
It was introduced in the early days of the docs'
modularization and appears not to be used anywhere
anymore.
Change-Id: I5b0c60d92828624af2129153fce96ad01aec861c
Reviewed-by: Martin Smith <martin.smith@digia.com>
Diffstat (limited to 'src/tools/qdoc/generator.cpp')
| -rw-r--r-- | src/tools/qdoc/generator.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/tools/qdoc/generator.cpp b/src/tools/qdoc/generator.cpp index 75d6629990..d40fec81f4 100644 --- a/src/tools/qdoc/generator.cpp +++ b/src/tools/qdoc/generator.cpp @@ -58,7 +58,6 @@ QT_BEGIN_NAMESPACE -QString Generator::baseDir_; Generator* Generator::currentGenerator_; QStringList Generator::exampleDirs; QStringList Generator::exampleImgExts; @@ -1453,11 +1452,7 @@ void Generator::initialize(const Config &config) outputFormats = config.getOutputFormats(); if (!outputFormats.isEmpty()) { outDir_ = config.getOutputDir(); - baseDir_ = config.getString(CONFIG_BASEDIR); - if (!baseDir_.isEmpty()) - config.location().warning(tr("\"basedir\" specified in config file. " - "All output will be in module directories " - "of the output directory")); + if (outDir_.isEmpty()) config.lastLocation().fatal(tr("No output directory specified in " "configuration file or on the command line")); |