diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-12-11 15:08:00 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-12-11 15:08:00 +0100 |
| commit | c9ce0deeb8f2bb79c446e41584f753f1b1bfe17f (patch) | |
| tree | 5e9a06346ea22e6e9a2fafd6a2ac7394c73648c6 /src/core/nodes | |
| parent | f1b333c36a19cf85eab798fc1b1952ed063fedfe (diff) | |
| parent | 0a0a7e4ca4f05c7d6da55ec64c8a9734d82853fe (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
src/render/renderers/opengl/textures/gltexture.cpp
Change-Id: I57e9a296dc15f0b5dc3af3664f698bdc799c4bb5
Diffstat (limited to 'src/core/nodes')
| -rw-r--r-- | src/core/nodes/qcomponent.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/nodes/qcomponent.cpp b/src/core/nodes/qcomponent.cpp index e678880e8..5ca49ff30 100644 --- a/src/core/nodes/qcomponent.cpp +++ b/src/core/nodes/qcomponent.cpp @@ -112,7 +112,7 @@ void QComponentPrivate::removeEntity(QEntity *entity) */ /*! - \fn Qt3DCore::QComponent::addedToEntity(Qt3DCore::QEntity *entity)' + \fn Qt3DCore::QComponent::addedToEntity(Qt3DCore::QEntity *entity) Indicates that a reference has been added to \a entity. */ |