diff options
| author | Kari Oikarinen <kari.oikarinen@qt.io> | 2020-01-15 19:08:52 +0200 |
|---|---|---|
| committer | Kari Oikarinen <kari.oikarinen@qt.io> | 2020-01-15 19:08:52 +0200 |
| commit | a3430755811a998fbd49baae4b3782aebe3583c9 (patch) | |
| tree | d256d396a2bdb8ad62035e2cd3ab4653ae4e5d49 | |
| parent | f9db2b99b2de6ba1442c7acc0888cc2129b8b903 (diff) | |
| parent | e3507ac277fcb8da41ae21138b6c0f233d17ee38 (diff) | |
| download | qttools-a3430755811a998fbd49baae4b3782aebe3583c9.tar.gz | |
Merge 5.14 into 5.14.1
Change-Id: I56056dc6f61fd14277051be027e55e6365c4c2ac
| -rw-r--r-- | src/assistant/assistant/assistant.qch | bin | 546816 -> 208896 bytes | |||
| -rw-r--r-- | src/qdoc/htmlgenerator.cpp | 6 |
2 files changed, 1 insertions, 5 deletions
diff --git a/src/assistant/assistant/assistant.qch b/src/assistant/assistant/assistant.qch Binary files differindex fded08e62..b58b7ecca 100644 --- a/src/assistant/assistant/assistant.qch +++ b/src/assistant/assistant/assistant.qch diff --git a/src/qdoc/htmlgenerator.cpp b/src/qdoc/htmlgenerator.cpp index b7dc227ca..9f29d099c 100644 --- a/src/qdoc/htmlgenerator.cpp +++ b/src/qdoc/htmlgenerator.cpp @@ -1110,11 +1110,7 @@ int HtmlGenerator::generateAtom(const Atom *atom, const Node *relative, CodeMark } } } - if (inTableHeader_) - out() << '>'; - else { - out() << '>'; - } + out() << '>'; if (matchAhead(atom, Atom::ParaLeft)) skipAhead = 1; } break; |