diff options
| author | Marcus Tillmanns <marcus.tillmanns@qt.io> | 2024-03-04 13:30:39 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2024-03-13 15:13:47 +0000 |
| commit | c44f9dcb18f9e597f13598494f7fa9a3db8ee960 (patch) | |
| tree | bed0f571f32e67b7a496c822574125b42f278657 | |
| parent | 42fcafed23cf13c5efb71da3091a53edd482e2a8 (diff) | |
qhelpgenerator: Fix evaluation of timestamps
Amends f11d7e4af73ca474ab71310961b155f6c9bc71da and
b860d48aabfe43d1eb3c9c1c10bd3698d367c255 to correctly
parse and compare timestamps.
Fixes: QTBUG-122994
Change-Id: I1fb12200ef6fc1fdc58dd629d92a7c39e14ca29e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: hjk <hjk@qt.io>
(cherry picked from commit 2ec42bc0981c339780d280b6d93ff5fa7c018ea9)
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
(cherry picked from commit eeecb35cadf747c845b047b110172c6ff8d619b1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/assistant/help/qhelpcollectionhandler.cpp | 6 | ||||
| -rw-r--r-- | src/assistant/help/qhelpcollectionhandler_p.h | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/assistant/help/qhelpcollectionhandler.cpp b/src/assistant/help/qhelpcollectionhandler.cpp index 1116f750f..ca40f17d1 100644 --- a/src/assistant/help/qhelpcollectionhandler.cpp +++ b/src/assistant/help/qhelpcollectionhandler.cpp @@ -201,7 +201,7 @@ bool QHelpCollectionHandler::openCollectionFile() timeStamp.folderId = m_query->value(1).toInt(); timeStamp.fileName = m_query->value(2).toString(); timeStamp.size = m_query->value(3).toInt(); - timeStamp.timeStamp = m_query->value(4).toString(); + timeStamp.timeStamp = m_query->value(4).toDateTime(); timeStamps.append(timeStamp); } @@ -253,7 +253,7 @@ bool QHelpCollectionHandler::isTimeStampCorrect(const TimeStamp &timeStamp) cons if (fi.size() != timeStamp.size) return false; - if (fi.lastModified().toString(Qt::ISODate) != timeStamp.timeStamp) + if (fi.lastModified(QTimeZone::UTC) != timeStamp.timeStamp) return false; m_query->prepare(QLatin1String("SELECT FilePath " @@ -2173,7 +2173,7 @@ bool QHelpCollectionHandler::registerIndexTable(const QHelpDBReader::IndexTable if (ok && sourceDateEpoch < lastModified.toSecsSinceEpoch()) lastModified.setSecsSinceEpoch(sourceDateEpoch); } - m_query->addBindValue(lastModified.toString(Qt::ISODate)); + m_query->addBindValue(lastModified); if (!m_query->exec()) return false; diff --git a/src/assistant/help/qhelpcollectionhandler_p.h b/src/assistant/help/qhelpcollectionhandler_p.h index c2e89b60f..b6c48848f 100644 --- a/src/assistant/help/qhelpcollectionhandler_p.h +++ b/src/assistant/help/qhelpcollectionhandler_p.h @@ -26,6 +26,10 @@ #include "qhelpdbreader_p.h" #include "qhelplink.h" +#include <QtCore/qdatetime.h> +#include <QtCore/qobject.h> +#include <QtCore/qstringlist.h> + QT_BEGIN_NAMESPACE class QVersionNumber; @@ -50,7 +54,7 @@ public: int folderId = -1; QString fileName; int size = 0; - QString timeStamp; + QDateTime timeStamp; }; struct ContentsData |