diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-04-28 03:49:13 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-04-28 03:49:13 (GMT) |
| commit | c8daf2ac917a90a54db780e8844a770a2cd0b464 (patch) | |
| tree | 987a3818d51382b115537fd5774487964eaaa235 /src/declarative/qml/qmlmetaproperty.cpp | |
| parent | 0c12a5a3bc547f2ba55350509adff3f66e73ba46 (diff) | |
| parent | 4927fb460e12ee8b4dada1025ad042d2b6b9b6f4 (diff) | |
| download | Qt-c8daf2ac917a90a54db780e8844a770a2cd0b464.zip Qt-c8daf2ac917a90a54db780e8844a770a2cd0b464.tar.gz Qt-c8daf2ac917a90a54db780e8844a770a2cd0b464.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/qml/qmlmetaproperty.cpp')
| -rw-r--r-- | src/declarative/qml/qmlmetaproperty.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qmlmetaproperty.cpp b/src/declarative/qml/qmlmetaproperty.cpp index e7f7cfb..780f8a8 100644 --- a/src/declarative/qml/qmlmetaproperty.cpp +++ b/src/declarative/qml/qmlmetaproperty.cpp @@ -550,7 +550,7 @@ QObject *QmlMetaPropertyPrivate::attachedObject() const if(attachedFunc == -1) return 0; else - return QmlMetaType::attachedPropertiesFuncById(attachedFunc)(object); + return qmlAttachedPropertiesObjectById(attachedFunc, object); } /*! |