diff options
author | hjk <hjk@qt.io> | 2020-04-15 07:04:47 +0200 |
---|---|---|
committer | hjk <hjk@qt.io> | 2020-04-17 09:02:22 +0200 |
commit | 300bd7fff8b25bfbdb025315331e5733c3346d98 (patch) | |
tree | 806460db06255e4fe3861478a69efd9ecc2a05ad /src/tools/rcc | |
parent | 33b1662f16e21a7e0f0b1ba809f16326aaa5f0ef (diff) | |
download | qtbase-300bd7fff8b25bfbdb025315331e5733c3346d98.tar.gz |
rcc: Always seed the hash with 0
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>
Diffstat (limited to 'src/tools/rcc')
-rw-r--r-- | src/tools/rcc/main.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/tools/rcc/main.cpp b/src/tools/rcc/main.cpp index ac87e48e39..d8e243daea 100644 --- a/src/tools/rcc/main.cpp +++ b/src/tools/rcc/main.cpp @@ -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); } |