Merge remote-tracking branch 'origin/4.2' into 4.3

Change-Id: I4931dcc81be872d7712e67123e94d15ee696459f
2017-03-14 16:20:14 +02:00
parent 2e54c89738 4033471aa9
commit da7cb91446
57 changed files with 67 additions and 4 deletions
--- a/src/plugins/cpptools/cppcurrentdocumentfilter.cpp
+++ b/src/plugins/cpptools/cppcurrentdocumentfilter.cpp
@@ -31,6 +31,7 @@
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/editormanager/ieditor.h>

+#include <QRegExp>
 #include <QStringMatcher>

 using namespace CppTools::Internal;
--- a/src/plugins/cpptools/cpplocatorfilter.cpp
+++ b/src/plugins/cpptools/cpplocatorfilter.cpp
@@ -28,6 +28,7 @@

 #include <coreplugin/editormanager/editormanager.h>

+#include <QRegExp>
 #include <QStringMatcher>

 #include <algorithm>