diff options
| author | Geir Vattekar <geir.vattekar@nokia.com> | 2010-10-08 07:21:51 (GMT) |
|---|---|---|
| committer | Geir Vattekar <geir.vattekar@nokia.com> | 2010-10-08 07:21:51 (GMT) |
| commit | 904b56a9cc810b340d1b7db81199fc0e15b4aab6 (patch) | |
| tree | 5792edd70546f6500210164327d0014f147d1ffe /src/declarative/qml/qdeclarativeproxymetaobject.cpp | |
| parent | 91396846206e6b41d32fa8a30888261581bd28dc (diff) | |
| parent | 8130fcbffe365c0e019f45baae7f1b273d8e17e7 (diff) | |
| download | Qt-904b56a9cc810b340d1b7db81199fc0e15b4aab6.zip Qt-904b56a9cc810b340d1b7db81199fc0e15b4aab6.tar.gz Qt-904b56a9cc810b340d1b7db81199fc0e15b4aab6.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'src/declarative/qml/qdeclarativeproxymetaobject.cpp')
| -rw-r--r-- | src/declarative/qml/qdeclarativeproxymetaobject.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/qml/qdeclarativeproxymetaobject.cpp b/src/declarative/qml/qdeclarativeproxymetaobject.cpp index c2dce0a..ceb6977 100644 --- a/src/declarative/qml/qdeclarativeproxymetaobject.cpp +++ b/src/declarative/qml/qdeclarativeproxymetaobject.cpp @@ -40,6 +40,7 @@ ****************************************************************************/ #include "private/qdeclarativeproxymetaobject_p.h" +#include "private/qdeclarativeproperty_p.h" QT_BEGIN_NAMESPACE @@ -95,8 +96,7 @@ int QDeclarativeProxyMetaObject::metaCall(QMetaObject::Call c, int id, void **a) QMetaMethod method = metaObject->method(jj + methodOffset); if (method.methodType() == QMetaMethod::Signal) - QMetaObject::connect(proxy, methodOffset + jj, - object, localOffset + jj); + QDeclarativePropertyPrivate::connect(proxy, methodOffset + jj, object, localOffset + jj); } } |