blob: 88e5e79b259499292663d7654ae1df9cbb3e5147 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
|
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
- use QT_PLUGIN_PATH for qtsafelayouttool calls. Builds are using qt.conf
(from OE_QMAKE_QTCONF_PATH env in yocto builds) and from QT_HOST_BINS
directory in the nativesdk, which has target paths for QT_INSTALL_PLUGINS
that causes qtsafelayouttool to fail to find any plugins.
Change-Id: Ie042b7ef45c7a5e03b36008a2e2cbce1a9193139
---
tools/featurespec/qtsaferenderer-tools.prf | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/tools/featurespec/qtsaferenderer-tools.prf b/tools/featurespec/qtsaferenderer-tools.prf
index b4daf86..36440e2 100644
--- a/tools/featurespec/qtsaferenderer-tools.prf
+++ b/tools/featurespec/qtsaferenderer-tools.prf
@@ -1,3 +1,7 @@
+pluginpath.name = QT_PLUGIN_PATH
+pluginpath.value = $$[QT_HOST_LIBS/get]/plugins
+QT_TOOL_ENV += pluginpath
+
defineTest(addSafeTargetEnv) {
cmd = $$3
$${1}_EXE = $$cmd
|