Bump some Qt 5 to-do's to Qt 6.

Source-incompatible changes are no longer desirable for Qt 5, so these
items must wait until at least Qt 6.

Task-number: QTBUG-23524
Change-Id: I0b9ae5f6f3a792e0169a4b0d3aefbdcb744acd2f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>

13 files changed, 16 insertions, 16 deletions

diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h
index d180e63198..5666afbad8 100644
--- a/src/corelib/global/qlibraryinfo.h
+++ b/src/corelib/global/qlibraryinfo.h
@@ -88,7 +88,7 @@ public:
 #endif
         SettingsPath = 100
     };
-    static QString location(LibraryLocation); // ### Qt 5: consider renaming it to path()
+    static QString location(LibraryLocation); // ### Qt 6: consider renaming it to path()
 #ifdef QT_BUILD_QMAKE
     static QString rawLocation(LibraryLocation);
 #endif
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h
index 4ea62c77a6..fa13bedab6 100644
--- a/src/corelib/global/qnamespace.h
+++ b/src/corelib/global/qnamespace.h
@@ -153,7 +153,7 @@ public:
         NoButton         = 0x00000000,
         LeftButton       = 0x00000001,
         RightButton      = 0x00000002,
-        MidButton        = 0x00000004, // ### Qt 5: remove me
+        MidButton        = 0x00000004, // ### Qt 6: remove me
         MiddleButton     = MidButton,
         XButton1         = 0x00000008,
         BackButton       = XButton1,
diff --git a/src/corelib/io/qfileinfo.cpp b/src/corelib/io/qfileinfo.cpp
index 044c71d00a..1805e759ab 100644
--- a/src/corelib/io/qfileinfo.cpp
+++ b/src/corelib/io/qfileinfo.cpp
@@ -830,7 +830,7 @@ QString QFileInfo::suffix() const
 QDir QFileInfo::dir() const
 {
     Q_D(const QFileInfo);
-    // ### Qt5: Maybe rename this to parentDirectory(), considering what it actually do?
+    // ### 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 eba408b285..8e39f9ccd7 100644
--- a/src/corelib/io/qiodevice.h
+++ b/src/corelib/io/qiodevice.h
@@ -102,7 +102,7 @@ public:
     virtual bool open(OpenMode mode);
     virtual void close();
 
-    // ### Qt 5: pos() and seek() should not be virtual, and
+    // ### Qt 6: pos() and seek() should not be virtual, and
     // ### seek() should call a virtual seekData() function.
     virtual qint64 pos() const;
     virtual qint64 size() const;
diff --git a/src/corelib/io/qsettings.h b/src/corelib/io/qsettings.h
index a4bb8349a8..ca3fe245ea 100644
--- a/src/corelib/io/qsettings.h
+++ b/src/corelib/io/qsettings.h
@@ -173,8 +173,8 @@ public:
 
     static void setDefaultFormat(Format format);
     static Format defaultFormat();
-    static void setSystemIniPath(const QString &dir); // ### remove in 5.0 (use setPath() instead)
-    static void setUserIniPath(const QString &dir);   // ### remove in 5.0 (use setPath() instead)
+    static void setSystemIniPath(const QString &dir); // ### Qt 6: remove (use setPath() instead)
+    static void setUserIniPath(const QString &dir);   // ### Qt 6: remove (use setPath() instead)
     static void setPath(Format format, Scope scope, const QString &path);
 
     typedef QMap<QString, QVariant> SettingsMap;
diff --git a/src/corelib/tools/qbytearray.h b/src/corelib/tools/qbytearray.h
index 7711d7349e..dd35fcd9bc 100644
--- a/src/corelib/tools/qbytearray.h
+++ b/src/corelib/tools/qbytearray.h
@@ -339,7 +339,7 @@ public:
     QByteArray &setNum(qulonglong, int base = 10);
     QByteArray &setNum(float, char f = 'g', int prec = 6);
     QByteArray &setNum(double, char f = 'g', int prec = 6);
-    QByteArray &setRawData(const char *a, uint n); // ### Qt 5: use an int
+    QByteArray &setRawData(const char *a, uint n); // ### Qt 6: use an int
 
     static QByteArray number(int, int base = 10);
     static QByteArray number(uint, int base = 10);
diff --git a/src/corelib/tools/qline.h b/src/corelib/tools/qline.h
index 92ea4ea426..f2e0d4380a 100644
--- a/src/corelib/tools/qline.h
+++ b/src/corelib/tools/qline.h
@@ -245,7 +245,7 @@ public:
     QLineF unitVector() const;
     Q_DECL_CONSTEXPR inline QLineF normalVector() const;
 
-    // ### Qt 5: rename intersects() or intersection() and rename IntersectType IntersectionType
+    // ### Qt 6: rename intersects() or intersection() and rename IntersectType IntersectionType
     IntersectType intersect(const QLineF &l, QPointF *intersectionPoint) const;
 
     qreal angle(const QLineF &l) const;
diff --git a/src/widgets/dialogs/qwizard.h b/src/widgets/dialogs/qwizard.h
index caa9d5e648..c9d791653b 100644
--- a/src/widgets/dialogs/qwizard.h
+++ b/src/widgets/dialogs/qwizard.h
@@ -130,7 +130,7 @@ public:
     void removePage(int id);
     QWizardPage *page(int id) const;
     bool hasVisitedPage(int id) const;
-    QList<int> visitedPages() const;    // ### visitedIds()?
+    QList<int> visitedPages() const;    // ### Qt 6: visitedIds()?
     QList<int> pageIds() const;
     void setStartId(int id);
     int startId() const;
diff --git a/src/widgets/styles/qstyle.h b/src/widgets/styles/qstyle.h
index a8ec8c8c3e..42bd8763d2 100644
--- a/src/widgets/styles/qstyle.h
+++ b/src/widgets/styles/qstyle.h
@@ -194,7 +194,7 @@ public:
         PE_IndicatorItemViewItemDrop,
 
         PE_PanelItemViewItem,
-        PE_PanelItemViewRow, // ### Qt 5: remove
+        PE_PanelItemViewRow, // ### Qt 6: remove
 
         PE_PanelStatusBar,
 
@@ -303,7 +303,7 @@ public:
         SE_ProgressBarContents,
         SE_ProgressBarLabel,
 
-        // ### Qt 5: These values are unused; eliminate them
+        // ### Qt 6: These values are unused; eliminate them
         SE_DialogButtonAccept,
         SE_DialogButtonReject,
         SE_DialogButtonApply,
@@ -343,7 +343,7 @@ public:
         SE_CheckBoxLayoutItem,
         SE_ComboBoxLayoutItem,
         SE_DateTimeEditLayoutItem,
-        SE_DialogButtonBoxLayoutItem, // ### remove
+        SE_DialogButtonBoxLayoutItem, // ### Qt 6: remove
         SE_LabelLayoutItem,
         SE_ProgressBarLayoutItem,
         SE_PushButtonLayoutItem,
diff --git a/src/widgets/widgets/qcombobox.h b/src/widgets/widgets/qcombobox.h
index 1442cd983e..854ced596b 100644
--- a/src/widgets/widgets/qcombobox.h
+++ b/src/widgets/widgets/qcombobox.h
@@ -131,7 +131,7 @@ public:
     enum SizeAdjustPolicy {
         AdjustToContents,
         AdjustToContentsOnFirstShow,
-        AdjustToMinimumContentsLength, // ### Qt 5: remove
+        AdjustToMinimumContentsLength, // ### Qt 6: remove
         AdjustToMinimumContentsLengthWithIcon
     };
 
diff --git a/src/widgets/widgets/qdockwidget.h b/src/widgets/widgets/qdockwidget.h
index 21872fa404..bd5a2c2aa4 100644
--- a/src/widgets/widgets/qdockwidget.h
+++ b/src/widgets/widgets/qdockwidget.h
@@ -82,7 +82,7 @@ public:
         DockWidgetVerticalTitleBar = 0x08,
 
         DockWidgetFeatureMask = 0x0f,
-        AllDockWidgetFeatures = DockWidgetClosable|DockWidgetMovable|DockWidgetFloatable, // ### remove in 5.0
+        AllDockWidgetFeatures = DockWidgetClosable|DockWidgetMovable|DockWidgetFloatable, // ### Qt 6: remove
         NoDockWidgetFeatures  = 0x00,
 
         Reserved              = 0xff
diff --git a/src/widgets/widgets/qstatusbar.h b/src/widgets/widgets/qstatusbar.h
index b05bf627ad..4cab706c0b 100644
--- a/src/widgets/widgets/qstatusbar.h
+++ b/src/widgets/widgets/qstatusbar.h
@@ -87,7 +87,7 @@ protected:
     void paintEvent(QPaintEvent *);
     void resizeEvent(QResizeEvent *);
 
-    // ### Qt 5: consider making reformat() and hideOrShow() private
+    // ### Qt 6: consider making reformat() and hideOrShow() private
     void reformat();
     void hideOrShow();
     bool event(QEvent *);
diff --git a/tests/auto/xml/dom/qdom/tst_qdom.cpp b/tests/auto/xml/dom/qdom/tst_qdom.cpp
index 1533e6a139..3633975896 100644
--- a/tests/auto/xml/dom/qdom/tst_qdom.cpp
+++ b/tests/auto/xml/dom/qdom/tst_qdom.cpp
@@ -1405,7 +1405,7 @@ void tst_QDom::normalizeEndOfLine() const
 
     const QString expected(QLatin1String("<a>\nc\nc\na\na</a>"));
 
-    // ### Qt 5: fix this, if we keep QDom at all
+    // ### Qt 6: 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);
 }