diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2016-10-13 17:21:41 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2016-10-13 17:21:48 +0200 |
| commit | 90fa3414156522ef89f9ebe8cefd6dad303ce06c (patch) | |
| tree | 65ba250895722795ce3d14fb9b4341953ffd1733 /src/particles/qquickcumulativedirection.cpp | |
| parent | 2a999f870e791d99c5c0463a11be05fc5a14dfcc (diff) | |
| parent | a05fec277d0a122e03bb6c7756777729df50b1f2 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/scenegraphng
Change-Id: Ica09141c3d3c4f9e8585c9dc66a050158a25f446
Diffstat (limited to 'src/particles/qquickcumulativedirection.cpp')
| -rw-r--r-- | src/particles/qquickcumulativedirection.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/particles/qquickcumulativedirection.cpp b/src/particles/qquickcumulativedirection.cpp index b6b3e76f69..6fbd53df48 100644 --- a/src/particles/qquickcumulativedirection.cpp +++ b/src/particles/qquickcumulativedirection.cpp @@ -59,7 +59,7 @@ QQmlListProperty<QQuickDirection> QQuickCumulativeDirection::directions() return QQmlListProperty<QQuickDirection>(this, m_directions);//TODO: Proper list property } -const QPointF QQuickCumulativeDirection::sample(const QPointF &from) +QPointF QQuickCumulativeDirection::sample(const QPointF &from) { QPointF ret; foreach (QQuickDirection* dir, m_directions) |