From e44de91a2cab6e3c4632523e644fadaa93b89364 Mon Sep 17 00:00:00 2001 From: Sze Howe Koh Date: Sun, 26 Jan 2020 16:39:05 +0800 Subject: Doc: Clarify usage of Qt::ReturnByValue in QCursor Change-Id: I6ce2c658dc0e72beb9e7a2497c6dbdbc71d96bc5 Reviewed-by: Paul Wicking --- src/corelib/global/qnamespace.qdoc | 2 ++ src/gui/kernel/qcursor.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'src') 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(); -- cgit v1.2.3