diff options
| author | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-08-26 23:42:57 +0200 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-08-26 23:42:57 +0200 |
| commit | e028a54690f2fedfae6da19fb24b7401e4a71e56 (patch) | |
| tree | 72c038e84d9fb1063c970a121949d898442c5648 /src/declarative/graphicsitems/qdeclarativerepeater.cpp | |
| parent | d54407928be05781ede2358baba2f2f91749cc80 (diff) | |
| parent | 6661f5c2222c145d854e225076195b37672637d2 (diff) | |
| download | qt4-tools-e028a54690f2fedfae6da19fb24b7401e4a71e56.tar.gz | |
Merge branch 4.7 into qt-4.8-from-4.7
Conflicts:
doc/src/index.qdoc
src/xmlpatterns/expr/qevaluationcache_p.h
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativerepeater.cpp')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativerepeater.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativerepeater.cpp b/src/declarative/graphicsitems/qdeclarativerepeater.cpp index e881b96bcb..813c255300 100644 --- a/src/declarative/graphicsitems/qdeclarativerepeater.cpp +++ b/src/declarative/graphicsitems/qdeclarativerepeater.cpp @@ -128,7 +128,7 @@ QDeclarativeRepeaterPrivate::~QDeclarativeRepeaterPrivate() /*! \qmlsignal Repeater::onItemAdded(int index, Item item) - \since QtQuick 1.1 + \since Quick 1.1 This handler is called when an item is added to the repeater. The \a index parameter holds the index at which the item has been inserted within the @@ -137,7 +137,7 @@ QDeclarativeRepeaterPrivate::~QDeclarativeRepeaterPrivate() /*! \qmlsignal Repeater::onItemRemoved(int index, Item item) - \since QtQuick 1.1 + \since Quick 1.1 This handler is called when an item is removed from the repeater. The \a index parameter holds the index at which the item was removed from the repeater, @@ -306,7 +306,7 @@ int QDeclarativeRepeater::count() const /*! \qmlmethod Item Repeater::itemAt(index) - \since QtQuick 1.1 + \since Quick 1.1 Returns the \l Item that has been created at the given \a index, or \c null if no item exists at \a index. |