AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rcc: Always seed the hash with 0

Browse Source 
That was already done to pass the auto tests, but the randomization also
bites for reproducible builds.

Change-Id: Ibf4da513059deb5a806d2ac1a83c1994edf09d4a
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
hjk 2020-04-15 07:04:47 +02:00
parent 33b1662f16
commit 300bd7fff8
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/tools/rcc/main.cpp
View File

@ -435,11 +435,10 @@ int main(int argc, char *argv[])
{
// rcc uses a QHash to store files in the resource system.
// we must force a certain hash order when testing or tst_rcc will fail, see QTBUG-25078
if (Q_UNLIKELY(!qEnvironmentVariableIsEmpty("QT_RCC_TEST"))) {
qSetGlobalQHashSeed(0);
if (qGlobalQHashSeed() != 0)
qFatal("Cannot force QHash seed for testing as requested");
}
// similar requirements exist for reproducibly builds.
qSetGlobalQHashSeed(0);
if (qGlobalQHashSeed() != 0)
qWarning("Cannot force QHash seed");
return QT_PREPEND_NAMESPACE(runRcc)(argc, argv);
}