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/qmlprofiler | |
| parent | 2e54c89738b23f5be6eebdea4d39a0a5663877b6 (diff) | |
| parent | 4033471aa91ac0cde52786c45c9e95b119197dfc (diff) | |
Merge remote-tracking branch 'origin/4.2' into 4.3
Change-Id: I4931dcc81be872d7712e67123e94d15ee696459f
Diffstat (limited to 'src/plugins/qmlprofiler')
| -rw-r--r-- | src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp | 1 | ||||
| -rw-r--r-- | src/plugins/qmlprofiler/qmlprofilertraceview.cpp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp b/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp index 2a766c9597..4edfad3ee4 100644 --- a/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp +++ b/src/plugins/qmlprofiler/qmlprofilermodelmanager.cpp @@ -37,6 +37,7 @@ #include <QDebug> #include <QFile> #include <QMessageBox> +#include <QRegExp> #include <QStack> #include <functional> diff --git a/src/plugins/qmlprofiler/qmlprofilertraceview.cpp b/src/plugins/qmlprofiler/qmlprofilertraceview.cpp index 8530994fe5..c8b9b3ec5f 100644 --- a/src/plugins/qmlprofiler/qmlprofilertraceview.cpp +++ b/src/plugins/qmlprofiler/qmlprofilertraceview.cpp @@ -67,6 +67,7 @@ #include <QQuickItem> #include <QQuickWidget> #include <QApplication> +#include <QRegExp> #include <QTextCursor> #include <math.h> |