From 9e428d2f631f68117e5aeb915a5fe7f09d81eab8 Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Tue, 30 Oct 2018 16:44:12 +0200
Subject: qtdeclarative: fix inconsistent QML_COMPILE_HASH value

qtdeclarative and qtdeclarative-native may end up with different values
for QML_COMPILE_HASH, which prevents running QML application when
qtquickcompiler has been used.

Change-Id: I9e3839b566996581bc40fa1472d7e7d07c82ce53
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
---
 ...ways-use-commit-sha1-for-QML_COMPILE_HASH.patch | 31 ++++++++++++++++++++++
 .../recipes-qt/qt5/qtdeclarative_git.bbappend      |  4 +++
 2 files changed, 35 insertions(+)
 create mode 100644 meta-boot2qt-distro/recipes-qt/qt5/qtdeclarative/0001-Always-use-commit-sha1-for-QML_COMPILE_HASH.patch

diff --git a/meta-boot2qt-distro/recipes-qt/qt5/qtdeclarative/0001-Always-use-commit-sha1-for-QML_COMPILE_HASH.patch b/meta-boot2qt-distro/recipes-qt/qt5/qtdeclarative/0001-Always-use-commit-sha1-for-QML_COMPILE_HASH.patch
new file mode 100644
index 00000000..a734f8a2
--- /dev/null
+++ b/meta-boot2qt-distro/recipes-qt/qt5/qtdeclarative/0001-Always-use-commit-sha1-for-QML_COMPILE_HASH.patch
@@ -0,0 +1,31 @@
+From 260e165993fe15a1668cfd36caee18a95b2d2f59 Mon Sep 17 00:00:00 2001
+From: Samuli Piippo <samuli.piippo@qt.io>
+Date: Mon, 2 Jul 2018 13:32:44 +0300
+Subject: [PATCH] Always use commit sha1 for QML_COMPILE_HASH
+
+git describe can produce different strings for the same sha1, depending
+on the version of git (length of short hash) and whether release tag was
+in place when build was done (v5.11.1-0- vs. v5.11.0-66-).
+
+Instead use rev-parse to get the unambiguous commit sha1 which is also
+what is used from the .tag file.
+
+Change-Id: If378f03eb764e2d858bda5b662106aa4402d6559
+Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
+---
+ src/qml/qml.pro | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/qml/qml.pro b/src/qml/qml.pro
+index 940ebb325..a76a87b15 100644
+--- a/src/qml/qml.pro
++++ b/src/qml/qml.pro
+@@ -31,7 +31,7 @@ DEFINES += QT_NO_FOREACH
+     !equals(tag, "$${LITERAL_DOLLAR}Format:%H$${LITERAL_DOLLAR}") {
+         QML_COMPILE_HASH = $$tag
+     } else:exists($$PWD/../../.git) {
+-        commit = $$system(git describe --tags --always --long --dirty)
++        commit = $$system(git rev-parse HEAD)
+         QML_COMPILE_HASH = $$commit
+     }
+     compile_hash_contents = \
diff --git a/meta-boot2qt-distro/recipes-qt/qt5/qtdeclarative_git.bbappend b/meta-boot2qt-distro/recipes-qt/qt5/qtdeclarative_git.bbappend
index d9144a89..ec82d402 100644
--- a/meta-boot2qt-distro/recipes-qt/qt5/qtdeclarative_git.bbappend
+++ b/meta-boot2qt-distro/recipes-qt/qt5/qtdeclarative_git.bbappend
@@ -27,6 +27,10 @@
 ##
 ############################################################################
 
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRC_URI += "file://0001-Always-use-commit-sha1-for-QML_COMPILE_HASH.patch"
+
 FILES_${PN}-plugins_mingw32 = " \
     ${OE_QMAKE_PATH_PLUGINS}/*/*.dll \
 "
-- 
cgit v1.2.3