diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2017-01-10 15:08:06 +0000 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2017-01-10 15:08:16 +0000 |
| commit | 0e7561d6d3b89f1972939809715e25d551632a80 (patch) | |
| tree | 12487ff6afa0581b7046d89d7cd6bcedac63f663 /src/quick3d/quick3d/items | |
| parent | 7ae2a8b0d42234ae47ae81b4b1d898e0c97b24d7 (diff) | |
| parent | 8adaeea5a706779de384cf4a8e9c4fec431b6734 (diff) | |
Merge branch '5.8' into dev
Conflicts:
.qmake.conf
Change-Id: Iae28acac3058d5c2f223c989393cededad49da08
Diffstat (limited to 'src/quick3d/quick3d/items')
| -rw-r--r-- | src/quick3d/quick3d/items/quick3dentityloader.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/quick3d/quick3d/items/quick3dentityloader.cpp b/src/quick3d/quick3d/items/quick3dentityloader.cpp index 9f305d977..9c82db7ad 100644 --- a/src/quick3d/quick3d/items/quick3dentityloader.cpp +++ b/src/quick3d/quick3d/items/quick3dentityloader.cpp @@ -93,7 +93,14 @@ private: /*! \qmltype EntityLoader \inqmlmodule Qt3D.Core + \inherits Entity \since 5.5 + \brief Provides the facility to load entities from qml source + + An EntityLoader provides the facitily to load predefined set of entities + from qml source file. EntityLoader itself is an entity and the loaded entity + tree is set as a child of the loader. The loaded entity tree root can be + accessed with EntityLoader::entity property. */ Quick3DEntityLoader::Quick3DEntityLoader(QNode *parent) : QEntity(*new Quick3DEntityLoaderPrivate, parent) @@ -107,7 +114,8 @@ Quick3DEntityLoader::~Quick3DEntityLoader() } /*! - \qmlproperty QtQml::QtObject Qt3DCore::EntityLoader::entity + \qmlproperty QtQml::QtObject EntityLoader::entity + Holds the loaded entity tree root. \readonly */ QObject *Quick3DEntityLoader::entity() const @@ -118,6 +126,7 @@ QObject *Quick3DEntityLoader::entity() const /*! \qmlproperty url Qt3DCore::EntityLoader::source + Holds the source url. */ QUrl Quick3DEntityLoader::source() const { |