Replace timestamps from qhelpgenerator by a fixed date

In order to make qhelpgenerator output reproducible, we need a way to get
deterministic embedded timestaps.  Backport the patch from qttools5 [1] to
make qch files reproducible by replacing the current time by a fixed date.
 [1] https://codereview.qt-project.org/#/c/106296/
Author: Eduard Sanou <dhole@openmailbox.org>

Gbp-Pq: Name replace_timestamps_with_fixed_date_in_qhelpgenerator.patch

diff --git a/tools/assistant/lib/qhelpgenerator.cpp b/tools/assistant/lib/qhelpgenerator.cpp
index 6f1bd8a23f7a4c945d213211742311f9d4e451e8..d0b465ee9a5854fb4edb7a11c6bac62444ff0e51 100644 (file)
--- a/tools/assistant/lib/qhelpgenerator.cpp
+++ b/tools/assistant/lib/qhelpgenerator.cpp
@@ -380,9 +380,7 @@ bool QHelpGenerator::createTables()
 
     d->query->exec(QLatin1String("INSERT INTO MetaDataTable VALUES('qchVersion', '1.0')"));
 
-    d->query->prepare(QLatin1String("INSERT INTO MetaDataTable VALUES('CreationDate', ?)"));
-    d->query->bindValue(0, QDateTime::currentDateTime().toString(Qt::ISODate));
-    d->query->exec();
+    d->query->exec(QLatin1String("INSERT INTO MetaDataTable VALUES('CreationDate', '2012-12-20T12:00:00Z')"));
 
     return true;
 }

diff --git a/tools/assistant/tools/qcollectiongenerator/main.cpp b/tools/assistant/tools/qcollectiongenerator/main.cpp
index ef25ecfc42665f1d3e2de3fa179ed7980b0094b4..b0305e4ab425d35b9647e5bc8eb197eecd4181b1 100644 (file)
--- a/tools/assistant/tools/qcollectiongenerator/main.cpp
+++ b/tools/assistant/tools/qcollectiongenerator/main.cpp
@@ -521,7 +521,7 @@ int main(int argc, char *argv[])
     CollectionConfiguration::setAddressBarVisible(helpEngine,
          !config.hideAddressBar());
     CollectionConfiguration::setCreationTime(helpEngine,
-        QDateTime::currentDateTime().toTime_t());
+        QDateTime::fromString("2012-12-20T12:00:00Z", Qt::ISODate).toUTC().toTime_t());
     CollectionConfiguration::setFullTextSearchFallbackEnabled(helpEngine,
         config.fullTextSearchFallbackEnabled());
 

diff --git a/tools/assistant/tools/shared/collectionconfiguration.cpp b/tools/assistant/tools/shared/collectionconfiguration.cpp
index 352bb60f8882908482eea87663b508bc41537212..0ce182ac91cd08a74f9a874e5cd128b2ecfd1578 100644 (file)
--- a/tools/assistant/tools/shared/collectionconfiguration.cpp
+++ b/tools/assistant/tools/shared/collectionconfiguration.cpp
@@ -282,7 +282,7 @@ const QDateTime CollectionConfiguration::lastRegisterTime(const QHelpEngineCore
 
 void CollectionConfiguration::updateLastRegisterTime(QHelpEngineCore &helpEngine)
 {
-    helpEngine.setCustomValue(LastRegisterTime, QDateTime::currentDateTime());
+    helpEngine.setCustomValue(LastRegisterTime, QDateTime::fromString("2012-12-20T12:00:00Z", Qt::ISODate).toUTC());
 }
 
 bool CollectionConfiguration::isNewer(const QHelpEngineCore &newer,