aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabian Kosmale <fabian.kosmale@qt.io>2022-02-07 13:09:11 +0100
committerFabian Kosmale <fabian.kosmale@qt.io>2022-02-21 18:20:56 +0100
commitac4f3aa7cf4af7b0b48d2d9c44063ea19aea90b1 (patch)
tree35a4505d9cb9e7bacb99f6a0a52ec30a0a8dfa95
parent3668bc40777b3d7a4606139b94ab0e02f13d8e6f (diff)
QtQuick: Reduce number of V4 includes
Change-Id: I801d2489e447309f25883e313cba13050fce20a4 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
-rw-r--r--src/quick/items/context2d/qquickcanvascontext_p.h6
-rw-r--r--src/quick/items/context2d/qquickcontext2d_p.h5
-rw-r--r--src/quick/items/qquickloader_p_p.h3
-rw-r--r--src/quick/items/qquickview_p.h5
4 files changed, 11 insertions, 8 deletions
diff --git a/src/quick/items/context2d/qquickcanvascontext_p.h b/src/quick/items/context2d/qquickcanvascontext_p.h
index ffb01563ed..dcfa863553 100644
--- a/src/quick/items/context2d/qquickcanvascontext_p.h
+++ b/src/quick/items/context2d/qquickcanvascontext_p.h
@@ -56,10 +56,14 @@
QT_REQUIRE_CONFIG(quick_canvas);
#include <QtQuick/qquickitem.h>
-#include <QtQml/private/qv4value_p.h>
+#include <QtQml/private/qv4staticvalue_p.h>
QT_BEGIN_NAMESPACE
+namespace QV4 {
+ struct ExecutionEngine;
+}
+
class QQuickCanvasItem;
class QSGLayer;
diff --git a/src/quick/items/context2d/qquickcontext2d_p.h b/src/quick/items/context2d/qquickcontext2d_p.h
index ea1354725f..d769c4396b 100644
--- a/src/quick/items/context2d/qquickcontext2d_p.h
+++ b/src/quick/items/context2d/qquickcontext2d_p.h
@@ -67,7 +67,6 @@ QT_REQUIRE_CONFIG(quick_canvas);
#include <QtCore/qqueue.h>
#include <QtCore/QWaitCondition>
-#include <private/qv4value_p.h>
#include <private/qv4persistent_p.h>
//#define QQUICKCONTEXT2D_DEBUG //enable this for just DEBUG purpose!
@@ -78,6 +77,10 @@ QT_REQUIRE_CONFIG(quick_canvas);
QT_BEGIN_NAMESPACE
+namespace QV4 {
+ struct ExecutionEngine;
+}
+
class QQuickContext2DCommandBuffer;
class QQuickContext2DTexture;
class QQuickPixmap;
diff --git a/src/quick/items/qquickloader_p_p.h b/src/quick/items/qquickloader_p_p.h
index f98b4beefb..dac9e2cb59 100644
--- a/src/quick/items/qquickloader_p_p.h
+++ b/src/quick/items/qquickloader_p_p.h
@@ -56,7 +56,8 @@
#include "qquickitemchangelistener_p.h"
#include <qqmlincubator.h>
-#include <private/qv4value_p.h>
+#include <private/qv4staticvalue_p.h>
+#include <private/qv4persistent_p.h>
QT_BEGIN_NAMESPACE
diff --git a/src/quick/items/qquickview_p.h b/src/quick/items/qquickview_p.h
index 1bc266bbbf..7018a84395 100644
--- a/src/quick/items/qquickview_p.h
+++ b/src/quick/items/qquickview_p.h
@@ -60,17 +60,12 @@
#include <QtCore/QWeakPointer>
#include <QtQml/qqmlengine.h>
-#include <private/qv4object_p.h>
#include "qquickwindow_p.h"
#include "qquickitemchangelistener_p.h"
QT_BEGIN_NAMESPACE
-namespace QV4 {
-struct ExecutionEngine;
-}
-
class QQmlContext;
class QQmlError;
class QQuickItem;