diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2017-03-14 16:20:14 +0200 |
|---|---|---|
| committer | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2017-03-14 16:20:14 +0200 |
| commit | da7cb914467e8816ebe4676ea070ebeeb385e9d2 (patch) | |
| tree | 402afce4807a2fc9fb9f55bce63416c01dccd50b /src/plugins/qmlprojectmanager/fileformat | |
| parent | 2e54c89738b23f5be6eebdea4d39a0a5663877b6 (diff) | |
| parent | 4033471aa91ac0cde52786c45c9e95b119197dfc (diff) | |
| download | qt-creator-da7cb914467e8816ebe4676ea070ebeeb385e9d2.tar.gz | |
Merge remote-tracking branch 'origin/4.2' into 4.3
Change-Id: I4931dcc81be872d7712e67123e94d15ee696459f
Diffstat (limited to 'src/plugins/qmlprojectmanager/fileformat')
| -rw-r--r-- | src/plugins/qmlprojectmanager/fileformat/filefilteritems.cpp | 1 | ||||
| -rw-r--r-- | src/plugins/qmlprojectmanager/fileformat/filefilteritems.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/qmlprojectmanager/fileformat/filefilteritems.cpp b/src/plugins/qmlprojectmanager/fileformat/filefilteritems.cpp index abdfe4141a..21863b48d3 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 aebf3093ba..3b44d8b06c 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> |