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

Change-Id: I4931dcc81be872d7712e67123e94d15ee696459f

src/plugins/qmlprojectmanager/fileformat/filefilteritems.cpp

@@ -32,6 +32,7 @@
 #include <QDebug>
 #include <QDir>
 #include <QImageReader>
+#include <QRegExp>
 
 namespace QmlProjectManager {
 

src/plugins/qmlprojectmanager/fileformat/filefilteritems.h

@@ -28,6 +28,7 @@
 #include "qmlprojectitem.h"
 
 #include <QObject>
+#include <QRegExp>
 #include <QSet>
 #include <QTimer>
 

src/plugins/qmlprojectmanager/qmlproject.cpp

@@ -48,6 +48,7 @@
 #include <utils/algorithm.h>
 
 #include <QDebug>
+#include <QRegExp>
 
 using namespace Core;
 using namespace ProjectExplorer;