Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
bc26b917
Commit
bc26b917
authored
Apr 26, 2010
by
Marco Bubke
Committed by
Kai Koehne
Apr 27, 2010
Browse files
Revertlist for states are now skipped if the state is destroying.
Task-Number: BAUHAUS-636 Reviewed-by: kkoehne
parent
edb13d33
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/plugins/qmldesigner/core/instances/qmlpropertychangesnodeinstance.cpp
View file @
bc26b917
...
...
@@ -252,7 +252,7 @@ QDeclarativeStateGroup *QmlPropertyChangesObject::stateGroup() const
QDeclarativeStatePrivate
*
QmlPropertyChangesObject
::
statePrivate
()
const
{
if
(
!
parent
())
if
(
!
parent
()
||
QObjectPrivate
::
get
(
parent
())
->
wasDeleted
)
return
0
;
Q_ASSERT
(
qobject_cast
<
QDeclarativeState
*>
(
parent
()));
...
...
@@ -350,12 +350,13 @@ void QmlPropertyChangesObject::removeFromStateRevertList()
while
(
simpleActionIterator
.
hasNext
())
{
QDeclarativeSimpleAction
&
simpleAction
=
simpleActionIterator
.
next
();
if
(
simpleAction
.
specifiedObject
==
targetObject
())
{
Q_ASSERT
(
simpleAction
.
property
.
isValid
());
if
(
simpleAction
.
binding
)
{
QDeclarativePropertyPrivate
::
setBinding
(
simpleAction
.
property
,
simpleAction
.
binding
);
}
else
if
(
simpleAction
.
value
.
isValid
())
{
QDeclarativePropertyPrivate
::
setBinding
(
simpleAction
.
property
,
0
);
simpleAction
.
property
.
write
(
simpleAction
.
value
);
if
(
simpleAction
.
property
.
isValid
())
{
if
(
simpleAction
.
binding
)
{
QDeclarativePropertyPrivate
::
setBinding
(
simpleAction
.
property
,
simpleAction
.
binding
);
}
else
if
(
simpleAction
.
value
.
isValid
())
{
QDeclarativePropertyPrivate
::
setBinding
(
simpleAction
.
property
,
0
);
simpleAction
.
property
.
write
(
simpleAction
.
value
);
}
}
simpleActionIterator
.
remove
();
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment