diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-08-24 21:13:41 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-08-24 21:14:07 +0200 |
| commit | 922ca8c3a839ccbf3407bfe7e449bfceec5ecd23 (patch) | |
| tree | f18c3702e1692c17ebe710530aba931c8a4554f6 /tools/qmlprofiler | |
| parent | 9c9fca5e27bd91da1ea07bebd7569049493c5ccf (diff) | |
| parent | 9dd496c069154ac655be9b85b72a6eb409bfa223 (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: Ic5aad89b014527d3dfd7ad9b1837e3c3065c5f4c
Diffstat (limited to 'tools/qmlprofiler')
| -rw-r--r-- | tools/qmlprofiler/qmlprofilerclient.cpp | 2 | ||||
| -rw-r--r-- | tools/qmlprofiler/qmlprofilerdata.cpp | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/tools/qmlprofiler/qmlprofilerclient.cpp b/tools/qmlprofiler/qmlprofilerclient.cpp index 4bebd74579..72e11eadec 100644 --- a/tools/qmlprofiler/qmlprofilerclient.cpp +++ b/tools/qmlprofiler/qmlprofilerclient.cpp @@ -37,6 +37,8 @@ #include <QtCore/QStringList> #include <QtCore/QDataStream> +#include <limits> + ProfilerClient::ProfilerClient(const QString &clientName, QQmlDebugConnection *client) : QQmlDebugClient(clientName, client), diff --git a/tools/qmlprofiler/qmlprofilerdata.cpp b/tools/qmlprofiler/qmlprofilerdata.cpp index 5d49dc6708..ac7b51159f 100644 --- a/tools/qmlprofiler/qmlprofilerdata.cpp +++ b/tools/qmlprofiler/qmlprofilerdata.cpp @@ -39,6 +39,8 @@ #include <QFile> #include <QXmlStreamReader> +#include <limits> + const char PROFILER_FILE_VERSION[] = "1.02"; static const char *RANGE_TYPE_STRINGS[] = { |