diff options
| author | Roberto Raggi <roberto.raggi@nokia.com> | 2009-05-08 14:34:17 (GMT) |
|---|---|---|
| committer | Roberto Raggi <roberto.raggi@nokia.com> | 2009-05-08 14:34:17 (GMT) |
| commit | b0aa85acee7e9e332d3811b054c914c4ec3fafce (patch) | |
| tree | 2ec374f31294f344d1673eb7cbbe31140cb38f7f | |
| parent | 445c06ef96158befe035a0b45c613e4931d76e82 (diff) | |
| parent | 140339c9a8ba51dab7384608a610ba129e0388dd (diff) | |
| download | Qt-b0aa85acee7e9e332d3811b054c914c4ec3fafce.zip Qt-b0aa85acee7e9e332d3811b054c914c4ec3fafce.tar.gz Qt-b0aa85acee7e9e332d3811b054c914c4ec3fafce.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| -rw-r--r-- | src/declarative/3rdparty/qlistmodelinterface.cpp | 1 | ||||
| -rw-r--r-- | src/declarative/3rdparty/qlistmodelinterface.h | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/declarative/3rdparty/qlistmodelinterface.cpp b/src/declarative/3rdparty/qlistmodelinterface.cpp index 5e0544e..7e50378 100644 --- a/src/declarative/3rdparty/qlistmodelinterface.cpp +++ b/src/declarative/3rdparty/qlistmodelinterface.cpp @@ -54,6 +54,7 @@ QT_BEGIN_NAMESPACE /*! \fn QListModelInterface::QListModelInterface(QObject *parent) Constructs a QListModelInterface with the specified \a parent. +*/ /*! \fn QListModelInterface::QListModelInterface(QObjectPrivate &dd, QObject *parent) diff --git a/src/declarative/3rdparty/qlistmodelinterface.h b/src/declarative/3rdparty/qlistmodelinterface.h index e1eb21e..8a0cf44 100644 --- a/src/declarative/3rdparty/qlistmodelinterface.h +++ b/src/declarative/3rdparty/qlistmodelinterface.h @@ -70,7 +70,7 @@ class Q_DECLARATIVE_EXPORT QListModelInterface : public QObject typedef QHash<int, QVariant> QHash_int; typedef QList<int> QList_int; - virtual QHash_int data(int index, const QList_int &roles = QList_int) const = 0; + virtual QHash_int data(int index, const QList_int &roles = QList_int()) const = 0; virtual bool setData(int index, const QHash_int &values) { Q_UNUSED(index); Q_UNUSED(values); return false; } |