summaryrefslogtreecommitdiffstats
path: root/src/declarative
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2010-10-11 01:43:59 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2010-10-11 01:44:47 (GMT)
commitf69eeec7030a5df12803a9128819207e3fc5bead (patch)
tree66427dccf9532fdebeb58dc8f67ed05d13265434 /src/declarative
parente11ee40cefc981fbdcfb10816039d4efb080fb17 (diff)
downloadQt-f69eeec7030a5df12803a9128819207e3fc5bead.zip
Qt-f69eeec7030a5df12803a9128819207e3fc5bead.tar.gz
Qt-f69eeec7030a5df12803a9128819207e3fc5bead.tar.bz2
Install the declarative objectNameChanged callback
Task-number: QTBUG-13999
Diffstat (limited to 'src/declarative')
-rw-r--r--src/declarative/qml/qdeclarativedata_p.h2
-rw-r--r--src/declarative/qml/qdeclarativeengine.cpp4
2 files changed, 6 insertions, 0 deletions
diff --git a/src/declarative/qml/qdeclarativedata_p.h b/src/declarative/qml/qdeclarativedata_p.h
index e916273..c7857b7 100644
--- a/src/declarative/qml/qdeclarativedata_p.h
+++ b/src/declarative/qml/qdeclarativedata_p.h
@@ -82,10 +82,12 @@ public:
static inline void init() {
QAbstractDeclarativeData::destroyed = destroyed;
QAbstractDeclarativeData::parentChanged = parentChanged;
+ QAbstractDeclarativeData::objectNameChanged = objectNameChanged;
}
static void destroyed(QAbstractDeclarativeData *, QObject *);
static void parentChanged(QAbstractDeclarativeData *, QObject *, QObject *);
+ static void objectNameChanged(QAbstractDeclarativeData *, QObject *);
void destroyed(QObject *);
void parentChanged(QObject *, QObject *);
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index 0749767..dfc29c4 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -468,6 +468,10 @@ void QDeclarativeData::parentChanged(QAbstractDeclarativeData *d, QObject *o, QO
static_cast<QDeclarativeData *>(d)->parentChanged(o, p);
}
+void QDeclarativeData::objectNameChanged(QAbstractDeclarativeData *d, QObject *o)
+{
+}
+
void QDeclarativeEnginePrivate::init()
{
Q_Q(QDeclarativeEngine);