diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-02-04 13:55:50 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-02-04 13:55:50 (GMT) |
| commit | 47322c3e9eddeeb68d49445507af2d7cf154f3c7 (patch) | |
| tree | d86c24071d4aaaa1ded75e5d6ee6682f9cb34847 /src/declarative/qml/qdeclarativeinstruction_p.h | |
| parent | 5ee75c4a483405180788b5a4986dce2cf9360d86 (diff) | |
| parent | bc331aca61a2f212a347708c9d44a4fb092183fd (diff) | |
| download | Qt-47322c3e9eddeeb68d49445507af2d7cf154f3c7.zip Qt-47322c3e9eddeeb68d49445507af2d7cf154f3c7.tar.gz Qt-47322c3e9eddeeb68d49445507af2d7cf154f3c7.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7
Diffstat (limited to 'src/declarative/qml/qdeclarativeinstruction_p.h')
| -rw-r--r-- | src/declarative/qml/qdeclarativeinstruction_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/declarative/qml/qdeclarativeinstruction_p.h b/src/declarative/qml/qdeclarativeinstruction_p.h index 59cce84..20be889 100644 --- a/src/declarative/qml/qdeclarativeinstruction_p.h +++ b/src/declarative/qml/qdeclarativeinstruction_p.h @@ -182,6 +182,7 @@ public: struct CreateSimpleInstruction { void (*create)(void *); int typeSize; + int type; ushort column; }; struct StoreMetaInstruction { |