aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Wicking <paul.wicking@qt.io>2021-05-25 15:11:32 +0200
committerPaul Wicking <paul.wicking@qt.io>2021-06-07 10:43:51 +0200
commitf38778445d5ccd4bd0b5555ab327036c521cb553 (patch)
tree3e0b2e4ff3deef0bda1cbc1aa7fd92f4ec93b384 /src
parent9fafa0652c169314043ec3928d7c3ba33f9c3ae8 (diff)
Doc: Use \deprecated instead of \obsolete
Task-number: QTBUG-93990 Change-Id: I74e7dcc04fd5552660e14b011d1a005a7abcb690 Reviewed-by: Topi Reiniƶ <topi.reinio@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/quick/items/context2d/qquickcanvasitem.cpp4
-rw-r--r--src/quick/items/qquickitem.cpp8
-rw-r--r--src/quick/items/qquickpainteditem.cpp8
-rw-r--r--src/quick/items/qquickwindow.cpp2
4 files changed, 11 insertions, 11 deletions
diff --git a/src/quick/items/context2d/qquickcanvasitem.cpp b/src/quick/items/context2d/qquickcanvasitem.cpp
index 110877da45..e13c0f6dae 100644
--- a/src/quick/items/context2d/qquickcanvasitem.cpp
+++ b/src/quick/items/context2d/qquickcanvasitem.cpp
@@ -417,7 +417,7 @@ void QQuickCanvasItem::setCanvasSize(const QSizeF & size)
By default the tileSize is the same as the canvasSize.
- \obsolete This feature is incomplete. For details, see QTBUG-33129.
+ \deprecated This feature is incomplete. For details, see QTBUG-33129.
\sa canvasSize, canvasWindow
*/
@@ -452,7 +452,7 @@ void QQuickCanvasItem::setTileSize(const QSize & size)
can display different visible areas by changing the canvas windowSize
and/or position.
- \obsolete This feature is incomplete. For details, see QTBUG-33129
+ \deprecated This feature is incomplete. For details, see QTBUG-33129.
\sa canvasSize, tileSize
*/
diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp
index 6776685dc2..7fe057ad70 100644
--- a/src/quick/items/qquickitem.cpp
+++ b/src/quick/items/qquickitem.cpp
@@ -7899,7 +7899,7 @@ QQuickPointerHandler *QQuickItemPrivate::effectiveCursorHandler() const
#endif
/*!
- \obsolete Use QPointerEvent::setExclusiveGrabber()
+ \deprecated Use QPointerEvent::setExclusiveGrabber().
Grabs the mouse input.
@@ -7929,7 +7929,7 @@ void QQuickItem::grabMouse()
}
/*!
- \obsolete Use QPointerEvent::setExclusiveGrabber()
+ \deprecated Use QPointerEvent::setExclusiveGrabber().
Releases the mouse grab following a call to grabMouse().
@@ -7991,7 +7991,7 @@ void QQuickItem::setKeepMouseGrab(bool keep)
}
/*!
- \obsolete Use QPointerEvent::setExclusiveGrabber().
+ \deprecated Use QPointerEvent::setExclusiveGrabber().
Grabs the touch points specified by \a ids.
These touch points will be owned by the item until
@@ -8014,7 +8014,7 @@ void QQuickItem::grabTouchPoints(const QList<int> &ids)
}
/*!
- \obsolete Use QEventPoint::setExclusiveGrabber() instead.
+ \deprecated Use QEventPoint::setExclusiveGrabber() instead.
Ungrabs the touch points owned by this item.
*/
void QQuickItem::ungrabTouchPoints()
diff --git a/src/quick/items/qquickpainteditem.cpp b/src/quick/items/qquickpainteditem.cpp
index 6a9599badf..2cf26142c8 100644
--- a/src/quick/items/qquickpainteditem.cpp
+++ b/src/quick/items/qquickpainteditem.cpp
@@ -356,7 +356,7 @@ void QQuickPaintedItem::setTextureSize(const QSize &size)
}
/*!
- \obsolete
+ \deprecated
This function is provided for compatibility, use size in combination
with textureSize to decide the size of what you are drawing.
@@ -381,7 +381,7 @@ QRectF QQuickPaintedItem::contentsBoundingRect() const
/*!
\property QQuickPaintedItem::contentsSize
\brief Obsolete method for setting the contents size.
- \obsolete
+ \deprecated
This function is provided for compatibility, use size in combination
with textureSize to decide the size of what you are drawing.
@@ -408,7 +408,7 @@ void QQuickPaintedItem::setContentsSize(const QSize &size)
}
/*!
- \obsolete
+ \deprecated
This convenience function is equivalent to calling setContentsSize(QSize()).
*/
void QQuickPaintedItem::resetContentsSize()
@@ -419,7 +419,7 @@ void QQuickPaintedItem::resetContentsSize()
/*!
\property QQuickPaintedItem::contentsScale
\brief Obsolete method for scaling the contents.
- \obsolete
+ \deprecated
This function is provided for compatibility, use size() in combination
with textureSize() to decide the size of what you are drawing.
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp
index 4097c71609..e6bfde66ae 100644
--- a/src/quick/items/qquickwindow.cpp
+++ b/src/quick/items/qquickwindow.cpp
@@ -836,7 +836,7 @@ void QQuickWindowPrivate::dirtyItem(QQuickItem *)
}
/*!
- \obsolete Use QPointerEvent::exclusiveGrabber()
+ \deprecated Use QPointerEvent::exclusiveGrabber().
Returns the item which currently has the mouse grab.
*/
QQuickItem *QQuickWindow::mouseGrabberItem() const