diff options
78 files changed, 535 insertions, 1606 deletions
diff --git a/.qmake.conf b/.qmake.conf index bf8c411f1..4a55f5212 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) DEFINES += QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST -MODULE_VERSION = 5.15.12 +MODULE_VERSION = 5.15.13 diff --git a/src/assistant/assistant/helpenginewrapper.cpp b/src/assistant/assistant/helpenginewrapper.cpp index c927a2ef1..afaa6e503 100644 --- a/src/assistant/assistant/helpenginewrapper.cpp +++ b/src/assistant/assistant/helpenginewrapper.cpp @@ -107,6 +107,11 @@ private: HelpEngineWrapper *HelpEngineWrapper::helpEngineWrapper = nullptr; +HelpEngineWrapper &HelpEngineWrapper::instance() +{ + return instance({}); +} + HelpEngineWrapper &HelpEngineWrapper::instance(const QString &collectionFile) { TRACE_OBJ diff --git a/src/assistant/assistant/helpenginewrapper.h b/src/assistant/assistant/helpenginewrapper.h index df2ec8a73..68e4c7011 100644 --- a/src/assistant/assistant/helpenginewrapper.h +++ b/src/assistant/assistant/helpenginewrapper.h @@ -64,7 +64,8 @@ class HelpEngineWrapper : public QObject Q_DISABLE_COPY(HelpEngineWrapper) friend class TimeoutForwarder; public: - static HelpEngineWrapper &instance(const QString &collectionFile = QString()); + static HelpEngineWrapper &instance(); + static HelpEngineWrapper &instance(const QString &collectionFile); static void removeInstance(); // Forwarded help engine member functions, possibly enriched. diff --git a/src/designer/src/lib/shared/qlayout_widget_p.h b/src/designer/src/lib/shared/qlayout_widget_p.h index 1efe3a905..af6f1c9c6 100644 --- a/src/designer/src/lib/shared/qlayout_widget_p.h +++ b/src/designer/src/lib/shared/qlayout_widget_p.h @@ -201,6 +201,7 @@ public: // grid helpers: find item index static int findItemAt(QGridLayout *, int row, int column); + using QDesignerLayoutDecorationExtension::findItemAt; // grid helpers: Quick check whether simplify should be enabled for grids. May return false positives. static bool canSimplifyQuickCheck(const QGridLayout *); static bool canSimplifyQuickCheck(const QFormLayout *fl); diff --git a/src/qdoc/doc/qdoc-manual-markupcmds.qdoc b/src/qdoc/doc/qdoc-manual-markupcmds.qdoc index f03be6899..97671044a 100644 --- a/src/qdoc/doc/qdoc-manual-markupcmds.qdoc +++ b/src/qdoc/doc/qdoc-manual-markupcmds.qdoc @@ -3715,14 +3715,11 @@ \target meta-command \section1 \\meta - The \\meta command is used for adding metadata to example documentation, - and when generating HTML output for specifying the \e maintainer(s) of a - C++ class. - + The \\meta command is used for adding metadata to example documentation. The command has two arguments: the first argument is the name of the - metadata attribute, and the second argument is the - value for the attribute. Each argument should be enclosed in curly - brackets, as shown in this example: + metadata attribute, and the second argument is the value for the attribute. + Each argument should be enclosed in curly brackets, as shown in this + example: \code / *! diff --git a/src/qdoc/docbookgenerator.cpp b/src/qdoc/docbookgenerator.cpp index c835e1842..0248125c0 100644 --- a/src/qdoc/docbookgenerator.cpp +++ b/src/qdoc/docbookgenerator.cpp @@ -2349,38 +2349,6 @@ void DocBookGenerator::generateAlsoList(const Node *node, CodeMarker *marker) } /*! - Generate a list of maintainers in the output - */ -void DocBookGenerator::generateMaintainerList(const Aggregate *node, CodeMarker *marker) -{ - Q_UNUSED(marker); - // From Generator::generateMaintainerList. - QStringList sl = getMetadataElements(node, "maintainer"); - - if (!sl.isEmpty()) { - writer->writeStartElement(dbNamespace, "para"); - writer->writeStartElement(dbNamespace, "emphasis"); - writer->writeCharacters("Maintained by: "); - writer->writeEndElement(); // emphasis - newLine(); - - writer->writeStartElement(dbNamespace, "simplelist"); - writer->writeAttribute("type", "vert"); - writer->writeAttribute("role", "maintainer"); - for (int i = 0; i < sl.size(); ++i) { - writer->writeStartElement(dbNamespace, "member"); - writer->writeCharacters(sl.at(i)); - writer->writeEndElement(); // member - newLine(); - } - writer->writeEndElement(); // simplelist - newLine(); - - writer->writeEndElement(); // para - } -} - -/*! Open a new file to write XML contents, including the DocBook opening tag. */ @@ -2477,7 +2445,6 @@ void DocBookGenerator::generateCppReferencePage(Node *node) generateBody(aggregate); generateAlsoList(aggregate); - generateMaintainerList(aggregate); endSection(); } @@ -4071,7 +4038,6 @@ void DocBookGenerator::generateProxyPage(Aggregate *aggregate) generateBody(aggregate); generateAlsoList(aggregate); - generateMaintainerList(aggregate); endSection(); } diff --git a/src/qdoc/docbookgenerator.h b/src/qdoc/docbookgenerator.h index 753f5be33..d01739b79 100644 --- a/src/qdoc/docbookgenerator.h +++ b/src/qdoc/docbookgenerator.h @@ -127,7 +127,6 @@ private: void generateBrief(const Node *node); void generateAlsoList(const Node *node, CodeMarker *marker = nullptr) override; void generateSignatureList(const NodeList &nodes); - void generateMaintainerList(const Aggregate *node, CodeMarker *marker = nullptr) override; void generateReimplementsClause(const FunctionNode *fn); void generateClassHierarchy(const Node *relative, NodeMap &classMap); void generateFunctionIndex(const Node *relative); diff --git a/src/qdoc/generator.cpp b/src/qdoc/generator.cpp index e753d3090..c176f2e72 100644 --- a/src/qdoc/generator.cpp +++ b/src/qdoc/generator.cpp @@ -1191,45 +1191,6 @@ void Generator::generateDocumentation(Node *node) } /*! - Generate a list of maintainers in the output - */ -void Generator::generateMaintainerList(const Aggregate *node, CodeMarker *marker) -{ - QStringList sl = getMetadataElements(node, "maintainer"); - - if (!sl.isEmpty()) { - Text text; - text << Atom::ParaLeft << Atom(Atom::FormattingLeft, ATOM_FORMATTING_BOLD) - << "Maintained by: " << Atom(Atom::FormattingRight, ATOM_FORMATTING_BOLD); - - for (int i = 0; i < sl.size(); ++i) - text << sl.at(i) << separator(i, sl.size()); - - text << Atom::ParaRight; - generateText(text, node, marker); - } -} - -/*! - Output the "Inherit by" list for the QML element, - if it is inherited by any other elements. - */ -void Generator::generateQmlInheritedBy(const QmlTypeNode *qcn, CodeMarker *marker) -{ - if (qcn) { - NodeList subs; - QmlTypeNode::subclasses(qcn, subs); - if (!subs.isEmpty()) { - Text text; - text << Atom::ParaLeft << "Inherited by "; - appendSortedQmlNames(text, qcn, subs); - text << Atom::ParaRight; - generateText(text, qcn, marker); - } - } -} - -/*! Extract sections of markup text surrounded by \e qmltext and \e endqmltext and output them. */ diff --git a/src/qdoc/generator.h b/src/qdoc/generator.h index 8a613224f..f7a1cfccd 100644 --- a/src/qdoc/generator.h +++ b/src/qdoc/generator.h @@ -112,9 +112,6 @@ protected: virtual void generateInheritedBy(const ClassNode *classe, CodeMarker *marker); virtual void generateInherits(const ClassNode *classe, CodeMarker *marker); virtual void generateDocumentation(Node *node); - virtual void generateMaintainerList(const Aggregate *node, CodeMarker *marker); - virtual void generateQmlInheritedBy(const QmlTypeNode *qcn, CodeMarker *marker); - virtual void generateQmlInherits(QmlTypeNode *, CodeMarker *) {} virtual bool generateQmlText(const Text &text, const Node *relative, CodeMarker *marker, const QString &qmlName); virtual bool generateText(const Text &text, const Node *relative, CodeMarker *marker); diff --git a/src/qdoc/htmlgenerator.cpp b/src/qdoc/htmlgenerator.cpp index 055a40229..e293b5aae 100644 --- a/src/qdoc/htmlgenerator.cpp +++ b/src/qdoc/htmlgenerator.cpp @@ -72,7 +72,7 @@ static void addLink(const QString &linkTarget, const QStringRef &nestedStuff, QS if (!linkTarget.isEmpty()) { *res += QLatin1String("<a href=\""); *res += linkTarget; - *res += QLatin1String("\">"); + *res += QLatin1String("\" translate=\"no\">"); *res += nestedStuff; *res += QLatin1String("</a>"); } else { @@ -118,12 +118,12 @@ void HtmlGenerator::initializeGenerator() } defaults[] = { { ATOM_FORMATTING_BOLD, "<b>", "</b>" }, { ATOM_FORMATTING_INDEX, "<!--", "-->" }, { ATOM_FORMATTING_ITALIC, "<i>", "</i>" }, - { ATOM_FORMATTING_PARAMETER, "<i>", "</i>" }, + { ATOM_FORMATTING_PARAMETER, "<i translate=\"no\">", "</i>" }, { ATOM_FORMATTING_SUBSCRIPT, "<sub>", "</sub>" }, { ATOM_FORMATTING_SUPERSCRIPT, "<sup>", "</sup>" }, - { ATOM_FORMATTING_TELETYPE, "<code>", + { ATOM_FORMATTING_TELETYPE, "<code translate=\"no\">", "</code>" }, // <tt> tag is not supported in HTML5 - { ATOM_FORMATTING_UICONTROL, "<b>", "</b>" }, + { ATOM_FORMATTING_UICONTROL, "<b translate=\"no\">", "</b>" }, { ATOM_FORMATTING_UNDERLINE, "<u>", "</u>" }, { nullptr, nullptr, nullptr } }; @@ -538,7 +538,7 @@ int HtmlGenerator::generateAtom(const Atom *atom, const Node *relative, CodeMark } break; case Atom::Qml: - out() << "<pre class=\"qml\">" + out() << "<pre class=\"qml\" translate=\"no\">" << trimmedTrailing(highlightedCode(indent(codeIndent, atom->string()), relative, false, Node::QML), codePrefix, codeSuffix) @@ -555,7 +555,7 @@ int HtmlGenerator::generateAtom(const Atom *atom, const Node *relative, CodeMark out() << "<p>you can rewrite it as</p>\n"; Q_FALLTHROUGH(); case Atom::Code: - out() << "<pre class=\"cpp\">" + out() << "<pre class=\"cpp\" translate=\"no\">" << trimmedTrailing(highlightedCode(indent(codeIndent, atom->string()), relative), codePrefix, codeSuffix) << "</pre>\n"; @@ -564,7 +564,7 @@ int HtmlGenerator::generateAtom(const Atom *atom, const Node *relative, CodeMark out() << "<p>For example, if you have code like</p>\n"; Q_FALLTHROUGH(); case Atom::CodeBad: - out() << "<pre class=\"cpp plain\">" + out() << "<pre class=\"cpp plain\" translate=\"no\">" << trimmedTrailing(protectEnc(plainCode(indent(codeIndent, atom->string()))), codePrefix, codeSuffix) << "</pre>\n"; @@ -750,7 +750,7 @@ int HtmlGenerator::generateAtom(const Atom *atom, const Node *relative, CodeMark NodeVector nv = map->values().toVector(); out() << "<p>Class "; - out() << "<a href=\"" << linkForNode(map.key(), relative) << "\">"; + out() << "<a href=\"" << linkForNode(map.key(), relative) << "\" translate=\"no\">"; QStringList pieces = map.key()->fullName().split("::"); out() << protectEnc(pieces.last()); out() << "</a>" @@ -931,7 +931,7 @@ int HtmlGenerator::generateAtom(const Atom *atom, const Node *relative, CodeMark QPair<QString, int> pair = getAtomListValue(atom); skipAhead = pair.second; QString t = protectEnc(plainCode(marker->markedUpEnumValue(pair.first, relative))); - out() << "<tr><td class=\"topAlign\"><code>" << t << "</code>"; + out() << "<tr><td class=\"topAlign\"><code translate=\"no\">" << t << "</code>"; if (relative->isEnumType()) { out() << "</td><td class=\"topAlign tblval\">"; @@ -940,7 +940,7 @@ int HtmlGenerator::generateAtom(const Atom *atom, const Node *relative, CodeMark if (itemValue.isEmpty()) out() << '?'; else - out() << "<code>" << protectEnc(itemValue) << "</code>"; + out() << "<code translate=\"no\">" << protectEnc(itemValue) << "</code>"; } } break; @@ -1126,7 +1126,7 @@ int HtmlGenerator::generateAtom(const Atom *atom, const Node *relative, CodeMark out() << "<b class=\"redFont\"><Missing HTML></b>"; break; case Atom::UnknownCommand: - out() << "<b class=\"redFont\"><code>\\" << protectEnc(atom->string()) << "</code></b>"; + out() << "<b class=\"redFont\"><code translate=\"no\">\\" << protectEnc(atom->string()) << "</code></b>"; break; case Atom::QmlText: case Atom::EndQmlText: @@ -1302,7 +1302,6 @@ void HtmlGenerator::generateCppReferencePage(Aggregate *aggregate, CodeMarker *m generateBody(aggregate, marker); out() << "</div>\n"; // QTBUG-9504 generateAlsoList(aggregate, marker); - generateMaintainerList(aggregate, marker); generateExtractionMark(aggregate, EndMark); } @@ -1406,7 +1405,6 @@ void HtmlGenerator::generateProxyPage(Aggregate *aggregate, CodeMarker *marker) generateBody(aggregate, marker); out() << "</div>\n"; // QTBUG-9504 generateAlsoList(aggregate, marker); - generateMaintainerList(aggregate, marker); generateExtractionMark(aggregate, EndMark); } @@ -1970,14 +1968,18 @@ void HtmlGenerator::generateTitle(const QString &title, const Text &subtitle, CodeMarker *marker) { out() << QString(prologue).replace("\\" + COMMAND_VERSION, qdb_->version()); + QString attribute; + if (relative->genus() != Node::DontCare && relative->genus() != Node::DOC) + attribute = R"( translate="no")"; + if (!title.isEmpty()) - out() << "<h1 class=\"title\">" << protectEnc(title) << "</h1>\n"; + out() << "<h1 class=\"title\"" << attribute << ">" << protectEnc(title) << "</h1>\n"; if (!subtitle.isEmpty()) { out() << "<span"; if (subTitleSize == SmallSubTitle) - out() << " class=\"small-subtitle\">"; + out() << " class=\"small-subtitle\"" << attribute << ">"; else - out() << " class=\"subtitle\">"; + out() << " class=\"subtitle\"" << attribute << ">"; generateText(subtitle, relative, marker); out() << "</span>\n"; } @@ -2090,10 +2092,9 @@ void HtmlGenerator::generateRequisites(Aggregate *aggregate, CodeMarker *marker) if (!requisites.isEmpty()) { // generate the table - out() << "<div class=\"table\"><table class=\"alignedsummary\">\n"; + out() << "<div class=\"table\"><table class=\"alignedsummary\" translate=\"no\">\n"; for (auto it = requisiteorder.constBegin(); it != requisiteorder.constEnd(); ++it) { - if (requisites.contains(*it)) { out() << "<tr>" << "<td class=\"memItemLeft rightAlign topAlign\"> " << *it @@ -2201,7 +2202,7 @@ void HtmlGenerator::generateQmlRequisites(QmlTypeNode *qcn, CodeMarker *marker) if (!requisites.isEmpty()) { // generate the table - out() << "<div class=\"table\"><table class=\"alignedsummary\">\n"; + out() << "<div class=\"table\"><table class=\"alignedsummary\" translate=\"no\">\n"; for (const auto &requisite : requisiteorder) { if (requisites.contains(requisite)) { @@ -2423,7 +2424,7 @@ QString HtmlGenerator::generateAllQmlMembersFile(const Sections §ions, CodeM continue; std::function<void(Node *)> generate = [&](Node *n) { - out() << "<li class=\"fn\">"; + out() << "<li class=\"fn\" translate=\"no\">"; generateQmlItem(n, aggregate, marker, true); if (n->isDefault()) out() << " [default]"; @@ -2472,7 +2473,7 @@ QString HtmlGenerator::generateObsoleteMembersFile(const Sections §ions, Cod generateTitle(title, Text(), SmallSubTitle, aggregate, marker); out() << "<p><b>The following members of class " - << "<a href=\"" << linkForNode(aggregate, nullptr) << "\">" + << "<a href=\"" << linkForNode(aggregate, nullptr) << "\" translate=\"no\">" << protectEnc(aggregate->name()) << "</a>" << " are obsolete.</b> " << "They are provided to keep old source code working. " @@ -2633,7 +2634,7 @@ void HtmlGenerator::generateAnnotatedList(const Node *relative, CodeMarker *mark out() << "<tr class=\"odd topAlign\">"; else out() << "<tr class=\"even topAlign\">"; - out() << "<td class=\"tblName\"><p>"; + out() << "<td class=\"tblName\" translate=\"no\"><p>"; generateFullName(node, relative); out() << "</p></td>"; @@ -2746,7 +2747,7 @@ void HtmlGenerator::generateCompactList(ListType listType, const Node *relative, Output the alphabet as a row of links. */ if (includeAlphabet) { - out() << "<p class=\"centerAlign functionIndex\"><b>"; + out() << "<p class=\"centerAlign functionIndex\" translate=\"no\"><b>"; for (int i = 0; i < 26; i++) { QChar ch('a' + i); if (usedParagraphNames.contains(char('a' + i))) @@ -2758,7 +2759,7 @@ void HtmlGenerator::generateCompactList(ListType listType, const Node *relative, /* Output a <div> element to contain all the <dl> elements. */ - out() << "<div class=\"flowListDiv\">\n"; + out() << "<div class=\"flowListDiv\" translate=\"no\">\n"; numTableRows_ = 0; int curParNr = 0; @@ -2853,7 +2854,7 @@ void HtmlGenerator::generateCompactList(ListType listType, const Node *relative, void HtmlGenerator::generateFunctionIndex(const Node *relative) { - out() << "<p class=\"centerAlign functionIndex\"><b>"; + out() << "<p class=\"centerAlign functionIndex\" translate=\"no\"><b>"; for (int i = 0; i < 26; i++) { QChar ch('a' + i); out() << QString("<a href=\"#%1\">%2</a> ").arg(ch).arg(ch.toUpper()); @@ -2863,7 +2864,7 @@ void HtmlGenerator::generateFunctionIndex(const Node *relative) char nextLetter = 'a'; char currentLetter; - out() << "<ul>\n"; + out() << "<ul translate=\"no\">\n"; NodeMapMap &funcIndex = qdb_->getFunctionIndex(); for (auto fnMap = funcIndex.constBegin(); fnMap != funcIndex.constEnd(); ++fnMap) { out() << "<li>"; @@ -3002,10 +3003,10 @@ void HtmlGenerator::generateSection(const NodeVector &nv, const Node *relative, alignNames = false; } if (alignNames) { - out() << "<div class=\"table\"><table class=\"alignedsummary\">\n"; + out() << "<div class=\"table\"><table class=\"alignedsummary\" translate=\"no\">\n"; } else { if (twoColumn) - out() << "<div class=\"table\"><table class=\"propsummary\">\n" + out() << "<div class=\"table\"><table class=\"propsummary\" translate=\"no\">\n" << "<tr><td class=\"topAlign\">"; out() << "<ul>\n"; } @@ -3020,7 +3021,7 @@ void HtmlGenerator::generateSection(const NodeVector &nv, const Node *relative, } else { if (twoColumn && i == (nv.count() + 1) / 2) out() << "</ul></td><td class=\"topAlign\"><ul>\n"; - out() << "<li class=\"fn\">"; + out() << "<li class=\"fn\" translate=\"no\">"; } generateSynopsis(member, relative, marker, Section::Summary, alignNames); @@ -3058,10 +3059,10 @@ void HtmlGenerator::generateSectionList(const Section §ion, const Node *rela alignNames = false; } if (alignNames) { - out() << "<div class=\"table\"><table class=\"alignedsummary\">\n"; + out() << "<div class=\"table\"><table class=\"alignedsummary\" translate=\"no\">\n"; } else { if (twoColumn) - out() << "<div class=\"table\"><table class=\"propsummary\">\n" + out() << "<div class=\"table\"><table class=\"propsummary\" translate=\"no\">\n" << "<tr><td class=\"topAlign\">"; out() << "<ul>\n"; } @@ -3076,7 +3077,7 @@ void HtmlGenerator::generateSectionList(const Section §ion, const Node *rela } else { if (twoColumn && i == (members.count() + 1) / 2) out() << "</ul></td><td class=\"topAlign\"><ul>\n"; - out() << "<li class=\"fn\">"; + out() << "<li class=\"fn\" translate=\"no\">"; } QString prefix; @@ -3131,7 +3132,7 @@ void HtmlGenerator::generateSectionInheritedList(const Section §ion, const N { const QVector<QPair<Aggregate *, int>> &inheritedMembers = section.inheritedMembers(); for (const auto &member : inheritedMembers) { - out() << "<li class=\"fn\">"; + out() << "<li class=\"fn\" translate=\"no\">"; out() << member.second << ' '; if (member.second == 1) { out() << section.singular(); @@ -3170,7 +3171,7 @@ void HtmlGenerator::generateSynopsis(const Node *node, const Node *relative, Cod extraRegExp.setMinimal(true); marked.remove(extraRegExp); } else { - marked.replace("<@extra>", "<code>"); + marked.replace("<@extra>", "<code translate=\"no\">"); marked.replace("</@extra>", "</code>"); } @@ -3447,7 +3448,7 @@ void HtmlGenerator::generateDetailedMember(const Node *node, const PageNode *rel out() << "<div class=\"fngroup\">\n"; for (const auto *node : collective) { nodeRef = refForNode(node); - out() << "<h3 class=\"fn fngroupitem\" id=\"" << nodeRef << "\">"; + out() << "<h3 class=\"fn fngroupitem\" translate=\"no\" id=\"" << nodeRef << "\">"; out() << "<a name=\"" + nodeRef + "\"></a>"; generateSynopsis(node, relative, marker, Section::Details); out() << "</h3>"; @@ -3468,7 +3469,7 @@ void HtmlGenerator::generateDetailedMember(const Node *node, const PageNode *rel generateSynopsis(etn->flagsType(), relative, marker, Section::Details); out() << "</h3>\n"; } else { - out() << "<h3 class=\"fn\" id=\"" << nodeRef << "\">"; + out() << "<h3 class=\"fn\" translate=\"no\" id=\"" << nodeRef << "\">"; out() << "<a name=\"" + nodeRef + "\"></a>"; generateSynopsis(node, relative, marker, Section::Details); out() << "</h3>" << divNavTop << '\n'; @@ -3542,7 +3543,7 @@ void HtmlGenerator::beginLink(const QString &link) if (showBrokenLinks) out() << "<i>"; } - out() << "<a href=\"" << link_ << "\">"; + out() << "<a href=\"" << link_ << "\" translate=\"no\">"; inLink_ = true; } @@ -3553,11 +3554,11 @@ void HtmlGenerator::beginLink(const QString &link, const Node *node, const Node if (showBrokenLinks) out() << "<i>"; } else if (node == nullptr || (relative != nullptr && node->status() == relative->status())) - out() << "<a href=\"" << link_ << "\">"; + out() << "<a href=\"" << link_ << "\" translate=\"no\">"; else if (node->isObsolete()) - out() << "<a href=\"" << link_ << "\" class=\"obsolete\">"; + out() << "<a href=\"" << link_ << "\" class=\"obsolete\" translate=\"no\">"; else - out() << "<a href=\"" << link_ << "\">"; + out() << "<a href=\"" << link_ << "\" translate=\"no\">"; inLink_ = true; } @@ -3588,7 +3589,7 @@ void HtmlGenerator::generateQmlSummary(const NodeVector &members, const Node *re if (!members.isEmpty()) { out() << "<ul>\n"; for (const auto &member : members) { - out() << "<li class=\"fn\">"; + out() << "<li class=\"fn\" translate=\"no\">"; generateQmlItem(member, relative, marker, true); if (member->isPropertyGroup()) { const SharedCommentNode *scn = static_cast<const SharedCommentNode *>(member); @@ -3597,7 +3598,7 @@ void HtmlGenerator::generateQmlSummary(const NodeVector &members, const Node *re const QVector<Node *> sharedNodes = scn->collective(); for (const auto &node : sharedNodes) { if (node->isQmlProperty() || node->isJsProperty()) { - out() << "<li class=\"fn\">"; + out() << "<li class=\"fn\" translate=\"no\">"; generateQmlItem(node, relative, marker, true); out() << "</li>\n"; } @@ -3624,7 +3625,7 @@ void HtmlGenerator::generateDetailedQmlMember(Node *node, const Aggregate *relat generateExtractionMark(node, MemberMark); generateKeywordAnchors(node); - QString qmlItemHeader("<div class=\"qmlproto\">\n" + QString qmlItemHeader("<div class=\"qmlproto\" translate=\"no\">\n" "<div class=\"table\"><table class=\"qmlname\">\n"); QString qmlItemStart("<tr valign=\"top\" class=\"odd\" id=\"%1\">\n" @@ -3708,30 +3709,6 @@ void HtmlGenerator::generateDetailedQmlMember(Node *node, const Aggregate *relat } /*! - Output the "Inherits" line for the QML element, - if there should be one. - */ -void HtmlGenerator::generateQmlInherits(QmlTypeNode *qcn, CodeMarker *marker) -{ - if (!qcn) - return; - QmlTypeNode *base = qcn->qmlBaseNode(); - while (base && base->isInternal()) { - base = base->qmlBaseNode(); - } - if (base) { - Text text; - text << Atom::ParaLeft << "Inherits "; - text << Atom(Atom::LinkNode, CodeMarker::stringForNode(base)); - text << Atom(Atom::FormattingLeft, ATOM_FORMATTING_LINK); - text << Atom(Atom::String, base->name()); - text << Atom(Atom::FormattingRight, ATOM_FORMATTING_LINK); - text << Atom::ParaRight; - generateText(text, qcn, marker); - } -} - -/*! Output the "[Xxx instantiates the C++ class QmlGraphicsXxx]" line for the QML element, if there should be one. diff --git a/src/qdoc/htmlgenerator.h b/src/qdoc/htmlgenerator.h index 8a3e43863..0a085d011 100644 --- a/src/qdoc/htmlgenerator.h +++ b/src/qdoc/htmlgenerator.h @@ -128,7 +128,6 @@ private: void generateQmlSummary(const NodeVector &members, const Node *relative, CodeMarker *marker); void generateQmlItem(const Node *node, const Node *relative, CodeMarker *marker, bool summary); void generateDetailedQmlMember(Node *node, const Aggregate *relative, CodeMarker *marker); - void generateQmlInherits(QmlTypeNode *qcn, CodeMarker *marker) override; void generateQmlInstantiates(QmlTypeNode *qcn, CodeMarker *marker); void generateInstantiatedBy(ClassNode *cn, CodeMarker *marker); diff --git a/src/qtattributionsscanner/main.cpp b/src/qtattributionsscanner/main.cpp index b3fb236c1..7459af36f 100644 --- a/src/qtattributionsscanner/main.cpp +++ b/src/qtattributionsscanner/main.cpp @@ -147,8 +147,8 @@ int main(int argc, char *argv[]) std::cerr << qPrintable(tr("%1 packages found.").arg(packages.size())) << std::endl; // Prepare the output text stream - QTextStream out(stdout); QFile outFile(parser.value(outputOption)); + QTextStream out(stdout); if (!outFile.fileName().isEmpty()) { if (!outFile.open(QFile::WriteOnly)) { std::cerr << qPrintable(tr("Cannot open %1 for writing.").arg( diff --git a/tests/auto/qdoc/generatedoutput/expected_output/crossmodule/testtype-members.html b/tests/auto/qdoc/generatedoutput/expected_output/crossmodule/testtype-members.html index 1b7260e33..7e7917916 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/crossmodule/testtype-members.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/crossmodule/testtype-members.html @@ -8,19 +8,19 @@ <body> <li>TestType</li> <div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">List of All Members for TestType</h1> +<h1 class="title" translate="no">List of All Members for TestType</h1> <p>This is the complete list of members for <a href="testtype.html">TestType</a>, including inherited members.</p> <ul> -<li class="fn"><span class="name"><b><a href="testqdoc-testderived.html#DerivedType-alias">DerivedType</a></b></span></li> -<li class="fn"><span class="name"><b><a href="testqdoc-testderived.html#NotTypedef-alias">NotTypedef</a></b></span></li> -<li class="fn">typedef <span class="name"><b><a href="testqdoc-test.html#SomeType-typedef">SomeType</a></b></span></li> -<li class="fn"><span class="name"><b><a href="testqdoc-test.html#inlineFunction">inlineFunction</a></b></span>()</li> -<li class="fn"><span class="name"><b><a href="testtype.html#nothing">nothing</a></b></span>()</li> -<li class="fn"><span class="name"><b><a href="testqdoc-test.html#overload">overload</a></b></span>()</li> -<li class="fn"><span class="name"><b><a href="testqdoc-test.html#overload-1">overload</a></b></span>(bool )</li> -<li class="fn"><span class="name"><b><a href="testqdoc-test.html#someFunction">someFunction</a></b></span>(int ) : int</li> -<li class="fn"><span class="name"><b><a href="testqdoc-test.html#someFunctionDefaultArg">someFunctionDefaultArg</a></b></span>(int , bool )</li> -<li class="fn"><span class="name"><b><a href="testqdoc-testderived.html#virtualFun">virtualFun</a></b></span>()</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-testderived.html#DerivedType-alias" translate="no">DerivedType</a></b></span></li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-testderived.html#NotTypedef-alias" translate="no">NotTypedef</a></b></span></li> +<li class="fn" translate="no">typedef <span class="name"><b><a href="testqdoc-test.html#SomeType-typedef" translate="no">SomeType</a></b></span></li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#inlineFunction" translate="no">inlineFunction</a></b></span>()</li> +<li class="fn" translate="no"><span class="name"><b><a href="testtype.html#nothing" translate="no">nothing</a></b></span>()</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#overload" translate="no">overload</a></b></span>()</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#overload-1" translate="no">overload</a></b></span>(bool )</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#someFunction" translate="no">someFunction</a></b></span>(int ) : int</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#someFunctionDefaultArg" translate="no">someFunctionDefaultArg</a></b></span>(int , bool )</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-testderived.html#virtualFun" translate="no">virtualFun</a></b></span>()</li> </ul> </body> </html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/crossmodule/testtype.html b/tests/auto/qdoc/generatedoutput/expected_output/crossmodule/testtype.html index dcf2114b7..730d10dc8 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/crossmodule/testtype.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/crossmodule/testtype.html @@ -17,19 +17,19 @@ </ul> </div> <div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">TestType Class</h1> +<h1 class="title" translate="no">TestType Class</h1> <!-- $$$TestType-brief --> <p>A class inheriting another class that lives in an external doc module. <a href="#details">More...</a></p> <!-- @@@TestType --> -<div class="table"><table class="alignedsummary"> +<div class="table"><table class="alignedsummary" translate="no"> <tr><td class="memItemLeft rightAlign topAlign"> Header:</td><td class="memItemRight bottomAlign"> <span class="preprocessor">#include <TestType></span> -</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Inherits:</td><td class="memItemRight bottomAlign"> <a href="testqdoc-testderived.html">TestQDoc::TestDerived</a></td></tr></table></div><ul> +</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Inherits:</td><td class="memItemRight bottomAlign"> <a href="testqdoc-testderived.html" translate="no">TestQDoc::TestDerived</a></td></tr></table></div><ul> <li><a href="testtype-members.html">List of all members, including inherited members</a></li> </ul> <a name="public-functions"></a> <h2 id="public-functions">Public Functions</h2> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testtype.html#nothing">nothing</a></b>()</td></tr> +<div class="table"><table class="alignedsummary" translate="no"> +<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testtype.html#nothing" translate="no">nothing</a></b>()</td></tr> </table></div> <a name="details"></a> <!-- $$$TestType-description --> @@ -39,17 +39,17 @@ <h3 id="linking">Linking</h3> <p>These links go to the parent class:</p> <ul> -<li><a href="testqdoc-testderived.html">TestQDoc::TestDerived</a></li> -<li><a href="testqdoc-test.html">Test</a> class <a href="testqdoc.html#usage">Usage</a>.</li> -<li><a href="testqdoc.html#QDOCTEST_MACRO">QDOCTEST_MACRO</a></li> +<li><a href="testqdoc-testderived.html" translate="no">TestQDoc::TestDerived</a></li> +<li><a href="testqdoc-test.html" translate="no">Test</a> class <a href="testqdoc.html#usage" translate="no">Usage</a>.</li> +<li><a href="testqdoc.html#QDOCTEST_MACRO" translate="no">QDOCTEST_MACRO</a></li> </ul> </div> -<p><b>See also </b><a href="testqdoc-test.html#someFunction">someFunction</a>().</p> +<p><b>See also </b><a href="testqdoc-test.html#someFunction" translate="no">someFunction</a>().</p> <!-- @@@TestType --> <div class="func"> <h2>Member Function Documentation</h2> <!-- $$$nothing[overload1]$$$nothing --> -<h3 class="fn" id="nothing"><a name="nothing"></a><span class="type">void</span> TestType::<span class="name">nothing</span>()</h3> +<h3 class="fn" translate="no" id="nothing"><a name="nothing"></a><span class="type">void</span> TestType::<span class="name">nothing</span>()</h3> <p>Nothing to see here.</p> <!-- @@@nothing --> </div> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/dontdocument/classes.html b/tests/auto/qdoc/generatedoutput/expected_output/dontdocument/classes.html index f5bae610a..8d16389cb 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/dontdocument/classes.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/dontdocument/classes.html @@ -12,9 +12,9 @@ <!-- $$$classes.html-description --> <div class="descr"> <a name="details"></a> <div class="table"><table class="annotated"> -<tr class="odd topAlign"><td class="tblName"><p><a href="seenclass.html">SeenClass</a></p></td><td class="tblDescr"><p>A public but undocumented class</p></td></tr> -<tr class="even topAlign"><td class="tblName"><p><a href="testqdoc-test.html">TestQDoc::Test</a></p></td><td class="tblDescr"><p>A class in a namespace</p></td></tr> -<tr class="odd topAlign"><td class="tblName"><p><a href="testqdoc-testderived.html">TestQDoc::TestDerived</a></p></td><td class="tblDescr"><p>A derived class in a namespace</p></td></tr> +<tr class="odd topAlign"><td class="tblName" translate="no"><p><a href="seenclass.html">SeenClass</a></p></td><td class="tblDescr"><p>A public but undocumented class</p></td></tr> +<tr class="even topAlign"><td class="tblName" translate="no"><p><a href="testqdoc-test.html">TestQDoc::Test</a></p></td><td class="tblDescr"><p>A class in a namespace</p></td></tr> +<tr class="odd topAlign"><td class="tblName" translate="no"><p><a href="testqdoc-testderived.html">TestQDoc::TestDerived</a></p></td><td class="tblDescr"><p>A derived class in a namespace</p></td></tr> </table></div> </div> <!-- @@@classes.html --> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/dontdocument/seenclass.html b/tests/auto/qdoc/generatedoutput/expected_output/dontdocument/seenclass.html index 119841e44..7f99fc0c5 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/dontdocument/seenclass.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/dontdocument/seenclass.html @@ -15,11 +15,11 @@ </ul> </div> <div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">SeenClass Class</h1> +<h1 class="title" translate="no">SeenClass Class</h1> <!-- $$$SeenClass-brief --> <p>A public but undocumented class. <a href="#details">More...</a></p> <!-- @@@SeenClass --> -<div class="table"><table class="alignedsummary"> +<div class="table"><table class="alignedsummary" translate="no"> <tr><td class="memItemLeft rightAlign topAlign"> Header:</td><td class="memItemRight bottomAlign"> <span class="preprocessor">#include <SeenClass></span> </td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr></table></div><ul> </ul> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/first.html b/tests/auto/qdoc/generatedoutput/expected_output/first.html index 1e92e7067..741c8b22e 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/first.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/first.html @@ -15,8 +15,8 @@ </ul> </div> <div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">First Class</h1> -<div class="table"><table class="alignedsummary"> +<h1 class="title" translate="no">First Class</h1> +<div class="table"><table class="alignedsummary" translate="no"> <tr><td class="memItemLeft rightAlign topAlign"> Header:</td><td class="memItemRight bottomAlign"> <span class="preprocessor">#include <First></span> </td></tr></table></div><ul> </ul> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/headerfile/headers.html b/tests/auto/qdoc/generatedoutput/expected_output/headerfile/headers.html index 65b88eca4..eeed3cf9f 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/headerfile/headers.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/headerfile/headers.html @@ -14,7 +14,7 @@ </div> <!-- @@@headers --> <div class="table"><table class="annotated"> -<tr class="odd topAlign"><td class="tblName"><p><a href="testheader.html"><TestHeader></a></p></td><td class="tblDescr"><p>A header file</p></td></tr> +<tr class="odd topAlign"><td class="tblName" translate="no"><p><a href="testheader.html"><TestHeader></a></p></td><td class="tblDescr"><p>A header file</p></td></tr> </table></div> </body> </html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/headerfile/testheader.html b/tests/auto/qdoc/generatedoutput/expected_output/headerfile/testheader.html index f67de8a3f..82ee93ea6 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/headerfile/testheader.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/headerfile/testheader.html @@ -6,7 +6,7 @@ <title><TestHeader> - Test Header | HeaderFile</title> </head> <body> -<li><a href="headers.html">Headers</a></li> +<li><a href="headers.html" translate="no">Headers</a></li> <li><TestHeader> - Test Header</li> <div class="sidebar"> <div class="toc"> @@ -15,28 +15,28 @@ </ul> </div> <div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title"><TestHeader> - Test Header</h1> +<h1 class="title" translate="no"><TestHeader> - Test Header</h1> <!-- $$$<TestHeader>-brief --> <p>A header file. <a href="#details">More...</a></p> <!-- @@@<TestHeader> --> -<div class="table"><table class="alignedsummary"> +<div class="table"><table class="alignedsummary" translate="no"> <tr><td class="memItemLeft rightAlign topAlign"> Header:</td><td class="memItemRight bottomAlign"> <span class="preprocessor">#include <TestHeader></span> </td></tr></table></div><ul> </ul> <a name="types"></a> <h2 id="types">Types</h2> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft rightAlign topAlign"> enum </td><td class="memItemRight bottomAlign"><b><a href="testheader.html#Globals-enum">Globals</a></b> { Glo, Bal }</td></tr> +<div class="table"><table class="alignedsummary" translate="no"> +<tr><td class="memItemLeft rightAlign topAlign"> enum </td><td class="memItemRight bottomAlign"><b><a href="testheader.html#Globals-enum" translate="no">Globals</a></b> { Glo, Bal }</td></tr> </table></div> <a name="variables"></a> <h2 id="variables">Variables</h2> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft rightAlign topAlign"> const int </td><td class="memItemRight bottomAlign"><b><a href="testheader.html#globalVar-var">globalVar</a></b></td></tr> +<div class="table"><table class="alignedsummary" translate="no"> +<tr><td class="memItemLeft rightAlign topAlign"> const int </td><td class="memItemRight bottomAlign"><b><a href="testheader.html#globalVar-var" translate="no">globalVar</a></b></td></tr> </table></div> <a name="functions"></a> <h2 id="functions">Functions</h2> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testheader.html#globalFunc">globalFunc</a></b>()</td></tr> +<div class="table"><table class="alignedsummary" translate="no"> +<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testheader.html#globalFunc" translate="no">globalFunc</a></b>()</td></tr> </table></div> <a name="details"></a> <!-- $$$<TestHeader>-description --> @@ -47,24 +47,24 @@ <div class="types"> <h2>Type Documentation</h2> <!-- $$$Globals$$$Glo$$$Bal --> -<h3 class="fn" id="Globals-enum"><a name="Globals-enum"></a>enum <span class="name">Globals</span></h3> +<h3 class="fn" translate="no" id="Globals-enum"><a name="Globals-enum"></a>enum <span class="name">Globals</span></h3> <div class="table"><table class="valuelist"><tr><th class="tblConst">Constant</th><th class="tblVal">Value</th></tr> -<tr><td class="topAlign"><code>Glo</code></td><td class="topAlign tblval"><code>0</code></td></tr> -<tr><td class="topAlign"><code>Bal</code></td><td class="topAlign tblval"><code>1</code></td></tr> +<tr><td class="topAlign"><code translate="no">Glo</code></td><td class="topAlign tblval"><code translate="no">0</code></td></tr> +<tr><td class="topAlign"><code translate="no">Bal</code></td><td class="topAlign tblval"><code translate="no">1</code></td></tr> </table></div> <!-- @@@Globals --> </div> <div class="vars"> <h2>Variable Documentation</h2> <!-- $$$globalVar --> -<h3 class="fn" id="globalVar-var"><a name="globalVar-var"></a>const <span class="type">int</span> <span class="name">globalVar</span></h3> +<h3 class="fn" translate="no" id="globalVar-var"><a name="globalVar-var"></a>const <span class="type">int</span> <span class="name">globalVar</span></h3> <p>Global variable.</p> <!-- @@@globalVar --> </div> <div class="func"> <h2>Function Documentation</h2> <!-- $$$globalFunc[overload1]$$$globalFunc --> -<h3 class="fn" id="globalFunc"><a name="globalFunc"></a><span class="type">void</span> <span class="name">globalFunc</span>()</h3> +<h3 class="fn" translate="no" id="globalFunc"><a name="globalFunc"></a><span class="type">void</span> <span class="name">globalFunc</span>()</h3> <p>Global function.</p> <!-- @@@globalFunc --> </div> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/html/testqdoc.webxml b/tests/auto/qdoc/generatedoutput/expected_output/html/testqdoc.webxml deleted file mode 100644 index a8cbb951a..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/html/testqdoc.webxml +++ /dev/null @@ -1,75 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<WebXML> - <document> - <namespace name="TestQDoc" href="testqdoc.html" status="active" access="public" location="testcpp.h" documented="true" module="TestCPP" brief="A namespace"> - <contents name="usage" title="Usage" level="1"/> - <description> - <brief>A namespace.</brief> - <section id="usage"> - <heading level="1">Usage</heading> - <para>This namespace is for testing QDoc output.</para> - </section> - </description> - <function name="QDOCTEST_MACRO" href="testqdoc.html#QDOCTEST_MACRO" status="active" access="public" documented="true" related="true" meta="macrowithoutparams" virtual="non" const="false" static="false" final="false" override="false" type="" signature="QDOCTEST_MACRO"> - <description /> - </function> - <class name="Test" fullname="TestQDoc::Test" href="testqdoc-test.html" status="active" access="public" location="testcpp.h" documented="true" module="TestCPP" brief="A class in a namespace"> - <description> - <brief>A class in a namespace.</brief> - </description> - <function name="QDOCTEST_MACRO2" href="testqdoc-test.html#QDOCTEST_MACRO2" status="active" access="public" documented="true" related="true" since="Test 1.1" meta="macrowithparams" virtual="non" const="false" static="false" final="false" override="false" type="" brief="A macro with argument x" signature="QDOCTEST_MACRO2( x)"> - <parameter type="" name="x" default=""/> - <description> - <brief>A macro with argument <argument>x</argument>.</brief> - </description> - </function> - <function name="anotherObsoleteMember" fullname="TestQDoc::Test::anotherObsoleteMember" href="testqdoc-test-obsolete.html#anotherObsoleteMember" status="obsolete" access="public" location="testcpp.h" documented="true" meta="plain" virtual="non" const="false" static="false" final="false" override="false" type="void" signature="void anotherObsoleteMember()"> - <description> - <para>Use <link raw="obsoleteMember()" href="testqdoc-test-obsolete.html#obsoleteMember" type="function">obsoleteMember()</link> instead.</para> - </description> - </function> - <function name="deprecatedMember" fullname="TestQDoc::Test::deprecatedMember" href="testqdoc-test-obsolete.html#deprecatedMember" status="obsolete" access="public" location="testcpp.h" documented="true" meta="plain" virtual="non" const="false" static="false" final="false" override="false" type="void" signature="void deprecatedMember()"> - <description> - <para>Use <link raw="someFunction()" href="testqdoc-test.html#someFunction" type="function">someFunction()</link> instead.</para> - </description> - </function> - <function name="inlineFunction" fullname="TestQDoc::Test::inlineFunction" href="testqdoc-test.html#inlineFunction" status="active" access="public" location="testcpp.h" documented="true" meta="plain" virtual="non" const="false" static="false" final="false" override="false" type="void" brief="An inline function, documented using the \fn QDoc command" signature="void inlineFunction()"> - <description> - <brief>An inline function, documented using the \fn QDoc command.</brief> - </description> - </function> - <function name="obsoleteMember" fullname="TestQDoc::Test::obsoleteMember" href="testqdoc-test-obsolete.html#obsoleteMember" status="obsolete" access="public" location="testcpp.h" documented="true" meta="plain" virtual="non" const="false" static="false" final="false" override="false" type="void" signature="void obsoleteMember()"> - <description> - <para>Use <link raw="someFunction()" href="testqdoc-test.html#someFunction" type="function">someFunction()</link> instead.</para> - </description> - </function> - <function name="someFunction" fullname="TestQDoc::Test::someFunction" href="testqdoc-test.html#someFunction" status="active" access="public" location="testcpp.h" documented="true" meta="plain" virtual="non" const="false" static="false" final="false" override="false" type="int" signature="int someFunction(int v)"> - <parameter type="int" name="v" default=""/> - <description> - <para>Function that takes a parameter <argument>v</argument>. Also returns the value of <argument>v</argument>.</para> - </description> - </function> - <function name="someFunctionDefaultArg" fullname="TestQDoc::Test::someFunctionDefaultArg" href="testqdoc-test.html#someFunctionDefaultArg" status="active" access="public" location="testcpp.h" documented="true" meta="plain" virtual="non" const="false" static="false" final="false" override="false" type="void" signature="void someFunctionDefaultArg(int i, bool b)"> - <parameter type="int" name="i" default=""/> - <parameter type="bool" name="b" default="false"/> - <description> - <para>Function that takes a parameter <argument>i</argument> and <argument>b</argument>.</para> - </description> - </function> - <function name="virtualFun" fullname="TestQDoc::Test::virtualFun" href="testqdoc-test.html#virtualFun" status="active" access="public" location="testcpp.h" documented="true" meta="plain" virtual="virtual" const="false" static="false" final="false" override="false" type="void" signature="void virtualFun()"> - <description> - <para>Function that must be reimplemented.</para> - </description> - </function> - </class> - <class name="TestDerived" fullname="TestQDoc::TestDerived" href="testqdoc-testderived.html" status="active" access="public" location="testcpp.h" documented="true" bases="TestQDoc::Test" module="TestCPP" brief="A derived class in a namespace"> - <description> - <brief>A derived class in a namespace.</brief> - </description> - <function name="virtualFun" fullname="TestQDoc::TestDerived::virtualFun" href="testqdoc-testderived.html#virtualFun" status="active" access="public" location="testcpp.h" documented="true" meta="plain" virtual="virtual" const="false" static="false" final="false" override="true" type="void" signature="void virtualFun() override"> - <description /> - </function> - </class> - </namespace> - </document> -</WebXML> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/ignoresince/testqdoc-test.html b/tests/auto/qdoc/generatedoutput/expected_output/ignoresince/testqdoc-test.html index 7165b2bdb..224156da5 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/ignoresince/testqdoc-test.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/ignoresince/testqdoc-test.html @@ -19,41 +19,41 @@ </ul> </div> <div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">Test Class</h1> -<span class="small-subtitle">class <a href="testqdoc.html">TestQDoc</a>::Test</span> +<h1 class="title" translate="no">Test Class</h1> +<span class="small-subtitle" translate="no">class <a href="testqdoc.html" translate="no">TestQDoc</a>::Test</span> <!-- $$$Test-brief --> <p>A class in a namespace. <a href="#details">More...</a></p> <!-- @@@Test --> -<div class="table"><table class="alignedsummary"> +<div class="table"><table class="alignedsummary" translate="no"> <tr><td class="memItemLeft rightAlign topAlign"> Header:</td><td class="memItemRight bottomAlign"> <span class="preprocessor">#include <Test></span> -</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Inherited By:</td><td class="memItemRight bottomAlign"> <p><a href="testqdoc-testderived.html">TestQDoc::TestDerived</a></p> +</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Inherited By:</td><td class="memItemRight bottomAlign"> <p><a href="testqdoc-testderived.html" translate="no">TestQDoc::TestDerived</a></p> </td></tr></table></div><ul> <li><a href="testqdoc-test-members.html">List of all members, including inherited members</a></li> <li><a href="testqdoc-test-obsolete.html">Obsolete members</a></li> </ul> <a name="public-types"></a> <h2 id="public-types">Public Types</h2> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft rightAlign topAlign"> typedef </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#SomeType-typedef">SomeType</a></b></td></tr> +<div class="table"><table class="alignedsummary" translate="no"> +<tr><td class="memItemLeft rightAlign topAlign"> typedef </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#SomeType-typedef" translate="no">SomeType</a></b></td></tr> </table></div> <a name="public-functions"></a> <h2 id="public-functions">Public Functions</h2> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#inlineFunction">inlineFunction</a></b>()</td></tr> -<tr><td class="memItemLeft rightAlign topAlign"> int </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#someFunction">someFunction</a></b>(int <i>v</i> = 0)</td></tr> -<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#someFunctionDefaultArg">someFunctionDefaultArg</a></b>(int <i>i</i>, bool <i>b</i> = false)</td></tr> -<tr><td class="memItemLeft rightAlign topAlign"> virtual void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#virtualFun">virtualFun</a></b>()</td></tr> +<div class="table"><table class="alignedsummary" translate="no"> +<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#inlineFunction" translate="no">inlineFunction</a></b>()</td></tr> +<tr><td class="memItemLeft rightAlign topAlign"> int </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#someFunction" translate="no">someFunction</a></b>(int <i>v</i> = 0)</td></tr> +<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#someFunctionDefaultArg" translate="no">someFunctionDefaultArg</a></b>(int <i>i</i>, bool <i>b</i> = false)</td></tr> +<tr><td class="memItemLeft rightAlign topAlign"> virtual void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#virtualFun" translate="no">virtualFun</a></b>()</td></tr> </table></div> <a name="protected-functions"></a> <h2 id="protected-functions">Protected Functions</h2> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#overload">overload</a></b>()</td></tr> -<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#overload-1">overload</a></b>(bool <i>b</i>)</td></tr> +<div class="table"><table class="alignedsummary" translate="no"> +<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#overload" translate="no">overload</a></b>()</td></tr> +<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#overload-1" translate="no">overload</a></b>(bool <i>b</i>)</td></tr> </table></div> <a name="macros"></a> <h2 id="macros">Macros</h2> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft rightAlign topAlign"> </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#QDOCTEST_MACRO2">QDOCTEST_MACRO2</a></b>(<i>x</i>)</td></tr> +<div class="table"><table class="alignedsummary" translate="no"> +<tr><td class="memItemLeft rightAlign topAlign"> </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#QDOCTEST_MACRO2" translate="no">QDOCTEST_MACRO2</a></b>(<i>x</i>)</td></tr> </table></div> <a name="details"></a> <!-- $$$Test-description --> @@ -64,7 +64,7 @@ <div class="types"> <h2>Member Type Documentation</h2> <!-- $$$SomeType --> -<h3 class="fn" id="SomeType-typedef"><a name="SomeType-typedef"></a>typedef Test::<span class="name">SomeType</span></h3> +<h3 class="fn" translate="no" id="SomeType-typedef"><a name="SomeType-typedef"></a>typedef Test::<span class="name">SomeType</span></h3> <p>A typedef.</p> <!-- @@@SomeType --> </div> @@ -72,34 +72,34 @@ <h2>Member Function Documentation</h2> <!-- $$$ --> <div class="fngroup"> -<h3 class="fn fngroupitem" id="overload"><a name="overload"></a><code>[protected] </code><span class="type">void</span> Test::<span class="name">overload</span>()</h3><h3 class="fn fngroupitem" id="overload-1"><a name="overload-1"></a><code>[protected] </code><span class="type">void</span> Test::<span class="name">overload</span>(<span class="type">bool</span> <i>b</i>)</h3></div> -<p>Overloads that share a documentation comment, optionally taking a parameter <i>b</i>.</p> +<h3 class="fn fngroupitem" translate="no" id="overload"><a name="overload"></a><code translate="no">[protected] </code><span class="type">void</span> Test::<span class="name">overload</span>()</h3><h3 class="fn fngroupitem" translate="no" id="overload-1"><a name="overload-1"></a><code translate="no">[protected] </code><span class="type">void</span> Test::<span class="name">overload</span>(<span class="type">bool</span> <i>b</i>)</h3></div> +<p>Overloads that share a documentation comment, optionally taking a parameter <i translate="no">b</i>.</p> <p>This function was introduced in Test 1.2.</p> <!-- @@@ --> <!-- $$$inlineFunction[overload1]$$$inlineFunction --> -<h3 class="fn" id="inlineFunction"><a name="inlineFunction"></a><span class="type">void</span> Test::<span class="name">inlineFunction</span>()</h3> +<h3 class="fn" translate="no" id="inlineFunction"><a name="inlineFunction"></a><span class="type">void</span> Test::<span class="name">inlineFunction</span>()</h3> <p>An inline function, documented using the \fn QDoc command.</p> <!-- @@@inlineFunction --> <!-- $$$someFunction[overload1]$$$someFunctionint --> -<h3 class="fn" id="someFunction"><a name="someFunction"></a><span class="type">int</span> Test::<span class="name">someFunction</span>(<span class="type">int</span> <i>v</i> = 0)</h3> -<p>Function that takes a parameter <i>v</i>. Also returns the value of <i>v</i>.</p> +<h3 class="fn" translate="no" id="someFunction"><a name="someFunction"></a><span class="type">int</span> Test::<span class="name">someFunction</span>(<span class="type">int</span> <i>v</i> = 0)</h3> +<p>Function that takes a parameter <i translate="no">v</i>. Also returns the value of <i translate="no">v</i>.</p> <p>This function was introduced in Test 1.0.</p> <!-- @@@someFunction --> <!-- $$$someFunctionDefaultArg[overload1]$$$someFunctionDefaultArgintbool --> -<h3 class="fn" id="someFunctionDefaultArg"><a name="someFunctionDefaultArg"></a><span class="type">void</span> Test::<span class="name">someFunctionDefaultArg</span>(<span class="type">int</span> <i>i</i>, <span class="type">bool</span> <i>b</i> = false)</h3> -<p>Function that takes a parameter <i>i</i> and <i>b</i>.</p> +<h3 class="fn" translate="no" id="someFunctionDefaultArg"><a name="someFunctionDefaultArg"></a><span class="type">void</span> Test::<span class="name">someFunctionDefaultArg</span>(<span class="type">int</span> <i>i</i>, <span class="type">bool</span> <i>b</i> = false)</h3> +<p>Function that takes a parameter <i translate="no">i</i> and <i translate="no">b</i>.</p> <p>This function was introduced in Qt 2.0.</p> <!-- @@@someFunctionDefaultArg --> <!-- $$$virtualFun[overload1]$$$virtualFun --> -<h3 class="fn" id="virtualFun"><a name="virtualFun"></a><code>[virtual] </code><span class="type">void</span> Test::<span class="name">virtualFun</span>()</h3> +<h3 class="fn" translate="no" id="virtualFun"><a name="virtualFun"></a><code translate="no">[virtual] </code><span class="type">void</span> Test::<span class="name">virtualFun</span>()</h3> <p>Function that must be reimplemented.</p> <!-- @@@virtualFun --> </div> <div class="macros"> <h2>Macro Documentation</h2> <!-- $$$QDOCTEST_MACRO2[overload1]$$$QDOCTEST_MACRO2 --> -<h3 class="fn" id="QDOCTEST_MACRO2"><a name="QDOCTEST_MACRO2"></a><span class="name">QDOCTEST_MACRO2</span>(<i>x</i>)</h3> -<p>A macro with argument <i>x</i>.</p> +<h3 class="fn" translate="no" id="QDOCTEST_MACRO2"><a name="QDOCTEST_MACRO2"></a><span class="name">QDOCTEST_MACRO2</span>(<i>x</i>)</h3> +<p>A macro with argument <i translate="no">x</i>.</p> <p>This function was introduced in Test 1.1.</p> <!-- @@@QDOCTEST_MACRO2 --> </div> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/ignoresince/testqdoc.html b/tests/auto/qdoc/generatedoutput/expected_output/ignoresince/testqdoc.html index a259e40af..0a7fa08d3 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/ignoresince/testqdoc.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/ignoresince/testqdoc.html @@ -17,24 +17,24 @@ </ul> </div> <div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">TestQDoc Namespace</h1> +<h1 class="title" translate="no">TestQDoc Namespace</h1> <!-- $$$TestQDoc-brief --> <p>A namespace. <a href="#details">More...</a></p> <!-- @@@TestQDoc --> -<div class="table"><table class="alignedsummary"> +<div class="table"><table class="alignedsummary" translate="no"> <tr><td class="memItemLeft rightAlign topAlign"> Header:</td><td class="memItemRight bottomAlign"> <span class="preprocessor">#include <TestCPP></span> </td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr></table></div><ul> </ul> <a name="classes"></a> <h2 id="classes">Classes</h2> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft rightAlign topAlign"> class </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html">Test</a></b></td></tr> -<tr><td class="memItemLeft rightAlign topAlign"> class </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-testderived.html">TestDerived</a></b></td></tr> +<div class="table"><table class="alignedsummary" translate="no"> +<tr><td class="memItemLeft rightAlign topAlign"> class </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html" translate="no">Test</a></b></td></tr> +<tr><td class="memItemLeft rightAlign topAlign"> class </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-testderived.html" translate="no">TestDerived</a></b></td></tr> </table></div> <a name="macros"></a> <h2 id="macros">Macros</h2> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft rightAlign topAlign"> </td><td class="memItemRight bottomAlign"><b><a href="testqdoc.html#QDOCTEST_MACRO">QDOCTEST_MACRO</a></b></td></tr> +<div class="table"><table class="alignedsummary" translate="no"> +<tr><td class="memItemLeft rightAlign topAlign"> </td><td class="memItemRight bottomAlign"><b><a href="testqdoc.html#QDOCTEST_MACRO" translate="no">QDOCTEST_MACRO</a></b></td></tr> </table></div> <a name="details"></a> <!-- $$$TestQDoc-description --> @@ -57,7 +57,7 @@ <div class="macros"> <h2>Macro Documentation</h2> <!-- $$$QDOCTEST_MACRO[overload1]$$$QDOCTEST_MACRO --> -<h3 class="fn" id="QDOCTEST_MACRO"><a name="QDOCTEST_MACRO"></a><span class="name">QDOCTEST_MACRO</span></h3> +<h3 class="fn" translate="no" id="QDOCTEST_MACRO"><a name="QDOCTEST_MACRO"></a><span class="name">QDOCTEST_MACRO</span></h3> <!-- @@@QDOCTEST_MACRO --> </div> </body> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/index.html b/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/index.html index fd9fdd50a..3686b3763 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/index.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/index.html @@ -13,15 +13,15 @@ <a name="c-classes"></a> <h2 id="c-classes">C++ Classes</h2> <div class="table"><table class="annotated"> -<tr class="odd topAlign"><td class="tblName"><p><a href="testqdoc-test.html">TestQDoc::Test</a></p></td><td class="tblDescr"><p>A class in a namespace</p></td></tr> -<tr class="even topAlign"><td class="tblName"><p><a href="testqdoc-testderived.html">TestQDoc::TestDerived</a></p></td><td class="tblDescr"><p>A derived class in a namespace</p></td></tr> +<tr class="odd topAlign"><td class="tblName" translate="no"><p><a href="testqdoc-test.html">TestQDoc::Test</a></p></td><td class="tblDescr"><p>A class in a namespace</p></td></tr> +<tr class="even topAlign"><td class="tblName" translate="no"><p><a href="testqdoc-testderived.html">TestQDoc::TestDerived</a></p></td><td class="tblDescr"><p>A derived class in a namespace</p></td></tr> </table></div> <a name="qml-types"></a> <h2 id="qml-types">QML Types</h2> <div class="table"><table class="annotated"> -<tr class="odd topAlign"><td class="tblName"><p><a href="qml-qdoc-test-abstractparent.html">AbstractParent</a></p></td><td class="tblDescr"><p>Abstract base QML type</p></td></tr> -<tr class="even topAlign"><td class="tblName"><p><a href="qml-qdoc-test-child.html">Child</a></p></td><td class="tblDescr"><p>A Child inheriting its parent</p></td></tr> -<tr class="odd topAlign"><td class="tblName"><p><a href="qml-int.html">int</a></p></td><td class="tblDescr"><p>An integer basic type</p></td></tr> +<tr class="odd topAlign"><td class="tblName" translate="no"><p><a href="qml-qdoc-test-abstractparent.html">AbstractParent</a></p></td><td class="tblDescr"><p>Abstract base QML type</p></td></tr> +<tr class="even topAlign"><td class="tblName" translate="no"><p><a href="qml-qdoc-test-child.html">Child</a></p></td><td class="tblDescr"><p>A Child inheriting its parent</p></td></tr> +<tr class="odd topAlign"><td class="tblName" translate="no"><p><a href="qml-int.html">int</a></p></td><td class="tblDescr"><p>An integer basic type</p></td></tr> </table></div> <p>Test include file that is part of the sourcedirs.</p> </div> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/qdoc-test-qmlmodule.html b/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/qdoc-test-qmlmodule.html deleted file mode 100644 index 6a513e987..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/qdoc-test-qmlmodule.html +++ /dev/null @@ -1,23 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- type.cpp --> - <title>Test</title> -</head> -<body> -<div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div> -<span class="subtitle"></span> -<!-- $$$QDoc.Test-description --> -<div class="descr"> <a name="details"></a> -</div> -<!-- @@@QDoc.Test --> -<div class="table"><table class="annotated"> -<tr class="odd topAlign"><td class="tblName"><p><a href="qml-qdoc-test-abstractparent.html">AbstractParent</a></p></td><td class="tblDescr"><p>Abstract base QML type</p></td></tr> -<tr class="even topAlign"><td class="tblName"><p><a href="qml-qdoc-test-child.html">Child</a></p></td><td class="tblDescr"><p>A Child inheriting its parent</p></td></tr> -<tr class="odd topAlign"><td class="tblName"><p><a href="qml-qdoc-test-doctest.html">DocTest</a></p></td><td class="tblDescr"><p>Represents a doc test case</p></td></tr> -<tr class="even topAlign"><td class="tblName"><p><a href="qml-qdoc-test-type.html">Type</a></p></td><td class="tblDescr"><p>A QML type documented in a .cpp file</p></td></tr> -<tr class="odd topAlign"><td class="tblName"><p><a href="qml-int.html">int</a></p></td><td class="tblDescr"><p>An integer basic type</p></td></tr> -</table></div> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/qml-int.html b/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/qml-int.html deleted file mode 100644 index 651f840cb..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/qml-int.html +++ /dev/null @@ -1,23 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- parent.qdoc --> - <title>int QML Basic Type | Test</title> -</head> -<body> -<div class="sidebar"> -<div class="toc"> -<h3><a name="toc">Contents</a></h3> -<ul> -</ul> -</div> -<div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">int QML Basic Type</h1> -<span class="subtitle"></span> -<!-- $$$int-description --> -<div class="descr"> <a name="details"></a> -</div> -<!-- @@@int --> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/qml-qdoc-test-abstractparent-members.html b/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/qml-qdoc-test-abstractparent-members.html index e8ecfbb69..6fed07e02 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/qml-qdoc-test-abstractparent-members.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/qml-qdoc-test-abstractparent-members.html @@ -7,11 +7,11 @@ </head> <body> <div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">List of All Members for AbstractParent</h1> +<h1 class="title" translate="no">List of All Members for AbstractParent</h1> <p>This is the complete list of members for <a href="qml-qdoc-test-abstractparent.html">AbstractParent</a>, including inherited members.</p> <ul> -<li class="fn"><b><b><a href="qml-qdoc-test-abstractparent.html#children-prop">children</a></b></b> : list<Child> [default]</li> -<li class="fn">void <b><b><a href="qml-qdoc-test-abstractparent.html#rear-method">rear</a></b></b>(Child <i>child</i>)</li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-abstractparent.html#children-prop" translate="no">children</a></b></b> : list<Child> [default]</li> +<li class="fn" translate="no">void <b><b><a href="qml-qdoc-test-abstractparent.html#rear-method" translate="no">rear</a></b></b>(Child <i>child</i>)</li> </ul> </body> </html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/qml-qdoc-test-abstractparent.html b/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/qml-qdoc-test-abstractparent.html index ae0e10d6d..148b0bc12 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/qml-qdoc-test-abstractparent.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/qml-qdoc-test-abstractparent.html @@ -16,25 +16,25 @@ </ul> </div> <div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">AbstractParent QML Type</h1> -<span class="subtitle"></span> +<h1 class="title" translate="no">AbstractParent QML Type</h1> +<span class="subtitle" translate="no"></span> <!-- $$$AbstractParent-brief --> <p>Abstract base QML type. <a href="#details">More...</a></p> <!-- @@@AbstractParent --> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft rightAlign topAlign"> Import Statement:</td><td class="memItemRight bottomAlign"> import QDoc.Test 1.1</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Inherited By:</td><td class="memItemRight bottomAlign"> <p><a href="qml-qdoc-test-child.html">Child</a></p> +<div class="table"><table class="alignedsummary" translate="no"> +<tr><td class="memItemLeft rightAlign topAlign"> Import Statement:</td><td class="memItemRight bottomAlign"> import QDoc.Test 1.1</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Inherited By:</td><td class="memItemRight bottomAlign"> <p><a href="qml-qdoc-test-child.html" translate="no">Child</a></p> </td></tr></table></div><ul> <li><a href="qml-qdoc-test-abstractparent-members.html">List of all members, including inherited members</a></li> </ul> <a name="properties"></a> <h2 id="properties">Properties</h2> <ul> -<li class="fn"><b><b><a href="qml-qdoc-test-abstractparent.html#children-prop">children</a></b></b> : list<Child></li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-abstractparent.html#children-prop" translate="no">children</a></b></b> : list<Child></li> </ul> <a name="methods"></a> <h2 id="methods">Methods</h2> <ul> -<li class="fn">void <b><b><a href="qml-qdoc-test-abstractparent.html#rear-method">rear</a></b></b>(Child <i>child</i>)</li> +<li class="fn" translate="no">void <b><b><a href="qml-qdoc-test-abstractparent.html#rear-method" translate="no">rear</a></b></b>(Child <i>child</i>)</li> </ul> <!-- $$$AbstractParent-description --> <a name="details"></a> @@ -43,11 +43,11 @@ <!-- @@@AbstractParent --> <h2>Property Documentation</h2> <!-- $$$children --> -<div class="qmlitem"><div class="qmlproto"> +<div class="qmlitem"><div class="qmlproto" translate="no"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="children-prop"> <td class="tblQmlPropNode"><p> -<a name="children-prop"></a><span class="qmldefault">[default] </span><span class="name">children</span> : <span class="type">list</span><<span class="type"><a href="qml-qdoc-test-child.html">Child</a></span>></p></td></tr> +<a name="children-prop"></a><span class="qmldefault">[default] </span><span class="name">children</span> : <span class="type">list</span><<span class="type"><a href="qml-qdoc-test-child.html" translate="no">Child</a></span>></p></td></tr> </table></div></div> <div class="qmldoc"><p>Children of the type.</p> <p>Test include file that is part of the sourcedirs.</p> @@ -55,13 +55,13 @@ <br/> <h2>Method Documentation</h2> <!-- $$$rear[overload1]$$$rearChild --> -<div class="qmlitem"><div class="qmlproto"> +<div class="qmlitem"><div class="qmlproto" translate="no"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="rear-method"> <td class="tblQmlFuncNode"><p> -<a name="rear-method"></a><span class="type">void</span> <span class="name">rear</span>(<span class="type"><a href="qml-qdoc-test-child.html">Child</a></span> <i>child</i>)</p></td></tr> +<a name="rear-method"></a><span class="type">void</span> <span class="name">rear</span>(<span class="type"><a href="qml-qdoc-test-child.html" translate="no">Child</a></span> <i>child</i>)</p></td></tr> </table></div></div> -<div class="qmldoc"><p>Do some abstract parenting on <i>child</i>.</p> +<div class="qmldoc"><p>Do some abstract parenting on <i translate="no">child</i>.</p> <p>Test include file that is part of the sourcedirs.</p> </div></div><!-- @@@rear --> <br/> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/qml-qdoc-test-child-members.html b/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/qml-qdoc-test-child-members.html deleted file mode 100644 index cedbad6bc..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/qml-qdoc-test-child-members.html +++ /dev/null @@ -1,18 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- parent.qdoc --> - <title>List of All Members for Child | Test</title> -</head> -<body> -<div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">List of All Members for Child</h1> -<p>This is the complete list of members for <a href="qml-qdoc-test-child.html">Child</a>, including inherited members.</p> -<ul> -<li class="fn"><b><b><a href="qml-qdoc-test-child.html#children-prop">children</a></b></b> : list<Child> [default]</li> -<li class="fn">void <b><b><a href="qml-qdoc-test-child.html#rear-method-1">rear</a></b></b>(<i>child</i>)</li> -<li class="fn">void <b><b><a href="qml-qdoc-test-child.html#rear-method">rear</a></b></b>(<i>child</i>)</li> -</ul> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/qml-qdoc-test-child.html b/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/qml-qdoc-test-child.html deleted file mode 100644 index b1775faa3..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/qml-qdoc-test-child.html +++ /dev/null @@ -1,79 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- parent.qdoc --> - <title>Child QML Type | Test</title> -</head> -<body> -<div class="sidebar"> -<div class="toc"> -<h3><a name="toc">Contents</a></h3> -<ul> -<li class="level1"><a href="#properties">Properties</a></li> -<li class="level1"><a href="#methods">Methods</a></li> -<li class="level1"><a href="#details">Detailed Description</a></li> -</ul> -</div> -<div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">Child QML Type</h1> -<span class="subtitle"></span> -<!-- $$$Child-brief --> -<p>A Child inheriting its parent. <a href="#details">More...</a></p> -<!-- @@@Child --> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft rightAlign topAlign"> Import Statement:</td><td class="memItemRight bottomAlign"> import QDoc.Test 1.1</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Inherits:</td><td class="memItemRight bottomAlign"> <p><a href="qml-qdoc-test-abstractparent.html">AbstractParent</a></p> -</td></tr></table></div><ul> -<li><a href="qml-qdoc-test-child-members.html">List of all members, including inherited members</a></li> -</ul> -<a name="properties"></a> -<h2 id="properties">Properties</h2> -<ul> -<li class="fn"><b><b><a href="qml-qdoc-test-child.html#children-prop">children</a></b></b> : list<Child></li> -</ul> -<a name="methods"></a> -<h2 id="methods">Methods</h2> -<ul> -<li class="fn">void <b><b><a href="qml-qdoc-test-child.html#rear-method-1">rear</a></b></b>(<i>child</i>)</li> -<li class="fn">void <b><b><a href="qml-qdoc-test-child.html#rear-method">rear</a></b></b>(<i>child</i>)</li> -</ul> -<!-- $$$Child-description --> -<a name="details"></a> -<h2 id="details">Detailed Description</h2> -<!-- @@@Child --> -<h2>Property Documentation</h2> -<!-- $$$children --> -<div class="qmlitem"><div class="qmlproto"> -<div class="table"><table class="qmlname"> -<tr valign="top" class="odd" id="children-prop"> -<td class="tblQmlPropNode"><p> -<a name="children-prop"></a><span class="qmldefault">[default] </span><span class="name">children</span> : <span class="type">list</span><<span class="type"><a href="qml-qdoc-test-child.html">Child</a></span>></p></td></tr> -</table></div></div> -<div class="qmldoc"><p>Children of the type.</p> -<p>Test include file that is part of the sourcedirs.</p> -</div></div><!-- @@@children --> -<br/> -<h2>Method Documentation</h2> -<!-- $$$rear$$$rear --> -<div class="qmlitem"><div class="qmlproto"> -<div class="table"><table class="qmlname"> -<tr valign="top" class="odd" id="rear-method-1"> -<td class="tblQmlFuncNode"><p> -<a name="rear-method-1"></a><span class="type">void</span> <span class="name">rear</span>(<i>child</i>)</p></td></tr> -</table></div></div> -<div class="qmldoc"><p>Do some abstract parenting on <i>child</i>.</p> -</div></div><!-- @@@rear --> -<br/> -<!-- $$$rear[overload1]$$$rear --> -<div class="qmlitem"><div class="qmlproto"> -<div class="table"><table class="qmlname"> -<tr valign="top" class="odd" id="rear-method"> -<td class="tblQmlFuncNode"><p> -<a name="rear-method"></a><span class="type">void</span> <span class="name">rear</span>(<i>child</i>)</p></td></tr> -</table></div></div> -<div class="qmldoc"><p>Do some abstract parenting on <i>child</i>.</p> -<p>Test include file that is part of the sourcedirs.</p> -</div></div><!-- @@@rear --> -<br/> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/qml-qdoc-test-doctest-members.html b/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/qml-qdoc-test-doctest-members.html deleted file mode 100644 index 3048f9701..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/qml-qdoc-test-doctest-members.html +++ /dev/null @@ -1,18 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- DocTest.qml --> - <title>List of All Members for DocTest | Test</title> -</head> -<body> -<div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">List of All Members for DocTest</h1> -<p>This is the complete list of members for <a href="qml-qdoc-test-doctest.html">DocTest</a>, including inherited members.</p> -<ul> -<li class="fn"><b><b><a href="qml-qdoc-test-doctest.html#active-prop">active</a></b></b> : bool</li> -<li class="fn"><b><b><a href="qml-qdoc-test-doctest.html#name-prop">name</a></b></b> : string</li> -<li class="fn"><b><b><a href="qml-qdoc-test-doctest.html#fail-method">fail</a></b></b>(<i>message</i>)</li> -</ul> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/qml-qdoc-test-doctest.html b/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/qml-qdoc-test-doctest.html deleted file mode 100644 index e1475d5fb..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/qml-qdoc-test-doctest.html +++ /dev/null @@ -1,86 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- DocTest.qml --> - <title>DocTest QML Type | Test</title> -</head> -<body> -<div class="sidebar"> -<div class="toc"> -<h3><a name="toc">Contents</a></h3> -<ul> -<li class="level1"><a href="#properties">Properties</a></li> -<li class="level1"><a href="#methods">Methods</a></li> -<li class="level1"><a href="#details">Detailed Description</a></li> -<li class="level2"><a href="#introduction">Introduction</a></li> -</ul> -</div> -<div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">DocTest QML Type</h1> -<span class="subtitle"></span> -<!-- $$$DocTest-brief --> -<p>Represents a doc test case. <a href="#details">More...</a></p> -<!-- @@@DocTest --> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft rightAlign topAlign"> Import Statement:</td><td class="memItemRight bottomAlign"> import QDoc.Test 1.1</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Since:</td><td class="memItemRight bottomAlign"> QDoc.Test 0.9</td></tr></table></div><ul> -<li><a href="qml-qdoc-test-doctest-members.html">List of all members, including inherited members</a></li> -</ul> -<a name="properties"></a> -<h2 id="properties">Properties</h2> -<ul> -<li class="fn"><b><b><a href="qml-qdoc-test-doctest.html#active-prop">active</a></b></b> : bool</li> -<li class="fn"><b><b><a href="qml-qdoc-test-doctest.html#name-prop">name</a></b></b> : string</li> -</ul> -<a name="methods"></a> -<h2 id="methods">Methods</h2> -<ul> -<li class="fn"><b><b><a href="qml-qdoc-test-doctest.html#fail-method">fail</a></b></b>(<i>message</i>)</li> -</ul> -<!-- $$$DocTest-description --> -<a name="details"></a> -<h2 id="details">Detailed Description</h2> -<a name="introduction"></a> -<h2 id="introduction">Introduction</h2> -<p>A documentation test case, itself documented inline in DocTest.qml.</p> -<!-- @@@DocTest --> -<h2>Property Documentation</h2> -<!-- $$$active --> -<div class="qmlitem"><div class="qmlproto"> -<div class="table"><table class="qmlname"> -<tr valign="top" class="odd" id="active-prop"> -<td class="tblQmlPropNode"><p> -<a name="active-prop"></a><span class="name">active</span> : <span class="type">bool</span></p></td></tr> -</table></div></div> -<div class="qmldoc"><p>Whether the test is active.</p> -<p><b>See also </b><a href="qml-qdoc-test-doctest.html#name-prop">name</a>.</p> -</div></div><!-- @@@active --> -<br/> -<!-- $$$name --> -<div class="qmlitem"><div class="qmlproto"> -<div class="table"><table class="qmlname"> -<tr valign="top" class="odd" id="name-prop"> -<td class="tblQmlPropNode"><p> -<a name="name-prop"></a><span class="name">name</span> : <span class="type">string</span></p></td></tr> -</table></div></div> -<div class="qmldoc"><p>Name of the test.</p> -<pre class="qml"><span class="type"><a href="qml-qdoc-test-doctest.html">DocTest</a></span> { - <span class="name">name</span>: <span class="string">"test"</span> - <span class="comment">// ...</span> -}</pre> -</div></div><!-- @@@name --> -<br/> -<h2>Method Documentation</h2> -<!-- $$$fail[overload1]$$$fail --> -<div class="qmlitem"><div class="qmlproto"> -<div class="table"><table class="qmlname"> -<tr valign="top" class="odd" id="fail-method"> -<td class="tblQmlFuncNode"><p> -<a name="fail-method"></a><span class="name">fail</span>(<i>message</i> = "oops")</p></td></tr> -</table></div></div> -<div class="qmldoc"><p>Fails the current test case, with the optional <i>message</i>.</p> -<p>This method was introduced in QDoc.Test 1.0.</p> -</div></div><!-- @@@fail --> -<br/> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/qml-qdoc-test-type-members.html b/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/qml-qdoc-test-type-members.html deleted file mode 100644 index 91cfa8643..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/qml-qdoc-test-type-members.html +++ /dev/null @@ -1,31 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- type.cpp --> - <title>List of All Members for Type | Test</title> -</head> -<body> -<div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">List of All Members for Type</h1> -<p>This is the complete list of members for <a href="qml-qdoc-test-type.html">Type</a>, including inherited members.</p> -<ul> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#fifth-prop">fifth</a></b></b> : int</li> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#fourth-prop">fourth</a></b></b> : int</li> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#group-prop">group</a></b></b><ul> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#group.first-prop">group.first</a></b></b> : int</li> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#group.second-prop">group.second</a></b></b> : int</li> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#group.third-prop">group.third</a></b></b> : int</li> -</ul> -</li> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#id-prop">id</a></b></b> : int</li> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#name-prop">name</a></b></b> : string</li> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#type-attached-prop">type</a></b></b> : enumeration [attached]</li> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#completed-signal">completed</a></b></b>(<i>status</i>)</li> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#configured-signal">configured</a></b></b>() [attached]</li> -<li class="fn">Type <b><b><a href="qml-qdoc-test-type.html#copy-method">copy</a></b></b>(<i>a</i>)</li> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#disable-method">disable</a></b></b>()</li> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#enable-method">enable</a></b></b>()</li> -</ul> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/qml-qdoc-test-type.html b/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/qml-qdoc-test-type.html deleted file mode 100644 index 166cbee81..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/qml-qdoc-test-type.html +++ /dev/null @@ -1,185 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- type.cpp --> - <title>Type QML Type | Test</title> -</head> -<body> -<div class="sidebar"> -<div class="toc"> -<h3><a name="toc">Contents</a></h3> -<ul> -<li class="level1"><a href="#properties">Properties</a></li> -<li class="level1"><a href="#attached-properties">Attached Properties</a></li> -<li class="level1"><a href="#signals">Signals</a></li> -<li class="level1"><a href="#attached-signals">Attached Signals</a></li> -<li class="level1"><a href="#methods">Methods</a></li> -<li class="level1"><a href="#details">Detailed Description</a></li> -</ul> -</div> -<div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">Type QML Type</h1> -<span class="subtitle"></span> -<!-- $$$Type-brief --> -<p>A QML type documented in a .cpp file. <a href="#details">More...</a></p> -<!-- @@@Type --> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft rightAlign topAlign"> Import Statement:</td><td class="memItemRight bottomAlign"> import QDoc.Test 1.1</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Instantiates:</td><td class="memItemRight bottomAlign"> <a href="qml-qdoc-test-type.html"><a href="testqdoc-test.html">Test</a></td></tr></table></div><ul> -<li><a href="qml-qdoc-test-type-members.html">List of all members, including inherited members</a></li> -</ul> -<a name="properties"></a> -<h2 id="properties">Properties</h2> -<ul> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#fifth-prop">fifth</a></b></b> : int</li> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#fourth-prop">fourth</a></b></b> : int</li> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#group-prop">group</a></b></b><ul> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#group.first-prop">group.first</a></b></b> : int</li> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#group.second-prop">group.second</a></b></b> : int</li> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#group.third-prop">group.third</a></b></b> : int</li> -</ul> -</li> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#id-prop">id</a></b></b> : int</li> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#name-prop">name</a></b></b> : string</li> -</ul> -<a name="attached-properties"></a> -<h2 id="attached-properties">Attached Properties</h2> -<ul> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#type-attached-prop">type</a></b></b> : enumeration</li> -</ul> -<a name="signals"></a> -<h2 id="signals">Signals</h2> -<ul> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#completed-signal">completed</a></b></b>(<i>status</i>)</li> -</ul> -<a name="attached-signals"></a> -<h2 id="attached-signals">Attached Signals</h2> -<ul> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#configured-signal">configured</a></b></b>()</li> -</ul> -<a name="methods"></a> -<h2 id="methods">Methods</h2> -<ul> -<li class="fn">Type <b><b><a href="qml-qdoc-test-type.html#copy-method">copy</a></b></b>(<i>a</i>)</li> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#disable-method">disable</a></b></b>()</li> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#enable-method">enable</a></b></b>()</li> -</ul> -<!-- $$$Type-description --> -<a name="details"></a> -<h2 id="details">Detailed Description</h2> -<!-- @@@Type --> -<h2>Property Documentation</h2> -<!-- $$$ --> -<div class="qmlitem"><div class="fngroup"> -<div class="qmlproto"> -<div class="table"><table class="qmlname"> -<tr valign="top" class="odd" id="fifth-prop"> -<td class="tblQmlPropNode"><p> -<a name="fifth-prop"></a><span class="name">fifth</span> : <span class="type"><a href="qml-int.html">int</a></span></p></td></tr> -<tr valign="top" class="odd" id="fourth-prop"> -<td class="tblQmlPropNode"><p> -<a name="fourth-prop"></a><span class="name">fourth</span> : <span class="type"><a href="qml-int.html">int</a></span></p></td></tr> -</table></div></div> -</div><div class="qmldoc"><p>A group of properties sharing a documentation comment.</p> -</div></div><!-- @@@ --> -<br/> -<!-- $$$group --> -<div class="qmlitem"><div class="qmlproto"> -<div class="table"><table class="qmlname"> -<tr valign="top" class="even" id="group-prop"><th class="centerAlign"><p><a name="group-prop"></a><b>group group</b></p></th></tr> -<tr valign="top" class="odd" id="group.first-prop"> -<td class="tblQmlPropNode"><p> -<a name="group.first-prop"></a><span class="name">group.first</span> : <span class="type"><a href="qml-int.html">int</a></span></p></td></tr> -<tr valign="top" class="odd" id="group.second-prop"> -<td class="tblQmlPropNode"><p> -<a name="group.second-prop"></a><span class="name">group.second</span> : <span class="type"><a href="qml-int.html">int</a></span></p></td></tr> -<tr valign="top" class="odd" id="group.third-prop"> -<td class="tblQmlPropNode"><p> -<a name="group.third-prop"></a><span class="name">group.third</span> : <span class="type"><a href="qml-int.html">int</a></span></p></td></tr> -</table></div></div> -<div class="qmldoc"><p>A property group.</p> -</div></div><!-- @@@group --> -<br/> -<!-- $$$id --> -<div class="qmlitem"><div class="qmlproto"> -<div class="table"><table class="qmlname"> -<tr valign="top" class="odd" id="id-prop"> -<td class="tblQmlPropNode"><p> -<a name="id-prop"></a><span class="qmlreadonly">[read-only] </span><span class="name">id</span> : <span class="type"><a href="qml-int.html">int</a></span></p></td></tr> -</table></div></div> -<div class="qmldoc"><p>A read-only property.</p> -</div></div><!-- @@@id --> -<br/> -<!-- $$$name --> -<div class="qmlitem"><div class="qmlproto"> -<div class="table"><table class="qmlname"> -<tr valign="top" class="odd" id="name-prop"> -<td class="tblQmlPropNode"><p> -<a name="name-prop"></a><span class="name">name</span> : <span class="type">string</span></p></td></tr> -</table></div></div> -<div class="qmldoc"><p>Name of the Test.</p> -</div></div><!-- @@@name --> -<br/> -<h2>Attached Property Documentation</h2> -<!-- $$$type --> -<div class="qmlitem"><div class="qmlproto"> -<div class="table"><table class="qmlname"> -<tr valign="top" class="odd" id="type-attached-prop"> -<td class="tblQmlPropNode"><p> -<a name="type-attached-prop"></a><span class="name">Type.type</span> : <span class="type">enumeration</span></p></td></tr> -</table></div></div> -<div class="qmldoc"><div class="table"><table class="valuelist"><tr valign="top" class="odd"><th class="tblConst">Constant</th><th class="tbldscr">Description</th></tr> -<tr><td class="topAlign"><code>Type.NoType</code></td><td class="topAlign">Nothing</td></tr> -<tr><td class="topAlign"><code>Type.SomeType</code></td><td class="topAlign">Something</td></tr> -</table></div> -</div></div><!-- @@@type --> -<br/> -<h2>Signal Documentation</h2> -<!-- $$$completed[overload1]$$$completed --> -<div class="qmlitem"><div class="qmlproto"> -<div class="table"><table class="qmlname"> -<tr valign="top" class="odd" id="completed-signal"> -<td class="tblQmlFuncNode"><p> -<a name="completed-signal"></a><span class="name">completed</span>(<i>status</i>)</p></td></tr> -</table></div></div> -<div class="qmldoc"><p>This signal is emitted when the operation completed with <i>status</i>.</p> -</div></div><!-- @@@completed --> -<br/> -<h2>Attached Signal Documentation</h2> -<!-- $$$configured[overload1]$$$configured --> -<div class="qmlitem"><div class="qmlproto"> -<div class="table"><table class="qmlname"> -<tr valign="top" class="odd" id="configured-signal"> -<td class="tblQmlFuncNode"><p> -<a name="configured-signal"></a><span class="name">configured</span>()</p></td></tr> -</table></div></div> -<div class="qmldoc"><p>This attached signal is emitted when the type was configured.</p> -</div></div><!-- @@@configured --> -<br/> -<h2>Method Documentation</h2> -<!-- $$$ --> -<div class="qmlitem"><div class="fngroup"> -<div class="qmlproto"> -<div class="table"><table class="qmlname"> -<tr valign="top" class="odd" id="disable-method"> -<td class="tblQmlFuncNode"><p> -<a name="disable-method"></a><span class="name">disable</span>()</p></td></tr> -<tr valign="top" class="odd" id="enable-method"> -<td class="tblQmlFuncNode"><p> -<a name="enable-method"></a><span class="name">enable</span>()</p></td></tr> -</table></div></div> -</div><div class="qmldoc"><p>Enables or disables this type.</p> -</div></div><!-- @@@ --> -<br/> -<!-- $$$copy[overload1]$$$copy --> -<div class="qmlitem"><div class="qmlproto"> -<div class="table"><table class="qmlname"> -<tr valign="top" class="odd" id="copy-method"> -<td class="tblQmlFuncNode"><p> -<a name="copy-method"></a><span class="type"><a href="qml-qdoc-test-type.html">Type</a></span> <span class="name">copy</span>(<i>a</i>)</p></td></tr> -</table></div></div> -<div class="qmldoc"><p>Returns another Type based on <i>a</i>.</p> -</div></div><!-- @@@copy --> -<br/> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/test.index b/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/test.index deleted file mode 100644 index f45b33114..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/test.index +++ /dev/null @@ -1,75 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE QDOCINDEX> -<INDEX url="" title="A test project for QDoc build artifacts" version="" project="Test"> - <namespace name="" status="active" access="public" module="test"> - <function name="QDOCTEST_MACRO" href="testqdoc.html#QDOCTEST_MACRO" status="active" access="public" documented="true" related="true" meta="macrowithoutparams" virtual="non" const="false" static="false" final="false" override="false" type="" signature="QDOCTEST_MACRO"/> - <function name="QDOCTEST_MACRO2" href="testqdoc-test.html#QDOCTEST_MACRO2" status="active" access="public" documented="true" related="true" since="Test 1.1" meta="macrowithparams" virtual="non" const="false" static="false" final="false" override="false" type="" brief="A macro with argument x" signature="QDOCTEST_MACRO2( x)"> - <parameter type="" name="x" default=""/> - </function> - <qmlclass name="AbstractParent" qml-module-name="QDoc.Test" fullname="QDoc.Test.AbstractParent" href="qml-qdoc-test-abstractparent.html" status="active" access="public" abstract="true" location="parent.qdoc" filepath="C:/qt5/qttools/tests/auto/qdoc/generatedoutput/qml/parent.qdoc" lineno="29" documented="true" title="AbstractParent" fulltitle="AbstractParent" subtitle="" groups="qmltypes" brief="Abstract base QML type"> - <function name="rear" fullname="QDoc.Test.AbstractParent.rear" href="qml-qdoc-test-abstractparent.html#rear-method" status="active" access="public" location="includefromparent.qdoc" filepath="C:/qt5/qttools/tests/auto/qdoc/generatedoutput/includefromexampledirs/src/includefromparent.qdoc" lineno="47" documented="true" meta="qmlmethod"/> - <function name="rear" fullname="QDoc.Test.AbstractParent.rear" href="qml-qdoc-test-abstractparent.html#rear-method" status="active" access="public" location="parent.qdoc" filepath="C:/qt5/qttools/tests/auto/qdoc/generatedoutput/qml/parent.qdoc" lineno="42" documented="true" meta="qmlmethod"/> - <qmlproperty name="children" fullname="QDoc.Test.AbstractParent.children" status="active" access="public" location="includefromparent.qdoc" filepath="C:/qt5/qttools/tests/auto/qdoc/generatedoutput/includefromexampledirs/src/includefromparent.qdoc" lineno="41" documented="true" type="list<Child>" attached="false" writable="true" brief="Children of the type"/> - </qmlclass> - <qmlclass name="Child" qml-module-name="QDoc.Test" qml-base-type="QDoc.Test::AbstractParent" fullname="QDoc.Test.Child" href="qml-qdoc-test-child.html" status="active" access="public" location="parent.qdoc" filepath="C:/qt5/qttools/tests/auto/qdoc/generatedoutput/qml/parent.qdoc" lineno="47" documented="true" title="Child" fulltitle="Child" subtitle="" brief="A Child inheriting its parent"/> - <qmlclass name="DocTest" qml-module-name="QDoc.Test" fullname="QDoc.Test.DocTest" href="qml-qdoc-test-doctest.html" status="active" access="public" since="QDoc.Test 0.9" documented="true" title="DocTest" fulltitle="DocTest" subtitle="" brief="Represents a doc test case"> - <contents name="introduction" title="Introduction" level="1"/> - <function name="doctest_fail" fullname="QDoc.Test.DocTest.doctest_fail" href="qml-qdoc-test-doctest.html#doctest_fail-method" status="internal" access="public" documented="true" meta="qmlmethod"/> - <function name="fail" fullname="QDoc.Test.DocTest.fail" href="qml-qdoc-test-doctest.html#fail-method" status="active" access="public" location="DocTest.qml" filepath="C:/qt5/qttools/tests/auto/qdoc/generatedoutput/qml/DocTest.qml" lineno="68" documented="true" since="QDoc.Test 1.0" meta="qmlmethod"/> - <qmlproperty name="active" fullname="QDoc.Test.DocTest.active" href="qml-qdoc-test-doctest.html#active-prop" status="active" access="public" documented="true" type="bool" attached="false" writable="true"/> - <qmlproperty name="doctest_internal" fullname="QDoc.Test.DocTest.doctest_internal" href="qml-qdoc-test-doctest.html#doctest_internal-prop" status="internal" access="public" documented="true" type="int" attached="false" writable="true"/> - <qmlproperty name="name" fullname="QDoc.Test.DocTest.name" href="qml-qdoc-test-doctest.html#name-prop" status="active" access="public" documented="true" type="string" attached="false" writable="true"/> - </qmlclass> - <namespace name="TestQDoc" href="testqdoc.html" status="active" access="public" location="testcpp.h" filepath="C:/qt5/qttools/tests/auto/qdoc/generatedoutput\testcpp.h" lineno="32" documented="true" module="TestCPP" brief="A namespace"> - <contents name="usage" title="Usage" level="1"/> - <function name="QDOCTEST_MACRO" href="testqdoc.html#QDOCTEST_MACRO" status="active" access="public" documented="true" related="true" meta="macrowithoutparams" virtual="non" const="false" static="false" final="false" override="false" type="" signature="QDOCTEST_MACRO"/> - <class name="Test" fullname="TestQDoc::Test" href="testqdoc-test.html" status="active" access="public" location="testcpp.h" filepath="C:/qt5/qttools/tests/auto/qdoc/generatedoutput\testcpp.h" lineno="34" documented="true" module="TestCPP" brief="A class in a namespace"> - <function name="QDOCTEST_MACRO2" href="testqdoc-test.html#QDOCTEST_MACRO2" status="active" access="public" documented="true" related="true" since="Test 1.1" meta="macrowithparams" virtual="non" const="false" static="false" final="false" override="false" type="" brief="A macro with argument x" signature="QDOCTEST_MACRO2( x)"> - <parameter type="" name="x" default=""/> - </function> - <function name="anotherObsoleteMember" fullname="TestQDoc::Test::anotherObsoleteMember" href="testqdoc-test-obsolete.html#anotherObsoleteMember" status="obsolete" access="public" location="testcpp.h" filepath="C:/qt5/qttools/tests/auto/qdoc/generatedoutput\testcpp.h" lineno="39" documented="true" meta="plain" virtual="non" const="false" static="false" final="false" override="false" type="void" signature="void anotherObsoleteMember()"/> - <function name="deprecatedMember" fullname="TestQDoc::Test::deprecatedMember" href="testqdoc-test-obsolete.html#deprecatedMember" status="obsolete" access="public" location="testcpp.h" filepath="C:/qt5/qttools/tests/auto/qdoc/generatedoutput\testcpp.h" lineno="40" documented="true" meta="plain" virtual="non" const="false" static="false" final="false" override="false" type="void" signature="void deprecatedMember()"/> - <function name="inlineFunction" fullname="TestQDoc::Test::inlineFunction" href="testqdoc-test.html#inlineFunction" status="active" access="public" location="testcpp.h" filepath="C:/qt5/qttools/tests/auto/qdoc/generatedoutput\testcpp.h" lineno="41" documented="true" meta="plain" virtual="non" const="false" static="false" final="false" override="false" type="void" brief="An inline function, documented using the \fn QDoc command" signature="void inlineFunction()"/> - <function name="obsoleteMember" fullname="TestQDoc::Test::obsoleteMember" href="testqdoc-test-obsolete.html#obsoleteMember" status="obsolete" access="public" location="testcpp.h" filepath="C:/qt5/qttools/tests/auto/qdoc/generatedoutput\testcpp.h" lineno="38" documented="true" meta="plain" virtual="non" const="false" static="false" final="false" override="false" type="void" signature="void obsoleteMember()"/> - <function name="overload" fullname="TestQDoc::Test::overload" href="testqdoc-test.html#overload" status="active" access="protected" location="testcpp.h" filepath="C:/qt5/qttools/tests/auto/qdoc/generatedoutput\testcpp.h" lineno="45" meta="plain" virtual="non" const="false" static="false" final="false" override="false" type="void" signature="void overload()"/> - <function name="overload" fullname="TestQDoc::Test::overload" href="testqdoc-test.html#overload-1" status="active" access="protected" location="testcpp.h" filepath="C:/qt5/qttools/tests/auto/qdoc/generatedoutput\testcpp.h" lineno="46" meta="plain" virtual="non" const="false" static="false" final="false" override="false" overload="true" overload-number="1" type="void" signature="void overload(bool b)"> - <parameter type="bool" name="b" default=""/> - </function> - <function name="someFunction" fullname="TestQDoc::Test::someFunction" href="testqdoc-test.html#someFunction" status="active" access="public" location="testcpp.h" filepath="C:/qt5/qttools/tests/auto/qdoc/generatedoutput\testcpp.h" lineno="36" documented="true" meta="plain" virtual="non" const="false" static="false" final="false" override="false" type="int" signature="int someFunction(int v)"> - <parameter type="int" name="v" default=""/> - </function> - <function name="someFunctionDefaultArg" fullname="TestQDoc::Test::someFunctionDefaultArg" href="testqdoc-test.html#someFunctionDefaultArg" status="active" access="public" location="testcpp.h" filepath="C:/qt5/qttools/tests/auto/qdoc/generatedoutput\testcpp.h" lineno="37" documented="true" meta="plain" virtual="non" const="false" static="false" final="false" override="false" type="void" signature="void someFunctionDefaultArg(int i, bool b)"> - <parameter type="int" name="i" default=""/> - <parameter type="bool" name="b" default="false"/> - </function> - <function name="virtualFun" fullname="TestQDoc::Test::virtualFun" href="testqdoc-test.html#virtualFun" status="active" access="public" location="testcpp.h" filepath="C:/qt5/qttools/tests/auto/qdoc/generatedoutput\testcpp.h" lineno="42" documented="true" meta="plain" virtual="virtual" const="false" static="false" final="false" override="false" type="void" signature="void virtualFun()"/> - </class> - <class name="TestDerived" fullname="TestQDoc::TestDerived" href="testqdoc-testderived.html" status="active" access="public" location="testcpp.h" filepath="C:/qt5/qttools/tests/auto/qdoc/generatedoutput\testcpp.h" lineno="49" documented="true" bases="TestQDoc::Test" module="TestCPP" brief="A derived class in a namespace"> - <function name="virtualFun" fullname="TestQDoc::TestDerived::virtualFun" href="testqdoc-testderived.html#virtualFun" status="active" access="public" location="testcpp.h" filepath="C:/qt5/qttools/tests/auto/qdoc/generatedoutput\testcpp.h" lineno="51" documented="true" meta="plain" virtual="virtual" const="false" static="false" final="false" override="true" type="void" signature="void virtualFun() override"/> - </class> - </namespace> - <qmlclass name="Type" qml-module-name="QDoc.Test" fullname="QDoc.Test.Type" href="qml-qdoc-test-type.html" status="active" access="public" documented="true" title="Type" fulltitle="Type" subtitle="" brief="A QML type documented in a .cpp file"> - <function name="completed" fullname="QDoc.Test.Type.completed" href="qml-qdoc-test-type.html#completed-signal" status="active" access="public" documented="true" meta="qmlsignal"/> - <function name="configured" fullname="QDoc.Test.Type.configured" href="qml-qdoc-test-type.html#configured-signal" status="active" access="public" documented="true" meta="qmlsignal"/> - <function name="copy" fullname="QDoc.Test.Type.copy" href="qml-qdoc-test-type.html#copy-method" status="active" access="public" documented="true" meta="qmlmethod"/> - <function name="disable" fullname="QDoc.Test.Type.disable" href="qml-qdoc-test-type.html#disable-method" status="active" access="public" meta="qmlmethod"/> - <function name="enable" fullname="QDoc.Test.Type.enable" href="qml-qdoc-test-type.html#enable-method" status="active" access="public" meta="qmlmethod"/> - <qmlproperty name="fifth" fullname="QDoc.Test.Type.fifth" href="qml-qdoc-test-type.html#fifth-prop" status="active" access="public" documented="true" type="int" attached="false" writable="true" brief="A group of properties sharing a documentation comment"/> - <qmlproperty name="fourth" fullname="QDoc.Test.Type.fourth" href="qml-qdoc-test-type.html#fourth-prop" status="active" access="public" documented="true" type="int" attached="false" writable="true" brief="A group of properties sharing a documentation comment"/> - <qmlproperty name="group.first" fullname="QDoc.Test.Type.group.first" href="qml-qdoc-test-type.html#group.first-prop" status="active" access="public" documented="true" type="int" attached="false" writable="true" brief="A property group"/> - <qmlproperty name="group.second" fullname="QDoc.Test.Type.group.second" href="qml-qdoc-test-type.html#group.second-prop" status="active" access="public" documented="true" type="int" attached="false" writable="true" brief="A property group"/> - <qmlproperty name="group.third" fullname="QDoc.Test.Type.group.third" href="qml-qdoc-test-type.html#group.third-prop" status="active" access="public" documented="true" type="int" attached="false" writable="true" brief="A property group"/> - <qmlproperty name="id" fullname="QDoc.Test.Type.id" href="qml-qdoc-test-type.html#id-prop" status="active" access="public" documented="true" type="int" attached="false" writable="false" brief="A read-only property"/> - <qmlproperty name="name" fullname="QDoc.Test.Type.name" href="qml-qdoc-test-type.html#name-prop" status="active" access="public" documented="true" type="string" attached="false" writable="true" brief="Name of the Test"/> - <qmlproperty name="type" fullname="QDoc.Test.Type.type" href="qml-qdoc-test-type.html#type-attached-prop" status="active" access="public" documented="true" type="enumeration" attached="true" writable="true"/> - </qmlclass> - <page name="index.html" href="index.html" status="active" location="includefromparent.qdoc" filepath="C:/qt5/qttools/tests/auto/qdoc/generatedoutput/includefromexampledirs/src/includefromparent.qdoc" lineno="29" documented="true" subtype="page" title="doc index" fulltitle="doc index" subtitle="" module="Test"> - <contents name="c-classes" title="C++ Classes" level="1"/> - <contents name="qml-types" title="QML Types" level="1"/> - </page> - <qmlbasictype name="int" href="qml-int.html" status="active" access="public" location="parent.qdoc" filepath="C:/qt5/qttools/tests/auto/qdoc/generatedoutput/qml/parent.qdoc" lineno="54" documented="true"/> - <group name="qmltypes" href="qmltypes.html" status="internal" seen="false" title="" members="AbstractParent"/> - <module name="TestCPP" href="testcpp-module.html" status="active" documented="true" seen="true" title="QDoc Test C++ Classes" module="Test" members="TestQDoc,Test,TestDerived" brief="A test module page"/> - <qmlmodule name="QDoc.Test" qml-module-name="QDoc.Test" qml-module-version="1.1" href="qdoc-test-qmlmodule.html" status="active" documented="true" seen="true" title="" module="Test" members="DocTest,AbstractParent,Child,int,Type" brief="QML Types for the Test module"/> - </namespace> -</INDEX> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/testcpp-module.html b/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/testcpp-module.html deleted file mode 100644 index b1301b5d0..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/testcpp-module.html +++ /dev/null @@ -1,42 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- testcpp.cpp --> - <title>QDoc Test C++ Classes | Test</title> -</head> -<body> -<div class="sidebar"> -<div class="toc"> -<h3><a name="toc">Contents</a></h3> -<ul> -<li class="level1"><a href="#namespaces">Namespaces</a></li> -<li class="level1"><a href="#classes">Classes</a></li> -<li class="level1"><a href="#details">Detailed Description</a></li> -</ul> -</div> -<div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">QDoc Test C++ Classes</h1> -<span class="subtitle"></span> -<!-- $$$TestCPP-brief --> -<p>A test module page. <a href="#details">More...</a></p> -<!-- @@@TestCPP --> -<a name="namespaces"></a> -<h2 id="namespaces">Namespaces</h2> -<div class="table"><table class="annotated"> -<tr class="odd topAlign"><td class="tblName"><p><a href="testqdoc.html">TestQDoc</a></p></td><td class="tblDescr"><p>A namespace</p></td></tr> -</table></div> -<a name="classes"></a> -<h2 id="classes">Classes</h2> -<div class="table"><table class="annotated"> -<tr class="odd topAlign"><td class="tblName"><p><a href="testqdoc-test.html">TestQDoc::Test</a></p></td><td class="tblDescr"><p>A class in a namespace</p></td></tr> -<tr class="even topAlign"><td class="tblName"><p><a href="testqdoc-testderived.html">TestQDoc::TestDerived</a></p></td><td class="tblDescr"><p>A derived class in a namespace</p></td></tr> -</table></div> -<!-- $$$TestCPP-description --> -<a name="details"></a> -<div class="descr"> -<h2 id="details">Detailed Description</h2> -</div> -<!-- @@@TestCPP --> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/testqdoc-test-members.html b/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/testqdoc-test-members.html deleted file mode 100644 index 6f3ca0ff5..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/testqdoc-test-members.html +++ /dev/null @@ -1,22 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- testcpp.cpp --> - <title>List of All Members for Test | Test</title> -</head> -<body> -<li>Test</li> -<div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">List of All Members for Test</h1> -<p>This is the complete list of members for <a href="testqdoc-test.html">TestQDoc::Test</a>, including inherited members.</p> -<ul> -<li class="fn"><span class="name"><b><a href="testqdoc-test.html#inlineFunction">inlineFunction</a></b></span>()</li> -<li class="fn"><span class="name"><b><a href="testqdoc-test.html#overload">overload</a></b></span>()</li> -<li class="fn"><span class="name"><b><a href="testqdoc-test.html#overload-1">overload</a></b></span>(bool )</li> -<li class="fn"><span class="name"><b><a href="testqdoc-test.html#someFunction">someFunction</a></b></span>(int ) : int</li> -<li class="fn"><span class="name"><b><a href="testqdoc-test.html#someFunctionDefaultArg">someFunctionDefaultArg</a></b></span>(int , bool )</li> -<li class="fn"><span class="name"><b><a href="testqdoc-test.html#virtualFun">virtualFun</a></b></span>()</li> -</ul> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/testqdoc-test-obsolete.html b/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/testqdoc-test-obsolete.html deleted file mode 100644 index 088c2ee99..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/testqdoc-test-obsolete.html +++ /dev/null @@ -1,36 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- testcpp.cpp --> - <title>Obsolete Members for Test | Test</title> -</head> -<body> -<li>Test</li> -<div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">Obsolete Members for Test</h1> -<p><b>The following members of class <a href="testqdoc-test.html">Test</a> are obsolete.</b> They are provided to keep old source code working. We strongly advise against using them in new code.</p> -<h2>Public Functions</h2> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft topAlign rightAlign"> <code>(obsolete) </code>void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test-obsolete.html#anotherObsoleteMember">anotherObsoleteMember</a></b>()</td></tr> -<tr><td class="memItemLeft topAlign rightAlign"> <code>(obsolete) </code>void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test-obsolete.html#deprecatedMember">deprecatedMember</a></b>()</td></tr> -<tr><td class="memItemLeft topAlign rightAlign"> <code>(obsolete) </code>void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test-obsolete.html#obsoleteMember">obsoleteMember</a></b>()</td></tr> -</table></div> -<h2>Member Function Documentation</h2> -<!-- $$$anotherObsoleteMember[overload1]$$$anotherObsoleteMember --> -<h3 class="fn" id="anotherObsoleteMember"><a name="anotherObsoleteMember"></a><span class="type">void</span> Test::<span class="name">anotherObsoleteMember</span>()</h3> -<p>This function is obsolete. It is provided to keep old source code working. We strongly advise against using it in new code.</p> -<p>Use <a href="testqdoc-test-obsolete.html#obsoleteMember">obsoleteMember</a>() instead.</p> -<!-- @@@anotherObsoleteMember --> -<!-- $$$deprecatedMember[overload1]$$$deprecatedMember --> -<h3 class="fn" id="deprecatedMember"><a name="deprecatedMember"></a><span class="type">void</span> Test::<span class="name">deprecatedMember</span>()</h3> -<p>This function is obsolete. It is provided to keep old source code working. We strongly advise against using it in new code.</p> -<p>Use <a href="testqdoc-test.html#someFunction">someFunction</a>() instead.</p> -<!-- @@@deprecatedMember --> -<!-- $$$obsoleteMember[overload1]$$$obsoleteMember --> -<h3 class="fn" id="obsoleteMember"><a name="obsoleteMember"></a><span class="type">void</span> Test::<span class="name">obsoleteMember</span>()</h3> -<p>This function is obsolete. It is provided to keep old source code working. We strongly advise against using it in new code.</p> -<p>Use <a href="testqdoc-test.html#someFunction">someFunction</a>() instead.</p> -<!-- @@@obsoleteMember --> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/testqdoc-test.html b/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/testqdoc-test.html deleted file mode 100644 index 53db06685..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/testqdoc-test.html +++ /dev/null @@ -1,91 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- testcpp.cpp --> - <title>Test Class | Test</title> -</head> -<body> -<li>Test</li> -<div class="sidebar"> -<div class="toc"> -<h3><a name="toc">Contents</a></h3> -<ul> -<li class="level1"><a href="#public-functions">Public Functions</a></li> -<li class="level1"><a href="#protected-functions">Protected Functions</a></li> -<li class="level1"><a href="#macros">Macros</a></li> -<li class="level1"><a href="#details">Detailed Description</a></li> -</ul> -</div> -<div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">Test Class</h1> -<span class="small-subtitle">(<a href="testqdoc-test.html">TestQDoc::Test</a>)<br/></span> -<!-- $$$Test-brief --> -<p>A class in a namespace. <a href="#details">More...</a></p> -<!-- @@@Test --> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft rightAlign topAlign"> Header:</td><td class="memItemRight bottomAlign"> <span class="preprocessor">#include <Test></span> -</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Instantiated By:</td><td class="memItemRight bottomAlign"> <a href="qml-qdoc-test-type.html">Type</a></td></tr><tr><td class="memItemLeft rightAlign topAlign"> Inherited By:</td><td class="memItemRight bottomAlign"> <p><a href="testqdoc-testderived.html">TestQDoc::TestDerived</a></p> -</td></tr></table></div><ul> -<li><a href="testqdoc-test-members.html">List of all members, including inherited members</a></li> -<li><a href="testqdoc-test-obsolete.html">Obsolete members</a></li> -</ul> -<a name="public-functions"></a> -<h2 id="public-functions">Public Functions</h2> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#inlineFunction">inlineFunction</a></b>()</td></tr> -<tr><td class="memItemLeft rightAlign topAlign"> int </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#someFunction">someFunction</a></b>(int <i>v</i>)</td></tr> -<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#someFunctionDefaultArg">someFunctionDefaultArg</a></b>(int <i>i</i>, bool <i>b</i> = false)</td></tr> -<tr><td class="memItemLeft rightAlign topAlign"> virtual void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#virtualFun">virtualFun</a></b>()</td></tr> -</table></div> -<a name="protected-functions"></a> -<h2 id="protected-functions">Protected Functions</h2> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#overload">overload</a></b>()</td></tr> -<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#overload-1">overload</a></b>(bool <i>b</i>)</td></tr> -</table></div> -<a name="macros"></a> -<h2 id="macros">Macros</h2> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft rightAlign topAlign"> </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#QDOCTEST_MACRO2">QDOCTEST_MACRO2</a></b>(<i>x</i>)</td></tr> -</table></div> -<a name="details"></a> -<!-- $$$Test-description --> -<div class="descr"> -<h2 id="details">Detailed Description</h2> -</div> -<!-- @@@Test --> -<div class="func"> -<h2>Member Function Documentation</h2> -<!-- $$$ --> -<div class="fngroup"> -<h3 class="fn fngroupitem" id="overload"><a name="overload"></a><code>[protected] </code><span class="type">void</span> Test::<span class="name">overload</span>()</h3><h3 class="fn fngroupitem" id="overload-1"><a name="overload-1"></a><code>[protected] </code><span class="type">void</span> Test::<span class="name">overload</span>(<span class="type">bool</span> <i>b</i>)</h3></div> -<p>Overloads that share a documentation comment, optionally taking a parameter <i>b</i>.</p> -<!-- @@@ --> -<!-- $$$inlineFunction[overload1]$$$inlineFunction --> -<h3 class="fn" id="inlineFunction"><a name="inlineFunction"></a><span class="type">void</span> Test::<span class="name">inlineFunction</span>()</h3> -<p>An inline function, documented using the \fn QDoc command.</p> -<!-- @@@inlineFunction --> -<!-- $$$someFunction[overload1]$$$someFunctionint --> -<h3 class="fn" id="someFunction"><a name="someFunction"></a><span class="type">int</span> Test::<span class="name">someFunction</span>(<span class="type">int</span> <i>v</i>)</h3> -<p>Function that takes a parameter <i>v</i>. Also returns the value of <i>v</i>.</p> -<!-- @@@someFunction --> -<!-- $$$someFunctionDefaultArg[overload1]$$$someFunctionDefaultArgintbool --> -<h3 class="fn" id="someFunctionDefaultArg"><a name="someFunctionDefaultArg"></a><span class="type">void</span> Test::<span class="name">someFunctionDefaultArg</span>(<span class="type">int</span> <i>i</i>, <span class="type">bool</span> <i>b</i> = false)</h3> -<p>Function that takes a parameter <i>i</i> and <i>b</i>.</p> -<!-- @@@someFunctionDefaultArg --> -<!-- $$$virtualFun[overload1]$$$virtualFun --> -<h3 class="fn" id="virtualFun"><a name="virtualFun"></a><code>[virtual] </code><span class="type">void</span> Test::<span class="name">virtualFun</span>()</h3> -<p>Function that must be reimplemented.</p> -<!-- @@@virtualFun --> -</div> -<div class="macros"> -<h2>Macro Documentation</h2> -<!-- $$$QDOCTEST_MACRO2[overload1]$$$QDOCTEST_MACRO2 --> -<h3 class="fn" id="QDOCTEST_MACRO2"><a name="QDOCTEST_MACRO2"></a><span class="name">QDOCTEST_MACRO2</span>(<i>x</i>)</h3> -<p>A macro with argument <i>x</i>.</p> -<p>This function was introduced in Test 1.1.</p> -<!-- @@@QDOCTEST_MACRO2 --> -</div> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/testqdoc-testderived-members.html b/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/testqdoc-testderived-members.html deleted file mode 100644 index 0babbbd5f..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/testqdoc-testderived-members.html +++ /dev/null @@ -1,22 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- testcpp.cpp --> - <title>List of All Members for TestDerived | Test</title> -</head> -<body> -<li>TestDerived</li> -<div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">List of All Members for TestDerived</h1> -<p>This is the complete list of members for <a href="testqdoc-testderived.html">TestQDoc::TestDerived</a>, including inherited members.</p> -<ul> -<li class="fn"><span class="name"><b><a href="testqdoc-test.html#inlineFunction">inlineFunction</a></b></span>()</li> -<li class="fn"><span class="name"><b><a href="testqdoc-test.html#overload">overload</a></b></span>()</li> -<li class="fn"><span class="name"><b><a href="testqdoc-test.html#overload-1">overload</a></b></span>(bool )</li> -<li class="fn"><span class="name"><b><a href="testqdoc-test.html#someFunction">someFunction</a></b></span>(int ) : int</li> -<li class="fn"><span class="name"><b><a href="testqdoc-test.html#someFunctionDefaultArg">someFunctionDefaultArg</a></b></span>(int , bool )</li> -<li class="fn"><span class="name"><b><a href="testqdoc-testderived.html#virtualFun">virtualFun</a></b></span>()</li> -</ul> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/testqdoc-testderived.html b/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/testqdoc-testderived.html deleted file mode 100644 index 8f7517cd3..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/testqdoc-testderived.html +++ /dev/null @@ -1,48 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- testcpp.cpp --> - <title>TestDerived Class | Test</title> -</head> -<body> -<li>TestDerived</li> -<div class="sidebar"> -<div class="toc"> -<h3><a name="toc">Contents</a></h3> -<ul> -<li class="level1"><a href="#reimplemented-public-functions">Reimplemented Public Functions</a></li> -<li class="level1"><a href="#details">Detailed Description</a></li> -</ul> -</div> -<div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">TestDerived Class</h1> -<span class="small-subtitle">(<a href="testqdoc-testderived.html">TestQDoc::TestDerived</a>)<br/></span> -<!-- $$$TestDerived-brief --> -<p>A derived class in a namespace. <a href="#details">More...</a></p> -<!-- @@@TestDerived --> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft rightAlign topAlign"> Header:</td><td class="memItemRight bottomAlign"> <span class="preprocessor">#include <TestDerived></span> -</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Inherits:</td><td class="memItemRight bottomAlign"> <a href="testqdoc-test.html">TestQDoc::Test</a></td></tr></table></div><ul> -<li><a href="testqdoc-testderived-members.html">List of all members, including inherited members</a></li> -</ul> -<a name="reimplemented-public-functions"></a> -<h2 id="reimplemented-public-functions">Reimplemented Public Functions</h2> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft rightAlign topAlign"> virtual void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-testderived.html#virtualFun">virtualFun</a></b>() override</td></tr> -</table></div> -<a name="details"></a> -<!-- $$$TestDerived-description --> -<div class="descr"> -<h2 id="details">Detailed Description</h2> -</div> -<!-- @@@TestDerived --> -<div class="func"> -<h2>Member Function Documentation</h2> -<!-- $$$virtualFun[overload1]$$$virtualFun --> -<h3 class="fn" id="virtualFun"><a name="virtualFun"></a><code>[override virtual] </code><span class="type">void</span> TestDerived::<span class="name">virtualFun</span>()</h3> -<p>Reimplements: <a href="testqdoc-test.html#virtualFun">Test::virtualFun</a>().</p> -<!-- @@@virtualFun --> -</div> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/testqdoc.html b/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/testqdoc.html deleted file mode 100644 index 9c6f5b6ae..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/includefromexampledirs/testqdoc.html +++ /dev/null @@ -1,64 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- testcpp.cpp --> - <title>TestQDoc Namespace | Test</title> -</head> -<body> -<div class="sidebar"> -<div class="toc"> -<h3><a name="toc">Contents</a></h3> -<ul> -<li class="level1"><a href="#classes">Classes</a></li> -<li class="level1"><a href="#macros">Macros</a></li> -<li class="level1"><a href="#details">Detailed Description</a></li> -<li class="level2"><a href="#usage">Usage</a></li> -</ul> -</div> -<div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">TestQDoc Namespace</h1> -<!-- $$$TestQDoc-brief --> -<p>A namespace. <a href="#details">More...</a></p> -<!-- @@@TestQDoc --> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft rightAlign topAlign"> Header:</td><td class="memItemRight bottomAlign"> <span class="preprocessor">#include <TestCPP></span> -</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr></table></div><ul> -</ul> -<a name="classes"></a> -<h2 id="classes">Classes</h2> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft rightAlign topAlign"> class </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html">Test</a></b></td></tr> -<tr><td class="memItemLeft rightAlign topAlign"> class </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-testderived.html">TestDerived</a></b></td></tr> -</table></div> -<a name="macros"></a> -<h2 id="macros">Macros</h2> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft rightAlign topAlign"> </td><td class="memItemRight bottomAlign"><b><a href="testqdoc.html#QDOCTEST_MACRO">QDOCTEST_MACRO</a></b></td></tr> -</table></div> -<a name="details"></a> -<!-- $$$TestQDoc-description --> -<div class="descr"> -<h2 id="details">Detailed Description</h2> -<a name="usage"></a> -<h3 id="usage">Usage</h3> -<p>This namespace is for testing QDoc output.</p> -</div> -<!-- @@@TestQDoc --> -<div class="classes"> -<h2>Classes</h2> -<h3> class <a href="testqdoc-test.html">Test</a></h3><!-- $$$Test-brief --> -<p>A class in a namespace. <a href="testqdoc-test.html#details">More...</a></p> -<!-- @@@Test --> -<h3> class <a href="testqdoc-testderived.html">TestDerived</a></h3><!-- $$$TestDerived-brief --> -<p>A derived class in a namespace. <a href="testqdoc-testderived.html#details">More...</a></p> -<!-- @@@TestDerived --> -</div> -<div class="macros"> -<h2>Macro Documentation</h2> -<!-- $$$QDOCTEST_MACRO[overload1]$$$QDOCTEST_MACRO --> -<h3 class="fn" id="QDOCTEST_MACRO"><a name="QDOCTEST_MACRO"></a><span class="name">QDOCTEST_MACRO</span></h3> -<!-- @@@QDOCTEST_MACRO --> -</div> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/index.html b/tests/auto/qdoc/generatedoutput/expected_output/index.html index cb5b7b6db..1efeb9166 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/index.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/index.html @@ -11,10 +11,10 @@ <!-- $$$index.html-description --> <div class="descr"> <a name="details"></a> <div class="table"><table class="annotated"> -<tr class="odd topAlign"><td class="tblName"><p><a href="first.html">First</a></p></td></tr> -<tr class="even topAlign"><td class="tblName"><p><a href="">First::Nested</a></p></td></tr> -<tr class="odd topAlign"><td class="tblName"><p><a href="second.html">Second</a></p></td></tr> -<tr class="even topAlign"><td class="tblName"><p><a href="third.html">Third</a></p></td></tr> +<tr class="odd topAlign"><td class="tblName" translate="no"><p><a href="first.html">First</a></p></td></tr> +<tr class="even topAlign"><td class="tblName" translate="no"><p><a href="">First::Nested</a></p></td></tr> +<tr class="odd topAlign"><td class="tblName" translate="no"><p><a href="second.html">Second</a></p></td></tr> +<tr class="even topAlign"><td class="tblName" translate="no"><p><a href="third.html">Third</a></p></td></tr> </table></div> </div> <!-- @@@index.html --> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/nestedmacro/testcpp-module.html b/tests/auto/qdoc/generatedoutput/expected_output/nestedmacro/testcpp-module.html index 6ab4d245b..f264ca881 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/nestedmacro/testcpp-module.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/nestedmacro/testcpp-module.html @@ -16,21 +16,21 @@ </ul> </div> <div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">QDoc Test C++ Classes</h1> -<span class="subtitle"></span> +<h1 class="title" translate="no">QDoc Test C++ Classes</h1> +<span class="subtitle" translate="no"></span> <!-- $$$TestCPP-brief --> <p>A test module page. <a href="#details">More...</a></p> <!-- @@@TestCPP --> <a name="namespaces"></a> <h2 id="namespaces">Namespaces</h2> <div class="table"><table class="annotated"> -<tr class="odd topAlign"><td class="tblName"><p><a href="testqdoc.html">TestQDoc</a></p></td><td class="tblDescr"><p>A namespace</p></td></tr> +<tr class="odd topAlign"><td class="tblName" translate="no"><p><a href="testqdoc.html">TestQDoc</a></p></td><td class="tblDescr"><p>A namespace</p></td></tr> </table></div> <a name="classes"></a> <h2 id="classes">Classes</h2> <div class="table"><table class="annotated"> -<tr class="odd topAlign"><td class="tblName"><p><a href="testqdoc-test.html">TestQDoc::Test</a></p></td><td class="tblDescr"><p>A class in a namespace</p></td></tr> -<tr class="even topAlign"><td class="tblName"><p><a href="testqdoc-testderived.html">TestQDoc::TestDerived</a></p></td><td class="tblDescr"><p>A derived class in a namespace</p></td></tr> +<tr class="odd topAlign"><td class="tblName" translate="no"><p><a href="testqdoc-test.html">TestQDoc::Test</a></p></td><td class="tblDescr"><p>A class in a namespace</p></td></tr> +<tr class="even topAlign"><td class="tblName" translate="no"><p><a href="testqdoc-testderived.html">TestQDoc::TestDerived</a></p></td><td class="tblDescr"><p>A derived class in a namespace</p></td></tr> </table></div> <!-- $$$TestCPP-description --> <a name="details"></a> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/noautolist/qdoc-test-qmlmodule.html b/tests/auto/qdoc/generatedoutput/expected_output/noautolist/qdoc-test-qmlmodule.html index 9a1d8b329..6c6982fdf 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/noautolist/qdoc-test-qmlmodule.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/noautolist/qdoc-test-qmlmodule.html @@ -7,7 +7,7 @@ </head> <body> <div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div> -<span class="subtitle"></span> +<span class="subtitle" translate="no"></span> <p><b>This module is under development and is subject to change.</b></p> <p>This module was introduced in Qt 1.1.</p> <!-- $$$QDoc.Test-description --> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/noautolist/test-componentset-example.html b/tests/auto/qdoc/generatedoutput/expected_output/noautolist/test-componentset-example.html index 5331c2b35..d5f16bcb0 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/noautolist/test-componentset-example.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/noautolist/test-componentset-example.html @@ -25,22 +25,22 @@ <!-- $$$componentset-description --> <div class="descr"> <a name="details"></a> <p>This example demonstrates one of the ways to document QML types.</p> -<p>In particular, there are sample types that are documented with QDoc commands comments. There are documentation comments for the QML types and their public interfaces. The types are grouped into a module, the <a href="uicomponents-qmlmodule.html">UI Components</a> module.</p> -<p>The uicomponents.qdoc file generates the overview page for the <a href="uicomponents-qmlmodule.html">UI Components</a> module page.</p> -<p>The generated documentation is available in the <a href="uicomponents-qmlmodule.html">UI Components</a> module.</p> +<p>In particular, there are sample types that are documented with QDoc commands comments. There are documentation comments for the QML types and their public interfaces. The types are grouped into a module, the <a href="uicomponents-qmlmodule.html" translate="no">UI Components</a> module.</p> +<p>The uicomponents.qdoc file generates the overview page for the <a href="uicomponents-qmlmodule.html" translate="no">UI Components</a> module page.</p> +<p>The generated documentation is available in the <a href="uicomponents-qmlmodule.html" translate="no">UI Components</a> module.</p> <a name="qml-class"></a> <h4 id="qml-class">QML Class</h4> -<p>The QML types use the \qmltype to document the type. In addition, they have the \inmodule command in order for QDoc to associate them to the <code>UIComponents</code> module.</p> +<p>The QML types use the \qmltype to document the type. In addition, they have the \inmodule command in order for QDoc to associate them to the <code translate="no">UIComponents</code> module.</p> <p>QDoc uses the \brief command to place a basic description when listing the types.</p> <a name="properties-signals-handlers-and-methods"></a> <h4 id="properties-signals-handlers-and-methods">Properties, Signals, Handlers, and Methods</h4> <p>The types have their properties, signals, handlers, and methods defined in their respective QML files. QDoc associates the properties and methods to the types, therefore, you only need to place the documentation above the property, method, or signal.</p> <p>To document the type of a <i>property alias</i>, you must use the \qmlproperty command to specify the data type.</p> -<pre class="cpp">\qmlproperty <span class="type">int</span> anAliasedProperty +<pre class="cpp" translate="no">\qmlproperty <span class="type">int</span> anAliasedProperty An aliased property of type <span class="type">int</span><span class="operator">.</span></pre> <a name="internal-documentation"></a> <h5 id="internal-documentation">Internal Documentation</h5> -<p>You may declare that a documentation is for internal use by placing the \internal command after the beginning QDoc comment <code>/*</code>. QDoc will prevent the internal documentation from appearing in the public API.</p> +<p>You may declare that a documentation is for internal use by placing the \internal command after the beginning QDoc comment <code translate="no">/*</code>. QDoc will prevent the internal documentation from appearing in the public API.</p> <p>If you wish to omit certain parts of the documentation, you may use the \omit and \endomit command.</p> <a name="qml-types-with-c-implementation"></a> <h4 id="qml-types-with-c-implementation">QML Types with C++ Implementation</h4> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/noautolist/testcpp-module.html b/tests/auto/qdoc/generatedoutput/expected_output/noautolist/testcpp-module.html index 8108b0979..432637022 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/noautolist/testcpp-module.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/noautolist/testcpp-module.html @@ -14,8 +14,8 @@ </ul> </div> <div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">QDoc Test C++ Classes</h1> -<span class="subtitle"></span> +<h1 class="title" translate="no">QDoc Test C++ Classes</h1> +<span class="subtitle" translate="no"></span> <!-- $$$TestCPP-brief --> <p>A test module page. <a href="#details">More...</a></p> <!-- @@@TestCPP --> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qdoc-test-qmlmodule.html b/tests/auto/qdoc/generatedoutput/expected_output/qdoc-test-qmlmodule.html index 734447216..908a2a365 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qdoc-test-qmlmodule.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qdoc-test-qmlmodule.html @@ -7,7 +7,7 @@ </head> <body> <div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div> -<span class="subtitle"></span> +<span class="subtitle" translate="no"></span> <p><b>This module is under development and is subject to change.</b></p> <p>This module was introduced in Qt 1.1.</p> <!-- $$$QDoc.Test-description --> @@ -15,11 +15,11 @@ </div> <!-- @@@QDoc.Test --> <div class="table"><table class="annotated"> -<tr class="odd topAlign"><td class="tblName"><p><a href="qml-qdoc-test-abstractparent.html">AbstractParent</a></p></td><td class="tblDescr"><p>Abstract base QML type</p></td></tr> -<tr class="even topAlign"><td class="tblName"><p><a href="qml-qdoc-test-child.html">Child</a></p></td><td class="tblDescr"><p>A Child inheriting its parent</p></td></tr> -<tr class="odd topAlign"><td class="tblName"><p><a href="qml-qdoc-test-doctest.html">DocTest</a></p></td><td class="tblDescr"><p>Represents a doc test case</p></td></tr> -<tr class="even topAlign"><td class="tblName"><p><a href="qml-qdoc-test-type.html">Type</a></p></td><td class="tblDescr"><p>A QML type documented in a .cpp file</p></td></tr> -<tr class="odd topAlign"><td class="tblName"><p><a href="qml-int.html">int</a></p></td><td class="tblDescr"><p>An integer basic type</p></td></tr> +<tr class="odd topAlign"><td class="tblName" translate="no"><p><a href="qml-qdoc-test-abstractparent.html">AbstractParent</a></p></td><td class="tblDescr"><p>Abstract base QML type</p></td></tr> +<tr class="even topAlign"><td class="tblName" translate="no"><p><a href="qml-qdoc-test-child.html">Child</a></p></td><td class="tblDescr"><p>A Child inheriting its parent</p></td></tr> +<tr class="odd topAlign"><td class="tblName" translate="no"><p><a href="qml-qdoc-test-doctest.html">DocTest</a></p></td><td class="tblDescr"><p>Represents a doc test case</p></td></tr> +<tr class="even topAlign"><td class="tblName" translate="no"><p><a href="qml-qdoc-test-type.html">Type</a></p></td><td class="tblDescr"><p>A QML type documented in a .cpp file</p></td></tr> +<tr class="odd topAlign"><td class="tblName" translate="no"><p><a href="qml-int.html">int</a></p></td><td class="tblDescr"><p>An integer basic type</p></td></tr> </table></div> </body> </html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput-linking.html b/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput-linking.html index 2e294ffff..94d1e1a08 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput-linking.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput-linking.html @@ -20,7 +20,7 @@ <div class="descr"> <a name="details"></a> <a name="link-test-target"></a><a name="link-targets"></a> <h2 id="link-targets">Link targets</h2> -<p>Valid parameters for the link command (<code>\l</code>) are page and section titles, targets defined with \target or \keyword commands, and API reference keywords (types, methods, namespaces, and so on).</p> +<p>Valid parameters for the link command (<code translate="no">\l</code>) are page and section titles, targets defined with \target or \keyword commands, and API reference keywords (types, methods, namespaces, and so on).</p> </div> <!-- @@@qdoctests-qdocfileoutput-linking.html --> </body> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput.html b/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput.html index 8b60812bb..ed48aa30f 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qdoctests-qdocfileoutput.html @@ -20,32 +20,32 @@ <span class="subtitle"></span> <!-- $$$qdoctests-qdocfileoutput.html-description --> <div class="descr"> <a name="details"></a> -<p>QDoc generates documentation for software projects. It does this by extracting <i>QDoc comments</i> from project source files. QDoc comments are signified by a C-style-like comment tag followed by an exclamation point, like this: <code>/*!</code> <code>This text is contained within QDoc comment tags.</code> <code>*/</code>.</p> +<p>QDoc generates documentation for software projects. It does this by extracting <i>QDoc comments</i> from project source files. QDoc comments are signified by a C-style-like comment tag followed by an exclamation point, like this: <code translate="no">/*!</code> <code translate="no">This text is contained within QDoc comment tags.</code> <code translate="no">*/</code>.</p> <a name="supported-file-types"></a> <h2 id="supported-file-types">Supported file types</h2> -<p>QDoc parses <code>.cpp</code> and <code>.qdoc</code> files. It does extract comments from header (<code>.h</code>) files.</p> +<p>QDoc parses <code translate="no">.cpp</code> and <code translate="no">.qdoc</code> files. It does extract comments from header (<code translate="no">.h</code>) files.</p> <a name="further-information"></a> <h2 id="further-information">Further information</h2> -<p>This test document is written with the purpose of testing the output QDoc generates when parsing <code>.qdoc</code> files. It is fairly simple and makes use of a limited subset of QDoc's command. Those commands are:</p> +<p>This test document is written with the purpose of testing the output QDoc generates when parsing <code translate="no">.qdoc</code> files. It is fairly simple and makes use of a limited subset of QDoc's command. Those commands are:</p> <ul> -<li><code>\page</code></li> -<li><code>\title</code></li> -<li><code>\brief</code></li> -<li><code>\e</code> (for emphasizing "QDoc comments")</li> -<li><code>\c</code> (for multiple monospace-formatted entries)</li> -<li><code>\section1</code></li> -<li><code>\list</code></li> -<li><code>\li</code></li> -<li><code>\endlist</code></li> +<li><code translate="no">\page</code></li> +<li><code translate="no">\title</code></li> +<li><code translate="no">\brief</code></li> +<li><code translate="no">\e</code> (for emphasizing "QDoc comments")</li> +<li><code translate="no">\c</code> (for multiple monospace-formatted entries)</li> +<li><code translate="no">\section1</code></li> +<li><code translate="no">\list</code></li> +<li><code translate="no">\li</code></li> +<li><code translate="no">\endlist</code></li> </ul> <a name="linking"></a> <h2 id="linking">Linking</h2> <p>There are multiple ways to create hyperlinks to other topics:</p> <ul> -<li><a href="qdoctests-qdocfileoutput-linking.html">Linking to a page title</a></li> -<li><a href="qdoctests-qdocfileoutput-linking.html#link-targets">Linking to a section title</a></li> -<li><a href="qdoctests-qdocfileoutput-linking.html#link-test-target">Linking using a \target string</a></li> -<li><a href="qdoctests-qdocfileoutput-linking.html">Linking using a \keyword string</a></li> +<li><a href="qdoctests-qdocfileoutput-linking.html" translate="no">Linking to a page title</a></li> +<li><a href="qdoctests-qdocfileoutput-linking.html#link-targets" translate="no">Linking to a section title</a></li> +<li><a href="qdoctests-qdocfileoutput-linking.html#link-test-target" translate="no">Linking using a \target string</a></li> +<li><a href="qdoctests-qdocfileoutput-linking.html" translate="no">Linking using a \keyword string</a></li> </ul> </div> <!-- @@@qdoctests-qdocfileoutput.html --> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-int.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-int.html index 16603af4b..511d42df6 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qml-int.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-int.html @@ -15,12 +15,12 @@ </ul> </div> <div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">int QML Basic Type</h1> -<span class="subtitle"></span> +<h1 class="title" translate="no">int QML Basic Type</h1> +<span class="subtitle" translate="no"></span> <a name="methods"></a> <h2 id="methods">Methods</h2> <ul> -<li class="fn">int <b><b><a href="qml-int.html#abs-method">abs</a></b></b>()</li> +<li class="fn" translate="no">int <b><b><a href="qml-int.html#abs-method" translate="no">abs</a></b></b>()</li> </ul> <!-- $$$int-description --> <div class="descr"> <a name="details"></a> @@ -28,11 +28,11 @@ <!-- @@@int --> <h2>Method Documentation</h2> <!-- $$$abs[overload1]$$$abs --> -<div class="qmlitem"><div class="qmlproto"> +<div class="qmlitem"><div class="qmlproto" translate="no"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="abs-method"> <td class="tblQmlFuncNode"><p> -<a name="abs-method"></a><span class="type"><a href="qml-int.html">int</a></span> <span class="name">abs</span>()</p></td></tr> +<a name="abs-method"></a><span class="type"><a href="qml-int.html" translate="no">int</a></span> <span class="name">abs</span>()</p></td></tr> </table></div></div> <div class="qmldoc"><p>Returns the absolute value of this integer.</p> </div></div><!-- @@@abs --> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-abstractparent.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-abstractparent.html index 96d573abc..4c2d93386 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-abstractparent.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-abstractparent.html @@ -16,25 +16,25 @@ </ul> </div> <div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">AbstractParent QML Type</h1> -<span class="subtitle"></span> +<h1 class="title" translate="no">AbstractParent QML Type</h1> +<span class="subtitle" translate="no"></span> <!-- $$$AbstractParent-brief --> <p>Abstract base QML type. <a href="#details">More...</a></p> <!-- @@@AbstractParent --> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft rightAlign topAlign"> Import Statement:</td><td class="memItemRight bottomAlign"> import QDoc.Test 1.1</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Inherited By:</td><td class="memItemRight bottomAlign"> <p><a href="qml-qdoc-test-child.html">Child</a></p> +<div class="table"><table class="alignedsummary" translate="no"> +<tr><td class="memItemLeft rightAlign topAlign"> Import Statement:</td><td class="memItemRight bottomAlign"> import QDoc.Test 1.1</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Inherited By:</td><td class="memItemRight bottomAlign"> <p><a href="qml-qdoc-test-child.html" translate="no">Child</a></p> </td></tr></table></div><ul> <li><a href="qml-qdoc-test-abstractparent-members.html">List of all members, including inherited members</a></li> </ul> <a name="properties"></a> <h2 id="properties">Properties</h2> <ul> -<li class="fn"><b><b><a href="qml-qdoc-test-abstractparent.html#children-prop">children</a></b></b> : list<Child></li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-abstractparent.html#children-prop" translate="no">children</a></b></b> : list<Child></li> </ul> <a name="methods"></a> <h2 id="methods">Methods</h2> <ul> -<li class="fn">void <b><b><a href="qml-qdoc-test-abstractparent.html#rear-method">rear</a></b></b>(Child <i>child</i>, var <i>method</i>)</li> +<li class="fn" translate="no">void <b><b><a href="qml-qdoc-test-abstractparent.html#rear-method" translate="no">rear</a></b></b>(Child <i>child</i>, var <i>method</i>)</li> </ul> <!-- $$$AbstractParent-description --> <a name="details"></a> @@ -42,24 +42,24 @@ <!-- @@@AbstractParent --> <h2>Property Documentation</h2> <!-- $$$children --> -<div class="qmlitem"><div class="qmlproto"> +<div class="qmlitem"><div class="qmlproto" translate="no"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="children-prop"> <td class="tblQmlPropNode"><p> -<a name="children-prop"></a><span class="qmldefault">[default] </span><span class="name">children</span> : <span class="type">list</span><<span class="type"><a href="qml-qdoc-test-child.html">Child</a></span>></p></td></tr> +<a name="children-prop"></a><span class="qmldefault">[default] </span><span class="name">children</span> : <span class="type">list</span><<span class="type"><a href="qml-qdoc-test-child.html" translate="no">Child</a></span>></p></td></tr> </table></div></div> <div class="qmldoc"><p>Children of the type.</p> </div></div><!-- @@@children --> <br/> <h2>Method Documentation</h2> <!-- $$$rear[overload1]$$$rearChildvar --> -<div class="qmlitem"><div class="qmlproto"> +<div class="qmlitem"><div class="qmlproto" translate="no"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="rear-method"> <td class="tblQmlFuncNode"><p> -<a name="rear-method"></a><span class="type">void</span> <span class="name">rear</span>(<span class="type"><a href="qml-qdoc-test-child.html">Child</a></span> <i>child</i>, <span class="type">var</span> <i>method</i> = Strict)</p></td></tr> +<a name="rear-method"></a><span class="type">void</span> <span class="name">rear</span>(<span class="type"><a href="qml-qdoc-test-child.html" translate="no">Child</a></span> <i>child</i>, <span class="type">var</span> <i>method</i> = Strict)</p></td></tr> </table></div></div> -<div class="qmldoc"><p>Do some abstract parenting on <i>child</i> using a specific <i>method</i>.</p> +<div class="qmldoc"><p>Do some abstract parenting on <i translate="no">child</i> using a specific <i translate="no">method</i>.</p> </div></div><!-- @@@rear --> <br/> </body> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-child.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-child.html index f5ba33fd1..039c541bc 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-child.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-child.html @@ -16,25 +16,25 @@ </ul> </div> <div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">Child QML Type</h1> -<span class="subtitle"></span> +<h1 class="title" translate="no">Child QML Type</h1> +<span class="subtitle" translate="no"></span> <!-- $$$Child-brief --> <p>A Child inheriting its parent. <a href="#details">More...</a></p> <!-- @@@Child --> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft rightAlign topAlign"> Import Statement:</td><td class="memItemRight bottomAlign"> import QDoc.Test 1.1</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Inherits:</td><td class="memItemRight bottomAlign"> <p><a href="qml-qdoc-test-abstractparent.html">AbstractParent</a></p> +<div class="table"><table class="alignedsummary" translate="no"> +<tr><td class="memItemLeft rightAlign topAlign"> Import Statement:</td><td class="memItemRight bottomAlign"> import QDoc.Test 1.1</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Inherits:</td><td class="memItemRight bottomAlign"> <p><a href="qml-qdoc-test-abstractparent.html" translate="no">AbstractParent</a></p> </td></tr></table></div><ul> <li><a href="qml-qdoc-test-child-members.html">List of all members, including inherited members</a></li> </ul> <a name="properties"></a> <h2 id="properties">Properties</h2> <ul> -<li class="fn"><b><b><a href="qml-qdoc-test-child.html#children-prop">children</a></b></b> : list<Child></li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-child.html#children-prop" translate="no">children</a></b></b> : list<Child></li> </ul> <a name="methods"></a> <h2 id="methods">Methods</h2> <ul> -<li class="fn">void <b><b><a href="qml-qdoc-test-child.html#rear-method">rear</a></b></b>(Child <i>child</i>, var <i>method</i>)</li> +<li class="fn" translate="no">void <b><b><a href="qml-qdoc-test-child.html#rear-method" translate="no">rear</a></b></b>(Child <i>child</i>, var <i>method</i>)</li> </ul> <!-- $$$Child-description --> <a name="details"></a> @@ -42,24 +42,24 @@ <!-- @@@Child --> <h2>Property Documentation</h2> <!-- $$$children --> -<div class="qmlitem"><div class="qmlproto"> +<div class="qmlitem"><div class="qmlproto" translate="no"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="children-prop"> <td class="tblQmlPropNode"><p> -<a name="children-prop"></a><span class="qmldefault">[default] </span><span class="name">children</span> : <span class="type">list</span><<span class="type"><a href="qml-qdoc-test-child.html">Child</a></span>></p></td></tr> +<a name="children-prop"></a><span class="qmldefault">[default] </span><span class="name">children</span> : <span class="type">list</span><<span class="type"><a href="qml-qdoc-test-child.html" translate="no">Child</a></span>></p></td></tr> </table></div></div> <div class="qmldoc"><p>Children of the type.</p> </div></div><!-- @@@children --> <br/> <h2>Method Documentation</h2> <!-- $$$rear[overload1]$$$rearChildvar --> -<div class="qmlitem"><div class="qmlproto"> +<div class="qmlitem"><div class="qmlproto" translate="no"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="rear-method"> <td class="tblQmlFuncNode"><p> -<a name="rear-method"></a><span class="type">void</span> <span class="name">rear</span>(<span class="type"><a href="qml-qdoc-test-child.html">Child</a></span> <i>child</i>, <span class="type">var</span> <i>method</i> = Strict)</p></td></tr> +<a name="rear-method"></a><span class="type">void</span> <span class="name">rear</span>(<span class="type"><a href="qml-qdoc-test-child.html" translate="no">Child</a></span> <i>child</i>, <span class="type">var</span> <i>method</i> = Strict)</p></td></tr> </table></div></div> -<div class="qmldoc"><p>Do some abstract parenting on <i>child</i> using a specific <i>method</i>.</p> +<div class="qmldoc"><p>Do some abstract parenting on <i translate="no">child</i> using a specific <i translate="no">method</i>.</p> </div></div><!-- @@@rear --> <br/> </body> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-doctest.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-doctest.html index bdee999d1..168ed5b6c 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-doctest.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-doctest.html @@ -18,32 +18,32 @@ </ul> </div> <div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">DocTest QML Type</h1> -<span class="subtitle"></span> +<h1 class="title" translate="no">DocTest QML Type</h1> +<span class="subtitle" translate="no"></span> <!-- $$$DocTest-brief --> <p>Represents a doc test case. <a href="#details">More...</a></p> <!-- @@@DocTest --> -<div class="table"><table class="alignedsummary"> +<div class="table"><table class="alignedsummary" translate="no"> <tr><td class="memItemLeft rightAlign topAlign"> Import Statement:</td><td class="memItemRight bottomAlign"> import QDoc.Test 1.1</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Since:</td><td class="memItemRight bottomAlign"> QDoc.Test 0.9</td></tr></table></div><ul> <li><a href="qml-qdoc-test-doctest-members.html">List of all members, including inherited members</a></li> </ul> <a name="properties"></a> <h2 id="properties">Properties</h2> <ul> -<li class="fn"><b><b><a href="qml-qdoc-test-doctest.html#active-prop">active</a></b></b> : bool</li> -<li class="fn"><b><b><a href="qml-qdoc-test-doctest.html#name-prop">name</a></b></b> : string</li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-doctest.html#active-prop" translate="no">active</a></b></b> : bool</li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-doctest.html#name-prop" translate="no">name</a></b></b> : string</li> </ul> <a name="signals"></a> <h2 id="signals">Signals</h2> <ul> -<li class="fn"><b><b><a href="qml-qdoc-test-doctest.html#completed-signal">completed</a></b></b>()</li> -<li class="fn"><b><b><a href="qml-qdoc-test-doctest.html#foo-signal">foo</a></b></b>(var <i>bar</i>)</li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-doctest.html#completed-signal" translate="no">completed</a></b></b>()</li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-doctest.html#foo-signal" translate="no">foo</a></b></b>(var <i>bar</i>)</li> </ul> <a name="methods"></a> <h2 id="methods">Methods</h2> <ul> -<li class="fn"><b><b><a href="qml-qdoc-test-doctest.html#fail-method">fail</a></b></b>(<i>message</i>)</li> -<li class="fn"><b><b><a href="qml-qdoc-test-doctest.html#fail_hard-method">fail_hard</a></b></b>(<i>msg</i>, <i>option</i>)</li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-doctest.html#fail-method" translate="no">fail</a></b></b>(<i>message</i>)</li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-doctest.html#fail_hard-method" translate="no">fail_hard</a></b></b>(<i>msg</i>, <i>option</i>)</li> </ul> <!-- $$$DocTest-description --> <a name="details"></a> @@ -54,25 +54,25 @@ <!-- @@@DocTest --> <h2>Property Documentation</h2> <!-- $$$active --> -<div class="qmlitem"><div class="qmlproto"> +<div class="qmlitem"><div class="qmlproto" translate="no"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="active-prop"> <td class="tblQmlPropNode"><p> <a name="active-prop"></a><span class="name">active</span> : <span class="type">bool</span></p></td></tr> </table></div></div> <div class="qmldoc"><p>Whether the test is active.</p> -<p><b>See also </b><a href="qml-qdoc-test-doctest.html#name-prop">name</a>.</p> +<p><b>See also </b><a href="qml-qdoc-test-doctest.html#name-prop" translate="no">name</a>.</p> </div></div><!-- @@@active --> <br/> <!-- $$$name --> -<div class="qmlitem"><div class="qmlproto"> +<div class="qmlitem"><div class="qmlproto" translate="no"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="name-prop"> <td class="tblQmlPropNode"><p> <a name="name-prop"></a><span class="name">name</span> : <span class="type">string</span></p></td></tr> </table></div></div> <div class="qmldoc"><p>Name of the test.</p> -<pre class="qml"><span class="type"><a href="qml-qdoc-test-doctest.html">DocTest</a></span> { +<pre class="qml" translate="no"><span class="type"><a href="qml-qdoc-test-doctest.html" translate="no">DocTest</a></span> { <span class="name">name</span>: <span class="string">"test"</span> <span class="comment">// ...</span> }</pre> @@ -80,40 +80,40 @@ <br/> <h2>Signal Documentation</h2> <!-- $$$completed[overload1]$$$completed --> -<div class="qmlitem"><div class="qmlproto"> +<div class="qmlitem"><div class="qmlproto" translate="no"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="completed-signal"> <td class="tblQmlFuncNode"><p> <a name="completed-signal"></a><span class="name">completed</span>()</p></td></tr> </table></div></div> -<div class="qmldoc"><p><b>Note: </b>The corresponding handler is <code>onCompleted</code>.</p> +<div class="qmldoc"><p><b>Note: </b>The corresponding handler is <code translate="no">onCompleted</code>.</p> </div></div><!-- @@@completed --> <br/> <!-- $$$foo[overload1]$$$foovar --> -<div class="qmlitem"><div class="qmlproto"> +<div class="qmlitem"><div class="qmlproto" translate="no"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="foo-signal"> <td class="tblQmlFuncNode"><p> <a name="foo-signal"></a><span class="name">foo</span>(<span class="type">var</span> <i>bar</i>)</p></td></tr> </table></div></div> -<div class="qmldoc"><p>Signal with parameter <i>bar</i>.</p> -<p><b>Note: </b>The corresponding handler is <code>onFoo</code>.</p> +<div class="qmldoc"><p>Signal with parameter <i translate="no">bar</i>.</p> +<p><b>Note: </b>The corresponding handler is <code translate="no">onFoo</code>.</p> </div></div><!-- @@@foo --> <br/> <h2>Method Documentation</h2> <!-- $$$fail[overload1]$$$fail --> -<div class="qmlitem"><div class="qmlproto"> +<div class="qmlitem"><div class="qmlproto" translate="no"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="fail-method"> <td class="tblQmlFuncNode"><p> <a name="fail-method"></a><span class="name">fail</span>(<i>message</i> = "oops")</p></td></tr> </table></div></div> -<div class="qmldoc"><p>Fails the current test case, with the optional <i>message</i>.</p> +<div class="qmldoc"><p>Fails the current test case, with the optional <i translate="no">message</i>.</p> <p>This method was introduced in QDoc.Test 1.0.</p> </div></div><!-- @@@fail --> <br/> <!-- $$$fail_hard[overload1]$$$fail_hard --> -<div class="qmlitem"><div class="qmlproto"> +<div class="qmlitem"><div class="qmlproto" translate="no"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="fail_hard-method"> <td class="tblQmlFuncNode"><p> @@ -121,8 +121,8 @@ </table></div></div> <div class="qmldoc"><p>Fails the current test case, hard.</p> <ul> -<li>Prints out <i>msg</i>.</li> -<li>Accepts a random <i>option</i>.</li> +<li>Prints out <i translate="no">msg</i>.</li> +<li>Accepts a random <i translate="no">option</i>.</li> </ul> </div></div><!-- @@@fail_hard --> <br/> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type-members.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type-members.html index c3866cc66..fb955c684 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type-members.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type-members.html @@ -7,25 +7,25 @@ </head> <body> <div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">List of All Members for Type</h1> +<h1 class="title" translate="no">List of All Members for Type</h1> <p>This is the complete list of members for <a href="qml-qdoc-test-type.html">Type</a>, including inherited members.</p> <ul> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#fifth-prop">fifth</a></b></b> : int</li> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#fourth-prop">fourth</a></b></b> : int</li> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#group-prop">group</a></b></b><ul> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#group.first-prop">group.first</a></b></b> : int</li> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#group.second-prop">group.second</a></b></b> : int</li> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#group.third-prop">group.third</a></b></b> : int</li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#fifth-prop" translate="no">fifth</a></b></b> : int</li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#fourth-prop" translate="no">fourth</a></b></b> : int</li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#group-prop" translate="no">group</a></b></b><ul> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#group.first-prop" translate="no">group.first</a></b></b> : int</li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#group.second-prop" translate="no">group.second</a></b></b> : int</li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#group.third-prop" translate="no">group.third</a></b></b> : int</li> </ul> </li> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#id-prop">id</a></b></b> : int</li> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#name-prop">name</a></b></b> : string</li> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#type-attached-prop">type</a></b></b> : enumeration [attached]</li> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#completed-signal">completed</a></b></b>(int <i>status</i>)</li> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#configured-signal">configured</a></b></b>() [attached]</li> -<li class="fn">Type <b><b><a href="qml-qdoc-test-type.html#copy-method">copy</a></b></b>(<i>a</i>)</li> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#disable-method">disable</a></b></b>()</li> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#enable-method">enable</a></b></b>()</li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#id-prop" translate="no">id</a></b></b> : int</li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#name-prop" translate="no">name</a></b></b> : string</li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#type-attached-prop" translate="no">type</a></b></b> : enumeration [attached]</li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#completed-signal" translate="no">completed</a></b></b>(int <i>status</i>)</li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#configured-signal" translate="no">configured</a></b></b>() [attached]</li> +<li class="fn" translate="no">Type <b><b><a href="qml-qdoc-test-type.html#copy-method" translate="no">copy</a></b></b>(<i>a</i>)</li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#disable-method" translate="no">disable</a></b></b>()</li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#enable-method" translate="no">enable</a></b></b>()</li> </ul> </body> </html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type.html index 21d07d25f..ed9c9a9d4 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-qdoc-test-type.html @@ -19,50 +19,50 @@ </ul> </div> <div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">Type QML Type</h1> -<span class="subtitle"></span> +<h1 class="title" translate="no">Type QML Type</h1> +<span class="subtitle" translate="no"></span> <!-- $$$Type-brief --> <p>A QML type documented in a .cpp file. <a href="#details">More...</a></p> <!-- @@@Type --> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft rightAlign topAlign"> Import Statement:</td><td class="memItemRight bottomAlign"> import QDoc.Test 1.1</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Instantiates:</td><td class="memItemRight bottomAlign"> <a href="qml-qdoc-test-type.html"><a href="testqdoc-test.html">Test</a></td></tr></table></div><ul> +<div class="table"><table class="alignedsummary" translate="no"> +<tr><td class="memItemLeft rightAlign topAlign"> Import Statement:</td><td class="memItemRight bottomAlign"> import QDoc.Test 1.1</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Instantiates:</td><td class="memItemRight bottomAlign"> <a href="qml-qdoc-test-type.html" translate="no"><a href="testqdoc-test.html" translate="no">Test</a></td></tr></table></div><ul> <li><a href="qml-qdoc-test-type-members.html">List of all members, including inherited members</a></li> </ul> <a name="properties"></a> <h2 id="properties">Properties</h2> <ul> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#fifth-prop">fifth</a></b></b> : int</li> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#fourth-prop">fourth</a></b></b> : int</li> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#group-prop">group</a></b></b><ul> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#group.first-prop">group.first</a></b></b> : int</li> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#group.second-prop">group.second</a></b></b> : int</li> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#group.third-prop">group.third</a></b></b> : int</li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#fifth-prop" translate="no">fifth</a></b></b> : int</li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#fourth-prop" translate="no">fourth</a></b></b> : int</li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#group-prop" translate="no">group</a></b></b><ul> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#group.first-prop" translate="no">group.first</a></b></b> : int</li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#group.second-prop" translate="no">group.second</a></b></b> : int</li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#group.third-prop" translate="no">group.third</a></b></b> : int</li> </ul> </li> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#id-prop">id</a></b></b> : int</li> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#name-prop">name</a></b></b> : string</li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#id-prop" translate="no">id</a></b></b> : int</li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#name-prop" translate="no">name</a></b></b> : string</li> </ul> <a name="attached-properties"></a> <h2 id="attached-properties">Attached Properties</h2> <ul> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#type-attached-prop">type</a></b></b> : enumeration</li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#type-attached-prop" translate="no">type</a></b></b> : enumeration</li> </ul> <a name="signals"></a> <h2 id="signals">Signals</h2> <ul> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#completed-signal">completed</a></b></b>(int <i>status</i>)</li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#completed-signal" translate="no">completed</a></b></b>(int <i>status</i>)</li> </ul> <a name="attached-signals"></a> <h2 id="attached-signals">Attached Signals</h2> <ul> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#configured-signal">configured</a></b></b>()</li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#configured-signal" translate="no">configured</a></b></b>()</li> </ul> <a name="methods"></a> <h2 id="methods">Methods</h2> <ul> -<li class="fn">Type <b><b><a href="qml-qdoc-test-type.html#copy-method">copy</a></b></b>(<i>a</i>)</li> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#disable-method">disable</a></b></b>()</li> -<li class="fn"><b><b><a href="qml-qdoc-test-type.html#enable-method">enable</a></b></b>()</li> +<li class="fn" translate="no">Type <b><b><a href="qml-qdoc-test-type.html#copy-method" translate="no">copy</a></b></b>(<i>a</i>)</li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#disable-method" translate="no">disable</a></b></b>()</li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-type.html#enable-method" translate="no">enable</a></b></b>()</li> </ul> <!-- $$$Type-description --> <a name="details"></a> @@ -71,47 +71,47 @@ <h2>Property Documentation</h2> <!-- $$$ --> <div class="qmlitem"><div class="fngroup"> -<div class="qmlproto"> +<div class="qmlproto" translate="no"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="fifth-prop"> <td class="tblQmlPropNode"><p> -<a name="fifth-prop"></a><span class="name">fifth</span> : <span class="type"><a href="qml-int.html">int</a></span></p></td></tr> +<a name="fifth-prop"></a><span class="name">fifth</span> : <span class="type"><a href="qml-int.html" translate="no">int</a></span></p></td></tr> <tr valign="top" class="odd" id="fourth-prop"> <td class="tblQmlPropNode"><p> -<a name="fourth-prop"></a><span class="name">fourth</span> : <span class="type"><a href="qml-int.html">int</a></span></p></td></tr> +<a name="fourth-prop"></a><span class="name">fourth</span> : <span class="type"><a href="qml-int.html" translate="no">int</a></span></p></td></tr> </table></div></div> </div><div class="qmldoc"><p>A group of properties sharing a documentation comment.</p> </div></div><!-- @@@ --> <br/> <!-- $$$group --> -<div class="qmlitem"><div class="qmlproto"> +<div class="qmlitem"><div class="qmlproto" translate="no"> <div class="table"><table class="qmlname"> <tr valign="top" class="even" id="group-prop"><th class="centerAlign"><p><a name="group-prop"></a><b>group group</b></p></th></tr> <tr valign="top" class="odd" id="group.first-prop"> <td class="tblQmlPropNode"><p> -<a name="group.first-prop"></a><span class="name">group.first</span> : <span class="type"><a href="qml-int.html">int</a></span></p></td></tr> +<a name="group.first-prop"></a><span class="name">group.first</span> : <span class="type"><a href="qml-int.html" translate="no">int</a></span></p></td></tr> <tr valign="top" class="odd" id="group.second-prop"> <td class="tblQmlPropNode"><p> -<a name="group.second-prop"></a><span class="name">group.second</span> : <span class="type"><a href="qml-int.html">int</a></span></p></td></tr> +<a name="group.second-prop"></a><span class="name">group.second</span> : <span class="type"><a href="qml-int.html" translate="no">int</a></span></p></td></tr> <tr valign="top" class="odd" id="group.third-prop"> <td class="tblQmlPropNode"><p> -<a name="group.third-prop"></a><span class="name">group.third</span> : <span class="type"><a href="qml-int.html">int</a></span></p></td></tr> +<a name="group.third-prop"></a><span class="name">group.third</span> : <span class="type"><a href="qml-int.html" translate="no">int</a></span></p></td></tr> </table></div></div> <div class="qmldoc"><p>A property group.</p> </div></div><!-- @@@group --> <br/> <!-- $$$id --> -<div class="qmlitem"><div class="qmlproto"> +<div class="qmlitem"><div class="qmlproto" translate="no"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="id-prop"> <td class="tblQmlPropNode"><p> -<a name="id-prop"></a><span class="qmlreadonly">[read-only] </span><span class="name">id</span> : <span class="type"><a href="qml-int.html">int</a></span></p></td></tr> +<a name="id-prop"></a><span class="qmlreadonly">[read-only] </span><span class="name">id</span> : <span class="type"><a href="qml-int.html" translate="no">int</a></span></p></td></tr> </table></div></div> <div class="qmldoc"><p>A read-only property.</p> </div></div><!-- @@@id --> <br/> <!-- $$$name --> -<div class="qmlitem"><div class="qmlproto"> +<div class="qmlitem"><div class="qmlproto" translate="no"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="name-prop"> <td class="tblQmlPropNode"><p> @@ -122,46 +122,46 @@ <br/> <h2>Attached Property Documentation</h2> <!-- $$$type --> -<div class="qmlitem"><div class="qmlproto"> +<div class="qmlitem"><div class="qmlproto" translate="no"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="type-attached-prop"> <td class="tblQmlPropNode"><p> <a name="type-attached-prop"></a><span class="name">Type.type</span> : <span class="type">enumeration</span></p></td></tr> </table></div></div> <div class="qmldoc"><div class="table"><table class="valuelist"><tr valign="top" class="odd"><th class="tblConst">Constant</th><th class="tbldscr">Description</th></tr> -<tr><td class="topAlign"><code>Type.NoType</code></td><td class="topAlign">Nothing</td></tr> -<tr><td class="topAlign"><code>Type.SomeType</code></td><td class="topAlign">Something</td></tr> +<tr><td class="topAlign"><code translate="no">Type.NoType</code></td><td class="topAlign">Nothing</td></tr> +<tr><td class="topAlign"><code translate="no">Type.SomeType</code></td><td class="topAlign">Something</td></tr> </table></div> </div></div><!-- @@@type --> <br/> <h2>Signal Documentation</h2> <!-- $$$completed[overload1]$$$completedint --> -<div class="qmlitem"><div class="qmlproto"> +<div class="qmlitem"><div class="qmlproto" translate="no"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="completed-signal"> <td class="tblQmlFuncNode"><p> -<a name="completed-signal"></a><span class="name">completed</span>(<span class="type"><a href="qml-int.html">int</a></span> <i>status</i>)</p></td></tr> +<a name="completed-signal"></a><span class="name">completed</span>(<span class="type"><a href="qml-int.html" translate="no">int</a></span> <i>status</i>)</p></td></tr> </table></div></div> -<div class="qmldoc"><p>This signal is emitted when the operation completed with <i>status</i>.</p> -<p><b>Note: </b>The corresponding handler is <code>onCompleted</code>.</p> +<div class="qmldoc"><p>This signal is emitted when the operation completed with <i translate="no">status</i>.</p> +<p><b>Note: </b>The corresponding handler is <code translate="no">onCompleted</code>.</p> </div></div><!-- @@@completed --> <br/> <h2>Attached Signal Documentation</h2> <!-- $$$configured[overload1]$$$configured --> -<div class="qmlitem"><div class="qmlproto"> +<div class="qmlitem"><div class="qmlproto" translate="no"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="configured-signal"> <td class="tblQmlFuncNode"><p> <a name="configured-signal"></a><span class="name">configured</span>()</p></td></tr> </table></div></div> <div class="qmldoc"><p>This attached signal is emitted when the type was configured.</p> -<p><b>Note: </b>The corresponding handler is <code>onConfigured</code>.</p> +<p><b>Note: </b>The corresponding handler is <code translate="no">onConfigured</code>.</p> </div></div><!-- @@@configured --> <br/> <h2>Method Documentation</h2> <!-- $$$ --> <div class="qmlitem"><div class="fngroup"> -<div class="qmlproto"> +<div class="qmlproto" translate="no"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="disable-method"> <td class="tblQmlFuncNode"><p> @@ -174,13 +174,13 @@ </div></div><!-- @@@ --> <br/> <!-- $$$copy[overload1]$$$copy --> -<div class="qmlitem"><div class="qmlproto"> +<div class="qmlitem"><div class="qmlproto" translate="no"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="copy-method"> <td class="tblQmlFuncNode"><p> -<a name="copy-method"></a><span class="type"><a href="qml-qdoc-test-type.html">Type</a></span> <span class="name">copy</span>(<i>a</i>)</p></td></tr> +<a name="copy-method"></a><span class="type"><a href="qml-qdoc-test-type.html" translate="no">Type</a></span> <span class="name">copy</span>(<i>a</i>)</p></td></tr> </table></div></div> -<div class="qmldoc"><p>Returns another Type based on <i>a</i>.</p> +<div class="qmldoc"><p>Returns another Type based on <i translate="no">a</i>.</p> </div></div><!-- @@@copy --> <br/> </body> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-progressbar.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-progressbar.html index a1b43ea9d..f54873ac7 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-progressbar.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-progressbar.html @@ -15,80 +15,80 @@ </ul> </div> <div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">ProgressBar QML Type</h1> -<span class="subtitle"></span> +<h1 class="title" translate="no">ProgressBar QML Type</h1> +<span class="subtitle" translate="no"></span> <!-- $$$ProgressBar-brief --> <p>A component that shows the progress of an event. <a href="#details">More...</a></p> <!-- @@@ProgressBar --> -<div class="table"><table class="alignedsummary"> +<div class="table"><table class="alignedsummary" translate="no"> <tr><td class="memItemLeft rightAlign topAlign"> Import Statement:</td><td class="memItemRight bottomAlign"> import UIComponents 1.0</td></tr></table></div><ul> <li><a href="qml-uicomponents-progressbar-members.html">List of all members, including inherited members</a></li> </ul> <a name="properties"></a> <h2 id="properties">Properties</h2> <ul> -<li class="fn"><b><b><a href="qml-uicomponents-progressbar.html#color-prop">color</a></b></b> : color</li> -<li class="fn"><b><b><a href="qml-uicomponents-progressbar.html#maximum-prop">maximum</a></b></b> : int</li> -<li class="fn"><b><b><a href="qml-uicomponents-progressbar.html#minimum-prop">minimum</a></b></b> : int</li> -<li class="fn"><b><b><a href="qml-uicomponents-progressbar.html#secondColor-prop">secondColor</a></b></b> : color</li> -<li class="fn"><b><b><a href="qml-uicomponents-progressbar.html#value-prop">value</a></b></b> : int</li> +<li class="fn" translate="no"><b><b><a href="qml-uicomponents-progressbar.html#color-prop" translate="no">color</a></b></b> : color</li> +<li class="fn" translate="no"><b><b><a href="qml-uicomponents-progressbar.html#maximum-prop" translate="no">maximum</a></b></b> : int</li> +<li class="fn" translate="no"><b><b><a href="qml-uicomponents-progressbar.html#minimum-prop" translate="no">minimum</a></b></b> : int</li> +<li class="fn" translate="no"><b><b><a href="qml-uicomponents-progressbar.html#secondColor-prop" translate="no">secondColor</a></b></b> : color</li> +<li class="fn" translate="no"><b><b><a href="qml-uicomponents-progressbar.html#value-prop" translate="no">value</a></b></b> : int</li> </ul> <!-- $$$ProgressBar-description --> <a name="details"></a> <h2 id="details">Detailed Description</h2> -<p>A ProgressBar shows the linear progress of an event as its <a href="qml-uicomponents-progressbar.html#value-prop">value</a>. The range is specified using the <a href="qml-uicomponents-progressbar.html#minimum-prop">minimum</a> and the <a href="qml-uicomponents-progressbar.html#maximum-prop">maximum</a> values.</p> -<p>The ProgressBar component is part of the <a href="uicomponents-qmlmodule.html">UI Components</a> module.</p> -<p>This documentation is part of the <a href="test-componentset-example.html">UIComponents</a> example.</p> +<p>A ProgressBar shows the linear progress of an event as its <a href="qml-uicomponents-progressbar.html#value-prop" translate="no">value</a>. The range is specified using the <a href="qml-uicomponents-progressbar.html#minimum-prop" translate="no">minimum</a> and the <a href="qml-uicomponents-progressbar.html#maximum-prop" translate="no">maximum</a> values.</p> +<p>The ProgressBar component is part of the <a href="uicomponents-qmlmodule.html" translate="no">UI Components</a> module.</p> +<p>This documentation is part of the <a href="test-componentset-example.html" translate="no">UIComponents</a> example.</p> <!-- @@@ProgressBar --> <h2>Property Documentation</h2> <!-- $$$color --> -<div class="qmlitem"><div class="qmlproto"> +<div class="qmlitem"><div class="qmlproto" translate="no"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="color-prop"> <td class="tblQmlPropNode"><p> <a name="color-prop"></a><span class="name">color</span> : <span class="type">color</span></p></td></tr> </table></div></div> -<div class="qmldoc"><p>The color of the <a href="qml-uicomponents-progressbar.html">ProgressBar</a>'s gradient. Must bind to a color type.</p> -<p><b>See also </b><a href="qml-uicomponents-progressbar.html#secondColor-prop">secondColor</a>.</p> +<div class="qmldoc"><p>The color of the <a href="qml-uicomponents-progressbar.html" translate="no">ProgressBar</a>'s gradient. Must bind to a color type.</p> +<p><b>See also </b><a href="qml-uicomponents-progressbar.html#secondColor-prop" translate="no">secondColor</a>.</p> </div></div><!-- @@@color --> <br/> <!-- $$$maximum --> -<div class="qmlitem"><div class="qmlproto"> +<div class="qmlitem"><div class="qmlproto" translate="no"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="maximum-prop"> <td class="tblQmlPropNode"><p> -<a name="maximum-prop"></a><span class="name">maximum</span> : <span class="type"><a href="qml-int.html">int</a></span></p></td></tr> +<a name="maximum-prop"></a><span class="name">maximum</span> : <span class="type"><a href="qml-int.html" translate="no">int</a></span></p></td></tr> </table></div></div> -<div class="qmldoc"><p>The maximum value of the <a href="qml-uicomponents-progressbar.html">ProgressBar</a> range. The <a href="qml-uicomponents-progressbar.html#value-prop">value</a> must not be more than this value.</p> +<div class="qmldoc"><p>The maximum value of the <a href="qml-uicomponents-progressbar.html" translate="no">ProgressBar</a> range. The <a href="qml-uicomponents-progressbar.html#value-prop" translate="no">value</a> must not be more than this value.</p> </div></div><!-- @@@maximum --> <br/> <!-- $$$minimum --> -<div class="qmlitem"><div class="qmlproto"> +<div class="qmlitem"><div class="qmlproto" translate="no"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="minimum-prop"> <td class="tblQmlPropNode"><p> -<a name="minimum-prop"></a><span class="name">minimum</span> : <span class="type"><a href="qml-int.html">int</a></span></p></td></tr> +<a name="minimum-prop"></a><span class="name">minimum</span> : <span class="type"><a href="qml-int.html" translate="no">int</a></span></p></td></tr> </table></div></div> -<div class="qmldoc"><p>The minimum value of the <a href="qml-uicomponents-progressbar.html">ProgressBar</a> range. The <a href="qml-uicomponents-progressbar.html#value-prop">value</a> must not be less than this value.</p> +<div class="qmldoc"><p>The minimum value of the <a href="qml-uicomponents-progressbar.html" translate="no">ProgressBar</a> range. The <a href="qml-uicomponents-progressbar.html#value-prop" translate="no">value</a> must not be less than this value.</p> </div></div><!-- @@@minimum --> <br/> <!-- $$$secondColor --> -<div class="qmlitem"><div class="qmlproto"> +<div class="qmlitem"><div class="qmlproto" translate="no"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="secondColor-prop"> <td class="tblQmlPropNode"><p> <a name="secondColor-prop"></a><span class="name">secondColor</span> : <span class="type">color</span></p></td></tr> </table></div></div> -<div class="qmldoc"><p>The second color of the <a href="qml-uicomponents-progressbar.html">ProgressBar</a>'s gradient. Must bind to a color type.</p> -<p><b>See also </b><a href="qml-uicomponents-progressbar.html#color-prop">color</a>.</p> +<div class="qmldoc"><p>The second color of the <a href="qml-uicomponents-progressbar.html" translate="no">ProgressBar</a>'s gradient. Must bind to a color type.</p> +<p><b>See also </b><a href="qml-uicomponents-progressbar.html#color-prop" translate="no">color</a>.</p> </div></div><!-- @@@secondColor --> <br/> <!-- $$$value --> -<div class="qmlitem"><div class="qmlproto"> +<div class="qmlitem"><div class="qmlproto" translate="no"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="value-prop"> <td class="tblQmlPropNode"><p> -<a name="value-prop"></a><span class="name">value</span> : <span class="type"><a href="qml-int.html">int</a></span></p></td></tr> +<a name="value-prop"></a><span class="name">value</span> : <span class="type"><a href="qml-int.html" translate="no">int</a></span></p></td></tr> </table></div></div> <div class="qmldoc"><p>The value of the progress.</p> </div></div><!-- @@@value --> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-switch.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-switch.html index fadb1a531..fd6851a7a 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-switch.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-switch.html @@ -16,52 +16,52 @@ </ul> </div> <div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">Switch QML Type</h1> -<span class="subtitle"></span> +<h1 class="title" translate="no">Switch QML Type</h1> +<span class="subtitle" translate="no"></span> <!-- $$$Switch-brief --> <p>A component that can be turned on or off. <a href="#details">More...</a></p> <!-- @@@Switch --> -<div class="table"><table class="alignedsummary"> +<div class="table"><table class="alignedsummary" translate="no"> <tr><td class="memItemLeft rightAlign topAlign"> Import Statement:</td><td class="memItemRight bottomAlign"> import UIComponents 1.0</td></tr></table></div><ul> <li><a href="qml-uicomponents-switch-members.html">List of all members, including inherited members</a></li> </ul> <a name="properties"></a> <h2 id="properties">Properties</h2> <ul> -<li class="fn"><b><b><a href="qml-uicomponents-switch.html#on-prop">on</a></b></b> : bool</li> +<li class="fn" translate="no"><b><b><a href="qml-uicomponents-switch.html#on-prop" translate="no">on</a></b></b> : bool</li> </ul> <a name="methods"></a> <h2 id="methods">Methods</h2> <ul> -<li class="fn"><b><b><a href="qml-uicomponents-switch.html#toggle-method">toggle</a></b></b>()</li> +<li class="fn" translate="no"><b><b><a href="qml-uicomponents-switch.html#toggle-method" translate="no">toggle</a></b></b>()</li> </ul> <!-- $$$Switch-description --> <a name="details"></a> <h2 id="details">Detailed Description</h2> -<p>A toggle switch has two states: an <code>on</code> and an <code>off</code> state. The <code>off</code> state is when the <a href="qml-uicomponents-switch.html#on-prop">on</a> property is set to <code>false</code>.</p> -<p>The ToggleSwitch component is part of the <a href="uicomponents-qmlmodule.html">UI Components</a> module.</p> -<p>This documentation is part of the <a href="test-componentset-example.html">UIComponents</a> example.</p> +<p>A toggle switch has two states: an <code translate="no">on</code> and an <code translate="no">off</code> state. The <code translate="no">off</code> state is when the <a href="qml-uicomponents-switch.html#on-prop" translate="no">on</a> property is set to <code translate="no">false</code>.</p> +<p>The ToggleSwitch component is part of the <a href="uicomponents-qmlmodule.html" translate="no">UI Components</a> module.</p> +<p>This documentation is part of the <a href="test-componentset-example.html" translate="no">UIComponents</a> example.</p> <!-- @@@Switch --> <h2>Property Documentation</h2> <!-- $$$on --> -<div class="qmlitem"><div class="qmlproto"> +<div class="qmlitem"><div class="qmlproto" translate="no"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="on-prop"> <td class="tblQmlPropNode"><p> <a name="on-prop"></a><span class="name">on</span> : <span class="type">bool</span></p></td></tr> </table></div></div> -<div class="qmldoc"><p>Indicates the state of the switch. If <code>false</code>, then the switch is in the <code>off</code> state.</p> +<div class="qmldoc"><p>Indicates the state of the switch. If <code translate="no">false</code>, then the switch is in the <code translate="no">off</code> state.</p> </div></div><!-- @@@on --> <br/> <h2>Method Documentation</h2> <!-- $$$toggle[overload1]$$$toggle --> -<div class="qmlitem"><div class="qmlproto"> +<div class="qmlitem"><div class="qmlproto" translate="no"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="toggle-method"> <td class="tblQmlFuncNode"><p> <a name="toggle-method"></a><span class="name">toggle</span>()</p></td></tr> </table></div></div> -<div class="qmldoc"><p>A method to toggle the switch. If the switch is <code>on</code>, the toggling it will turn it <code>off</code>. Toggling a switch in the <code>off</code> position will turn it <code>on</code>.</p> +<div class="qmldoc"><p>A method to toggle the switch. If the switch is <code translate="no">on</code>, the toggling it will turn it <code translate="no">off</code>. Toggling a switch in the <code translate="no">off</code> position will turn it <code translate="no">on</code>.</p> </div></div><!-- @@@toggle --> <br/> </body> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-tabwidget.html b/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-tabwidget.html index 1b2421722..3b13a4cf3 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-tabwidget.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qml-uicomponents-tabwidget.html @@ -16,31 +16,31 @@ </ul> </div> <div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">TabWidget QML Type</h1> -<span class="subtitle"></span> +<h1 class="title" translate="no">TabWidget QML Type</h1> +<span class="subtitle" translate="no"></span> <!-- $$$TabWidget-brief --> <p>A widget that places its children as tabs. <a href="#details">More...</a></p> <!-- @@@TabWidget --> -<div class="table"><table class="alignedsummary"> +<div class="table"><table class="alignedsummary" translate="no"> <tr><td class="memItemLeft rightAlign topAlign"> Import Statement:</td><td class="memItemRight bottomAlign"> import UIComponents 1.0</td></tr></table></div><ul> <li><a href="qml-uicomponents-tabwidget-members.html">List of all members, including inherited members</a></li> </ul> <a name="properties"></a> <h2 id="properties">Properties</h2> <ul> -<li class="fn"><b><b><a href="qml-uicomponents-tabwidget.html#current-prop">current</a></b></b> : int</li> -<li class="fn"><b><b><a href="qml-uicomponents-tabwidget.html#sampleReadOnlyProperty-prop">sampleReadOnlyProperty</a></b></b> : int</li> +<li class="fn" translate="no"><b><b><a href="qml-uicomponents-tabwidget.html#current-prop" translate="no">current</a></b></b> : int</li> +<li class="fn" translate="no"><b><b><a href="qml-uicomponents-tabwidget.html#sampleReadOnlyProperty-prop" translate="no">sampleReadOnlyProperty</a></b></b> : int</li> </ul> <!-- $$$TabWidget-description --> <a name="details"></a> <h2 id="details">Detailed Description</h2> <p>A TabWidget places its children as tabs in a view. Selecting a tab involves selecting the tab at the top.</p> -<p>The TabWidget component is part of the <a href="uicomponents-qmlmodule.html">UI Components</a> module.</p> -<p>This documentation is part of the <a href="test-componentset-example.html">UIComponents</a> example.</p> +<p>The TabWidget component is part of the <a href="uicomponents-qmlmodule.html" translate="no">UI Components</a> module.</p> +<p>This documentation is part of the <a href="test-componentset-example.html" translate="no">UIComponents</a> example.</p> <a name="adding-tabs"></a> <h2 id="adding-tabs">Adding Tabs</h2> <p>To add a tab, declare the tab as a child of the TabWidget.</p> -<pre class="cpp">TabWidget { +<pre class="cpp" translate="no">TabWidget { id: tabwidget Rectangle { @@ -58,25 +58,25 @@ <!-- @@@TabWidget --> <h2>Property Documentation</h2> <!-- $$$current --> -<div class="qmlitem"><div class="qmlproto"> +<div class="qmlitem"><div class="qmlproto" translate="no"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="current-prop"> <td class="tblQmlPropNode"><p> -<a name="current-prop"></a><span class="name">current</span> : <span class="type"><a href="qml-int.html">int</a></span></p></td></tr> +<a name="current-prop"></a><span class="name">current</span> : <span class="type"><a href="qml-int.html" translate="no">int</a></span></p></td></tr> </table></div></div> -<div class="qmldoc"><p>The currently active tab in the <a href="qml-uicomponents-tabwidget.html">TabWidget</a>.</p> +<div class="qmldoc"><p>The currently active tab in the <a href="qml-uicomponents-tabwidget.html" translate="no">TabWidget</a>.</p> </div></div><!-- @@@current --> <br/> <!-- $$$sampleReadOnlyProperty --> -<div class="qmlitem"><div class="qmlproto"> +<div class="qmlitem"><div class="qmlproto" translate="no"> <div class="table"><table class="qmlname"> <tr valign="top" class="odd" id="sampleReadOnlyProperty-prop"> <td class="tblQmlPropNode"><p> -<a name="sampleReadOnlyProperty-prop"></a><span class="qmlreadonly">[read-only] </span><span class="name">sampleReadOnlyProperty</span> : <span class="type"><a href="qml-int.html">int</a></span></p></td></tr> +<a name="sampleReadOnlyProperty-prop"></a><span class="qmlreadonly">[read-only] </span><span class="name">sampleReadOnlyProperty</span> : <span class="type"><a href="qml-int.html" translate="no">int</a></span></p></td></tr> </table></div></div> -<div class="qmldoc"><p>A sample <code>read-only</code> property. A contrived property to demonstrate QDoc's ability to detect read-only properties.</p> +<div class="qmldoc"><p>A sample <code translate="no">read-only</code> property. A contrived property to demonstrate QDoc's ability to detect read-only properties.</p> <p>The signature is:</p> -<pre class="cpp">readonly property <span class="type"><a href="qml-int.html">int</a></span> sampleReadOnlyProperty: <span class="number">0</span></pre> +<pre class="cpp" translate="no">readonly property <span class="type"><a href="qml-int.html" translate="no">int</a></span> sampleReadOnlyProperty: <span class="number">0</span></pre> <p>Note that the property must be initialized to a value.</p> </div></div><!-- @@@sampleReadOnlyProperty --> <br/> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/qmlpropertygroups/qml-qdoc-test-anotherchild-members.html b/tests/auto/qdoc/generatedoutput/expected_output/qmlpropertygroups/qml-qdoc-test-anotherchild-members.html index aa80b49df..d63f61717 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/qmlpropertygroups/qml-qdoc-test-anotherchild-members.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/qmlpropertygroups/qml-qdoc-test-anotherchild-members.html @@ -7,17 +7,17 @@ </head> <body> <div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">List of All Members for AnotherChild</h1> +<h1 class="title" translate="no">List of All Members for AnotherChild</h1> <p>This is the complete list of members for <a href="qml-qdoc-test-anotherchild.html">AnotherChild</a>, including inherited members.</p> <ul> -<li class="fn"><b><b><a href="qml-qdoc-test-anotherchild.html#name-prop">name</a></b></b> : string</li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-anotherchild.html#name-prop" translate="no">name</a></b></b> : string</li> </ul> <p>The following members are inherited from <a href="qml-qdoc-test-parent.html">Parent</a>.</p> <ul> -<li class="fn"><b><b><a href="qml-qdoc-test-parent.html#group-prop">group</a></b></b><ul> -<li class="fn"><b><b><a href="qml-qdoc-test-parent.html#group.a-prop">group.a</a></b></b> : int</li> -<li class="fn"><b><b><a href="qml-qdoc-test-parent.html#group.b-prop">group.b</a></b></b> : int</li> -<li class="fn"><b><b><a href="qml-qdoc-test-parent.html#group.c-prop">group.c</a></b></b> : int</li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-parent.html#group-prop" translate="no">group</a></b></b><ul> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-parent.html#group.a-prop" translate="no">group.a</a></b></b> : int</li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-parent.html#group.b-prop" translate="no">group.b</a></b></b> : int</li> +<li class="fn" translate="no"><b><b><a href="qml-qdoc-test-parent.html#group.c-prop" translate="no">group.c</a></b></b> : int</li> </ul> </li> </ul> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/scopedenum/testqdoc-test.html b/tests/auto/qdoc/generatedoutput/expected_output/scopedenum/testqdoc-test.html index 1fc1a19d9..ba7980302 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/scopedenum/testqdoc-test.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/scopedenum/testqdoc-test.html @@ -19,42 +19,42 @@ </ul> </div> <div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">Test Class</h1> -<span class="small-subtitle">class <a href="testqdoc.html">TestQDoc</a>::Test</span> +<h1 class="title" translate="no">Test Class</h1> +<span class="small-subtitle" translate="no">class <a href="testqdoc.html" translate="no">TestQDoc</a>::Test</span> <!-- $$$Test-brief --> <p>A class in a namespace. <a href="#details">More...</a></p> <!-- @@@Test --> -<div class="table"><table class="alignedsummary"> +<div class="table"><table class="alignedsummary" translate="no"> <tr><td class="memItemLeft rightAlign topAlign"> Header:</td><td class="memItemRight bottomAlign"> <span class="preprocessor">#include <Test></span> -</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Inherited By:</td><td class="memItemRight bottomAlign"> <p><a href="testqdoc-testderived.html">TestQDoc::TestDerived</a></p> +</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Inherited By:</td><td class="memItemRight bottomAlign"> <p><a href="testqdoc-testderived.html" translate="no">TestQDoc::TestDerived</a></p> </td></tr></table></div><ul> <li><a href="testqdoc-test-members.html">List of all members, including inherited members</a></li> <li><a href="testqdoc-test-obsolete.html">Obsolete members</a></li> </ul> <a name="public-types"></a> <h2 id="public-types">Public Types</h2> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft rightAlign topAlign"> enum class </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#ScopedEnum-enum">ScopedEnum</a></b> { This, That, All }</td></tr> -<tr><td class="memItemLeft rightAlign topAlign"> typedef </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#SomeType-typedef">SomeType</a></b></td></tr> +<div class="table"><table class="alignedsummary" translate="no"> +<tr><td class="memItemLeft rightAlign topAlign"> enum class </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#ScopedEnum-enum" translate="no">ScopedEnum</a></b> { This, That, All }</td></tr> +<tr><td class="memItemLeft rightAlign topAlign"> typedef </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#SomeType-typedef" translate="no">SomeType</a></b></td></tr> </table></div> <a name="public-functions"></a> <h2 id="public-functions">Public Functions</h2> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#inlineFunction">inlineFunction</a></b>()</td></tr> -<tr><td class="memItemLeft rightAlign topAlign"> int </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#someFunction">someFunction</a></b>(int <i>v</i> = 0)</td></tr> -<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#someFunctionDefaultArg">someFunctionDefaultArg</a></b>(int <i>i</i>, bool <i>b</i> = false)</td></tr> -<tr><td class="memItemLeft rightAlign topAlign"> virtual void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#virtualFun">virtualFun</a></b>()</td></tr> +<div class="table"><table class="alignedsummary" translate="no"> +<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#inlineFunction" translate="no">inlineFunction</a></b>()</td></tr> +<tr><td class="memItemLeft rightAlign topAlign"> int </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#someFunction" translate="no">someFunction</a></b>(int <i>v</i> = 0)</td></tr> +<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#someFunctionDefaultArg" translate="no">someFunctionDefaultArg</a></b>(int <i>i</i>, bool <i>b</i> = false)</td></tr> +<tr><td class="memItemLeft rightAlign topAlign"> virtual void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#virtualFun" translate="no">virtualFun</a></b>()</td></tr> </table></div> <a name="protected-functions"></a> <h2 id="protected-functions">Protected Functions</h2> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#overload">overload</a></b>()</td></tr> -<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#overload-1">overload</a></b>(bool <i>b</i>)</td></tr> +<div class="table"><table class="alignedsummary" translate="no"> +<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#overload" translate="no">overload</a></b>()</td></tr> +<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#overload-1" translate="no">overload</a></b>(bool <i>b</i>)</td></tr> </table></div> <a name="macros"></a> <h2 id="macros">Macros</h2> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft rightAlign topAlign"> </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#QDOCTEST_MACRO2">QDOCTEST_MACRO2</a></b>(<i>x</i>)</td></tr> +<div class="table"><table class="alignedsummary" translate="no"> +<tr><td class="memItemLeft rightAlign topAlign"> </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#QDOCTEST_MACRO2" translate="no">QDOCTEST_MACRO2</a></b>(<i>x</i>)</td></tr> </table></div> <a name="details"></a> <!-- $$$Test-description --> @@ -65,15 +65,15 @@ <div class="types"> <h2>Member Type Documentation</h2> <!-- $$$ScopedEnum$$$This$$$That$$$All$$$OmittedValue --> -<h3 class="fn" id="ScopedEnum-enum"><a name="ScopedEnum-enum"></a>enum class Test::<span class="name">ScopedEnum</span></h3> +<h3 class="fn" translate="no" id="ScopedEnum-enum"><a name="ScopedEnum-enum"></a>enum class Test::<span class="name">ScopedEnum</span></h3> <div class="table"><table class="valuelist"><tr valign="top" class="odd"><th class="tblConst">Constant</th><th class="tblval">Value</th><th class="tbldscr">Description</th></tr> -<tr><td class="topAlign"><code>TestQDoc::Test::ScopedEnum::This</code></td><td class="topAlign tblval"><code>0x01</code></td><td class="topAlign">Something</td></tr> -<tr><td class="topAlign"><code>TestQDoc::Test::ScopedEnum::That</code></td><td class="topAlign tblval"><code>0x02</code></td><td class="topAlign">Something else</td></tr> -<tr><td class="topAlign"><code>TestQDoc::Test::ScopedEnum::All</code></td><td class="topAlign tblval"><code>This | That</code></td><td class="topAlign">Everything</td></tr> +<tr><td class="topAlign"><code translate="no">TestQDoc::Test::ScopedEnum::This</code></td><td class="topAlign tblval"><code translate="no">0x01</code></td><td class="topAlign">Something</td></tr> +<tr><td class="topAlign"><code translate="no">TestQDoc::Test::ScopedEnum::That</code></td><td class="topAlign tblval"><code translate="no">0x02</code></td><td class="topAlign">Something else</td></tr> +<tr><td class="topAlign"><code translate="no">TestQDoc::Test::ScopedEnum::All</code></td><td class="topAlign tblval"><code translate="no">This | That</code></td><td class="topAlign">Everything</td></tr> </table></div> <!-- @@@ScopedEnum --> <!-- $$$SomeType --> -<h3 class="fn" id="SomeType-typedef"><a name="SomeType-typedef"></a>typedef Test::<span class="name">SomeType</span></h3> +<h3 class="fn" translate="no" id="SomeType-typedef"><a name="SomeType-typedef"></a>typedef Test::<span class="name">SomeType</span></h3> <p>A typedef.</p> <!-- @@@SomeType --> </div> @@ -81,32 +81,32 @@ <h2>Member Function Documentation</h2> <!-- $$$ --> <div class="fngroup"> -<h3 class="fn fngroupitem" id="overload"><a name="overload"></a><code>[protected] </code><span class="type">void</span> Test::<span class="name">overload</span>()</h3><h3 class="fn fngroupitem" id="overload-1"><a name="overload-1"></a><code>[protected] </code><span class="type">void</span> Test::<span class="name">overload</span>(<span class="type">bool</span> <i>b</i>)</h3></div> -<p>Overloads that share a documentation comment, optionally taking a parameter <i>b</i>.</p> +<h3 class="fn fngroupitem" translate="no" id="overload"><a name="overload"></a><code translate="no">[protected] </code><span class="type">void</span> Test::<span class="name">overload</span>()</h3><h3 class="fn fngroupitem" translate="no" id="overload-1"><a name="overload-1"></a><code translate="no">[protected] </code><span class="type">void</span> Test::<span class="name">overload</span>(<span class="type">bool</span> <i>b</i>)</h3></div> +<p>Overloads that share a documentation comment, optionally taking a parameter <i translate="no">b</i>.</p> <p>This function was introduced in Test 1.2.</p> <!-- @@@ --> <!-- $$$inlineFunction[overload1]$$$inlineFunction --> -<h3 class="fn" id="inlineFunction"><a name="inlineFunction"></a><span class="type">void</span> Test::<span class="name">inlineFunction</span>()</h3> +<h3 class="fn" translate="no" id="inlineFunction"><a name="inlineFunction"></a><span class="type">void</span> Test::<span class="name">inlineFunction</span>()</h3> <p>An inline function, documented using the \fn QDoc command.</p> <!-- @@@inlineFunction --> <!-- $$$someFunction[overload1]$$$someFunctionint --> -<h3 class="fn" id="someFunction"><a name="someFunction"></a><span class="type">int</span> Test::<span class="name">someFunction</span>(<span class="type">int</span> <i>v</i> = 0)</h3> -<p>Function that takes a parameter <i>v</i>. Also returns the value of <i>v</i>.</p> +<h3 class="fn" translate="no" id="someFunction"><a name="someFunction"></a><span class="type">int</span> Test::<span class="name">someFunction</span>(<span class="type">int</span> <i>v</i> = 0)</h3> +<p>Function that takes a parameter <i translate="no">v</i>. Also returns the value of <i translate="no">v</i>.</p> <!-- @@@someFunction --> <!-- $$$someFunctionDefaultArg[overload1]$$$someFunctionDefaultArgintbool --> -<h3 class="fn" id="someFunctionDefaultArg"><a name="someFunctionDefaultArg"></a><span class="type">void</span> Test::<span class="name">someFunctionDefaultArg</span>(<span class="type">int</span> <i>i</i>, <span class="type">bool</span> <i>b</i> = false)</h3> -<p>Function that takes a parameter <i>i</i> and <i>b</i>.</p> +<h3 class="fn" translate="no" id="someFunctionDefaultArg"><a name="someFunctionDefaultArg"></a><span class="type">void</span> Test::<span class="name">someFunctionDefaultArg</span>(<span class="type">int</span> <i>i</i>, <span class="type">bool</span> <i>b</i> = false)</h3> +<p>Function that takes a parameter <i translate="no">i</i> and <i translate="no">b</i>.</p> <!-- @@@someFunctionDefaultArg --> <!-- $$$virtualFun[overload1]$$$virtualFun --> -<h3 class="fn" id="virtualFun"><a name="virtualFun"></a><code>[virtual] </code><span class="type">void</span> Test::<span class="name">virtualFun</span>()</h3> +<h3 class="fn" translate="no" id="virtualFun"><a name="virtualFun"></a><code translate="no">[virtual] </code><span class="type">void</span> Test::<span class="name">virtualFun</span>()</h3> <p>Function that must be reimplemented.</p> <!-- @@@virtualFun --> </div> <div class="macros"> <h2>Macro Documentation</h2> <!-- $$$QDOCTEST_MACRO2[overload1]$$$QDOCTEST_MACRO2 --> -<h3 class="fn" id="QDOCTEST_MACRO2"><a name="QDOCTEST_MACRO2"></a><span class="name">QDOCTEST_MACRO2</span>(<i>x</i>)</h3> -<p>A macro with argument <i>x</i>.</p> +<h3 class="fn" translate="no" id="QDOCTEST_MACRO2"><a name="QDOCTEST_MACRO2"></a><span class="name">QDOCTEST_MACRO2</span>(<i>x</i>)</h3> +<p>A macro with argument <i translate="no">x</i>.</p> <p>This function was introduced in Test 1.1.</p> <!-- @@@QDOCTEST_MACRO2 --> </div> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/second.html b/tests/auto/qdoc/generatedoutput/expected_output/second.html index 04a4862cd..9ac18ec7e 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/second.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/second.html @@ -15,8 +15,8 @@ </ul> </div> <div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">Second Class</h1> -<div class="table"><table class="alignedsummary"> +<h1 class="title" translate="no">Second Class</h1> +<div class="table"><table class="alignedsummary" translate="no"> <tr><td class="memItemLeft rightAlign topAlign"> Header:</td><td class="memItemRight bottomAlign"> <span class="preprocessor">#include <Second></span> </td></tr></table></div><ul> </ul> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/template/bar.html b/tests/auto/qdoc/generatedoutput/expected_output/template/bar.html index 552cbe9cd..e2faa2878 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/template/bar.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/template/bar.html @@ -15,12 +15,12 @@ </ul> </div> <div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">Bar Class</h1> -<span class="small-subtitle">template <typename T, typename D> class Bar</span> +<h1 class="title" translate="no">Bar Class</h1> +<span class="small-subtitle" translate="no">template <typename T, typename D> class Bar</span> <!-- $$$Bar-brief --> <p>Another class template. <a href="#details">More...</a></p> <!-- @@@Bar --> -<div class="table"><table class="alignedsummary"> +<div class="table"><table class="alignedsummary" translate="no"> <tr><td class="memItemLeft rightAlign topAlign"> Header:</td><td class="memItemRight bottomAlign"> <span class="preprocessor">#include <Bar></span> </td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr></table></div><ul> </ul> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/template/baz.html b/tests/auto/qdoc/generatedoutput/expected_output/template/baz.html index f9a3e24af..acb9d577b 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/template/baz.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/template/baz.html @@ -15,12 +15,12 @@ </ul> </div> <div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">Baz Struct</h1> -<span class="small-subtitle">template <template <typename> class X, typename Y> struct Baz</span> +<h1 class="title" translate="no">Baz Struct</h1> +<span class="small-subtitle" translate="no">template <template <typename> class X, typename Y> struct Baz</span> <!-- $$$Baz-brief --> <p>Class template template. <a href="#details">More...</a></p> <!-- @@@Baz --> -<div class="table"><table class="alignedsummary"> +<div class="table"><table class="alignedsummary" translate="no"> <tr><td class="memItemLeft rightAlign topAlign"> Header:</td><td class="memItemRight bottomAlign"> <span class="preprocessor">#include <Baz></span> </td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr></table></div><ul> </ul> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/template/foo.html b/tests/auto/qdoc/generatedoutput/expected_output/template/foo.html index 9e92a01b5..a0fea77a8 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/template/foo.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/template/foo.html @@ -15,12 +15,12 @@ </ul> </div> <div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">Foo Class</h1> -<span class="small-subtitle">template <typename T> class Foo</span> +<h1 class="title" translate="no">Foo Class</h1> +<span class="small-subtitle" translate="no">template <typename T> class Foo</span> <!-- $$$Foo-brief --> <p>Class template. <a href="#details">More...</a></p> <!-- @@@Foo --> -<div class="table"><table class="alignedsummary"> +<div class="table"><table class="alignedsummary" translate="no"> <tr><td class="memItemLeft rightAlign topAlign"> Header:</td><td class="memItemRight bottomAlign"> <span class="preprocessor">#include <Foo></span> </td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr></table></div><ul> </ul> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/template/testqdoc-test-struct.html b/tests/auto/qdoc/generatedoutput/expected_output/template/testqdoc-test-struct.html index 1624e4fd2..dd707aa1a 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/template/testqdoc-test-struct.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/template/testqdoc-test-struct.html @@ -15,8 +15,8 @@ </ul> </div> <div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">Struct Struct</h1> -<span class="small-subtitle">template <typename D, typename T> struct <a href="testqdoc.html">TestQDoc</a>::<a href="testqdoc-test.html">Test</a>::Struct</span> +<h1 class="title" translate="no">Struct Struct</h1> +<span class="small-subtitle" translate="no">template <typename D, typename T> struct <a href="testqdoc.html" translate="no">TestQDoc</a>::<a href="testqdoc-test.html" translate="no">Test</a>::Struct</span> <!-- $$$Struct-brief --> <p>Templated struct. <a href="#details">More...</a></p> <!-- @@@Struct --> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/template/testqdoc-test.html b/tests/auto/qdoc/generatedoutput/expected_output/template/testqdoc-test.html index de5eb904a..25b61dafa 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/template/testqdoc-test.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/template/testqdoc-test.html @@ -19,44 +19,44 @@ </ul> </div> <div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">Test Class</h1> -<span class="small-subtitle">class <a href="testqdoc.html">TestQDoc</a>::Test</span> +<h1 class="title" translate="no">Test Class</h1> +<span class="small-subtitle" translate="no">class <a href="testqdoc.html" translate="no">TestQDoc</a>::Test</span> <!-- $$$Test-brief --> <p>A class in a namespace. <a href="#details">More...</a></p> <!-- @@@Test --> -<div class="table"><table class="alignedsummary"> +<div class="table"><table class="alignedsummary" translate="no"> <tr><td class="memItemLeft rightAlign topAlign"> Header:</td><td class="memItemRight bottomAlign"> <span class="preprocessor">#include <Test></span> -</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Inherited By:</td><td class="memItemRight bottomAlign"> <p><a href="testqdoc-testderived.html">TestQDoc::TestDerived</a></p> +</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Inherited By:</td><td class="memItemRight bottomAlign"> <p><a href="testqdoc-testderived.html" translate="no">TestQDoc::TestDerived</a></p> </td></tr></table></div><ul> <li><a href="testqdoc-test-members.html">List of all members, including inherited members</a></li> <li><a href="testqdoc-test-obsolete.html">Obsolete members</a></li> </ul> <a name="public-types"></a> <h2 id="public-types">Public Types</h2> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft rightAlign topAlign"> struct </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test-struct.html">Struct</a></b></td></tr> -<tr><td class="memItemLeft rightAlign topAlign"> typedef </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#SomeType-typedef">SomeType</a></b></td></tr> -<tr><td class="memItemLeft rightAlign topAlign"> (alias) </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#Specialized-alias">Specialized</a></b></td></tr> +<div class="table"><table class="alignedsummary" translate="no"> +<tr><td class="memItemLeft rightAlign topAlign"> struct </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test-struct.html" translate="no">Struct</a></b></td></tr> +<tr><td class="memItemLeft rightAlign topAlign"> typedef </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#SomeType-typedef" translate="no">SomeType</a></b></td></tr> +<tr><td class="memItemLeft rightAlign topAlign"> (alias) </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#Specialized-alias" translate="no">Specialized</a></b></td></tr> </table></div> <a name="public-functions"></a> <h2 id="public-functions">Public Functions</h2> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#inlineFunction">inlineFunction</a></b>()</td></tr> -<tr><td class="memItemLeft rightAlign topAlign"> int </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#someFunction">someFunction</a></b>(int <i>v</i> = 0)</td></tr> -<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#someFunctionDefaultArg">someFunctionDefaultArg</a></b>(int <i>i</i>, bool <i>b</i> = false)</td></tr> -<tr><td class="memItemLeft rightAlign topAlign"> virtual void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#virtualFun">virtualFun</a></b>()</td></tr> +<div class="table"><table class="alignedsummary" translate="no"> +<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#inlineFunction" translate="no">inlineFunction</a></b>()</td></tr> +<tr><td class="memItemLeft rightAlign topAlign"> int </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#someFunction" translate="no">someFunction</a></b>(int <i>v</i> = 0)</td></tr> +<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#someFunctionDefaultArg" translate="no">someFunctionDefaultArg</a></b>(int <i>i</i>, bool <i>b</i> = false)</td></tr> +<tr><td class="memItemLeft rightAlign topAlign"> virtual void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#virtualFun" translate="no">virtualFun</a></b>()</td></tr> </table></div> <a name="protected-functions"></a> <h2 id="protected-functions">Protected Functions</h2> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#funcTemplate">funcTemplate</a></b>(T1 <i>a</i>, T2 <i>b</i>)</td></tr> -<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#overload">overload</a></b>()</td></tr> -<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#overload-1">overload</a></b>(bool <i>b</i>)</td></tr> +<div class="table"><table class="alignedsummary" translate="no"> +<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#funcTemplate" translate="no">funcTemplate</a></b>(T1 <i>a</i>, T2 <i>b</i>)</td></tr> +<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#overload" translate="no">overload</a></b>()</td></tr> +<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#overload-1" translate="no">overload</a></b>(bool <i>b</i>)</td></tr> </table></div> <a name="macros"></a> <h2 id="macros">Macros</h2> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft rightAlign topAlign"> </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#QDOCTEST_MACRO2">QDOCTEST_MACRO2</a></b>(<i>x</i>)</td></tr> +<div class="table"><table class="alignedsummary" translate="no"> +<tr><td class="memItemLeft rightAlign topAlign"> </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#QDOCTEST_MACRO2" translate="no">QDOCTEST_MACRO2</a></b>(<i>x</i>)</td></tr> </table></div> <a name="details"></a> <!-- $$$Test-description --> @@ -67,11 +67,11 @@ <div class="types"> <h2>Member Type Documentation</h2> <!-- $$$SomeType --> -<h3 class="fn" id="SomeType-typedef"><a name="SomeType-typedef"></a>typedef Test::<span class="name">SomeType</span></h3> +<h3 class="fn" translate="no" id="SomeType-typedef"><a name="SomeType-typedef"></a>typedef Test::<span class="name">SomeType</span></h3> <p>A typedef.</p> <!-- @@@SomeType --> <!-- $$$Specialized --> -<h3 class="fn" id="Specialized-alias"><a name="Specialized-alias"></a><code>[alias] </code>template<typename T> Test::<span class="name">Specialized</span></h3> +<h3 class="fn" translate="no" id="Specialized-alias"><a name="Specialized-alias"></a><code translate="no">[alias] </code>template<typename T> Test::<span class="name">Specialized</span></h3> <p>This is a type alias for Struct<int, T>.</p> <!-- @@@Specialized --> </div> @@ -79,36 +79,36 @@ <h2>Member Function Documentation</h2> <!-- $$$ --> <div class="fngroup"> -<h3 class="fn fngroupitem" id="overload"><a name="overload"></a><code>[protected] </code><span class="type">void</span> Test::<span class="name">overload</span>()</h3><h3 class="fn fngroupitem" id="overload-1"><a name="overload-1"></a><code>[protected] </code><span class="type">void</span> Test::<span class="name">overload</span>(<span class="type">bool</span> <i>b</i>)</h3></div> -<p>Overloads that share a documentation comment, optionally taking a parameter <i>b</i>.</p> +<h3 class="fn fngroupitem" translate="no" id="overload"><a name="overload"></a><code translate="no">[protected] </code><span class="type">void</span> Test::<span class="name">overload</span>()</h3><h3 class="fn fngroupitem" translate="no" id="overload-1"><a name="overload-1"></a><code translate="no">[protected] </code><span class="type">void</span> Test::<span class="name">overload</span>(<span class="type">bool</span> <i>b</i>)</h3></div> +<p>Overloads that share a documentation comment, optionally taking a parameter <i translate="no">b</i>.</p> <p>This function was introduced in Test 1.2.</p> <!-- @@@ --> <!-- $$$funcTemplate[overload1]$$$funcTemplateT1T2 --> -<h3 class="fn" id="funcTemplate"><a name="funcTemplate"></a><code>[protected] </code>template <typename T1, typename T2> <span class="type">void</span> Test::<span class="name">funcTemplate</span>(<span class="type">T1</span> <i>a</i>, <span class="type">T2</span> <i>b</i>)</h3> -<p>Function template with two parameters, <i>a</i> and <i>b</i>.</p> +<h3 class="fn" translate="no" id="funcTemplate"><a name="funcTemplate"></a><code translate="no">[protected] </code>template <typename T1, typename T2> <span class="type">void</span> Test::<span class="name">funcTemplate</span>(<span class="type">T1</span> <i>a</i>, <span class="type">T2</span> <i>b</i>)</h3> +<p>Function template with two parameters, <i translate="no">a</i> and <i translate="no">b</i>.</p> <!-- @@@funcTemplate --> <!-- $$$inlineFunction[overload1]$$$inlineFunction --> -<h3 class="fn" id="inlineFunction"><a name="inlineFunction"></a><span class="type">void</span> Test::<span class="name">inlineFunction</span>()</h3> +<h3 class="fn" translate="no" id="inlineFunction"><a name="inlineFunction"></a><span class="type">void</span> Test::<span class="name">inlineFunction</span>()</h3> <p>An inline function, documented using the \fn QDoc command.</p> <!-- @@@inlineFunction --> <!-- $$$someFunction[overload1]$$$someFunctionint --> -<h3 class="fn" id="someFunction"><a name="someFunction"></a><span class="type">int</span> Test::<span class="name">someFunction</span>(<span class="type">int</span> <i>v</i> = 0)</h3> -<p>Function that takes a parameter <i>v</i>. Also returns the value of <i>v</i>.</p> +<h3 class="fn" translate="no" id="someFunction"><a name="someFunction"></a><span class="type">int</span> Test::<span class="name">someFunction</span>(<span class="type">int</span> <i>v</i> = 0)</h3> +<p>Function that takes a parameter <i translate="no">v</i>. Also returns the value of <i translate="no">v</i>.</p> <!-- @@@someFunction --> <!-- $$$someFunctionDefaultArg[overload1]$$$someFunctionDefaultArgintbool --> -<h3 class="fn" id="someFunctionDefaultArg"><a name="someFunctionDefaultArg"></a><span class="type">void</span> Test::<span class="name">someFunctionDefaultArg</span>(<span class="type">int</span> <i>i</i>, <span class="type">bool</span> <i>b</i> = false)</h3> -<p>Function that takes a parameter <i>i</i> and <i>b</i>.</p> +<h3 class="fn" translate="no" id="someFunctionDefaultArg"><a name="someFunctionDefaultArg"></a><span class="type">void</span> Test::<span class="name">someFunctionDefaultArg</span>(<span class="type">int</span> <i>i</i>, <span class="type">bool</span> <i>b</i> = false)</h3> +<p>Function that takes a parameter <i translate="no">i</i> and <i translate="no">b</i>.</p> <!-- @@@someFunctionDefaultArg --> <!-- $$$virtualFun[overload1]$$$virtualFun --> -<h3 class="fn" id="virtualFun"><a name="virtualFun"></a><code>[virtual] </code><span class="type">void</span> Test::<span class="name">virtualFun</span>()</h3> +<h3 class="fn" translate="no" id="virtualFun"><a name="virtualFun"></a><code translate="no">[virtual] </code><span class="type">void</span> Test::<span class="name">virtualFun</span>()</h3> <p>Function that must be reimplemented.</p> <!-- @@@virtualFun --> </div> <div class="macros"> <h2>Macro Documentation</h2> <!-- $$$QDOCTEST_MACRO2[overload1]$$$QDOCTEST_MACRO2 --> -<h3 class="fn" id="QDOCTEST_MACRO2"><a name="QDOCTEST_MACRO2"></a><span class="name">QDOCTEST_MACRO2</span>(<i>x</i>)</h3> -<p>A macro with argument <i>x</i>.</p> +<h3 class="fn" translate="no" id="QDOCTEST_MACRO2"><a name="QDOCTEST_MACRO2"></a><span class="name">QDOCTEST_MACRO2</span>(<i>x</i>)</h3> +<p>A macro with argument <i translate="no">x</i>.</p> <p>This function was introduced in Test 1.1.</p> <!-- @@@QDOCTEST_MACRO2 --> </div> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/test-cmaketest-example.html b/tests/auto/qdoc/generatedoutput/expected_output/test-cmaketest-example.html index dc123674d..f3e8249b7 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/test-cmaketest-example.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/test-cmaketest-example.html @@ -13,8 +13,8 @@ <div class="descr"> <a name="details"></a> <p>Files:</p> <ul> -<li><a href="test-cmaketest-cmakelists-txt.html">cmaketest/CMakeLists.txt</a></li> -<li><a href="test-cmaketest-main-cpp.html">cmaketest/main.cpp</a></li> +<li><a href="test-cmaketest-cmakelists-txt.html" translate="no">cmaketest/CMakeLists.txt</a></li> +<li><a href="test-cmaketest-main-cpp.html" translate="no">cmaketest/main.cpp</a></li> </ul> </div> <!-- @@@cmaketest --> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/test-componentset-example.html b/tests/auto/qdoc/generatedoutput/expected_output/test-componentset-example.html index 8b792090f..bf7f83f6b 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/test-componentset-example.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/test-componentset-example.html @@ -25,32 +25,32 @@ <!-- $$$componentset-description --> <div class="descr"> <a name="details"></a> <p>This example demonstrates one of the ways to document QML types.</p> -<p>In particular, there are sample types that are documented with QDoc commands comments. There are documentation comments for the QML types and their public interfaces. The types are grouped into a module, the <a href="uicomponents-qmlmodule.html">UI Components</a> module.</p> -<p>The uicomponents.qdoc file generates the overview page for the <a href="uicomponents-qmlmodule.html">UI Components</a> module page.</p> -<p>The generated documentation is available in the <a href="uicomponents-qmlmodule.html">UI Components</a> module.</p> +<p>In particular, there are sample types that are documented with QDoc commands comments. There are documentation comments for the QML types and their public interfaces. The types are grouped into a module, the <a href="uicomponents-qmlmodule.html" translate="no">UI Components</a> module.</p> +<p>The uicomponents.qdoc file generates the overview page for the <a href="uicomponents-qmlmodule.html" translate="no">UI Components</a> module page.</p> +<p>The generated documentation is available in the <a href="uicomponents-qmlmodule.html" translate="no">UI Components</a> module.</p> <a name="qml-class"></a> <h4 id="qml-class">QML Class</h4> -<p>The QML types use the \qmltype to document the type. In addition, they have the \inmodule command in order for QDoc to associate them to the <code>UIComponents</code> module.</p> +<p>The QML types use the \qmltype to document the type. In addition, they have the \inmodule command in order for QDoc to associate them to the <code translate="no">UIComponents</code> module.</p> <p>QDoc uses the \brief command to place a basic description when listing the types.</p> <a name="properties-signals-handlers-and-methods"></a> <h4 id="properties-signals-handlers-and-methods">Properties, Signals, Handlers, and Methods</h4> <p>The types have their properties, signals, handlers, and methods defined in their respective QML files. QDoc associates the properties and methods to the types, therefore, you only need to place the documentation above the property, method, or signal.</p> <p>To document the type of a <i>property alias</i>, you must use the \qmlproperty command to specify the data type.</p> -<pre class="cpp">\qmlproperty <span class="type">int</span> anAliasedProperty +<pre class="cpp" translate="no">\qmlproperty <span class="type">int</span> anAliasedProperty An aliased property of type <span class="type">int</span><span class="operator">.</span></pre> <a name="internal-documentation"></a> <h5 id="internal-documentation">Internal Documentation</h5> -<p>You may declare that a documentation is for internal use by placing the \internal command after the beginning QDoc comment <code>/*</code>. QDoc will prevent the internal documentation from appearing in the public API.</p> +<p>You may declare that a documentation is for internal use by placing the \internal command after the beginning QDoc comment <code translate="no">/*</code>. QDoc will prevent the internal documentation from appearing in the public API.</p> <p>If you wish to omit certain parts of the documentation, you may use the \omit and \endomit command.</p> <a name="qml-types-with-c-implementation"></a> <h4 id="qml-types-with-c-implementation">QML Types with C++ Implementation</h4> <p>This example only demonstrates the documentation for types in QML files, but the regular QML commands may be placed inside C++ classes to define the public API of the QML type.</p> <p>Files:</p> <ul> -<li><a href="test-componentset-progressbar-qml.html">componentset/ProgressBar.qml</a></li> -<li><a href="test-componentset-switch-qml.html">componentset/Switch.qml</a></li> -<li><a href="test-componentset-tabwidget-qml.html">componentset/TabWidget.qml</a></li> -<li><a href="test-componentset-componentset-pro.html">componentset/componentset.pro</a></li> +<li><a href="test-componentset-progressbar-qml.html" translate="no">componentset/ProgressBar.qml</a></li> +<li><a href="test-componentset-switch-qml.html" translate="no">componentset/Switch.qml</a></li> +<li><a href="test-componentset-tabwidget-qml.html" translate="no">componentset/TabWidget.qml</a></li> +<li><a href="test-componentset-componentset-pro.html" translate="no">componentset/componentset.pro</a></li> </ul> </div> <!-- @@@componentset --> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/testcpp-module.html b/tests/auto/qdoc/generatedoutput/expected_output/testcpp-module.html index 60bbd587c..d1c1b9754 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/testcpp-module.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/testcpp-module.html @@ -16,21 +16,21 @@ </ul> </div> <div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">QDoc Test C++ Classes</h1> -<span class="subtitle"></span> +<h1 class="title" translate="no">QDoc Test C++ Classes</h1> +<span class="subtitle" translate="no"></span> <!-- $$$TestCPP-brief --> <p>A test module page. <a href="#details">More...</a></p> <!-- @@@TestCPP --> <a name="namespaces"></a> <h2 id="namespaces">Namespaces</h2> <div class="table"><table class="annotated"> -<tr class="odd topAlign"><td class="tblName"><p><a href="testqdoc.html">TestQDoc</a></p></td><td class="tblDescr"><p>A namespace</p></td></tr> +<tr class="odd topAlign"><td class="tblName" translate="no"><p><a href="testqdoc.html">TestQDoc</a></p></td><td class="tblDescr"><p>A namespace</p></td></tr> </table></div> <a name="classes"></a> <h2 id="classes">Classes</h2> <div class="table"><table class="annotated"> -<tr class="odd topAlign"><td class="tblName"><p><a href="testqdoc-test.html">TestQDoc::Test</a></p></td><td class="tblDescr"><p>A class in a namespace</p></td></tr> -<tr class="even topAlign"><td class="tblName"><p><a href="testqdoc-testderived.html">TestQDoc::TestDerived</a></p></td><td class="tblDescr"><p>A derived class in a namespace</p></td></tr> +<tr class="odd topAlign"><td class="tblName" translate="no"><p><a href="testqdoc-test.html">TestQDoc::Test</a></p></td><td class="tblDescr"><p>A class in a namespace</p></td></tr> +<tr class="even topAlign"><td class="tblName" translate="no"><p><a href="testqdoc-testderived.html">TestQDoc::TestDerived</a></p></td><td class="tblDescr"><p>A derived class in a namespace</p></td></tr> </table></div> <!-- $$$TestCPP-description --> <a name="details"></a> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test-members.html b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test-members.html index fc87f8613..76770c5c3 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test-members.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test-members.html @@ -8,16 +8,16 @@ <body> <li>Test</li> <div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">List of All Members for Test</h1> +<h1 class="title" translate="no">List of All Members for Test</h1> <p>This is the complete list of members for <a href="testqdoc-test.html">TestQDoc::Test</a>, including inherited members.</p> <ul> -<li class="fn">typedef <span class="name"><b><a href="testqdoc-test.html#SomeType-typedef">SomeType</a></b></span></li> -<li class="fn"><span class="name"><b><a href="testqdoc-test.html#inlineFunction">inlineFunction</a></b></span>()</li> -<li class="fn"><span class="name"><b><a href="testqdoc-test.html#overload">overload</a></b></span>()</li> -<li class="fn"><span class="name"><b><a href="testqdoc-test.html#overload-1">overload</a></b></span>(bool )</li> -<li class="fn"><span class="name"><b><a href="testqdoc-test.html#someFunction">someFunction</a></b></span>(int ) : int</li> -<li class="fn"><span class="name"><b><a href="testqdoc-test.html#someFunctionDefaultArg">someFunctionDefaultArg</a></b></span>(int , bool )</li> -<li class="fn"><span class="name"><b><a href="testqdoc-test.html#virtualFun">virtualFun</a></b></span>()</li> +<li class="fn" translate="no">typedef <span class="name"><b><a href="testqdoc-test.html#SomeType-typedef" translate="no">SomeType</a></b></span></li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#inlineFunction" translate="no">inlineFunction</a></b></span>()</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#overload" translate="no">overload</a></b></span>()</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#overload-1" translate="no">overload</a></b></span>(bool )</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#someFunction" translate="no">someFunction</a></b></span>(int ) : int</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#someFunctionDefaultArg" translate="no">someFunctionDefaultArg</a></b></span>(int , bool )</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#virtualFun" translate="no">virtualFun</a></b></span>()</li> </ul> </body> </html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test-obsolete.html b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test-obsolete.html deleted file mode 100644 index ef0e7bcac..000000000 --- a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test-obsolete.html +++ /dev/null @@ -1,36 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> -<head> - <meta charset="utf-8"> -<!-- testcpp.cpp --> - <title>Obsolete Members for Test | TestCPP</title> -</head> -<body> -<li>Test</li> -<div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">Obsolete Members for Test</h1> -<p><b>The following members of class <a href="testqdoc-test.html">Test</a> are obsolete.</b> They are provided to keep old source code working. We strongly advise against using them in new code.</p> -<h2>Public Functions</h2> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft topAlign rightAlign"> <code>(obsolete) </code>void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test-obsolete.html#anotherObsoleteMember">anotherObsoleteMember</a></b>()</td></tr> -<tr><td class="memItemLeft topAlign rightAlign"> <code>(obsolete) </code>void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test-obsolete.html#deprecatedMember">deprecatedMember</a></b>()</td></tr> -<tr><td class="memItemLeft topAlign rightAlign"> <code>(obsolete) </code>void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test-obsolete.html#obsoleteMember">obsoleteMember</a></b>()</td></tr> -</table></div> -<h2>Member Function Documentation</h2> -<!-- $$$anotherObsoleteMember[overload1]$$$anotherObsoleteMember --> -<h3 class="fn" id="anotherObsoleteMember"><a name="anotherObsoleteMember"></a><span class="type">void</span> Test::<span class="name">anotherObsoleteMember</span>()</h3> -<p>This function is obsolete. It is provided to keep old source code working. We strongly advise against using it in new code.</p> -<p>Use <a href="testqdoc-test-obsolete.html#obsoleteMember">obsoleteMember</a>() instead.</p> -<!-- @@@anotherObsoleteMember --> -<!-- $$$deprecatedMember[overload1]$$$deprecatedMember --> -<h3 class="fn" id="deprecatedMember"><a name="deprecatedMember"></a><span class="type">void</span> Test::<span class="name">deprecatedMember</span>()</h3> -<p>This function is obsolete. It is provided to keep old source code working. We strongly advise against using it in new code.</p> -<p>Use <a href="testqdoc-test.html#someFunction">someFunction</a>() instead.</p> -<!-- @@@deprecatedMember --> -<!-- $$$obsoleteMember[overload1]$$$obsoleteMember --> -<h3 class="fn" id="obsoleteMember"><a name="obsoleteMember"></a><span class="type">void</span> Test::<span class="name">obsoleteMember</span>()</h3> -<p>This function is obsolete. It is provided to keep old source code working. We strongly advise against using it in new code.</p> -<p>Use <a href="testqdoc-test.html#someFunction">someFunction</a>() instead.</p> -<!-- @@@obsoleteMember --> -</body> -</html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test.html b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test.html index 805dc32a9..412789b86 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-test.html @@ -19,41 +19,41 @@ </ul> </div> <div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">Test Class</h1> -<span class="small-subtitle">class <a href="testqdoc.html">TestQDoc</a>::Test</span> +<h1 class="title" translate="no">Test Class</h1> +<span class="small-subtitle" translate="no">class <a href="testqdoc.html" translate="no">TestQDoc</a>::Test</span> <!-- $$$Test-brief --> <p>A class in a namespace. <a href="#details">More...</a></p> <!-- @@@Test --> -<div class="table"><table class="alignedsummary"> +<div class="table"><table class="alignedsummary" translate="no"> <tr><td class="memItemLeft rightAlign topAlign"> Header:</td><td class="memItemRight bottomAlign"> <span class="preprocessor">#include <Test></span> -</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Inherited By:</td><td class="memItemRight bottomAlign"> <p><a href="testqdoc-testderived.html">TestQDoc::TestDerived</a></p> +</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Inherited By:</td><td class="memItemRight bottomAlign"> <p><a href="testqdoc-testderived.html" translate="no">TestQDoc::TestDerived</a></p> </td></tr></table></div><ul> <li><a href="testqdoc-test-members.html">List of all members, including inherited members</a></li> <li><a href="testqdoc-test-obsolete.html">Obsolete members</a></li> </ul> <a name="public-types"></a> <h2 id="public-types">Public Types</h2> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft rightAlign topAlign"> typedef </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#SomeType-typedef">SomeType</a></b></td></tr> +<div class="table"><table class="alignedsummary" translate="no"> +<tr><td class="memItemLeft rightAlign topAlign"> typedef </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#SomeType-typedef" translate="no">SomeType</a></b></td></tr> </table></div> <a name="public-functions"></a> <h2 id="public-functions">Public Functions</h2> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#inlineFunction">inlineFunction</a></b>()</td></tr> -<tr><td class="memItemLeft rightAlign topAlign"> int </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#someFunction">someFunction</a></b>(int <i>v</i> = 0)</td></tr> -<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#someFunctionDefaultArg">someFunctionDefaultArg</a></b>(int <i>i</i>, bool <i>b</i> = false)</td></tr> -<tr><td class="memItemLeft rightAlign topAlign"> virtual void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#virtualFun">virtualFun</a></b>()</td></tr> +<div class="table"><table class="alignedsummary" translate="no"> +<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#inlineFunction" translate="no">inlineFunction</a></b>()</td></tr> +<tr><td class="memItemLeft rightAlign topAlign"> int </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#someFunction" translate="no">someFunction</a></b>(int <i>v</i> = 0)</td></tr> +<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#someFunctionDefaultArg" translate="no">someFunctionDefaultArg</a></b>(int <i>i</i>, bool <i>b</i> = false)</td></tr> +<tr><td class="memItemLeft rightAlign topAlign"> virtual void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#virtualFun" translate="no">virtualFun</a></b>()</td></tr> </table></div> <a name="protected-functions"></a> <h2 id="protected-functions">Protected Functions</h2> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#overload">overload</a></b>()</td></tr> -<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#overload-1">overload</a></b>(bool <i>b</i>)</td></tr> +<div class="table"><table class="alignedsummary" translate="no"> +<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#overload" translate="no">overload</a></b>()</td></tr> +<tr><td class="memItemLeft rightAlign topAlign"> void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#overload-1" translate="no">overload</a></b>(bool <i>b</i>)</td></tr> </table></div> <a name="macros"></a> <h2 id="macros">Macros</h2> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft rightAlign topAlign"> </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#QDOCTEST_MACRO2">QDOCTEST_MACRO2</a></b>(<i>x</i>)</td></tr> +<div class="table"><table class="alignedsummary" translate="no"> +<tr><td class="memItemLeft rightAlign topAlign"> </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html#QDOCTEST_MACRO2" translate="no">QDOCTEST_MACRO2</a></b>(<i>x</i>)</td></tr> </table></div> <a name="details"></a> <!-- $$$Test-description --> @@ -64,7 +64,7 @@ <div class="types"> <h2>Member Type Documentation</h2> <!-- $$$SomeType --> -<h3 class="fn" id="SomeType-typedef"><a name="SomeType-typedef"></a>typedef Test::<span class="name">SomeType</span></h3> +<h3 class="fn" translate="no" id="SomeType-typedef"><a name="SomeType-typedef"></a>typedef Test::<span class="name">SomeType</span></h3> <p>A typedef.</p> <!-- @@@SomeType --> </div> @@ -72,32 +72,32 @@ <h2>Member Function Documentation</h2> <!-- $$$ --> <div class="fngroup"> -<h3 class="fn fngroupitem" id="overload"><a name="overload"></a><code>[protected] </code><span class="type">void</span> Test::<span class="name">overload</span>()</h3><h3 class="fn fngroupitem" id="overload-1"><a name="overload-1"></a><code>[protected] </code><span class="type">void</span> Test::<span class="name">overload</span>(<span class="type">bool</span> <i>b</i>)</h3></div> -<p>Overloads that share a documentation comment, optionally taking a parameter <i>b</i>.</p> +<h3 class="fn fngroupitem" translate="no" id="overload"><a name="overload"></a><code translate="no">[protected] </code><span class="type">void</span> Test::<span class="name">overload</span>()</h3><h3 class="fn fngroupitem" translate="no" id="overload-1"><a name="overload-1"></a><code translate="no">[protected] </code><span class="type">void</span> Test::<span class="name">overload</span>(<span class="type">bool</span> <i>b</i>)</h3></div> +<p>Overloads that share a documentation comment, optionally taking a parameter <i translate="no">b</i>.</p> <p>This function was introduced in Test 1.2.</p> <!-- @@@ --> <!-- $$$inlineFunction[overload1]$$$inlineFunction --> -<h3 class="fn" id="inlineFunction"><a name="inlineFunction"></a><span class="type">void</span> Test::<span class="name">inlineFunction</span>()</h3> +<h3 class="fn" translate="no" id="inlineFunction"><a name="inlineFunction"></a><span class="type">void</span> Test::<span class="name">inlineFunction</span>()</h3> <p>An inline function, documented using the \fn QDoc command.</p> <!-- @@@inlineFunction --> <!-- $$$someFunction[overload1]$$$someFunctionint --> -<h3 class="fn" id="someFunction"><a name="someFunction"></a><span class="type">int</span> Test::<span class="name">someFunction</span>(<span class="type">int</span> <i>v</i> = 0)</h3> -<p>Function that takes a parameter <i>v</i>. Also returns the value of <i>v</i>.</p> +<h3 class="fn" translate="no" id="someFunction"><a name="someFunction"></a><span class="type">int</span> Test::<span class="name">someFunction</span>(<span class="type">int</span> <i>v</i> = 0)</h3> +<p>Function that takes a parameter <i translate="no">v</i>. Also returns the value of <i translate="no">v</i>.</p> <!-- @@@someFunction --> <!-- $$$someFunctionDefaultArg[overload1]$$$someFunctionDefaultArgintbool --> -<h3 class="fn" id="someFunctionDefaultArg"><a name="someFunctionDefaultArg"></a><span class="type">void</span> Test::<span class="name">someFunctionDefaultArg</span>(<span class="type">int</span> <i>i</i>, <span class="type">bool</span> <i>b</i> = false)</h3> -<p>Function that takes a parameter <i>i</i> and <i>b</i>.</p> +<h3 class="fn" translate="no" id="someFunctionDefaultArg"><a name="someFunctionDefaultArg"></a><span class="type">void</span> Test::<span class="name">someFunctionDefaultArg</span>(<span class="type">int</span> <i>i</i>, <span class="type">bool</span> <i>b</i> = false)</h3> +<p>Function that takes a parameter <i translate="no">i</i> and <i translate="no">b</i>.</p> <!-- @@@someFunctionDefaultArg --> <!-- $$$virtualFun[overload1]$$$virtualFun --> -<h3 class="fn" id="virtualFun"><a name="virtualFun"></a><code>[virtual] </code><span class="type">void</span> Test::<span class="name">virtualFun</span>()</h3> +<h3 class="fn" translate="no" id="virtualFun"><a name="virtualFun"></a><code translate="no">[virtual] </code><span class="type">void</span> Test::<span class="name">virtualFun</span>()</h3> <p>Function that must be reimplemented.</p> <!-- @@@virtualFun --> </div> <div class="macros"> <h2>Macro Documentation</h2> <!-- $$$QDOCTEST_MACRO2[overload1]$$$QDOCTEST_MACRO2 --> -<h3 class="fn" id="QDOCTEST_MACRO2"><a name="QDOCTEST_MACRO2"></a><span class="name">QDOCTEST_MACRO2</span>(<i>x</i>)</h3> -<p>A macro with argument <i>x</i>.</p> +<h3 class="fn" translate="no" id="QDOCTEST_MACRO2"><a name="QDOCTEST_MACRO2"></a><span class="name">QDOCTEST_MACRO2</span>(<i>x</i>)</h3> +<p>A macro with argument <i translate="no">x</i>.</p> <p>This function was introduced in Test 1.1.</p> <!-- @@@QDOCTEST_MACRO2 --> </div> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived-members.html b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived-members.html index 4dc3649db..74cea6212 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived-members.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived-members.html @@ -8,18 +8,18 @@ <body> <li>TestDerived</li> <div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">List of All Members for TestDerived</h1> +<h1 class="title" translate="no">List of All Members for TestDerived</h1> <p>This is the complete list of members for <a href="testqdoc-testderived.html">TestQDoc::TestDerived</a>, including inherited members.</p> <ul> -<li class="fn"><span class="name"><b><a href="testqdoc-testderived.html#DerivedType-alias">DerivedType</a></b></span></li> -<li class="fn"><span class="name"><b><a href="testqdoc-testderived.html#NotTypedef-alias">NotTypedef</a></b></span></li> -<li class="fn">typedef <span class="name"><b><a href="testqdoc-test.html#SomeType-typedef">SomeType</a></b></span></li> -<li class="fn"><span class="name"><b><a href="testqdoc-test.html#inlineFunction">inlineFunction</a></b></span>()</li> -<li class="fn"><span class="name"><b><a href="testqdoc-test.html#overload">overload</a></b></span>()</li> -<li class="fn"><span class="name"><b><a href="testqdoc-test.html#overload-1">overload</a></b></span>(bool )</li> -<li class="fn"><span class="name"><b><a href="testqdoc-test.html#someFunction">someFunction</a></b></span>(int ) : int</li> -<li class="fn"><span class="name"><b><a href="testqdoc-test.html#someFunctionDefaultArg">someFunctionDefaultArg</a></b></span>(int , bool )</li> -<li class="fn"><span class="name"><b><a href="testqdoc-testderived.html#virtualFun">virtualFun</a></b></span>()</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-testderived.html#DerivedType-alias" translate="no">DerivedType</a></b></span></li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-testderived.html#NotTypedef-alias" translate="no">NotTypedef</a></b></span></li> +<li class="fn" translate="no">typedef <span class="name"><b><a href="testqdoc-test.html#SomeType-typedef" translate="no">SomeType</a></b></span></li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#inlineFunction" translate="no">inlineFunction</a></b></span>()</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#overload" translate="no">overload</a></b></span>()</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#overload-1" translate="no">overload</a></b></span>(bool )</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#someFunction" translate="no">someFunction</a></b></span>(int ) : int</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-test.html#someFunctionDefaultArg" translate="no">someFunctionDefaultArg</a></b></span>(int , bool )</li> +<li class="fn" translate="no"><span class="name"><b><a href="testqdoc-testderived.html#virtualFun" translate="no">virtualFun</a></b></span>()</li> </ul> </body> </html> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived-obsolete.html b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived-obsolete.html index d35dd5837..136f3c900 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived-obsolete.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived-obsolete.html @@ -8,15 +8,15 @@ <body> <li>TestDerived</li> <div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">Obsolete Members for TestDerived</h1> -<p><b>The following members of class <a href="testqdoc-testderived.html">TestDerived</a> are obsolete.</b> They are provided to keep old source code working. We strongly advise against using them in new code.</p> +<h1 class="title" translate="no">Obsolete Members for TestDerived</h1> +<p><b>The following members of class <a href="testqdoc-testderived.html" translate="no">TestDerived</a> are obsolete.</b> They are provided to keep old source code working. We strongly advise against using them in new code.</p> <h2>Static Public Members</h2> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft topAlign rightAlign"> <code>(obsolete) </code>void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-testderived-obsolete.html#staticObsoleteMember">staticObsoleteMember</a></b>()</td></tr> +<div class="table"><table class="alignedsummary" translate="no"> +<tr><td class="memItemLeft topAlign rightAlign"> <code translate="no">(obsolete) </code>void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-testderived-obsolete.html#staticObsoleteMember" translate="no">staticObsoleteMember</a></b>()</td></tr> </table></div> <h2>Member Function Documentation</h2> <!-- $$$staticObsoleteMember[overload1]$$$staticObsoleteMember --> -<h3 class="fn" id="staticObsoleteMember"><a name="staticObsoleteMember"></a><code>[static] </code><span class="type">void</span> TestDerived::<span class="name">staticObsoleteMember</span>()</h3> +<h3 class="fn" translate="no" id="staticObsoleteMember"><a name="staticObsoleteMember"></a><code translate="no">[static] </code><span class="type">void</span> TestDerived::<span class="name">staticObsoleteMember</span>()</h3> <p>This function is obsolete. It is provided to keep old source code working. We strongly advise against using it in new code.</p> <p>Static obsolete method.</p> <!-- @@@staticObsoleteMember --> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived.html b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived.html index bfbc272f5..55b9ac6b9 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc-testderived.html @@ -17,27 +17,27 @@ </ul> </div> <div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">TestDerived Class</h1> -<span class="small-subtitle">class <a href="testqdoc.html">TestQDoc</a>::TestDerived</span> +<h1 class="title" translate="no">TestDerived Class</h1> +<span class="small-subtitle" translate="no">class <a href="testqdoc.html" translate="no">TestQDoc</a>::TestDerived</span> <!-- $$$TestDerived-brief --> <p>A derived class in a namespace. <a href="#details">More...</a></p> <!-- @@@TestDerived --> -<div class="table"><table class="alignedsummary"> +<div class="table"><table class="alignedsummary" translate="no"> <tr><td class="memItemLeft rightAlign topAlign"> Header:</td><td class="memItemRight bottomAlign"> <span class="preprocessor">#include <TestDerived></span> -</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Inherits:</td><td class="memItemRight bottomAlign"> <a href="testqdoc-test.html">TestQDoc::Test</a></td></tr></table></div><ul> +</td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr><tr><td class="memItemLeft rightAlign topAlign"> Inherits:</td><td class="memItemRight bottomAlign"> <a href="testqdoc-test.html" translate="no">TestQDoc::Test</a></td></tr></table></div><ul> <li><a href="testqdoc-testderived-members.html">List of all members, including inherited members</a></li> <li><a href="testqdoc-testderived-obsolete.html">Obsolete members</a></li> </ul> <a name="public-types"></a> <h2 id="public-types">Public Types</h2> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft rightAlign topAlign"> (alias) </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-testderived.html#DerivedType-alias">DerivedType</a></b></td></tr> -<tr><td class="memItemLeft rightAlign topAlign"> (alias) </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-testderived.html#NotTypedef-alias">NotTypedef</a></b></td></tr> +<div class="table"><table class="alignedsummary" translate="no"> +<tr><td class="memItemLeft rightAlign topAlign"> (alias) </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-testderived.html#DerivedType-alias" translate="no">DerivedType</a></b></td></tr> +<tr><td class="memItemLeft rightAlign topAlign"> (alias) </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-testderived.html#NotTypedef-alias" translate="no">NotTypedef</a></b></td></tr> </table></div> <a name="reimplemented-public-functions"></a> <h2 id="reimplemented-public-functions">Reimplemented Public Functions</h2> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft rightAlign topAlign"> virtual void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-testderived.html#virtualFun">virtualFun</a></b>() override</td></tr> +<div class="table"><table class="alignedsummary" translate="no"> +<tr><td class="memItemLeft rightAlign topAlign"> virtual void </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-testderived.html#virtualFun" translate="no">virtualFun</a></b>() override</td></tr> </table></div> <a name="details"></a> <!-- $$$TestDerived-description --> @@ -48,12 +48,12 @@ <div class="types"> <h2>Member Type Documentation</h2> <!-- $$$DerivedType --> -<h3 class="fn" id="DerivedType-alias"><a name="DerivedType-alias"></a><code>[alias] </code>TestDerived::<span class="name">DerivedType</span></h3> -<p>This is a type alias for <a href="testqdoc-test.html#SomeType-typedef">TestQDoc::Test::SomeType</a>.</p> +<h3 class="fn" translate="no" id="DerivedType-alias"><a name="DerivedType-alias"></a><code translate="no">[alias] </code>TestDerived::<span class="name">DerivedType</span></h3> +<p>This is a type alias for <a href="testqdoc-test.html#SomeType-typedef" translate="no">TestQDoc::Test::SomeType</a>.</p> <p>An aliased typedef.</p> <!-- @@@DerivedType --> <!-- $$$NotTypedef --> -<h3 class="fn" id="NotTypedef-alias"><a name="NotTypedef-alias"></a><code>[alias] </code>TestDerived::<span class="name">NotTypedef</span></h3> +<h3 class="fn" translate="no" id="NotTypedef-alias"><a name="NotTypedef-alias"></a><code translate="no">[alias] </code>TestDerived::<span class="name">NotTypedef</span></h3> <p>This is a type alias for int.</p> <p>I'm an alias, not a typedef.</p> <!-- @@@NotTypedef --> @@ -61,8 +61,8 @@ <div class="func"> <h2>Member Function Documentation</h2> <!-- $$$virtualFun[overload1]$$$virtualFun --> -<h3 class="fn" id="virtualFun"><a name="virtualFun"></a><code>[override virtual] </code><span class="type">void</span> TestDerived::<span class="name">virtualFun</span>()</h3> -<p>Reimplements: <a href="testqdoc-test.html#virtualFun">Test::virtualFun</a>().</p> +<h3 class="fn" translate="no" id="virtualFun"><a name="virtualFun"></a><code translate="no">[override virtual] </code><span class="type">void</span> TestDerived::<span class="name">virtualFun</span>()</h3> +<p>Reimplements: <a href="testqdoc-test.html#virtualFun" translate="no">Test::virtualFun</a>().</p> <!-- @@@virtualFun --> </div> </body> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc.html b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc.html index a259e40af..0a7fa08d3 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/testqdoc.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/testqdoc.html @@ -17,24 +17,24 @@ </ul> </div> <div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">TestQDoc Namespace</h1> +<h1 class="title" translate="no">TestQDoc Namespace</h1> <!-- $$$TestQDoc-brief --> <p>A namespace. <a href="#details">More...</a></p> <!-- @@@TestQDoc --> -<div class="table"><table class="alignedsummary"> +<div class="table"><table class="alignedsummary" translate="no"> <tr><td class="memItemLeft rightAlign topAlign"> Header:</td><td class="memItemRight bottomAlign"> <span class="preprocessor">#include <TestCPP></span> </td></tr><tr><td class="memItemLeft rightAlign topAlign"> qmake:</td><td class="memItemRight bottomAlign"> QT += testcpp</td></tr></table></div><ul> </ul> <a name="classes"></a> <h2 id="classes">Classes</h2> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft rightAlign topAlign"> class </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html">Test</a></b></td></tr> -<tr><td class="memItemLeft rightAlign topAlign"> class </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-testderived.html">TestDerived</a></b></td></tr> +<div class="table"><table class="alignedsummary" translate="no"> +<tr><td class="memItemLeft rightAlign topAlign"> class </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-test.html" translate="no">Test</a></b></td></tr> +<tr><td class="memItemLeft rightAlign topAlign"> class </td><td class="memItemRight bottomAlign"><b><a href="testqdoc-testderived.html" translate="no">TestDerived</a></b></td></tr> </table></div> <a name="macros"></a> <h2 id="macros">Macros</h2> -<div class="table"><table class="alignedsummary"> -<tr><td class="memItemLeft rightAlign topAlign"> </td><td class="memItemRight bottomAlign"><b><a href="testqdoc.html#QDOCTEST_MACRO">QDOCTEST_MACRO</a></b></td></tr> +<div class="table"><table class="alignedsummary" translate="no"> +<tr><td class="memItemLeft rightAlign topAlign"> </td><td class="memItemRight bottomAlign"><b><a href="testqdoc.html#QDOCTEST_MACRO" translate="no">QDOCTEST_MACRO</a></b></td></tr> </table></div> <a name="details"></a> <!-- $$$TestQDoc-description --> @@ -57,7 +57,7 @@ <div class="macros"> <h2>Macro Documentation</h2> <!-- $$$QDOCTEST_MACRO[overload1]$$$QDOCTEST_MACRO --> -<h3 class="fn" id="QDOCTEST_MACRO"><a name="QDOCTEST_MACRO"></a><span class="name">QDOCTEST_MACRO</span></h3> +<h3 class="fn" translate="no" id="QDOCTEST_MACRO"><a name="QDOCTEST_MACRO"></a><span class="name">QDOCTEST_MACRO</span></h3> <!-- @@@QDOCTEST_MACRO --> </div> </body> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/third.html b/tests/auto/qdoc/generatedoutput/expected_output/third.html index ee69a1689..85bce8505 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/third.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/third.html @@ -15,8 +15,8 @@ </ul> </div> <div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">Third Class</h1> -<div class="table"><table class="alignedsummary"> +<h1 class="title" translate="no">Third Class</h1> +<div class="table"><table class="alignedsummary" translate="no"> <tr><td class="memItemLeft rightAlign topAlign"> Header:</td><td class="memItemRight bottomAlign"> <span class="preprocessor">#include <Third></span> </td></tr></table></div><ul> </ul> diff --git a/tests/auto/qdoc/generatedoutput/expected_output/uicomponents-qmlmodule.html b/tests/auto/qdoc/generatedoutput/expected_output/uicomponents-qmlmodule.html index baba2c57a..9123cb1a7 100644 --- a/tests/auto/qdoc/generatedoutput/expected_output/uicomponents-qmlmodule.html +++ b/tests/auto/qdoc/generatedoutput/expected_output/uicomponents-qmlmodule.html @@ -7,18 +7,18 @@ </head> <body> <div class="sidebar"><div class="sidebar-content" id="sidebar-content"></div></div> -<h1 class="title">UI Components</h1> -<span class="subtitle"></span> +<h1 class="title" translate="no">UI Components</h1> +<span class="subtitle" translate="no"></span> <!-- $$$UIComponents-description --> <div class="descr"> <a name="details"></a> <p>This is a listing of a list of UI components implemented by QML types. These files are available for general import and they are based on the Qt Quick Code Samples.</p> -<p>This module is part of the <a href="test-componentset-example.html">UIComponents</a> example.</p> +<p>This module is part of the <a href="test-componentset-example.html" translate="no">UIComponents</a> example.</p> </div> <!-- @@@UIComponents --> <div class="table"><table class="annotated"> -<tr class="odd topAlign"><td class="tblName"><p><a href="qml-uicomponents-progressbar.html">ProgressBar</a></p></td><td class="tblDescr"><p>A component that shows the progress of an event</p></td></tr> -<tr class="even topAlign"><td class="tblName"><p><a href="qml-uicomponents-switch.html">Switch</a></p></td><td class="tblDescr"><p>A component that can be turned on or off</p></td></tr> -<tr class="odd topAlign"><td class="tblName"><p><a href="qml-uicomponents-tabwidget.html">TabWidget</a></p></td><td class="tblDescr"><p>A widget that places its children as tabs</p></td></tr> +<tr class="odd topAlign"><td class="tblName" translate="no"><p><a href="qml-uicomponents-progressbar.html">ProgressBar</a></p></td><td class="tblDescr"><p>A component that shows the progress of an event</p></td></tr> +<tr class="even topAlign"><td class="tblName" translate="no"><p><a href="qml-uicomponents-switch.html">Switch</a></p></td><td class="tblDescr"><p>A component that can be turned on or off</p></td></tr> +<tr class="odd topAlign"><td class="tblName" translate="no"><p><a href="qml-uicomponents-tabwidget.html">TabWidget</a></p></td><td class="tblDescr"><p>A widget that places its children as tabs</p></td></tr> </table></div> </body> </html> |