diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-06 16:12:40 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-06 16:12:41 +0100 |
| commit | 24e2b39e7a06687322a18a158a083eb51a7c0dca (patch) | |
| tree | 1a32caf6dd6db74fbac9553a094bb00b216fa678 /src/quick/items/qquickitem.cpp | |
| parent | 39540124dd0900e0c99dcda8c0ebdf4f3cea8d5e (diff) | |
| parent | daff5f2988cef31442629a48c3b3088abf01837a (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: If9a205bea219b9aca95d78b1e556ca9bbff58dd0
Diffstat (limited to 'src/quick/items/qquickitem.cpp')
| -rw-r--r-- | src/quick/items/qquickitem.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index 72b0e588ec..8a11e31b9f 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -1819,7 +1819,7 @@ void QQuickItemPrivate::updateSubFocusItem(QQuickItem *scope, bool focus) \value Bottom The center point of the bottom of the item. \value BottomRight The bottom-right corner of the item. - \sa transformOrigin + \sa transformOrigin(), setTransformOrigin() */ /*! @@ -2425,7 +2425,7 @@ void QQuickItem::stackAfter(const QQuickItem *sibling) Returns the window in which this item is rendered. The item does not have a window until it has been assigned into a scene. The - \l windowChanged signal provides a notification both when the item is entered + \l windowChanged() signal provides a notification both when the item is entered into a scene and when it is removed from a scene. */ QQuickWindow *QQuickItem::window() const @@ -4487,7 +4487,7 @@ void QQuickItemPrivate::deliverInputMethodEvent(QInputMethodEvent *e) QQuickItem::itemChange(change, value); \endcode typically at the end of your implementation, to ensure the - \l windowChanged signal will be emitted. + \l windowChanged() signal will be emitted. */ void QQuickItem::itemChange(ItemChange change, const ItemChangeData &value) { |