From 2b2ba298f3cfc17b74ddd476613377f0b325955b Mon Sep 17 00:00:00 2001 From: Nikolai Kosjar Date: Fri, 4 Mar 2016 12:43:06 +0100 Subject: CppEditor: Generate doxygen comments for functions with macros ...at least for object-like macros. This handles the common case where a macro before the function signature annotates the DLL import/export. Task-number: QTCREATORBUG-15819 Change-Id: I79f22508188019402fb7345222408aaf90106f20 Reviewed-by: Erik Verbruggen --- src/libs/cplusplus/FastPreprocessor.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/libs/cplusplus/FastPreprocessor.h') diff --git a/src/libs/cplusplus/FastPreprocessor.h b/src/libs/cplusplus/FastPreprocessor.h index 1f15f97b1a..04d7320115 100644 --- a/src/libs/cplusplus/FastPreprocessor.h +++ b/src/libs/cplusplus/FastPreprocessor.h @@ -51,7 +51,9 @@ class CPLUSPLUS_EXPORT FastPreprocessor: public Client public: FastPreprocessor(const Snapshot &snapshot); - QByteArray run(Document::Ptr newDoc, const QByteArray &source); + QByteArray run(Document::Ptr newDoc, + const QByteArray &source, + bool mergeDefinedMacrosOfDocument = false); // CPlusPlus::Client virtual void sourceNeeded(unsigned line, const QString &fileName, IncludeType mode, -- cgit v1.2.1