diff options
author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-11-10 22:42:50 +0200 |
---|---|---|
committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2022-11-10 22:42:50 +0200 |
commit | 6914f7c8039e5d9aab9446a6d0d882caf9f61025 (patch) | |
tree | 003e742f177c319bfefab970d93e0093eab1d190 | |
parent | 7a197fadc9af18a446a5de8f026b298ce343e923 (diff) | |
parent | df21d25a156d6686a220dad34a372a061edbe783 (diff) |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.8' into tqtc/lts-5.15-opensourcev5.15.8-lts-lgpl
Change-Id: I49622bd49ad2570121543819ad4d8d1e249dcbcd
-rw-r--r-- | .qmake.conf | 2 | ||||
-rw-r--r-- | src/macdeployqt/shared/shared.cpp | 2 | ||||
-rw-r--r-- | src/qdoc/atom.cpp | 2 | ||||
-rw-r--r-- | src/qdoc/atom.h | 2 | ||||
-rw-r--r-- | src/qdoc/doc.cpp | 6 | ||||
-rw-r--r-- | src/qdoc/docbookgenerator.cpp | 10 | ||||
-rw-r--r-- | src/qdoc/htmlgenerator.cpp | 25 | ||||
-rw-r--r-- | src/qdoc/webxmlgenerator.cpp | 13 |
8 files changed, 36 insertions, 26 deletions
diff --git a/.qmake.conf b/.qmake.conf index 03db297ab..560f538fb 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.7 +MODULE_VERSION = 5.15.8 diff --git a/src/macdeployqt/shared/shared.cpp b/src/macdeployqt/shared/shared.cpp index a81a2f0d9..a29b3be6e 100644 --- a/src/macdeployqt/shared/shared.cpp +++ b/src/macdeployqt/shared/shared.cpp @@ -1289,7 +1289,7 @@ bool deployQmlImports(const QString &appBundlePath, DeploymentInfo deploymentInf LogError() << "Could not start qmlimpoortscanner. Process error is" << qmlImportScanner.errorString(); return false; } - qmlImportScanner.waitForFinished(); + qmlImportScanner.waitForFinished(-1); // log qmlimportscanner errors qmlImportScanner.setReadChannel(QProcess::StandardError); diff --git a/src/qdoc/atom.cpp b/src/qdoc/atom.cpp index f4920f43e..9f0761ad4 100644 --- a/src/qdoc/atom.cpp +++ b/src/qdoc/atom.cpp @@ -234,6 +234,8 @@ static const struct { "TableOfContents", Atom::TableOfContents }, { "Target", Atom::Target }, { "UnhandledFormat", Atom::UnhandledFormat }, + { "WarningLeft", Atom::WarningLeft }, + { "WarningRight", Atom::WarningRight }, { "UnknownCommand", Atom::UnknownCommand }, { nullptr, 0 } }; diff --git a/src/qdoc/atom.h b/src/qdoc/atom.h index 6b37618e8..064e712b4 100644 --- a/src/qdoc/atom.h +++ b/src/qdoc/atom.h @@ -128,6 +128,8 @@ public: TableOfContents, Target, UnhandledFormat, + WarningLeft, + WarningRight, UnknownCommand, Last = UnknownCommand }; diff --git a/src/qdoc/doc.cpp b/src/qdoc/doc.cpp index 23d5205ff..284bb0d16 100644 --- a/src/qdoc/doc.cpp +++ b/src/qdoc/doc.cpp @@ -1297,11 +1297,7 @@ void DocParser::parse(const QString &source, DocPrivate *docPrivate, break; case CMD_WARNING: leavePara(); - enterPara(); - append(Atom::FormattingLeft, ATOM_FORMATTING_BOLD); - append(Atom::String, "Warning:"); - append(Atom::FormattingRight, ATOM_FORMATTING_BOLD); - append(Atom::String, " "); + enterPara(Atom::WarningLeft, Atom::WarningRight); break; case CMD_OVERLOAD: priv->metacommandsUsed.insert(cmdStr); diff --git a/src/qdoc/docbookgenerator.cpp b/src/qdoc/docbookgenerator.cpp index b5acf4d7b..c835e1842 100644 --- a/src/qdoc/docbookgenerator.cpp +++ b/src/qdoc/docbookgenerator.cpp @@ -478,14 +478,18 @@ int DocBookGenerator::generateAtom(const Atom *atom, const Node *relative, CodeM case Atom::ImageText: break; case Atom::ImportantLeft: - case Atom::NoteLeft: { - QString tag = atom->type() == Atom::ImportantLeft ? "important" : "note"; - writer->writeStartElement(dbNamespace, tag); + case Atom::NoteLeft: + case Atom::WarningLeft: { + QString admonType = atom->typeString().toLower(); + // Remove 'Left' to get the admonition type + admonType.chop(4); + writer->writeStartElement(dbNamespace, admonType); newLine(); writer->writeStartElement(dbNamespace, "para"); } break; case Atom::ImportantRight: case Atom::NoteRight: + case Atom::WarningRight: writer->writeEndElement(); // para newLine(); writer->writeEndElement(); // note/important diff --git a/src/qdoc/htmlgenerator.cpp b/src/qdoc/htmlgenerator.cpp index d78877ea6..16abb2265 100644 --- a/src/qdoc/htmlgenerator.cpp +++ b/src/qdoc/htmlgenerator.cpp @@ -800,23 +800,24 @@ int HtmlGenerator::generateAtom(const Atom *atom, const Node *relative, CodeMark } break; case Atom::ImageText: break; + // Admonitions case Atom::ImportantLeft: - out() << "<p>"; - out() << formattingLeftMap()[ATOM_FORMATTING_BOLD]; - out() << "Important: "; - out() << formattingRightMap()[ATOM_FORMATTING_BOLD]; - break; - case Atom::ImportantRight: - out() << "</p>"; - break; case Atom::NoteLeft: - out() << "<p>"; + case Atom::WarningLeft: { + QString admonType = atom->typeString(); + // Remove 'Left' from atom type to get the admonition type + admonType.chop(4); + out() << "<div class=\"admonition " << admonType.toLower() << "\">\n" + << "<p>"; out() << formattingLeftMap()[ATOM_FORMATTING_BOLD]; - out() << "Note: "; + out() << admonType << ": "; out() << formattingRightMap()[ATOM_FORMATTING_BOLD]; - break; + } break; + case Atom::ImportantRight: case Atom::NoteRight: - out() << "</p>\n"; + case Atom::WarningRight: + out() << "</p>\n" + << "</div>\n"; break; case Atom::LegaleseLeft: out() << "<div class=\"LegaleseLeft\">"; diff --git a/src/qdoc/webxmlgenerator.cpp b/src/qdoc/webxmlgenerator.cpp index 59e83b1b0..8788791e3 100644 --- a/src/qdoc/webxmlgenerator.cpp +++ b/src/qdoc/webxmlgenerator.cpp @@ -523,10 +523,6 @@ const Atom *WebXMLGenerator::addAtomElements(QXmlStreamWriter &writer, const Ato writer.writeCharacters(" "); break; - case Atom::ImportantRight: - writer.writeEndElement(); // para - break; - case Atom::LegaleseLeft: writer.writeStartElement("legalese"); break; @@ -603,7 +599,10 @@ const Atom *WebXMLGenerator::addAtomElements(QXmlStreamWriter &writer, const Ato writer.writeCharacters(" "); break; + // End admonition elements + case Atom::ImportantRight: case Atom::NoteRight: + case Atom::WarningRight: writer.writeEndElement(); // para break; @@ -728,6 +727,12 @@ const Atom *WebXMLGenerator::addAtomElements(QXmlStreamWriter &writer, const Ato writer.writeEndElement(); break; + case Atom::WarningLeft: + writer.writeStartElement("para"); + writer.writeTextElement("bold", "Warning:"); + writer.writeCharacters(" "); + break; + case Atom::UnhandledFormat: case Atom::UnknownCommand: writer.writeCharacters(atom->typeString()); |