diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2019-06-22 10:50:15 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <doxygen@gmail.com> | 2019-06-22 10:50:15 (GMT) |
| commit | 6b0238561f47da966d55305d9479af1e5cadf45c (patch) | |
| tree | d5fc7e39ef822d2c2ebb3546c2e1a7509365f7d7 /src/htmldocvisitor.cpp | |
| parent | f919067d59fb8c83194e6f73fbe1a4731b1eded6 (diff) | |
| parent | 8e19ed1c20261572d305503236a6d4299beee34a (diff) | |
| download | Doxygen-6b0238561f47da966d55305d9479af1e5cadf45c.zip Doxygen-6b0238561f47da966d55305d9479af1e5cadf45c.tar.gz Doxygen-6b0238561f47da966d55305d9479af1e5cadf45c.tar.bz2 | |
Merge branch 'master' of github.com:doxygen/doxygen
Diffstat (limited to 'src/htmldocvisitor.cpp')
| -rw-r--r-- | src/htmldocvisitor.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/htmldocvisitor.cpp b/src/htmldocvisitor.cpp index e7d9d57..29298a1 100644 --- a/src/htmldocvisitor.cpp +++ b/src/htmldocvisitor.cpp @@ -784,7 +784,9 @@ void HtmlDocVisitor::visit(DocIncOperator *op) pushEnabled(); m_hide=TRUE; } - SrcLangExt langExt = getLanguageFromFileName(m_langExt); + QCString locLangExt = getFileNameExtension(op->includeFileName()); + if (locLangExt.isEmpty()) locLangExt = m_langExt; + SrcLangExt langExt = getLanguageFromFileName(locLangExt); if (op->type()!=DocIncOperator::Skip) { popEnabled(); @@ -796,7 +798,7 @@ void HtmlDocVisitor::visit(DocIncOperator *op) QFileInfo cfi( op->includeFileName() ); fd = createFileDef( cfi.dirPath().utf8(), cfi.fileName().utf8() ); } - Doxygen::parserManager->getParser(m_langExt) + Doxygen::parserManager->getParser(locLangExt) ->parseCode( m_ci, op->context(), |