diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2012-04-19 12:27:45 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-23 01:22:29 +0200 |
| commit | b332a6c1e484560220eb054686f05c5cc62914b3 (patch) | |
| tree | 0102067c82ab93c8d4c1440a8bda79bab74d60c7 /src/corelib | |
| parent | 5f22899a17389e28930917336512dd531cc9b4f9 (diff) | |
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>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/kernel/qobject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp index a633f503a7..f0f537080e 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); } |