forked from qt-creator/qt-creator
Fix crash for reseting a property
Task-Number: BAUHAUS-606
(cherry picked from commit 212afcfa92
)
This commit is contained in:
@@ -296,11 +296,13 @@ void QmlPropertyChangesObject::removeActionForProperty(const QString &propertyNa
|
||||
actionIterator.remove();
|
||||
}
|
||||
|
||||
QMutableListIterator<QDeclarativeSimpleAction> simpleActionIterator(statePrivate()->revertList);
|
||||
while (simpleActionIterator.hasNext()) {
|
||||
QDeclarativeSimpleAction &qmlSimpleAction = simpleActionIterator.next();
|
||||
if (qmlSimpleAction.specifiedProperty == propertyName && qmlSimpleAction.specifiedObject == targetObject()) {
|
||||
simpleActionIterator.remove();
|
||||
if (statePrivate()) {
|
||||
QMutableListIterator<QDeclarativeSimpleAction> simpleActionIterator(statePrivate()->revertList);
|
||||
while (simpleActionIterator.hasNext()) {
|
||||
QDeclarativeSimpleAction &qmlSimpleAction = simpleActionIterator.next();
|
||||
if (qmlSimpleAction.specifiedProperty == propertyName && qmlSimpleAction.specifiedObject == targetObject()) {
|
||||
simpleActionIterator.remove();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user