diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-10-26 12:00:43 (GMT) |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-10-26 12:00:43 (GMT) |
| commit | 85f3f3ac74a2e7fe6a0874a46f9358a15f0dab34 (patch) | |
| tree | 191b227596f18333f1609ff824d2746dd7f1090f /src/declarative/util/qlistmodelinterface.cpp | |
| parent | 26139fcacc05b4a74fce1ef4e0db819118765310 (diff) | |
| parent | 2d071521228a6bc9ef423cbdbbd8560d28208790 (diff) | |
| download | Qt-85f3f3ac74a2e7fe6a0874a46f9358a15f0dab34.zip Qt-85f3f3ac74a2e7fe6a0874a46f9358a15f0dab34.tar.gz Qt-85f3f3ac74a2e7fe6a0874a46f9358a15f0dab34.tar.bz2 | |
Merge remote branch 'qt/master' into lighthouse-master
Conflicts:
src/opengl/qwindowsurface_gl.cpp
Diffstat (limited to 'src/declarative/util/qlistmodelinterface.cpp')
| -rw-r--r-- | src/declarative/util/qlistmodelinterface.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/declarative/util/qlistmodelinterface.cpp b/src/declarative/util/qlistmodelinterface.cpp index acf4dd6..1e2dfb7 100644 --- a/src/declarative/util/qlistmodelinterface.cpp +++ b/src/declarative/util/qlistmodelinterface.cpp @@ -46,6 +46,7 @@ QT_BEGIN_NAMESPACE /*! \internal \class QListModelInterface + \since 4.7 \brief The QListModelInterface class can be subclassed to provide C++ models to QDeclarativeGraphics Views This class is comprised primarily of pure virtual functions which @@ -70,15 +71,10 @@ QT_BEGIN_NAMESPACE Returns the number of data entries in the model. */ -/*! \fn QHash<int,QVariant> QListModelInterface::data(int index, const QList<int>& roles) const +/*! \fn QVariant QListModelInterface::data(int index, int role) const Returns the data at the given \a index for the specified \a roles. */ -/*! \fn bool QListModelInterface::setData(int index, const QHash<int,QVariant>& values) - Sets the data at the given \a index. \a values is a mapping of - QVariant values to roles. Returns false. -*/ - /*! \fn QList<int> QListModelInterface::roles() const Returns the list of roles for which the list model interface provides data. |