aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ApiExtractor/typesystem.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/ApiExtractor/typesystem.h b/ApiExtractor/typesystem.h
index ac0b40f45..b75da48ba 100644
--- a/ApiExtractor/typesystem.h
+++ b/ApiExtractor/typesystem.h
@@ -890,7 +890,13 @@ public:
}
void setInclude(const Include &inc)
{
- m_include = inc;
+ // This is a workaround for preventing double inclusion of the QSharedPointer implementation
+ // header, which does not use header guards. In the previous parser this was not a problem
+ // because the Q_QDOC define was set, and the implementation header was never included.
+ if (inc.name() == QLatin1String("qsharedpointer_impl.h"))
+ m_include = Include(inc.type(), QLatin1String("qsharedpointer.h"));
+ else
+ m_include = inc;
}
// Replace conversionRule arg to CodeSnip in future version