diff options
author | Martin Smith <martin.smith@nokia.com> | 2010-08-12 07:09:20 (GMT) |
---|---|---|
committer | Martin Smith <martin.smith@nokia.com> | 2010-08-12 07:09:20 (GMT) |
commit | 03d9d3cf641c8dde22a903870ac2b6e58ada6eec (patch) | |
tree | e8cec9d4a89995ab8270876165354f9b3c6aa2be /tools/qdoc3/main.cpp | |
parent | add515dc7fefd1c6b07ab75d94d033f145293ee4 (diff) | |
download | Qt-03d9d3cf641c8dde22a903870ac2b6e58ada6eec.zip Qt-03d9d3cf641c8dde22a903870ac2b6e58ada6eec.tar.gz Qt-03d9d3cf641c8dde22a903870ac2b6e58ada6eec.tar.bz2 |
qdoc: All references to -assistant and -base were removed.
Flags allowed are now -creator and -online. -creator is
the default.
Diffstat (limited to 'tools/qdoc3/main.cpp')
-rw-r--r-- | tools/qdoc3/main.cpp | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/tools/qdoc3/main.cpp b/tools/qdoc3/main.cpp index 38b76a4..fa7efee 100644 --- a/tools/qdoc3/main.cpp +++ b/tools/qdoc3/main.cpp @@ -194,10 +194,7 @@ static void processQdocconfFile(const QString &fileName) /* Set the application to which qdoc will create the output. - The three applications are: - - base or assistant: simple, basic html output - for offline viewing in the Assistant application. + The two applications are: creator: additional formatting for viewing in the Creator application. @@ -207,9 +204,9 @@ static void processQdocconfFile(const QString &fileName) */ if (appArg.isEmpty()) { qDebug() << "Warning: Application flag not specified on" - << "command line. Options are -assistant, -creator," - << "and -online (default)."; - appArg = "online"; + << "command line. Options are -creator (default)" + << "and -online."; + appArg = "creator"; } config.setStringList(CONFIG_APPLICATION, QStringList(appArg)); @@ -484,10 +481,6 @@ int main(int argc, char **argv) else if (opt == "-obsoletelinks") { obsoleteLinks = true; } - else if (opt == "-base") - appArg = "base"; - else if (opt == "-assistant") - appArg = "assistant"; else if (opt == "-creator") appArg = "creator"; else if (opt == "-online") |