From 87429a2609b822d2b08ec17fb2a20464a5043c9e Mon Sep 17 00:00:00 2001
From: ppescher <p.messina@robotechsrl.com>
Date: Wed, 25 Mar 2015 18:33:53 +0100
Subject: fix enum brief description in RTF output

bug: brief description of enum member is put at the beginning of the
next list item, instead of at the end of the current list item
---
 src/memberlist.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/memberlist.cpp b/src/memberlist.cpp
index fae285f..64fe44a 100644
--- a/src/memberlist.cpp
+++ b/src/memberlist.cpp
@@ -409,7 +409,6 @@ void MemberList::writePlainDeclarations(OutputList &ol,
               {
                 ol.endDoxyAnchor(md->getOutputFileBase(),md->anchor());
               }
-              ol.endMemberItem();
               if (!md->briefDescription().isEmpty() && Config_getBool("BRIEF_MEMBER_DESC"))
               {
                 DocRoot *rootNode = validatingParseDoc(
@@ -437,6 +436,7 @@ void MemberList::writePlainDeclarations(OutputList &ol,
                 delete rootNode;
               }
               ol.endMemberDeclaration(md->anchor(),inheritId);
+              ol.endMemberItem();
             }
             md->warnIfUndocumented();
             break;
-- 
cgit v0.12


From 700a9ac3c177fdef25b9b00ed6bb5e0ea963d236 Mon Sep 17 00:00:00 2001
From: ppescher <p.messina@robotechsrl.com>
Date: Fri, 27 Mar 2015 12:57:39 +0100
Subject: fix for CHM TOC "Classes" entry to point to annotated file

bug: when layout file disables Class List but Classes are still visible
the related TOC entry of Compiled HTML Help file does not link to any
page, so the annotated.html file is not reachable from the TOC tree even
though it still gets generated
---
 src/index.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/index.cpp b/src/index.cpp
index 2cb7de2..e7ba8e7 100644
--- a/src/index.cpp
+++ b/src/index.cpp
@@ -4140,7 +4140,7 @@ static void writeIndexHierarchyEntries(OutputList &ol,const QList<LayoutNavEntry
         case LayoutNavEntry::Classes: 
           if (annotatedClasses>0 && addToIndex)
           {
-            Doxygen::indexList->addContentsItem(TRUE,lne->title(),0,0,0); 
+            Doxygen::indexList->addContentsItem(TRUE,lne->title(),0,"annotated",0); 
             Doxygen::indexList->incContentsDepth();
             needsClosing=TRUE;
           }
-- 
cgit v0.12


From 4438e24b478de1fd97ccc81a3a9f7651124e1c63 Mon Sep 17 00:00:00 2001
From: ppescher <p.messina@robotechsrl.com>
Date: Fri, 27 Mar 2015 13:00:00 +0100
Subject: added HHC.exe own output to the debug output when extcmd flag enabled

this may help debugging the source of the error
---
 src/doxygen.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index 17ec15d..09e92a4 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -11672,7 +11672,7 @@ void generateOutput()
     QString oldDir = QDir::currentDirPath();
     QDir::setCurrent(Config_getString("HTML_OUTPUT"));
     portable_sysTimerStart();
-    if (portable_system(Config_getString("HHC_LOCATION"), "index.hhp", FALSE))
+	if (portable_system(Config_getString("HHC_LOCATION"), "index.hhp", Debug::isFlagSet(Debug::ExtCmd)))
     {
       err("failed to run html help compiler on index.hhp\n");
     }
-- 
cgit v0.12