diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-11-04 13:26:04 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-11-04 13:26:04 (GMT) |
| commit | 7905101fb5ef18c776be515b9287356b1efc5ceb (patch) | |
| tree | 3d865c288848891c1790b8dadcf7128410b233c1 /src/corelib/kernel/qmetaobject.cpp | |
| parent | 49d551b24dbb9131db4a5769b8ddd205bbf99093 (diff) | |
| parent | 94b595f37b3a49d44d1a795e5f2b003ac921d4b7 (diff) | |
| download | Qt-7905101fb5ef18c776be515b9287356b1efc5ceb.zip Qt-7905101fb5ef18c776be515b9287356b1efc5ceb.tar.gz Qt-7905101fb5ef18c776be515b9287356b1efc5ceb.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/corelib/kernel/qmetaobject.cpp')
| -rw-r--r-- | src/corelib/kernel/qmetaobject.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/corelib/kernel/qmetaobject.cpp b/src/corelib/kernel/qmetaobject.cpp index 71afc5b..6e6da19 100644 --- a/src/corelib/kernel/qmetaobject.cpp +++ b/src/corelib/kernel/qmetaobject.cpp @@ -2237,7 +2237,10 @@ bool QMetaProperty::write(QObject *object, const QVariant &value) const // -1 (unchanged): normal qt_metacall, result stored in argv[0] // changed: result stored directly in value, return the value of status int status = -1; - void *argv[] = { 0, &v, &status }; + // the flags variable is used by the declarative module to implement + // interception of property writes. + int flags = 0; + void *argv[] = { 0, &v, &status, &flags }; if (t == QVariant::LastType) argv[0] = &v; else |