diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-01-22 15:20:47 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2016-01-22 15:21:06 +0100 |
| commit | f286db98ee41a8aa71b9a65a235b6d3e265d79f4 (patch) | |
| tree | 16e17d4c52d35f7e55fc2103db5c96850e9bdfff /src/plugins | |
| parent | ce093497f2d4164fa8abc06cf976f9e36798e11e (diff) | |
| parent | b60a5dc9405ce89d7a742abc81b906d5c8cf5f7d (diff) | |
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: I4af0bf8ec1569097d97f8ce0bb8bf1a0e4a989ec
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; |