diff options
author | Sze Howe Koh <szehowe.koh@gmail.com> | 2020-01-26 16:52:47 +0800 |
---|---|---|
committer | Sze Howe Koh <szehowe.koh@gmail.com> | 2020-02-06 07:37:15 +0800 |
commit | c3050b6d96d636e53ead46c1009b83453565221c (patch) | |
tree | b8ece26323bf78d68b45893c0b6342f1515b3690 /src/corelib/global | |
parent | 74a2467edd1bf0800cbaf1878984c6bccd42570d (diff) |
Rename Qt::ReturnByValue_t -> Qt::ReturnByValueConstant
Copy the convention of QDeadlineTimer::ForeverConstant
Task-number: QTBUG-48701
Change-Id: Ic7760b7ffec630f1cd47361f5adda3f17fffb9f6
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib/global')
-rw-r--r-- | src/corelib/global/qnamespace.h | 2 | ||||
-rw-r--r-- | src/corelib/global/qnamespace.qdoc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index ea2c635303..17ae73536d 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -1770,7 +1770,7 @@ public: }; // QTBUG-48701 - enum ReturnByValue_t { ReturnByValue }; // ### Qt 7: Remove me + enum ReturnByValueConstant { ReturnByValue }; // ### Qt 7: Remove me #ifndef Q_QDOC // NOTE: Generally, do not add QT_Q_ENUM if a corresponding Q_Q_FLAG exists. diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index 6a84662323..708ecb11ab 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -3334,7 +3334,7 @@ */ /*! - \enum Qt::ReturnByValue_t + \enum Qt::ReturnByValueConstant \since 5.15 This is a dummy type, designed to help users transition from certain deprecated APIs to their replacement APIs. |