summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qmlinstruction_p.h
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2009-10-22 01:59:33 (GMT)
committerMartin Jones <martin.jones@nokia.com>2009-10-22 01:59:33 (GMT)
commit6c9ac788a60fcd2f946787a5297d7c2f71ad1968 (patch)
treeaf53424d7d2adfcbb324624ab93d31845d3db80d /src/declarative/qml/qmlinstruction_p.h
parent2391cf5d127882ce8811e058115d5c2605328079 (diff)
parentfa85d539decf7bdcb16fa8f52858b13479cea659 (diff)
downloadQt-6c9ac788a60fcd2f946787a5297d7c2f71ad1968.zip
Qt-6c9ac788a60fcd2f946787a5297d7c2f71ad1968.tar.gz
Qt-6c9ac788a60fcd2f946787a5297d7c2f71ad1968.tar.bz2
Merge branch 'kinetic-declarativeui' of 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.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/declarative/qml/qmlinstruction_p.h b/src/declarative/qml/qmlinstruction_p.h
index 5265d42..dc18b05 100644
--- a/src/declarative/qml/qmlinstruction_p.h
+++ b/src/declarative/qml/qmlinstruction_p.h
@@ -119,6 +119,7 @@ public:
StoreSignal, /* storeSignal */
StoreScript, /* storeScript */
+ StoreScriptString, /* storeScriptString */
//
// Unresolved single assignment
@@ -245,6 +246,11 @@ public:
int value;
} storeString;
struct {
+ int propertyIndex;
+ int value;
+ int scope;
+ } storeScriptString;
+ struct {
int value;
int fileName;
int lineNumber;