summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Smith <martin.smith@nokia.com>2010-08-12 07:09:20 (GMT)
committerMartin Smith <martin.smith@nokia.com>2010-08-12 07:09:20 (GMT)
commit03d9d3cf641c8dde22a903870ac2b6e58ada6eec (patch)
treee8cec9d4a89995ab8270876165354f9b3c6aa2be
parentadd515dc7fefd1c6b07ab75d94d033f145293ee4 (diff)
downloadQt-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.
-rw-r--r--doc/doc.pri2
-rw-r--r--tools/qdoc3/htmlgenerator.cpp18
-rw-r--r--tools/qdoc3/htmlgenerator.h1
-rw-r--r--tools/qdoc3/main.cpp15
4 files changed, 6 insertions, 30 deletions
diff --git a/doc/doc.pri b/doc/doc.pri
index e1efa21..a5db3c7 100644
--- a/doc/doc.pri
+++ b/doc/doc.pri
@@ -20,7 +20,7 @@ $$unixstyle {
QDOC = $$replace(QDOC, "/", "\\")
}
ADP_DOCS_QDOCCONF_FILE = -online qt-build-docs.qdocconf
-QT_DOCUMENTATION = ($$QDOC -assistant qt-api-only.qdocconf assistant.qdocconf designer.qdocconf \
+QT_DOCUMENTATION = ($$QDOC -creator qt-api-only.qdocconf assistant.qdocconf designer.qdocconf \
linguist.qdocconf qmake.qdocconf qdeclarative.qdocconf) && \
(cd $$QT_BUILD_TREE && \
$$GENERATOR doc-build/html-qt/qt.qhp -o doc/qch/qt.qch && \
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index 9e8d768..4603a40 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -293,12 +293,8 @@ void HtmlGenerator::initializeGenerator(const Config &config)
application = Online;
else if (app == "creator")
application = Creator;
- else if (app == "assistant")
- application = Assistant;
- else if (app == "base")
- application = Assistant;
else
- application = Online;
+ application = Creator;
projectDescription = config.getString(CONFIG_DESCRIPTION);
if (projectDescription.isEmpty() && !project.isEmpty())
@@ -1841,10 +1837,6 @@ void HtmlGenerator::generateHeader(const QString& title,
// CheckEmptyAndLoadList activating search
out() << "<body class=\"\" onload=\"CheckEmptyAndLoadList();\">\n";
break;
- case Assistant:
- out() << "</head>\n";
- out() << "<body class=\"offline \">\n";
- break;
case Creator:
out() << "</head>\n";
out() << "<body class=\"offline narrow creator\">\n"; // offline narrow
@@ -1866,11 +1858,6 @@ void HtmlGenerator::generateHeader(const QString& title,
generateBreadCrumbs(title,node,marker);
out() << QString(postPostHeader).replace("\\" + COMMAND_VERSION, myTree->version());
break;
- case Assistant:
- out() << QString(creatorPostHeader).replace("\\" + COMMAND_VERSION, myTree->version());
- generateBreadCrumbs(title,node,marker);
- out() << QString(creatorPostPostHeader).replace("\\" + COMMAND_VERSION, myTree->version());
- break;
case Creator:
out() << QString(creatorPostHeader).replace("\\" + COMMAND_VERSION, myTree->version());
generateBreadCrumbs(title,node,marker);
@@ -1988,9 +1975,6 @@ void HtmlGenerator::generateFooter(const Node *node)
out() << " </script> -->\n";
out() << "</body>\n";
break;
- case Assistant:
- out() << "</body>\n";
- break;
case Creator:
out() << "</body>\n";
break;
diff --git a/tools/qdoc3/htmlgenerator.h b/tools/qdoc3/htmlgenerator.h
index 07226f5..eab10c6 100644
--- a/tools/qdoc3/htmlgenerator.h
+++ b/tools/qdoc3/htmlgenerator.h
@@ -97,7 +97,6 @@ class HtmlGenerator : public PageGenerator
enum Application {
Online,
- Assistant,
Creator};
public:
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")