From 8b280f7b97fa08bcb03a872678cbb4a9cae1166c Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Wed, 8 Jan 2020 16:28:21 +0100
Subject: Update internal assistant documentation

Fixes: QTBUG-65810
Change-Id: I02fa147bed30342f12f26f6ba0169ef6d9f98e79
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
---
 src/assistant/assistant/assistant.qch | Bin 546816 -> 208896 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/src/assistant/assistant/assistant.qch b/src/assistant/assistant/assistant.qch
index fded08e62..b58b7ecca 100644
Binary files a/src/assistant/assistant/assistant.qch and b/src/assistant/assistant/assistant.qch differ
-- 
cgit v1.2.3


From e3507ac277fcb8da41ae21138b6c0f233d17ee38 Mon Sep 17 00:00:00 2001
From: Levon Sargsyan <levon.sargsyan@qt.io>
Date: Fri, 10 Jan 2020 17:22:18 +0100
Subject: Remove identical code under if for different branches
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I953f30dc04f4bc95fccb135b79f806d6a354ed70
Coverity-Id: 226101
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
---
 src/qdoc/htmlgenerator.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

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;
-- 
cgit v1.2.3