diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-11-21 11:34:57 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2019-11-22 09:50:11 +0100 |
| commit | aa3813366a8e772cd58c9253461cf2dc50b97a9d (patch) | |
| tree | e306a60fa9b2d1f7dd2e6b245fdf05214c7c55df /src/particles | |
| parent | 4241bb4d26ef69eb212e0274bad0926ec71bead9 (diff) | |
| parent | acb6ed0815f92588c3ff875a568e9561fe61218c (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
src/qml/qml/qqmlextensionplugin.cpp
tests/auto/quick/qquicktableview/tst_qquicktableview.cpp
Change-Id: Ic58d36a8532015bae30f2690063db9829b3bf372
Diffstat (limited to 'src/particles')
| -rw-r--r-- | src/particles/qquickparticleextruder.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/particles/qquickparticleextruder.cpp b/src/particles/qquickparticleextruder.cpp index f56e288e09..ea64a79563 100644 --- a/src/particles/qquickparticleextruder.cpp +++ b/src/particles/qquickparticleextruder.cpp @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE /*! - \qmltype Shape + \qmltype ParticleExtruder \instantiates QQuickParticleExtruder \inqmlmodule QtQuick.Particles \brief For specifying an area for affectors and emitters. |