diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2018-06-25 09:53:01 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-06-25 12:15:55 +0200 |
| commit | fbf6f7400a5b5ae10267171e201391ce1ff8eb96 (patch) | |
| tree | 18e22092c2764fea16442fd814f230d4fe095a49 /src/particles/qquickpointattractor.cpp | |
| parent | c21a6a9f2c2d635aca3bf88a6431c560b16b1cc6 (diff) | |
| parent | 9999591e69a0908cd3fbe14646fb98881e32061b (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/plugins/qmltooling/packetprotocol/qpacketprotocol.cpp
src/quick/handlers/qquickhandlerpoint.cpp
src/quick/handlers/qquicksinglepointhandler.cpp
tests/auto/qml/ecmascripttests/test262
Change-Id: I8908ec8c6116ca626fbd269af7625d4c429429ca
Diffstat (limited to 'src/particles/qquickpointattractor.cpp')
| -rw-r--r-- | src/particles/qquickpointattractor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/particles/qquickpointattractor.cpp b/src/particles/qquickpointattractor.cpp index d7446842f2..cbc16f3a06 100644 --- a/src/particles/qquickpointattractor.cpp +++ b/src/particles/qquickpointattractor.cpp @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE \inqmlmodule QtQuick.Particles \ingroup qtquick-particles \inherits Affector - \brief For attracting particles towards a specific point + \brief For attracting particles towards a specific point. Note that the size and position of this element affects which particles it affects. The size of the point attracted to is always 0x0, and the location of that point |