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

Change-Id: I4931dcc81be872d7712e67123e94d15ee696459f

46 files changed, 54 insertions, 3 deletions

diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp
index 29791c2ae6a..0b8762f24dc 100644
--- a/src/plugins/android/androidmanager.cpp
+++ b/src/plugins/android/androidmanager.cpp
@@ -56,6 +56,7 @@
 #include <QFileSystemWatcher>
 #include <QList>
 #include <QProcess>
+#include <QRegExp>
 #include <QMessageBox>
 #include <QApplication>
 #include <QDomDocument>
diff --git a/src/plugins/android/androidrunner.cpp b/src/plugins/android/androidrunner.cpp
index 593e44ef758..e7b95bc0767 100644
--- a/src/plugins/android/androidrunner.cpp
+++ b/src/plugins/android/androidrunner.cpp
@@ -47,6 +47,7 @@
 #include <memory>
 #include <QApplication>
 #include <QDir>
+#include <QRegExp>
 #include <QTime>
 #include <QTcpServer>
 #include <QTcpSocket>
diff --git a/src/plugins/android/androidtoolchain.cpp b/src/plugins/android/androidtoolchain.cpp
index 63cf260bdd3..0f8defe6d1b 100644
--- a/src/plugins/android/androidtoolchain.cpp
+++ b/src/plugins/android/androidtoolchain.cpp
@@ -45,6 +45,7 @@
 #include <QDirIterator>
 #include <QFormLayout>
 #include <QLabel>
+#include <QRegExp>
 #include <QVBoxLayout>
 
 namespace {
diff --git a/src/plugins/android/javaparser.h b/src/plugins/android/javaparser.h
index 642db44e236..f47075b4e28 100644
--- a/src/plugins/android/javaparser.h
+++ b/src/plugins/android/javaparser.h
@@ -28,6 +28,8 @@
 #include <projectexplorer/ioutputparser.h>
 #include <utils/fileutils.h>
 
+#include <QRegExp>
+
 namespace Android {
 namespace Internal {
 
diff --git a/src/plugins/autotest/gtest/gtestoutputreader.cpp b/src/plugins/autotest/gtest/gtestoutputreader.cpp
index 973f384c941..2eba52e7537 100644
--- a/src/plugins/autotest/gtest/gtestoutputreader.cpp
+++ b/src/plugins/autotest/gtest/gtestoutputreader.cpp
@@ -28,6 +28,7 @@
 
 #include <QDir>
 #include <QFileInfo>
+#include <QRegExp>
 
 namespace Autotest {
 namespace Internal {
diff --git a/src/plugins/bazaar/bazaarclient.cpp b/src/plugins/bazaar/bazaarclient.cpp
index b2bdac3288b..d8d13cd27a5 100644
--- a/src/plugins/bazaar/bazaarclient.cpp
+++ b/src/plugins/bazaar/bazaarclient.cpp
@@ -36,6 +36,7 @@
 
 #include <QDir>
 #include <QFileInfo>
+#include <QRegExp>
 #include <QTextStream>
 #include <QDebug>
 
diff --git a/src/plugins/clearcase/clearcasesync.cpp b/src/plugins/clearcase/clearcasesync.cpp
index cbbacba8109..8f8262ee7c5 100644
--- a/src/plugins/clearcase/clearcasesync.cpp
+++ b/src/plugins/clearcase/clearcasesync.cpp
@@ -29,6 +29,7 @@
 #include <QDir>
 #include <QFutureInterface>
 #include <QProcess>
+#include <QRegExp>
 #include <QStringList>
 #include <utils/qtcassert.h>
 
diff --git a/src/plugins/cmakeprojectmanager/cmakeautocompleter.cpp b/src/plugins/cmakeprojectmanager/cmakeautocompleter.cpp
index 2605830d0b5..8c2a0ba0a1d 100644
--- 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>
diff --git a/src/plugins/cmakeprojectmanager/cmakebuildstep.h b/src/plugins/cmakeprojectmanager/cmakebuildstep.h
index 1fb677e24cb..e7cec2c3b6d 100644
--- 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;
diff --git a/src/plugins/cmakeprojectmanager/cmakeparser.h b/src/plugins/cmakeprojectmanager/cmakeparser.h
index f8ea4464818..85a20d870d9 100644
--- 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 {
diff --git a/src/plugins/coreplugin/actionmanager/command.cpp b/src/plugins/coreplugin/actionmanager/command.cpp
index cdbbe200e3a..186ac4649f1 100644
--- a/src/plugins/coreplugin/actionmanager/command.cpp
+++ b/src/plugins/coreplugin/actionmanager/command.cpp
@@ -32,6 +32,7 @@
 #include <utils/hostosinfo.h>
 
 #include <QAction>
+#include <QRegExp>
 #include <QToolButton>
 #include <QTextStream>
 
diff --git a/src/plugins/coreplugin/find/basetextfind.cpp b/src/plugins/coreplugin/find/basetextfind.cpp
index 3786ad142c3..f0b3ad64c33 100644
--- a/src/plugins/coreplugin/find/basetextfind.cpp
+++ b/src/plugins/coreplugin/find/basetextfind.cpp
@@ -29,10 +29,9 @@
 #include <utils/filesearch.h>
 
 #include <QPointer>
-
-#include <QTextBlock>
 #include <QPlainTextEdit>
 #include <QRegularExpression>
+#include <QTextBlock>
 #include <QTextCursor>
 
 namespace Core {
diff --git a/src/plugins/coreplugin/locator/basefilefilter.cpp b/src/plugins/coreplugin/locator/basefilefilter.cpp
index 99dec707bd0..7562a76d766 100644
--- a/src/plugins/coreplugin/locator/basefilefilter.cpp
+++ b/src/plugins/coreplugin/locator/basefilefilter.cpp
@@ -30,6 +30,7 @@
 #include <utils/qtcassert.h>
 
 #include <QDir>
+#include <QRegExp>
 #include <QStringMatcher>
 #include <QTimer>
 
diff --git a/src/plugins/coreplugin/locator/opendocumentsfilter.cpp b/src/plugins/coreplugin/locator/opendocumentsfilter.cpp
index f4ed4b8b29b..73c3c2dc40a 100644
--- a/src/plugins/coreplugin/locator/opendocumentsfilter.cpp
+++ b/src/plugins/coreplugin/locator/opendocumentsfilter.cpp
@@ -32,6 +32,7 @@
 #include <QAbstractItemModel>
 #include <QFileInfo>
 #include <QMutexLocker>
+#include <QRegExp>
 
 using namespace Core;
 using namespace Core;
diff --git a/src/plugins/coreplugin/toolsettings.cpp b/src/plugins/coreplugin/toolsettings.cpp
index 764cbfab6f3..a892edbadc3 100644
--- a/src/plugins/coreplugin/toolsettings.cpp
+++ b/src/plugins/coreplugin/toolsettings.cpp
@@ -35,6 +35,7 @@
 #include <QCoreApplication>
 #include <QFileInfo>
 #include <QDir>
+#include <QRegExp>
 
 #include <QDebug>
 
diff --git a/src/plugins/cppeditor/cppfunctiondecldeflink.cpp b/src/plugins/cppeditor/cppfunctiondecldeflink.cpp
index ce41df99403..dcc842d0bc1 100644
--- a/src/plugins/cppeditor/cppfunctiondecldeflink.cpp
+++ b/src/plugins/cppeditor/cppfunctiondecldeflink.cpp
@@ -46,6 +46,7 @@
 #include <utils/runextensions.h>
 #include <utils/tooltip/tooltip.h>
 
+#include <QRegExp>
 #include <QVarLengthArray>
 
 using namespace CPlusPlus;
diff --git a/src/plugins/cpptools/cppcurrentdocumentfilter.cpp b/src/plugins/cpptools/cppcurrentdocumentfilter.cpp
index 588915348cb..964720e7a93 100644
--- 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;
diff --git a/src/plugins/cpptools/cpplocatorfilter.cpp b/src/plugins/cpptools/cpplocatorfilter.cpp
index 6c735582711..e18a1a4c57a 100644
--- 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>
diff --git a/src/plugins/diffeditor/differ.cpp b/src/plugins/diffeditor/differ.cpp
index c46277b22b6..a99b14a127b 100644
--- a/src/plugins/diffeditor/differ.cpp
+++ b/src/plugins/diffeditor/differ.cpp
@@ -34,6 +34,7 @@ publication by Neil Fraser: http://neil.fraser.name/writing/diff/
 #include "differ.h"
 
 #include <QList>
+#include <QRegExp>
 #include <QStringList>
 #include <QMap>
 #include <QPair>
diff --git a/src/plugins/diffeditor/diffutils.cpp b/src/plugins/diffeditor/diffutils.cpp
index d3a186e5c63..1a6a2b729dd 100644
--- a/src/plugins/diffeditor/diffutils.cpp
+++ b/src/plugins/diffeditor/diffutils.cpp
@@ -25,6 +25,7 @@
 
 #include "diffutils.h"
 #include "differ.h"
+#include <QRegExp>
 #include <QStringList>
 #include <QTextStream>
 #include "texteditor/fontsettings.h"
diff --git a/src/plugins/git/githighlighters.h b/src/plugins/git/githighlighters.h
index 166c6a7be8b..16325423bf4 100644
--- a/src/plugins/git/githighlighters.h
+++ b/src/plugins/git/githighlighters.h
@@ -27,6 +27,8 @@
 
 #include <texteditor/syntaxhighlighter.h>
 
+#include <QRegExp>
+
 namespace Git {
 namespace Internal {
 
diff --git a/src/plugins/help/searchwidget.cpp b/src/plugins/help/searchwidget.cpp
index 1288673a6ec..27e21a9ff88 100644
--- a/src/plugins/help/searchwidget.cpp
+++ b/src/plugins/help/searchwidget.cpp
@@ -45,6 +45,7 @@
 #include <QLayout>
 #include <QMap>
 #include <QMenu>
+#include <QRegExp>
 #include <QString>
 #include <QStringList>
 #include <QTextBrowser>
diff --git a/src/plugins/projectexplorer/abi.cpp b/src/plugins/projectexplorer/abi.cpp
index 7f4773fc7b8..28356e15838 100644
--- a/src/plugins/projectexplorer/abi.cpp
+++ b/src/plugins/projectexplorer/abi.cpp
@@ -30,6 +30,7 @@
 #include <QDebug>
 #include <QtEndian>
 #include <QFile>
+#include <QRegExp>
 #include <QString>
 #include <QStringList>
 #include <QSysInfo>
diff --git a/src/plugins/projectexplorer/gcctoolchain.cpp b/src/plugins/projectexplorer/gcctoolchain.cpp
index 9af71fa40af..ae4c9813d8e 100644
--- a/src/plugins/projectexplorer/gcctoolchain.cpp
+++ b/src/plugins/projectexplorer/gcctoolchain.cpp
@@ -455,6 +455,7 @@ ToolChain::PredefinedMacrosRunner GccToolChain::createPredefinedMacrosRunner() c
             } else if (a == "-m128bit-long-double" || a == "-m32" || a == "-m3dnow" || a == "-m3dnowa"
                        || a == "-m64" || a == "-m96bit-long-double" || a == "-mabm" || a == "-maes"
                        || a.startsWith("-march=") || a == "-mavx" || a.startsWith("-masm=")
+                       || a.startsWith("-mfloat-abi")
                        || a == "-mcx16" || a == "-mfma" || a == "-mfma4" || a == "-mlwp"
                        || a == "-mpclmul" || a == "-mpopcnt" || a == "-msse" || a == "-msse2"
                        || a == "-msse2avx" || a == "-msse3" || a == "-msse4" || a == "-msse4.1"
diff --git a/src/plugins/projectexplorer/settingsaccessor.cpp b/src/plugins/projectexplorer/settingsaccessor.cpp
index cb59459601d..4920da03b59 100644
--- a/src/plugins/projectexplorer/settingsaccessor.cpp
+++ b/src/plugins/projectexplorer/settingsaccessor.cpp
@@ -43,6 +43,7 @@
 
 #include <QApplication>
 #include <QDir>
+#include <QRegExp>
 
 using namespace Utils;
 
diff --git a/src/plugins/pythoneditor/pythoneditorplugin.cpp b/src/plugins/pythoneditor/pythoneditorplugin.cpp
index 2a7e4784564..08f2ffc95aa 100644
--- a/src/plugins/pythoneditor/pythoneditorplugin.cpp
+++ b/src/plugins/pythoneditor/pythoneditorplugin.cpp
@@ -59,6 +59,7 @@
 #include <QtPlugin>
 #include <QCoreApplication>
 #include <QFormLayout>
+#include <QRegExp>
 
 using namespace Core;
 using namespace ProjectExplorer;
diff --git a/src/plugins/qmakeprojectmanager/customwidgetwizard/plugingenerator.cpp b/src/plugins/qmakeprojectmanager/customwidgetwizard/plugingenerator.cpp
index 1355dffde7a..f43b4ca73e5 100644
--- a/src/plugins/qmakeprojectmanager/customwidgetwizard/plugingenerator.cpp
+++ b/src/plugins/qmakeprojectmanager/customwidgetwizard/plugingenerator.cpp
@@ -33,6 +33,7 @@
 
 #include <QFileInfo>
 #include <QDir>
+#include <QRegExp>
 #include <QSet>
 
 static QString headerGuard(const QString &header)
diff --git a/src/plugins/qmakeprojectmanager/makefileparse.cpp b/src/plugins/qmakeprojectmanager/makefileparse.cpp
index e0c2e4100c4..aea591e5abd 100644
--- a/src/plugins/qmakeprojectmanager/makefileparse.cpp
+++ b/src/plugins/qmakeprojectmanager/makefileparse.cpp
@@ -32,6 +32,7 @@
 #include <QDebug>
 #include <QDir>
 #include <QFileInfo>
+#include <QRegExp>
 #include <QTextStream>
 #include <QLoggingCategory>
 
diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp b/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
index 47587fe2ee7..b61ceb1d49a 100644
--- a/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
+++ b/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
@@ -29,6 +29,7 @@
 #include <rewritingexception.h>
 
 #include <QDebug>
+#include <QRegExp>
 #include <math.h>
 
 #include <nodemetainfo.h>
diff --git a/src/plugins/qmldesigner/designercore/model/abstractview.cpp b/src/plugins/qmldesigner/designercore/model/abstractview.cpp
index 3ab67786552..c6084a9c93d 100644
--- a/src/plugins/qmldesigner/designercore/model/abstractview.cpp
+++ b/src/plugins/qmldesigner/designercore/model/abstractview.cpp
@@ -34,6 +34,8 @@
 #include <coreplugin/helpmanager.h>
 #include <utils/qtcassert.h>
 
+#include <QRegExp>
+
 namespace QmlDesigner {
 
 
diff --git a/src/plugins/qmldesigner/designercore/model/modelnode.cpp b/src/plugins/qmldesigner/designercore/model/modelnode.cpp
index 4b5dba99bd8..5d58350f274 100644
--- a/src/plugins/qmldesigner/designercore/model/modelnode.cpp
+++ b/src/plugins/qmldesigner/designercore/model/modelnode.cpp
@@ -43,6 +43,7 @@
 #include <rewriterview.h>
 
 #include <QHash>
+#include <QRegExp>
 #include <QSet>
 #include <QTextStream>
 
diff --git a/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp b/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp
index 5d1ee0c31f2..ddc8cefe976 100644
--- a/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp
+++ b/src/plugins/qmldesigner/designercore/model/qmlobjectnode.cpp
@@ -39,6 +39,8 @@
 #include <qmldesignerplugin.h>
 #endif
 
+#include <QRegExp>
+
 namespace QmlDesigner {
 
 void QmlObjectNode::setVariantProperty(const PropertyName &name, const QVariant &value)
diff --git a/src/plugins/qmljstools/qmljsfunctionfilter.cpp b/src/plugins/qmljstools/qmljsfunctionfilter.cpp
index 88af53a0e50..d7c5979fd77 100644
--- a/src/plugins/qmljstools/qmljsfunctionfilter.cpp
+++ b/src/plugins/qmljstools/qmljsfunctionfilter.cpp
@@ -29,6 +29,7 @@
 #include <coreplugin/editormanager/editormanager.h>
 #include <utils/algorithm.h>
 
+#include <QRegExp>
 #include <QStringMatcher>
 
 using namespace QmlJSTools::Internal;
diff --git a/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp b/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp
index 2a766c95976..4edfad3ee45 100644
--- a/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp
@@ -37,6 +37,7 @@
 #include <QDebug>
 #include <QFile>
 #include <QMessageBox>
+#include <QRegExp>
 #include <QStack>
 
 #include <functional>
diff --git a/src/plugins/qmlprofiler/qmlprofilertraceview.cpp b/src/plugins/qmlprofiler/qmlprofilertraceview.cpp
index 8530994fe52..c8b9b3ec5f3 100644
--- a/src/plugins/qmlprofiler/qmlprofilertraceview.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilertraceview.cpp
@@ -67,6 +67,7 @@
 #include <QQuickItem>
 #include <QQuickWidget>
 #include <QApplication>
+#include <QRegExp>
 #include <QTextCursor>
 
 #include <math.h>
diff --git a/src/plugins/qmlprojectmanager/fileformat/filefilteritems.cpp b/src/plugins/qmlprojectmanager/fileformat/filefilteritems.cpp
index abdfe4141a0..21863b48d3a 100644
--- a/src/plugins/qmlprojectmanager/fileformat/filefilteritems.cpp
+++ b/src/plugins/qmlprojectmanager/fileformat/filefilteritems.cpp
@@ -32,6 +32,7 @@
 #include <QDebug>
 #include <QDir>
 #include <QImageReader>
+#include <QRegExp>
 
 namespace QmlProjectManager {
 
diff --git a/src/plugins/qmlprojectmanager/fileformat/filefilteritems.h b/src/plugins/qmlprojectmanager/fileformat/filefilteritems.h
index aebf3093ba7..3b44d8b06cb 100644
--- a/src/plugins/qmlprojectmanager/fileformat/filefilteritems.h
+++ b/src/plugins/qmlprojectmanager/fileformat/filefilteritems.h
@@ -28,6 +28,7 @@
 #include "qmlprojectitem.h"
 
 #include <QObject>
+#include <QRegExp>
 #include <QSet>
 #include <QTimer>
 
diff --git a/src/plugins/qmlprojectmanager/qmlproject.cpp b/src/plugins/qmlprojectmanager/qmlproject.cpp
index 22a69da34b0..587059f80fc 100644
--- a/src/plugins/qmlprojectmanager/qmlproject.cpp
+++ b/src/plugins/qmlprojectmanager/qmlproject.cpp
@@ -48,6 +48,7 @@
 #include <utils/algorithm.h>
 
 #include <QDebug>
+#include <QRegExp>
 
 using namespace Core;
 using namespace ProjectExplorer;
diff --git a/src/plugins/qnx/qnxversionnumber.cpp b/src/plugins/qnx/qnxversionnumber.cpp
index b733e7ed1ac..8a4188c3ef7 100644
--- a/src/plugins/qnx/qnxversionnumber.cpp
+++ b/src/plugins/qnx/qnxversionnumber.cpp
@@ -26,6 +26,7 @@
 #include "qnxversionnumber.h"
 
 #include <QDir>
+#include <QRegExp>
 
 namespace Qnx {
 namespace Internal {
diff --git a/src/plugins/qnx/slog2inforunner.cpp b/src/plugins/qnx/slog2inforunner.cpp
index 35ee2a84946..7b5f0f38bf4 100644
--- a/src/plugins/qnx/slog2inforunner.cpp
+++ b/src/plugins/qnx/slog2inforunner.cpp
@@ -30,6 +30,8 @@
 #include <projectexplorer/runnables.h>
 #include <utils/qtcassert.h>
 
+#include <QRegExp>
+
 using namespace ProjectExplorer;
 
 namespace Qnx {
diff --git a/src/plugins/qtsupport/qscxmlcgenerator.cpp b/src/plugins/qtsupport/qscxmlcgenerator.cpp
index 6920f2e0763..309113322a1 100644
--- a/src/plugins/qtsupport/qscxmlcgenerator.cpp
+++ b/src/plugins/qtsupport/qscxmlcgenerator.cpp
@@ -30,9 +30,9 @@
 #include <projectexplorer/target.h>
 #include <utils/qtcassert.h>
 
+#include <QDateTime>
 #include <QLoggingCategory>
 #include <QUuid>
-#include <QDateTime>
 
 using namespace ProjectExplorer;
 
diff --git a/src/plugins/qtsupport/qtkitinformation.cpp b/src/plugins/qtsupport/qtkitinformation.cpp
index b2b3de41107..93997c901e9 100644
--- a/src/plugins/qtsupport/qtkitinformation.cpp
+++ b/src/plugins/qtsupport/qtkitinformation.cpp
@@ -25,6 +25,8 @@
 
 #include "qtkitinformation.h"
 
+#include <QRegExp>
+
 #include "qtkitconfigwidget.h"
 #include "qtsupportconstants.h"
 #include "qtversionmanager.h"
diff --git a/src/plugins/qtsupport/qtparser.h b/src/plugins/qtsupport/qtparser.h
index 91b74a4aaa1..e4263b7b7e6 100644
--- a/src/plugins/qtsupport/qtparser.h
+++ b/src/plugins/qtsupport/qtparser.h
@@ -25,6 +25,8 @@
 
 #pragma once
 
+#include <QRegExp>
+
 #include "qtsupport_global.h"
 #include <projectexplorer/ioutputparser.h>
 
diff --git a/src/plugins/subversion/subversioneditor.cpp b/src/plugins/subversion/subversioneditor.cpp
index 09074723243..cb48da5daaf 100644
--- a/src/plugins/subversion/subversioneditor.cpp
+++ b/src/plugins/subversion/subversioneditor.cpp
@@ -34,6 +34,7 @@
 
 #include <QDebug>
 #include <QFileInfo>
+#include <QRegExp>
 #include <QTextCursor>
 #include <QTextBlock>
 
diff --git a/src/plugins/todo/todoitemsprovider.cpp b/src/plugins/todo/todoitemsprovider.cpp
index c8e89961100..d7a584179fe 100644
--- a/src/plugins/todo/todoitemsprovider.cpp
+++ b/src/plugins/todo/todoitemsprovider.cpp
@@ -39,6 +39,7 @@
 #include <projectexplorer/projecttree.h>
 #include <projectexplorer/session.h>
 
+#include <QRegExp>
 #include <QTimer>
 
 using namespace ProjectExplorer;
diff --git a/src/plugins/vcsbase/vcsoutputwindow.cpp b/src/plugins/vcsbase/vcsoutputwindow.cpp
index 51389bdbcc3..14a6f6bf635 100644
--- a/src/plugins/vcsbase/vcsoutputwindow.cpp
+++ b/src/plugins/vcsbase/vcsoutputwindow.cpp
@@ -45,6 +45,7 @@
 #include <QPointer>
 #include <QTextCodec>
 #include <QDir>
+#include <QRegExp>
 #include <QTextStream>
 #include <QTime>
 #include <QPoint>