aboutsummaryrefslogtreecommitdiffstats
path: root/cmake
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@qt.io>2022-01-24 09:04:11 +0100
committerUlf Hermann <ulf.hermann@qt.io>2022-01-25 23:55:27 +0100
commit17dcba699566bfe052bf2c320e07c2c7cc53094b (patch)
treec1b3f5006030d85980a9098acf8b243190cfb9d8 /cmake
parent672891354220c05a712663d637e5c5d0074a3181 (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. Pick-to: 5.15 6.2 6.3 Fixes: QTBUG-99608 Change-Id: Ide5047acec78fdd91617577b3c2125feb0b2bdf4 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'cmake')
-rw-r--r--cmake/QtDeclarativeSetup.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/QtDeclarativeSetup.cmake b/cmake/QtDeclarativeSetup.cmake
index e3125d528a..aeb61d70e4 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(