diff options
| author | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2016-05-24 21:26:33 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2016-05-24 21:50:29 +0200 |
| commit | 0837453ef90f5d5f569702aa1c7620648dae2c00 (patch) | |
| tree | 43a35f937dfcca3f467d4deafe2800d01f0859da /src/quick/items/context2d | |
| parent | 9ff09fb283cd130fb717769b44f54bfbb28efd8a (diff) | |
| parent | 0ba6dffd96a0dda8e3938b09395075c19e46644b (diff) | |
Merge remote-tracking branch 'origin/dev' into HEAD
Change-Id: If91e0e28d004f1db978dcab393f189743bb69cd5
Diffstat (limited to 'src/quick/items/context2d')
| -rw-r--r-- | src/quick/items/context2d/qquickcanvasitem.cpp | 1 | ||||
| -rw-r--r-- | src/quick/items/context2d/qquickcanvasitem_p.h | 1 | ||||
| -rw-r--r-- | src/quick/items/context2d/qquickcontext2d.cpp | 1 | ||||
| -rw-r--r-- | src/quick/items/context2d/qquickcontext2d_p.h | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/src/quick/items/context2d/qquickcanvasitem.cpp b/src/quick/items/context2d/qquickcanvasitem.cpp index 9ca986501c..7ffb715346 100644 --- a/src/quick/items/context2d/qquickcanvasitem.cpp +++ b/src/quick/items/context2d/qquickcanvasitem.cpp @@ -55,6 +55,7 @@ #include <private/qv4value_p.h> #include <private/qv4functionobject_p.h> #include <private/qv4scopedvalue_p.h> +#include <private/qv4qobjectwrapper_p.h> QT_BEGIN_NAMESPACE diff --git a/src/quick/items/context2d/qquickcanvasitem_p.h b/src/quick/items/context2d/qquickcanvasitem_p.h index b99fcf869d..4f94393a45 100644 --- a/src/quick/items/context2d/qquickcanvasitem_p.h +++ b/src/quick/items/context2d/qquickcanvasitem_p.h @@ -53,6 +53,7 @@ #include <QtQuick/qquickitem.h> #include <private/qv8engine_p.h> +#include <private/qqmlrefcount_p.h> #include <QtCore/QThread> #include <QtGui/QImage> diff --git a/src/quick/items/context2d/qquickcontext2d.cpp b/src/quick/items/context2d/qquickcontext2d.cpp index 7e7b1fa062..93ca8e9358 100644 --- a/src/quick/items/context2d/qquickcontext2d.cpp +++ b/src/quick/items/context2d/qquickcontext2d.cpp @@ -58,6 +58,7 @@ #include <private/qv4domerrors_p.h> #include <private/qv4engine_p.h> #include <private/qv4object_p.h> +#include <private/qv4qobjectwrapper_p.h> #include <private/qquickwindow_p.h> #include <private/qv4value_p.h> diff --git a/src/quick/items/context2d/qquickcontext2d_p.h b/src/quick/items/context2d/qquickcontext2d_p.h index 818db0868c..cfb62ee052 100644 --- a/src/quick/items/context2d/qquickcontext2d_p.h +++ b/src/quick/items/context2d/qquickcontext2d_p.h @@ -66,6 +66,7 @@ #include <QtCore/QWaitCondition> #include <private/qv4value_p.h> +#include <private/qv4persistent_p.h> //#define QQUICKCONTEXT2D_DEBUG //enable this for just DEBUG purpose! |