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/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>
--- 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"