From b332a6c1e484560220eb054686f05c5cc62914b3 Mon Sep 17 00:00:00 2001
From: Michael Brasser <michael.brasser@nokia.com>
Date: Thu, 19 Apr 2012 12:27:45 +1000
Subject: [PATCH] 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>
---
 src/corelib/kernel/qobject.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
index a633f503a71..f0f537080e5 100644
--- 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);
     }