AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use fromIsoTimeString() in QDateTime::fromString() also for TextDate

Browse Source 
That way it'll be consistent with QTime()'s parsing of the time part.

Change-Id: I3f66e5686ba6e2ea4bbc2d5a9a29a177de2d9e69
Reviewed-by: Andreas Buhr <andreas.buhr@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
Edward Welbourne 2020-09-30 11:09:45 +02:00
parent 6404084b9c
commit 51a16a6862
1 changed files with 2 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/corelib/time/qdatetime.cpp
View File

@ -4825,46 +4825,11 @@ QDateTime QDateTime::fromString(QStringView string, Qt::DateFormat format)
if (!ok || !month || !day)
return QDateTime();
QDate date(year, month, day);
const QDate date(year, month, day);
if (!date.isValid())
return QDateTime();
// ### fixme, use QStringView::tokenize() when available
QList<QStringView> timeParts = parts.at(timePart).split(QLatin1Char(':'));
if (timeParts.count() < 2 || timeParts.count() > 3)
return QDateTime();
int hour = timeParts.at(0).toInt(&ok);
if (!ok)
return QDateTime();
int minute = timeParts.at(1).toInt(&ok);
if (!ok)
return QDateTime();
int second = 0;
int millisecond = 0;
if (timeParts.count() > 2) {
// ### fixme, use QStringView::tokenize() when available
const QList<QStringView> secondParts = timeParts.at(2).split(QLatin1Char('.'));
if (secondParts.size() > 2) {
return QDateTime();
}
second = secondParts.first().toInt(&ok);
if (!ok) {
return QDateTime();
}
if (secondParts.size() > 1) {
millisecond = secondParts.last().toInt(&ok);
if (!ok) {
return QDateTime();
}
}
}
QTime time(hour, minute, second, millisecond);
const QTime time = fromIsoTimeString(parts.at(timePart), format, nullptr);
if (!time.isValid())
return QDateTime();