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/qnx | |
| 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/qnx')
| -rw-r--r-- | src/plugins/qnx/qnxversionnumber.cpp | 1 | ||||
| -rw-r--r-- | src/plugins/qnx/slog2inforunner.cpp | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/qnx/qnxversionnumber.cpp b/src/plugins/qnx/qnxversionnumber.cpp index b733e7ed1a..8a4188c3ef 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 35ee2a8494..7b5f0f38bf 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 { |