aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2024-04-10 05:46:25 +0000
committerSamuli Piippo <samuli.piippo@qt.io>2024-04-11 06:35:29 +0000
commitd316ceaab0b9295e09d04b42fce9b6e36754896e (patch)
treeb6b65e78fc782b66449a182c1c3c2e1d061cb83a
parentc693c255774cca816933f3b3a53dc2fd72ff3d2c (diff)
pyside6: fix build6.6.3
Update to latest version of 6.6.3.1 and workaround another build issue by using unity build. Fixes: QTBUG-123933 Task-number: PYSIDE-2673 Change-Id: Ife2b38966f5a019be54c39724c097af0c89bbb4d Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
-rw-r--r--recipes-python/pyside6/python3-pyside6_git.bb1
-rw-r--r--recipes-qt/qt6/qt6-git.inc2
2 files changed, 2 insertions, 1 deletions
diff --git a/recipes-python/pyside6/python3-pyside6_git.bb b/recipes-python/pyside6/python3-pyside6_git.bb
index 87e7faa..6033da7 100644
--- a/recipes-python/pyside6/python3-pyside6_git.bb
+++ b/recipes-python/pyside6/python3-pyside6_git.bb
@@ -45,6 +45,7 @@ PYSIDE_COMPILER = "${HOST_SYS}-g++"
PYSIDE_COMPILER:toolchain-clang = "${HOST_SYS}-clang++"
EXTRA_OECMAKE += "\
+ -DCMAKE_UNITY_BUILD=ON \
-DSTANDALONE=ON \
-DPYSIDE_TREAT_QT_INCLUDE_DIRS_AS_NON_SYSTEM=ON \
-DSHIBOKEN_GENERATOR_EXTRA_FLAGS='\
diff --git a/recipes-qt/qt6/qt6-git.inc b/recipes-qt/qt6/qt6-git.inc
index ff8d39f..64d327b 100644
--- a/recipes-qt/qt6/qt6-git.inc
+++ b/recipes-qt/qt6/qt6-git.inc
@@ -21,7 +21,7 @@ SRCREV = "${SRCREV_${QT_MODULE}}"
SRCREV_tqtc-qmlcompilerplus = "976dae30ade4b2e766e91861047c4971237a93d5"
SRCREV_tqtc-qtinsighttracker = "b1a9b31f0cf2a4eebdd372564be371b790fa190d"
SRCREV_tqtc-qtvncserver = "108f7ba06f92e729a6cc2b9d6b454a89258af0ef"
-SRCREV_pyside-setup = "afbd87359bc5e959bac28cc0318794aa2231a91c"
+SRCREV_pyside-setup = "5cad7f595f4cd7faa6e45a2ddf82f3bb14ab9140"
SRCREV_qt3d = "c5d6c942098327226ff0661b60adb3baef704992"
SRCREV_qt3d-assimp = "c60a259fd35f09b8896b2920d48c436145914aae"
SRCREV_qt5compat = "b495ada5f1eefc060f38a100b04ebc4c55abf076"