2 files changed, 6 insertions, 14 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
diff --git a/src/corelib/kernel/qobject.h b/src/corelib/kernel/qobject.h
index 1865656d49..307518d81e 100644
--- a/src/corelib/kernel/qobject.h
+++ b/src/corelib/kernel/qobject.h
@@ -115,7 +115,7 @@ public:
 class Q_CORE_EXPORT QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QString objectName READ objectName WRITE setObjectName NOTIFY objectNameChanged)
+    Q_PROPERTY(QString objectName READ objectName WRITE setObjectName)
     Q_DECLARE_PRIVATE(QObject)
 
 public:
@@ -313,7 +313,6 @@ public:
 
 Q_SIGNALS:
     void destroyed(QObject * = 0);
-    void objectNameChanged(const QString &objectName);
 
 public:
     inline QObject *parent() const { return d_ptr->parent; }