diff options
| author | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-10-07 19:23:54 (GMT) |
|---|---|---|
| committer | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2010-10-07 19:23:54 (GMT) |
| commit | 4f1d524f992b0df3626ab63c001345c96ccea766 (patch) | |
| tree | ddc248c09fbb041b09792dae680b2f494e9b4e4b /src/declarative/qml/qdeclarativewatcher.cpp | |
| parent | 34c8022c216f6e298b0b0f8250cdf17688534c5b (diff) | |
| parent | 161f15e1e79ec5f23244da68340ba1e78f3ac4bb (diff) | |
| download | Qt-4f1d524f992b0df3626ab63c001345c96ccea766.zip Qt-4f1d524f992b0df3626ab63c001345c96ccea766.tar.gz Qt-4f1d524f992b0df3626ab63c001345c96ccea766.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/declarative/qml/qdeclarativewatcher.cpp')
| -rw-r--r-- | src/declarative/qml/qdeclarativewatcher.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativewatcher.cpp b/src/declarative/qml/qdeclarativewatcher.cpp index da1419f..b9d5ec8 100644 --- a/src/declarative/qml/qdeclarativewatcher.cpp +++ b/src/declarative/qml/qdeclarativewatcher.cpp @@ -46,6 +46,7 @@ #include "qdeclarative.h" #include <qdeclarativedebugservice_p.h> +#include "private/qdeclarativeproperty_p.h" #include <QtCore/qmetaobject.h> #include <QtCore/qdebug.h> @@ -103,7 +104,7 @@ QDeclarativeWatchProxy::QDeclarativeWatchProxy(int id, refreshIdx = QDeclarativeWatchProxy::staticMetaObject.indexOfMethod("notifyValueChanged()"); if (prop.hasNotifySignal()) - QMetaObject::connect(m_object, prop.notifySignalIndex(), this, refreshIdx); + QDeclarativePropertyPrivate::connect(m_object, prop.notifySignalIndex(), this, refreshIdx); } void QDeclarativeWatchProxy::notifyValueChanged() |