summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@qt.io>2020-09-16 08:25:53 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2020-09-19 16:05:46 +0000
commite97526224664d39f036304e7ebe299a06a46cecf (patch)
tree1823df4fe2532a657ae698cc1d036a004e95105a /qmake
parentc7e5f92aac16c83611c6b106fbdf311d0a474548 (diff)
qmake: Make use of QHash deterministic
As a build tool, qmake should produce deterministic outputs. Task-number: QTBUG-86675 Change-Id: Ifc855d6ddf025cdad3aa57aee79beabf9c6008e2 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from commit cccace0c10d1b7d21cea00bd9f1b5169c1bbf007) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'qmake')
-rw-r--r--qmake/main.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/qmake/main.cpp b/qmake/main.cpp
index 86f91031df..15b1b23f98 100644
--- a/qmake/main.cpp
+++ b/qmake/main.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2020 The Qt Company Ltd.
** Copyright (C) 2016 Intel Corporation.
** Contact: https://www.qt.io/licensing/
**
@@ -446,6 +446,8 @@ bool qmake_setpwd(const QString &p)
int runQMake(int argc, char **argv)
{
+ qSetGlobalQHashSeed(0);
+
// stderr is unbuffered by default, but stdout buffering depends on whether
// there is a terminal attached. Buffering can make output from stderr and stdout
// appear out of sync, so force stdout to be unbuffered as well.