Revert "qtdeclarative: fix inconsistent QML_COMPILE_HASH value"

Applied via meta-qt5 layer update in the next commit.
This reverts commit 9e428d2f631f68117e5aeb915a5fe7f09d81eab8.

Change-Id: I81765199803a5bc7b95b8c02a83aa42f0ce9a594
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>

2 files changed, 0 insertions, 35 deletions

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
deleted file mode 100644
index a734f8a..0000000
--- a/meta-boot2qt-distro/recipes-qt/qt5/qtdeclarative/0001-Always-use-commit-sha1-for-QML_COMPILE_HASH.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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 ec82d40..d9144a8 100644
--- a/meta-boot2qt-distro/recipes-qt/qt5/qtdeclarative_git.bbappend
+++ b/meta-boot2qt-distro/recipes-qt/qt5/qtdeclarative_git.bbappend
@@ -27,10 +27,6 @@
 ##
 ############################################################################
 
-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 \
 "