Don't assume QAbstractDeclarativeData::objectNameChanged is available.

Preparation for removal from declarative now that a proper NOTIFY
signal exists.

Change-Id: If0acb73b73d17c49dc8de211d95ecd1e8e80ff1b
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>

diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
index a633f50..f0f5370 100644 (file)
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
@@ -989,7 +989,7 @@ void QObject::setObjectName(const QString &name)
     Q_D(QObject);
     if (d->objectName != name) {
         d->objectName = name;
-        if (d->declarativeData)
+        if (d->declarativeData && d->declarativeData->objectNameChanged)
             d->declarativeData->objectNameChanged(d->declarativeData, this);
         emit objectNameChanged(d->objectName);
     }