diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2019-12-18 10:14:57 +0100 |
|---|---|---|
| committer | Paul Lemire <paul.lemire@kdab.com> | 2019-12-18 10:15:32 +0100 |
| commit | 1776037b0443dc57d59afe0772a83b1d47aced14 (patch) | |
| tree | 56213eee7188e5f1d2e4abe290b3757603c835ef /src/render/io/qsceneloader.cpp | |
| parent | c2ea752f684290d156c500c6a7174fe3f27fa086 (diff) | |
| parent | c754eb2883394852f155e31f5366fa25a4ffad42 (diff) | |
Merge branch '5.15' into dev
Change-Id: I731aa986e1cc45b3af920db1a23f256927beecf7
Diffstat (limited to 'src/render/io/qsceneloader.cpp')
| -rw-r--r-- | src/render/io/qsceneloader.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/render/io/qsceneloader.cpp b/src/render/io/qsceneloader.cpp index cf1e45355..2d53702f6 100644 --- a/src/render/io/qsceneloader.cpp +++ b/src/render/io/qsceneloader.cpp @@ -41,7 +41,6 @@ #include "qsceneloader_p.h" #include <Qt3DCore/private/qscene_p.h> -#include <Qt3DCore/qpropertyupdatedchange.h> #include <Qt3DCore/qentity.h> #include <Qt3DCore/qtransform.h> #include <Qt3DRender/qgeometryrenderer.h> @@ -253,6 +252,11 @@ QSceneLoader::~QSceneLoader() { } +// TODO Unused remove in Qt6 +void QSceneLoader::sceneChangeEvent(const QSceneChangePtr &) +{ +} + /*! \internal */ QSceneLoader::QSceneLoader(QSceneLoaderPrivate &dd, QNode *parent) : Qt3DCore::QComponent(dd, parent) @@ -313,7 +317,7 @@ QStringList QSceneLoader::entityNames() const /*! \qmlmethod Entity SceneLoader::component(string entityName, enumeration componentType) - Returns a component matching \a componentType of a loaded entity with an \a objectName matching + Returns a component matching \a componentType of a loaded entity with an \e objectName matching the \a entityName. If the entity has multiple matching components, the first match in the component list of the entity is returned. |