diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2014-09-29 13:40:53 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2014-09-29 13:40:53 +0200 |
| commit | d008779bf779ba2d6eaae9248a49486e5ae428eb (patch) | |
| tree | 61221545f33aa7b4474fc5dfddc3a87075e0285b /share | |
| parent | b2487e1683b82eef7f3d62297af843b4b5babc8b (diff) | |
| parent | 6bf9a19276a65882f846455d282d157893b6ef48 (diff) | |
| download | qt-creator-d008779bf779ba2d6eaae9248a49486e5ae428eb.tar.gz | |
Merge remote-tracking branch 'origin/3.2'
Conflicts:
src/plugins/projectexplorer/projectexplorer.cpp
Change-Id: I6dffc1925e6bf35cf6e9fe0676c11d1a5143a208
Diffstat (limited to 'share')
| -rw-r--r-- | share/qtcreator/qml/qmlpuppet/container/addimportcontainer.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/container/addimportcontainer.cpp b/share/qtcreator/qml/qmlpuppet/container/addimportcontainer.cpp index 9c08c81029..43047f383a 100644 --- a/share/qtcreator/qml/qmlpuppet/container/addimportcontainer.cpp +++ b/share/qtcreator/qml/qmlpuppet/container/addimportcontainer.cpp @@ -30,6 +30,7 @@ #include "addimportcontainer.h" #include <QDebug> +#include <QDataStream> namespace QmlDesigner { |