diff options
| author | Sze Howe Koh <szehowe.koh@gmail.com> | 2020-01-26 16:39:05 +0800 |
|---|---|---|
| committer | Sze Howe Koh <szehowe.koh@gmail.com> | 2020-01-27 21:31:08 +0800 |
| commit | e44de91a2cab6e3c4632523e644fadaa93b89364 (patch) | |
| tree | bfa3d9975aad650be1e1eb2c085c36df3572a32f | |
| parent | 582311d1224cb196d8149bdfd8f178d5239c6b28 (diff) | |
Doc: Clarify usage of Qt::ReturnByValue in QCursor
Change-Id: I6ce2c658dc0e72beb9e7a2497c6dbdbc71d96bc5
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| -rw-r--r-- | src/corelib/global/qnamespace.qdoc | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qcursor.cpp | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index 169c296bcd..29b58783d5 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -3326,6 +3326,8 @@ This is a dummy type, designed to help users transition from certain deprecated APIs to their replacement APIs. + \sa QCursor::bitmap() + \sa QCursor::mask() \sa QLabel::picture() \sa QLabel::pixmap() */ diff --git a/src/gui/kernel/qcursor.cpp b/src/gui/kernel/qcursor.cpp index 2018d28d92..7f6fdafbd0 100644 --- a/src/gui/kernel/qcursor.cpp +++ b/src/gui/kernel/qcursor.cpp @@ -614,8 +614,8 @@ const QBitmap *QCursor::mask() const QBitmap bmpVal = cursor->bitmap(Qt::ReturnByValue); \endcode - If you disable the deprecated version, then you can omit \c Qt::ReturnByValue - as shown below: + If you disable the deprecated version using the QT_DISABLE_DEPRECATED_BEFORE + macro, then you can omit \c Qt::ReturnByValue as shown below: \code QBitmap bmpVal = cursor->bitmap(); @@ -646,8 +646,8 @@ QBitmap QCursor::bitmap(Qt::ReturnByValue_t) const QBitmap bmpVal = cursor->mask(Qt::ReturnByValue); \endcode - If you disable the deprecated version, then you can omit \c Qt::ReturnByValue - as shown below: + If you disable the deprecated version using the QT_DISABLE_DEPRECATED_BEFORE + macro, then you can omit \c Qt::ReturnByValue as shown below: \code QBitmap bmpVal = cursor->mask(); |