diff options
| author | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-03-23 16:00:07 +0200 |
|---|---|---|
| committer | Tarja Sundqvist <tarja.sundqvist@qt.io> | 2023-03-23 16:00:07 +0200 |
| commit | 19ed7973a311a8d42d3a558bb551230e902ce9b9 (patch) | |
| tree | 9832c0cc796722f85579e25fd50cc38b65e6ef6c /src/qml/common/common.pri | |
| parent | f5701f0def37fcc0c2b38ae9552eb3a896a34687 (diff) | |
| parent | a5635345175e667601c8b6a344508c4d4ebb0f9d (diff) | |
Merge remote-tracking branch 'origin/tqtc/lts-5.15.9' into tqtc/lts-5.15-opensourcev5.15.9-lts-lgpl
Change-Id: I91d2b178e7111d0802ea973bccf230b264c30c96
Diffstat (limited to 'src/qml/common/common.pri')
| -rw-r--r-- | src/qml/common/common.pri | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/common/common.pri b/src/qml/common/common.pri index b333c0f6d9..b824812d27 100644 --- a/src/qml/common/common.pri +++ b/src/qml/common/common.pri @@ -1,8 +1,8 @@ !build_pass { # Create a header containing a hash that describes this library. For a # released version of Qt, we'll use the .tag file that is updated by git - # archive with the commit hash. For unreleased versions, we'll ask git - # describe. Note that it won't update unless qmake is run again, even if + # archive with the tree hash. For unreleased versions, we'll ask git + # rev-parse. Note that it won't update unless qmake is run again, even if # the commit change also changed something in this library. tagFile = $$PWD/../../.tag tag = @@ -10,7 +10,7 @@ tag = $$cat($$tagFile, singleline) QMAKE_INTERNAL_INCLUDED_FILES += $$tagFile } - !equals(tag, "$${LITERAL_DOLLAR}Format:%H$${LITERAL_DOLLAR}") { + !equals(tag, "$${LITERAL_DOLLAR}Format:%T$${LITERAL_DOLLAR}") { QML_COMPILE_HASH = $$tag } else:exists($$PWD/../../.git) { commit = $$system(git rev-parse HEAD) |