Remove/update Qt 5 to-do's that won't be done for Qt 5.

Task-number: QTBUG-23524
Change-Id: Iebf5b78dc2ff27310b5a484bae588862417f693c
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Jason McDonald 2012-04-02 23:03:57 +10:00 committed by Qt by Nokia
parent 7de94904f1
commit acd79f7d64
3 changed files with 1 additions and 3 deletions

View File

@ -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

View File

@ -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(); }

View File

@ -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.