summaryrefslogtreecommitdiffstats
path: root/src/declarative/util/qdeclarativelistmodel.cpp
diff options
context:
space:
mode:
authorSami Merila <sami.merila@nokia.com>2010-08-27 11:15:05 (GMT)
committerSami Merila <sami.merila@nokia.com>2010-08-27 11:15:05 (GMT)
commit287001fcd6d854b58bd61412e8b2c5bbdcb67b05 (patch)
treed78b4f109c9cce328dc5627de334f96b79331046 /src/declarative/util/qdeclarativelistmodel.cpp
parent9ef61d3d1e53d32dc2568cbfb9f8ff5b19cb4ffc (diff)
parent8cb399e2c2ba47cdf3b27c7c5cb4d8d35702a068 (diff)
downloadQt-287001fcd6d854b58bd61412e8b2c5bbdcb67b05.zip
Qt-287001fcd6d854b58bd61412e8b2c5bbdcb67b05.tar.gz
Qt-287001fcd6d854b58bd61412e8b2c5bbdcb67b05.tar.bz2
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7
Diffstat (limited to 'src/declarative/util/qdeclarativelistmodel.cpp')
-rw-r--r--src/declarative/util/qdeclarativelistmodel.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/declarative/util/qdeclarativelistmodel.cpp b/src/declarative/util/qdeclarativelistmodel.cpp
index 0162beb..7504c23 100644
--- a/src/declarative/util/qdeclarativelistmodel.cpp
+++ b/src/declarative/util/qdeclarativelistmodel.cpp
@@ -58,9 +58,6 @@ Q_DECLARE_METATYPE(QListModelInterface *)
QT_BEGIN_NAMESPACE
-#define DATA_ROLE_ID 1
-#define DATA_ROLE_NAME "data"
-
QDeclarativeListModelParser::ListInstruction *QDeclarativeListModelParser::ListModelData::instructions() const
{
return (QDeclarativeListModelParser::ListInstruction *)((char *)this + sizeof(ListModelData));