diff options
| author | fanquake <fanquake@gmail.com> | 2021-04-21 15:09:47 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2021-04-21 15:16:47 +0800 |
| commit | e16f8720dca2de1040478968c9f3ca07644a04b7 (patch) | |
| tree | 88283baf2cf74270fb1281209b9001dc71ee6c1b /depends/packages | |
| parent | e507acb1184fc3e378bf33e38dce97ca3008f19c (diff) | |
| parent | c799a19b4bb8d0cc5ffd9b49746b5b267745c9b5 (diff) | |
Merge #21655: build, qt: No longer need to set QT_RCC_TEST=1 for determinism
c799a19b4bb8d0cc5ffd9b49746b5b267745c9b5 build, qt: No longer need to set QT_RCC_TEST=1 for determinism (Hennadii Stepanov)
Pull request description:
The Qt Resource Compiler (rcc) output order relies on [`QHash`](https://doc.qt.io/qt-5/qhash.html):
> This randomization of `QHash` is enabled by default. Even though programs should never depend on a particular `QHash` ordering, there may be situations where you temporarily need deterministic behavior, for example for debugging or regression testing. To disable the randomization, define the environment variable `QT_HASH_SEED` to have the value 0.
Since #3620 we use `QT_RCC_TEST=1` to achieve a deterministic output.
Since Qt 5.3.1 hash seeding is disabled for all of the bootstrapped tools, including rcc. Therefore, `QT_RCC_TEST=1` is no longer needed.
See commit [5283a6c87beac5a43f612786fefd6e43f2c70bf6](https://github.com/qt/qtbase/commit/5283a6c87beac5a43f612786fefd6e43f2c70bf6).
ACKs for top commit:
fanquake:
ACK c799a19b4bb8d0cc5ffd9b49746b5b267745c9b5
Tree-SHA512: 9d116ac1e8c605ee3e8ed7f618586f0de85d8b06bbbb70fe8c298939ce203d2a7e97264a9afac037179993ab54c5f69a65ebb9ab27ca7f45acb963011bd45743
Diffstat (limited to 'depends/packages')
| -rw-r--r-- | depends/packages/qt.mk | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/depends/packages/qt.mk b/depends/packages/qt.mk index 64234dc367..0133eee920 100644 --- a/depends/packages/qt.mk +++ b/depends/packages/qt.mk @@ -173,7 +173,6 @@ $(package)_config_opts_armv7a_android += -android-arch armeabi-v7a $(package)_config_opts_x86_64_android += -android-arch x86_64 $(package)_config_opts_i686_android += -android-arch i686 -$(package)_build_env = QT_RCC_TEST=1 $(package)_build_env += QT_RCC_SOURCE_DATE_OVERRIDE=1 endef |