diff options
-rw-r--r-- | src/quick/handlers/qquicksinglepointhandler.cpp | 2 | ||||
-rw-r--r-- | src/quick/items/qquickitem.cpp | 10 | ||||
-rw-r--r-- | src/quick/items/qquickpainteditem.cpp | 4 |
3 files changed, 10 insertions, 6 deletions
diff --git a/src/quick/handlers/qquicksinglepointhandler.cpp b/src/quick/handlers/qquicksinglepointhandler.cpp index 8b1d8c11b9..1a5537b732 100644 --- a/src/quick/handlers/qquicksinglepointhandler.cpp +++ b/src/quick/handlers/qquicksinglepointhandler.cpp @@ -470,7 +470,7 @@ void QQuickHandlerPoint::reset() If the contact patch is unknown, or the device is not a touchscreen, these values will be zero. - \sa QtQuick::EventPoint::ellipseDiameters, QtQuick::TouchPoint::ellipseDiameters, QTouchEvent::TouchPoint::ellipseDiameters + \sa QtQuick::EventTouchPoint::ellipseDiameters, QtQuick::TouchPoint::ellipseDiameters, QTouchEvent::TouchPoint::ellipseDiameters */ QT_END_NAMESPACE diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp index 9373da33dd..2576886abf 100644 --- a/src/quick/items/qquickitem.cpp +++ b/src/quick/items/qquickitem.cpp @@ -3956,8 +3956,8 @@ void QQuickItem::inputMethodEvent(QInputMethodEvent *event) /*! This event handler can be reimplemented in a subclass to receive focus-in - events for an item. The event information is provided by the - \a event parameter. + events for an item. The event information is provided by the \c event + parameter. */ void QQuickItem::focusInEvent(QFocusEvent * /*event*/) { @@ -3973,8 +3973,8 @@ void QQuickItem::focusInEvent(QFocusEvent * /*event*/) /*! This event handler can be reimplemented in a subclass to receive focus-out - events for an item. The event information is provided by the - \a event parameter. + events for an item. The event information is provided by the \c event + parameter. */ void QQuickItem::focusOutEvent(QFocusEvent * /*event*/) { @@ -5179,8 +5179,8 @@ void QQuickItem::updateInputMethod(Qt::InputMethodQueries queries) } #endif // im -/*! \internal */ // XXX todo - do we want/need this anymore? +/*! \internal */ QRectF QQuickItem::boundingRect() const { Q_D(const QQuickItem); diff --git a/src/quick/items/qquickpainteditem.cpp b/src/quick/items/qquickpainteditem.cpp index 197c4c6348..57848919f3 100644 --- a/src/quick/items/qquickpainteditem.cpp +++ b/src/quick/items/qquickpainteditem.cpp @@ -675,6 +675,10 @@ QSGTextureProvider *QQuickPaintedItem::textureProvider() const return d->textureProvider; } + +/*! + \reimp +*/ void QQuickPaintedItem::itemChange(ItemChange change, const ItemChangeData &value) { if (change == ItemDevicePixelRatioHasChanged) |