diff options
| author | hjk <hjk@qt.io> | 2022-08-05 08:48:22 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2022-08-05 08:50:27 +0200 |
| commit | ed8c775defe375bdd1b6f0812352baebf4294001 (patch) | |
| tree | c886e5eec54e1057972eafcf179ee8e1f46ef6df /share/qtcreator/qml/qmlpuppet/qml2puppet | |
| parent | 0da5ade118a62b09c6da608e813237c63f0bed19 (diff) | |
| parent | 5d85c4dbdf2e62d5188831c8ef082cf2a009a090 (diff) | |
Merge remote-tracking branch 'origin/8.0'
Change-Id: Icbb87ac8bcee5fb86042d3863a973573510651b4
Diffstat (limited to 'share/qtcreator/qml/qmlpuppet/qml2puppet')
| -rw-r--r-- | share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/generalhelper.h | 1 | ||||
| -rw-r--r-- | share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/generalhelper.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/generalhelper.h index e3ae249755..8bda11ddd2 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/generalhelper.h +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/editor3d/generalhelper.h @@ -27,6 +27,7 @@ #ifdef QUICK3D_MODULE +#include <QColor> #include <QHash> #include <QMatrix4x4> #include <QObject> diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp index 69128f0c3a..8af22d4877 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp @@ -101,6 +101,7 @@ #include <QtQuick3D/private/qquick3dscenerootnode_p.h> #include <QtQuick3D/private/qquick3drepeater_p.h> #include <QtQuick3D/private/qquick3dloader_p.h> +#include <QtQuick3D/private/qquick3dsceneenvironment_p.h> #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) #include "../editor3d/qt5compat/qquick3darealight_p.h" #endif |