diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2020-10-26 13:23:55 +0100 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-11-02 15:04:46 +0100 |
| commit | 5b57ce06a8178e1d62ed9a3ebea417864e263fa6 (patch) | |
| tree | 33b959f38ffef3921d7ff17a317ebaae3b673fd1 /src/corelib/global/qglobal.h | |
| parent | 4703e07a7c4ce9e89cadb0ef1c1ef69f8ed9fb21 (diff) | |
Resolve corelib's remaining ### Qt 6 comments
No action taken at Qt 6, suggesting it shall never happen.
Four removed, one converted to Qt 7, others converted to unversioned TODOs.
Filed Jira tasks, and referenced in comments, for those retained.
There remain two "once bootstrap builds are obsolete" comments and
one other on which pending action may yet happen.
Fixes: QTBUG-85700
Change-Id: Ib140a6a21c63370e51e4734cc591f67573a29d9a
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/corelib/global/qglobal.h')
| -rw-r--r-- | src/corelib/global/qglobal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index d1f00234eb..5856ddfb01 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -1160,7 +1160,7 @@ template <typename Ptr> inline auto qGetPtrHelper(Ptr &ptr) noexcept -> decltype #define QT_TRANSLATE_NOOP3(scope, x, comment) {x, comment} #define QT_TRANSLATE_NOOP3_UTF8(scope, x, comment) {x, comment} -#ifndef QT_NO_TRANSLATION // ### Qt6: This should enclose the NOOPs above +#ifndef QT_NO_TRANSLATION #define QT_TR_N_NOOP(x) x #define QT_TRANSLATE_N_NOOP(scope, x) x |