diff options
| author | Erik Verbruggen <erik.verbruggen@digia.com> | 2016-03-23 13:17:10 +0100 |
|---|---|---|
| committer | Erik Verbruggen <erik.verbruggen@qt.io> | 2016-05-20 13:44:13 +0000 |
| commit | 607320ca9fb2796a5f6f2578578fd314f7e8b99e (patch) | |
| tree | 4c3925a5e58ea52c415098169855494341ab5a77 /src/quick | |
| parent | 41a426d78177b704cdf321fdf0b36b7cabc29a56 (diff) | |
V4: allow inlining of ExecutionEngine::{qml,js}Engine()
All other changes are just to be able to include qv8engine_p.h in
qv4engine_p.h
Change-Id: I71ba2ec42cdc20d5c7d97a74b99b4d1ada1a5ed8
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/quick')
| -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 | ||||
| -rw-r--r-- | src/quick/items/qquickimage.cpp | 1 | ||||
| -rw-r--r-- | src/quick/items/qquickitem.cpp | 1 |
6 files changed, 6 insertions, 0 deletions
diff --git a/src/quick/items/context2d/qquickcanvasitem.cpp b/src/quick/items/context2d/qquickcanvasitem.cpp index 68f465cc5a..4abcc722d1 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 ced4d2a6c4..b2117d3eb9 100644 --- a/src/quick/items/context2d/qquickcontext2d.cpp +++ b/src/quick/items/context2d/qquickcontext2d.cpp @@ -57,6 +57,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! diff --git a/src/quick/items/qquickimage.cpp b/src/quick/items/qquickimage.cpp index c04a526bd0..a168b43fd1 100644 --- a/src/quick/items/qquickimage.cpp +++ b/src/quick/items/qquickimage.cpp @@ -44,6 +44,7 @@ #include <QtQuick/private/qsgcontext_p.h> #include <private/qsgadaptationlayer_p.h> +#include <private/qnumeric_p.h> #include <QtCore/qmath.h> #include <QtGui/qpainter.h> diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index 95b4e09aa5..3573788855 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -71,6 +71,7 @@ #include <private/qv4engine_p.h> #include <private/qv4object_p.h> +#include <private/qv4qobjectwrapper_p.h> #include <private/qdebug_p.h> #ifndef QT_NO_CURSOR |