diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2022-01-24 09:04:11 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-01-26 01:40:07 +0000 |
| commit | 396b1e0c74fcd70c31fb1c46483be401671faac8 (patch) | |
| tree | 170668433701e3e24a6cd47ad3d6355ca00f1234 /cmake | |
| parent | 3c57d75b2d96cdf887c60f56e00c2980c2eb27d2 (diff) | |
Use tree hash rather than commit hash in .tag file
We want equal source packages to have the same .tag file, even if their
commit hashes differ.
Fixes: QTBUG-99608
Change-Id: Ide5047acec78fdd91617577b3c2125feb0b2bdf4
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit 17dcba699566bfe052bf2c320e07c2c7cc53094b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtDeclarativeSetup.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/QtDeclarativeSetup.cmake b/cmake/QtDeclarativeSetup.cmake index 98ea95dd58..024bdb2785 100644 --- a/cmake/QtDeclarativeSetup.cmake +++ b/cmake/QtDeclarativeSetup.cmake @@ -8,7 +8,7 @@ function(qt_declarative_write_tag_header target_name) endif() find_program(git_path git) - if(tag_contents AND NOT tag_contents STREQUAL "$Format:%H$") + if(tag_contents AND NOT tag_contents STREQUAL "$Format:%T$") set(QML_COMPILE_HASH "${tag_contents}") elseif(git_path AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/../../.git") execute_process( |