diff options
Diffstat (limited to 'src/location/declarativemaps/qparameterizableobject.cpp')
-rw-r--r-- | src/location/declarativemaps/qparameterizableobject.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/location/declarativemaps/qparameterizableobject.cpp b/src/location/declarativemaps/qparameterizableobject.cpp index 25c535e0..b1e588e6 100644 --- a/src/location/declarativemaps/qparameterizableobject.cpp +++ b/src/location/declarativemaps/qparameterizableobject.cpp @@ -94,11 +94,9 @@ public: static bool initialized = false; if (!initialized) { initialized = true; - QAbstractDeclarativeData::parentChanged = parentChanged; } } - static void parentChanged(QAbstractDeclarativeData *d, QObject *o, QObject *p); }; Q_GLOBAL_STATIC(QParameterizableObjectData, parametrizableObjectData) @@ -109,13 +107,12 @@ QParameterizableObject::QParameterizableObject(QObject *parent) QObjectPrivate::get(this)->declarativeData = parametrizableObjectData; } -void QParameterizableObjectData::parentChanged(QAbstractDeclarativeData *d, QObject *o, QObject *p) +void QParameterizableObject::setParentAndNotify(QObject *parent) { - Q_UNUSED(p); - Q_UNUSED(d); - QParameterizableObject *po = qobject_cast<QParameterizableObject *>(o); - if (po) - po->parentChanged(); + QObject *oldParent = this->parent(); + QObject::setParent(parent); + if (parent != oldParent) + emit parentChanged(); } QT_END_NAMESPACE |