Merge remote-tracking branch 'origin/5.15' into 5.15.0

Change-Id: I9d9f9e0955144241fcee6148fc78c4501e2ffcea

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);
 }