diff options
| author | axis <qt-info@nokia.com> | 2009-11-04 14:07:39 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-11-04 14:07:39 (GMT) |
| commit | 9cda9fb4bb496a7c589767bdcead131dbcdeeb79 (patch) | |
| tree | 2302096f06d4629ea62a85317429daa74ce6f02d /src/corelib/kernel/qmetaobject.cpp | |
| parent | be6357bfa96cdaffa5797fef99e95cac7121e5b3 (diff) | |
| parent | 7905101fb5ef18c776be515b9287356b1efc5ceb (diff) | |
| download | Qt-9cda9fb4bb496a7c589767bdcead131dbcdeeb79.zip Qt-9cda9fb4bb496a7c589767bdcead131dbcdeeb79.tar.gz Qt-9cda9fb4bb496a7c589767bdcead131dbcdeeb79.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60
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 |