2 files changed, 14 insertions, 0 deletions
diff --git a/src/libs/cplusplus/pp-engine.cpp b/src/libs/cplusplus/pp-engine.cpp
index 134fb4d51c..6a414d8b0f 100644
--- a/src/libs/cplusplus/pp-engine.cpp
+++ b/src/libs/cplusplus/pp-engine.cpp
@@ -762,6 +762,11 @@ QByteArray Preprocessor::run(const QString &fileName,
     return preprocessed;
 }
 
+void Preprocessor::setCancelChecker(const Preprocessor::CancelChecker &cancelChecker)
+{
+    m_cancelChecker = cancelChecker;
+}
+
 bool Preprocessor::expandFunctionlikeMacros() const
 {
     return m_expandFunctionlikeMacros;
@@ -1636,6 +1641,9 @@ void Preprocessor::handlePreprocessorDirective(PPToken *tk)
 
 void Preprocessor::handleIncludeDirective(PPToken *tk, bool includeNext)
 {
+    if (m_cancelChecker && m_cancelChecker())
+        return;
+
     m_state.m_lexer->setScanAngleStringLiteralTokens(true);
     lex(tk); // consume "include" token
     m_state.m_lexer->setScanAngleStringLiteralTokens(false);
diff --git a/src/libs/cplusplus/pp-engine.h b/src/libs/cplusplus/pp-engine.h
index b265de6d46..19935b2c7d 100644
--- a/src/libs/cplusplus/pp-engine.h
+++ b/src/libs/cplusplus/pp-engine.h
@@ -56,6 +56,8 @@
 #include <QByteArray>
 #include <QPair>
 
+#include <functional>
+
 namespace CPlusPlus {
 
 class Environment;
@@ -81,6 +83,9 @@ public:
     QByteArray run(const QString &filename, const QByteArray &source,
                    bool noLines = false, bool markGeneratedTokens = true);
 
+    using CancelChecker = std::function<bool()>;
+    void setCancelChecker(const CancelChecker &cancelChecker);
+
     bool expandFunctionlikeMacros() const;
     void setExpandFunctionlikeMacros(bool expandFunctionlikeMacros);
 
@@ -253,6 +258,7 @@ private:
     Client *m_client;
     Environment *m_env;
     QByteArray m_scratchBuffer;
+    CancelChecker m_cancelChecker;
 
     bool m_expandFunctionlikeMacros;
     bool m_keepComments;