diff options
| author | Ian Walters <ian.walters@nokia.com> | 2009-05-05 05:18:20 (GMT) |
|---|---|---|
| committer | Ian Walters <ian.walters@nokia.com> | 2009-05-05 05:18:20 (GMT) |
| commit | 872c45c272ca71e8618475060aa28075e83fffce (patch) | |
| tree | 5a5a2ed3eaf15470160d0d7fe36a67b39c41e5ef /src/declarative/qml/qmlinstruction_p.h | |
| parent | 415708f85341448c6f30bbca6e31e48dbfde72a5 (diff) | |
| parent | 0725ca189ad30ec54a2a7a054404a50f20e2bfed (diff) | |
| download | Qt-872c45c272ca71e8618475060aa28075e83fffce.zip Qt-872c45c272ca71e8618475060aa28075e83fffce.tar.gz Qt-872c45c272ca71e8618475060aa28075e83fffce.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/qml/qmlinstruction_p.h')
| -rw-r--r-- | src/declarative/qml/qmlinstruction_p.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/declarative/qml/qmlinstruction_p.h b/src/declarative/qml/qmlinstruction_p.h index 922fc61..462f9e4 100644 --- a/src/declarative/qml/qmlinstruction_p.h +++ b/src/declarative/qml/qmlinstruction_p.h @@ -63,7 +63,6 @@ public: // top of the stack. Init, /* init */ CreateObject, /* create */ - CreateCustomObject, /* createCustom */ SetId, /* setId */ SetDefault, CreateComponent, /* createComponent */ @@ -180,10 +179,6 @@ public: int data; } storeMeta; struct { - int type; - int data; - } createCustom; - struct { int value; int save; } setId; |