QVersionNumber: change int to qsizetype in fromString()

This completes the update to qsizetype in this class, adding a couple of
methods that need to be removed in Qt 7. They're only required where int
is not qsizetype (i.e., 64-bit platforms).

Change-Id: I0e5f6bec596a4a78bd3bfffd16c9de29bec4c637
Reviewed-by: Marc Mutz <marc.mutz@qt.io>

1 files changed, 35 insertions, 1 deletions

diff --git a/src/corelib/compat/removed_api.cpp b/src/corelib/compat/removed_api.cpp
index 566c7b608b..61d3842e64 100644
--- a/src/corelib/compat/removed_api.cpp
+++ b/src/corelib/compat/removed_api.cpp
@@ -113,7 +113,41 @@ QByteArray QtPrivate::QByteArrayList_join(const QByteArrayList *that, const char
     return QByteArrayList_join(that, {sep, seplen});
 }
 
+#endif // QT_REMOVED_SINCE(6, 3)
+#if QT_REMOVED_SINCE(6, 4)
+
+#include "qversionnumber.h"
+
+#  if QT_POINTER_SIZE != 4
+QVersionNumber QVersionNumber::fromString(const QString &string, int *suffixIndex)
+{
+    qsizetype si;
+    QVersionNumber r = fromString(QLatin1String(string.toLatin1()), &si);
+    if (suffixIndex)
+        *suffixIndex = si;
+    return r;
+}
+
+QVersionNumber QVersionNumber::fromString(QStringView string, int *suffixIndex)
+{
+    qsizetype si;
+    QVersionNumber r = fromString(QLatin1String(string.toLatin1()), &si);
+    if (suffixIndex)
+        *suffixIndex = si;
+    return r;
+}
+
+QVersionNumber QVersionNumber::fromString(QLatin1String string, int *suffixIndex)
+{
+    qsizetype si;
+    QVersionNumber r = fromString(string, &si);
+    if (suffixIndex)
+        *suffixIndex = si;
+    return r;
+}
+#  endif // QT_POINTER_SIZE != 4
+
 // #include <qotherheader.h>
 // // implement removed functions from qotherheader.h
 
-#endif // QT_REMOVED_SINCE(6, 3)
+#endif // QT_REMOVED_SINCE(6, 4)