You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
25 lines
1.0 KiB
25 lines
1.0 KiB
3 years ago
|
Hardcode last modified timestamp in Qt RCC
|
||
|
|
|
||
|
|
This change allows the already built qt package to be reused even with
|
||
|
|
the SOURCE_DATE_EPOCH variable set, e.g., for Guix builds.
|
||
|
|
|
||
|
|
|
||
|
|
--- old/qtbase/src/tools/rcc/rcc.cpp
|
||
|
|
+++ new/qtbase/src/tools/rcc/rcc.cpp
|
||
|
|
@@ -227,14 +227,7 @@ void RCCFileInfo::writeDataInfo(RCCResourceLibrary &lib)
|
||
|
|
|
||
|
|
if (lib.formatVersion() >= 2) {
|
||
|
|
// last modified time stamp
|
||
|
|
- const QDateTime lastModified = m_fileInfo.lastModified();
|
||
|
|
- quint64 lastmod = quint64(lastModified.isValid() ? lastModified.toMSecsSinceEpoch() : 0);
|
||
|
|
- static const quint64 sourceDate = 1000 * qgetenv("QT_RCC_SOURCE_DATE_OVERRIDE").toULongLong();
|
||
|
|
- if (sourceDate != 0)
|
||
|
|
- lastmod = sourceDate;
|
||
|
|
- static const quint64 sourceDate2 = 1000 * qgetenv("SOURCE_DATE_EPOCH").toULongLong();
|
||
|
|
- if (sourceDate2 != 0)
|
||
|
|
- lastmod = sourceDate2;
|
||
|
|
+ quint64 lastmod = quint64(1);
|
||
|
|
lib.writeNumber8(lastmod);
|
||
|
|
if (text || pass1)
|
||
|
|
lib.writeChar('\n');
|