summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri van Heesch <doxygen@gmail.com>2020-04-25 10:23:47 (GMT)
committerDimitri van Heesch <doxygen@gmail.com>2020-04-25 10:23:47 (GMT)
commit0965cca458849722eace1ae5cbe9b86fa628545b (patch)
tree9784b9f3c746e593a90776a8f4ba3c0b27effa4d
parent8274ebf0ac500d54f5760e0a85124e4a4219ab2e (diff)
parent991f64abb257d1a70077ed809cba6c6adca38042 (diff)
downloadDoxygen-0965cca458849722eace1ae5cbe9b86fa628545b.zip
Doxygen-0965cca458849722eace1ae5cbe9b86fa628545b.tar.gz
Doxygen-0965cca458849722eace1ae5cbe9b86fa628545b.tar.bz2
Merge branch 'feature/bug_tag_doxygen' of https://github.com/albert-github/doxygen into albert-github-feature/bug_tag_doxygen
-rw-r--r--src/doxygen.cpp7
-rw-r--r--src/tagreader.cpp2
2 files changed, 9 insertions, 0 deletions
diff --git a/src/doxygen.cpp b/src/doxygen.cpp
index 873f5dc..47b5cea 100644
--- a/src/doxygen.cpp
+++ b/src/doxygen.cpp
@@ -10364,6 +10364,13 @@ static void writeTagFile()
FTextStream tagFile(&tag);
tagFile << "<?xml version='1.0' encoding='UTF-8' standalone='yes' ?>" << endl;
tagFile << "<tagfile>" << endl;
+ tagFile << " <doxygen";
+ tagFile << " version=\"" << getDoxygenVersion() << "\"";
+ if (strlen(getGitVersion())>0)
+ {
+ tagFile << " gitid=\"" << getGitVersion() << "\"";
+ }
+ tagFile << "></doxygen>" << endl;
// for each file
for (const auto &fn : *Doxygen::inputNameLinkedMap)
diff --git a/src/tagreader.cpp b/src/tagreader.cpp
index 12010e8..6e3c6d4 100644
--- a/src/tagreader.cpp
+++ b/src/tagreader.cpp
@@ -860,6 +860,7 @@ class TagFileParser : public QXmlDefaultHandler
m_startElementHandlers.insert("tagfile", new StartElementHandler(this,&TagFileParser::startIgnoreElement));
m_startElementHandlers.insert("templarg", new StartElementHandler(this,&TagFileParser::startStringValue));
m_startElementHandlers.insert("type", new StartElementHandler(this,&TagFileParser::startStringValue));
+ m_startElementHandlers.insert("doxygen", new StartElementHandler(this,&TagFileParser::startIgnoreElement));
m_endElementHandlers.insert("compound", new EndElementHandler(this,&TagFileParser::endCompound));
m_endElementHandlers.insert("member", new EndElementHandler(this,&TagFileParser::endMember));
@@ -884,6 +885,7 @@ class TagFileParser : public QXmlDefaultHandler
m_endElementHandlers.insert("tagfile", new EndElementHandler(this,&TagFileParser::endIgnoreElement));
m_endElementHandlers.insert("templarg", new EndElementHandler(this,&TagFileParser::endTemplateArg));
m_endElementHandlers.insert("type", new EndElementHandler(this,&TagFileParser::endType));
+ m_endElementHandlers.insert("doxygen", new EndElementHandler(this,&TagFileParser::endIgnoreElement));
return TRUE;
}