Commit 8f7b58cd authored by Jan Hambrecht's avatar Jan Hambrecht

fix merge conflict

parent 6ad28e04
......@@ -127,7 +127,8 @@ public:
ParameterChanged, ///< the shapes parameter has changed (KoParameterShape only)
ContentChanged, ///< the content of the shape changed e.g. a new image inside a pixmap/text change inside a textshape
TextRunAroundChanged, ///< used after a setTextRunAroundSide()
ChildChanged ///< a child of a container was changed/removed. This is propagated to all parents
ChildChanged, ///< a child of a container was changed/removed. This is propagated to all parents
ConnectionPointChanged ///< a connection point has changed
};
/// See QGraphicsItem::CacheMode
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment