mirror of
http://code.qt.io/yocto/meta-qt6.git
synced 2026-01-01 13:58:07 +00:00
update modules
this brings qtwayland back
This commit is contained in:
parent
b680cdb148
commit
05324f3198
|
|
@ -0,0 +1,44 @@
|
|||
From 6f2aa9edc41621cf515778c2ac40e8f3e821a7b3 Mon Sep 17 00:00:00 2001
|
||||
From: Samuli Piippo <samuli.piippo@qt.io>
|
||||
Date: Thu, 2 Apr 2020 15:56:37 +0300
|
||||
Subject: [PATCH] qt_record_extra_package_dependency: check that target exists
|
||||
|
||||
The target may not be defined which causes error:
|
||||
get_target_property() called with non-existent target "qtwaylandscanner".
|
||||
|
||||
Change-Id: I58a9122456ccbbbb8fc9f0adce3b7ddcc985e6a4
|
||||
---
|
||||
cmake/QtBuild.cmake | 16 +++++++++-------
|
||||
1 file changed, 9 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake
|
||||
index 80dc5f02fa..dfe88d7da4 100644
|
||||
--- a/cmake/QtBuild.cmake
|
||||
+++ b/cmake/QtBuild.cmake
|
||||
@@ -2188,14 +2188,16 @@ endfunction()
|
||||
# main_target_name = qtwaylandscanner
|
||||
# dep_package_name = WaylandScanner
|
||||
function(qt_record_extra_package_dependency main_target_name dep_package_name dep_package_version)
|
||||
- get_target_property(extra_packages "${main_target_name}" QT_EXTRA_PACKAGE_DEPENDENCIES)
|
||||
- if(NOT extra_packages)
|
||||
- set(extra_packages "")
|
||||
- endif()
|
||||
+ if (TARGET "${main_target_name}")
|
||||
+ get_target_property(extra_packages "${main_target_name}" QT_EXTRA_PACKAGE_DEPENDENCIES)
|
||||
+ if(NOT extra_packages)
|
||||
+ set(extra_packages "")
|
||||
+ endif()
|
||||
|
||||
- list(APPEND extra_packages "${dep_package_name}\;${dep_package_version}")
|
||||
- set_target_properties("${main_target_name}" PROPERTIES QT_EXTRA_PACKAGE_DEPENDENCIES
|
||||
- "${extra_packages}")
|
||||
+ list(APPEND extra_packages "${dep_package_name}\;${dep_package_version}")
|
||||
+ set_target_properties("${main_target_name}" PROPERTIES QT_EXTRA_PACKAGE_DEPENDENCIES
|
||||
+ "${extra_packages}")
|
||||
+ endif()
|
||||
endfunction()
|
||||
|
||||
# This function records a dependency between ${main_target_name} and ${dep_target_name}
|
||||
--
|
||||
2.17.1
|
||||
|
||||
|
|
@ -19,6 +19,7 @@ SRC_URI += "\
|
|||
file://0003-Sysrootify-qmake.patch \
|
||||
file://0004-qtbase-allow-paths-outside-of-prefix.patch \
|
||||
file://0005-Allow-build-without-opengl.patch \
|
||||
file://0001-CMake-check-that-target-exists-in-qt_record_extra_pa.patch \
|
||||
"
|
||||
|
||||
DEPENDS += "\
|
||||
|
|
@ -133,4 +134,4 @@ FILES_${PN}-tools += "\
|
|||
|
||||
BBCLASSEXTEND =+ "native nativesdk"
|
||||
|
||||
SRCREV = "098d2edb07e08da6485fee4efbea72f43ddc766e"
|
||||
SRCREV = "a97703d33a088865e5d3b077a36cdea1f2725ac3"
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ DEPENDS += "qtbase qtdeclarative-native"
|
|||
|
||||
BBCLASSEXTEND =+ "native nativesdk"
|
||||
|
||||
SRCREV = "dbc6b9bfc7e6f1c7e212460105b426b8e80db671"
|
||||
SRCREV = "eb5aa8d9c18535ecd0aacc42fe3af954faf01c04"
|
||||
|
||||
do_install_append_class-target() {
|
||||
# broken installation of plugins.qmltypes
|
||||
|
|
|
|||
|
|
@ -19,6 +19,6 @@ SRC_URI += "\
|
|||
|
||||
BBCLASSEXTEND =+ "native nativesdk"
|
||||
|
||||
SRCREV = "d9db7d6aaa9ada14a933043362998f31e26395d0"
|
||||
SRCREV = "07b9ccd98b4d6598ba705800588feb63d9fb22cc"
|
||||
|
||||
#PNBLACKLIST[qttools] = "broken"
|
||||
|
|
|
|||
|
|
@ -37,6 +37,4 @@ DEPENDS += "qtbase qtdeclarative qtwayland-native wayland wayland-native"
|
|||
|
||||
BBCLASSEXTEND =+ "native nativesdk"
|
||||
|
||||
SRCREV = "12058b161e5f0d6f76523dc831acc8bdbc027fec"
|
||||
|
||||
PNBLACKLIST[qtwayland] = "broken"
|
||||
SRCREV = "3d4160fc36d584183b473fbffdb528b50a839b98"
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user