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/kernel | |
| 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/kernel')
| -rw-r--r-- | src/corelib/kernel/qcoreapplication.cpp | 4 | ||||
| -rw-r--r-- | src/corelib/kernel/qmetaobject_p.h | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp index 44d8b8100a..38cc445e2a 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp @@ -1282,7 +1282,7 @@ void QCoreApplication::processEvents(QEventLoop::ProcessEventsFlags flags) */ void QCoreApplication::processEvents(QEventLoop::ProcessEventsFlags flags, int ms) { - // ### Qt 6: consider splitting this method into a public and a private + // ### TODO: consider splitting this method into a public and a private // one, so that a user-invoked processEvents can be detected // and handled properly. QThreadData *data = QThreadData::current(); @@ -1645,7 +1645,7 @@ bool QCoreApplication::compressEvent(QEvent *event, QObject *receiver, QPostEven */ void QCoreApplication::sendPostedEvents(QObject *receiver, int event_type) { - // ### Qt 6: consider splitting this method into a public and a private + // ### TODO: consider splitting this method into a public and a private // one, so that a user-invoked sendPostedEvents can be detected // and handled properly. QThreadData *data = QThreadData::current(); diff --git a/src/corelib/kernel/qmetaobject_p.h b/src/corelib/kernel/qmetaobject_p.h index 574acafd1f..f98185ac81 100644 --- a/src/corelib/kernel/qmetaobject_p.h +++ b/src/corelib/kernel/qmetaobject_p.h @@ -62,8 +62,7 @@ #include <QtCore/qvarlengtharray.h> QT_BEGIN_NAMESPACE -// ### TODO Qt6: add a proper namespace with Q_NAMESPACE and use scoped enums -// A namespace and scoped are needed to avoid enum clashes +// ### TODO - QTBUG-87869: wrap in a proper Q_NAMESPACE and use scoped enums, to avoid name clashes enum PropertyFlags { Invalid = 0x00000000, |