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/qdeclarativeboundsignal.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/qdeclarativeboundsignal.cpp')
| -rw-r--r-- | src/declarative/qml/qdeclarativeboundsignal.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/qml/qdeclarativeboundsignal.cpp b/src/declarative/qml/qdeclarativeboundsignal.cpp index 8769122..6af3e05 100644 --- a/src/declarative/qml/qdeclarativeboundsignal.cpp +++ b/src/declarative/qml/qdeclarativeboundsignal.cpp @@ -103,7 +103,7 @@ QDeclarativeBoundSignal::QDeclarativeBoundSignal(QObject *scope, const QMetaMeth if (evaluateIdx == -1) evaluateIdx = metaObject()->methodCount(); QDeclarative_setParent_noEvent(this, parent); - QMetaObject::connect(scope, m_signal.methodIndex(), this, evaluateIdx); + QDeclarativePropertyPrivate::connect(scope, m_signal.methodIndex(), this, evaluateIdx); } QDeclarativeBoundSignal::QDeclarativeBoundSignal(QDeclarativeContext *ctxt, const QString &val, @@ -117,7 +117,7 @@ QDeclarativeBoundSignal::QDeclarativeBoundSignal(QDeclarativeContext *ctxt, cons if (evaluateIdx == -1) evaluateIdx = metaObject()->methodCount(); QDeclarative_setParent_noEvent(this, parent); - QMetaObject::connect(scope, m_signal.methodIndex(), this, evaluateIdx); + QDeclarativePropertyPrivate::connect(scope, m_signal.methodIndex(), this, evaluateIdx); m_expression = new QDeclarativeExpression(ctxt, scope, val); } |