From 5a1e30df86bd54f0abe02bf369caa0a20912c9a4 Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Thu, 11 Oct 2012 14:04:21 +0200 Subject: qdoc: qdoc now can run in 2 passes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Two command line options have been added, -prepare and -generate. If you run qdoc with -prepare, qdoc reads and parses the source files but does not generate the documentation. It only creates the .index file for the module you are running qdoc on. If you run qdoc with -generate, qdoc reads and parses the source files as well as the .index files created by running qdoc with -prepare, and it generates the documentation but no .index file. If you run without either option, qdoc runs as before, i.e. it runs both passes as a single pass. Task number: QTBUG-27539 Change-Id: Idbfe3f0f9dff58283596b504f00dff3f70f6e371 Reviewed-by: Tor Arne Vestbø --- src/tools/qdoc/main.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'src/tools/qdoc/main.cpp') diff --git a/src/tools/qdoc/main.cpp b/src/tools/qdoc/main.cpp index 03974c5d04..5fbc01f1f0 100644 --- a/src/tools/qdoc/main.cpp +++ b/src/tools/qdoc/main.cpp @@ -131,6 +131,10 @@ static void printHelp() "Specify output directory, overrides setting in qdocconf file\n" " -outputformat " "Specify output format, overrides setting in qdocconf file\n" + " -prepare " + "Run qdoc only to generate an index file, not the docs\n" + " -generate " + "Run qdoc to read the index files and generate the docs\n" " -showinternal " "Include content marked internal\n" " -version " @@ -594,6 +598,12 @@ int main(int argc, char **argv) else if (opt == "-debug") { Generator::setDebugSegfaultFlag(true); } + else if (opt == "-prepare") { + Generator::setQDocPass(Generator::Prepare); + } + else if (opt == "-generate") { + Generator::setQDocPass(Generator::Generate); + } else { qdocFiles.append(opt); } -- cgit v1.2.3