diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2015-02-26 19:40:22 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2015-02-26 19:40:22 (GMT) |
| commit | 8f74562b98af27288041a35b707a13a06a38ca23 (patch) | |
| tree | 78519288c825a847582137fc667bcf5920c655f2 /src/context.cpp | |
| parent | e11b48785323017bf1d81e91e8133d7f3ba1f243 (diff) | |
| parent | 5e5615a9d2da8b923565c1bcadc9db48efbc75d0 (diff) | |
| download | Doxygen-8f74562b98af27288041a35b707a13a06a38ca23.zip Doxygen-8f74562b98af27288041a35b707a13a06a38ca23.tar.gz Doxygen-8f74562b98af27288041a35b707a13a06a38ca23.tar.bz2 | |
Merge branch 'master' of github.com:doxygen/doxygen
Diffstat (limited to 'src/context.cpp')
| -rw-r--r-- | src/context.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/context.cpp b/src/context.cpp index d151a3b..f76c49b 100644 --- a/src/context.cpp +++ b/src/context.cpp @@ -4056,8 +4056,7 @@ class MemberContext::Private : public DefinitionContext<MemberContext::Private> TemplateVariant hasCallGraph() const { static bool haveDot = Config_getBool("HAVE_DOT"); - static bool callGraph = Config_getBool("CALL_GRAPH"); - if ((callGraph || m_memberDef->hasCallGraph()) && haveDot && + if (m_memberDef->hasCallGraph() && haveDot && (m_memberDef->isFunction() || m_memberDef->isSlot() || m_memberDef->isSignal())) { DotCallGraph *cg = getCallGraph(); @@ -4096,8 +4095,7 @@ class MemberContext::Private : public DefinitionContext<MemberContext::Private> TemplateVariant hasCallerGraph() const { static bool haveDot = Config_getBool("HAVE_DOT"); - static bool callerGraph = Config_getBool("CALLER_GRAPH"); - if ((callerGraph || m_memberDef->hasCallerGraph()) && haveDot && + if (m_memberDef->hasCallerGraph() && haveDot && (m_memberDef->isFunction() || m_memberDef->isSlot() || m_memberDef->isSignal())) { DotCallGraph *cg = getCallerGraph(); |