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
Tobias Hunger
qt-creator
Commits
70fd2c21
Commit
70fd2c21
authored
Oct 25, 2010
by
Thomas Hartmann
Browse files
QmlDesigner.NodeInstances: crash fix
This patch avoids a recursion. Reviewed-by: Marco Bubke
parent
742d9008
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/plugins/qmldesigner/designercore/instances/qmlgraphicsitemnodeinstance.cpp
View file @
70fd2c21
...
...
@@ -247,16 +247,22 @@ QVariant QmlGraphicsItemNodeInstance::property(const QString &name) const
double
implicitWidth
=
qmlGraphicsItem
()
->
implicitWidth
();
if
(
!
m_hasWidth
&&
implicitWidth
// WORKAROUND
&&
implicitWidth
!=
qmlGraphicsItem
()
->
width
())
qmlGraphicsItem
()
->
setWidth
(
implicitWidth
);
&&
implicitWidth
!=
qmlGraphicsItem
()
->
width
())
{
qmlGraphicsItem
()
->
blockSignals
(
true
);
qmlGraphicsItem
()
->
setWidth
(
implicitWidth
);
qmlGraphicsItem
()
->
blockSignals
(
false
);
}
}
if
(
name
==
"height"
&&
modelNode
().
isValid
()
&&
!
modelNode
().
hasBindingProperty
(
"height"
))
{
double
implicitHeight
=
qmlGraphicsItem
()
->
implicitHeight
();
if
(
!
m_hasHeight
&&
implicitHeight
// WORKAROUND
&&
implicitHeight
!=
qmlGraphicsItem
()
->
height
())
qmlGraphicsItem
()
->
setHeight
(
implicitHeight
);
&&
implicitHeight
!=
qmlGraphicsItem
()
->
height
())
{
qmlGraphicsItem
()
->
blockSignals
(
true
);
qmlGraphicsItem
()
->
setHeight
(
implicitHeight
);
qmlGraphicsItem
()
->
blockSignals
(
false
);
}
}
return
GraphicsObjectNodeInstance
::
property
(
name
);
...
...
Write
Preview
Markdown
is supported
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