mirror of
http://code.qt.io/yocto/meta-qt6.git
synced 2026-01-01 13:58:07 +00:00
Update module revisions
remove merged patch
This commit is contained in:
parent
562aa2e970
commit
1d97adfd6c
|
|
@ -1,44 +0,0 @@
|
|||
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
|
||||
|
||||
|
|
@ -3,6 +3,7 @@ From: Samuli Piippo <samuli.piippo@qt.io>
|
|||
Date: Fri, 20 Mar 2020 09:11:48 +0200
|
||||
Subject: [PATCH] qtbase: allow paths outside of prefix
|
||||
|
||||
Task-number: QTBUG-81289
|
||||
Change-Id: I0ada0283a31cdf27890b83207f292db38e4e569a
|
||||
---
|
||||
cmake/QtBuild.cmake | 2 +-
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ From: Samuli Piippo <samuli.piippo@qt.io>
|
|||
Date: Fri, 20 Mar 2020 09:55:42 +0200
|
||||
Subject: [PATCH] Allow build without opengl
|
||||
|
||||
Task-number: QTBUG-82982
|
||||
Change-Id: I10dd13d6cdc6e69b13925ad4f96c90e178695ef4
|
||||
---
|
||||
src/gui/configure.cmake | 2 +-
|
||||
|
|
|
|||
|
|
@ -19,7 +19,6 @@ 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 += "\
|
||||
|
|
@ -134,4 +133,4 @@ FILES_${PN}-tools += "\
|
|||
|
||||
BBCLASSEXTEND =+ "native nativesdk"
|
||||
|
||||
SRCREV = "7e9481f1fb00bee9d20e8c13d761c0f16ee04973"
|
||||
SRCREV = "430232e44d5e6c7d7fd7ca3ebebb06d74e21ce2f"
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ DEPENDS += "qtbase qtdeclarative-native"
|
|||
|
||||
BBCLASSEXTEND =+ "native nativesdk"
|
||||
|
||||
SRCREV = "63bf6ac4c483cc64b48c410c6e1afb404f2bcbd1"
|
||||
SRCREV = "fb3552e0d152e963d74cccc7b36f4e618638b722"
|
||||
|
||||
do_install_append_class-target() {
|
||||
# broken installation of plugins.qmltypes
|
||||
|
|
|
|||
|
|
@ -17,4 +17,4 @@ include recipes-qt/qt6/qt6.inc
|
|||
|
||||
DEPENDS += "qtbase qtdeclarative"
|
||||
|
||||
SRCREV = "07036e42b1dc7fa86c7b71018ff5865cc9953ff1"
|
||||
SRCREV = "8a2df53bdc737314262443149a34287014a9e6fe"
|
||||
|
|
|
|||
|
|
@ -18,4 +18,4 @@ include recipes-qt/qt6/qt6.inc
|
|||
|
||||
DEPENDS += "qtbase"
|
||||
|
||||
SRCREV = "34f450cf9ccb9c7dc851e13bca74e7a17e89500a"
|
||||
SRCREV = "2ef670693de7dc36aa77b577a9fc0513602055b3"
|
||||
|
|
|
|||
|
|
@ -11,4 +11,4 @@ include recipes-qt/qt6/qt6.inc
|
|||
|
||||
DEPENDS += "qtbase"
|
||||
|
||||
SRCREV = "387076958e54aaacade9e2b9c06a51a095ba489d"
|
||||
SRCREV = "80c21ccaebc19e41939df16b56d3834c9d4a5e4e"
|
||||
|
|
|
|||
|
|
@ -19,4 +19,4 @@ do_configure_prepend() {
|
|||
sed -i -e 's/QmlTools//' ${S}/CMakeLists.txt
|
||||
}
|
||||
|
||||
SRCREV = "566b60d8b0a7f4d5dd5f5b949d349b2fa5b7b615"
|
||||
SRCREV = "be8ea7b8d0850b51e12daa261453fa64941885b6"
|
||||
|
|
|
|||
|
|
@ -13,4 +13,4 @@ include recipes-qt/qt6/qt6.inc
|
|||
|
||||
DEPENDS += "qtbase"
|
||||
|
||||
SRCREV = "6d904c19a521080ad46df4d7366dbf38f64d1c84"
|
||||
SRCREV = "d83ee2f5c383c78c2544aa09a3cce7bedae2380a"
|
||||
|
|
|
|||
|
|
@ -19,6 +19,6 @@ SRC_URI += "\
|
|||
|
||||
BBCLASSEXTEND =+ "native nativesdk"
|
||||
|
||||
SRCREV = "1c161fcbc13dac423e5a9589518988fc086a4248"
|
||||
SRCREV = "ac9cbc85ed0b75596b10b1a58c76eca13b41d033"
|
||||
|
||||
#PNBLACKLIST[qttools] = "broken"
|
||||
|
|
|
|||
|
|
@ -37,4 +37,4 @@ DEPENDS += "qtbase qtdeclarative qtwayland-native wayland wayland-native"
|
|||
|
||||
BBCLASSEXTEND =+ "native nativesdk"
|
||||
|
||||
SRCREV = "d599fff70eaff259ce4888bf1b411b54258e4141"
|
||||
SRCREV = "d3195879c0bc661339ea226f27fe3f7fb8e0d167"
|
||||
|
|
|
|||
|
|
@ -16,4 +16,4 @@ PACKAGECONFIG[translations] = ",,,qttranslations-${BPN}"
|
|||
|
||||
DEPENDS += "qtbase qtdeclarative"
|
||||
|
||||
SRCREV = "864ab7054515b05572e63aa649de795d2c2d6cef"
|
||||
SRCREV = "8cd3173ecdf0f73cc1cefae381febaa93f40f132"
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user