diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-01-22 14:30:58 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-01-22 14:30:58 +0000 |
| commit | 60d27c228e6e17ed782ca0a4202768ffe2e46740 (patch) | |
| tree | d45f7c354f5914e6eb23f11fe3966466fa4818c3 /src/plugins | |
| parent | ccaa12c225062e0ef654bee9a96cbe5e5f9724ae (diff) | |
| parent | f286db98ee41a8aa71b9a65a235b6d3e265d79f4 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/dev
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.h b/src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.h index aea03d2257..6e6bf8ff68 100644 --- a/src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.h +++ b/src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.h @@ -46,6 +46,9 @@ #include <QtCore/QJsonObject> #include <QtCore/QJsonArray> +#include <QtCore/QJsonObject> +#include <QtCore/QJsonArray> + QT_BEGIN_NAMESPACE class QV4Debugger; |