summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorMartin Smith <martin.smith@nokia.com>2010-11-09 12:47:56 (GMT)
committerMartin Smith <martin.smith@nokia.com>2010-11-09 12:47:56 (GMT)
commit2f5fe525c5d9ac142571c39c215386675ee79899 (patch)
treef218bedd7c653278995d0d44d773f49825736b16 /tools
parent2e71fd324eaab8ba08fd748a3dd1c8025a38da2a (diff)
downloadQt-2f5fe525c5d9ac142571c39c215386675ee79899.zip
Qt-2f5fe525c5d9ac142571c39c215386675ee79899.tar.gz
Qt-2f5fe525c5d9ac142571c39c215386675ee79899.tar.bz2
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE topic PUBLIC "-//OASIS//DTD DITA Topic//EN" "dtd/topic.dtd"> <!--commercialeditions.qdoc--> <topic id="id-686f5cb9-31b5-470e-97e6-7b6f8d47e4e8" outputclass="page"> <title>Qt Commercial Edition</title> <shortdesc>Information about the license and features of the Commercial Edition.</shortdesc> <body> <section id="id-3680bc34-a532-447a-b782-1c901e84f41e" outputclass="details"> <p outputclass="brief">Information about the license and features of the Commercial Edition.</p> <p>Qt can be used to develop closed source software if you obtain a commercial license.</p> <p>If you want to develop Free or Open Source software for release using a recognized Open Source license, you can use the <xref href="opensourceedition.xml">Open Source Versions of Qt</xref>.</p> <p>The table below summarizes the differences between the two commercial editions:</p> <p>Please see the <xref href="supported-platforms.xml">list of supported platforms</xref> for up-to-date information about the various platforms and compilers that Qt supports.</p> <p>On the Qt web site, you can find a <xref href="http://qt.nokia.com/products/licensing/">Qt Licensing Overview</xref> and information on <xref href="http://qt.nokia.com/products/pricing/">Qt License Pricing</xref> for commercial editions of Qt and other Qt-related products.</p> <p>To purchase, please visit the <xref href="http://qt.nokia.com/about/contact-us">online order form</xref>.</p> <p>For further information and assistance, please contact Qt sales.</p> <p>Web: http://qt.nokia.com/contact.</p> <p>Phone, U.S&amp;#x2e; office (for North America): <b>1-650-813-1676</b>.</p> <p>Phone, Norway office (for the rest of the world): <b>+47 21 60 48 00</b>.</p> </section> </body> </topic>
Diffstat (limited to 'tools')
-rw-r--r--tools/qdoc3/ditaxmlgenerator.cpp64
-rw-r--r--tools/qdoc3/ditaxmlgenerator.h5
2 files changed, 11 insertions, 58 deletions
diff --git a/tools/qdoc3/ditaxmlgenerator.cpp b/tools/qdoc3/ditaxmlgenerator.cpp
index e2b3ca1..00ec8fd 100644
--- a/tools/qdoc3/ditaxmlgenerator.cpp
+++ b/tools/qdoc3/ditaxmlgenerator.cpp
@@ -639,7 +639,7 @@ int DitaXmlGenerator::generateAtom(const Atom *atom,
const Node* node = 0;
QString link = getLink(atom, relative, marker, &node);
if (!link.isEmpty()) {
- beginLink(link, node, relative, marker);
+ beginLink(link);
generateLink(atom, relative, marker);
endLink();
}
@@ -1091,7 +1091,7 @@ int DitaXmlGenerator::generateAtom(const Atom *atom,
.arg(marker->plainFullName(relative)));
}
else if (!inSectionHeading) {
- beginLink(myLink, node, relative, marker);
+ beginLink(myLink);
}
#if 0
else {
@@ -1107,14 +1107,14 @@ int DitaXmlGenerator::generateAtom(const Atom *atom,
#if 0
qDebug() << "GUID LINK:" << atom->string() << outFileName();
#endif
- beginLink(atom->string(), 0, relative, marker);
+ beginLink(atom->string());
skipAhead = 1;
}
break;
case Atom::LinkNode:
{
const Node* node = CodeMarker::nodeForString(atom->string());
- beginLink(linkForNode(node, relative), node, relative, marker);
+ beginLink(linkForNode(node, relative));
skipAhead = 1;
}
break;
@@ -1476,7 +1476,7 @@ int DitaXmlGenerator::generateAtom(const Atom *atom,
break;
case Atom::UnknownCommand:
xmlWriter().writeStartElement("b");
- xmlWriter().writeAttribute("outputclass","redFont code");
+ xmlWriter().writeAttribute("outputclass","error unknown-command");
xmlWriter().writeCharacters(protectEnc(atom->string()));
xmlWriter().writeEndElement(); // </b>
break;
@@ -3701,20 +3701,6 @@ void DitaXmlGenerator::generateFullName(const Node* apparentNode,
actualNode = apparentNode;
xmlWriter().writeStartElement("xref");
xmlWriter().writeAttribute("href",linkForNode(actualNode, relative));
-#if 0
- if (true || relative == 0 || relative->status() != actualNode->status()) {
- switch (actualNode->status()) {
- case Node::Obsolete:
- xmlWriter().writeAttribute("outputclass","obsolete");
- break;
- case Node::Compat:
- xmlWriter().writeAttribute("outputclass","compat");
- break;
- default:
- break;
- }
- }
-#endif
xmlWriter().writeCharacters(protectEnc(fullName(apparentNode, relative, marker)));
xmlWriter().writeEndElement(); // </xref>
}
@@ -4194,41 +4180,13 @@ void DitaXmlGenerator::generateStatus(const Node* node, CodeMarker* marker)
}
}
-void DitaXmlGenerator::beginLink(const QString& link,
- const Node* node,
- const Node* relative,
- CodeMarker* marker)
+void DitaXmlGenerator::beginLink(const QString& link)
{
- Q_UNUSED(marker)
- Q_UNUSED(relative)
-
this->link = link;
- if (link.isEmpty()) {
- if (showBrokenLinks)
- xmlWriter().writeStartElement("i");
- }
- else if (node == 0 || (relative != 0 &&
- node->status() == relative->status())) {
- xmlWriter().writeStartElement("xref");
- xmlWriter().writeAttribute("href",link);
- }
- else {
- switch (node->status()) {
- case Node::Obsolete:
- xmlWriter().writeStartElement("xref");
- xmlWriter().writeAttribute("href",link);
- //xmlWriter().writeAttribute("outputclass","obsolete");
- break;
- case Node::Compat:
- xmlWriter().writeStartElement("xref");
- xmlWriter().writeAttribute("href",link);
- //xmlWriter().writeAttribute("outputclass","compat");
- break;
- default:
- xmlWriter().writeStartElement("xref");
- xmlWriter().writeAttribute("href",link);
- }
- }
+ if (link.isEmpty())
+ return;
+ xmlWriter().writeStartElement("xref");
+ xmlWriter().writeAttribute("href",link);
inLink = true;
}
@@ -4356,7 +4314,6 @@ void DitaXmlGenerator::generateQmlInherits(const QmlClassNode* cn,
if (n && n->subType() == Node::QmlClass) {
const QmlClassNode* qcn = static_cast<const QmlClassNode*>(n);
xmlWriter().writeStartElement("p");
- xmlWriter().writeAttribute("outputclass","centerAlign");
Text text;
text << "[Inherits ";
text << Atom(Atom::LinkNode,CodeMarker::stringForNode(qcn));
@@ -4404,7 +4361,6 @@ void DitaXmlGenerator::generateQmlInstantiates(const QmlClassNode* qcn,
const ClassNode* cn = qcn->classNode();
if (cn && (cn->status() != Node::Internal)) {
xmlWriter().writeStartElement("p");
- xmlWriter().writeAttribute("outputclass","centerAlign");
Text text;
text << "[";
text << Atom(Atom::LinkNode,CodeMarker::stringForNode(qcn));
diff --git a/tools/qdoc3/ditaxmlgenerator.h b/tools/qdoc3/ditaxmlgenerator.h
index 29ec546..427264c 100644
--- a/tools/qdoc3/ditaxmlgenerator.h
+++ b/tools/qdoc3/ditaxmlgenerator.h
@@ -245,10 +245,7 @@ class DitaXmlGenerator : public PageGenerator
#ifdef GENERATE_MAC_REFS
void generateMacRef(const Node* node, CodeMarker* marker);
#endif
- void beginLink(const QString& link,
- const Node* node,
- const Node* relative,
- CodeMarker* marker);
+ void beginLink(const QString& link);
void endLink();
QString writeGuidAttribute(QString text);
void writeGuidAttribute(Node* node);
generated by cgit v0.12 at 2024-12-26 15:41:21 (GMT)