Merge remote-tracking branch 'origin/4.2'

Change-Id: I957c22020fbacb2f631220b0cdc7fa16a782798b
2016-11-21 10:25:45 +02:00
parent 6a061b2a35 97c9213358
commit 6d1d1a4416
36 changed files with 488 additions and 308 deletions
--- a/src/plugins/cpptools/baseeditordocumentprocessor.h
+++ b/src/plugins/cpptools/baseeditordocumentprocessor.h
@@ -30,6 +30,7 @@
 #include "cpptools_global.h"

 #include <texteditor/codeassist/assistinterface.h>
+#include <texteditor/quickfix.h>
 #include <texteditor/texteditor.h>
 #include <texteditor/textdocument.h>

@@ -41,7 +42,6 @@

 namespace TextEditor {
 class TextDocument;
-class QuickFixOperations;
 }

 namespace CppTools {