diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-21 09:00:01 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-21 09:00:01 (GMT) |
| commit | deefcaaa5bfaf22ee31ae9da2965ab627b0c43b5 (patch) | |
| tree | f6d8171283540eb887aeb4fd7727d7ab8e720459 /src | |
| parent | fd110f31ce6b50b5258e6066073276a858fb88cd (diff) | |
| parent | 521a13e3f0a66c31bbf95304de3c7384042a39aa (diff) | |
| download | Qt-deefcaaa5bfaf22ee31ae9da2965ab627b0c43b5.zip Qt-deefcaaa5bfaf22ee31ae9da2965ab627b0c43b5.tar.gz Qt-deefcaaa5bfaf22ee31ae9da2965ab627b0c43b5.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fix writing to an attached property from script.
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/qml/qdeclarativetypenamescriptclass.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativetypenamescriptclass.cpp b/src/declarative/qml/qdeclarativetypenamescriptclass.cpp index d3e2025..0314a7a 100644 --- a/src/declarative/qml/qdeclarativetypenamescriptclass.cpp +++ b/src/declarative/qml/qdeclarativetypenamescriptclass.cpp @@ -158,7 +158,7 @@ void QDeclarativeTypeNameScriptClass::setProperty(Object *o, const Identifier &n Q_ASSERT(!type); QDeclarativeEnginePrivate *ep = QDeclarativeEnginePrivate::get(engine); - ep->objectClass->setProperty(((TypeNameData *)o)->object, n, v, context()); + ep->objectClass->setProperty(object, n, v, context()); } QT_END_NAMESPACE |