summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2024-04-25 09:21:45 -0700
committerThiago Macieira <thiago.macieira@intel.com>2024-04-26 15:26:46 -0700
commit2289fe932dbd3bf1e676cd3748e81333fba9aa1c (patch)
treedd304a6594b53ac53a398e7ee2ceeff11df969e9
parent860405064e823cfe5bdb110a7a8def4ecbd7b853 (diff)
QResource: use qint64 for lastModifiedHEADdev
We pass it to QDateTime::fromMSecsSinceEpoch, which is signed. Change-Id: I6979d02a7395405cbf23fffd17c992674c6321fc Reviewed-by: Ahmad Samir <a.samirh78@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
-rw-r--r--src/corelib/io/qresource.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/io/qresource.cpp b/src/corelib/io/qresource.cpp
index 5b8b60c576..005380720b 100644
--- a/src/corelib/io/qresource.cpp
+++ b/src/corelib/io/qresource.cpp
@@ -130,7 +130,7 @@ public:
return QResource::NoCompression;
}
const uchar *data(int node, qint64 *size) const;
- quint64 lastModified(int node) const;
+ qint64 lastModified(int node) const;
QStringList children(int node) const;
virtual QString mappingRoot() const { return QString(); }
bool mappingRootSubdir(const QString &path, QString *match = nullptr) const;
@@ -283,7 +283,7 @@ public:
QString fileName, absoluteFilePath;
QList<QResourceRoot *> related;
qint64 size;
- quint64 lastModified;
+ qint64 lastModified;
const uchar *data;
mutable QStringList children;
quint8 compressionAlgo;
@@ -928,14 +928,14 @@ const uchar *QResourceRoot::data(int node, qint64 *size) const
return nullptr;
}
-quint64 QResourceRoot::lastModified(int node) const
+qint64 QResourceRoot::lastModified(int node) const
{
if (node == -1 || version < 0x02)
return 0;
const int offset = findOffset(node) + 14;
- return qFromBigEndian<quint64>(tree + offset);
+ return qFromBigEndian<qint64>(tree + offset);
}
QStringList QResourceRoot::children(int node) const