diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-08-25 23:21:21 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-08-25 23:21:21 (GMT) |
| commit | 407e131dfc2f85518e42be6ca7a2b43946d0413c (patch) | |
| tree | 3e160cf1509a671e0f5bfcb3551b084d8aca83a3 | |
| parent | 08df2a17f4f0ed9b5ce69ad91e3849260acda092 (diff) | |
| parent | 6f4d7ef066fef92eda4ae9c1ba5a380c9e2ed95b (diff) | |
| download | Qt-407e131dfc2f85518e42be6ca7a2b43946d0413c.zip Qt-407e131dfc2f85518e42be6ca7a2b43946d0413c.tar.gz Qt-407e131dfc2f85518e42be6ca7a2b43946d0413c.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
| -rw-r--r-- | src/declarative/util/qdeclarativelistmodel.cpp | 3 |
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)); |