diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2018-01-16 12:47:51 +0000 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-01-16 14:21:42 +0000 |
| commit | ce766374432309b85fdcfe8ef287dbb2ef11b337 (patch) | |
| tree | f82903a0c4d5519c6f2fb8e1a83758dc6e450705 /recipes-qt/qt5/qt5-creator/0003-Qmlpuppet-add-missing-includes.patch | |
| parent | 229f819b97e653399455e7b1d491de5ea49d5ba5 (diff) | |
| download | meta-qt5-ce766374432309b85fdcfe8ef287dbb2ef11b337.tar.gz | |
qt: refresh remaining patches and tags in meta-qt5 repos
* update tag name to match the patches in meta-qt5 repository
where the meta-qt5 .patch files are maintained, so that it's
more clear from where these changes are exported (with:
git format-patch --no-numbered --no-signature)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qt5-creator/0003-Qmlpuppet-add-missing-includes.patch')
| -rw-r--r-- | recipes-qt/qt5/qt5-creator/0003-Qmlpuppet-add-missing-includes.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qt5-creator/0003-Qmlpuppet-add-missing-includes.patch b/recipes-qt/qt5/qt5-creator/0003-Qmlpuppet-add-missing-includes.patch new file mode 100644 index 00000000..e64b6d9a --- /dev/null +++ b/recipes-qt/qt5/qt5-creator/0003-Qmlpuppet-add-missing-includes.patch | |||
| @@ -0,0 +1,38 @@ | |||
| 1 | From 896624d715e20e658344ac85db91cd55d25e7211 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Marco Benelli <marco.benelli@qt.io> | ||
| 3 | Date: Thu, 6 Jul 2017 09:31:41 +0200 | ||
| 4 | Subject: [PATCH] Qmlpuppet: add missing includes | ||
| 5 | |||
| 6 | Task-number: QTCREATORBUG-18498 | ||
| 7 | Change-Id: Ie40a066508bb52f53b8ad528f9d4cf6969fc0632 | ||
| 8 | Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> | ||
| 9 | --- | ||
| 10 | .../qtcreator/qml/qmlpuppet/qml2puppet/instances/layoutnodeinstance.cpp | 2 ++ | ||
| 11 | .../qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp | 1 + | ||
| 12 | 2 files changed, 3 insertions(+) | ||
| 13 | |||
| 14 | diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/layoutnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/layoutnodeinstance.cpp | ||
| 15 | index 3f9f148..160e5c4 100644 | ||
| 16 | --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/layoutnodeinstance.cpp | ||
| 17 | +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/layoutnodeinstance.cpp | ||
| 18 | @@ -29,6 +29,8 @@ | ||
| 19 | ****************************************************************************/ | ||
| 20 | #include "layoutnodeinstance.h" | ||
| 21 | |||
| 22 | +#include <QCoreApplication> | ||
| 23 | + | ||
| 24 | namespace QmlDesigner { | ||
| 25 | namespace Internal { | ||
| 26 | |||
| 27 | diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp | ||
| 28 | index 5a9342f..bacbc12 100644 | ||
| 29 | --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp | ||
| 30 | +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp | ||
| 31 | @@ -33,6 +33,7 @@ | ||
| 32 | #include <enumeration.h> | ||
| 33 | #include <qmlprivategate.h> | ||
| 34 | |||
| 35 | +#include <QDebug> | ||
| 36 | #include <QEvent> | ||
| 37 | #include <QQmlContext> | ||
| 38 | #include <QQmlError> | ||
