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

src/libs/qmljs/qmljscheck.cpp

@@ -33,6 +33,7 @@
 
 #include <QColor>
 #include <QDir>
+#include <QRegExp>
 
 using namespace QmlJS;
 using namespace QmlJS::AST;

src/libs/qmljs/qmljsdocument.cpp

@@ -35,6 +35,7 @@
 #include <QCryptographicHash>
 #include <QDir>
 #include <QFileInfo>
+#include <QRegExp>
 
 #include <algorithm>
 

src/libs/qmljs/qmljsfindexportedcpptypes.cpp

@@ -34,6 +34,7 @@
 #include <utils/qtcassert.h>
 
 #include <QList>
+#include <QRegExp>
 
 //using namespace QmlJS;
 

src/libs/qmljs/qmljsscopechain.cpp

@@ -29,6 +29,8 @@
 #include "qmljsmodelmanagerinterface.h"
 #include "parser/qmljsengine_p.h"
 
+#include <QRegExp>
+
 using namespace QmlJS;
 
 /*!