Update qtsaferenderer to 1.1.2 for QtAS 5.13.2

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

4 files changed, 8 insertions, 71 deletions

diff --git a/meta-boot2qt/recipes-qt/automotive/qtsaferenderer/0001-Fix-yocto-build-issues.patch b/meta-boot2qt/recipes-qt/automotive/qtsaferenderer/0001-Fix-yocto-build-issues.patch
index c991d1de..88e5e79b 100644
--- a/meta-boot2qt/recipes-qt/automotive/qtsaferenderer/0001-Fix-yocto-build-issues.patch
+++ b/meta-boot2qt/recipes-qt/automotive/qtsaferenderer/0001-Fix-yocto-build-issues.patch
@@ -1,4 +1,4 @@
-From 39c1fb5bc25d23564f25ad3e4290e1ecb6c74f46 Mon Sep 17 00:00:00 2001
+From b6c8b88c62feabd1258744a956aa67fa829a6e72 Mon Sep 17 00:00:00 2001
 From: Samuli Piippo <samuli.piippo@qt.io>
 Date: Thu, 30 May 2019 09:54:57 +0300
 Subject: [PATCH] Fix yocto build issues
@@ -14,7 +14,7 @@ Change-Id: Ie042b7ef45c7a5e03b36008a2e2cbce1a9193139
  1 file changed, 4 insertions(+)
 
 diff --git a/tools/featurespec/qtsaferenderer-tools.prf b/tools/featurespec/qtsaferenderer-tools.prf
-index 0a5366e..7f42dad 100644
+index b4daf86..36440e2 100644
 --- a/tools/featurespec/qtsaferenderer-tools.prf
 +++ b/tools/featurespec/qtsaferenderer-tools.prf
 @@ -1,3 +1,7 @@
@@ -22,6 +22,6 @@ index 0a5366e..7f42dad 100644
 +pluginpath.value = $$[QT_HOST_LIBS/get]/plugins
 +QT_TOOL_ENV += pluginpath
 +
- qtPrepareTool(QMAKE_SAFELAYOUT, qtsafelayouttool, _DEP)
- !exists($$QMAKE_SAFELAYOUT_EXE) {
-     cmd = $$absolute_path("qtsafelayouttool", $$[QT_INSTALL_PREFIX]/../../Tools/QSR-$$QT.qtsaferenderer.VERSION/bin)
+ defineTest(addSafeTargetEnv) {
+     cmd = $$3
+     $${1}_EXE = $$cmd
diff --git a/meta-boot2qt/recipes-qt/automotive/qtsaferenderer/0002-Fix-libnetworkmsgplugin-install.patch b/meta-boot2qt/recipes-qt/automotive/qtsaferenderer/0002-Fix-libnetworkmsgplugin-install.patch
deleted file mode 100644
index f2427a56..00000000
--- a/meta-boot2qt/recipes-qt/automotive/qtsaferenderer/0002-Fix-libnetworkmsgplugin-install.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 6e3acb41295b93127b2b0e3da3068303406d7b13 Mon Sep 17 00:00:00 2001
-From: Teemu Holappa <teemu.holappa@qt.io>
-Date: Tue, 8 Oct 2019 14:43:22 +0300
-Subject: [PATCH] Fix libnetworkmsgplugin install
-
-Task-number: QSR-559
-Change-Id: I27438325bcdaac0bff9156cfdb183898a40210d1
-Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
----
- src/messagesenderplugin/networkmsg/networkmsg.pro | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/messagesenderplugin/networkmsg/networkmsg.pro b/src/messagesenderplugin/networkmsg/networkmsg.pro
-index 6094fb9..1925238 100644
---- a/src/messagesenderplugin/networkmsg/networkmsg.pro
-+++ b/src/messagesenderplugin/networkmsg/networkmsg.pro
-@@ -3,7 +3,9 @@ TARGET = $$qtLibraryTarget(networkmsgplugin)
- TEMPLATE = lib
- CONFIG += plugin
- 
--DESTDIR=$$[QT_INSTALL_PLUGINS]/$$replace(uri, \\., /)/saferenderer
-+PLUGIN_TYPE = saferenderer
-+target.path = $$[QT_INSTALL_PLUGINS]/$$PLUGIN_TYPE
-+INSTALLS += target
- 
- # The following define makes your compiler emit warnings if you use
- # any feature of Qt which has been marked as deprecated (the exact warnings
-@@ -27,5 +29,3 @@ HEADERS += \
-         $$PWD/../messagesenderinterface_p.h \
-         $$PWD/../../saferenderer/qsafeevent.h
- DISTFILES += networkmsgplugin.json
--
--
diff --git a/meta-boot2qt/recipes-qt/automotive/qtsaferenderer/0003-Remove-superfluous-header-installation.patch b/meta-boot2qt/recipes-qt/automotive/qtsaferenderer/0003-Remove-superfluous-header-installation.patch
deleted file mode 100644
index 6ade98cd..00000000
--- a/meta-boot2qt/recipes-qt/automotive/qtsaferenderer/0003-Remove-superfluous-header-installation.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 0ceae9a8c8807f0d9aac013c7043bf3c72aba8dd Mon Sep 17 00:00:00 2001
-From: Samuli Piippo <samuli.piippo@qt.io>
-Date: Wed, 13 Nov 2019 08:53:32 +0200
-Subject: [PATCH] Remove superfluous header installation
-
-The headers are already installed from using the qt_module,
-second installation can lead to build breaks.
-
-Task-number: QSR-568
-Change-Id: Ia93a038d34882372500b4863181dacf97be9b07d
-Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
----
- src/saferenderer/saferenderer.pro | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/src/saferenderer/saferenderer.pro b/src/saferenderer/saferenderer.pro
-index 00b91e8..8a84dfb 100644
---- a/src/saferenderer/saferenderer.pro
-+++ b/src/saferenderer/saferenderer.pro
-@@ -12,8 +12,3 @@ include(saferenderer.pri)
- 
- target.path = $$[QT_INSTALL_LIBS]
- INSTALLS += target
--
--headersDataFiles.path = $$[QT_INSTALL_HEADERS]/QtSafeRenderer/
--headersDataFiles.files += $$HEADERS
--
--INSTALLS += headersDataFiles
diff --git a/meta-boot2qt/recipes-qt/automotive/qtsaferenderer_git.bb b/meta-boot2qt/recipes-qt/automotive/qtsaferenderer_git.bb
index 59478932..2db4dcf1 100644
--- a/meta-boot2qt/recipes-qt/automotive/qtsaferenderer_git.bb
+++ b/meta-boot2qt/recipes-qt/automotive/qtsaferenderer_git.bb
@@ -46,15 +46,13 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only,,"
 
 EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
 
-PV = "1.1.1"
+PV = "1.1.2"
 BRANCH = "1.1"
 SRC_URI = "\
-    git://codereview.qt-project.org/tqtc-boot2qt/qtsaferenderer;branch=${BRANCH};protocol=ssh;sdk-uri=Src/QtSafeRenderer-1.1.1 \
+    git://codereview.qt-project.org/tqtc-boot2qt/qtsaferenderer;branch=${BRANCH};protocol=ssh;sdk-uri=Src/QtSafeRenderer-1.1.2 \
     file://0001-Fix-yocto-build-issues.patch \
-    file://0002-Fix-libnetworkmsgplugin-install.patch \
-    file://0003-Remove-superfluous-header-installation.patch \
     "
-SRCREV = "e31a035f69bbc7280fc6e01e0c1031ac569b84a7"
+SRCREV = "93c14517549a5b779d39040b68802d400355a6d7"
 
 DEPENDS = "qtbase qtdeclarative"