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/io | |
| 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/io')
| -rw-r--r-- | src/corelib/io/qfileinfo.cpp | 1 | ||||
| -rw-r--r-- | src/corelib/io/qiodevice.h | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/corelib/io/qfileinfo.cpp b/src/corelib/io/qfileinfo.cpp index 7e1e62a775..8b80141a32 100644 --- a/src/corelib/io/qfileinfo.cpp +++ b/src/corelib/io/qfileinfo.cpp @@ -890,7 +890,6 @@ QString QFileInfo::suffix() const QDir QFileInfo::dir() const { Q_D(const QFileInfo); - // ### Qt 6: Maybe rename this to parentDirectory(), considering what it actually does? return QDir(d->fileEntry.path()); } diff --git a/src/corelib/io/qiodevice.h b/src/corelib/io/qiodevice.h index fa43efdb4d..e4388b8972 100644 --- a/src/corelib/io/qiodevice.h +++ b/src/corelib/io/qiodevice.h @@ -98,7 +98,7 @@ public: virtual bool open(OpenMode mode); virtual void close(); - // ### Qt 6: pos() and seek() should not be virtual, and + // ### Qt 7 - QTBUG-76492: pos() and seek() should not be virtual, and // ### seek() should call a virtual seekData() function. virtual qint64 pos() const; virtual qint64 size() const; |