diff options
| author | Martin Jones <martin.jones@nokia.com> | 2011-12-02 14:28:00 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-02 06:03:12 +0100 |
| commit | 9b17557f3bbd5135651bcedf9f10e61d7e078ae2 (patch) | |
| tree | e738dd1aa4d3458b62bd0927f8372e3a3d36321a /src/corelib/kernel/qobject.cpp | |
| parent | 6534898cc69e22115cf158f71a1e0edd7f13877b (diff) | |
Revert "Add QObject::objectNameChanged(const QString &objectName) signal"
This reverts commit ba635d7e74472f3a54c0c4686966af46d9035c6f.
Breaks tests in declarative:
tst_qdeclarativeecmascript::deleteLater
tst_qquickvisualdatamodel::objectListModel
Change-Id: I467b45109332e66fc62f3de00f376b1b88ab19ca
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Diffstat (limited to 'src/corelib/kernel/qobject.cpp')
| -rw-r--r-- | src/corelib/kernel/qobject.cpp | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp index bdf833bc48..b1d2463737 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -1096,20 +1096,13 @@ QString QObject::objectName() const void QObject::setObjectName(const QString &name) { Q_D(QObject); - if (d->objectName != name) { - d->objectName = name; - if (d->declarativeData) - d->declarativeData->objectNameChanged(d->declarativeData, this); - emit objectNameChanged(d->objectName); - } -} - -/*! \fn void QObject::objectNameChanged(const QString &objectName) + bool objectNameChanged = d->declarativeData && d->objectName != name; - This signal is emitted after the object's name has been changed. The new object name is passed as \a objectName. + d->objectName = name; - \sa QObject::objectName -*/ + if (objectNameChanged) + d->declarativeData->objectNameChanged(d->declarativeData, this); +} /*! \fn bool QObject::isWidgetType() const |