t-head/meta-qt5
1
0
Fork 0
mirror of https://github.com/thead-yocto-mirror/meta-qt5 synced 2026-09-08 23:24:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

qtbase: fix install locations used in static builds

Browse Source 
Both qml and plugin paths need to be adjusted for static builds,
so that they point to the recipe-sysroot instead of the native one.
Similar change is already applied to host bins. These changes do
not affect regular dynamic builds, as the sections are only used in
static builds.

Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
This commit is contained in:
Samuli Piippo
2018-07-04 19:29:28 +03:00
committed by Martin Jansa
parent 823fa380c5
commit 75bc4403cc
1 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
View File

@@ -1,4 +1,4 @@
From a0a36aaaeb0509d5964566f501b717d2dd27b205 Mon Sep 17 00:00:00 2001
From 542b69b5534214e9d0ddb4ba328325d0bfcccb50 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Mon, 15 Apr 2013 04:29:32 +0200
Subject: [PATCH] Add linux-oe-g++ platform
@@ -22,10 +22,11 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
configure | 2 +-
mkspecs/features/configure.prf | 4 +--
mkspecs/features/qt.prf | 6 ++---
mkspecs/features/qt_functions.prf | 2 +-
mkspecs/linux-oe-g++/qmake.conf | 40 ++++++++++++++++++++++++++++
mkspecs/linux-oe-g++/qplatformdefs.h | 1 +
5 files changed, 45 insertions(+), 4 deletions(-)
6 files changed, 48 insertions(+), 7 deletions(-)
create mode 100644 mkspecs/linux-oe-g++/qmake.conf
create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h
@@ -63,6 +64,30 @@ index 934a18a9249..0f5b1b63334 100644
log("yes$$escape_expand(\\n)")
msg = "test $$1 succeeded"
write_file($$QMAKE_CONFIG_LOG, msg, append)
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
index b57afcf72d7..afa1c39b3e9 100644
--- a/mkspecs/features/qt.prf
+++ b/mkspecs/features/qt.prf
@@ -147,7 +147,7 @@ import_plugins:qtConfig(static) {
!isEmpty(plug_type) {
plug_path = $$eval(QT_PLUGIN.$${plug}.PATH)
isEmpty(plug_path): \
- plug_path = $$[QT_INSTALL_PLUGINS/get]
+ plug_path = $$[QT_INSTALL_PLUGINS]
LIBS += -L$$plug_path/$$plug_type
}
LIBS += -l$${plug}$$qtPlatformTargetSuffix()
@@ -298,8 +298,8 @@ for(ever) {
# static builds: link qml import plugins into the target.
contains(all_qt_module_deps, qml): \
qtConfig(static):import_plugins:!host_build:!no_import_scan {
- exists($$[QT_INSTALL_QML/get]): \
- QMLPATHS *= $$[QT_INSTALL_QML/get]
+ exists($$[QT_INSTALL_QML]): \
+ QMLPATHS *= $$[QT_INSTALL_QML]
# run qmlimportscanner
qtPrepareTool(QMLIMPORTSCANNER, qmlimportscanner, , system)
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
index 1903e509c8e..c093dd4592d 100644
--- a/mkspecs/features/qt_functions.prf