From 7a6c300b730585c3b107204ccf6b8fa99dbe07ae Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Mon, 26 Sep 2022 08:51:07 +0300 Subject: [PATCH 01/32] Bump version to 6.2.7 Change-Id: I0e6529af717038f15e6ea8ee3bbf4f75dc09d338 Reviewed-by: Tarja Sundqvist --- recipes-qt/qt6/qt6-git.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt6/qt6-git.inc b/recipes-qt/qt6/qt6-git.inc index 5466dac..1c9d87b 100644 --- a/recipes-qt/qt6/qt6-git.inc +++ b/recipes-qt/qt6/qt6-git.inc @@ -12,7 +12,7 @@ CVE_PRODUCT = "qt" S = "${WORKDIR}/git" -PV = "6.2.6" +PV = "6.2.7" SRCREV = "${SRCREV_${QT_MODULE}}" From c5929225c977ad43f093dc1fd21f180cd1dc4b8d Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 27 Sep 2022 01:30:36 +0000 Subject: [PATCH 02/32] Update submodule refs on 'lts-6.2' in yocto/meta-qt6 Change-Id: Ibd6094d73fa48b9d2b2dea98aec53648105c1895 Reviewed-by: Qt Submodule Update Bot --- recipes-qt/qt6/qt6-git.inc | 76 +++++++++++++++++++------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/recipes-qt/qt6/qt6-git.inc b/recipes-qt/qt6/qt6-git.inc index 1c9d87b..f7fad9e 100644 --- a/recipes-qt/qt6/qt6-git.inc +++ b/recipes-qt/qt6/qt6-git.inc @@ -16,45 +16,45 @@ PV = "6.2.7" SRCREV = "${SRCREV_${QT_MODULE}}" -SRCREV_tqtc-qmlcompilerplus = "9b1c654fa686b728ac54185ad1e2bb5a4c9b3be8" -SRCREV_qt3d = "93c6319d0dfcf08123f0a3c1efc7c7c284feca20" +SRCREV_tqtc-qmlcompilerplus = "9b10a813220404de3515ed705e1f4b0ed895631f" +SRCREV_qt3d = "12df3e3b27643e4f7a96ff3caa36bb68e5ca56c6" SRCREV_qt3d-assimp = "5a38cd0a03015ceabbd5bc6efb0730dde1ef74e5" -SRCREV_qt5compat = "76e78615091e7a3fd0c08974d7477dc0e38b224f" -SRCREV_qtbase = "ea80641cbcdf599e10ea16f5438822f46a3e84ae" -SRCREV_qtapplicationmanager = "1e0c00d76955dc953f1908a06ad0280f30324850" -SRCREV_qtcharts = "d1396ae6471c1db4213fd7d1437e07923028224c" -SRCREV_qtcoap = "5d9ec52df1980f633050c80afe8d6981f004cd9c" -SRCREV_qtconnectivity = "bc41f49591186520ab98451a3e644be21810b9b7" -SRCREV_qtdatavis3d = "a924b6433c82062be7d6c826359180e7d7905e0a" -SRCREV_qtdeclarative = "60d10fc453019a8123bbfe4021e48c12245b8724" -SRCREV_qtdeviceutilities = "5f9249a64bc5fcd82bc082b635258291dce511c7" -SRCREV_qtimageformats = "0774e4a8e0f9dbfe2cdbc17b7098c7a16cfd74fa" -SRCREV_qtinterfaceframework = "e9745b20629af1a7690e074aa3d7169b81b9301e" -SRCREV_qtlottie = "6560ce857740a56062eca29ae2ec1e410224a159" -SRCREV_qtmqtt = "60c54782c2df982cc56c5ee0ee19b303c08c8333" -SRCREV_qtmultimedia = "dd2eb0e4d0ba6ee7f9d4f91c7a486394fa1997c8" -SRCREV_qtnetworkauth = "278faa596c87276353ca1d04dbcf8db236563173" -SRCREV_qtopcua = "31a0ad531ac387728c7564b2a9b88bddf9c03707" -SRCREV_qtpositioning = "5570608e62483dfbc60d8c532e73219dd566e7b6" -SRCREV_qtquick3d = "ff6526a80efa2a6892c2ea21fa3065d25f383131" +SRCREV_qt5compat = "8fbccc886ad481a26c5cea1e5d28df1d028a14bc" +SRCREV_qtbase = "deb23bddf3da9612d17d8153c74e1740f3ca01d1" +SRCREV_qtapplicationmanager = "ccf572b8a7c6fba8339f98fa6ef6e7e1047ecd6e" +SRCREV_qtcharts = "15f926bc9e6422dfbe98a4a319eed2b95d010e6f" +SRCREV_qtcoap = "9c2cd73cb3814d947a4addb0583b5d639cda4ab5" +SRCREV_qtconnectivity = "e3973523846dbd9e86b5344395ce75b3254c6629" +SRCREV_qtdatavis3d = "c5d8235a5c37d88c65e581dfdada5d5f389755e5" +SRCREV_qtdeclarative = "5d92fe24dace994986b3dee38c6a52569a99e744" +SRCREV_qtdeviceutilities = "3aa48f8aecb62149a1139217617a1efce8cf471c" +SRCREV_qtimageformats = "6eadf870fdd766841d706e5c9fb71ef45d26542c" +SRCREV_qtinterfaceframework = "dbad593944c3ae29531fad215e6f82e087aaf749" +SRCREV_qtlottie = "6c25837e12af24cb414be4c1ae5a6b6e6cb24143" +SRCREV_qtmqtt = "2c060f5d01102cf992794cabbc5637db80301469" +SRCREV_qtmultimedia = "13e0f88f00edeb4303812a8827de471d65bb96bd" +SRCREV_qtnetworkauth = "91c302772c3a7e0426fc46a07ec776285b93f2c0" +SRCREV_qtopcua = "1521fd978325b1300ae8273dbb58ec98a702977b" +SRCREV_qtpositioning = "e013837e54256ce2e9a6b45c8ebc7e8ab34d2f7c" +SRCREV_qtquick3d = "502d4794f02f5ddecf6c4e1e9870c2570a584219" SRCREV_qtquick3d-assimp = "5a38cd0a03015ceabbd5bc6efb0730dde1ef74e5" -SRCREV_qtquickdesigner-components = "532cabf950f13d4dc04fb8b14f5eed20b6afc6fa" -SRCREV_qtquicktimeline = "6984bc3848fdd8a7dac9d236f57d3ad3396aba41" -SRCREV_qtremoteobjects = "6f72d2818389be3d16dc22707c3a08abf90f6aa4" -SRCREV_qtscxml = "6d43147c5368a6d2e29846151615c551b2e4e39e" -SRCREV_qtsensors = "2da363fb7c325d339ad32c1a88693c6264cfcdc5" -SRCREV_qtserialbus = "0b62f360dc7587567ef44e72f1b60a04dd567a99" -SRCREV_qtserialport = "913fd335f121770257a5497225f21d1328fead67" -SRCREV_qtshadertools = "fc0c14e283a4df80c71206e56ff2fbd93694e513" -SRCREV_qtsvg = "7bbabaa31b20e4412f464f8f5e917f0e81dbf1e1" -SRCREV_qttools = "d40931ba405b9726929c2a359da09e255151416b" +SRCREV_qtquickdesigner-components = "27359a5293c8d877180f7d6afb123155bde0b61a" +SRCREV_qtquicktimeline = "79cb3a534cb4641ad5ea31f41de9a3b3cf090da6" +SRCREV_qtremoteobjects = "a65ad41aa2e285b65f1f703412b171b580941129" +SRCREV_qtscxml = "af121c862b3fb80920afd1d16581f01a8c059d48" +SRCREV_qtsensors = "8ef3e8d5abeaffb787702738da5cc09486f2a089" +SRCREV_qtserialbus = "0d41f8bdb5b496fa9fe5c96f67b4f21e7fe6ae7c" +SRCREV_qtserialport = "ea6834cce1efa81c1c38371ee3591ff533c00308" +SRCREV_qtshadertools = "7ebfbe1b3963ccc3906feb801aefbaf83a7f08cd" +SRCREV_qtsvg = "3b6601107bcb13ad46eb6a8cd14a773435acb1f4" +SRCREV_qttools = "cfed18e36088dd15a33d4f86e7e0759593b055fe" SRCREV_qttools-qlitehtml = "4931b7aa30f256c20573d283561aa432fecf8f38" SRCREV_qttools-qlitehtml-litehtml = "6236113734bb0a28467e5999e86fdd2834be8e01" -SRCREV_qttranslations = "88166a103abd2a3908fb5b6581f6f3c3dedeff7c" -SRCREV_qtvirtualkeyboard = "07d64cd92c6b4d3ca398790d93309f8078c5f746" -SRCREV_qtwayland = "94c665a21384f7a3ad2351fb7503cede1f5a6595" -SRCREV_qtwebchannel = "6c519d144c14ca6a2837f631b8b5fc997d262a5c" -SRCREV_qtwebengine = "7ce407c4bb0c375cff9d41b8abf2060a4961057b" -SRCREV_qtwebengine-chromium = "9a8385241542eaad285501be6dc66d96a76c20aa" -SRCREV_qtwebsockets = "caf9c925a9dbe23179471d2a213eabcb4021e51d" -SRCREV_qtwebview = "30784bb86204bc671052890201ce2513d1efa4c6" +SRCREV_qttranslations = "e04af790ed408bc8a0511cd962398ac9e5cd8e71" +SRCREV_qtvirtualkeyboard = "264ba2f3444fd9e0da799e06e02e5b2b63abda65" +SRCREV_qtwayland = "97ee14bda3997bc8ae8b70a8c904df59a71f114b" +SRCREV_qtwebchannel = "b854d6af5f8ffe43c4fe4e67489df503c0ed4b91" +SRCREV_qtwebengine = "7371cada5d84362aeee370844386262dc0c4bc74" +SRCREV_qtwebengine-chromium = "cee5373e6119a7ee20ba5e941185f4a22104d46d" +SRCREV_qtwebsockets = "2383c082b3100a0ffc9bef388bdf5f83416dbbef" +SRCREV_qtwebview = "425a6a390831328cd68aa6e84f1c0bd4fb245f3d" From c039f7bb52cfe6dc583984d8327a1f03916e9fb7 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Tue, 27 Sep 2022 12:49:48 +0300 Subject: [PATCH 03/32] Bump version to 6.2.7 Change-Id: Ia4a75ff47cb9b9b4dc4e226a9b0a6d74f2360e04 Reviewed-by: Tarja Sundqvist From e341180db583fbd631559e2e73f04beb5c762260 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 4 Oct 2022 12:13:49 +0000 Subject: [PATCH 04/32] Update submodule refs on 'lts-6.2' in yocto/meta-qt6 Change-Id: I5d9dc33b97ebadbcc8ce21237779fafd5aff65e3 Reviewed-by: Qt Submodule Update Bot --- recipes-qt/qt6/qt6-git.inc | 72 +++++++++++++++++++------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/recipes-qt/qt6/qt6-git.inc b/recipes-qt/qt6/qt6-git.inc index f7fad9e..2217c7c 100644 --- a/recipes-qt/qt6/qt6-git.inc +++ b/recipes-qt/qt6/qt6-git.inc @@ -16,45 +16,45 @@ PV = "6.2.7" SRCREV = "${SRCREV_${QT_MODULE}}" -SRCREV_tqtc-qmlcompilerplus = "9b10a813220404de3515ed705e1f4b0ed895631f" -SRCREV_qt3d = "12df3e3b27643e4f7a96ff3caa36bb68e5ca56c6" +SRCREV_tqtc-qmlcompilerplus = "d18948550a7be48afb925c7d2f9b1781f911a772" +SRCREV_qt3d = "4a4d72d06f06df696625294b3d2f4e656e184ad1" SRCREV_qt3d-assimp = "5a38cd0a03015ceabbd5bc6efb0730dde1ef74e5" -SRCREV_qt5compat = "8fbccc886ad481a26c5cea1e5d28df1d028a14bc" -SRCREV_qtbase = "deb23bddf3da9612d17d8153c74e1740f3ca01d1" -SRCREV_qtapplicationmanager = "ccf572b8a7c6fba8339f98fa6ef6e7e1047ecd6e" -SRCREV_qtcharts = "15f926bc9e6422dfbe98a4a319eed2b95d010e6f" -SRCREV_qtcoap = "9c2cd73cb3814d947a4addb0583b5d639cda4ab5" -SRCREV_qtconnectivity = "e3973523846dbd9e86b5344395ce75b3254c6629" -SRCREV_qtdatavis3d = "c5d8235a5c37d88c65e581dfdada5d5f389755e5" -SRCREV_qtdeclarative = "5d92fe24dace994986b3dee38c6a52569a99e744" -SRCREV_qtdeviceutilities = "3aa48f8aecb62149a1139217617a1efce8cf471c" -SRCREV_qtimageformats = "6eadf870fdd766841d706e5c9fb71ef45d26542c" -SRCREV_qtinterfaceframework = "dbad593944c3ae29531fad215e6f82e087aaf749" -SRCREV_qtlottie = "6c25837e12af24cb414be4c1ae5a6b6e6cb24143" -SRCREV_qtmqtt = "2c060f5d01102cf992794cabbc5637db80301469" -SRCREV_qtmultimedia = "13e0f88f00edeb4303812a8827de471d65bb96bd" -SRCREV_qtnetworkauth = "91c302772c3a7e0426fc46a07ec776285b93f2c0" -SRCREV_qtopcua = "1521fd978325b1300ae8273dbb58ec98a702977b" -SRCREV_qtpositioning = "e013837e54256ce2e9a6b45c8ebc7e8ab34d2f7c" -SRCREV_qtquick3d = "502d4794f02f5ddecf6c4e1e9870c2570a584219" +SRCREV_qt5compat = "fc13e2fa678a2eb9be92da2f216c3ad04c87c2b0" +SRCREV_qtbase = "ae32c1a472d3437d225292db12ca9a000b27b293" +SRCREV_qtapplicationmanager = "47dfb07a014044f5f3e1b695dee3d4bf0f28d251" +SRCREV_qtcharts = "53f8ca566cec194201e840027114343ba4612f4d" +SRCREV_qtcoap = "cc10af481506fbf74b8531b4900e91a4e964b70e" +SRCREV_qtconnectivity = "a053c1723a26d71bace73e23e1b5f526c490610d" +SRCREV_qtdatavis3d = "1431fa12be2e0c7480d6d0a363499bbf8ebb3ece" +SRCREV_qtdeclarative = "446f3bfd4c7800b5ef9c38aca533a0ade1544750" +SRCREV_qtdeviceutilities = "c3d9543136a9cf65365ab0781a7d9e99aa9fbe11" +SRCREV_qtimageformats = "a57df663fe370f92c1d044a68d69f29d182e43e2" +SRCREV_qtinterfaceframework = "0c62ce6f514312ac932818a64112396ceb833f6f" +SRCREV_qtlottie = "33ebabae0040233553887b35c2b3cb1f29d66d60" +SRCREV_qtmqtt = "e3e9497883b084f45ffce73cf61ff02efa95ab94" +SRCREV_qtmultimedia = "2146cacc9eac1262f7ecfd7ee609881783e6053b" +SRCREV_qtnetworkauth = "bba8b29173525fa18be41909185fd4f44973265c" +SRCREV_qtopcua = "850b1107ceddf8a606f446cea2fa87124e631c4b" +SRCREV_qtpositioning = "4606bb8442f8ec50fbed280475da68e6f9c334ab" +SRCREV_qtquick3d = "2917cea262d9272b473ad5a0206d7f85e33a8c95" SRCREV_qtquick3d-assimp = "5a38cd0a03015ceabbd5bc6efb0730dde1ef74e5" SRCREV_qtquickdesigner-components = "27359a5293c8d877180f7d6afb123155bde0b61a" -SRCREV_qtquicktimeline = "79cb3a534cb4641ad5ea31f41de9a3b3cf090da6" -SRCREV_qtremoteobjects = "a65ad41aa2e285b65f1f703412b171b580941129" -SRCREV_qtscxml = "af121c862b3fb80920afd1d16581f01a8c059d48" -SRCREV_qtsensors = "8ef3e8d5abeaffb787702738da5cc09486f2a089" -SRCREV_qtserialbus = "0d41f8bdb5b496fa9fe5c96f67b4f21e7fe6ae7c" -SRCREV_qtserialport = "ea6834cce1efa81c1c38371ee3591ff533c00308" -SRCREV_qtshadertools = "7ebfbe1b3963ccc3906feb801aefbaf83a7f08cd" -SRCREV_qtsvg = "3b6601107bcb13ad46eb6a8cd14a773435acb1f4" -SRCREV_qttools = "cfed18e36088dd15a33d4f86e7e0759593b055fe" +SRCREV_qtquicktimeline = "c3ec1654ba99c2ece1d3edadb03bd460a425e218" +SRCREV_qtremoteobjects = "65e7a37e5236d16e50bab8bab1dab95364047dd0" +SRCREV_qtscxml = "f910209da5ea91b45847764ae81d99949be0db36" +SRCREV_qtsensors = "2b648803bd2944b9182feeede56a48a54d2fb3ab" +SRCREV_qtserialbus = "c4abd6898c9d2dad8502fcacd40d441e08fed29b" +SRCREV_qtserialport = "881e9ea2e1fbfb3b32f038d314ceef337d7c1560" +SRCREV_qtshadertools = "03e7592ad0912b971d1a371f0fd8cbc8e2cd92b0" +SRCREV_qtsvg = "2089deec469dcf2b27cc52fcb138580d32b50151" +SRCREV_qttools = "8c1e1bc27a6362aabb62d907af52f61e37f24d36" SRCREV_qttools-qlitehtml = "4931b7aa30f256c20573d283561aa432fecf8f38" SRCREV_qttools-qlitehtml-litehtml = "6236113734bb0a28467e5999e86fdd2834be8e01" -SRCREV_qttranslations = "e04af790ed408bc8a0511cd962398ac9e5cd8e71" -SRCREV_qtvirtualkeyboard = "264ba2f3444fd9e0da799e06e02e5b2b63abda65" -SRCREV_qtwayland = "97ee14bda3997bc8ae8b70a8c904df59a71f114b" -SRCREV_qtwebchannel = "b854d6af5f8ffe43c4fe4e67489df503c0ed4b91" -SRCREV_qtwebengine = "7371cada5d84362aeee370844386262dc0c4bc74" +SRCREV_qttranslations = "a7f9404c4735337f9268f49cd03675dfbb608c5c" +SRCREV_qtvirtualkeyboard = "cce5820e9508ab22b2b845ad9d2cfb995808f1cf" +SRCREV_qtwayland = "b1d5c4637e508f48a0ad4a1970268158da26101e" +SRCREV_qtwebchannel = "bc61e19d7990eddeabd2e2e4e3c0c223108c4602" +SRCREV_qtwebengine = "74f388ed23ac04a912649d31bb0f917820f5afb0" SRCREV_qtwebengine-chromium = "cee5373e6119a7ee20ba5e941185f4a22104d46d" -SRCREV_qtwebsockets = "2383c082b3100a0ffc9bef388bdf5f83416dbbef" -SRCREV_qtwebview = "425a6a390831328cd68aa6e84f1c0bd4fb245f3d" +SRCREV_qtwebsockets = "e300f1c350ce0c60946ecd27ef51a206c2b38b51" +SRCREV_qtwebview = "a15e0eea697f6af9446453e4027093775a682d70" From f2a7f387b160ffe90f589e3f59ea415a5dab5bb7 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 8 Oct 2022 16:14:11 +0000 Subject: [PATCH 05/32] Update submodule refs on 'lts-6.2' in yocto/meta-qt6 Change-Id: Ia4f5e1d3ac8cfad0d340be646db7338ddf8657f0 Reviewed-by: Qt Submodule Update Bot --- recipes-qt/qt6/qt6-git.inc | 72 +++++++++++++++++++------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/recipes-qt/qt6/qt6-git.inc b/recipes-qt/qt6/qt6-git.inc index 2217c7c..dd3a77d 100644 --- a/recipes-qt/qt6/qt6-git.inc +++ b/recipes-qt/qt6/qt6-git.inc @@ -16,45 +16,45 @@ PV = "6.2.7" SRCREV = "${SRCREV_${QT_MODULE}}" -SRCREV_tqtc-qmlcompilerplus = "d18948550a7be48afb925c7d2f9b1781f911a772" -SRCREV_qt3d = "4a4d72d06f06df696625294b3d2f4e656e184ad1" +SRCREV_tqtc-qmlcompilerplus = "a1d2f6340f5867f64ac0903c30d7c73251600bb0" +SRCREV_qt3d = "a44ff73338a8af3641e658f2eadae989cfd88b0e" SRCREV_qt3d-assimp = "5a38cd0a03015ceabbd5bc6efb0730dde1ef74e5" -SRCREV_qt5compat = "fc13e2fa678a2eb9be92da2f216c3ad04c87c2b0" -SRCREV_qtbase = "ae32c1a472d3437d225292db12ca9a000b27b293" -SRCREV_qtapplicationmanager = "47dfb07a014044f5f3e1b695dee3d4bf0f28d251" -SRCREV_qtcharts = "53f8ca566cec194201e840027114343ba4612f4d" -SRCREV_qtcoap = "cc10af481506fbf74b8531b4900e91a4e964b70e" -SRCREV_qtconnectivity = "a053c1723a26d71bace73e23e1b5f526c490610d" -SRCREV_qtdatavis3d = "1431fa12be2e0c7480d6d0a363499bbf8ebb3ece" -SRCREV_qtdeclarative = "446f3bfd4c7800b5ef9c38aca533a0ade1544750" -SRCREV_qtdeviceutilities = "c3d9543136a9cf65365ab0781a7d9e99aa9fbe11" -SRCREV_qtimageformats = "a57df663fe370f92c1d044a68d69f29d182e43e2" -SRCREV_qtinterfaceframework = "0c62ce6f514312ac932818a64112396ceb833f6f" -SRCREV_qtlottie = "33ebabae0040233553887b35c2b3cb1f29d66d60" -SRCREV_qtmqtt = "e3e9497883b084f45ffce73cf61ff02efa95ab94" -SRCREV_qtmultimedia = "2146cacc9eac1262f7ecfd7ee609881783e6053b" -SRCREV_qtnetworkauth = "bba8b29173525fa18be41909185fd4f44973265c" -SRCREV_qtopcua = "850b1107ceddf8a606f446cea2fa87124e631c4b" -SRCREV_qtpositioning = "4606bb8442f8ec50fbed280475da68e6f9c334ab" -SRCREV_qtquick3d = "2917cea262d9272b473ad5a0206d7f85e33a8c95" +SRCREV_qt5compat = "d74d9e8d08fe12eb16d24c57b23ab20c5cdbcc47" +SRCREV_qtbase = "5cbc56c70d4f2d04ec5ef4d734fdb04064110e83" +SRCREV_qtapplicationmanager = "44a85fdb4e25d9276bc87791ad5a436c745f21e9" +SRCREV_qtcharts = "09e12d63aa5dadccee37351672237190a318759e" +SRCREV_qtcoap = "56355baeccd78608ba4af4f5c5e9db91b8f90be0" +SRCREV_qtconnectivity = "fbd6ef323fd2b2523b51363d7523b1a296a0d459" +SRCREV_qtdatavis3d = "4670e16ddeaa76d0af49039e14be842c432a8919" +SRCREV_qtdeclarative = "34239061838069ce75f37ad377c36471728dc3d6" +SRCREV_qtdeviceutilities = "5c77430a14b65f0fef1e94f84633f48bfa6e2af5" +SRCREV_qtimageformats = "a6332cb4cfc8bf01e137da252e7a0566e6376b88" +SRCREV_qtinterfaceframework = "eebdf65f7b3c284c06db1a495f0be44f94be7597" +SRCREV_qtlottie = "6f67a675dedc8f8454637f9e23610760649421c9" +SRCREV_qtmqtt = "0d58b36196d2c91263e7c6305e00da56f461c2af" +SRCREV_qtmultimedia = "ef09a565212ae51acfeee4d772b7c9f4b449aa55" +SRCREV_qtnetworkauth = "ada5b0ed1b15aac875ba4cd465c26172e48a4cde" +SRCREV_qtopcua = "7045247a643f515be250c968997347fa44600b67" +SRCREV_qtpositioning = "563d4f64489358e4c438cb23566ccbd7d000d5e1" +SRCREV_qtquick3d = "4899c9aede027de76d083cd619f3c695f240f2a5" SRCREV_qtquick3d-assimp = "5a38cd0a03015ceabbd5bc6efb0730dde1ef74e5" SRCREV_qtquickdesigner-components = "27359a5293c8d877180f7d6afb123155bde0b61a" -SRCREV_qtquicktimeline = "c3ec1654ba99c2ece1d3edadb03bd460a425e218" -SRCREV_qtremoteobjects = "65e7a37e5236d16e50bab8bab1dab95364047dd0" -SRCREV_qtscxml = "f910209da5ea91b45847764ae81d99949be0db36" -SRCREV_qtsensors = "2b648803bd2944b9182feeede56a48a54d2fb3ab" -SRCREV_qtserialbus = "c4abd6898c9d2dad8502fcacd40d441e08fed29b" -SRCREV_qtserialport = "881e9ea2e1fbfb3b32f038d314ceef337d7c1560" -SRCREV_qtshadertools = "03e7592ad0912b971d1a371f0fd8cbc8e2cd92b0" -SRCREV_qtsvg = "2089deec469dcf2b27cc52fcb138580d32b50151" -SRCREV_qttools = "8c1e1bc27a6362aabb62d907af52f61e37f24d36" +SRCREV_qtquicktimeline = "7ae53320ccf29e5831778015dc657e9052888fc0" +SRCREV_qtremoteobjects = "dc699adb301d74fd444efc9ff1d600783fffccd5" +SRCREV_qtscxml = "00c9df9e0e667728a2a5f5b703347218d753ecbe" +SRCREV_qtsensors = "9d1279773cd350646f40ceffdc6d145756ddd9ba" +SRCREV_qtserialbus = "a9f228dc1ca32b45e49121678cd6d32cfaf51cd1" +SRCREV_qtserialport = "cbeed65c441d18e7714faeb32eeaf3e2071f4ea8" +SRCREV_qtshadertools = "119fc53be08ac54f81408d6f549324ad3b48176f" +SRCREV_qtsvg = "657ef4f837121e85e74e655530ded953a25275bc" +SRCREV_qttools = "0bd001a9af7d8861575cba4d0fc474ed41e5175e" SRCREV_qttools-qlitehtml = "4931b7aa30f256c20573d283561aa432fecf8f38" SRCREV_qttools-qlitehtml-litehtml = "6236113734bb0a28467e5999e86fdd2834be8e01" -SRCREV_qttranslations = "a7f9404c4735337f9268f49cd03675dfbb608c5c" -SRCREV_qtvirtualkeyboard = "cce5820e9508ab22b2b845ad9d2cfb995808f1cf" -SRCREV_qtwayland = "b1d5c4637e508f48a0ad4a1970268158da26101e" -SRCREV_qtwebchannel = "bc61e19d7990eddeabd2e2e4e3c0c223108c4602" -SRCREV_qtwebengine = "74f388ed23ac04a912649d31bb0f917820f5afb0" +SRCREV_qttranslations = "118169c05a968f4f9bb4bf78b634ffcc2ae5a909" +SRCREV_qtvirtualkeyboard = "52176e42ddc4f6731ba6285554789716af3b6356" +SRCREV_qtwayland = "bb8ccc0be41f96cee614007962b753e69ba49405" +SRCREV_qtwebchannel = "a53057130fa6cb2d6532bc141fb36f1221902fec" +SRCREV_qtwebengine = "37e010aa35bb859872d83be01bc42fcb838e0332" SRCREV_qtwebengine-chromium = "cee5373e6119a7ee20ba5e941185f4a22104d46d" -SRCREV_qtwebsockets = "e300f1c350ce0c60946ecd27ef51a206c2b38b51" -SRCREV_qtwebview = "a15e0eea697f6af9446453e4027093775a682d70" +SRCREV_qtwebsockets = "00fd2df5625713e79c10c0876770c6d57676629e" +SRCREV_qtwebview = "7b362fc03f129c324914ee73c98b58aee7de4225" From e66966dcbf0c62a1b67db16d4e5591a557e35512 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 10 Oct 2022 08:43:30 +0000 Subject: [PATCH 06/32] qtbase: avoid cmake archiving api for native build After 812bf25183c440dd28dcadaa7732d8f088b134f1, we need to extend the workaround for badly configured CMake also to qtbase-native. This fixes error: CMake was not built with zstd support. Rebuild CMake or set QT_AVOID_CMAKE_ARCHIVING_API=ON. Fixes: WEBOSCI-54 Change-Id: I33c97b1a051fe90d706461c83f75912aa1c1c820 Reviewed-by: Janne Juntunen (cherry picked from commit 0bb5361fe0495e23e451869fc10faeb29a825571) Reviewed-by: Mikko Gronoff --- recipes-qt/qt6/qtbase_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt6/qtbase_git.bb b/recipes-qt/qt6/qtbase_git.bb index d969609..fedc682 100644 --- a/recipes-qt/qt6/qtbase_git.bb +++ b/recipes-qt/qt6/qtbase_git.bb @@ -127,12 +127,12 @@ PACKAGECONFIG[sql-sqlite] = "-DFEATURE_system_sqlite=ON,-DFEATURE_sql_sqlite=OFF EXTRA_OECMAKE += "\ -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \ -DQT_EDITION=${QT_EDITION} \ + -DQT_AVOID_CMAKE_ARCHIVING_API=ON \ " EXTRA_OECMAKE:append:class-target = "\ -DFEATURE_rpath=OFF \ -DQT_QPA_DEFAULT_PLATFORM=${QT_QPA_DEFAULT_PLATFORM} \ - -DQT_AVOID_CMAKE_ARCHIVING_API=ON \ ${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '-DFEATURE_use_gold_linker=ON', '-DFEATURE_use_bfd_linker=ON', d)} \ " From 0d0a52a27764cc4d2ac8d7763f2673fb761efc30 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 18 Oct 2022 01:30:38 +0000 Subject: [PATCH 07/32] Update submodule refs on 'lts-6.2' in yocto/meta-qt6 Change-Id: Iabdca01696d2e8de4365586f4bc1fadd5338a462 Reviewed-by: Qt Submodule Update Bot --- recipes-qt/qt6/qt6-git.inc | 72 +++++++++++++++++++------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/recipes-qt/qt6/qt6-git.inc b/recipes-qt/qt6/qt6-git.inc index dd3a77d..a33e85b 100644 --- a/recipes-qt/qt6/qt6-git.inc +++ b/recipes-qt/qt6/qt6-git.inc @@ -16,45 +16,45 @@ PV = "6.2.7" SRCREV = "${SRCREV_${QT_MODULE}}" -SRCREV_tqtc-qmlcompilerplus = "a1d2f6340f5867f64ac0903c30d7c73251600bb0" -SRCREV_qt3d = "a44ff73338a8af3641e658f2eadae989cfd88b0e" +SRCREV_tqtc-qmlcompilerplus = "2d421269250bcd84d57f630eac9a2d1b19c1c127" +SRCREV_qt3d = "29ff65b933f72af557fa652514df6bc2684ec045" SRCREV_qt3d-assimp = "5a38cd0a03015ceabbd5bc6efb0730dde1ef74e5" -SRCREV_qt5compat = "d74d9e8d08fe12eb16d24c57b23ab20c5cdbcc47" -SRCREV_qtbase = "5cbc56c70d4f2d04ec5ef4d734fdb04064110e83" -SRCREV_qtapplicationmanager = "44a85fdb4e25d9276bc87791ad5a436c745f21e9" -SRCREV_qtcharts = "09e12d63aa5dadccee37351672237190a318759e" -SRCREV_qtcoap = "56355baeccd78608ba4af4f5c5e9db91b8f90be0" -SRCREV_qtconnectivity = "fbd6ef323fd2b2523b51363d7523b1a296a0d459" -SRCREV_qtdatavis3d = "4670e16ddeaa76d0af49039e14be842c432a8919" -SRCREV_qtdeclarative = "34239061838069ce75f37ad377c36471728dc3d6" -SRCREV_qtdeviceutilities = "5c77430a14b65f0fef1e94f84633f48bfa6e2af5" -SRCREV_qtimageformats = "a6332cb4cfc8bf01e137da252e7a0566e6376b88" -SRCREV_qtinterfaceframework = "eebdf65f7b3c284c06db1a495f0be44f94be7597" -SRCREV_qtlottie = "6f67a675dedc8f8454637f9e23610760649421c9" -SRCREV_qtmqtt = "0d58b36196d2c91263e7c6305e00da56f461c2af" -SRCREV_qtmultimedia = "ef09a565212ae51acfeee4d772b7c9f4b449aa55" -SRCREV_qtnetworkauth = "ada5b0ed1b15aac875ba4cd465c26172e48a4cde" -SRCREV_qtopcua = "7045247a643f515be250c968997347fa44600b67" -SRCREV_qtpositioning = "563d4f64489358e4c438cb23566ccbd7d000d5e1" -SRCREV_qtquick3d = "4899c9aede027de76d083cd619f3c695f240f2a5" +SRCREV_qt5compat = "f06386b93833be8850d2c11eede0ed40e47660ee" +SRCREV_qtbase = "ce97b2255af2ea260cbcbbff7b475e01e0e58563" +SRCREV_qtapplicationmanager = "d329862262fd1038105dc4cc35fc9f375d9954e3" +SRCREV_qtcharts = "4d8e844d16b398ce5c846d2dd192ac77681d9a02" +SRCREV_qtcoap = "242a2f6710978ff0af8d88998aff57a3b4cebf47" +SRCREV_qtconnectivity = "2ea7a1bd40402347e9878d10aac37643087bb565" +SRCREV_qtdatavis3d = "095fb0d9611db600ae452dd2245deed92fa2c1d5" +SRCREV_qtdeclarative = "abbf5e18c06687cfde35a58284b1625c46b0c6e5" +SRCREV_qtdeviceutilities = "fcbeff585444aa936444838c5dcf184854a7eaa0" +SRCREV_qtimageformats = "406c94717fbca59445d840fa3820798730c02e29" +SRCREV_qtinterfaceframework = "0d2a1abc90e8047aac60e3b7e723c07982c385bd" +SRCREV_qtlottie = "81cefc8c60423c6d23964495030f23b242858cf0" +SRCREV_qtmqtt = "3ba72b3c8ca24438071f942c0f9b7e7ad013d007" +SRCREV_qtmultimedia = "bf03ce6a13fab6583042064e0fec0b03461ae7fd" +SRCREV_qtnetworkauth = "c8c9b1d20a5802940b321055754d974d060c80ec" +SRCREV_qtopcua = "1d5070165c07d3ca733fa76d38ea0af6bb06d03a" +SRCREV_qtpositioning = "8811673248d2243ea775edefbae302fae266bea4" +SRCREV_qtquick3d = "7be97a368b138809e5b57a63e204f350f15c8b8f" SRCREV_qtquick3d-assimp = "5a38cd0a03015ceabbd5bc6efb0730dde1ef74e5" SRCREV_qtquickdesigner-components = "27359a5293c8d877180f7d6afb123155bde0b61a" -SRCREV_qtquicktimeline = "7ae53320ccf29e5831778015dc657e9052888fc0" -SRCREV_qtremoteobjects = "dc699adb301d74fd444efc9ff1d600783fffccd5" -SRCREV_qtscxml = "00c9df9e0e667728a2a5f5b703347218d753ecbe" -SRCREV_qtsensors = "9d1279773cd350646f40ceffdc6d145756ddd9ba" -SRCREV_qtserialbus = "a9f228dc1ca32b45e49121678cd6d32cfaf51cd1" -SRCREV_qtserialport = "cbeed65c441d18e7714faeb32eeaf3e2071f4ea8" -SRCREV_qtshadertools = "119fc53be08ac54f81408d6f549324ad3b48176f" -SRCREV_qtsvg = "657ef4f837121e85e74e655530ded953a25275bc" -SRCREV_qttools = "0bd001a9af7d8861575cba4d0fc474ed41e5175e" +SRCREV_qtquicktimeline = "a1d71b52ea81ae9ef0f46cbd139c8a957db16d8c" +SRCREV_qtremoteobjects = "df2db2d2b4adcc01f4fc03aa5363fc8a079f73da" +SRCREV_qtscxml = "2eb099256dde53c603ccad73ac49a36cfd77707c" +SRCREV_qtsensors = "ebb93e0940ba75184d86f3f3c889e5024a1583fe" +SRCREV_qtserialbus = "40fe1b88970601cf9ffe90623f830f738dbb1663" +SRCREV_qtserialport = "84f73ab98f8d5a6a10c03bf22e75d8ae0b66ed1d" +SRCREV_qtshadertools = "f8bb75ac2251f0bec3495b4c56d13fd3ceba153d" +SRCREV_qtsvg = "93c21fb6c2c7206d39297f822cedd3fa5f2b8b4b" +SRCREV_qttools = "3c10e6a657bfd75c97378f60bc9d0e65c5c749c1" SRCREV_qttools-qlitehtml = "4931b7aa30f256c20573d283561aa432fecf8f38" SRCREV_qttools-qlitehtml-litehtml = "6236113734bb0a28467e5999e86fdd2834be8e01" -SRCREV_qttranslations = "118169c05a968f4f9bb4bf78b634ffcc2ae5a909" -SRCREV_qtvirtualkeyboard = "52176e42ddc4f6731ba6285554789716af3b6356" -SRCREV_qtwayland = "bb8ccc0be41f96cee614007962b753e69ba49405" -SRCREV_qtwebchannel = "a53057130fa6cb2d6532bc141fb36f1221902fec" -SRCREV_qtwebengine = "37e010aa35bb859872d83be01bc42fcb838e0332" +SRCREV_qttranslations = "13c0c7bbb4a336bd6813d4e096bd9c6e2130b2bc" +SRCREV_qtvirtualkeyboard = "e9fb59075533e1aec6b5e1d02ffc261324a5b2fc" +SRCREV_qtwayland = "466ccc5f60147835d17d8e92b0ad390a069e63f7" +SRCREV_qtwebchannel = "8ba0b413c319a7bc869f32f94028ab890148522f" +SRCREV_qtwebengine = "278478b27d8c8143843fd28a342762b0dfba64d8" SRCREV_qtwebengine-chromium = "cee5373e6119a7ee20ba5e941185f4a22104d46d" -SRCREV_qtwebsockets = "00fd2df5625713e79c10c0876770c6d57676629e" -SRCREV_qtwebview = "7b362fc03f129c324914ee73c98b58aee7de4225" +SRCREV_qtwebsockets = "9d761e363e4fefa410729190531cfc64fb70ca7d" +SRCREV_qtwebview = "613fa76cf578c1c6a7c8375b6547d7df8c9c3697" From a85a7f2daf623d4bb31851ff01424de8ad925612 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 24 Oct 2022 04:42:07 +0000 Subject: [PATCH 08/32] Update submodule refs on 'lts-6.2' in yocto/meta-qt6 Change-Id: Ie78feafb18ea35ee746f88d1424bc0a15199cdbf Reviewed-by: Qt Submodule Update Bot --- recipes-qt/qt6/qt6-git.inc | 72 +++++++++++++++++++------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/recipes-qt/qt6/qt6-git.inc b/recipes-qt/qt6/qt6-git.inc index a33e85b..d4ae3cb 100644 --- a/recipes-qt/qt6/qt6-git.inc +++ b/recipes-qt/qt6/qt6-git.inc @@ -16,45 +16,45 @@ PV = "6.2.7" SRCREV = "${SRCREV_${QT_MODULE}}" -SRCREV_tqtc-qmlcompilerplus = "2d421269250bcd84d57f630eac9a2d1b19c1c127" -SRCREV_qt3d = "29ff65b933f72af557fa652514df6bc2684ec045" +SRCREV_tqtc-qmlcompilerplus = "a006a8cfe9a31bcd1af35582e91f012e7ace71a0" +SRCREV_qt3d = "2a64d755a84864dee385038dc4d809e3379e9075" SRCREV_qt3d-assimp = "5a38cd0a03015ceabbd5bc6efb0730dde1ef74e5" -SRCREV_qt5compat = "f06386b93833be8850d2c11eede0ed40e47660ee" -SRCREV_qtbase = "ce97b2255af2ea260cbcbbff7b475e01e0e58563" -SRCREV_qtapplicationmanager = "d329862262fd1038105dc4cc35fc9f375d9954e3" -SRCREV_qtcharts = "4d8e844d16b398ce5c846d2dd192ac77681d9a02" -SRCREV_qtcoap = "242a2f6710978ff0af8d88998aff57a3b4cebf47" -SRCREV_qtconnectivity = "2ea7a1bd40402347e9878d10aac37643087bb565" -SRCREV_qtdatavis3d = "095fb0d9611db600ae452dd2245deed92fa2c1d5" -SRCREV_qtdeclarative = "abbf5e18c06687cfde35a58284b1625c46b0c6e5" -SRCREV_qtdeviceutilities = "fcbeff585444aa936444838c5dcf184854a7eaa0" -SRCREV_qtimageformats = "406c94717fbca59445d840fa3820798730c02e29" -SRCREV_qtinterfaceframework = "0d2a1abc90e8047aac60e3b7e723c07982c385bd" -SRCREV_qtlottie = "81cefc8c60423c6d23964495030f23b242858cf0" -SRCREV_qtmqtt = "3ba72b3c8ca24438071f942c0f9b7e7ad013d007" -SRCREV_qtmultimedia = "bf03ce6a13fab6583042064e0fec0b03461ae7fd" -SRCREV_qtnetworkauth = "c8c9b1d20a5802940b321055754d974d060c80ec" -SRCREV_qtopcua = "1d5070165c07d3ca733fa76d38ea0af6bb06d03a" -SRCREV_qtpositioning = "8811673248d2243ea775edefbae302fae266bea4" -SRCREV_qtquick3d = "7be97a368b138809e5b57a63e204f350f15c8b8f" +SRCREV_qt5compat = "60edd0e55e40f2882667d1651de9759029c25664" +SRCREV_qtbase = "a629a6dc04515e7d01340e58d0161c84adb09e38" +SRCREV_qtapplicationmanager = "9f48753ee663f7a2a3310e07e5f6b0850009bfb2" +SRCREV_qtcharts = "51e71dc7ea15ad5b5df4626cbb9f9da43fbbea23" +SRCREV_qtcoap = "e110b9e4ba96ab7e84343d864c025681c35b10e7" +SRCREV_qtconnectivity = "24b057c3404fbca420a449e4135adc6623096309" +SRCREV_qtdatavis3d = "291df78a404dba9f6fd0d3ede12a4ed8db9a6b8f" +SRCREV_qtdeclarative = "47abea6b3515948704e123e2e112db48facdbc0b" +SRCREV_qtdeviceutilities = "772efe0b8bbfbb049df7067640cce6adea8ef39d" +SRCREV_qtimageformats = "a46adac28acb7d807b577774d4b491c44e243e7d" +SRCREV_qtinterfaceframework = "0d6bd485302027c7d08f0a1982cb9e4f42bff900" +SRCREV_qtlottie = "27221ea156993ad514916743e2b204b558d07a5b" +SRCREV_qtmqtt = "29dc8d2fae0542ca2293edcb6b60b8ad68d266a5" +SRCREV_qtmultimedia = "76f71d798f8792218d71d3d66a08b0ba839b7b9a" +SRCREV_qtnetworkauth = "159078591e1c4bb2429884fdb0add83a0a24a58d" +SRCREV_qtopcua = "3c43fa7deeeda176d39e21e2407381582d577b98" +SRCREV_qtpositioning = "62a3dc374ef118dc3b689781084cd90c476c3386" +SRCREV_qtquick3d = "bcb8778abf782c16e32a3a54c79404254ba1e14e" SRCREV_qtquick3d-assimp = "5a38cd0a03015ceabbd5bc6efb0730dde1ef74e5" SRCREV_qtquickdesigner-components = "27359a5293c8d877180f7d6afb123155bde0b61a" -SRCREV_qtquicktimeline = "a1d71b52ea81ae9ef0f46cbd139c8a957db16d8c" -SRCREV_qtremoteobjects = "df2db2d2b4adcc01f4fc03aa5363fc8a079f73da" -SRCREV_qtscxml = "2eb099256dde53c603ccad73ac49a36cfd77707c" -SRCREV_qtsensors = "ebb93e0940ba75184d86f3f3c889e5024a1583fe" -SRCREV_qtserialbus = "40fe1b88970601cf9ffe90623f830f738dbb1663" -SRCREV_qtserialport = "84f73ab98f8d5a6a10c03bf22e75d8ae0b66ed1d" -SRCREV_qtshadertools = "f8bb75ac2251f0bec3495b4c56d13fd3ceba153d" -SRCREV_qtsvg = "93c21fb6c2c7206d39297f822cedd3fa5f2b8b4b" -SRCREV_qttools = "3c10e6a657bfd75c97378f60bc9d0e65c5c749c1" +SRCREV_qtquicktimeline = "547ac63e112f6a13bea207fb062c6e99e0c3d7ee" +SRCREV_qtremoteobjects = "a29db1fc2864ac5ffec96d6d60933856663f1a4d" +SRCREV_qtscxml = "dcd89f72f160e20cc1408e1d6ab375c0ae68e925" +SRCREV_qtsensors = "21186ffc4c10267cbcaa810148da9cf153b39efe" +SRCREV_qtserialbus = "bd801acd548f568490cd5e19d6c990316c269ca5" +SRCREV_qtserialport = "a1d4d74934380d251c2605ca826f0860f5e3d01f" +SRCREV_qtshadertools = "d6a37ffaf11930ab08986a304f0ee46f3039634d" +SRCREV_qtsvg = "900ff532c99e68a4fd79e0955d7500342ec33b0d" +SRCREV_qttools = "e8c1680defb05f7ab3763b75869cec0bac07c27f" SRCREV_qttools-qlitehtml = "4931b7aa30f256c20573d283561aa432fecf8f38" SRCREV_qttools-qlitehtml-litehtml = "6236113734bb0a28467e5999e86fdd2834be8e01" -SRCREV_qttranslations = "13c0c7bbb4a336bd6813d4e096bd9c6e2130b2bc" -SRCREV_qtvirtualkeyboard = "e9fb59075533e1aec6b5e1d02ffc261324a5b2fc" -SRCREV_qtwayland = "466ccc5f60147835d17d8e92b0ad390a069e63f7" -SRCREV_qtwebchannel = "8ba0b413c319a7bc869f32f94028ab890148522f" -SRCREV_qtwebengine = "278478b27d8c8143843fd28a342762b0dfba64d8" +SRCREV_qttranslations = "095a456da0fd8bc34722880d7a44141eefa210a1" +SRCREV_qtvirtualkeyboard = "512ddb4164347a3f12ef5fa7df43f9db355c3ba2" +SRCREV_qtwayland = "8535704bd40baaf54f44c925a131e568e3e2fd5a" +SRCREV_qtwebchannel = "85ac0acec48b41586efb0532c4a031b57f73e982" +SRCREV_qtwebengine = "9d2440bb2c6ec3cf4e92c876ca0e37685a656a9a" SRCREV_qtwebengine-chromium = "cee5373e6119a7ee20ba5e941185f4a22104d46d" -SRCREV_qtwebsockets = "9d761e363e4fefa410729190531cfc64fb70ca7d" -SRCREV_qtwebview = "613fa76cf578c1c6a7c8375b6547d7df8c9c3697" +SRCREV_qtwebsockets = "f1662818f2899199a29d2829b971ca6b79169369" +SRCREV_qtwebview = "19f0c03a02fd9280049ff7e83308d0bcb018fb1f" From 77b03a5a5329acc18e99288519227950823ab327 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Wed, 2 Nov 2022 11:44:48 +0200 Subject: [PATCH 09/32] webengine: add patch for python 3.11 build issue yocto master branch updated python to 3.11, resulting in webengine build error(s): "File "/home/qt/work/build/build/tmp/work/cortexa15t2hf-neon-poky-linux-gnueabi/qtwebengine/6.4.1-r0/git/src/3rdparty/chromium/tools/grit/grit/util.py", line 214, in ReadFile with io.open(filename, mode, encoding=encoding) as f: ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ ValueError: invalid mode: 'rU'" Add patch from chromium upstream. Change-Id: I6308d2acd17a74b20ad6651d59f34e7246dc96ef Reviewed-by: Qt CI Bot Reviewed-by: Ari Parkkila (cherry picked from commit 676e6da41b8ed42ce32a6b85fac792413bd2a35f) --- recipes-qt/qt6/qtwebengine.inc | 1 + ...build-in-Python-3.11-invalid-mode-rU.patch | 50 +++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 recipes-qt/qt6/qtwebengine/chromium/0003-Fix-build-in-Python-3.11-invalid-mode-rU.patch diff --git a/recipes-qt/qt6/qtwebengine.inc b/recipes-qt/qt6/qtwebengine.inc index 22ca2f7..619ed6b 100644 --- a/recipes-qt/qt6/qtwebengine.inc +++ b/recipes-qt/qt6/qtwebengine.inc @@ -36,6 +36,7 @@ SRC_URI += " \ SRC_URI += " \ file://chromium/0001-v8-qemu-wrapper.patch;patchdir=src/3rdparty \ file://chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \ + file://chromium/0003-Fix-build-in-Python-3.11-invalid-mode-rU.patch;patchdir=src/3rdparty \ " SRCREV_FORMAT = "qtwebengine_qtwebengine-chromium" diff --git a/recipes-qt/qt6/qtwebengine/chromium/0003-Fix-build-in-Python-3.11-invalid-mode-rU.patch b/recipes-qt/qt6/qtwebengine/chromium/0003-Fix-build-in-Python-3.11-invalid-mode-rU.patch new file mode 100644 index 0000000..9ab3787 --- /dev/null +++ b/recipes-qt/qt6/qtwebengine/chromium/0003-Fix-build-in-Python-3.11-invalid-mode-rU.patch @@ -0,0 +1,50 @@ +From a0cabac19789a4e88c86407970ea3b3d2929006b Mon Sep 17 00:00:00 2001 +From: Joanmarie Diggs +Date: Tue, 30 Aug 2022 06:00:13 +0000 +Subject: [PATCH] Fix build in Python 3.11 (invalid mode: 'rU') + +In Python 3.11, 'U' ("universal newline") is no longer accepted in +the file mode, having been deprecated in Python 3.3. The "universal +newline" is used by default when a file is open in text mode. + +This commit removes the 'U' from the two (non-third-party) places +it is used. + +Bug: 1357549 +Change-Id: I3305707858d8ba7a9f518656a9b97dc1702bbe94 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3859535 +Reviewed-by: Mike Pinkerton +Commit-Queue: Joanmarie Diggs +Reviewed-by: Nico Weber +Cr-Commit-Position: refs/heads/main@{#1040794} +--- + chromium/PRESUBMIT_test_mocks.py | 2 +- + chromium/tools/grit/grit/util.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/chromium/PRESUBMIT_test_mocks.py b/chromium/PRESUBMIT_test_mocks.py +index b7d1b482c5f..7304697b117 100644 +--- a/chromium/PRESUBMIT_test_mocks.py ++++ b/chromium/PRESUBMIT_test_mocks.py +@@ -128,7 +128,7 @@ class MockInputApi(object): + def PresubmitLocalPath(self): + return self.presubmit_local_path + +- def ReadFile(self, filename, mode='rU'): ++ def ReadFile(self, filename, mode='r'): + if hasattr(filename, 'AbsoluteLocalPath'): + filename = filename.AbsoluteLocalPath() + for file_ in self.files: +diff --git a/chromium/tools/grit/grit/util.py b/chromium/tools/grit/grit/util.py +index 98433d154c0..98e770b8533 100644 +--- a/chromium/tools/grit/grit/util.py ++++ b/chromium/tools/grit/grit/util.py +@@ -209,7 +209,7 @@ def ReadFile(filename, encoding): + mode = 'rb' + encoding = None + else: +- mode = 'rU' ++ mode = 'r' + + with io.open(filename, mode, encoding=encoding) as f: + return f.read() From cf01e7bf3c1aaab59b0bd7c36087d2a7ae6b5a10 Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Wed, 25 May 2022 12:24:47 +0200 Subject: [PATCH 10/32] Add zlib dependency for qtbase Zlib is mandatory dependency, meaning if there is no system one qt will do bundled one. This is important to know which one is used as webengine will try to build also bundled one. Task-number: QTBUG-103149 Change-Id: Ie7cc83dea558a5605295133fb0bf6fe0a3217492 Reviewed-by: Samuli Piippo (cherry picked from commit a565bccb0722fa3f76de4aa33c0f1d4cdc819a0b) --- recipes-qt/qt6/qtbase_git.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes-qt/qt6/qtbase_git.bb b/recipes-qt/qt6/qtbase_git.bb index fedc682..47e1f07 100644 --- a/recipes-qt/qt6/qtbase_git.bb +++ b/recipes-qt/qt6/qtbase_git.bb @@ -53,7 +53,7 @@ PACKAGECONFIG_FONTS ?= "" PACKAGECONFIG_SYSTEM ?= "" PACKAGECONFIG_DISTRO ?= "" PACKAGECONFIG_DEFAULT ?= "accessibility dbus udev gui widgets icu openssl \ - jpeg png dbus libinput fontconfig harfbuzz \ + jpeg png dbus libinput fontconfig harfbuzz zlib \ ${@bb.utils.contains('SELECTED_OPTIMIZATION', '-Os', 'optimize-size ltcg', '', d)} \ ${@bb.utils.contains('BBFILE_COLLECTIONS', 'openembedded-layer', 'zstd', '', d)} \ " @@ -77,6 +77,7 @@ PACKAGECONFIG[developer-build] = "-DFEATURE_developer_build=ON,-DFEATURE_develop PACKAGECONFIG[cups] = "-DFEATURE_cups=ON,-DFEATURE_cups=OFF,cups" PACKAGECONFIG[dbus] = "-DFEATURE_dbus=ON,-DFEATURE_dbus=OFF,dbus" PACKAGECONFIG[udev] = "-DFEATURE_libudev=ON,-DFEATURE_libudev=OFF,udev" +PACKAGECONFIG[zlib] = "-DFEATURE_system_zlib=ON,-DFEATURE_system_zlib=OFF,zlib" PACKAGECONFIG[zstd] = "-DFEATURE_zstd=ON,-DFEATURE_zstd=OFF,zstd" # corelib From 8468dd9b99f4de5cb13732ec9c28cfd292c44e36 Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Wed, 25 May 2022 12:28:37 +0200 Subject: [PATCH 11/32] Fix minizip usage in qtwebengine WebEngine needs minizip which is part of zlib.Till now it always built bundled zip as minizip recipe does not exist in poky and moreover this was never a configurable feature as it was not in PACKAGECONFIG. A change in https://codereview.qt-project.org/c/qt/qtwebengine/+/384262 enables compilation of bundled minizip against system zlib (by using shim headers) however it is not advisable as those two version of zip might be different and minizip is project wise a part of zlib. Therefore introduce cheap rip off of zlib recipe, however building minizip from same source tree. Task-number: QTBUG-103149 Change-Id: I1e36d2fba339fb5383018f05a6347c27dde0c8c1 Reviewed-by: Samuli Piippo (cherry picked from commit 9c2b02aab650137fd8c0febaecbc6d593ffb3d02) --- recipes-core/minizip/minizip_1.2.11.bb | 21 +++++++++++++++++++++ recipes-qt/qt6/qtwebengine_git.bb | 3 +-- 2 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 recipes-core/minizip/minizip_1.2.11.bb diff --git a/recipes-core/minizip/minizip_1.2.11.bb b/recipes-core/minizip/minizip_1.2.11.bb new file mode 100644 index 0000000..5fd004b --- /dev/null +++ b/recipes-core/minizip/minizip_1.2.11.bb @@ -0,0 +1,21 @@ +SUMMARY = "Minizip Compression Library" +DESCRIPTION = "Minizip is a part of Zlib, which is a general-purpose, patent-free, lossless data compression \ +library which is used by many different programs." +HOMEPAGE = "http://www.winimage.com/zLibDll/minizip.html" +SECTION = "libs" +LICENSE = "Zlib" +LIC_FILES_CHKSUM = "file://zip.h;beginline=14;endline=30;md5=8eaa8535a3a1a2296b303f40f75385e7" + +SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/zlib/${PV}/zlib-${PV}.tar.xz" +UPSTREAM_CHECK_URI = "http://zlib.net/" + +S = "${WORKDIR}/zlib-${PV}/contrib/minizip" + +SRC_URI[md5sum] = "85adef240c5f370b308da8c938951a68" +SRC_URI[sha256sum] = "4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066" + +DEPENDS = "zlib" + +inherit autotools + +BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-qt/qt6/qtwebengine_git.bb b/recipes-qt/qt6/qtwebengine_git.bb index 23934f9..f38bd58 100644 --- a/recipes-qt/qt6/qtwebengine_git.bb +++ b/recipes-qt/qt6/qtwebengine_git.bb @@ -61,7 +61,6 @@ PACKAGECONFIG[libpng] = "-DFEATURE_webengine_system_libpng=ON,-DFEATURE_webengin PACKAGECONFIG[libvpx] = "-DFEATURE_webengine_system_libvpx=ON,-DFEATURE_webengine_system_libvpx=OFF,libvpx" PACKAGECONFIG[libwebp] = "-DFEATURE_webengine_system_libwebp=ON,-DFEATURE_webengine_system_libwebp=OFF,libwebp" PACKAGECONFIG[libxml] = "-DFEATURE_webengine_system_libxml=ON,-DFEATURE_webengine_system_libxml=OFF,libxml2 libxslt" -PACKAGECONFIG[minizip] = "-DFEATURE_webengine_system_minizip=ON,-DFEATURE_webengine_system_minizip=OFF,minizip" PACKAGECONFIG[opus] = "-DFEATURE_webengine_system_opus=ON,-DFEATURE_webengine_system_opus=OFF,libopus" PACKAGECONFIG[libpci] = "-DFEATURE_webengine_system_libpci=ON,-DFEATURE_webengine_system_libpci=OFF,pciutils" PACKAGECONFIG[pepper-plugins] = "-DFEATURE_webengine_pepper_plugins=ON,-DFEATURE_webengine_pepper_plugins=OFF" @@ -74,7 +73,7 @@ PACKAGECONFIG[spellchecker] = "-DFEATURE_webengine_spellchecker=ON,-DFEATURE_web PACKAGECONFIG[webchannel] = "-DFEATURE_webengine_webchannel=ON,-DFEATURE_webengine_webchannel=OFF,qtwebchannel" PACKAGECONFIG[webrtc] = "-DFEATURE_webengine_webrtc=ON,-DFEATURE_webengine_webrtc=OFF,libvpx" PACKAGECONFIG[webrtc-pipewire] = "-DFEATURE_webengine_webrtc_pipewire=ON,-DFEATURE_webengine_webrtc_pipewire=OFF,pipewire glib-2.0" -PACKAGECONFIG[zlib] = "-DFEATURE_webengine_system_zlib=ON,-DFEATURE_webengine_system_zlib=OFF,zlib" +PACKAGECONFIG[zlib] = "-DFEATURE_webengine_system_zlib=ON -DFEATURE_webengine_system_minizip=ON,-DFEATURE_webengine_system_zlib=OFF -DFEATURE_webengine_system_minizip,zlib minizip" FILES:${PN} += "\ ${QT6_INSTALL_TRANSLATIONSDIR} \ From f77498d211074c9d1fff744b77a917b4c0dfdc77 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 24 Aug 2022 07:49:16 +0000 Subject: [PATCH 12/32] ptest: remove build paths from tests Testlib adds references to the build and source directories to tests, which causes warnings on buildpaths QA test. Remove those references. Task-number: QTBUG-105913 Change-Id: Ic63e72a0b11bef55876ef5ca40d0c1d753243004 Reviewed-by: Ari Parkkila (cherry picked from commit 3102804b6504c98064101fac9a357fcbb1237fcd) --- ...rack-the-build-or-source-directories.patch | 28 +++++++++++++++++++ recipes-qt/qt6/qtbase_git.bb | 1 + 2 files changed, 29 insertions(+) create mode 100644 recipes-qt/qt6/qtbase/0005-testlib-don-t-track-the-build-or-source-directories.patch diff --git a/recipes-qt/qt6/qtbase/0005-testlib-don-t-track-the-build-or-source-directories.patch b/recipes-qt/qt6/qtbase/0005-testlib-don-t-track-the-build-or-source-directories.patch new file mode 100644 index 0000000..ec8bd4a --- /dev/null +++ b/recipes-qt/qt6/qtbase/0005-testlib-don-t-track-the-build-or-source-directories.patch @@ -0,0 +1,28 @@ +From 07f7e1ae76b24ba64cd87726c438638a8fa3eba0 Mon Sep 17 00:00:00 2001 +From: Samuli Piippo +Date: Mon, 22 Aug 2022 15:01:28 +0300 +Subject: [PATCH] testlib: don't track the build or source directories + +Build tests without location of the build and sources directories. + +Upstream-Status: Inappropriate [embedded specific] +Change-Id: I8d5add473623a3d9f481097649819c9fb906e4b2 +--- + src/testlib/CMakeLists.txt | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/testlib/CMakeLists.txt b/src/testlib/CMakeLists.txt +index 03deb2edc9..972b366532 100644 +--- a/src/testlib/CMakeLists.txt ++++ b/src/testlib/CMakeLists.txt +@@ -125,8 +125,8 @@ set(qt_tc_build_dir_def + "$>" + ) + set_property(TARGET Test APPEND PROPERTY INTERFACE_COMPILE_DEFINITIONS +- QT_TESTCASE_BUILDDIR="${qt_tc_build_dir_def}" +- QT_TESTCASE_SOURCEDIR="$" ++ QT_TESTCASE_BUILDDIR="" ++ QT_TESTCASE_SOURCEDIR="" + ) + + # special case begin diff --git a/recipes-qt/qt6/qtbase_git.bb b/recipes-qt/qt6/qtbase_git.bb index 47e1f07..4aec73e 100644 --- a/recipes-qt/qt6/qtbase_git.bb +++ b/recipes-qt/qt6/qtbase_git.bb @@ -20,6 +20,7 @@ SRC_URI += "\ file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \ file://0003-tests-disable-failing-tests.patch \ file://0004-Fix-qt.toolchain.cmake-for-SDK-use.patch \ + file://0005-testlib-don-t-track-the-build-or-source-directories.patch \ " DEPENDS += "\ From 9fd87589f70e8dfaf505d96750dd952de996f245 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 23 Aug 2022 14:01:20 +0000 Subject: [PATCH 13/32] ptest: remove references to destination directory Tests are build against the destination directory where qt module was just installed. This causes extra files to be taken into source package and adds references to the TMPDIR, which produces QA warnings from buildpaths QA test. Use DEBUG_PREFIX_MAP to get rid of those paths. Task-number: QTBUG-105913 Change-Id: I01ed9261004410db307f2cd809a181377b734c9e Reviewed-by: Ari Parkkila (cherry picked from commit 497624e9676fcccf9f9004f6aed02a10ec3e6e44) --- recipes-qt/qt6/qt6-ptest.inc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/recipes-qt/qt6/qt6-ptest.inc b/recipes-qt/qt6/qt6-ptest.inc index 6118f69..d68e17d 100644 --- a/recipes-qt/qt6/qt6-ptest.inc +++ b/recipes-qt/qt6/qt6-ptest.inc @@ -6,6 +6,10 @@ inherit ptest QT_PTEST_ENABLED ?= "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', '1', '0', d)}" PTEST_ENABLED = "${QT_PTEST_ENABLED}" +DEBUG_PREFIX_MAP += "\ + -fmacro-prefix-map=${D}= \ +" + fakeroot do_install_ptest() { if [ -n "${OE_QMAKE_QMAKE}" ]; then # qmake project From 0144a4389c0bdd6bbcc303de3ba64b1b743f65bb Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 9 Jun 2022 07:51:07 +0000 Subject: [PATCH 14/32] ptest: fix build issue with qtbase tests ptest build had a subtle problem with qtbase where it was using Qt6BuildInternals package from native sysroot instead of the target install path. This could add compiler flags that were not supported for the target architecture: cc1plus: error: '-fcf-protection=full' is not supported for this target QT_ADDITIONAL_PACKAGES_PREFIX_PATH is not used in qtbase/CMakeLists.txt: find_package(Qt6 REQUIRED COMPONENTS BuildInternals CMAKE_FIND_ROOT_PATH_BOTH) so the current approach for using Qt from the install path was not working. Change the ptest build from using QT_ADDITIONAL_PACKAGES_PREFIX_PATHs to using separate cmake toolchain file that prepends the install path to CMAKE_FIND_ROOT_PATH, which makes CMake find the target Qt packages correctly. Change-Id: Idc99a26577886208b85bafe811f61538bb38d5bc Reviewed-by: Alexandru Croitor (cherry picked from commit b6a93fbdb6074d7578904a69c7ce6adeff38481f) --- recipes-qt/qt6/qt6-ptest.inc | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/recipes-qt/qt6/qt6-ptest.inc b/recipes-qt/qt6/qt6-ptest.inc index d68e17d..6eaa041 100644 --- a/recipes-qt/qt6/qt6-ptest.inc +++ b/recipes-qt/qt6/qt6-ptest.inc @@ -11,6 +11,11 @@ DEBUG_PREFIX_MAP += "\ " fakeroot do_install_ptest() { + cat >${WORKDIR}/toolchain-ptest.cmake < Date: Mon, 14 Nov 2022 09:04:14 +0200 Subject: [PATCH 15/32] coin: update test-no-webengine.inc Update bitbake syntax. Change-Id: Ifc0fa4ad1e3926cc55b38d8a008e914962fdd779 Reviewed-by: Samuli Piippo --- coin/test-no-webengine.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/test-no-webengine.inc b/coin/test-no-webengine.inc index 1827495..8c3f2ad 100644 --- a/coin/test-no-webengine.inc +++ b/coin/test-no-webengine.inc @@ -1 +1 @@ -DISTRO_FEATURES_remove = "webengine" +DISTRO_FEATURES:remove = "webengine" From 3738a382711c68a55d62d2c822d35a62c1917fa3 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 7 Jul 2022 15:45:36 +0000 Subject: [PATCH 16/32] qtbase: build native and nativesdk with zstd enabled rcc is using zstd to compress resources, so that needs be enabled also in native and nativesdk builds. Change-Id: Ic10758eb41a67712e55b44bfec4d4385d0512f7e Reviewed-by: Mikko Gronoff (cherry picked from commit 812bf25183c440dd28dcadaa7732d8f088b134f1) --- recipes-qt/qt6/qtbase_git.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/recipes-qt/qt6/qtbase_git.bb b/recipes-qt/qt6/qtbase_git.bb index 4aec73e..87dd91f 100644 --- a/recipes-qt/qt6/qtbase_git.bb +++ b/recipes-qt/qt6/qtbase_git.bb @@ -30,7 +30,10 @@ DEPENDS += "\ DEPENDS:remove:class-native = "qtbase-native" RDEPENDS_${PN}:remove:class-native = "libssl-native" -PACKAGECONFIG:class-native ?= "gui widgets png dbus no-opengl openssl" +PACKAGECONFIG:class-native ?= "\ + gui widgets png dbus no-opengl openssl \ + ${@bb.utils.contains('BBFILE_COLLECTIONS', 'openembedded-layer', 'zstd', '', d)} \ +" PACKAGECONFIG:class-nativesdk ?= "${PACKAGECONFIG:class-native}" PACKAGECONFIG ?= "\ ${PACKAGECONFIG_DEFAULT} \ From 0f2b57455dc6a96e064120260298fb448d84b1eb Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 8 Jul 2022 08:11:28 +0000 Subject: [PATCH 17/32] Coin: enable examples for qtapplicationmanager Change-Id: If4065a9b309fafd8e05d018495dedd22be956aa7 Reviewed-by: Mikko Gronoff (cherry picked from commit 85d9d71e27f24ff9accb9247e28dd91f85a5e5d7) Reviewed-by: Samuli Piippo --- coin/test-configs.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/test-configs.inc b/coin/test-configs.inc index 71136b8..22ee90a 100644 --- a/coin/test-configs.inc +++ b/coin/test-configs.inc @@ -54,7 +54,7 @@ PACKAGECONFIG:append:pn-qtimageformats = " jasper" PACKAGECONFIG:append:pn-qmlcompilerplus = " examples" PACKAGECONFIG:append:pn-qt3d = " examples" PACKAGECONFIG:append:pn-qt5compat = " examples" -#PACKAGECONFIG:append:pn-qtapplicationmanager = " examples" +PACKAGECONFIG:append:pn-qtapplicationmanager = " examples" PACKAGECONFIG:append:pn-qtbase = " examples" PACKAGECONFIG:append:pn-qtcharts = " examples" PACKAGECONFIG:append:pn-qtcoap = " examples" From 82e85ace8c7d8d692e006ae646246f09620a0dcc Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 13 Nov 2022 13:09:57 +0000 Subject: [PATCH 18/32] Update submodule refs on 'lts-6.2' in yocto/meta-qt6 Change-Id: I161efa7e88ed2ad5310dc010904d515044bf5982 Reviewed-by: Qt Submodule Update Bot --- recipes-qt/qt6/qt6-git.inc | 74 +++++++++++++++++++------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/recipes-qt/qt6/qt6-git.inc b/recipes-qt/qt6/qt6-git.inc index d4ae3cb..56b7e3c 100644 --- a/recipes-qt/qt6/qt6-git.inc +++ b/recipes-qt/qt6/qt6-git.inc @@ -16,45 +16,45 @@ PV = "6.2.7" SRCREV = "${SRCREV_${QT_MODULE}}" -SRCREV_tqtc-qmlcompilerplus = "a006a8cfe9a31bcd1af35582e91f012e7ace71a0" -SRCREV_qt3d = "2a64d755a84864dee385038dc4d809e3379e9075" +SRCREV_tqtc-qmlcompilerplus = "a3db2b1efadf5ab3e68551e20e00e3faa35aa547" +SRCREV_qt3d = "dd0648719923d0b747bce3e0491c0ff1c8524e7e" SRCREV_qt3d-assimp = "5a38cd0a03015ceabbd5bc6efb0730dde1ef74e5" -SRCREV_qt5compat = "60edd0e55e40f2882667d1651de9759029c25664" -SRCREV_qtbase = "a629a6dc04515e7d01340e58d0161c84adb09e38" -SRCREV_qtapplicationmanager = "9f48753ee663f7a2a3310e07e5f6b0850009bfb2" -SRCREV_qtcharts = "51e71dc7ea15ad5b5df4626cbb9f9da43fbbea23" -SRCREV_qtcoap = "e110b9e4ba96ab7e84343d864c025681c35b10e7" -SRCREV_qtconnectivity = "24b057c3404fbca420a449e4135adc6623096309" -SRCREV_qtdatavis3d = "291df78a404dba9f6fd0d3ede12a4ed8db9a6b8f" -SRCREV_qtdeclarative = "47abea6b3515948704e123e2e112db48facdbc0b" -SRCREV_qtdeviceutilities = "772efe0b8bbfbb049df7067640cce6adea8ef39d" -SRCREV_qtimageformats = "a46adac28acb7d807b577774d4b491c44e243e7d" -SRCREV_qtinterfaceframework = "0d6bd485302027c7d08f0a1982cb9e4f42bff900" -SRCREV_qtlottie = "27221ea156993ad514916743e2b204b558d07a5b" -SRCREV_qtmqtt = "29dc8d2fae0542ca2293edcb6b60b8ad68d266a5" -SRCREV_qtmultimedia = "76f71d798f8792218d71d3d66a08b0ba839b7b9a" -SRCREV_qtnetworkauth = "159078591e1c4bb2429884fdb0add83a0a24a58d" -SRCREV_qtopcua = "3c43fa7deeeda176d39e21e2407381582d577b98" -SRCREV_qtpositioning = "62a3dc374ef118dc3b689781084cd90c476c3386" -SRCREV_qtquick3d = "bcb8778abf782c16e32a3a54c79404254ba1e14e" +SRCREV_qt5compat = "d2ed3ef3adbc2d426f6a1bc1b1b78f4c1ece8282" +SRCREV_qtbase = "fb01300a295a4883e5b99a193eeb80cb39225c80" +SRCREV_qtapplicationmanager = "8a11797566c5067bac598b5b4ad77fee117b9eb8" +SRCREV_qtcharts = "f981c46a90defde7158838f363afddc24d6f0442" +SRCREV_qtcoap = "31260717682e5fd9cc23327d7643756aa7916b8b" +SRCREV_qtconnectivity = "4497d43c75b329750cc949dce7df1c7c832fd77a" +SRCREV_qtdatavis3d = "391e1fb8fdbfd079c452a88f1e3857c5c310bc08" +SRCREV_qtdeclarative = "8e84f43ce8e0483319537646533712e08b28a273" +SRCREV_qtdeviceutilities = "81a5f79b71f0f89e1ccf47ba451a4bd2b2c1090e" +SRCREV_qtimageformats = "4423a44330f8f671719c1985409b0eb037cb6671" +SRCREV_qtinterfaceframework = "f36b0728d185ac0111767e402317853e75948ed1" +SRCREV_qtlottie = "00a40f081547c1bd1f97314ce24d6bd8f297344e" +SRCREV_qtmqtt = "4262705362f7cff25f9200a8321c7e365427c84a" +SRCREV_qtmultimedia = "eb7a3eca4da2a65444d83a32da2f0b1aa5d9771c" +SRCREV_qtnetworkauth = "0096709f9636da0a4afeb7a999667bc4647d1579" +SRCREV_qtopcua = "64682ae25c33b6fb3970ad9bc3e23c7a6fffde9a" +SRCREV_qtpositioning = "b6795013e3b9cb2cd1c4a47f87cf4c653396a768" +SRCREV_qtquick3d = "a76edeeb86f9a523f61b76f97f374b17f3efec9d" SRCREV_qtquick3d-assimp = "5a38cd0a03015ceabbd5bc6efb0730dde1ef74e5" SRCREV_qtquickdesigner-components = "27359a5293c8d877180f7d6afb123155bde0b61a" -SRCREV_qtquicktimeline = "547ac63e112f6a13bea207fb062c6e99e0c3d7ee" -SRCREV_qtremoteobjects = "a29db1fc2864ac5ffec96d6d60933856663f1a4d" -SRCREV_qtscxml = "dcd89f72f160e20cc1408e1d6ab375c0ae68e925" -SRCREV_qtsensors = "21186ffc4c10267cbcaa810148da9cf153b39efe" -SRCREV_qtserialbus = "bd801acd548f568490cd5e19d6c990316c269ca5" -SRCREV_qtserialport = "a1d4d74934380d251c2605ca826f0860f5e3d01f" -SRCREV_qtshadertools = "d6a37ffaf11930ab08986a304f0ee46f3039634d" -SRCREV_qtsvg = "900ff532c99e68a4fd79e0955d7500342ec33b0d" -SRCREV_qttools = "e8c1680defb05f7ab3763b75869cec0bac07c27f" +SRCREV_qtquicktimeline = "d39de445c44954094a76284313e0005936258e2e" +SRCREV_qtremoteobjects = "6e0482b18ddc73bc5c986eeb2123b5a8619cc595" +SRCREV_qtscxml = "5dbf545004dda2cec91456c8c906c8ff227feef8" +SRCREV_qtsensors = "79da888523552c727c1d837f8f4344536403baa0" +SRCREV_qtserialbus = "1c32402262f555f47fe2b133d01cd1707846a54f" +SRCREV_qtserialport = "2b9e5b021a0aaf97e4dc6f4d84f81768c426db17" +SRCREV_qtshadertools = "f24719455db8173e93a0c61784774d55d81cca53" +SRCREV_qtsvg = "e81ab887ba7ae3932d398cbb6c7a2d1392373097" +SRCREV_qttools = "e35009646c1fc9f076d086e4b3e409730340db6e" SRCREV_qttools-qlitehtml = "4931b7aa30f256c20573d283561aa432fecf8f38" SRCREV_qttools-qlitehtml-litehtml = "6236113734bb0a28467e5999e86fdd2834be8e01" -SRCREV_qttranslations = "095a456da0fd8bc34722880d7a44141eefa210a1" -SRCREV_qtvirtualkeyboard = "512ddb4164347a3f12ef5fa7df43f9db355c3ba2" -SRCREV_qtwayland = "8535704bd40baaf54f44c925a131e568e3e2fd5a" -SRCREV_qtwebchannel = "85ac0acec48b41586efb0532c4a031b57f73e982" -SRCREV_qtwebengine = "9d2440bb2c6ec3cf4e92c876ca0e37685a656a9a" -SRCREV_qtwebengine-chromium = "cee5373e6119a7ee20ba5e941185f4a22104d46d" -SRCREV_qtwebsockets = "f1662818f2899199a29d2829b971ca6b79169369" -SRCREV_qtwebview = "19f0c03a02fd9280049ff7e83308d0bcb018fb1f" +SRCREV_qttranslations = "b14587a50d233e5e8d39cef29ae4af1ccaf5699e" +SRCREV_qtvirtualkeyboard = "4f56515cb110c3a082377e18b34927e7a60f7eba" +SRCREV_qtwayland = "cdfcd4d95b374c57ba30caacdfca699b77e57874" +SRCREV_qtwebchannel = "0e27b521113bbb47d15f298eb8f2eb827cec9bb0" +SRCREV_qtwebengine = "c7333d7d77a6d8675d27e015dd4ca68b0ea7bc1f" +SRCREV_qtwebengine-chromium = "9457651ead9b7034edb37532c2f33a558b1700b6" +SRCREV_qtwebsockets = "026dbf10ebfdd30f6dfc211f19bb34b0777b3b4f" +SRCREV_qtwebview = "754e995aed864138b23c22f935f81868daf475be" From a3df17ac976f3f6738b41a4ac148a67ea28214bd Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Mon, 27 Jun 2022 07:57:47 +0000 Subject: [PATCH 19/32] qtwebengine: update licenses MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update licenses after SPDX changes were applied to the module. Change-Id: I5fba720fd55b7a5912e81617e3b25f40eed47da1 Reviewed-by: Pasi Petäjäjärvi (cherry picked from commit ca64e61b9771497d5914d9390abe14f870276b80) Reviewed-by: Samuli Piippo --- recipes-qt/qt6/qtwebengine.inc | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/recipes-qt/qt6/qtwebengine.inc b/recipes-qt/qt6/qtwebengine.inc index 619ed6b..015ba4f 100644 --- a/recipes-qt/qt6/qtwebengine.inc +++ b/recipes-qt/qt6/qtwebengine.inc @@ -1,11 +1,12 @@ -LICENSE = "GFDL-1.3 & BSD-3-Clause & ( GPL-3.0-only & The-Qt-Company-GPL-Exception-1.0 | The-Qt-Company-Commercial ) & ( LGPL-3.0-only | The-Qt-Company-Commercial )" +LICENSE = "(The-Qt-Company-Commercial | (GPL-3.0-only & Qt-GPL-exception-1.0) & (LGPL-3.0-only | GPL-2.0-only | GPL-3.0-only) & GFDL-1.3-no-invariants-only) & BSD-3-Clause" LIC_FILES_CHKSUM = " \ - file://src/3rdparty/chromium/LICENSE;md5=0fca02217a5d49a14dfe2d11837bb34d \ - file://LICENSE.FDL;md5=f70ee9a6c44ae8917586fea34dff0ab5 \ - file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ - file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \ - file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \ - file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://LICENSES/GFDL-1.3-no-invariants-only.txt;md5=a22d0be1ce2284b67950a4d1673dd1b0 \ + file://LICENSES/GPL-2.0-only.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://LICENSES/GPL-3.0-only.txt;md5=d32239bcb673463ab874e80d47fae504 \ + file://LICENSES/LGPL-3.0-only.txt;md5=e6a600fd5e1d9cbde2d983680233ad02 \ + file://LICENSES/LicenseRef-Qt-Commercial.txt;md5=40a1036f91cefc0e3fabad241fb5f187 \ + file://LICENSES/Qt-GPL-exception-1.0.txt;md5=9a13522cd91a88fba784baf16ea66af8 \ + file://LICENSE.Chromium;md5=d64fde5d347c3a68afe70f5e2e31fe83 \ " inherit qt6-cmake From 42326e359f17b150c67430dbb89230c9f12c6d9c Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 10 Aug 2022 05:22:10 +0000 Subject: [PATCH 20/32] qtwebengine: move to 102-based chromium Latest chromium no longer supports x86 builds. Enabled spellchecker as build fails without it. Change-Id: I6f40d48c20a47edbbc958e2f9c25907d05feb5b1 Reviewed-by: Mikko Gronoff (cherry picked from commit c1441fcabcee46f1d3569d5d9b00e68546564dab) Reviewed-by: Samuli Piippo --- coin/module_config.yaml | 2 +- recipes-qt/qt6/chromium-gn.inc | 1 - recipes-qt/qt6/qtwebengine.inc | 2 +- recipes-qt/qt6/qtwebengine_git.bb | 1 + 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/coin/module_config.yaml b/coin/module_config.yaml index d0a7f71..7f83df9 100644 --- a/coin/module_config.yaml +++ b/coin/module_config.yaml @@ -49,7 +49,7 @@ target2: &target2 variableValue: honister.xml - type: EnvironmentVariable variableName: TEST_CONFIGS - variableValue: ci configs pre-inclusive wayland mingw + variableValue: ci configs pre-inclusive wayland mingw no-webengine enable_if: condition: property property: target.arch diff --git a/recipes-qt/qt6/chromium-gn.inc b/recipes-qt/qt6/chromium-gn.inc index d608fb7..1b0e023 100644 --- a/recipes-qt/qt6/chromium-gn.inc +++ b/recipes-qt/qt6/chromium-gn.inc @@ -8,7 +8,6 @@ COMPATIBLE_MACHINE:aarch64 = "(.*)" COMPATIBLE_MACHINE:armv6 = "(.*)" COMPATIBLE_MACHINE:armv7a = "(.*)" COMPATIBLE_MACHINE:armv7ve = "(.*)" -COMPATIBLE_MACHINE:x86 = "(.*)" COMPATIBLE_MACHINE:x86-64 = "(.*)" # By default, passing is_official_build=true to GN causes its symbol_level diff --git a/recipes-qt/qt6/qtwebengine.inc b/recipes-qt/qt6/qtwebengine.inc index 015ba4f..9ac8b56 100644 --- a/recipes-qt/qt6/qtwebengine.inc +++ b/recipes-qt/qt6/qtwebengine.inc @@ -24,7 +24,7 @@ def gettext_oeconf(d): return "" QT_MODULE = "qtwebengine" -QT_MODULE_BRANCH_CHROMIUM = "94-based" +QT_MODULE_BRANCH_CHROMIUM = "102-based" FILESEXTRAPATHS:prepend := "${THISDIR}/qtwebengine:" diff --git a/recipes-qt/qt6/qtwebengine_git.bb b/recipes-qt/qt6/qtwebengine_git.bb index f38bd58..bf4b4a9 100644 --- a/recipes-qt/qt6/qtwebengine_git.bb +++ b/recipes-qt/qt6/qtwebengine_git.bb @@ -39,6 +39,7 @@ PACKAGECONFIG ??= "\ ${@bb.utils.contains('BBFILE_COLLECTIONS', 'multimedia-layer', 'webrtc-pipewire', '', d)} \ printing-and-pdf \ pepper-plugins \ + spellchecker \ " PACKAGECONFIG_OPENEMBEDDED ?= "\ lcms2 \ From 54bf4ded71360713df446dfc59241f7e0d13d2e0 Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Mon, 14 Nov 2022 12:45:02 +0200 Subject: [PATCH 21/32] webengine: adapt to WE 6.3 -> 6.4 update Picked & squashed together from meta-qt6(6.4) the relevant parts from commits "65972077eb19bac169cab82dfd6aa29e5c56c691 qtwebengine: move to 98-based chromium" and "dc6a7797e0235c59adf48271b4c3101192be7e13 Add QtPDF" ...leaving the QtPDF addition part & obsolete chromium branch adjustments out. Change-Id: Ied9d5dc31af336dcc85207d2075d8b06f6650d53 Reviewed-by: Samuli Piippo --- recipes-qt/qt6/chromium-gn.inc | 4 +-- .../chromium/0001-v8-qemu-wrapper.patch | 36 +++++++++---------- recipes-qt/qt6/qtwebengine_git.bb | 2 +- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/recipes-qt/qt6/chromium-gn.inc b/recipes-qt/qt6/chromium-gn.inc index 1b0e023..5d697ab 100644 --- a/recipes-qt/qt6/chromium-gn.inc +++ b/recipes-qt/qt6/chromium-gn.inc @@ -56,7 +56,7 @@ python do_create_v8_qemu_wrapper () { d.expand('${STAGING_DIR_HOST}${base_libdir}')] qemu_cmd = qemu_wrapper_cmdline(d, d.getVar('STAGING_DIR_HOST', True), qemu_libdirs) - wrapper_path = d.expand('${B}/src/core/Release/${TARGET_ARCH}') + wrapper_path = d.expand('${B}') bb.utils.mkdirhier(wrapper_path) wrapper_path = os.path.join(wrapper_path, "v8-qemu-wrapper.sh") with open(wrapper_path, 'w') as wrapper_file: @@ -77,7 +77,7 @@ python do_create_v8_qemu_wrapper () { # to build. Instead of using QEMU, change the wrapper to try to run the # tools directly, using the target dynloader. python do_create_v8_qemu_wrapper:x86-64 () { - wrapper_path = d.expand('${B}/src/core/Release/${TARGET_ARCH}') + wrapper_path = d.expand('${B}') bb.utils.mkdirhier(wrapper_path) wrapper_path = os.path.join(wrapper_path, "v8-qemu-wrapper.sh") with open(wrapper_path, 'w') as wrapper_file: diff --git a/recipes-qt/qt6/qtwebengine/chromium/0001-v8-qemu-wrapper.patch b/recipes-qt/qt6/qtwebengine/chromium/0001-v8-qemu-wrapper.patch index 8bd1313..83a9e29 100644 --- a/recipes-qt/qt6/qtwebengine/chromium/0001-v8-qemu-wrapper.patch +++ b/recipes-qt/qt6/qtwebengine/chromium/0001-v8-qemu-wrapper.patch @@ -1,4 +1,4 @@ -From 87769922a455bec09951f95e8cd3402cf646ee33 Mon Sep 17 00:00:00 2001 +From 23d02fd87c766b6aef2a5aa81186b3db3f13b82a Mon Sep 17 00:00:00 2001 From: Raphael Kubo da Costa Date: Tue, 7 Nov 2017 15:24:32 +0100 Subject: [PATCH] v8: qemu wrapper @@ -16,50 +16,50 @@ Signed-off-by: Maksim Sisov 2 files changed, 5 insertions(+) diff --git a/chromium/tools/v8_context_snapshot/BUILD.gn b/chromium/tools/v8_context_snapshot/BUILD.gn -index 6e86a543558..eee89b37064 100644 +index d868696dbf2..298273818ef 100644 --- a/chromium/tools/v8_context_snapshot/BUILD.gn +++ b/chromium/tools/v8_context_snapshot/BUILD.gn -@@ -56,6 +56,7 @@ if (use_v8_context_snapshot) { - output_path = rebase_path(output_file, root_build_dir) +@@ -72,6 +72,7 @@ if (use_v8_context_snapshot) { + output_path = rebase_path(output_file, root_build_dir) - args = [ -+ "./v8-qemu-wrapper.sh", - "./" + rebase_path( - get_label_info( - ":v8_context_snapshot_generator($v8_snapshot_toolchain)", + args = [ ++ "../../../../v8-qemu-wrapper.sh", + "./" + rebase_path(get_label_info(":v8_context_snapshot_generator", + "root_out_dir") + + "/v8_context_snapshot_generator", diff --git a/chromium/v8/BUILD.gn b/chromium/v8/BUILD.gn -index db762c8c300..11e96d1ea3b 100644 +index 2f99c3d70b0..9b28cf2ed4c 100644 --- a/chromium/v8/BUILD.gn +++ b/chromium/v8/BUILD.gn -@@ -1521,6 +1521,7 @@ template("run_torque") { +@@ -1870,6 +1870,7 @@ template("run_torque") { } args = [ -+ "./v8-qemu-wrapper.sh", ++ "../../../../v8-qemu-wrapper.sh", "./" + rebase_path( get_label_info(":torque($toolchain)", "root_out_dir") + "/torque", root_build_dir), -@@ -1637,6 +1638,7 @@ action("generate_bytecode_builtins_list") { +@@ -2002,6 +2003,7 @@ action("generate_bytecode_builtins_list") { outputs = [ "$target_gen_dir/builtins-generated/bytecodes-builtins-list.h" ] deps = [ ":bytecode_builtins_list_generator($v8_generator_toolchain)" ] args = [ -+ "./v8-qemu-wrapper.sh", ++ "../../../../v8-qemu-wrapper.sh", "./" + rebase_path( get_label_info( ":bytecode_builtins_list_generator($v8_generator_toolchain)", -@@ -1682,6 +1684,7 @@ template("run_mksnapshot") { +@@ -2047,6 +2049,7 @@ template("run_mksnapshot") { data = [] args = [ -+ "./v8-qemu-wrapper.sh", ++ "../../../../v8-qemu-wrapper.sh", "./" + rebase_path(get_label_info(":mksnapshot($v8_snapshot_toolchain)", "root_out_dir") + "/mksnapshot", root_build_dir), -@@ -5133,6 +5136,7 @@ if (v8_enable_i18n_support) { +@@ -5849,6 +5852,7 @@ if (v8_enable_i18n_support) { outputs = [ output_file ] args = [ -+ "./v8-qemu-wrapper.sh", ++ "../../../../v8-qemu-wrapper.sh", "./" + rebase_path( get_label_info( ":gen-regexp-special-case($v8_generator_toolchain)", diff --git a/recipes-qt/qt6/qtwebengine_git.bb b/recipes-qt/qt6/qtwebengine_git.bb index bf4b4a9..c98cfa3 100644 --- a/recipes-qt/qt6/qtwebengine_git.bb +++ b/recipes-qt/qt6/qtwebengine_git.bb @@ -73,7 +73,7 @@ PACKAGECONFIG[snappy] = "-DFEATURE_webengine_system_snappy=ON,-DFEATURE_webengin PACKAGECONFIG[spellchecker] = "-DFEATURE_webengine_spellchecker=ON,-DFEATURE_webengine_spellchecker=OFF" PACKAGECONFIG[webchannel] = "-DFEATURE_webengine_webchannel=ON,-DFEATURE_webengine_webchannel=OFF,qtwebchannel" PACKAGECONFIG[webrtc] = "-DFEATURE_webengine_webrtc=ON,-DFEATURE_webengine_webrtc=OFF,libvpx" -PACKAGECONFIG[webrtc-pipewire] = "-DFEATURE_webengine_webrtc_pipewire=ON,-DFEATURE_webengine_webrtc_pipewire=OFF,pipewire glib-2.0" +PACKAGECONFIG[webrtc-pipewire] = "-DFEATURE_webengine_webrtc_pipewire=ON,-DFEATURE_webengine_webrtc_pipewire=OFF,pipewire glib-2.0 libepoxy" PACKAGECONFIG[zlib] = "-DFEATURE_webengine_system_zlib=ON -DFEATURE_webengine_system_minizip=ON,-DFEATURE_webengine_system_zlib=OFF -DFEATURE_webengine_system_minizip,zlib minizip" FILES:${PN} += "\ From 4ee0482dd22ac8c510677d878afe9228bd27681f Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 7 Apr 2022 05:53:27 +0000 Subject: [PATCH 22/32] qtwebengine: webrtc-pipewire depends on libgbm Add libgbm dependency to webrtc-pipewire PACKAGECONFIG and remove it from the defaults, since not all graphics stacks have it. Change-Id: Ibb8033514d8ed14674d6b475b26f84f14aefca18 Reviewed-by: Mikko Gronoff (cherry picked from commit 76e4f4c875ac449f77508dd0cbe25fb29ef8231c) Reviewed-by: Samuli Piippo --- recipes-qt/qt6/qtwebengine_git.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/recipes-qt/qt6/qtwebengine_git.bb b/recipes-qt/qt6/qtwebengine_git.bb index c98cfa3..1972a91 100644 --- a/recipes-qt/qt6/qtwebengine_git.bb +++ b/recipes-qt/qt6/qtwebengine_git.bb @@ -36,7 +36,6 @@ PACKAGECONFIG ??= "\ ${@bb.utils.contains('BBFILE_COLLECTIONS', 'openembedded-layer', '${PACKAGECONFIG_OPENEMBEDDED}', '', d)} \ geolocation \ webchannel \ - ${@bb.utils.contains('BBFILE_COLLECTIONS', 'multimedia-layer', 'webrtc-pipewire', '', d)} \ printing-and-pdf \ pepper-plugins \ spellchecker \ @@ -73,7 +72,7 @@ PACKAGECONFIG[snappy] = "-DFEATURE_webengine_system_snappy=ON,-DFEATURE_webengin PACKAGECONFIG[spellchecker] = "-DFEATURE_webengine_spellchecker=ON,-DFEATURE_webengine_spellchecker=OFF" PACKAGECONFIG[webchannel] = "-DFEATURE_webengine_webchannel=ON,-DFEATURE_webengine_webchannel=OFF,qtwebchannel" PACKAGECONFIG[webrtc] = "-DFEATURE_webengine_webrtc=ON,-DFEATURE_webengine_webrtc=OFF,libvpx" -PACKAGECONFIG[webrtc-pipewire] = "-DFEATURE_webengine_webrtc_pipewire=ON,-DFEATURE_webengine_webrtc_pipewire=OFF,pipewire glib-2.0 libepoxy" +PACKAGECONFIG[webrtc-pipewire] = "-DFEATURE_webengine_webrtc_pipewire=ON,-DFEATURE_webengine_webrtc_pipewire=OFF,pipewire glib-2.0 libepoxy virtual/libgbm" PACKAGECONFIG[zlib] = "-DFEATURE_webengine_system_zlib=ON -DFEATURE_webengine_system_minizip=ON,-DFEATURE_webengine_system_zlib=OFF -DFEATURE_webengine_system_minizip,zlib minizip" FILES:${PN} += "\ From 5b3b8cd59711e636bd0c9ac8e30d675743eda5fb Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 17 Nov 2022 03:30:39 +0000 Subject: [PATCH 23/32] Update submodule refs on 'lts-6.2' in yocto/meta-qt6 Change-Id: I190a7c33b1e6bdee2a800bb7ef279997c6f0fbf5 Reviewed-by: Qt Submodule Update Bot --- recipes-qt/qt6/qt6-git.inc | 74 +++++++++++++++++++------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/recipes-qt/qt6/qt6-git.inc b/recipes-qt/qt6/qt6-git.inc index 56b7e3c..d687490 100644 --- a/recipes-qt/qt6/qt6-git.inc +++ b/recipes-qt/qt6/qt6-git.inc @@ -16,45 +16,45 @@ PV = "6.2.7" SRCREV = "${SRCREV_${QT_MODULE}}" -SRCREV_tqtc-qmlcompilerplus = "a3db2b1efadf5ab3e68551e20e00e3faa35aa547" -SRCREV_qt3d = "dd0648719923d0b747bce3e0491c0ff1c8524e7e" +SRCREV_tqtc-qmlcompilerplus = "439141e4ea25c94ff41cdf67679b637c8867e615" +SRCREV_qt3d = "88cea79cfb4662e5a76bacdbecceeb15f89a68ef" SRCREV_qt3d-assimp = "5a38cd0a03015ceabbd5bc6efb0730dde1ef74e5" -SRCREV_qt5compat = "d2ed3ef3adbc2d426f6a1bc1b1b78f4c1ece8282" -SRCREV_qtbase = "fb01300a295a4883e5b99a193eeb80cb39225c80" -SRCREV_qtapplicationmanager = "8a11797566c5067bac598b5b4ad77fee117b9eb8" -SRCREV_qtcharts = "f981c46a90defde7158838f363afddc24d6f0442" -SRCREV_qtcoap = "31260717682e5fd9cc23327d7643756aa7916b8b" -SRCREV_qtconnectivity = "4497d43c75b329750cc949dce7df1c7c832fd77a" -SRCREV_qtdatavis3d = "391e1fb8fdbfd079c452a88f1e3857c5c310bc08" -SRCREV_qtdeclarative = "8e84f43ce8e0483319537646533712e08b28a273" -SRCREV_qtdeviceutilities = "81a5f79b71f0f89e1ccf47ba451a4bd2b2c1090e" -SRCREV_qtimageformats = "4423a44330f8f671719c1985409b0eb037cb6671" -SRCREV_qtinterfaceframework = "f36b0728d185ac0111767e402317853e75948ed1" -SRCREV_qtlottie = "00a40f081547c1bd1f97314ce24d6bd8f297344e" -SRCREV_qtmqtt = "4262705362f7cff25f9200a8321c7e365427c84a" -SRCREV_qtmultimedia = "eb7a3eca4da2a65444d83a32da2f0b1aa5d9771c" -SRCREV_qtnetworkauth = "0096709f9636da0a4afeb7a999667bc4647d1579" -SRCREV_qtopcua = "64682ae25c33b6fb3970ad9bc3e23c7a6fffde9a" -SRCREV_qtpositioning = "b6795013e3b9cb2cd1c4a47f87cf4c653396a768" -SRCREV_qtquick3d = "a76edeeb86f9a523f61b76f97f374b17f3efec9d" +SRCREV_qt5compat = "23a707bcaafc3c4b0abdc5bfddd7eda782edf50e" +SRCREV_qtbase = "be9dfb58d36bedd7a2b1ce93ad1276811f787dfc" +SRCREV_qtapplicationmanager = "ffc1bffccd19e0adf93a2cd5f3ade9eb952a7580" +SRCREV_qtcharts = "46b97c695d37cc4d1eaee3b4556740e7afacfc16" +SRCREV_qtcoap = "99c6847fe4b124798d576b1c2e129af145f2bfb5" +SRCREV_qtconnectivity = "770ff8a046b0d94aa30e7fb1fd6dcbef753db304" +SRCREV_qtdatavis3d = "a18f6262bec65518701cfc35418a1289f1f1d600" +SRCREV_qtdeclarative = "8cb2d8095f451392a9647458a2cda20d7e3d4a09" +SRCREV_qtdeviceutilities = "d783aa838225fff0d9660e5adea8118a823ea44f" +SRCREV_qtimageformats = "e6cc34e91549e10b709eaeb92f02b78d0142214a" +SRCREV_qtinterfaceframework = "72cbf12c1954841ba9a8f41bd8deeacbd5e9ad0f" +SRCREV_qtlottie = "b4cc4b8584fb352de9670bf1de228a10bb780d26" +SRCREV_qtmqtt = "34080813ca36c7f4ab1113122b3f2fcb72fa8a58" +SRCREV_qtmultimedia = "594679ddd866023d59b480fa54d58b98349f7ba6" +SRCREV_qtnetworkauth = "4cad653c100eda13bbe1fe6c734391439fc78f35" +SRCREV_qtopcua = "a404976f17f10dae7af290063115a2b7b28a971f" +SRCREV_qtpositioning = "721900f0ab39016e424507db42cff0af2fe19380" +SRCREV_qtquick3d = "fb74e7ac8f454dd75e64d2ba9093dcdf88b3565a" SRCREV_qtquick3d-assimp = "5a38cd0a03015ceabbd5bc6efb0730dde1ef74e5" -SRCREV_qtquickdesigner-components = "27359a5293c8d877180f7d6afb123155bde0b61a" -SRCREV_qtquicktimeline = "d39de445c44954094a76284313e0005936258e2e" -SRCREV_qtremoteobjects = "6e0482b18ddc73bc5c986eeb2123b5a8619cc595" -SRCREV_qtscxml = "5dbf545004dda2cec91456c8c906c8ff227feef8" -SRCREV_qtsensors = "79da888523552c727c1d837f8f4344536403baa0" -SRCREV_qtserialbus = "1c32402262f555f47fe2b133d01cd1707846a54f" -SRCREV_qtserialport = "2b9e5b021a0aaf97e4dc6f4d84f81768c426db17" -SRCREV_qtshadertools = "f24719455db8173e93a0c61784774d55d81cca53" -SRCREV_qtsvg = "e81ab887ba7ae3932d398cbb6c7a2d1392373097" -SRCREV_qttools = "e35009646c1fc9f076d086e4b3e409730340db6e" +SRCREV_qtquickdesigner-components = "728b7a681e4a6243f28af61dd84aa1ceddd80144" +SRCREV_qtquicktimeline = "01441d93813f20f754ea876d50de01c7409d004b" +SRCREV_qtremoteobjects = "7a546b25776a6654d6eac413607a6ff9ff00c85f" +SRCREV_qtscxml = "266ec89d11dd9168ec6f8a187bdef5976e52ecb9" +SRCREV_qtsensors = "33ea2711825338a55b731f315e38b64e79b45282" +SRCREV_qtserialbus = "c75e951e365aeae458aadf313900c2cb3b07422a" +SRCREV_qtserialport = "d1d009d34bcef30bc536d6b14b33f77cef951ad9" +SRCREV_qtshadertools = "bd1344e4109f677d8bc17a304116eb6d621fd282" +SRCREV_qtsvg = "31b3032c22960d04573baff83d04d3ffe0173161" +SRCREV_qttools = "b5c71ec152a62e85643c7bc37599a7436dbe9571" SRCREV_qttools-qlitehtml = "4931b7aa30f256c20573d283561aa432fecf8f38" SRCREV_qttools-qlitehtml-litehtml = "6236113734bb0a28467e5999e86fdd2834be8e01" -SRCREV_qttranslations = "b14587a50d233e5e8d39cef29ae4af1ccaf5699e" -SRCREV_qtvirtualkeyboard = "4f56515cb110c3a082377e18b34927e7a60f7eba" -SRCREV_qtwayland = "cdfcd4d95b374c57ba30caacdfca699b77e57874" -SRCREV_qtwebchannel = "0e27b521113bbb47d15f298eb8f2eb827cec9bb0" -SRCREV_qtwebengine = "c7333d7d77a6d8675d27e015dd4ca68b0ea7bc1f" +SRCREV_qttranslations = "07204039f8fbdc42d57b48abe808dccebdee4f0a" +SRCREV_qtvirtualkeyboard = "98ff9a18950f44474dcadee2885449d0fe4b9421" +SRCREV_qtwayland = "b014f22bbeb6cb43aa22c9f4e451dcc828d5a858" +SRCREV_qtwebchannel = "80c0c771b8c5562001819971564866845f8c18eb" +SRCREV_qtwebengine = "1b5598999d14b03512d9f5ffed18649837415c07" SRCREV_qtwebengine-chromium = "9457651ead9b7034edb37532c2f33a558b1700b6" -SRCREV_qtwebsockets = "026dbf10ebfdd30f6dfc211f19bb34b0777b3b4f" -SRCREV_qtwebview = "754e995aed864138b23c22f935f81868daf475be" +SRCREV_qtwebsockets = "1c1958ea228376556a7abad7cd741747b0e72baf" +SRCREV_qtwebview = "863cca319c4e3ae1e147ff2b5809ad6c3696c54d" From 6333a3482672fe0ce6c896bce41ba3c9b42ecfb4 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 21 Nov 2022 03:48:19 +0000 Subject: [PATCH 24/32] Update submodule refs on 'lts-6.2' in yocto/meta-qt6 Change-Id: I804cc28474201287277deeeaf4f4ceb960ef693c Reviewed-by: Qt Submodule Update Bot --- recipes-qt/qt6/qt6-git.inc | 72 +++++++++++++++++++------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/recipes-qt/qt6/qt6-git.inc b/recipes-qt/qt6/qt6-git.inc index d687490..62a3dd1 100644 --- a/recipes-qt/qt6/qt6-git.inc +++ b/recipes-qt/qt6/qt6-git.inc @@ -16,45 +16,45 @@ PV = "6.2.7" SRCREV = "${SRCREV_${QT_MODULE}}" -SRCREV_tqtc-qmlcompilerplus = "439141e4ea25c94ff41cdf67679b637c8867e615" -SRCREV_qt3d = "88cea79cfb4662e5a76bacdbecceeb15f89a68ef" +SRCREV_tqtc-qmlcompilerplus = "702f91c0aea4f18fd1aa5f905609fd21904e456e" +SRCREV_qt3d = "5e6d30fe005c6d021f740dad8277fb9a41bc1217" SRCREV_qt3d-assimp = "5a38cd0a03015ceabbd5bc6efb0730dde1ef74e5" -SRCREV_qt5compat = "23a707bcaafc3c4b0abdc5bfddd7eda782edf50e" -SRCREV_qtbase = "be9dfb58d36bedd7a2b1ce93ad1276811f787dfc" -SRCREV_qtapplicationmanager = "ffc1bffccd19e0adf93a2cd5f3ade9eb952a7580" -SRCREV_qtcharts = "46b97c695d37cc4d1eaee3b4556740e7afacfc16" -SRCREV_qtcoap = "99c6847fe4b124798d576b1c2e129af145f2bfb5" -SRCREV_qtconnectivity = "770ff8a046b0d94aa30e7fb1fd6dcbef753db304" -SRCREV_qtdatavis3d = "a18f6262bec65518701cfc35418a1289f1f1d600" -SRCREV_qtdeclarative = "8cb2d8095f451392a9647458a2cda20d7e3d4a09" -SRCREV_qtdeviceutilities = "d783aa838225fff0d9660e5adea8118a823ea44f" -SRCREV_qtimageformats = "e6cc34e91549e10b709eaeb92f02b78d0142214a" -SRCREV_qtinterfaceframework = "72cbf12c1954841ba9a8f41bd8deeacbd5e9ad0f" -SRCREV_qtlottie = "b4cc4b8584fb352de9670bf1de228a10bb780d26" -SRCREV_qtmqtt = "34080813ca36c7f4ab1113122b3f2fcb72fa8a58" -SRCREV_qtmultimedia = "594679ddd866023d59b480fa54d58b98349f7ba6" -SRCREV_qtnetworkauth = "4cad653c100eda13bbe1fe6c734391439fc78f35" -SRCREV_qtopcua = "a404976f17f10dae7af290063115a2b7b28a971f" -SRCREV_qtpositioning = "721900f0ab39016e424507db42cff0af2fe19380" -SRCREV_qtquick3d = "fb74e7ac8f454dd75e64d2ba9093dcdf88b3565a" +SRCREV_qt5compat = "1a1163c064729b5e170289e9a6b7074190f5d55e" +SRCREV_qtbase = "2d30ccdcf213462f3ab41ed67073f447a6992457" +SRCREV_qtapplicationmanager = "b91ac6705b0bfbff83e5988c29bbcf64427c5665" +SRCREV_qtcharts = "ba5c770502b390c11013ba9a0222235ba8816455" +SRCREV_qtcoap = "6269113fcf0c88e6cdb5bbe0a7a942ab646d1527" +SRCREV_qtconnectivity = "19ab5acb9278b5427f42e49aea209f252a8af31a" +SRCREV_qtdatavis3d = "7722471605081abd4d5d865721da0c9f873e2c72" +SRCREV_qtdeclarative = "02093a1e19dbff40179de330d863eae486b29e09" +SRCREV_qtdeviceutilities = "4df53776d2ca26b8abc984642be822ae8f13c204" +SRCREV_qtimageformats = "66c5c8078a91ebcc114b79ec358889db6d1e92ae" +SRCREV_qtinterfaceframework = "2fe3959fb799adb0e7bd484a6f2dcd83ec87ea7f" +SRCREV_qtlottie = "bd47cd3b0103c06d9317a73b67dc1127ecfd2a8b" +SRCREV_qtmqtt = "4188dc21d2dd5a88b4de484229296a2576b7c180" +SRCREV_qtmultimedia = "b881b18997db4dc7cad6566efe51a9b597d87c32" +SRCREV_qtnetworkauth = "4eec0f52c4b6a63f6081844707b75fdcc98485c2" +SRCREV_qtopcua = "54179431d34edb7009c81b6160490e4fa28dd8f1" +SRCREV_qtpositioning = "b474883bc5c65d775c1f8cff2af18a5530612bdd" +SRCREV_qtquick3d = "bdaf1499a97dfbf30ca25c24a37f4d5cc2df5958" SRCREV_qtquick3d-assimp = "5a38cd0a03015ceabbd5bc6efb0730dde1ef74e5" SRCREV_qtquickdesigner-components = "728b7a681e4a6243f28af61dd84aa1ceddd80144" -SRCREV_qtquicktimeline = "01441d93813f20f754ea876d50de01c7409d004b" -SRCREV_qtremoteobjects = "7a546b25776a6654d6eac413607a6ff9ff00c85f" -SRCREV_qtscxml = "266ec89d11dd9168ec6f8a187bdef5976e52ecb9" -SRCREV_qtsensors = "33ea2711825338a55b731f315e38b64e79b45282" -SRCREV_qtserialbus = "c75e951e365aeae458aadf313900c2cb3b07422a" -SRCREV_qtserialport = "d1d009d34bcef30bc536d6b14b33f77cef951ad9" -SRCREV_qtshadertools = "bd1344e4109f677d8bc17a304116eb6d621fd282" -SRCREV_qtsvg = "31b3032c22960d04573baff83d04d3ffe0173161" -SRCREV_qttools = "b5c71ec152a62e85643c7bc37599a7436dbe9571" +SRCREV_qtquicktimeline = "74f5ffadbee5c522e2ab95856407d604216a5354" +SRCREV_qtremoteobjects = "f511b7eb6c0459bdaf6e5452f7d015b29edebfda" +SRCREV_qtscxml = "0bf3625d78dc443d955421f44e5bba355aa7ad09" +SRCREV_qtsensors = "58d018e86c825d64d5c32d08e450f16eacaeb07c" +SRCREV_qtserialbus = "fe18776b744d7c77f5cbeef6da0c389dee8d2ce7" +SRCREV_qtserialport = "850603af5308ce68ab919a10700ca65e351a988f" +SRCREV_qtshadertools = "2794f867fb005020ea2a056022f827714e94b63c" +SRCREV_qtsvg = "5a817f8cd69e7a56fbba5da2f887f519fa823828" +SRCREV_qttools = "1b957107e740ef15886dd37c27052ebb4c9db735" SRCREV_qttools-qlitehtml = "4931b7aa30f256c20573d283561aa432fecf8f38" SRCREV_qttools-qlitehtml-litehtml = "6236113734bb0a28467e5999e86fdd2834be8e01" -SRCREV_qttranslations = "07204039f8fbdc42d57b48abe808dccebdee4f0a" -SRCREV_qtvirtualkeyboard = "98ff9a18950f44474dcadee2885449d0fe4b9421" -SRCREV_qtwayland = "b014f22bbeb6cb43aa22c9f4e451dcc828d5a858" -SRCREV_qtwebchannel = "80c0c771b8c5562001819971564866845f8c18eb" -SRCREV_qtwebengine = "1b5598999d14b03512d9f5ffed18649837415c07" +SRCREV_qttranslations = "9772a03afbecf97e1763ab348cca4c82fd6db08c" +SRCREV_qtvirtualkeyboard = "a0eec362a947822bcb1db066034406cd27537a8d" +SRCREV_qtwayland = "802b5a0451618817e77d933bc0b7d63579a4ca2f" +SRCREV_qtwebchannel = "42b0e8c32e26b22f11a6d49159b8f057941da427" +SRCREV_qtwebengine = "3534d899857b4e9cff31dc3114b0fb2ecf3d9a47" SRCREV_qtwebengine-chromium = "9457651ead9b7034edb37532c2f33a558b1700b6" -SRCREV_qtwebsockets = "1c1958ea228376556a7abad7cd741747b0e72baf" -SRCREV_qtwebview = "863cca319c4e3ae1e147ff2b5809ad6c3696c54d" +SRCREV_qtwebsockets = "5420e9904940c682fa9ca0a1977205f9806f0e50" +SRCREV_qtwebview = "05853ed2bb7f077586c554256dce6dd4a4d2058f" From 162a948e392143f0965b9206e67b3ad3e54a98b1 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 9 Nov 2022 11:36:08 +0000 Subject: [PATCH 25/32] qtwebengine: add dependency to cups Printing support needs cups in cases when it's not already enabled in qtbase. Change-Id: I5435bdd61b418f91524726571c9acd2cea92c729 Reviewed-by: Mikko Gronoff (cherry picked from commit 7731aab502f7b16026fb04bf3337d81119d386ab) Reviewed-by: Samuli Piippo --- recipes-qt/qt6/qtwebengine_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt6/qtwebengine_git.bb b/recipes-qt/qt6/qtwebengine_git.bb index 1972a91..ce2d564 100644 --- a/recipes-qt/qt6/qtwebengine_git.bb +++ b/recipes-qt/qt6/qtwebengine_git.bb @@ -64,7 +64,7 @@ PACKAGECONFIG[libxml] = "-DFEATURE_webengine_system_libxml=ON,-DFEATURE_webengin PACKAGECONFIG[opus] = "-DFEATURE_webengine_system_opus=ON,-DFEATURE_webengine_system_opus=OFF,libopus" PACKAGECONFIG[libpci] = "-DFEATURE_webengine_system_libpci=ON,-DFEATURE_webengine_system_libpci=OFF,pciutils" PACKAGECONFIG[pepper-plugins] = "-DFEATURE_webengine_pepper_plugins=ON,-DFEATURE_webengine_pepper_plugins=OFF" -PACKAGECONFIG[printing-and-pdf] = "-DFEATURE_webengine_printing_and_pdf=ON,-DFEATURE_webengine_printing_and_pdf=OFF" +PACKAGECONFIG[printing-and-pdf] = "-DFEATURE_webengine_printing_and_pdf=ON,-DFEATURE_webengine_printing_and_pdf=OFF,cups" PACKAGECONFIG[proprietary-codecs] = "-DFEATURE_webengine_proprietary_codecs=ON,-DFEATURE_webengine_proprietary_codecs=OFF" PACKAGECONFIG[pulseaudio] = "-DFEATURE_webengine_system_pulseaudio=ON,-DFEATURE_webengine_system_pulseaudio=OFF,pulseaudio" PACKAGECONFIG[re2] = "-DFEATURE_webengine_system_re2=ON,-DFEATURE_webengine_system_re2=OFF,re2" From a5a773400bea4a08bcb5bf876daddd1b6621367e Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Wed, 23 Nov 2022 12:56:52 +0200 Subject: [PATCH 26/32] coin: remove unused test-gatesgarth.inc Unused for a long time. Change-Id: If1689ce4c96409598cd5501d7e232481c1cc9be1 Reviewed-by: Samuli Piippo --- coin/test-gatesgarth.inc | 1 - 1 file changed, 1 deletion(-) delete mode 100644 coin/test-gatesgarth.inc diff --git a/coin/test-gatesgarth.inc b/coin/test-gatesgarth.inc deleted file mode 100644 index 1827495..0000000 --- a/coin/test-gatesgarth.inc +++ /dev/null @@ -1 +0,0 @@ -DISTRO_FEATURES_remove = "webengine" From e82536ff7be6a43adf7e684455942d4ce26b984a Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Sat, 26 Nov 2022 09:42:37 +0000 Subject: [PATCH 27/32] Revert "webengine: add patch for python 3.11 build issue" This reverts commit 77b03a5a5329acc18e99288519227950823ab327. Reason for revert: Available upstream. Change-Id: I7e44cddf7f2afced0bc6bc931680c8a6fbdd95c6 Reviewed-by: Mikko Gronoff --- recipes-qt/qt6/qtwebengine.inc | 1 - ...build-in-Python-3.11-invalid-mode-rU.patch | 50 ------------------- 2 files changed, 51 deletions(-) delete mode 100644 recipes-qt/qt6/qtwebengine/chromium/0003-Fix-build-in-Python-3.11-invalid-mode-rU.patch diff --git a/recipes-qt/qt6/qtwebengine.inc b/recipes-qt/qt6/qtwebengine.inc index 9ac8b56..b6d37fb 100644 --- a/recipes-qt/qt6/qtwebengine.inc +++ b/recipes-qt/qt6/qtwebengine.inc @@ -37,7 +37,6 @@ SRC_URI += " \ SRC_URI += " \ file://chromium/0001-v8-qemu-wrapper.patch;patchdir=src/3rdparty \ file://chromium/0002-chromium-workaround-for-too-long-.rps-file-name.patch;patchdir=src/3rdparty \ - file://chromium/0003-Fix-build-in-Python-3.11-invalid-mode-rU.patch;patchdir=src/3rdparty \ " SRCREV_FORMAT = "qtwebengine_qtwebengine-chromium" diff --git a/recipes-qt/qt6/qtwebengine/chromium/0003-Fix-build-in-Python-3.11-invalid-mode-rU.patch b/recipes-qt/qt6/qtwebengine/chromium/0003-Fix-build-in-Python-3.11-invalid-mode-rU.patch deleted file mode 100644 index 9ab3787..0000000 --- a/recipes-qt/qt6/qtwebengine/chromium/0003-Fix-build-in-Python-3.11-invalid-mode-rU.patch +++ /dev/null @@ -1,50 +0,0 @@ -From a0cabac19789a4e88c86407970ea3b3d2929006b Mon Sep 17 00:00:00 2001 -From: Joanmarie Diggs -Date: Tue, 30 Aug 2022 06:00:13 +0000 -Subject: [PATCH] Fix build in Python 3.11 (invalid mode: 'rU') - -In Python 3.11, 'U' ("universal newline") is no longer accepted in -the file mode, having been deprecated in Python 3.3. The "universal -newline" is used by default when a file is open in text mode. - -This commit removes the 'U' from the two (non-third-party) places -it is used. - -Bug: 1357549 -Change-Id: I3305707858d8ba7a9f518656a9b97dc1702bbe94 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3859535 -Reviewed-by: Mike Pinkerton -Commit-Queue: Joanmarie Diggs -Reviewed-by: Nico Weber -Cr-Commit-Position: refs/heads/main@{#1040794} ---- - chromium/PRESUBMIT_test_mocks.py | 2 +- - chromium/tools/grit/grit/util.py | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/chromium/PRESUBMIT_test_mocks.py b/chromium/PRESUBMIT_test_mocks.py -index b7d1b482c5f..7304697b117 100644 ---- a/chromium/PRESUBMIT_test_mocks.py -+++ b/chromium/PRESUBMIT_test_mocks.py -@@ -128,7 +128,7 @@ class MockInputApi(object): - def PresubmitLocalPath(self): - return self.presubmit_local_path - -- def ReadFile(self, filename, mode='rU'): -+ def ReadFile(self, filename, mode='r'): - if hasattr(filename, 'AbsoluteLocalPath'): - filename = filename.AbsoluteLocalPath() - for file_ in self.files: -diff --git a/chromium/tools/grit/grit/util.py b/chromium/tools/grit/grit/util.py -index 98433d154c0..98e770b8533 100644 ---- a/chromium/tools/grit/grit/util.py -+++ b/chromium/tools/grit/grit/util.py -@@ -209,7 +209,7 @@ def ReadFile(filename, encoding): - mode = 'rb' - encoding = None - else: -- mode = 'rU' -+ mode = 'r' - - with io.open(filename, mode, encoding=encoding) as f: - return f.read() From 686f7c4b08b7aa51d93d7f729bc7dccc209d1efa Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 25 Nov 2022 23:37:31 +0000 Subject: [PATCH 28/32] Update submodule refs on 'lts-6.2' in yocto/meta-qt6 Change-Id: Ide141d975ce3fceea938d4c9fb3d8eec6334840e Reviewed-by: Qt Submodule Update Bot --- recipes-qt/qt6/qt6-git.inc | 74 +++++++++++++++++++------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/recipes-qt/qt6/qt6-git.inc b/recipes-qt/qt6/qt6-git.inc index 62a3dd1..9c59e21 100644 --- a/recipes-qt/qt6/qt6-git.inc +++ b/recipes-qt/qt6/qt6-git.inc @@ -16,45 +16,45 @@ PV = "6.2.7" SRCREV = "${SRCREV_${QT_MODULE}}" -SRCREV_tqtc-qmlcompilerplus = "702f91c0aea4f18fd1aa5f905609fd21904e456e" -SRCREV_qt3d = "5e6d30fe005c6d021f740dad8277fb9a41bc1217" +SRCREV_tqtc-qmlcompilerplus = "b444429502b5b9bfe5f3ab6b1ab6c106b0e92370" +SRCREV_qt3d = "8c2960e1e9aab3d18f61ce7f1e8bf62a0e0bdb63" SRCREV_qt3d-assimp = "5a38cd0a03015ceabbd5bc6efb0730dde1ef74e5" -SRCREV_qt5compat = "1a1163c064729b5e170289e9a6b7074190f5d55e" -SRCREV_qtbase = "2d30ccdcf213462f3ab41ed67073f447a6992457" -SRCREV_qtapplicationmanager = "b91ac6705b0bfbff83e5988c29bbcf64427c5665" -SRCREV_qtcharts = "ba5c770502b390c11013ba9a0222235ba8816455" -SRCREV_qtcoap = "6269113fcf0c88e6cdb5bbe0a7a942ab646d1527" -SRCREV_qtconnectivity = "19ab5acb9278b5427f42e49aea209f252a8af31a" -SRCREV_qtdatavis3d = "7722471605081abd4d5d865721da0c9f873e2c72" -SRCREV_qtdeclarative = "02093a1e19dbff40179de330d863eae486b29e09" -SRCREV_qtdeviceutilities = "4df53776d2ca26b8abc984642be822ae8f13c204" -SRCREV_qtimageformats = "66c5c8078a91ebcc114b79ec358889db6d1e92ae" -SRCREV_qtinterfaceframework = "2fe3959fb799adb0e7bd484a6f2dcd83ec87ea7f" -SRCREV_qtlottie = "bd47cd3b0103c06d9317a73b67dc1127ecfd2a8b" -SRCREV_qtmqtt = "4188dc21d2dd5a88b4de484229296a2576b7c180" -SRCREV_qtmultimedia = "b881b18997db4dc7cad6566efe51a9b597d87c32" -SRCREV_qtnetworkauth = "4eec0f52c4b6a63f6081844707b75fdcc98485c2" -SRCREV_qtopcua = "54179431d34edb7009c81b6160490e4fa28dd8f1" -SRCREV_qtpositioning = "b474883bc5c65d775c1f8cff2af18a5530612bdd" -SRCREV_qtquick3d = "bdaf1499a97dfbf30ca25c24a37f4d5cc2df5958" +SRCREV_qt5compat = "68763931ca524dc4bf646338524f21d0a9d35b09" +SRCREV_qtbase = "bfb87f1940ce7ee980db83876bd37a98d4820382" +SRCREV_qtapplicationmanager = "d21efebae51fc4ea4b60cd567f106dfee34ccbb3" +SRCREV_qtcharts = "642f264f7c7d3adc8d35a0295e91778f03be5a80" +SRCREV_qtcoap = "6ce0bcc668317b6726ac41dc7c1a54cd214c32fa" +SRCREV_qtconnectivity = "cf2144870245f3e52dbd852548c1dcd99af20bbc" +SRCREV_qtdatavis3d = "6811d97ea6f5a8cdb98021e51302dbe195f74b33" +SRCREV_qtdeclarative = "69fa64eb2417771e062bbebd399e43b735c2617b" +SRCREV_qtdeviceutilities = "63eab88eda9f41b08a1763206940969c812748ec" +SRCREV_qtimageformats = "42f143f67136cf7f2234c2f751bc5116eb4b82be" +SRCREV_qtinterfaceframework = "f1a728e9a8b4b8ca572562b8053851401dd0dcc0" +SRCREV_qtlottie = "4db27edfe76231ea2387ef74b9d1f5b296ff3620" +SRCREV_qtmqtt = "6f57b468c51c677a5f39a99e62d98e684a5ebdb8" +SRCREV_qtmultimedia = "36108c69b2f6ae3a3fc34a1d1719395e31ae5d76" +SRCREV_qtnetworkauth = "8b63ead91eeff92c2e63883e0aa4b35fc828b79d" +SRCREV_qtopcua = "829ff473203e86dadf79beefbeec012f68569b2a" +SRCREV_qtpositioning = "dc609a1cc86d32007049badb49e9f6d298e453b3" +SRCREV_qtquick3d = "1d85766c35feaf4ac689a033eb355517e3192890" SRCREV_qtquick3d-assimp = "5a38cd0a03015ceabbd5bc6efb0730dde1ef74e5" SRCREV_qtquickdesigner-components = "728b7a681e4a6243f28af61dd84aa1ceddd80144" -SRCREV_qtquicktimeline = "74f5ffadbee5c522e2ab95856407d604216a5354" -SRCREV_qtremoteobjects = "f511b7eb6c0459bdaf6e5452f7d015b29edebfda" -SRCREV_qtscxml = "0bf3625d78dc443d955421f44e5bba355aa7ad09" -SRCREV_qtsensors = "58d018e86c825d64d5c32d08e450f16eacaeb07c" -SRCREV_qtserialbus = "fe18776b744d7c77f5cbeef6da0c389dee8d2ce7" -SRCREV_qtserialport = "850603af5308ce68ab919a10700ca65e351a988f" -SRCREV_qtshadertools = "2794f867fb005020ea2a056022f827714e94b63c" -SRCREV_qtsvg = "5a817f8cd69e7a56fbba5da2f887f519fa823828" -SRCREV_qttools = "1b957107e740ef15886dd37c27052ebb4c9db735" +SRCREV_qtquicktimeline = "9bf39de71210d2dbc96293a605f87ecdb23ee017" +SRCREV_qtremoteobjects = "6c42d9ed7f3bf9aceec174ff2cb3b3f396f79b1d" +SRCREV_qtscxml = "ad0cfe1c7e931402021a0faa4af89df6616e057c" +SRCREV_qtsensors = "27d37707baa1b5fe764ee2bba49c771df4aee078" +SRCREV_qtserialbus = "38fc6b95a25d474559bdb74a0d99ff563461fd7b" +SRCREV_qtserialport = "615ada0506d66f83b55f78663e42251861ba3c37" +SRCREV_qtshadertools = "e7ed9b8c02da906534f79d303466adb2f46d2e12" +SRCREV_qtsvg = "518f376a56288a9646becf20273661032516a27b" +SRCREV_qttools = "85ef8291b2ae9e333949468cbb294938fcc6a099" SRCREV_qttools-qlitehtml = "4931b7aa30f256c20573d283561aa432fecf8f38" SRCREV_qttools-qlitehtml-litehtml = "6236113734bb0a28467e5999e86fdd2834be8e01" -SRCREV_qttranslations = "9772a03afbecf97e1763ab348cca4c82fd6db08c" -SRCREV_qtvirtualkeyboard = "a0eec362a947822bcb1db066034406cd27537a8d" -SRCREV_qtwayland = "802b5a0451618817e77d933bc0b7d63579a4ca2f" -SRCREV_qtwebchannel = "42b0e8c32e26b22f11a6d49159b8f057941da427" -SRCREV_qtwebengine = "3534d899857b4e9cff31dc3114b0fb2ecf3d9a47" -SRCREV_qtwebengine-chromium = "9457651ead9b7034edb37532c2f33a558b1700b6" -SRCREV_qtwebsockets = "5420e9904940c682fa9ca0a1977205f9806f0e50" -SRCREV_qtwebview = "05853ed2bb7f077586c554256dce6dd4a4d2058f" +SRCREV_qttranslations = "5a88bf99b77dac6f3f76a1aac7ecd168195891bd" +SRCREV_qtvirtualkeyboard = "730b93a50510291ce7e868cbf6354d0f4684bff4" +SRCREV_qtwayland = "ae483970cdb19d01a95c6c167829c4b5d02d06fd" +SRCREV_qtwebchannel = "e2da958011f2ffac3f207b1fbd744f50cbc11001" +SRCREV_qtwebengine = "a89129e7afaa4c1981a539ab548bffb8ebc4e8bd" +SRCREV_qtwebengine-chromium = "5e7f517eade60dd5f9409f32a44a8c5f897bb8c1" +SRCREV_qtwebsockets = "b1befdf256dbbf2c6a843506262827e8a366d1d8" +SRCREV_qtwebview = "0ff12baceeff9c88ee4ff8682935cee47194a28d" From 6dd47f96a895a30a51fa2855589bed3b15ec807f Mon Sep 17 00:00:00 2001 From: Mikko Gronoff Date: Tue, 29 Nov 2022 08:26:10 +0200 Subject: [PATCH 29/32] qt6-git.inc: switch modules to 6.2.7 branch Change-Id: I1b73b77e57b5c186edc2a3fec0527e297f4262b4 Reviewed-by: Samuli Piippo --- recipes-qt/qt6/qt6-git.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt6/qt6-git.inc b/recipes-qt/qt6/qt6-git.inc index 9c59e21..aab3453 100644 --- a/recipes-qt/qt6/qt6-git.inc +++ b/recipes-qt/qt6/qt6-git.inc @@ -2,7 +2,7 @@ DESCRIPTION ?= "Qt is a cross-platform application development framework for des HOMEPAGE ?= "https://www.qt.io" QT_MODULE ?= "${BPN}" -QT_MODULE_BRANCH ?= "6.2" +QT_MODULE_BRANCH ?= "6.2.7" QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH}" QT_MODULE_REPO ?= "${QT_MODULE}.git" From a055a742724de5a60ec9bf983c2309d1d3dfe255 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 29 Nov 2022 04:28:04 +0000 Subject: [PATCH 30/32] Update submodule refs on 'lts-6.2.7' in yocto/meta-qt6 Change-Id: I8eadd4c1a6a6053e12380c130f08aae0df75063b Reviewed-by: Qt Submodule Update Bot --- recipes-qt/qt6/qt6-git.inc | 72 +++++++++++++++++++------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/recipes-qt/qt6/qt6-git.inc b/recipes-qt/qt6/qt6-git.inc index aab3453..0bb4133 100644 --- a/recipes-qt/qt6/qt6-git.inc +++ b/recipes-qt/qt6/qt6-git.inc @@ -16,45 +16,45 @@ PV = "6.2.7" SRCREV = "${SRCREV_${QT_MODULE}}" -SRCREV_tqtc-qmlcompilerplus = "b444429502b5b9bfe5f3ab6b1ab6c106b0e92370" -SRCREV_qt3d = "8c2960e1e9aab3d18f61ce7f1e8bf62a0e0bdb63" +SRCREV_tqtc-qmlcompilerplus = "fbaa907ac917349ebd56186a71e614573c50a8c7" +SRCREV_qt3d = "3f753f8afb5dabe4df0799d3c022ec4ca2fcbd29" SRCREV_qt3d-assimp = "5a38cd0a03015ceabbd5bc6efb0730dde1ef74e5" -SRCREV_qt5compat = "68763931ca524dc4bf646338524f21d0a9d35b09" -SRCREV_qtbase = "bfb87f1940ce7ee980db83876bd37a98d4820382" +SRCREV_qt5compat = "71f1fbd4921b923c6cd3eb63091cb8dc30c6cf3a" +SRCREV_qtbase = "938cdd2629732988bb815b5ceb14dab4563311d7" SRCREV_qtapplicationmanager = "d21efebae51fc4ea4b60cd567f106dfee34ccbb3" -SRCREV_qtcharts = "642f264f7c7d3adc8d35a0295e91778f03be5a80" -SRCREV_qtcoap = "6ce0bcc668317b6726ac41dc7c1a54cd214c32fa" -SRCREV_qtconnectivity = "cf2144870245f3e52dbd852548c1dcd99af20bbc" -SRCREV_qtdatavis3d = "6811d97ea6f5a8cdb98021e51302dbe195f74b33" -SRCREV_qtdeclarative = "69fa64eb2417771e062bbebd399e43b735c2617b" -SRCREV_qtdeviceutilities = "63eab88eda9f41b08a1763206940969c812748ec" -SRCREV_qtimageformats = "42f143f67136cf7f2234c2f751bc5116eb4b82be" -SRCREV_qtinterfaceframework = "f1a728e9a8b4b8ca572562b8053851401dd0dcc0" -SRCREV_qtlottie = "4db27edfe76231ea2387ef74b9d1f5b296ff3620" -SRCREV_qtmqtt = "6f57b468c51c677a5f39a99e62d98e684a5ebdb8" -SRCREV_qtmultimedia = "36108c69b2f6ae3a3fc34a1d1719395e31ae5d76" -SRCREV_qtnetworkauth = "8b63ead91eeff92c2e63883e0aa4b35fc828b79d" -SRCREV_qtopcua = "829ff473203e86dadf79beefbeec012f68569b2a" -SRCREV_qtpositioning = "dc609a1cc86d32007049badb49e9f6d298e453b3" -SRCREV_qtquick3d = "1d85766c35feaf4ac689a033eb355517e3192890" +SRCREV_qtcharts = "619ac5ee9abaf286ea26793ba5f382f978026d87" +SRCREV_qtcoap = "473cb3b3941e905f918577eaf96746012959d584" +SRCREV_qtconnectivity = "3b8f1f5811b6e7e0b7a694ce4944f52667cadb6d" +SRCREV_qtdatavis3d = "83c2629ce10fe975b31457a7c7a04660c66a98eb" +SRCREV_qtdeclarative = "b65d9135ebd43d5bf3cc882a94230a305893fd6a" +SRCREV_qtdeviceutilities = "ea50d0f319991227eb0904532e26ca9ef354c711" +SRCREV_qtimageformats = "ee6a337a4ba71630f148e1701614fb6171910b74" +SRCREV_qtinterfaceframework = "8229be1c0905b2315d1a5ba071f59830f014afcf" +SRCREV_qtlottie = "a7b793dcda7357b3fac6ef63428ea13c7e61a79b" +SRCREV_qtmqtt = "a2f0686a04501fc11d0518cd431be8ba7f208e9e" +SRCREV_qtmultimedia = "3dac584901aff0e9e45476b5a7a38a6b1c3d1d0c" +SRCREV_qtnetworkauth = "068d46cd3d98e4465e8030a57838b9c00db79b75" +SRCREV_qtopcua = "d4c3c6f108e52c87f50d5388494f6ce202af56f8" +SRCREV_qtpositioning = "9a3024bd3ca6aac5c0ff77c72e2946f821493dc7" +SRCREV_qtquick3d = "a91213913fe2df783b2766dfbf61c757bc4e8b69" SRCREV_qtquick3d-assimp = "5a38cd0a03015ceabbd5bc6efb0730dde1ef74e5" -SRCREV_qtquickdesigner-components = "728b7a681e4a6243f28af61dd84aa1ceddd80144" -SRCREV_qtquicktimeline = "9bf39de71210d2dbc96293a605f87ecdb23ee017" -SRCREV_qtremoteobjects = "6c42d9ed7f3bf9aceec174ff2cb3b3f396f79b1d" -SRCREV_qtscxml = "ad0cfe1c7e931402021a0faa4af89df6616e057c" -SRCREV_qtsensors = "27d37707baa1b5fe764ee2bba49c771df4aee078" -SRCREV_qtserialbus = "38fc6b95a25d474559bdb74a0d99ff563461fd7b" -SRCREV_qtserialport = "615ada0506d66f83b55f78663e42251861ba3c37" -SRCREV_qtshadertools = "e7ed9b8c02da906534f79d303466adb2f46d2e12" -SRCREV_qtsvg = "518f376a56288a9646becf20273661032516a27b" -SRCREV_qttools = "85ef8291b2ae9e333949468cbb294938fcc6a099" +SRCREV_qtquickdesigner-components = "eef765c5ed34eac8c1294fbeda55d273f916ca86" +SRCREV_qtquicktimeline = "bbbe83f9d1c05cf63e898891b8f54b49d800e596" +SRCREV_qtremoteobjects = "b1df47926ead3aadd4336e313fa83216cc50b771" +SRCREV_qtscxml = "bdeb455627e180c12b69c0d8afe7c64c2a40ee6f" +SRCREV_qtsensors = "0023445e5458cd6b2f198add79cd1ac24406e22d" +SRCREV_qtserialbus = "6d67898227fe2fccb4923b22ecefa4e2d934ef8e" +SRCREV_qtserialport = "950fda28d55287a5983ebe455fef6844e9f6cdc2" +SRCREV_qtshadertools = "46b0f976b38007c31f557820d226b1deeab55766" +SRCREV_qtsvg = "b0fb7359d2cc89792590a3331dc06a8d06e0c7fe" +SRCREV_qttools = "1f59d6f96eca88711091ded7f026476c409da739" SRCREV_qttools-qlitehtml = "4931b7aa30f256c20573d283561aa432fecf8f38" SRCREV_qttools-qlitehtml-litehtml = "6236113734bb0a28467e5999e86fdd2834be8e01" -SRCREV_qttranslations = "5a88bf99b77dac6f3f76a1aac7ecd168195891bd" -SRCREV_qtvirtualkeyboard = "730b93a50510291ce7e868cbf6354d0f4684bff4" -SRCREV_qtwayland = "ae483970cdb19d01a95c6c167829c4b5d02d06fd" -SRCREV_qtwebchannel = "e2da958011f2ffac3f207b1fbd744f50cbc11001" -SRCREV_qtwebengine = "a89129e7afaa4c1981a539ab548bffb8ebc4e8bd" +SRCREV_qttranslations = "0bdc3c3c454f67f98ece0f5cd78ecc68eb78b517" +SRCREV_qtvirtualkeyboard = "c9f8aa7018f31a82f3de0ff56efbabe12dd814e7" +SRCREV_qtwayland = "0213c6cbda0b1d65f8d4dfc76f4d88a085540aba" +SRCREV_qtwebchannel = "e1a6989e85781fde4c617ebb9437ef62e10ed3b8" +SRCREV_qtwebengine = "566edcac4fc52260c9b526d287d6a0ad623e7978" SRCREV_qtwebengine-chromium = "5e7f517eade60dd5f9409f32a44a8c5f897bb8c1" -SRCREV_qtwebsockets = "b1befdf256dbbf2c6a843506262827e8a366d1d8" -SRCREV_qtwebview = "0ff12baceeff9c88ee4ff8682935cee47194a28d" +SRCREV_qtwebsockets = "9f1e0aad40d386b9c0664498b0b4f1e92ba6d73a" +SRCREV_qtwebview = "ccb6d14a6b3cd3da087c50dac6fe6080255f0e8c" From 0eb86b19b69cbfca0fd643d66691dc996866f2da Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 29 Nov 2022 13:02:46 +0000 Subject: [PATCH 31/32] Update submodule refs on 'lts-6.2.7' in yocto/meta-qt6 Change-Id: I9f571f11df4ca17fea26763c80f96d460b8f90f2 Reviewed-by: Qt Submodule Update Bot --- recipes-qt/qt6/qt6-git.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/recipes-qt/qt6/qt6-git.inc b/recipes-qt/qt6/qt6-git.inc index 0bb4133..a9416d3 100644 --- a/recipes-qt/qt6/qt6-git.inc +++ b/recipes-qt/qt6/qt6-git.inc @@ -21,7 +21,7 @@ SRCREV_qt3d = "3f753f8afb5dabe4df0799d3c022ec4ca2fcbd29" SRCREV_qt3d-assimp = "5a38cd0a03015ceabbd5bc6efb0730dde1ef74e5" SRCREV_qt5compat = "71f1fbd4921b923c6cd3eb63091cb8dc30c6cf3a" SRCREV_qtbase = "938cdd2629732988bb815b5ceb14dab4563311d7" -SRCREV_qtapplicationmanager = "d21efebae51fc4ea4b60cd567f106dfee34ccbb3" +SRCREV_qtapplicationmanager = "22c59456804b22e205a5d5c14de7fb88305eaa1b" SRCREV_qtcharts = "619ac5ee9abaf286ea26793ba5f382f978026d87" SRCREV_qtcoap = "473cb3b3941e905f918577eaf96746012959d584" SRCREV_qtconnectivity = "3b8f1f5811b6e7e0b7a694ce4944f52667cadb6d" @@ -54,7 +54,7 @@ SRCREV_qttranslations = "0bdc3c3c454f67f98ece0f5cd78ecc68eb78b517" SRCREV_qtvirtualkeyboard = "c9f8aa7018f31a82f3de0ff56efbabe12dd814e7" SRCREV_qtwayland = "0213c6cbda0b1d65f8d4dfc76f4d88a085540aba" SRCREV_qtwebchannel = "e1a6989e85781fde4c617ebb9437ef62e10ed3b8" -SRCREV_qtwebengine = "566edcac4fc52260c9b526d287d6a0ad623e7978" -SRCREV_qtwebengine-chromium = "5e7f517eade60dd5f9409f32a44a8c5f897bb8c1" +SRCREV_qtwebengine = "46aad3d05bc8944286f603b70be88b341e71119a" +SRCREV_qtwebengine-chromium = "a0f47d475cd2411cacc985ebee6f20c0692a2969" SRCREV_qtwebsockets = "9f1e0aad40d386b9c0664498b0b4f1e92ba6d73a" -SRCREV_qtwebview = "ccb6d14a6b3cd3da087c50dac6fe6080255f0e8c" +SRCREV_qtwebview = "e76c03c73667dc288a1ecae71e2918f0dc5778b9" From 3e317c07ec1d539562a8c509a18f76d2229d41d6 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 9 Dec 2022 12:22:09 +0000 Subject: [PATCH 32/32] Don't validate the SRCREV value against the branch Qt modules recently lost all their release branches in their git repositories. This broke previous releases since bitbake validates that SRCREV can be found from the current branch. Add additional parameter to repo URI to stop bitbake from validating the SRCREV. Task-number: QTBUG-109319 Change-Id: Ib61164839fdbc5938a23b92ab03f3c07e945812f Reviewed-by: Mikko Gronoff (cherry picked from commit 28842c8014ed2127e23f79ad0318aae60b19da7a) Reviewed-by: Tarja Sundqvist --- recipes-qt/qt6/qt6-git.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt6/qt6-git.inc b/recipes-qt/qt6/qt6-git.inc index a9416d3..ab98568 100644 --- a/recipes-qt/qt6/qt6-git.inc +++ b/recipes-qt/qt6/qt6-git.inc @@ -3,7 +3,7 @@ HOMEPAGE ?= "https://www.qt.io" QT_MODULE ?= "${BPN}" QT_MODULE_BRANCH ?= "6.2.7" -QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH}" +QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH};nobranch=1" QT_MODULE_REPO ?= "${QT_MODULE}.git" SRC_URI = "${QT_GIT}/${QT_GIT_PROJECT}/${QT_MODULE_REPO};name=${QT_MODULE};${QT_MODULE_BRANCH_PARAM};protocol=${QT_GIT_PROTOCOL}"