aboutsummaryrefslogtreecommitdiffstats
path: root/src/declarative/particles/qsgcumulativedirection.cpp
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2011-08-31 16:43:22 +0200
committerFriedemann Kleint <Friedemann.Kleint@nokia.com>2011-08-31 17:02:05 +0200
commit01335edc94d2961bd4061ed2cb81ebd1151797bf (patch)
tree54df7d2d0857278198258e4d8a65bf63cb35d91a /src/declarative/particles/qsgcumulativedirection.cpp
parent20c3575fc39004d6a556820543982f4a6ebef0be (diff)
Fix export symbols for QtDeclarative and QtQuick1.
Fix build on Windows and compiler warnings. Requires 090ee21eac7257644422e35395194e5fd7fb8efa in qtbase. Change-Id: Ief8da504ccd3e2c2e78644cc9943d685c4302019 Reviewed-on: http://codereview.qt.nokia.com/3988 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/declarative/particles/qsgcumulativedirection.cpp')
-rw-r--r--src/declarative/particles/qsgcumulativedirection.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/declarative/particles/qsgcumulativedirection.cpp b/src/declarative/particles/qsgcumulativedirection.cpp
index 1d7523972b..3502b41bce 100644
--- a/src/declarative/particles/qsgcumulativedirection.cpp
+++ b/src/declarative/particles/qsgcumulativedirection.cpp
@@ -61,10 +61,10 @@ QDeclarativeListProperty<QSGStochasticDirection> QSGCumulativeDirection::directi
const QPointF &QSGCumulativeDirection::sample(const QPointF &from)
{
- QPointF ret;
+ m_ret = QPointF();
foreach (QSGStochasticDirection* dir, m_directions)
- ret += dir->sample(from);
- return ret;
+ m_ret += dir->sample(from);
+ return m_ret;
}
QT_END_NAMESPACE