diff --git a/src/corelib/io/qdir.cpp b/src/corelib/io/qdir.cpp
index 09315f9afe5..079063b77af 100644
--- a/src/corelib/io/qdir.cpp
+++ b/src/corelib/io/qdir.cpp
@@ -706,7 +706,7 @@ static int drivePrefixLength(const QString &path)
 
 static bool treatAsAbsolute(const QString &path)
 {
-    // ### Qt 6: be consistent about absolute paths
+    // ### Qt 7: be consistent about absolute paths
 
     // QFileInfo will use the right FS-engine for virtual file-systems
     // (e.g. resource paths).  Unfortunately, for real file-systems, it relies
diff --git a/src/corelib/io/qfileinfo.cpp b/src/corelib/io/qfileinfo.cpp
index 963a936d3a2..f77fdae3710 100644
--- a/src/corelib/io/qfileinfo.cpp
+++ b/src/corelib/io/qfileinfo.cpp
@@ -399,7 +399,7 @@ QFileInfo::~QFileInfo()
 bool QFileInfo::operator==(const QFileInfo &fileinfo) const
 {
     Q_D(const QFileInfo);
-    // ### Qt 5: understand long and short file names on Windows
+    // ### Qt 7: understand long and short file names on Windows
     // ### (GetFullPathName()).
     if (fileinfo.d_ptr == d_ptr)
         return true;
diff --git a/src/corelib/io/qsettings_win.cpp b/src/corelib/io/qsettings_win.cpp
index e88d738fe4a..348ddffa329 100644
--- a/src/corelib/io/qsettings_win.cpp
+++ b/src/corelib/io/qsettings_win.cpp
@@ -103,7 +103,7 @@ static void mergeKeySets(NameSet *dest, const QStringList &src)
 ** Wrappers for the insane windows registry API
 */
 
-// ### Qt 6: Use new helpers from qwinregistry.cpp (once bootstrap builds are obsolete)
+// ### Qt 7: Use new helpers from qwinregistry.cpp (once bootstrap builds are obsolete)
 
 // Open a key with the specified "perms".
 // "access" is to explicitly use the 32- or 64-bit branch.
diff --git a/src/corelib/itemmodels/qsortfilterproxymodel.cpp b/src/corelib/itemmodels/qsortfilterproxymodel.cpp
index 27cf624c51b..62054aa9ee5 100644
--- a/src/corelib/itemmodels/qsortfilterproxymodel.cpp
+++ b/src/corelib/itemmodels/qsortfilterproxymodel.cpp
@@ -2337,7 +2337,7 @@ Qt::DropActions QSortFilterProxyModel::supportedDropActions() const
     return d->model->supportedDropActions();
 }
 
-// Qt6: remove unnecessary reimplementation
+// ### Qt 7: remove unnecessary reimplementation
 /*!
   \reimp
 */
diff --git a/src/dbus/qdbusabstractinterface.cpp b/src/dbus/qdbusabstractinterface.cpp
index 363ec83ccee..42296a069d5 100644
--- a/src/dbus/qdbusabstractinterface.cpp
+++ b/src/dbus/qdbusabstractinterface.cpp
@@ -25,7 +25,7 @@ QT_BEGIN_NAMESPACE
 using namespace Qt::StringLiterals;
 
 namespace {
-// ### Qt6: change to a regular QEvent (customEvent)
+// ### Qt 7: change to a regular QEvent (customEvent)
 // We need to use a QMetaCallEvent here because we can't override customEvent() in
 // Qt 5. Since QDBusAbstractInterface is meant to be derived from, the vtables of
 // classes in generated code will have a pointer to QObject::customEvent instead
diff --git a/src/gui/kernel/qplatformdialoghelper.h b/src/gui/kernel/qplatformdialoghelper.h
index 83857ba82e8..d489f4505c1 100644
--- a/src/gui/kernel/qplatformdialoghelper.h
+++ b/src/gui/kernel/qplatformdialoghelper.h
@@ -84,7 +84,7 @@ class Q_GUI_EXPORT QPlatformDialogHelper : public QObject
 
     enum ButtonRole {
         // keep this in sync with QDialogButtonBox::ButtonRole and QMessageBox::ButtonRole
-        // TODO Qt 6: make the enum copies explicit, and make InvalidRole == 0 so that
+        // ### Qt 7: make the enum copies explicit, and make InvalidRole == 0 so that
         // AcceptRole can be or'ed with flags, and EOL can be the same as InvalidRole (null-termination)
         InvalidRole = -1,
         AcceptRole,
diff --git a/src/gui/math3d/qmatrix4x4.h b/src/gui/math3d/qmatrix4x4.h
index 0af8738b619..3390dbf8ed9 100644
--- a/src/gui/math3d/qmatrix4x4.h
+++ b/src/gui/math3d/qmatrix4x4.h
@@ -395,7 +395,7 @@ inline QMatrix4x4& QMatrix4x4::operator-=(const QMatrix4x4& other)
 
 inline QMatrix4x4& QMatrix4x4::operator*=(const QMatrix4x4& o)
 {
-    const QMatrix4x4 other = o; // prevent aliasing when &o == this ### Qt 6: take o by value
+    const QMatrix4x4 other = o; // prevent aliasing when &o == this ### Qt 7: take o by value
     flagBits |= other.flagBits;
 
     if (flagBits.toInt() < Rotation2D) {
diff --git a/src/gui/text/windows/qwindowsfontdatabasebase.cpp b/src/gui/text/windows/qwindowsfontdatabasebase.cpp
index a6df42da95c..05b516b623a 100644
--- a/src/gui/text/windows/qwindowsfontdatabasebase.cpp
+++ b/src/gui/text/windows/qwindowsfontdatabasebase.cpp
@@ -689,7 +689,7 @@ HFONT QWindowsFontDatabaseBase::systemFont()
 
 QFont QWindowsFontDatabaseBase::systemDefaultFont()
 {
-    // Qt 6: Obtain default GUI font (typically "Segoe UI, 9pt", see QTBUG-58610)
+    // ### Qt 7: Obtain default GUI font (typically "Segoe UI, 9pt", see QTBUG-58610)
     NONCLIENTMETRICS ncm;
     ncm.cbSize = FIELD_OFFSET(NONCLIENTMETRICS, lfMessageFont) + sizeof(LOGFONT);
     SystemParametersInfo(SPI_GETNONCLIENTMETRICS, ncm.cbSize , &ncm, 0);
diff --git a/src/plugins/platforms/windows/qwindowsclipboard.cpp b/src/plugins/platforms/windows/qwindowsclipboard.cpp
index 9bdd3314670..19e11f686ab 100644
--- a/src/plugins/platforms/windows/qwindowsclipboard.cpp
+++ b/src/plugins/platforms/windows/qwindowsclipboard.cpp
@@ -182,7 +182,7 @@ void QWindowsClipboard::unregisterViewer()
     }
 }
 
-// ### FIXME: Qt 6: Remove the clipboard chain handling code and make the
+// ### Qt 7: Remove the clipboard chain handling code and make the
 // format listener the default.
 
 static bool isProcessBeingDebugged(HWND hwnd)
diff --git a/src/widgets/doc/snippets/code/src_gui_kernel_qapplication.cpp b/src/widgets/doc/snippets/code/src_gui_kernel_qapplication.cpp
index a31e720fb13..7e3c3f89c88 100644
--- a/src/widgets/doc/snippets/code/src_gui_kernel_qapplication.cpp
+++ b/src/widgets/doc/snippets/code/src_gui_kernel_qapplication.cpp
@@ -31,7 +31,7 @@ QApplication::setStyle(QStyleFactory::create("Fusion"));
 //! [1]
 
 
-// ### fixme: Qt 6: Remove [2]
+// ### Qt 7: Remove [2]
 //! [2]
 int main(int argc, char *argv[])
 {
diff --git a/src/widgets/itemviews/qheaderview.h b/src/widgets/itemviews/qheaderview.h
index 6118faa868d..138f74bc59e 100644
--- a/src/widgets/itemviews/qheaderview.h
+++ b/src/widgets/itemviews/qheaderview.h
@@ -211,7 +211,7 @@ protected Q_SLOTS:
 private:
     void initStyleOption(QStyleOptionFrame *option) const override;
 
-    // ### Qt6: make them protected slots in QHeaderViewPrivate
+    // ### Qt 7: make them protected slots in QHeaderViewPrivate
     Q_PRIVATE_SLOT(d_func(), void _q_sectionsRemoved(const QModelIndex &parent, int logicalFirst, int logicalLast))
     Q_PRIVATE_SLOT(d_func(), void _q_sectionsAboutToBeMoved(const QModelIndex &sourceParent, int logicalStart, int logicalEnd, const QModelIndex &destinationParent, int logicalDestination))
     Q_PRIVATE_SLOT(d_func(), void _q_sectionsMoved(const QModelIndex &sourceParent, int logicalStart, int logicalEnd, const QModelIndex &destinationParent, int logicalDestination))
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
index ab129b73e70..59e84ff5364 100644
--- a/src/widgets/kernel/qwidget.cpp
+++ b/src/widgets/kernel/qwidget.cpp
@@ -1113,7 +1113,7 @@ bool q_evaluateRhiConfig(const QWidget *w, QPlatformBackingStoreRhiConfig *outCo
     return false;
 }
 
-// ### fixme: Qt 6: Remove parameter window from QWidget::create()
+// ### Qt 7: Remove parameter window from QWidget::create()
 
 /*!
     Creates a new widget window.
diff --git a/src/widgets/styles/qcommonstyle.cpp b/src/widgets/styles/qcommonstyle.cpp
index bf6aca03803..d8ce1b738fd 100644
--- a/src/widgets/styles/qcommonstyle.cpp
+++ b/src/widgets/styles/qcommonstyle.cpp
@@ -5327,7 +5327,7 @@ int QCommonStyle::styleHint(StyleHint sh, const QStyleOption *opt, const QWidget
         break;
 #endif
     case SH_Widget_Animate:
-    // TODO Qt6: move this code in the SH_Widget_Animation_Duration case
+    // ### Qt 7: move this code in the SH_Widget_Animation_Duration case
     // and replace false with 0 and true with 200.
 #if QT_CONFIG(treeview)
         if (qobject_cast<const QTreeView*>(widget)) {
diff --git a/tests/auto/dbus/qdbusabstractinterface/interface.cpp b/tests/auto/dbus/qdbusabstractinterface/interface.cpp
index 293996b4bbf..4d72773cbce 100644
--- a/tests/auto/dbus/qdbusabstractinterface/interface.cpp
+++ b/tests/auto/dbus/qdbusabstractinterface/interface.cpp
@@ -9,7 +9,7 @@ Interface::Interface()
 }
 
 // Export the sleep function
-// TODO QT5: remove this class, QThread::msleep is now public
+// ### Qt 7: remove this class, QThread::msleep is now public
 class FriendlySleepyThread : public QThread {
 public:
     using QThread::msleep;
diff --git a/tests/auto/gui/image/qimage/tst_qimage.cpp b/tests/auto/gui/image/qimage/tst_qimage.cpp
index d04d42e0b21..9a34fabecad 100644
--- a/tests/auto/gui/image/qimage/tst_qimage.cpp
+++ b/tests/auto/gui/image/qimage/tst_qimage.cpp
@@ -3976,7 +3976,7 @@ void tst_QImage::wideImage()
     painter.setCompositionMode(QPainter::CompositionMode_Source);
     painter.drawImage(0, 0, i2);
 
-    // Qt6: Test that it actually works on 64bit architectures.
+    // ### Qt 7: Test that it actually works on 64bit architectures.
 }
 
 void tst_QImage::largeFillScale()
diff --git a/tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp b/tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp
index ebddefb5fdd..b25e6ffa1ba 100644
--- a/tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp
+++ b/tests/auto/sql/models/qsqltablemodel/tst_qsqltablemodel.cpp
@@ -1878,7 +1878,7 @@ void tst_QSqlTableModel::submitAllOnInvalidTable()
     model.setEditStrategy(QSqlTableModel::OnManualSubmit);
 
     // setTable returns a void, so the error can only be caught by
-    // manually checking lastError(). ### Qt5: This should be changed!
+    // manually checking lastError(). ### Qt 7: This should be changed!
     model.setTable(qTableName("invalidTable", __FILE__, db));
     QCOMPARE(model.lastError().type(), QSqlError::StatementError);
 
diff --git a/tests/auto/xml/dom/qdom/tst_qdom.cpp b/tests/auto/xml/dom/qdom/tst_qdom.cpp
index de358614190..08dce3df445 100644
--- a/tests/auto/xml/dom/qdom/tst_qdom.cpp
+++ b/tests/auto/xml/dom/qdom/tst_qdom.cpp
@@ -1466,7 +1466,7 @@ void tst_QDom::normalizeEndOfLine() const
 
     const QString expected(QLatin1String("<a>\nc\nc\na\na</a>"));
 
-    // ### Qt 6: fix this, if we keep QDom at all
+    // ### Qt 7: fix this, if we keep QDom at all
     QEXPECT_FAIL("", "The parser doesn't perform newline normalization. Fixing that would change behavior.", Continue);
     QCOMPARE(doc.documentElement().text(), expected);
 }