diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2020-03-06 16:36:41 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2020-03-10 10:11:43 +0200 |
| commit | 2bcce88310153f4f420f13910de1d437859aecc8 (patch) | |
| tree | b753da65e262ff6626f4157a84ea1c2b2a7c1761 | |
| parent | 4e833d00d96617b3722b01ef2122de95a11cd371 (diff) | |
qtsaferenderer: make sure qtsaferenderer find its tools
Need to patch the qtsaferenderer-tools.prf so that it can find
its own native tools correctly.
Fixes: AUTOSUITE-1510
Change-Id: Ic025b7748c3a9c6ccf6df01d5dbe08831290ad04
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
| -rw-r--r-- | meta-boot2qt/recipes-qt/automotive/qtsaferenderer/0001-Fix-yocto-build-issues.patch | 28 |
1 files changed, 24 insertions, 4 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 88e5e79b..e4a75cad 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 b6c8b88c62feabd1258744a956aa67fa829a6e72 Mon Sep 17 00:00:00 2001 +From d4d20f0d0c3592bdc736513bc594f6d0fa0f6a15 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 @@ -8,13 +8,15 @@ Subject: [PATCH] Fix yocto build issues directory in the nativesdk, which has target paths for QT_INSTALL_PLUGINS that causes qtsafelayouttool to fail to find any plugins. +- Use QT_HOST_BINS/get to point to the native sysroot + Change-Id: Ie042b7ef45c7a5e03b36008a2e2cbce1a9193139 --- - tools/featurespec/qtsaferenderer-tools.prf | 4 ++++ - 1 file changed, 4 insertions(+) + tools/featurespec/qtsaferenderer-tools.prf | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/featurespec/qtsaferenderer-tools.prf b/tools/featurespec/qtsaferenderer-tools.prf -index b4daf86..36440e2 100644 +index b4daf86..773c8e5 100644 --- a/tools/featurespec/qtsaferenderer-tools.prf +++ b/tools/featurespec/qtsaferenderer-tools.prf @@ -1,3 +1,7 @@ @@ -25,3 +27,21 @@ index b4daf86..36440e2 100644 defineTest(addSafeTargetEnv) { cmd = $$3 $${1}_EXE = $$cmd +@@ -17,7 +21,7 @@ defineTest(addSafeTargetEnv) { + defineTest(prepareSafeTool) { + cmd = $$eval(QT_TOOL.$${2}.binary) + isEmpty(cmd)|!exists($$cmd) { +- cmd = $$[QT_HOST_BINS]/$${2} ++ cmd = $$[QT_HOST_BINS/get]/$${2} + contains(QMAKE_HOST.os, Windows) { + cmd = $${cmd}.exe + } +@@ -44,7 +48,7 @@ prepareSafeTool(QMAKE_SAFELAYOUT, qtsafelayouttool) + prepareSafeTool(QMAKE_SAFERCC, qtsafercctool) + SAFERCC_FILE = $$QMAKE_SAFERCC_EXE + isEmpty(SAFERCC_FILE)|!exists($$SAFERCC_FILE) { +- cmd = $$absolute_path("rcc", $$[QT_HOST_BINS]) ++ cmd = $$absolute_path("rcc", $$[QT_HOST_BINS/get]) + contains(QMAKE_HOST.os, Windows) { + cmd = $$system_path($${cmd}.exe) + } |