1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Doc: Clarify usage of Qt::ReturnByValue in QCursor

Browse Source 
Change-Id: I6ce2c658dc0e72beb9e7a2497c6dbdbc71d96bc5
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
This commit is contained in:
Sze Howe Koh 2020-01-26 16:39:05 +08:00
parent 582311d122
commit e44de91a2c
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/global/qnamespace.qdoc
View File

@ -3326,6 +3326,8 @@
This is a dummy type, designed to help users transition from certain deprecated APIs to their replacement APIs. 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::picture()
\sa QLabel::pixmap() \sa QLabel::pixmap()
*/ */

8
src/gui/kernel/qcursor.cpp
View File

@ -614,8 +614,8 @@ const QBitmap *QCursor::mask() const
QBitmap bmpVal = cursor->bitmap(Qt::ReturnByValue); QBitmap bmpVal = cursor->bitmap(Qt::ReturnByValue);
\endcode \endcode
If you disable the deprecated version, then you can omit \c Qt::ReturnByValue If you disable the deprecated version using the QT_DISABLE_DEPRECATED_BEFORE
as shown below: macro, then you can omit \c Qt::ReturnByValue as shown below:
\code \code
QBitmap bmpVal = cursor->bitmap(); QBitmap bmpVal = cursor->bitmap();
@ -646,8 +646,8 @@ QBitmap QCursor::bitmap(Qt::ReturnByValue_t) const
QBitmap bmpVal = cursor->mask(Qt::ReturnByValue); QBitmap bmpVal = cursor->mask(Qt::ReturnByValue);
\endcode \endcode
If you disable the deprecated version, then you can omit \c Qt::ReturnByValue If you disable the deprecated version using the QT_DISABLE_DEPRECATED_BEFORE
as shown below: macro, then you can omit \c Qt::ReturnByValue as shown below:
\code \code
QBitmap bmpVal = cursor->mask(); QBitmap bmpVal = cursor->mask();