diff options
| -rw-r--r-- | src/corelib/kernel/qvariant.cpp | 1 | ||||
| -rw-r--r-- | src/corelib/tools/qbitarray.h | 1 | ||||
| -rw-r--r-- | src/corelib/tools/qstring.cpp | 2 |
3 files changed, 1 insertions, 3 deletions
diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp index e630b5bba8..d723355204 100644 --- a/src/corelib/kernel/qvariant.cpp +++ b/src/corelib/kernel/qvariant.cpp @@ -1554,7 +1554,6 @@ void QVariant::detach() \internal */ -// ### Qt 5: change typeName()(and froends= to return a QString. Suggestion from Harald. /*! Returns the name of the type stored in the variant. The returned strings describe the C++ datatype used to store the data: for diff --git a/src/corelib/tools/qbitarray.h b/src/corelib/tools/qbitarray.h index ac54c2a4f5..cc3e93b151 100644 --- a/src/corelib/tools/qbitarray.h +++ b/src/corelib/tools/qbitarray.h @@ -72,7 +72,6 @@ public: inline int size() const { return (d.size() << 3) - *d.constData(); } inline int count() const { return (d.size() << 3) - *d.constData(); } int count(bool on) const; - // ### Qt 5: Store the number of set bits separately inline bool isEmpty() const { return d.isEmpty(); } inline bool isNull() const { return d.isNull(); } diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp index f1eb398c60..f263c0b1db 100644 --- a/src/corelib/tools/qstring.cpp +++ b/src/corelib/tools/qstring.cpp @@ -5056,7 +5056,7 @@ QString QString::toUpper() const return *this; } -// ### Qt 5: Consider whether this function shouldn't be removed See task 202871. +// ### Qt 6: Consider whether this function shouldn't be removed See task 202871. /*! Safely builds a formatted string from the format string \a cformat and an arbitrary list of arguments. |