Remove Qt 5 todo in QVariant: we're not going to change the behaviour

Task-number: QTBUG-25111
Change-Id: I2387767698c402e2bd0ecdfdd6ed41d4a224f1b6
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>

diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp
index 18bef1b..5e24ffe 100644 (file)
--- a/src/corelib/kernel/qvariant.cpp
+++ b/src/corelib/kernel/qvariant.cpp
@@ -2199,7 +2199,6 @@ inline T qNumVariantToHelper(const QVariant::Private &d,
     \b{Warning:} If the value is convertible to a \l LongLong but is too
     large to be represented in an int, the resulting arithmetic overflow will
     not be reflected in \a ok. A simple workaround is to use QString::toInt().
-    Fixing this bug has been postponed to Qt 5 in order to avoid breaking existing code.
 
     \sa canConvert(), convert()
 */
@@ -2219,7 +2218,6 @@ int QVariant::toInt(bool *ok) const
     \b{Warning:} If the value is convertible to a \l ULongLong but is too
     large to be represented in an unsigned int, the resulting arithmetic overflow will
     not be reflected in \a ok. A simple workaround is to use QString::toUInt().
-    Fixing this bug has been postponed to Qt 5 in order to avoid breaking existing code.
 
     \sa canConvert(), convert()
 */