diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2017-07-12 10:50:49 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2017-07-12 10:50:49 +0200 |
| commit | 5a1a20f2eebd5ebb30f529adcdc7b0320dfb295d (patch) | |
| tree | b76c9650429fd17a6e08dd767ede974c05935f16 /share | |
| parent | cdca4bd9df0698417030f6e8e3b845a4eb3f271f (diff) | |
| parent | ada1429594b2dfb24c743f79656f393028d0e340 (diff) | |
| download | qt-creator-5a1a20f2eebd5ebb30f529adcdc7b0320dfb295d.tar.gz | |
Merge remote-tracking branch 'origin/4.3' into 4.4
Change-Id: Ifb1dcc847ba4b32a79b349955fad5207e402cb7b
Diffstat (limited to 'share')
| -rw-r--r-- | share/qtcreator/qml/qmlpuppet/qml2puppet/instances/layoutnodeinstance.cpp | 2 | ||||
| -rw-r--r-- | share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/layoutnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/layoutnodeinstance.cpp index e92b6a9a51..6a89d713ce 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/layoutnodeinstance.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/layoutnodeinstance.cpp @@ -25,6 +25,8 @@ #include "layoutnodeinstance.h" +#include <QCoreApplication> + namespace QmlDesigner { namespace Internal { diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp index 857a016a5e..102e3851d0 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp @@ -28,6 +28,7 @@ #include <enumeration.h> #include <qmlprivategate.h> +#include <QDebug> #include <QEvent> #include <QQmlContext> #include <QQmlError> |