Merge master <-> api_changes

[profile/ivi/qtdeclarative.git] / src / quick / particles / qquickcumulativedirection.cpp

diff --git a/src/quick/particles/qquickcumulativedirection.cpp b/src/quick/particles/qquickcumulativedirection.cpp
index 0a2ac92..d7c4094 100644 (file)
--- a/src/quick/particles/qquickcumulativedirection.cpp
+++ b/src/quick/particles/qquickcumulativedirection.cpp
@@ -3,7 +3,7 @@
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/
 **
-** This file is part of the Declarative module of the Qt Toolkit.
+** This file is part of the QtQuick module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -54,9 +54,9 @@ QQuickCumulativeDirection::QQuickCumulativeDirection(QObject *parent):QQuickDire
 {
 }
 
-QDeclarativeListProperty<QQuickDirection> QQuickCumulativeDirection::directions()
+QQmlListProperty<QQuickDirection> QQuickCumulativeDirection::directions()
 {
-    return QDeclarativeListProperty<QQuickDirection>(this, m_directions);//TODO: Proper list property
+    return QQmlListProperty<QQuickDirection>(this, m_directions);//TODO: Proper list property
 }
 
 const QPointF QQuickCumulativeDirection::sample(const QPointF &from)