mirror of
http://code.qt.io/yocto/meta-qt6.git
synced 2026-01-01 13:58:07 +00:00
qt6: update submodules
* Update to Qt 6.0.0-beta5 content. * Add patch from codereview for qt3d to build against beta5 content. * disable qtopcua module temporarily due build issues against beta5 content. Task-number: QTBUG-86349 Change-Id: I0665d1c3df5d8dee1dbaac89a7973d5f22c5a8ad Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
This commit is contained in:
parent
9bd853d4fe
commit
7631ce8e65
File diff suppressed because it is too large
Load Diff
|
|
@ -15,6 +15,7 @@ include recipes-qt/qt6/qt6.inc
|
|||
|
||||
SRC_URI += " \
|
||||
git://github.com/assimp/assimp.git;name=assimp;branch=assimp_5.0_release;protocol=https;destsuffix=git/src/3rdparty/assimp/src \
|
||||
file://0001-Follow-up-on-change-of-QQmlListProperty-to-qsizetype.patch \
|
||||
"
|
||||
|
||||
DEPENDS = "qtbase qtdeclarative qtshadertools-native"
|
||||
|
|
|
|||
|
|
@ -17,4 +17,4 @@ DEPENDS += "qtbase"
|
|||
|
||||
PACKAGECONFIG[iconv] = "-DFEATURE_iconv=ON,-DFEATURE_iconv=OFF,virtual/libiconv"
|
||||
|
||||
SRCREV = "73b059a5ae0200f171397d5c39f0f69bbce97fa1"
|
||||
SRCREV = "a919ad565e95e0c3eda930fd7b4d727018ff585a"
|
||||
|
|
|
|||
|
|
@ -144,4 +144,4 @@ FILES_${PN}-tools += "\
|
|||
|
||||
BBCLASSEXTEND =+ "native nativesdk"
|
||||
|
||||
SRCREV = "3c3c5778e2a1c86a8492ae635844f5b8a553a571"
|
||||
SRCREV = "d8efe51303a08e93240766c620d2a7be3df0dd04"
|
||||
|
|
|
|||
|
|
@ -16,4 +16,4 @@ DEPENDS += "qtbase qtdeclarative-native"
|
|||
|
||||
BBCLASSEXTEND =+ "native nativesdk"
|
||||
|
||||
SRCREV = "bb61349080e34f154e8b2094f4765f42b2ae8c40"
|
||||
SRCREV = "39065e1cecdeb3f13917d48ff6381ffd6bcfc52f"
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = " \
|
|||
"
|
||||
|
||||
inherit qt6-cmake
|
||||
inherit disable-build
|
||||
|
||||
include recipes-qt/qt6/qt6-git.inc
|
||||
include recipes-qt/qt6/qt6.inc
|
||||
|
|
|
|||
|
|
@ -25,5 +25,5 @@ FILES_${PN}-qmlplugins += " \
|
|||
"
|
||||
|
||||
SRCREV_FORMAT = "qtquick3d_assimp"
|
||||
SRCREV_qtquick3d = "d1305da14229716eace131f4a7e18c7da98f3e12"
|
||||
SRCREV_qtquick3d = "877ab0a41a2472b59ea1cd3eddcc30c70e3027e1"
|
||||
SRCREV_assimp = "8f0c6b04b2257a520aaab38421b2e090204b69df"
|
||||
|
|
|
|||
|
|
@ -12,4 +12,4 @@ include recipes-qt/qt6/qt6.inc
|
|||
|
||||
DEPENDS = "qtbase qtdeclarative"
|
||||
|
||||
SRCREV = "5d73c595c54bcd63a9d77a0224f1209476ee5b93"
|
||||
SRCREV = "e3a6e2b0cd9a56e28f881e3602e378c90ae8238b"
|
||||
|
|
|
|||
|
|
@ -11,4 +11,4 @@ include recipes-qt/qt6/qt6.inc
|
|||
|
||||
DEPENDS = "qtbase qtdeclarative"
|
||||
|
||||
SRCREV = "3b0b39792cf6630435b3218d88021f143f937b2a"
|
||||
SRCREV = "5e4fa9054ed08c4dad01c1fd3d7ac83f1aea3c82"
|
||||
|
|
|
|||
|
|
@ -12,4 +12,4 @@ DEPENDS = "qtbase qtshadertools-native"
|
|||
|
||||
BBCLASSEXTEND =+ "native nativesdk"
|
||||
|
||||
SRCREV = "02f7757d497819bd927f55107c08535dac14ecb8"
|
||||
SRCREV = "bd39a1c9744dffb234c37a60549d0e0da3d5171e"
|
||||
|
|
|
|||
|
|
@ -13,4 +13,4 @@ include recipes-qt/qt6/qt6.inc
|
|||
|
||||
DEPENDS += "qtbase"
|
||||
|
||||
SRCREV = "3322c62f0129f6e87a184ba5f1956195c8a84a03"
|
||||
SRCREV = "4539d62e1c5d6389da53c1c788518ea2b8c5f0dc"
|
||||
|
|
|
|||
|
|
@ -16,4 +16,4 @@ DEPENDS += "qtbase qtdeclarative qttools-native"
|
|||
|
||||
BBCLASSEXTEND =+ "native nativesdk"
|
||||
|
||||
SRCREV = "071b4615e264cf097414095828e6b8bea742c065"
|
||||
SRCREV = "0cfb6d067b7dc7ccf5ad5247e9722ca8e7eff13a"
|
||||
|
|
|
|||
|
|
@ -18,4 +18,4 @@ python populate_packages_prepend () {
|
|||
'Qt translations for %s', extra_depends='')
|
||||
}
|
||||
|
||||
SRCREV = "b1445afeba173a71bd07348e26e907494511b946"
|
||||
SRCREV = "5922361002a96d59d9b38121ac3aa0b095528ad2"
|
||||
|
|
|
|||
|
|
@ -1,19 +1,19 @@
|
|||
From 942a41618d12f45e8803cfe995fdf3f9fb9fb081 Mon Sep 17 00:00:00 2001
|
||||
From 2a4f01d115ce9a69a71ac8c028e1c9cae9db63b3 Mon Sep 17 00:00:00 2001
|
||||
From: Samuli Piippo <samuli.piippo@qt.io>
|
||||
Date: Wed, 29 Jan 2020 12:39:09 +0200
|
||||
Subject: [PATCH] Allow qtwaylandscanner to be built without dependencies
|
||||
|
||||
Change-Id: I15aa5fc5128fcd0925d5950596bd56710b5b81d4
|
||||
---
|
||||
CMakeLists.txt | 7 +------
|
||||
CMakeLists.txt | 5 -----
|
||||
src/CMakeLists.txt | 2 +-
|
||||
2 files changed, 2 insertions(+), 7 deletions(-)
|
||||
2 files changed, 1 insertion(+), 6 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index e72c5e1c..232450ed 100644
|
||||
index 642afabb..08365f2d 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -18,19 +18,14 @@ find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS
|
||||
@@ -21,11 +21,6 @@ find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS
|
||||
BuildInternals
|
||||
)
|
||||
|
||||
|
|
@ -24,16 +24,7 @@ index e72c5e1c..232450ed 100644
|
|||
-
|
||||
find_package(Qt6 ${PROJECT_VERSION} CONFIG REQUIRED COMPONENTS
|
||||
Core
|
||||
Gui
|
||||
- OpenGL
|
||||
)
|
||||
|
||||
find_package(Qt6 ${PROJECT_VERSION} CONFIG OPTIONAL_COMPONENTS
|
||||
Quick
|
||||
+ OpenGL
|
||||
)
|
||||
# special case end
|
||||
|
||||
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
||||
index 8e60f0ba..4b2639e3 100644
|
||||
--- a/src/CMakeLists.txt
|
||||
|
|
|
|||
|
|
@ -37,4 +37,4 @@ DEPENDS += "qtbase qtdeclarative qtwayland-native wayland wayland-native"
|
|||
|
||||
BBCLASSEXTEND =+ "native nativesdk"
|
||||
|
||||
SRCREV = "f6be90fe629813d4941487b3a162778312e82dd0"
|
||||
SRCREV = "cdf0dcb42096c865ca7ad25a3e7f1e6f71010f34"
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user