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/cmakeprojectmanager/cmakeautocompleter.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeautocompleter.cpp
@@ -25,6 +25,7 @@

 #include "cmakeautocompleter.h"

+#include <QRegExp>
 #include <QTextCursor>
 #include <QTextBlock>
 #include <QDebug>
--- a/src/plugins/cmakeprojectmanager/cmakebuildstep.h
+++ b/src/plugins/cmakeprojectmanager/cmakebuildstep.h
@@ -27,6 +27,8 @@

 #include <projectexplorer/abstractprocessstep.h>

+#include <QRegExp>
+
 QT_BEGIN_NAMESPACE
 class QLineEdit;
 class QListWidget;
--- a/src/plugins/cmakeprojectmanager/cmakeparser.h
+++ b/src/plugins/cmakeprojectmanager/cmakeparser.h
@@ -30,6 +30,7 @@
 #include <projectexplorer/ioutputparser.h>
 #include <projectexplorer/task.h>

+#include <QRegExp>
 #include <QRegularExpression>

 namespace CMakeProjectManager {