diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2019-11-14 08:21:08 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2019-11-20 15:36:31 +0200 |
| commit | 4d3c655a538dfd43cf5c25fd409ada6fb27fe5b4 (patch) | |
| tree | 62dc01c1e841eee768930a40bd2cc615729d4530 | |
| parent | 2157a552e1038b533d2e0a13e438fe13bcec4858 (diff) | |
qtsaferenderer: include fix for installation failure
Include patch to fix build issues where same header files are
tried to be installed at the same time, ofter leading to build
breaks.
Task-name: QSR-568
Change-Id: I27b621b3a4347d94aa0c9afd92d5c4bce85c4d86
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
| -rw-r--r-- | meta-boot2qt/recipes-qt/automotive/qtsaferenderer/0003-Remove-superfluous-header-installation.patch | 28 | ||||
| -rw-r--r-- | meta-boot2qt/recipes-qt/automotive/qtsaferenderer_git.bb | 1 |
2 files changed, 29 insertions, 0 deletions
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 new file mode 100644 index 00000000..6ade98cd --- /dev/null +++ b/meta-boot2qt/recipes-qt/automotive/qtsaferenderer/0003-Remove-superfluous-header-installation.patch @@ -0,0 +1,28 @@ +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 499934bf..59478932 100644 --- a/meta-boot2qt/recipes-qt/automotive/qtsaferenderer_git.bb +++ b/meta-boot2qt/recipes-qt/automotive/qtsaferenderer_git.bb @@ -52,6 +52,7 @@ SRC_URI = "\ git://codereview.qt-project.org/tqtc-boot2qt/qtsaferenderer;branch=${BRANCH};protocol=ssh;sdk-uri=Src/QtSafeRenderer-1.1.1 \ file://0001-Fix-yocto-build-issues.patch \ file://0002-Fix-libnetworkmsgplugin-install.patch \ + file://0003-Remove-superfluous-header-installation.patch \ " SRCREV = "e31a035f69bbc7280fc6e01e0c1031ac569b84a7" |