1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QResource: use qint64 for lastModified

Browse Source 
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>
This commit is contained in:
Thiago Macieira 2024-04-25 09:21:45 -07:00
parent 860405064e
commit 2289fe932d
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/corelib/io/qresource.cpp
View File

@ -130,7 +130,7 @@ public:
return QResource::NoCompression; return QResource::NoCompression;
} }
const uchar *data(int node, qint64 *size) const; const uchar *data(int node, qint64 *size) const;
quint64 lastModified(int node) const; qint64 lastModified(int node) const;
QStringList children(int node) const; QStringList children(int node) const;
virtual QString mappingRoot() const { return QString(); } virtual QString mappingRoot() const { return QString(); }
bool mappingRootSubdir(const QString &path, QString *match = nullptr) const; bool mappingRootSubdir(const QString &path, QString *match = nullptr) const;
@ -283,7 +283,7 @@ public:
QString fileName, absoluteFilePath; QString fileName, absoluteFilePath;
QList<QResourceRoot *> related; QList<QResourceRoot *> related;
qint64 size; qint64 size;
quint64 lastModified; qint64 lastModified;
const uchar *data; const uchar *data;
mutable QStringList children; mutable QStringList children;
quint8 compressionAlgo; quint8 compressionAlgo;
@ -928,14 +928,14 @@ const uchar *QResourceRoot::data(int node, qint64 *size) const
return nullptr; return nullptr;
} }
quint64 QResourceRoot::lastModified(int node) const qint64 QResourceRoot::lastModified(int node) const
{ {
if (node == -1 || version < 0x02) if (node == -1 || version < 0x02)
return 0; return 0;
const int offset = findOffset(node) + 14; const int offset = findOffset(node) + 14;
return qFromBigEndian<quint64>(tree + offset); return qFromBigEndian<qint64>(tree + offset);
} }
QStringList QResourceRoot::children(int node) const QStringList QResourceRoot::children(int node) const