Skip to content
Snippets Groups Projects
Commit 4d3c655a authored by Samuli Piippo's avatar Samuli Piippo
Browse files

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: default avatarMikko Gronoff <mikko.gronoff@qt.io>
Reviewed-by: default avatarTeemu Holappa <teemu.holappa@qt.io>
parent 2157a552
No related branches found
No related tags found
No related merge requests found
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
......@@ -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"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment