diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-11-29 15:09:56 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-29 15:09:56 +0100 |
| commit | 7079f1121325cedfb59c753870bd227a897ce6c7 (patch) | |
| tree | 5b294835464ed6b00aa3eb59854cbae5a50c2e76 /src/corelib/kernel/qobject.cpp | |
| parent | af1dbfd2239c7834187f3a702fb2029dc78d4526 (diff) | |
| parent | 8e04691543ae3906e011f47d446ac7a94034259e (diff) | |
Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging/stable
Diffstat (limited to 'src/corelib/kernel/qobject.cpp')
| -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 e02026ca4c..7d2410a18a 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -1876,7 +1876,7 @@ void QObjectPrivate::setParent_helper(QObject *o) } } } - if (!isDeletingChildren && declarativeData && QAbstractDeclarativeData::parentChanged) + if (!wasDeleted && !isDeletingChildren && declarativeData && QAbstractDeclarativeData::parentChanged) QAbstractDeclarativeData::parentChanged(declarativeData, q, o); } |