From 8f7aafe9d32c56d0d85e7502cab0fe77e1406ca6 Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Mon, 9 Dec 2024 06:11:28 +0000 Subject: [PATCH 01/75] Adjust submodule branches Change-Id: I6bd8b23f632c67b7e2e2da86ae42b9b93865f30e --- .gitmodules | 86 ++++++++++++++++++++++++++--------------------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/.gitmodules b/.gitmodules index f8c07ce3887..621a5cd7592 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,40 +1,40 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = dev + branch = 6.9 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = dev + branch = 6.9 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtimageformats qtshadertools qtsvg qtlanguageserver path = qtdeclarative url = ../qtdeclarative.git - branch = dev + branch = 6.9 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = dev + branch = 6.9 status = addon [submodule "qtmultimedia"] depends = qtbase qtshadertools recommends = qtdeclarative qtquick3d path = qtmultimedia url = ../qtmultimedia.git - branch = dev + branch = 6.9 status = addon [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt path = qttools url = ../qttools.git - branch = dev + branch = 6.9 status = essential [submodule "qtxmlpatterns"] depends = qtbase @@ -47,7 +47,7 @@ depends = qttools path = qttranslations url = ../qttranslations.git - branch = dev + branch = 6.9 status = essential priority = 30 [submodule "qtdoc"] @@ -55,7 +55,7 @@ recommends = qtmultimedia qtshadertools qtwebengine path = qtdoc url = ../qtdoc.git - branch = dev + branch = 6.9 status = essential priority = 40 [submodule "qtrepotools"] @@ -68,7 +68,7 @@ depends = qtbase path = qtqa url = ../qtqa.git - branch = dev + branch = 6.9 status = essential priority = 50 [submodule "qtlocation"] @@ -76,21 +76,21 @@ recommends = qtdeclarative path = qtlocation url = ../qtlocation.git - branch = dev + branch = 6.9 status = preview [submodule "qtpositioning"] depends = qtbase recommends = qtdeclarative qtserialport path = qtpositioning url = ../qtpositioning.git - branch = dev + branch = 6.9 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = dev + branch = 6.9 status = addon [submodule "qtsystems"] depends = qtbase @@ -117,61 +117,61 @@ recommends = qtdeclarative path = qtconnectivity url = ../qtconnectivity.git - branch = dev + branch = 6.9 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = dev + branch = 6.9 status = addon [submodule "qt3d"] depends = qtbase recommends = qtdeclarative qtshadertools qtmultimedia path = qt3d url = ../qt3d.git - branch = dev + branch = 6.9 status = deprecated [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = dev + branch = 6.9 status = addon [submodule "qtserialbus"] depends = qtbase recommends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = dev + branch = 6.9 status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = dev + branch = 6.9 status = addon [submodule "qtwebsockets"] depends = qtbase recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = dev + branch = 6.9 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = dev + branch = 6.9 status = addon [submodule "qtwebengine"] depends = qtdeclarative recommends = qtwebchannel qttools qtpositioning path = qtwebengine url = ../qtwebengine.git - branch = dev + branch = 6.9 status = addon priority = 10 [submodule "qtcanvas3d"] @@ -185,28 +185,28 @@ recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = dev + branch = 6.9 status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = dev + branch = 6.9 status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = dev + branch = 6.9 status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = dev + branch = 6.9 status = addon [submodule "qtgamepad"] depends = qtbase @@ -219,27 +219,27 @@ depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml.git - branch = dev + branch = 6.9 status = addon [submodule "qtspeech"] depends = qtbase qtmultimedia recommends = qtdeclarative path = qtspeech url = ../qtspeech.git - branch = dev + branch = 6.9 status = addon [submodule "qtnetworkauth"] depends = qtbase path = qtnetworkauth url = ../qtnetworkauth.git - branch = dev + branch = 6.9 status = addon [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative path = qtremoteobjects url = ../qtremoteobjects.git - branch = dev + branch = 6.9 status = addon [submodule "qtwebglplugin"] depends = qtbase qtwebsockets @@ -252,88 +252,88 @@ depends = qtbase qtdeclarative path = qtlottie url = ../qtlottie.git - branch = dev + branch = 6.9 status = addon [submodule "qtquicktimeline"] depends = qtbase qtdeclarative path = qtquicktimeline url = ../qtquicktimeline - branch = dev + branch = 6.9 status = addon [submodule "qtquick3d"] depends = qtbase qtdeclarative qtshadertools recommends = qtquicktimeline path = qtquick3d url = ../qtquick3d.git - branch = dev + branch = 6.9 status = addon [submodule "qtshadertools"] depends = qtbase path = qtshadertools url = ../qtshadertools.git - branch = dev + branch = 6.9 status = addon [submodule "qt5compat"] depends = qtbase qtdeclarative path = qt5compat url = ../qt5compat.git - branch = dev + branch = 6.9 status = deprecated [submodule "qtcoap"] depends = qtbase path = qtcoap url = ../qtcoap.git - branch = dev + branch = 6.9 status = addon [submodule "qtmqtt"] depends = qtbase qtdeclarative recommends = qtwebsockets path = qtmqtt url = ../qtmqtt.git - branch = dev + branch = 6.9 status = addon [submodule "qtopcua"] depends = qtbase qtdeclarative path = qtopcua url = ../qtopcua.git - branch = dev + branch = 6.9 status = addon [submodule "qtlanguageserver"] depends = qtbase path = qtlanguageserver url = ../qtlanguageserver.git - branch = dev + branch = 6.9 status = preview [submodule "qthttpserver"] depends = qtbase recommends = qtwebsockets path = qthttpserver url = ../qthttpserver.git - branch = dev + branch = 6.9 status = addon [submodule "qtquick3dphysics"] depends = qtbase qtdeclarative qtquick3d qtshadertools path = qtquick3dphysics url = ../qtquick3dphysics.git - branch = dev + branch = 6.9 status = addon [submodule "qtgrpc"] depends = qtbase recommends = qtdeclarative path = qtgrpc url = ../qtgrpc.git - branch = dev + branch = 6.9 status = addon [submodule "qtquickeffectmaker"] depends = qtbase qtdeclarative qtshadertools recommends = qtquick3d path = qtquickeffectmaker url = ../qtquickeffectmaker.git - branch = dev + branch = 6.9 status = addon [submodule "qtgraphs"] depends = qtbase qtdeclarative qtquick3d path = qtgraphs url = ../qtgraphs.git - branch = dev + branch = 6.9 status = addon From 77e9af9920903a304443129d35f5533b100dede0 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 10 Dec 2024 04:49:00 +0000 Subject: [PATCH 02/75] Update submodules on '6.9 in qt/qt5' Change-Id: I31180bf79769de24abc1fb8306e100a22da97322 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qt5compat | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtcharts | 2 +- qtcoap | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgraphs | 2 +- qtgrpc | 2 +- qthttpserver | 2 +- qtimageformats | 2 +- qtlanguageserver | 2 +- qtlocation | 2 +- qtlottie | 2 +- qtmqtt | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtopcua | 2 +- qtpositioning | 2 +- qtquick3d | 2 +- qtquick3dphysics | 2 +- qtquickeffectmaker | 2 +- qtquicktimeline | 2 +- qtremoteobjects | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtshadertools | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- 42 files changed, 42 insertions(+), 42 deletions(-) diff --git a/qt3d b/qt3d index 219dd44a26c..ca46be43f85 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 219dd44a26cf4323c1a3ba1c7a48ac5f1596b5ba +Subproject commit ca46be43f854ee5cc75e7de98151530da522866a diff --git a/qt5compat b/qt5compat index 9e0fc26d8e0..a1f2965ceae 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 9e0fc26d8e087379ef3f860460c066274368c012 +Subproject commit a1f2965ceaeef2f88e21699a32e013cfba4a5081 diff --git a/qtactiveqt b/qtactiveqt index bea80dcdbc1..29a52164d22 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit bea80dcdbc1ca1580f7214debf0790415fba9bc2 +Subproject commit 29a52164d22d626475da33a96c8d0c439266a3d3 diff --git a/qtbase b/qtbase index 9cb0d48aae8..a77a7c157d5 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 9cb0d48aae81c5436bda783b64721d0b77bc3f6c +Subproject commit a77a7c157d5cdcc88bf0a02caed2aa5ff8850d06 diff --git a/qtcharts b/qtcharts index f4aa9dffcfe..44e97efa0cf 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit f4aa9dffcfed508f1e7fb7a0f95cb0873ecd47c7 +Subproject commit 44e97efa0cf04169c343fa8956edc9fb5e0f696a diff --git a/qtcoap b/qtcoap index 24c6d918810..416450db620 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit 24c6d9188107d0834b44b91517f58656a495d495 +Subproject commit 416450db620e5644c0ca85dbb4bf4fa82e06d381 diff --git a/qtconnectivity b/qtconnectivity index d401180fc4b..7d11fda5fca 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit d401180fc4bc59a4dbe279cd4cdf3f4325d6e210 +Subproject commit 7d11fda5fca4cb02b44a935982b44316e697996d diff --git a/qtdatavis3d b/qtdatavis3d index 3e7d0a477a0..9d1b3458383 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 3e7d0a477a0fe97e8de7669b8d4460c8280c2887 +Subproject commit 9d1b3458383a6118b766a261eff56965ee3485e4 diff --git a/qtdeclarative b/qtdeclarative index f5673f1e0e1..850cdae3054 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit f5673f1e0e139fab33a456275b015fe4e5ca3986 +Subproject commit 850cdae305401ee8ac8dc17db8797d3ba81f83f4 diff --git a/qtdoc b/qtdoc index 7d49bbdf128..0e25703a859 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 7d49bbdf12829df94719f5a53de9f20f76b7502b +Subproject commit 0e25703a859968992d74af991d8652201a81c5b2 diff --git a/qtgraphs b/qtgraphs index 59085abc657..10c285df411 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit 59085abc6574fdfd222bc9e9b0473093e5344360 +Subproject commit 10c285df4112a69ea02a2fe8eca4192f7b02c43b diff --git a/qtgrpc b/qtgrpc index bfd24967bc2..9cdf3c4fe00 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit bfd24967bc26373f4920e3505cd3d4fd28e70687 +Subproject commit 9cdf3c4fe0076929280bf481efd9ccebe82147a6 diff --git a/qthttpserver b/qthttpserver index 45c60e30e0a..9faf9249a50 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit 45c60e30e0a4a411162365cf01aafc1b0cba201c +Subproject commit 9faf9249a50f578d3ce3591fbc220bb5bcb92222 diff --git a/qtimageformats b/qtimageformats index 08d1bb47494..27dbcda65ca 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 08d1bb474949c2d4f886928198bcf4cbf70ce724 +Subproject commit 27dbcda65ca8cd68d4ed59cdb904fd2465860406 diff --git a/qtlanguageserver b/qtlanguageserver index 5f998f06ebd..f7c074eaa2a 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit 5f998f06ebd2aeedad839eb33b303fb44a10aaa9 +Subproject commit f7c074eaa2af825d2b56c3dc0fa30eea876fb124 diff --git a/qtlocation b/qtlocation index ea636dd72f8..fa9558d6b3d 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit ea636dd72f823c20c988b05230b7fbf5ea4aca4d +Subproject commit fa9558d6b3d4c54479b0b0399f41f3155a1f2e80 diff --git a/qtlottie b/qtlottie index 0fd4a8f813e..bbf4ffeca62 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 0fd4a8f813e0a0395de2b4374935fe6023d3afce +Subproject commit bbf4ffeca62c40be93239c8ef419ec90734f4bc6 diff --git a/qtmqtt b/qtmqtt index aeac9f7e171..0c56f0a4b30 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit aeac9f7e171205bb9c47eb6479cfd3d31768f312 +Subproject commit 0c56f0a4b3099e5550c59861315117f21b6aba00 diff --git a/qtmultimedia b/qtmultimedia index f68eef36f23..a4fe8f0e187 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit f68eef36f234acfa4e99e1c8ba1d9ed8119a8f44 +Subproject commit a4fe8f0e187935261c60710beb71f7192312d167 diff --git a/qtnetworkauth b/qtnetworkauth index 2f263f7028d..8fba40b2656 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 2f263f7028d2933c5e536c16f5622349053e682d +Subproject commit 8fba40b26563136b648aedc8479c46f3ee9bb3f1 diff --git a/qtopcua b/qtopcua index 7055c65fc10..535ed601a44 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit 7055c65fc10b2fdec80fe957768bdf27f7874ce1 +Subproject commit 535ed601a448f1e9d4e0541af3fd97bfb65f24a2 diff --git a/qtpositioning b/qtpositioning index 7db6885dce3..0fded03c824 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit 7db6885dce399ad7ef47493c612127b71d3b229d +Subproject commit 0fded03c824804ec36c4c87892e9d7bfc4492f23 diff --git a/qtquick3d b/qtquick3d index 575612ae6be..a827b503e38 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 575612ae6be6811226e794e68009db046d7ad780 +Subproject commit a827b503e3815757ee23f1575347cccf04069fde diff --git a/qtquick3dphysics b/qtquick3dphysics index 85f5ad2048d..6d40281fb87 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit 85f5ad2048d5fa11a0d9086cdb6a1dce549b44de +Subproject commit 6d40281fb87c5a27709af8ecee4b4199ab41e0c1 diff --git a/qtquickeffectmaker b/qtquickeffectmaker index e1847e589af..25370591f96 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit e1847e589affcc420c69cbf028f361276aa292a0 +Subproject commit 25370591f96160be2b3db16fb060a8832145c870 diff --git a/qtquicktimeline b/qtquicktimeline index 9e0a9979f2f..9484afcc34b 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 9e0a9979f2fe9eeead3c16311d0e3b8d6d5bbb8d +Subproject commit 9484afcc34bb3348cbc0735c34c5de15fd6b2877 diff --git a/qtremoteobjects b/qtremoteobjects index 392a215a2ad..1340945d331 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 392a215a2ad716b9cc60311da2d8b09af149753e +Subproject commit 1340945d331b221ebaf0c4f10be93ddc4897e05a diff --git a/qtscxml b/qtscxml index 253845885a6..00d5ccff4a5 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 253845885a6e293f0c4dbbd3d53131afd7b88f9c +Subproject commit 00d5ccff4a57069cdd005cefe1c0d4e149822312 diff --git a/qtsensors b/qtsensors index 9a2f543f523..30a218faef2 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 9a2f543f523bfe3519c4b7d2c56b03393d21fe88 +Subproject commit 30a218faef2c11d734bbd6adc91b56f09abcdbbe diff --git a/qtserialbus b/qtserialbus index 19335acb872..72689036bcb 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 19335acb87270d0768609b2e6bf708c7deac14ec +Subproject commit 72689036bcbe2f95eda39f8efe5112d16cdbc4c3 diff --git a/qtserialport b/qtserialport index 125813ab104..c741bd1d9fa 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 125813ab104a417ea168eeda8842ca1a51a4453e +Subproject commit c741bd1d9fa2b059fe458938d08c6dd4143a90f6 diff --git a/qtshadertools b/qtshadertools index ce3904c1b29..68177f41b69 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit ce3904c1b29b8960b623dee229f7fabdc7d14bd0 +Subproject commit 68177f41b697abd2fbb8da76a70a5166121a21f1 diff --git a/qtspeech b/qtspeech index da727c8dcc7..2912cecfbd1 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit da727c8dcc725c0f213e17cf68b2e7616d87ae66 +Subproject commit 2912cecfbd1b176b1d1c30e890bc78d1b2b0deeb diff --git a/qtsvg b/qtsvg index f4de0d25d1f..79155f931c4 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit f4de0d25d1faeb131b5fd6d37bd2ab2cbd27ab47 +Subproject commit 79155f931c40b7a62eec8c28b6d5519698c23391 diff --git a/qttools b/qttools index 3557f0897aa..00c96988539 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 3557f0897aa2624b633a0bb83f1970245de37e1f +Subproject commit 00c96988539e6a4b82ed7c92e9dcd12eb5086bcd diff --git a/qttranslations b/qttranslations index 437e02421dd..b9e36de0cf7 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 437e02421ddfad8ad0480f4ccf20b1abf647acbd +Subproject commit b9e36de0cf7b7c814b3606f2e1a69e04b9cb8d7e diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 8a59f19d1b0..eba380541c0 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 8a59f19d1b0b56fa3430927e4800d278e8d53746 +Subproject commit eba380541c08619bb0a4dd0793574846208d5ea8 diff --git a/qtwayland b/qtwayland index a8018eced50..08bd292e446 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit a8018eced508e2afffba4dfb20d04a23a184d7f9 +Subproject commit 08bd292e446e05f7d64428ed7c6832c7a39a5daa diff --git a/qtwebchannel b/qtwebchannel index a13deb0fbd2..693c09ffdcf 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit a13deb0fbd2f0af0c23311b83c3783ab27140a56 +Subproject commit 693c09ffdcf98f5f9f8c458eabcfde7420d96abc diff --git a/qtwebengine b/qtwebengine index bee04d31444..a4622aead16 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit bee04d31444c6dc2976beee9ad7d974f83633e41 +Subproject commit a4622aead16b879e1b51696cd86e42945e473f66 diff --git a/qtwebsockets b/qtwebsockets index 508323d5093..178c64f5319 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 508323d509354719754e12008b70199fe018d62b +Subproject commit 178c64f531909eacdb6706de6192a142982bfc3d diff --git a/qtwebview b/qtwebview index ac1a751e6f6..83f9ad13bb8 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit ac1a751e6f60748dc2a6bdf54569610fdc432efb +Subproject commit 83f9ad13bb8861480cdfbcf870a99f2545401cd0 From 28e2fcc202b11aff7a586e2f84432d771feea2a5 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 11 Dec 2024 19:00:44 +0000 Subject: [PATCH 03/75] Update submodules on '6.9 in qt/qt5' Change-Id: I119e3f81db18b9376ab7c349d9a2f841c34542df Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qt5compat | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtcharts | 2 +- qtcoap | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgraphs | 2 +- qtgrpc | 2 +- qthttpserver | 2 +- qtimageformats | 2 +- qtlanguageserver | 2 +- qtlocation | 2 +- qtlottie | 2 +- qtmqtt | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtopcua | 2 +- qtpositioning | 2 +- qtquick3d | 2 +- qtquick3dphysics | 2 +- qtquickeffectmaker | 2 +- qtquicktimeline | 2 +- qtremoteobjects | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtshadertools | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- 42 files changed, 42 insertions(+), 42 deletions(-) diff --git a/qt3d b/qt3d index ca46be43f85..5a217e3aad7 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit ca46be43f854ee5cc75e7de98151530da522866a +Subproject commit 5a217e3aad714398b20283e4858a6f7b4f1bb63e diff --git a/qt5compat b/qt5compat index a1f2965ceae..cd0c162bc6a 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit a1f2965ceaeef2f88e21699a32e013cfba4a5081 +Subproject commit cd0c162bc6a65871c614b719ae4180bd97dc794c diff --git a/qtactiveqt b/qtactiveqt index 29a52164d22..66ce265a8c4 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 29a52164d22d626475da33a96c8d0c439266a3d3 +Subproject commit 66ce265a8c4ddec395d0b6fd432bfef95b792d96 diff --git a/qtbase b/qtbase index a77a7c157d5..d0a3db5d93a 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit a77a7c157d5cdcc88bf0a02caed2aa5ff8850d06 +Subproject commit d0a3db5d93abe32e2744843ce0ab6e6c104b080d diff --git a/qtcharts b/qtcharts index 44e97efa0cf..a1390019684 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 44e97efa0cf04169c343fa8956edc9fb5e0f696a +Subproject commit a13900196840b8901269aa4bae00a37984afa931 diff --git a/qtcoap b/qtcoap index 416450db620..acdb5436b51 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit 416450db620e5644c0ca85dbb4bf4fa82e06d381 +Subproject commit acdb5436b516c330995fe38caaa0f025a02401ed diff --git a/qtconnectivity b/qtconnectivity index 7d11fda5fca..b3eee3a0ba7 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 7d11fda5fca4cb02b44a935982b44316e697996d +Subproject commit b3eee3a0ba72a11ee79c301dd4fef8999102f1ec diff --git a/qtdatavis3d b/qtdatavis3d index 9d1b3458383..bd375f29600 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 9d1b3458383a6118b766a261eff56965ee3485e4 +Subproject commit bd375f29600c331bba7e62549a32ba92bf60222f diff --git a/qtdeclarative b/qtdeclarative index 850cdae3054..88a95822835 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 850cdae305401ee8ac8dc17db8797d3ba81f83f4 +Subproject commit 88a958228352c9a489b9c9de5e9f475e0f040f93 diff --git a/qtdoc b/qtdoc index 0e25703a859..d944f73d19a 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 0e25703a859968992d74af991d8652201a81c5b2 +Subproject commit d944f73d19ab35783c9bd22e031ddc0eb2a78d0d diff --git a/qtgraphs b/qtgraphs index 10c285df411..ad8c3947e11 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit 10c285df4112a69ea02a2fe8eca4192f7b02c43b +Subproject commit ad8c3947e119ae4b48c5342f3bcc4460394f8828 diff --git a/qtgrpc b/qtgrpc index 9cdf3c4fe00..c53266bc3c2 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit 9cdf3c4fe0076929280bf481efd9ccebe82147a6 +Subproject commit c53266bc3c296d90b498225c1019a4512ff29583 diff --git a/qthttpserver b/qthttpserver index 9faf9249a50..f9df6fc8474 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit 9faf9249a50f578d3ce3591fbc220bb5bcb92222 +Subproject commit f9df6fc84748044e351f6f0b5f20c3bbfa3c66a7 diff --git a/qtimageformats b/qtimageformats index 27dbcda65ca..240e792ab5d 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 27dbcda65ca8cd68d4ed59cdb904fd2465860406 +Subproject commit 240e792ab5d64b3f19a75d2d4fc5e498fb397b5b diff --git a/qtlanguageserver b/qtlanguageserver index f7c074eaa2a..700d09aa576 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit f7c074eaa2af825d2b56c3dc0fa30eea876fb124 +Subproject commit 700d09aa576e3af016e634e22cc68046f6d4cde4 diff --git a/qtlocation b/qtlocation index fa9558d6b3d..2b136a823fe 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit fa9558d6b3d4c54479b0b0399f41f3155a1f2e80 +Subproject commit 2b136a823fe40a7e8533936bbabbfca6d92220de diff --git a/qtlottie b/qtlottie index bbf4ffeca62..b45f4d778bd 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit bbf4ffeca62c40be93239c8ef419ec90734f4bc6 +Subproject commit b45f4d778bd1a97bdf0d0fceded724bb96f6abea diff --git a/qtmqtt b/qtmqtt index 0c56f0a4b30..92ac9927f43 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit 0c56f0a4b3099e5550c59861315117f21b6aba00 +Subproject commit 92ac9927f430d109b784087c0c07f8e3f9fc95e5 diff --git a/qtmultimedia b/qtmultimedia index a4fe8f0e187..bccfd3e78c1 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit a4fe8f0e187935261c60710beb71f7192312d167 +Subproject commit bccfd3e78c159499ac994f44aa48d3ffbfcd008a diff --git a/qtnetworkauth b/qtnetworkauth index 8fba40b2656..67768569b6b 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 8fba40b26563136b648aedc8479c46f3ee9bb3f1 +Subproject commit 67768569b6b216944de87fe4159500de533b56f0 diff --git a/qtopcua b/qtopcua index 535ed601a44..949a056a0f4 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit 535ed601a448f1e9d4e0541af3fd97bfb65f24a2 +Subproject commit 949a056a0f4335413d11118a42d454f4a0669106 diff --git a/qtpositioning b/qtpositioning index 0fded03c824..89eeaaffc4f 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit 0fded03c824804ec36c4c87892e9d7bfc4492f23 +Subproject commit 89eeaaffc4f28f3136e1f671b121a9444f3ec4c0 diff --git a/qtquick3d b/qtquick3d index a827b503e38..2fa10a3b197 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit a827b503e3815757ee23f1575347cccf04069fde +Subproject commit 2fa10a3b1975daef94a45030ccb5416b833c4c64 diff --git a/qtquick3dphysics b/qtquick3dphysics index 6d40281fb87..256c0a6cc1b 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit 6d40281fb87c5a27709af8ecee4b4199ab41e0c1 +Subproject commit 256c0a6cc1bef4cb9ac6884ea9d7a9e4ffa37841 diff --git a/qtquickeffectmaker b/qtquickeffectmaker index 25370591f96..2f5b3664869 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit 25370591f96160be2b3db16fb060a8832145c870 +Subproject commit 2f5b3664869a425b255aa777f7bf6be68a9bc21d diff --git a/qtquicktimeline b/qtquicktimeline index 9484afcc34b..de81bf12e97 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 9484afcc34bb3348cbc0735c34c5de15fd6b2877 +Subproject commit de81bf12e971f74ef3dc8f1ef09a1bc034cf17db diff --git a/qtremoteobjects b/qtremoteobjects index 1340945d331..8e4d46eea36 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 1340945d331b221ebaf0c4f10be93ddc4897e05a +Subproject commit 8e4d46eea3608c2c7c457ddc062d3348e1dd1c68 diff --git a/qtscxml b/qtscxml index 00d5ccff4a5..bb4c4151c13 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 00d5ccff4a57069cdd005cefe1c0d4e149822312 +Subproject commit bb4c4151c130b21adc1ed7754633566b5eb6f58c diff --git a/qtsensors b/qtsensors index 30a218faef2..ded7a4ef253 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 30a218faef2c11d734bbd6adc91b56f09abcdbbe +Subproject commit ded7a4ef253c4f86673e01f89028e6fa5421cca8 diff --git a/qtserialbus b/qtserialbus index 72689036bcb..27c540ac309 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 72689036bcbe2f95eda39f8efe5112d16cdbc4c3 +Subproject commit 27c540ac3099dc9220f24b3f11108fa19f0e4e7a diff --git a/qtserialport b/qtserialport index c741bd1d9fa..40c860582de 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit c741bd1d9fa2b059fe458938d08c6dd4143a90f6 +Subproject commit 40c860582de4d3c7d40107934eda9255c0324319 diff --git a/qtshadertools b/qtshadertools index 68177f41b69..1ab42d2754a 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 68177f41b697abd2fbb8da76a70a5166121a21f1 +Subproject commit 1ab42d2754a032cea0f7bf0688cb5410c61db459 diff --git a/qtspeech b/qtspeech index 2912cecfbd1..ce83e7e4ab6 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 2912cecfbd1b176b1d1c30e890bc78d1b2b0deeb +Subproject commit ce83e7e4ab6cc9d09dc45d6ec492b69082f619df diff --git a/qtsvg b/qtsvg index 79155f931c4..c5747e0b8b0 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 79155f931c40b7a62eec8c28b6d5519698c23391 +Subproject commit c5747e0b8b0a499284dc705008360f43749f559e diff --git a/qttools b/qttools index 00c96988539..3db436bd65c 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 00c96988539e6a4b82ed7c92e9dcd12eb5086bcd +Subproject commit 3db436bd65c1a5750d7fa5312ae97e4e6ce129f8 diff --git a/qttranslations b/qttranslations index b9e36de0cf7..55d220e0951 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit b9e36de0cf7b7c814b3606f2e1a69e04b9cb8d7e +Subproject commit 55d220e095113aabc4ce2555e3fe9f1fa5c91085 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index eba380541c0..17377a0bb80 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit eba380541c08619bb0a4dd0793574846208d5ea8 +Subproject commit 17377a0bb802cc7459ad6f0eea307dd4dbb482e7 diff --git a/qtwayland b/qtwayland index 08bd292e446..eb878b7a4e9 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 08bd292e446e05f7d64428ed7c6832c7a39a5daa +Subproject commit eb878b7a4e92224edb81b5ca4642b4bbee1ea59c diff --git a/qtwebchannel b/qtwebchannel index 693c09ffdcf..10349613a84 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 693c09ffdcf98f5f9f8c458eabcfde7420d96abc +Subproject commit 10349613a84fb638c46f53fbebaefa2cd0836638 diff --git a/qtwebengine b/qtwebengine index a4622aead16..16bfe00ea77 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit a4622aead16b879e1b51696cd86e42945e473f66 +Subproject commit 16bfe00ea77ad41cd5b201867e9012544051b3bd diff --git a/qtwebsockets b/qtwebsockets index 178c64f5319..0bb59ea08a9 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 178c64f531909eacdb6706de6192a142982bfc3d +Subproject commit 0bb59ea08a952ade244a32916d0c9249e283eda6 diff --git a/qtwebview b/qtwebview index 83f9ad13bb8..74bca93f9c1 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 83f9ad13bb8861480cdfbcf870a99f2545401cd0 +Subproject commit 74bca93f9c1f5e92552e8edfd5afac388a10354f From dc1f9e060a69c8e4c8b8303771c20967aebd2076 Mon Sep 17 00:00:00 2001 From: Ville-Pekka Karhu Date: Thu, 21 Nov 2024 12:43:19 +0200 Subject: [PATCH 04/75] Provisioning: Add Simulator Runtime installation to macOS Task-number: QTQAINFRA-6774 Pick-to: 6.8 Change-Id: I2461911d20ba2fda7b2c53d38b0e688139501e22 Reviewed-by: Jukka Jokiniva (cherry picked from commit 1f6f97a141fbcb84da949e57ce07fc23b271ff0e) Reviewed-by: Qt Cherry-pick Bot --- .../common/macos/install-simulator-runtime.sh | 25 +++++++++++++++++++ .../22-install-simulator-runtime.sh | 14 +++++++++++ .../22-install-simulator-runtime.sh | 14 +++++++++++ .../22-install-simulator-runtime.sh | 14 +++++++++++ .../22-install-simulator-runtime.sh | 14 +++++++++++ 5 files changed, 81 insertions(+) create mode 100755 coin/provisioning/common/macos/install-simulator-runtime.sh create mode 100755 coin/provisioning/qtci-macos-14-arm/22-install-simulator-runtime.sh create mode 100755 coin/provisioning/qtci-macos-14-x86_64/22-install-simulator-runtime.sh create mode 100755 coin/provisioning/qtci-macos-15-arm/22-install-simulator-runtime.sh create mode 100755 coin/provisioning/qtci-macos-15-x86_64/22-install-simulator-runtime.sh diff --git a/coin/provisioning/common/macos/install-simulator-runtime.sh b/coin/provisioning/common/macos/install-simulator-runtime.sh new file mode 100755 index 00000000000..b3d6981339e --- /dev/null +++ b/coin/provisioning/common/macos/install-simulator-runtime.sh @@ -0,0 +1,25 @@ +#!/usr/bin/env bash +# Copyright (C) 2024 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +# shellcheck source=../unix/DownloadURL.sh +source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" +set -ex + +function InstallSimulatorRuntime { + url=$1 + url_alt=$2 + expectedSha1=$3 + packageName=$4 + version=$5 + + DownloadURL "$url" "$url_alt" "$expectedSha1" "/tmp/$packageName" + echo "Installing" + # macOS 14 / Xcode 15 has a different install command + if [[ $OSTYPE == "darwin23" ]]; then + xcrun simctl runtime add "/tmp/$packageName" + else + xcodebuild -importPlatform "/tmp/$packageName" + fi + + echo "Simulator Runtime = $version" >> ~/versions.txt +} diff --git a/coin/provisioning/qtci-macos-14-arm/22-install-simulator-runtime.sh b/coin/provisioning/qtci-macos-14-arm/22-install-simulator-runtime.sh new file mode 100755 index 00000000000..69e3a52d13b --- /dev/null +++ b/coin/provisioning/qtci-macos-14-arm/22-install-simulator-runtime.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env bash +# Copyright (C) 2024 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only + +set -ex + +# shellcheck source=../common/macos/install-simulator-runtime.sh +source "${BASH_SOURCE%/*}/../common/macos/install-simulator-runtime.sh" +version="17.4" +packageName=iOS_"$version"_Simulator_Runtime.dmg +url="http://ci-files01-hki.ci.qt.io/input/mac/$packageName" +sha1="7b930c544403806f3a4f99bb48e80f4ef1533f50" + +InstallSimulatorRuntime $url $url $sha1 $packageName $version diff --git a/coin/provisioning/qtci-macos-14-x86_64/22-install-simulator-runtime.sh b/coin/provisioning/qtci-macos-14-x86_64/22-install-simulator-runtime.sh new file mode 100755 index 00000000000..69e3a52d13b --- /dev/null +++ b/coin/provisioning/qtci-macos-14-x86_64/22-install-simulator-runtime.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env bash +# Copyright (C) 2024 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only + +set -ex + +# shellcheck source=../common/macos/install-simulator-runtime.sh +source "${BASH_SOURCE%/*}/../common/macos/install-simulator-runtime.sh" +version="17.4" +packageName=iOS_"$version"_Simulator_Runtime.dmg +url="http://ci-files01-hki.ci.qt.io/input/mac/$packageName" +sha1="7b930c544403806f3a4f99bb48e80f4ef1533f50" + +InstallSimulatorRuntime $url $url $sha1 $packageName $version diff --git a/coin/provisioning/qtci-macos-15-arm/22-install-simulator-runtime.sh b/coin/provisioning/qtci-macos-15-arm/22-install-simulator-runtime.sh new file mode 100755 index 00000000000..470bae9011b --- /dev/null +++ b/coin/provisioning/qtci-macos-15-arm/22-install-simulator-runtime.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env bash +# Copyright (C) 2024 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only + +set -ex + +# shellcheck source=../common/macos/install-simulator-runtime.sh +source "${BASH_SOURCE%/*}/../common/macos/install-simulator-runtime.sh" +version="18.0" +packageName=iOS_"$version"_Simulator_Runtime.dmg +url="http://ci-files01-hki.ci.qt.io/input/mac/$packageName" +sha1="f29778313459b3a2a497ffd711b9dfa212241183" + +InstallSimulatorRuntime $url $url $sha1 $packageName $version diff --git a/coin/provisioning/qtci-macos-15-x86_64/22-install-simulator-runtime.sh b/coin/provisioning/qtci-macos-15-x86_64/22-install-simulator-runtime.sh new file mode 100755 index 00000000000..470bae9011b --- /dev/null +++ b/coin/provisioning/qtci-macos-15-x86_64/22-install-simulator-runtime.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env bash +# Copyright (C) 2024 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only + +set -ex + +# shellcheck source=../common/macos/install-simulator-runtime.sh +source "${BASH_SOURCE%/*}/../common/macos/install-simulator-runtime.sh" +version="18.0" +packageName=iOS_"$version"_Simulator_Runtime.dmg +url="http://ci-files01-hki.ci.qt.io/input/mac/$packageName" +sha1="f29778313459b3a2a497ffd711b9dfa212241183" + +InstallSimulatorRuntime $url $url $sha1 $packageName $version From ab25d7a08b4e124c0b2db9f8ecd502c5bfae1804 Mon Sep 17 00:00:00 2001 From: Tero Heikkinen Date: Tue, 10 Dec 2024 12:55:59 +0200 Subject: [PATCH 05/75] Extend usage of pin cores feature for all targets running tests Extending feature usage with newest and recently added CI platforms - openSUSE 15.6 - SLES 15 SP6 The feature enables 1:1 pinning of CPU cores for VM, which should mean more stable CPU allocation from host and fewer sporadic failure. The down side of this is that the targets will effectively use double the capacity from the host that they previously would. It is to be seen how effective this is in reducing flakiness, which would counter the increased usage by reducing staging needed. In Coin the feature is limited so that it only affects test VMs. (Amends cf237ca8dc6e4bf111218d511f1f434189fbbf01) Task-number: QTQAINFRA-6702 Change-Id: I34f76b127899a878ef2ddf8f3c09904d8e21f493 Reviewed-by: Heikki Halmet (cherry picked from commit 1c4e0928ffb36e049f0d293a65dbcd67e3555398) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/address_sanitizer_platforms.yaml | 2 +- coin/platform_configs/cmake_platforms.yaml | 2 +- coin/platform_configs/cmake_platforms_static_tests.yaml | 2 +- coin/platform_configs/wasm_qtbase_tests.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/coin/platform_configs/address_sanitizer_platforms.yaml b/coin/platform_configs/address_sanitizer_platforms.yaml index d42ebfbb838..f38a6d6f9c1 100644 --- a/coin/platform_configs/address_sanitizer_platforms.yaml +++ b/coin/platform_configs/address_sanitizer_platforms.yaml @@ -14,7 +14,7 @@ Configurations: Id: 'opensuse-15.6-host-asan' Template: 'qtci-linux-openSUSE-15.6-x86_64-51' Compiler: 'GCC' - Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure', 'UseAddressSanitizer', 'InsignificantTests'] + Features: ['PinCores', 'Sccache', 'WarningsAreErrors', 'UseConfigure', 'UseAddressSanitizer', 'InsignificantTests'] Configure arguments: '-nomake examples -developer-build' Environment variables: [ 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}', diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 91f02d252bb..bce2822d7cc 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -122,7 +122,7 @@ Configurations: Id: 'opensuse-15.6-developer-build' Template: 'qtci-linux-openSUSE-15.6-x86_64-51' Compiler: 'GCC' - Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure', 'InsignificantTests'] + Features: ['PinCores', 'Sccache', 'WarningsAreErrors', 'UseConfigure', 'InsignificantTests'] Configure arguments: '-nomake examples -developer-build' Environment variables: [ 'PATH={{.Env.CMAKE_MIN_SUPPORTED_BIN_PATH}}:{{.Env.PATH}}', diff --git a/coin/platform_configs/cmake_platforms_static_tests.yaml b/coin/platform_configs/cmake_platforms_static_tests.yaml index ac5dbd22e12..25bed53ebb5 100644 --- a/coin/platform_configs/cmake_platforms_static_tests.yaml +++ b/coin/platform_configs/cmake_platforms_static_tests.yaml @@ -13,7 +13,7 @@ Configurations: Id: 'sles-15_sp6-minimal-static' Template: 'qtci-linux-SLES-15_SP6-x86_64-51' Compiler: 'GCC' - Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure', 'InsignificantTests'] + Features: ['PinCores', 'Sccache', 'MinimalStaticTests', 'UseConfigure', 'InsignificantTests'] Configure arguments: '-nomake examples -static -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer' Environment variables: [ 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}' diff --git a/coin/platform_configs/wasm_qtbase_tests.yaml b/coin/platform_configs/wasm_qtbase_tests.yaml index 36c897a79cc..a0ed2e828c8 100644 --- a/coin/platform_configs/wasm_qtbase_tests.yaml +++ b/coin/platform_configs/wasm_qtbase_tests.yaml @@ -12,5 +12,5 @@ Configurations: Template: 'qtci-linux-openSUSE-15.6-x86_64-51' Target os: 'WebAssembly' Compiler: 'GCC' - Features: ['Sccache', 'TestOnly'] + Features: ['PinCores', 'Sccache', 'TestOnly'] Platform dependency: 'webassembly-linux-thread-asyncify-openSUSE-15.6' From e583a0928b2eebadbae24affafd1672599e7d771 Mon Sep 17 00:00:00 2001 From: Tero Heikkinen Date: Tue, 10 Dec 2024 13:34:28 +0200 Subject: [PATCH 06/75] Make openSUSE 15.6 tests as blocking in CI [CI Platforms] Task-number: QTQAINFRA-6740 Change-Id: I844ef1e36d99a9cee2aaa5abf2050ed30b7e043f Reviewed-by: Heikki Halmet (cherry picked from commit d3ff4a42f60bc864a305a92c479f3e1f4aeb3a33) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/address_sanitizer_platforms.yaml | 2 +- coin/platform_configs/cmake_platforms.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/platform_configs/address_sanitizer_platforms.yaml b/coin/platform_configs/address_sanitizer_platforms.yaml index f38a6d6f9c1..285aa70d869 100644 --- a/coin/platform_configs/address_sanitizer_platforms.yaml +++ b/coin/platform_configs/address_sanitizer_platforms.yaml @@ -14,7 +14,7 @@ Configurations: Id: 'opensuse-15.6-host-asan' Template: 'qtci-linux-openSUSE-15.6-x86_64-51' Compiler: 'GCC' - Features: ['PinCores', 'Sccache', 'WarningsAreErrors', 'UseConfigure', 'UseAddressSanitizer', 'InsignificantTests'] + Features: ['PinCores', 'Sccache', 'WarningsAreErrors', 'UseConfigure', 'UseAddressSanitizer'] Configure arguments: '-nomake examples -developer-build' Environment variables: [ 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}', diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index bce2822d7cc..72eddeb86b9 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -122,7 +122,7 @@ Configurations: Id: 'opensuse-15.6-developer-build' Template: 'qtci-linux-openSUSE-15.6-x86_64-51' Compiler: 'GCC' - Features: ['PinCores', 'Sccache', 'WarningsAreErrors', 'UseConfigure', 'InsignificantTests'] + Features: ['PinCores', 'Sccache', 'WarningsAreErrors', 'UseConfigure'] Configure arguments: '-nomake examples -developer-build' Environment variables: [ 'PATH={{.Env.CMAKE_MIN_SUPPORTED_BIN_PATH}}:{{.Env.PATH}}', From 1ff24549420f7ca8f15fb38db3529ce8419387d6 Mon Sep 17 00:00:00 2001 From: Tero Heikkinen Date: Tue, 10 Dec 2024 13:50:16 +0200 Subject: [PATCH 07/75] Remove openSUSE 15.5 from CI openSUSE 15.6 is replacing openSUSE 15.5 [CI Platforms] Task-number: QTQAINFRA-6740 Change-Id: I7b1fcced5d27533c9d42c290e6f0106bdf35dfd6 Reviewed-by: Jukka Jokiniva (cherry picked from commit 54c7225ed4a34ad497edf24b0c46318b409bd1b7) Reviewed-by: Qt Cherry-pick Bot --- .../address_sanitizer_platforms.yaml | 10 ----- coin/platform_configs/cmake_platforms.yaml | 11 ----- .../cmake_platforms_wasm.yaml | 40 +------------------ .../qtsaferenderer-runtime.yaml | 1 - coin/platform_configs/qtsaferenderer.yaml | 1 - coin/platform_configs/wasm_qtbase_tests.yaml | 9 +---- 6 files changed, 2 insertions(+), 70 deletions(-) diff --git a/coin/platform_configs/address_sanitizer_platforms.yaml b/coin/platform_configs/address_sanitizer_platforms.yaml index 285aa70d869..ec06c821fef 100644 --- a/coin/platform_configs/address_sanitizer_platforms.yaml +++ b/coin/platform_configs/address_sanitizer_platforms.yaml @@ -1,15 +1,5 @@ Version: 2 Configurations: -- - Id: 'opensuse-15.5-host-asan' - Template: 'qtci-linux-openSUSE-15.5-x86_64-52' - Compiler: 'GCC' - Features: ['PinCores', 'Sccache', 'WarningsAreErrors', 'UseConfigure', 'UseAddressSanitizer'] - Configure arguments: '-nomake examples -developer-build' - Environment variables: [ - 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}', - 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE' - ] - Id: 'opensuse-15.6-host-asan' Template: 'qtci-linux-openSUSE-15.6-x86_64-51' diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 72eddeb86b9..e143636d540 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -107,17 +107,6 @@ Configurations: Compiler: 'GCC' Features: ['PinCores', 'Sccache', 'TestOnly', 'InsignificantTests'] Platform dependency: 'ubuntu-24.04-x64' -- - Id: 'opensuse-15.5-developer-build' - Template: 'qtci-linux-openSUSE-15.5-x86_64-52' - Compiler: 'GCC' - Features: ['PinCores', 'Sccache', 'WarningsAreErrors', 'UseConfigure'] - Configure arguments: '-nomake examples -developer-build' - Environment variables: [ - 'PATH={{.Env.CMAKE_MIN_SUPPORTED_BIN_PATH}}:{{.Env.PATH}}', - 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}', - 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE' - ] - Id: 'opensuse-15.6-developer-build' Template: 'qtci-linux-openSUSE-15.6-x86_64-51' diff --git a/coin/platform_configs/cmake_platforms_wasm.yaml b/coin/platform_configs/cmake_platforms_wasm.yaml index 4ee7839ef1d..3fa4b9632d2 100644 --- a/coin/platform_configs/cmake_platforms_wasm.yaml +++ b/coin/platform_configs/cmake_platforms_wasm.yaml @@ -2,18 +2,6 @@ Version: 2 Configurations: - Id: 'webassembly-linux-thread-asyncify' - Template: 'qtci-linux-openSUSE-15.5-x86_64-52' - Target os: 'WebAssembly' - Compiler: 'GCC' - Platform dependency: 'opensuse-15.5-developer-build' - Features: ['Sccache', 'DoNotRunTests', 'UseConfigure'] - Environment variables: [ - 'EM_CONFIG={{.Env.EMSDK}}/.emscripten', - "TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples -feature-thread \ - -feature-exceptions -DQT_QMAKE_DEVICE_OPTIONS=\"QT_EMSCRIPTEN_ASYNCIFY=1\"" - ] -- - Id: 'webassembly-linux-thread-asyncify-openSUSE-15.6' Template: 'qtci-linux-openSUSE-15.6-x86_64-51' Target os: 'WebAssembly' Compiler: 'GCC' @@ -41,24 +29,11 @@ Configurations: ] - Id: 'webassembly-linux-thread' - Template: 'qtci-linux-openSUSE-15.5-x86_64-52' - Target os: 'WebAssembly' - Compiler: 'GCC' - Platform dependency: 'opensuse-15.5-developer-build' - Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] - Environment variables: [ - 'EM_CONFIG={{.Env.EMSDK}}/.emscripten', - 'TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples -feature-thread', - 'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH=/usr/local -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', - 'TARGET_CMAKE_ARGS=-DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON' - ] -- - Id: 'webassembly-linux-thread-openSUSE-15.6' Template: 'qtci-linux-openSUSE-15.6-x86_64-51' Target os: 'WebAssembly' Compiler: 'GCC' Platform dependency: 'opensuse-15.6-developer-build' - Features: ['Sccache', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] + Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] Environment variables: [ 'EM_CONFIG={{.Env.EMSDK}}/.emscripten', 'TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples -feature-thread', @@ -67,19 +42,6 @@ Configurations: ] - Id: 'webassembly-linux-shared' - Template: 'qtci-linux-openSUSE-15.5-x86_64-52' - Target os: 'WebAssembly' - Compiler: 'GCC' - Platform dependency: 'opensuse-15.5-developer-build' - Features: ['Sccache', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] - Environment variables: [ - 'EM_CONFIG={{.Env.EMSDK}}/.emscripten', - 'TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -no-feature-thread -nomake tests -nomake examples -shared', - 'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH=/usr/local -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', - 'TARGET_CMAKE_ARGS=-DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON' - ] -- - Id: 'webassembly-linux-shared-openSUSE-15.6' Template: 'qtci-linux-openSUSE-15.6-x86_64-51' Target os: 'WebAssembly' Compiler: 'GCC' diff --git a/coin/platform_configs/qtsaferenderer-runtime.yaml b/coin/platform_configs/qtsaferenderer-runtime.yaml index f33170f1763..3a3e93ff21f 100644 --- a/coin/platform_configs/qtsaferenderer-runtime.yaml +++ b/coin/platform_configs/qtsaferenderer-runtime.yaml @@ -8,7 +8,6 @@ Include: [ cmake_platforms.yaml: [ "ubuntu-22.04", "ubuntu-22.04-developer-build", - "opensuse-15.5-developer-build", "opensuse-15.6-developer-build", "sles-15_sp5-static", "sles-15_sp6-static", diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index ed3db97f0c2..14fde3597cc 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -8,7 +8,6 @@ Include: [ cmake_platforms.yaml: [ "ubuntu-22.04", "ubuntu-22.04-developer-build", - "opensuse-15.5-developer-build", "opensuse-15.6-developer-build", "sles-15_sp5-static", "sles-15_sp6-static", diff --git a/coin/platform_configs/wasm_qtbase_tests.yaml b/coin/platform_configs/wasm_qtbase_tests.yaml index a0ed2e828c8..b268c58f506 100644 --- a/coin/platform_configs/wasm_qtbase_tests.yaml +++ b/coin/platform_configs/wasm_qtbase_tests.yaml @@ -2,15 +2,8 @@ Version: 2 Configurations: - Id: 'webassembly-linux-thread-asyncify-tests' - Template: 'qtci-linux-openSUSE-15.5-x86_64-52' - Target os: 'WebAssembly' - Compiler: 'GCC' - Features: ['PinCores', 'Sccache', 'TestOnly'] - Platform dependency: 'webassembly-linux-thread-asyncify' -- - Id: 'webassembly-linux-thread-asyncify-tests-openSUSE-15.6' Template: 'qtci-linux-openSUSE-15.6-x86_64-51' Target os: 'WebAssembly' Compiler: 'GCC' Features: ['PinCores', 'Sccache', 'TestOnly'] - Platform dependency: 'webassembly-linux-thread-asyncify-openSUSE-15.6' + Platform dependency: 'webassembly-linux-thread-asyncify' From d619cb643ae804689abff94961f6e291a0d91a77 Mon Sep 17 00:00:00 2001 From: Toni Saario Date: Thu, 28 Nov 2024 13:44:43 +0200 Subject: [PATCH 08/75] Make VxWorks tests more significant MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This makes ARM target tests significant for qtbase, qtgraphs and qtgrpc. Intel target tests for qtgraphs, qtgrpc, qtlanguageserver, qtquicktimeline, qtmultimedia, qtshadertools and qtsvg. Change-Id: I4ae3591dacb21207d5aaf65c1fdff4fd19c3903c Reviewed-by: Tero Heikkinen Reviewed-by: Simo Fält (cherry picked from commit 90071f1d7c726c1a29b013b39fdc333ee04ef475) Reviewed-by: Qt Cherry-pick Bot --- .../cmake_platforms_qemu_vxworks_tests_static.yaml | 2 +- coin/platform_configs/qtbase.yaml | 3 --- coin/platform_configs/qtgraphs.yaml | 5 ----- coin/platform_configs/qtgrpc.yaml | 5 ----- 4 files changed, 1 insertion(+), 14 deletions(-) diff --git a/coin/platform_configs/cmake_platforms_qemu_vxworks_tests_static.yaml b/coin/platform_configs/cmake_platforms_qemu_vxworks_tests_static.yaml index 278196f0e3e..0d11679464a 100644 --- a/coin/platform_configs/cmake_platforms_qemu_vxworks_tests_static.yaml +++ b/coin/platform_configs/cmake_platforms_qemu_vxworks_tests_static.yaml @@ -23,7 +23,7 @@ Configurations: Compiler: 'Clang' Target compiler: 'Clang' Platform dependency: 'vxworks-x86_64-buildtest' - Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests'] + Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly'] Environment variables: [ 'WIND_CC_SYSROOT=/opt/itl_generic_skylake_VSB', 'VXWORKS_TEST_LIBS_PATH=/opt/itl_generic_skylake_VSB/usr/lib/common;/opt/itl_generic_skylake_VSB/usr/root/llvm/bin;/opt/itl_generic_skylake_VSB/usr/3pp/develop/usr/lib;/home/qt/work/install/target/lib', diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml index eea3b14164c..bc4c2ee6079 100644 --- a/coin/platform_configs/qtbase.yaml +++ b/coin/platform_configs/qtbase.yaml @@ -15,9 +15,6 @@ Include: [ Configurations: [] Overrides: # Make VxWorks tests insignificant. -- - Id: 'vxworks-imx6-tests' - Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests'] - Id: 'vxworks-x86_64-tests' Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests'] diff --git a/coin/platform_configs/qtgraphs.yaml b/coin/platform_configs/qtgraphs.yaml index 4f61e54aa13..be582f53341 100644 --- a/coin/platform_configs/qtgraphs.yaml +++ b/coin/platform_configs/qtgraphs.yaml @@ -6,8 +6,3 @@ Include: [ address_sanitizer_platforms.yaml ] Configurations: [] -Overrides: -# Make VxWorks arm tests insignificant. -- - Id: 'vxworks-imx6-tests' - Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests'] diff --git a/coin/platform_configs/qtgrpc.yaml b/coin/platform_configs/qtgrpc.yaml index e6108d6209d..f2967349845 100644 --- a/coin/platform_configs/qtgrpc.yaml +++ b/coin/platform_configs/qtgrpc.yaml @@ -6,8 +6,3 @@ Include: [ address_sanitizer_platforms.yaml ] Configurations: [] -Overrides: -# Make VxWorks arm tests insignificant. -- - Id: 'vxworks-imx6-tests' - Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests'] From 22ae1bb5eec41c426dce4334e3e7a2ceb74cbd44 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 4 Dec 2024 18:48:07 +0100 Subject: [PATCH 09/75] init-repository: Normalize git urls with more than one '../' segment The qttools qlitehtml submodule url was recently updated to use a relative url like '../../playground/qlitehtml.git' instead of an absolute path to code.qt.io repo. Same for the nested litehtml submodule. This broke initialization of the qttools repository, because the init-repository script only normalized one '../' segment in the submodule url, instead of all of them, which ended up trying to clone a non-existent git://code.qt.io/qt/../playground/qlitehtml.git repo. Apply the url normalization in all the code paths where there might still be '../' segments in the url. Pick-to: 6.8 Change-Id: Iaa8e58104c92858318ad66aefa5a38d63ad7a155 Reviewed-by: Joerg Bornemann (cherry picked from commit ff25d705a346a06f77b14c64266cb02528871bff) Reviewed-by: Qt Cherry-pick Bot --- cmake/QtIRGitHelpers.cmake | 25 ++++++-- cmake/QtIRParsingHelpers.cmake | 111 ++++++++++++++++++++++++++------- 2 files changed, 110 insertions(+), 26 deletions(-) diff --git a/cmake/QtIRGitHelpers.cmake b/cmake/QtIRGitHelpers.cmake index 288f4ac78fb..d851b65a31e 100644 --- a/cmake/QtIRGitHelpers.cmake +++ b/cmake/QtIRGitHelpers.cmake @@ -93,9 +93,15 @@ function(qt_ir_run_git_submodule_init submodules working_directory) qt_ir_setup_commit_template("${working_directory}" "${working_directory}") endfunction() -# Add gerrit remotes to the repository. -function(qt_ir_add_git_remotes repo_name working_directory) - set(gerrit_ssh_base "ssh://@USER@codereview.qt-project.org@PORT@/qt/") +# Add gerrit remotes to the repository located in the working_directory. +# repo_relative_url is the relative URL of the repository. +# Examples: +# - qt5 +# - qttools.git +# - ../playground/qlitehtml.git +# - ../qt/qttools-litehtml.git +function(qt_ir_add_git_remotes repo_relative_url working_directory) + set(gerrit_ssh_base "ssh://@USER@codereview.qt-project.org@PORT@/") set(gerrit_repo_url "${gerrit_ssh_base}") qt_ir_get_option_value(codereview-username username) @@ -110,7 +116,10 @@ function(qt_ir_add_git_remotes repo_name working_directory) string(REPLACE "@PORT@" "" gerrit_repo_url "${gerrit_repo_url}") endif() - string(APPEND gerrit_repo_url "${repo_name}") + set(namespace "qt") + set(repo_relative_url_with_namespace "${namespace}/${repo_relative_url}") + qt_ir_normalize_git_url("http://github.com/$%7Brepo_relative_url_with_namespace%7D%22%20normalized_url) + string(APPEND gerrit_repo_url "${normalized_url}") qt_ir_execute_process_and_log_and_handle_error( COMMAND_ARGS git config remote.gerrit.url "${gerrit_repo_url}" @@ -193,15 +202,21 @@ function(qt_ir_clone_one_submodule submodule_name) set(submodule_base_git_path "${${prefix}_${submodule_name}_base_git_path}") set(submodule_url "${submodule_base_git_path}") - qt_ir_has_url_scheme("${submodule_url}" has_url_scheme) + qt_ir_parse_git_url( + URL "${submodule_url}" + OUT_VAR_HAS_URL_SCHEME has_url_scheme + ) + if(NOT has_url_scheme AND arg_BASE_URL) set(submodule_url "${arg_BASE_URL}${submodule_url}") + qt_ir_normalize_git_url("http://github.com/$%7Bsubmodule_url%7D%22%20submodule_url) endif() qt_ir_get_mirror(mirror_url) set(mirror "") if(NOT has_url_scheme AND mirror_url AND (should_clone OR arg_FETCH)) set(mirror "${mirror_url}${submodule_base_git_path}") + qt_ir_normalize_git_url("http://github.com/$%7Bmirror%7D%22%20mirror) endif() set(mirror_or_original_url "${submodule_url}") diff --git a/cmake/QtIRParsingHelpers.cmake b/cmake/QtIRParsingHelpers.cmake index d7d3f20e9d3..04a344234f5 100644 --- a/cmake/QtIRParsingHelpers.cmake +++ b/cmake/QtIRParsingHelpers.cmake @@ -40,18 +40,79 @@ function(qt_ir_get_git_config_contents out_var) set(${out_var} "${git_output}" PARENT_SCOPE) endfunction() -# Checks whether the given url has a scheme like https:// or is just a -# relative path. -function(qt_ir_has_url_scheme url out_var) - string(REGEX MATCH "^[a-z][a-z0-9+\-.]*://" has_url_scheme "${url}") +# Parses a git repo url to: +# - check if the given url has a scheme like https:// or git:// or is just a +# relative path with no scheme (possibly containing '../' segments) +# - extracts the scheme if it exists +# - extracts the url without the scheme +function(qt_ir_parse_git_url) + set(options "") + set(oneValueArgs + URL + OUT_VAR_HAS_URL_SCHEME + OUT_VAR_SCHEME + OUT_VAR_URL_WITHOUT_SCHEME + ) + set(multiValueArgs "") + cmake_parse_arguments(arg "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) - if(has_url_scheme) - set(${out_var} TRUE PARENT_SCOPE) + string(REGEX MATCH "^([a-z][a-z0-9+\-.]*://)(.+)" url_scheme_match "${arg_URL}") + + if(url_scheme_match) + set(has_url_scheme TRUE) + set(scheme "${CMAKE_MATCH_1}") + set(url_without_scheme "${CMAKE_MATCH_2}") else() - set(${out_var} FALSE PARENT_SCOPE) + set(has_url_scheme FALSE) + set(scheme "") + set(url_without_scheme "${url}") + endif() + + if(arg_OUT_VAR_HAS_URL_SCHEME) + set(${arg_OUT_VAR_HAS_URL_SCHEME} "${has_url_scheme}" PARENT_SCOPE) + endif() + + if(arg_OUT_VAR_SCHEME) + set(${arg_OUT_VAR_SCHEME} "${scheme}" PARENT_SCOPE) + endif() + + if(arg_OUT_VAR_URL_WITHOUT_SCHEME) + set(${arg_OUT_VAR_URL_WITHOUT_SCHEME} "${url_without_scheme}" PARENT_SCOPE) endif() endfunction() +# Normalizes a url that contains '../' path segments. +# Removes the '../' segments and the directories that they precede. +# Example: +# git://code.qt.io/qt/../playground/qlitehtml.git +# will be normalized to: +# git://code.qt.io/playground/qlitehtml.git +function(qt_ir_normalize_git_url url out_var) + # The exact perl code was while ($base =~ s,(?!\.\./)[^/]+/\.\./,,g) {} + # That got rid of ../ and ../../ in the path, but it broke down + # when more than two '../' segments were present. + # + # In CMake, we instead parse the url to get the non-scheme suffix, + # use get_filename_component(ABSOLUTE) to resolve the url as if it was a relative path + # and then re-add the scheme if it was present. + qt_ir_parse_git_url( + URL "${url}" + OUT_VAR_HAS_URL_SCHEME has_url_scheme + OUT_VAR_SCHEME url_scheme + OUT_VAR_URL_WITHOUT_SCHEME url_without_scheme + ) + + # Note the empty BASE_DIR is important, otherwise the path is relative to + # ${CMAKE_CURRENT_SOURCE_DIR}. + get_filename_component(normalized_url "${url_without_scheme}" ABSOLUTE BASE_DIR "") + + if(has_url_scheme) + string(PREPEND normalized_url "${url_scheme}") + endif() + + set(${out_var} "${normalized_url}" PARENT_SCOPE) +endfunction() + # Parses a key-value line from a .git/config or .gitmodules file macro(qt_ir_parse_git_key_value) string(REGEX REPLACE "^submodule\\.([^.=]+)\\.([^.=]+)=(.*)$" "\\1;\\2;\\3" @@ -79,14 +140,22 @@ endmacro() # url_value # the url where to clone a repo from # in perl script it was called $base -# e.g. '../qtbase.git', 'https://code.qt.io/playground/qlitehtml.git' +# Examples: +# - '../qtbase.git' +# - 'https://code.qt.io/playground/qlitehtml.git' +# - '../../playground/qlitehtml.git' # parent_repo_base_git_path # the base git path of the parent of the submodule # it is either a relative dir or a full url # in the perl script it was called $my_repo_base, # it was passed as first arg to git_clone_all_submodules, # it was passed the value of $subbases{$module} when doing recursive submodule cloning -# e.g. 'qt5', 'tqtc-qt5', 'qtdeclarative.git', 'https://code.qt.io/playground/qlitehtml.git' +# Examples: +# - 'qt5' +# - 'tqtc-qt5' +# - 'qtdeclarative.git' +# - 'qttools.git' +# - 'https://code.qt.io/playground/qlitehtml.git' # # Outputs # @@ -94,21 +163,21 @@ endmacro() # just the value of ${url_value} # ${out_var_prefix}_${submodule_name}_base_git_path # the whole url if it has a scheme, otherwise it's the value of -# ${url_value} relative to ${parent_repo_base_git_path}, so all the ../ are collapsed -# e.g. 'qtdeclarative.git' -# 'https://code.qt.io/playground/qlitehtml.git', +# ${url_value} relative to ${parent_repo_base_git_path}, so some of the '../' segments +# are collapsed depending on how many path segments are available in +# ${parent_repo_base_git_path}. +# Examples: +# - 'qtdeclarative.git' +# - 'https://code.qt.io/playground/qlitehtml.git' +# - '../playground/qlitehtml.git' macro(qt_ir_parse_git_url_key out_var_prefix submodule_name url_value parent_repo_base_git_path) - qt_ir_has_url_scheme("${url_value}" has_url_scheme) + qt_ir_parse_git_url( + URL "${url_value}" + OUT_VAR_HAS_URL_SCHEME has_url_scheme + ) if(NOT has_url_scheme) set(base_git_path "${parent_repo_base_git_path}/${url_value}") - - # The exact code perl code was while ($base =~ s,(?!\.\./)[^/]+/\.\./,,g) {} - # That got rid of ../ and ../../ in the path, but it broke down - # when more than two ../ were present. - # We just use ABSOLUTE to resolve the path and get rid of all ../ - # Note the empty BASE_DIR is important, otherwise the path is relative to - # ${CMAKE_CURRENT_SOURCE_DIR}. - get_filename_component(base_git_path "${base_git_path}" ABSOLUTE BASE_DIR "") + qt_ir_normalize_git_url("http://github.com/$%7Bbase_git_path%7D%22%20base_git_path) else() set(base_git_path "${url_value}") endif() From 5622b33626c537ea9a093f0e8a167b73331880d6 Mon Sep 17 00:00:00 2001 From: Tero Heikkinen Date: Tue, 10 Dec 2024 14:41:55 +0200 Subject: [PATCH 10/75] wasm: enable exceptions for autotests build for openSUSE 15.6 Qt auto tests now require exceptions due to usage of QTEST_THROW_ON_FAIL and QTEST_THROW_ON_SKIP. (Amends 72e234197139a72d42b2b0ac5c9303f9dae66ac4) Task-number: QTBUG-121822 Change-Id: I175ce8459660465477a0ac29d65353c871df69b9 Reviewed-by: Toni Saario (cherry picked from commit 565847e632a5ff3e6ee0f6255c6c66291516e4bc) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/cmake_platforms_wasm.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/cmake_platforms_wasm.yaml b/coin/platform_configs/cmake_platforms_wasm.yaml index 3fa4b9632d2..a780d234484 100644 --- a/coin/platform_configs/cmake_platforms_wasm.yaml +++ b/coin/platform_configs/cmake_platforms_wasm.yaml @@ -10,7 +10,7 @@ Configurations: Environment variables: [ 'EM_CONFIG={{.Env.EMSDK}}/.emscripten', "TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples -feature-thread \ - -DQT_QMAKE_DEVICE_OPTIONS=\"QT_EMSCRIPTEN_ASYNCIFY=1\"" + -feature-exceptions -DQT_QMAKE_DEVICE_OPTIONS=\"QT_EMSCRIPTEN_ASYNCIFY=1\"" ] - Id: 'webassembly-windows' From d23693dc5ee845e7652d8823f334118f238f86f7 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 21 Dec 2024 02:18:43 +0000 Subject: [PATCH 11/75] Update submodules on '6.9 in qt/qt5' Change-Id: Iaa6552accab0f2073893c85ab1b5e9c113be570e Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qt5compat | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtcharts | 2 +- qtcoap | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgraphs | 2 +- qtgrpc | 2 +- qthttpserver | 2 +- qtimageformats | 2 +- qtlanguageserver | 2 +- qtlocation | 2 +- qtlottie | 2 +- qtmqtt | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtopcua | 2 +- qtpositioning | 2 +- qtquick3d | 2 +- qtquick3dphysics | 2 +- qtquickeffectmaker | 2 +- qtquicktimeline | 2 +- qtremoteobjects | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtshadertools | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- 42 files changed, 42 insertions(+), 42 deletions(-) diff --git a/qt3d b/qt3d index 5a217e3aad7..c4a1b6eae95 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 5a217e3aad714398b20283e4858a6f7b4f1bb63e +Subproject commit c4a1b6eae9555d69d0fed9d161d485c05b903b99 diff --git a/qt5compat b/qt5compat index cd0c162bc6a..d37ec670685 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit cd0c162bc6a65871c614b719ae4180bd97dc794c +Subproject commit d37ec670685f1c1a6de5a388c66db855c64b58d3 diff --git a/qtactiveqt b/qtactiveqt index 66ce265a8c4..d69388b0d55 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 66ce265a8c4ddec395d0b6fd432bfef95b792d96 +Subproject commit d69388b0d55ac60a9603c84d638790a7095e15d1 diff --git a/qtbase b/qtbase index d0a3db5d93a..e63884c5933 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit d0a3db5d93abe32e2744843ce0ab6e6c104b080d +Subproject commit e63884c5933d0a5c63fbbe27af85afd6feb61e89 diff --git a/qtcharts b/qtcharts index a1390019684..8b64d35d160 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit a13900196840b8901269aa4bae00a37984afa931 +Subproject commit 8b64d35d160d0b2ca9d0acf937bf95e16c430031 diff --git a/qtcoap b/qtcoap index acdb5436b51..e8d88717bd8 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit acdb5436b516c330995fe38caaa0f025a02401ed +Subproject commit e8d88717bd89004774e92db735df7237f5cd2f45 diff --git a/qtconnectivity b/qtconnectivity index b3eee3a0ba7..e1ce5cbbe79 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit b3eee3a0ba72a11ee79c301dd4fef8999102f1ec +Subproject commit e1ce5cbbe790fb2fa3c75ef949d376f806323c7d diff --git a/qtdatavis3d b/qtdatavis3d index bd375f29600..130babe132c 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit bd375f29600c331bba7e62549a32ba92bf60222f +Subproject commit 130babe132c5e348a6bf134c6d84b5e7846c644a diff --git a/qtdeclarative b/qtdeclarative index 88a95822835..6d5999e152f 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 88a958228352c9a489b9c9de5e9f475e0f040f93 +Subproject commit 6d5999e152f31c098f58d2f1ff52fcd583a9ea8f diff --git a/qtdoc b/qtdoc index d944f73d19a..faf5abaaaa3 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit d944f73d19ab35783c9bd22e031ddc0eb2a78d0d +Subproject commit faf5abaaaa3cbece8ca0fa301f48191e2bbc1355 diff --git a/qtgraphs b/qtgraphs index ad8c3947e11..20e90d2228f 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit ad8c3947e119ae4b48c5342f3bcc4460394f8828 +Subproject commit 20e90d2228fa954398130dccaa906a6b706168f0 diff --git a/qtgrpc b/qtgrpc index c53266bc3c2..44914336a0e 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit c53266bc3c296d90b498225c1019a4512ff29583 +Subproject commit 44914336a0e996468df2f08b98a78c11b1200236 diff --git a/qthttpserver b/qthttpserver index f9df6fc8474..176430f7f7b 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit f9df6fc84748044e351f6f0b5f20c3bbfa3c66a7 +Subproject commit 176430f7f7b38be79eb023371394d341a0948833 diff --git a/qtimageformats b/qtimageformats index 240e792ab5d..ca3ec7aed99 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 240e792ab5d64b3f19a75d2d4fc5e498fb397b5b +Subproject commit ca3ec7aed998595651cd1e84b72a4c6146a61390 diff --git a/qtlanguageserver b/qtlanguageserver index 700d09aa576..2d66967ee8c 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit 700d09aa576e3af016e634e22cc68046f6d4cde4 +Subproject commit 2d66967ee8caacbdce1aea0ea21556fcff0e859b diff --git a/qtlocation b/qtlocation index 2b136a823fe..76ae02944fa 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 2b136a823fe40a7e8533936bbabbfca6d92220de +Subproject commit 76ae02944fa07937597c4315652506cd4cd98248 diff --git a/qtlottie b/qtlottie index b45f4d778bd..906c76ff38a 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit b45f4d778bd1a97bdf0d0fceded724bb96f6abea +Subproject commit 906c76ff38a43570c709a2358657baddd6470d10 diff --git a/qtmqtt b/qtmqtt index 92ac9927f43..f97c920eb39 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit 92ac9927f430d109b784087c0c07f8e3f9fc95e5 +Subproject commit f97c920eb39c894f4839c098acc48aa01d5c31e9 diff --git a/qtmultimedia b/qtmultimedia index bccfd3e78c1..1c6fdc88cfb 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit bccfd3e78c159499ac994f44aa48d3ffbfcd008a +Subproject commit 1c6fdc88cfbb9826dc55344dbe6d654a3b0c019c diff --git a/qtnetworkauth b/qtnetworkauth index 67768569b6b..1c201434779 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 67768569b6b216944de87fe4159500de533b56f0 +Subproject commit 1c201434779a91d17d71771b90972adc895f7f2b diff --git a/qtopcua b/qtopcua index 949a056a0f4..f100036b174 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit 949a056a0f4335413d11118a42d454f4a0669106 +Subproject commit f100036b17417838bf833dc144c6b41fe71593ec diff --git a/qtpositioning b/qtpositioning index 89eeaaffc4f..bb504ec4af7 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit 89eeaaffc4f28f3136e1f671b121a9444f3ec4c0 +Subproject commit bb504ec4af7462421968f7c2ad08a885351db418 diff --git a/qtquick3d b/qtquick3d index 2fa10a3b197..180fb46c182 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 2fa10a3b1975daef94a45030ccb5416b833c4c64 +Subproject commit 180fb46c182b12c92e4818c8881b1d707311e520 diff --git a/qtquick3dphysics b/qtquick3dphysics index 256c0a6cc1b..1fbf41db80e 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit 256c0a6cc1bef4cb9ac6884ea9d7a9e4ffa37841 +Subproject commit 1fbf41db80ec8bbc0faba67a37828d31c607fda1 diff --git a/qtquickeffectmaker b/qtquickeffectmaker index 2f5b3664869..14ba839271f 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit 2f5b3664869a425b255aa777f7bf6be68a9bc21d +Subproject commit 14ba839271f5c32d5bf0cab05df0df48fd2e270a diff --git a/qtquicktimeline b/qtquicktimeline index de81bf12e97..1ef7204bb2b 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit de81bf12e971f74ef3dc8f1ef09a1bc034cf17db +Subproject commit 1ef7204bb2ba76f20c22663e5afe3d277e4db310 diff --git a/qtremoteobjects b/qtremoteobjects index 8e4d46eea36..f24ebdbf6f3 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 8e4d46eea3608c2c7c457ddc062d3348e1dd1c68 +Subproject commit f24ebdbf6f370477a0a5825268b79dda2e2aa316 diff --git a/qtscxml b/qtscxml index bb4c4151c13..e35371ad852 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit bb4c4151c130b21adc1ed7754633566b5eb6f58c +Subproject commit e35371ad8525cabe5b5befec818ab4547a816701 diff --git a/qtsensors b/qtsensors index ded7a4ef253..f130bd0f652 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit ded7a4ef253c4f86673e01f89028e6fa5421cca8 +Subproject commit f130bd0f6527683e121aa6f87b48ac98753afda4 diff --git a/qtserialbus b/qtserialbus index 27c540ac309..3ad3e045005 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 27c540ac3099dc9220f24b3f11108fa19f0e4e7a +Subproject commit 3ad3e045005f6239fc0dbf1c79bccb6c73dd8191 diff --git a/qtserialport b/qtserialport index 40c860582de..52f94eebcc5 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 40c860582de4d3c7d40107934eda9255c0324319 +Subproject commit 52f94eebcc5c5eff7d4c6ab83a56f54b69acde7a diff --git a/qtshadertools b/qtshadertools index 1ab42d2754a..75108030bdd 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 1ab42d2754a032cea0f7bf0688cb5410c61db459 +Subproject commit 75108030bdd2d11a6e54df5640a0427400fe877a diff --git a/qtspeech b/qtspeech index ce83e7e4ab6..fd98f31c2e5 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit ce83e7e4ab6cc9d09dc45d6ec492b69082f619df +Subproject commit fd98f31c2e57bfc383fef7dbdebe0ce8c8d24690 diff --git a/qtsvg b/qtsvg index c5747e0b8b0..be7b33765a6 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit c5747e0b8b0a499284dc705008360f43749f559e +Subproject commit be7b33765a6e4e17107fd47ce4a2b7f3cfd8e1d8 diff --git a/qttools b/qttools index 3db436bd65c..60bcf96fb77 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 3db436bd65c1a5750d7fa5312ae97e4e6ce129f8 +Subproject commit 60bcf96fb77fbf6d1df8391badec388e1a9d62f1 diff --git a/qttranslations b/qttranslations index 55d220e0951..606559ae60c 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 55d220e095113aabc4ce2555e3fe9f1fa5c91085 +Subproject commit 606559ae60c75d9e128bf64bc73e718c8ea2b011 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 17377a0bb80..d6302bf7cd0 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 17377a0bb802cc7459ad6f0eea307dd4dbb482e7 +Subproject commit d6302bf7cd0d87619d3f98850ef813482c391726 diff --git a/qtwayland b/qtwayland index eb878b7a4e9..59ce90c24fe 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit eb878b7a4e92224edb81b5ca4642b4bbee1ea59c +Subproject commit 59ce90c24fe02401ebc33da7459aad0f1ad13c95 diff --git a/qtwebchannel b/qtwebchannel index 10349613a84..c7ac8edeb34 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 10349613a84fb638c46f53fbebaefa2cd0836638 +Subproject commit c7ac8edeb34ae113551377256f28df56c7ed0542 diff --git a/qtwebengine b/qtwebengine index 16bfe00ea77..d58b94f505b 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 16bfe00ea77ad41cd5b201867e9012544051b3bd +Subproject commit d58b94f505bd94a6d82230ffaa899965191c7c51 diff --git a/qtwebsockets b/qtwebsockets index 0bb59ea08a9..22a8a76944b 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 0bb59ea08a952ade244a32916d0c9249e283eda6 +Subproject commit 22a8a76944ba785821075425583b21709b09d7f3 diff --git a/qtwebview b/qtwebview index 74bca93f9c1..ed387f2700e 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 74bca93f9c1f5e92552e8edfd5afac388a10354f +Subproject commit ed387f2700e1ee1b3dd282be48c70f5338ac9f33 From 22b3565849350cf0bd5bce1a117fa04b565402b9 Mon Sep 17 00:00:00 2001 From: Pavel Dubsky Date: Thu, 3 Oct 2024 12:54:29 +0200 Subject: [PATCH 12/75] Update FFmpeg version to n7.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTBUG-129510 Pick-to: 6.8 6.5 Change-Id: I15a801c0c0568b26486e5bb2065a1d0d1d151951 Reviewed-by: Jøger Hansegård Reviewed-by: Artem Dyomin Reviewed-by: Tero Heikkinen (cherry picked from commit 154b41a26012057b78c77252513067122238e66e) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/common/unix/install-ffmpeg-android.sh | 4 ++-- coin/provisioning/common/unix/install-ffmpeg-ios.sh | 4 ++-- coin/provisioning/common/unix/install-ffmpeg.sh | 4 ++-- coin/provisioning/common/windows/install-ffmpeg.ps1 | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/coin/provisioning/common/unix/install-ffmpeg-android.sh b/coin/provisioning/common/unix/install-ffmpeg-android.sh index 9eab75d88ed..66feaf2ee89 100755 --- a/coin/provisioning/common/unix/install-ffmpeg-android.sh +++ b/coin/provisioning/common/unix/install-ffmpeg-android.sh @@ -11,9 +11,9 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -version="n7.0.2" +version="n7.1" url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz" -sha1="e017c72dd84a9bac1519eaa33c203b82dd850bc0" +sha1="f008a93710a7577e3f85a90f4b632cc615164712" url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz" ffmpeg_name="FFmpeg-$version" diff --git a/coin/provisioning/common/unix/install-ffmpeg-ios.sh b/coin/provisioning/common/unix/install-ffmpeg-ios.sh index 21e4d7d8013..798e547baa7 100755 --- a/coin/provisioning/common/unix/install-ffmpeg-ios.sh +++ b/coin/provisioning/common/unix/install-ffmpeg-ios.sh @@ -10,9 +10,9 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -version="n7.0.2" +version="n7.1" url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz" -sha1="e017c72dd84a9bac1519eaa33c203b82dd850bc0" +sha1="f008a93710a7577e3f85a90f4b632cc615164712" url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz" ffmpeg_name="FFmpeg-$version" diff --git a/coin/provisioning/common/unix/install-ffmpeg.sh b/coin/provisioning/common/unix/install-ffmpeg.sh index 6d20f9d5ce6..43e5820af03 100755 --- a/coin/provisioning/common/unix/install-ffmpeg.sh +++ b/coin/provisioning/common/unix/install-ffmpeg.sh @@ -17,9 +17,9 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -version="n7.0.2" +version="n7.1" url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz" -sha1="e017c72dd84a9bac1519eaa33c203b82dd850bc0" +sha1="f008a93710a7577e3f85a90f4b632cc615164712" url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz" ffmpeg_name="FFmpeg-$version" diff --git a/coin/provisioning/common/windows/install-ffmpeg.ps1 b/coin/provisioning/common/windows/install-ffmpeg.ps1 index f2c36417878..e960b076c94 100644 --- a/coin/provisioning/common/windows/install-ffmpeg.ps1 +++ b/coin/provisioning/common/windows/install-ffmpeg.ps1 @@ -6,9 +6,9 @@ # This script will install FFmpeg $msys = "C:\Utils\msys64\usr\bin\bash" -$version="n7.0.2" +$version="n7.1" $url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz" -$sha1="e017c72dd84a9bac1519eaa33c203b82dd850bc0" +$sha1="f008a93710a7577e3f85a90f4b632cc615164712" $url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz" $ffmpeg_name="FFmpeg-$version" From cfe773d749ba625e748f6d179c0b8b2c0d94bd9f Mon Sep 17 00:00:00 2001 From: Elias Toivola Date: Wed, 5 Jul 2023 13:25:27 +0300 Subject: [PATCH 13/75] Provisioning: Exit when an emscripten install command fails MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If there is an error in emsdk scripts when running ".\emsdk install", the provisioning would still continue. This change will make the script exit and stop provisioning when the install command fails. Also remove the attempt to use Python 2 and make sure the installation finds Python 3 instead. Pick-to: 6.8 6.5 Task-number: QTQAINFRA-5453 Change-Id: If052adcd446537b0eeb6261e4a297e9aeb292c6e Reviewed-by: Tony Sarajärvi (cherry picked from commit 879c8b91f37cb4ce9ddfcb930237f203645763e5) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/common/unix/emsdk.sh | 13 ++++++++----- coin/provisioning/common/windows/emsdk.ps1 | 18 +++++++++++++----- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/coin/provisioning/common/unix/emsdk.sh b/coin/provisioning/common/unix/emsdk.sh index b85105b5594..00f6a7459d7 100755 --- a/coin/provisioning/common/unix/emsdk.sh +++ b/coin/provisioning/common/unix/emsdk.sh @@ -11,7 +11,7 @@ source "${BASH_SOURCE%/*}/DownloadURL.sh" version="3.1.56" versionNode="v16.20.0" tarBallVersion="${version//./_}" -if uname -a |grep -q Darwin; then +if uname -a | grep -q Darwin; then tarBallPackage="emsdk_macos_${tarBallVersion}.tar.gz" sha="24c49db971da4fd7c68f6b71984c3d7775fdfb84" else @@ -22,7 +22,7 @@ cacheUrl="https://ci-files01-hki.ci.qt.io/input/emsdk/$%7BtarBallPackage%7D" target="/tmp/${tarBallPackage}" mkdir -p /opt -cd /opt +cd /opt || exit echo "URL: $cacheUrl" if DownloadURL "$cacheUrl" "" "$sha" "$target"; then @@ -31,13 +31,16 @@ if DownloadURL "$cacheUrl" "" "$sha" "$target"; then else echo "Emsdk isn't cached. Cloning it" sudo git clone https://github.com/emscripten-core/emsdk.git - cd emsdk - sudo ./emsdk install "$version" + cd emsdk || exit + if ! sudo ./emsdk install "$version"; then + echo "Error: emsdk installation failed" + exit 1 + fi sudo ./emsdk activate "$version" fi # platform-specific toolchain and node binaries. urls obtained from "emsdk install" -if uname -a |grep -q Darwin; then +if uname -a | grep -q Darwin; then pathNodeExecutable="node-$versionNode-darwin-x64/bin/node" else pathNodeExecutable="node-$versionNode-linux-x64/bin/node" diff --git a/coin/provisioning/common/windows/emsdk.ps1 b/coin/provisioning/common/windows/emsdk.ps1 index b0870e8d04e..5dcdd99e2d5 100644 --- a/coin/provisioning/common/windows/emsdk.ps1 +++ b/coin/provisioning/common/windows/emsdk.ps1 @@ -11,8 +11,9 @@ $temp = "$env:tmp" $cacheUrl = "https://ci-files01-hki.ci.qt.io/input/emsdk/emsdk_windows_$%7BzipVersion%7D.zip" $sha = "ab376d218f1a66302c36770977948f74f0576a42" -# Make sure python is in the path -Prepend-Path "C:\Python27" +# Python used for '.\emsdk install' +$pythonPath = [System.Environment]::GetEnvironmentVariable("PYTHON3_PATH", "Machine") +Prepend-Path $pythonPath cd "C:\\Utils" $installLocationEmsdk = "C:\\Utils\\emsdk" @@ -24,11 +25,18 @@ try { cd $installLocationEmsdk .\emsdk activate $version } catch { - Write-Host "Can't find cached emsdk. Cloning it" + Write-Host "Can't find cached emsdk or another error occurred. Cloning it" + Write-Host "Error details: $_" + C:\PROGRA~1\Git\bin\git clone https://github.com/emscripten-core/emsdk.git cd $installLocationEmsdk - .\emsdk install $version - .\emsdk activate $version + + try { + .\emsdk install $version + .\emsdk activate $version + } catch { + throw "emsdk installation failed: $_" + } } $versionWinPython = $($Env:EMSDK_PYTHON -split ('python\\') -split ('_64bit'))[1] From 5ae41db58600f3c9e7ded138d62aa3867b3d5e04 Mon Sep 17 00:00:00 2001 From: Tero Heikkinen Date: Wed, 12 Jun 2024 11:28:13 +0300 Subject: [PATCH 14/75] Provisioning: Make Windows Path visible at the end of provisioning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There's possibility that some installations might add more into Path that doesn't get visible during the installation process. Change makes it easier to detect if there's i.e. JRE installed during Mimer, which caused Java SE update to 17 fail in qtbase build for Android, because JRE was the first Java found from Path and it wasn't the required new JDK 17 version. This can lead even to test with incorrect version of Java, which can happen with any other different version installations as well. Task-number: QTQAINFRA-6392 Task-number: QTQAINFRA-6385 Pick-to: 6.8 Change-Id: Idce79eb06d73894ae648e0be53ff1f07bb21392d Reviewed-by: Tony Sarajärvi (cherry picked from commit 444167f5fb29f266cf8447ff932086c403037182) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/common/windows/version.ps1 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/coin/provisioning/common/windows/version.ps1 b/coin/provisioning/common/windows/version.ps1 index 7f701f637de..127393fd6be 100644 --- a/coin/provisioning/common/windows/version.ps1 +++ b/coin/provisioning/common/windows/version.ps1 @@ -4,3 +4,6 @@ Write-Host '*****************************************************' Write-Host '******************** Get-PSDrive ********************' Get-PSDrive Write-Host '*****************************************************' +Write-Host '******************** Path Content *******************' +$env:Path -split ';' +Write-Host '*****************************************************' From 32d895a2a092768c17e8c8a39302af030750f6b8 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 19 Nov 2024 11:57:33 +0100 Subject: [PATCH 15/75] CMake: Raise CI-tested minimum CMake version to 3.22.6 Also change the upper case L to lower case l, because it's changed upstream. Amends 0cfa1fa561d88e5561ad203a9814456a79e93ea6 Task-number: QTBUG-131169 Change-Id: I5e501e37bb5516e15a2cbb68cb523ebc5e88d47c Reviewed-by: Nicholas Bennett (cherry picked from commit ffef9203375be292f107c49392b632adb6c7bd10) Reviewed-by: Qt Cherry-pick Bot --- .../provisioning/common/linux/cmake_min_supported.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/coin/provisioning/common/linux/cmake_min_supported.sh b/coin/provisioning/common/linux/cmake_min_supported.sh index 4c64299bb24..7113fe47581 100755 --- a/coin/provisioning/common/linux/cmake_min_supported.sh +++ b/coin/provisioning/common/linux/cmake_min_supported.sh @@ -9,13 +9,13 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -majorminorversion="3.16" -version="3.16.8" -PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/cmake/cmake-$version-Linux-x86_64.tar.gz" -AltUrl="https://cmake.org/files/v$majorminorversion/cmake-$version-Linux-x86_64.tar.gz" -SHA1="a4d2f96f475ccc8e1ae1d97cf6c8ce39abaa9d7c" +majorminorversion="3.22" +version="3.22.6" +PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/cmake/cmake-$version-linux-x86_64.tar.gz" +AltUrl="https://cmake.org/files/v$majorminorversion/cmake-$version-linux-x86_64.tar.gz" +SHA1="4a5ba17568d108d295719850dd584e775583f61b" targetFolder="/opt/cmake-$version" -appPrefix="cmake-$version-Linux-x86_64" +appPrefix="cmake-$version-linux-x86_64" InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix" From b7abace8945ddd45436a87a4b7b4a354df0c077d Mon Sep 17 00:00:00 2001 From: Tero Heikkinen Date: Tue, 26 Nov 2024 16:13:07 +0200 Subject: [PATCH 16/75] Fix macOS ffmpeg ios parallel compiling to cause resource starvation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add -j4 to limit how many cores is used to build ffmpeg-ios binaries. Error in logs: "posix_spawn failed: Resource temporarily unavailable" Task-number: QTQAINFRA-6803 Pick-to: 6.8 Change-Id: I3fb56cdbe4cbda8f779852b0a16121916aa5a1d4 Reviewed-by: Jøger Hansegård Reviewed-by: Jukka Jokiniva (cherry picked from commit 6569f201c1359d09dba9627cda2ca375ecf6b8c3) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/common/unix/install-ffmpeg-ios.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/provisioning/common/unix/install-ffmpeg-ios.sh b/coin/provisioning/common/unix/install-ffmpeg-ios.sh index 798e547baa7..2f18b5c40b8 100755 --- a/coin/provisioning/common/unix/install-ffmpeg-ios.sh +++ b/coin/provisioning/common/unix/install-ffmpeg-ios.sh @@ -68,7 +68,7 @@ build_ffmpeg_ios() { --enable-pthreads \ --disable-audiotoolbox - sudo make install DESTDIR="$build_dir/installed" -j + sudo make install DESTDIR="$build_dir/installed" -j4 popd } From 51dec3728f8af5393b9aefdde503daa2e5921389 Mon Sep 17 00:00:00 2001 From: Oliver Wolff Date: Mon, 2 Dec 2024 08:17:20 +0100 Subject: [PATCH 17/75] README.md: Update minimal versions of Windows compilers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Pick-to: 6.8 Change-Id: Id743e89d0858fde4678b7ba4e848d780d19771fc Reviewed-by: Kai Köhne (cherry picked from commit 8319245b04c644bd5c4b3cc84838b04ef3971d0f) Reviewed-by: Qt Cherry-pick Bot --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ccf35c370c0..37f54aff81e 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ Windows: 1. Open a command prompt. 2. Ensure that the following tools can be found in the path: - * Supported compiler (Visual Studio 2019 or later, or MinGW-builds gcc 11.2 or later) + * Supported compiler (Visual Studio 2022 or later, or MinGW-builds gcc 13.1 or later) * Python 3 ([https://www.python.org/downloads/windows/] or from Microsoft Store) ``` From 6db401bedaa0900b4b04c67b2d606cb1c85000df Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 11 Nov 2024 17:27:13 +0100 Subject: [PATCH 18/75] coin: Switch ios-tests-on-macos to use qtci-macos-14-arm-106 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This will use the newer iOS 17 SDK during the build, and allow us to enforce the minimum SDK version check. This change also switches to using an arm mac for the build. Pick-to: 6.8 Task-number: QTBUG-119490 Change-Id: Ie9ff2b2f4fe40bda2856d4b12a03aaa05f836de4 Reviewed-by: Tor Arne Vestbø (cherry picked from commit f5970f9c6219362ae034df1bf35dc092efa1e1d8) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/ios-tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/ios-tests.yaml b/coin/platform_configs/ios-tests.yaml index f05645e95d0..b2fd1e0868c 100644 --- a/coin/platform_configs/ios-tests.yaml +++ b/coin/platform_configs/ios-tests.yaml @@ -2,7 +2,7 @@ Version: 2 Configurations: - Id: "ios-tests-on-macos" - Template: 'qtci-macos-13-x86_64-103' + Template: 'qtci-macos-14-arm-106' Target os: 'IOS_ANY' Target arch: 'arm64' Compiler: 'Clang' From 42097ba59d0425bf5e7ad3c1462c6539615f21a1 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 23 Dec 2024 17:18:39 +0000 Subject: [PATCH 19/75] Update submodules on '6.9 in qt/qt5' Change-Id: I4e1d791a600518f12f8659736468287b89df947c Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qt5compat | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtcharts | 2 +- qtcoap | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgraphs | 2 +- qtgrpc | 2 +- qthttpserver | 2 +- qtimageformats | 2 +- qtlanguageserver | 2 +- qtlocation | 2 +- qtlottie | 2 +- qtmqtt | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtopcua | 2 +- qtpositioning | 2 +- qtquick3d | 2 +- qtquick3dphysics | 2 +- qtquickeffectmaker | 2 +- qtquicktimeline | 2 +- qtremoteobjects | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtshadertools | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- 42 files changed, 42 insertions(+), 42 deletions(-) diff --git a/qt3d b/qt3d index c4a1b6eae95..889d6f8adfe 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit c4a1b6eae9555d69d0fed9d161d485c05b903b99 +Subproject commit 889d6f8adfe062276e954f869a9bf741ea4b1f76 diff --git a/qt5compat b/qt5compat index d37ec670685..778425ff914 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit d37ec670685f1c1a6de5a388c66db855c64b58d3 +Subproject commit 778425ff914b88e98690858614ff933c9dcbd3f5 diff --git a/qtactiveqt b/qtactiveqt index d69388b0d55..0adcdf8be9d 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit d69388b0d55ac60a9603c84d638790a7095e15d1 +Subproject commit 0adcdf8be9d163a5f688affa0098696a419276fb diff --git a/qtbase b/qtbase index e63884c5933..7b5dbe165d0 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit e63884c5933d0a5c63fbbe27af85afd6feb61e89 +Subproject commit 7b5dbe165d04725c3d68e7daf844ad0d58bca815 diff --git a/qtcharts b/qtcharts index 8b64d35d160..59dc67cef7c 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 8b64d35d160d0b2ca9d0acf937bf95e16c430031 +Subproject commit 59dc67cef7c2eb997b438ab8312488b6f0b7afba diff --git a/qtcoap b/qtcoap index e8d88717bd8..5bb90542f72 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit e8d88717bd89004774e92db735df7237f5cd2f45 +Subproject commit 5bb90542f72678613726f351b36fa1a41eff0208 diff --git a/qtconnectivity b/qtconnectivity index e1ce5cbbe79..b89e80d6cdc 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit e1ce5cbbe790fb2fa3c75ef949d376f806323c7d +Subproject commit b89e80d6cdcffbc3aab2770d44bd2708f83a5d9f diff --git a/qtdatavis3d b/qtdatavis3d index 130babe132c..e26b16640b1 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 130babe132c5e348a6bf134c6d84b5e7846c644a +Subproject commit e26b16640b1eb500865f71307d0727f0ca087688 diff --git a/qtdeclarative b/qtdeclarative index 6d5999e152f..4e391d09c8c 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 6d5999e152f31c098f58d2f1ff52fcd583a9ea8f +Subproject commit 4e391d09c8cd835781afd179014ec014a9764198 diff --git a/qtdoc b/qtdoc index faf5abaaaa3..506442e0d5f 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit faf5abaaaa3cbece8ca0fa301f48191e2bbc1355 +Subproject commit 506442e0d5fa109c263dcd142b97bfb588377448 diff --git a/qtgraphs b/qtgraphs index 20e90d2228f..1a3c7260a1a 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit 20e90d2228fa954398130dccaa906a6b706168f0 +Subproject commit 1a3c7260a1ad0cb28f3f6f77e438f4f2a8161821 diff --git a/qtgrpc b/qtgrpc index 44914336a0e..9652a266666 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit 44914336a0e996468df2f08b98a78c11b1200236 +Subproject commit 9652a266666b3c42104c74fcdb0fca882c910e66 diff --git a/qthttpserver b/qthttpserver index 176430f7f7b..a73261d0d71 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit 176430f7f7b38be79eb023371394d341a0948833 +Subproject commit a73261d0d7182696ea67fbf497b42379d8bda987 diff --git a/qtimageformats b/qtimageformats index ca3ec7aed99..d05a0dee027 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit ca3ec7aed998595651cd1e84b72a4c6146a61390 +Subproject commit d05a0dee027933c39f7017b74d0daed82177c01f diff --git a/qtlanguageserver b/qtlanguageserver index 2d66967ee8c..215086d8636 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit 2d66967ee8caacbdce1aea0ea21556fcff0e859b +Subproject commit 215086d8636daf952dd4116d02c6eb8c51ce6bdc diff --git a/qtlocation b/qtlocation index 76ae02944fa..59d0cce9678 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 76ae02944fa07937597c4315652506cd4cd98248 +Subproject commit 59d0cce967821c956eacb75e60adc926e8a773f9 diff --git a/qtlottie b/qtlottie index 906c76ff38a..6cbbbec7a39 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 906c76ff38a43570c709a2358657baddd6470d10 +Subproject commit 6cbbbec7a39026e4b2ba156406bef3f3ef5c6cbf diff --git a/qtmqtt b/qtmqtt index f97c920eb39..dd3a07a72d0 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit f97c920eb39c894f4839c098acc48aa01d5c31e9 +Subproject commit dd3a07a72d09bece972228a501ba929021ff43ec diff --git a/qtmultimedia b/qtmultimedia index 1c6fdc88cfb..71d9766abd8 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 1c6fdc88cfbb9826dc55344dbe6d654a3b0c019c +Subproject commit 71d9766abd808ac00285b5bde0769d9f1f92e412 diff --git a/qtnetworkauth b/qtnetworkauth index 1c201434779..068e977e693 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 1c201434779a91d17d71771b90972adc895f7f2b +Subproject commit 068e977e6939a774e60be1662d91153588043d51 diff --git a/qtopcua b/qtopcua index f100036b174..db36d15c52c 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit f100036b17417838bf833dc144c6b41fe71593ec +Subproject commit db36d15c52c8d39b30c26126bd0f0c726c9e28cc diff --git a/qtpositioning b/qtpositioning index bb504ec4af7..a9412075557 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit bb504ec4af7462421968f7c2ad08a885351db418 +Subproject commit a941207555706e47b703800924489898839ce88d diff --git a/qtquick3d b/qtquick3d index 180fb46c182..8834b5a1275 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 180fb46c182b12c92e4818c8881b1d707311e520 +Subproject commit 8834b5a12758b89884ff7a72d40810eff7bcb314 diff --git a/qtquick3dphysics b/qtquick3dphysics index 1fbf41db80e..e185995382d 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit 1fbf41db80ec8bbc0faba67a37828d31c607fda1 +Subproject commit e185995382da43b7a841061b52fa17853ab51562 diff --git a/qtquickeffectmaker b/qtquickeffectmaker index 14ba839271f..f11bbc5bfd0 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit 14ba839271f5c32d5bf0cab05df0df48fd2e270a +Subproject commit f11bbc5bfd0c987ab29902e1cfc8f7f5c8728923 diff --git a/qtquicktimeline b/qtquicktimeline index 1ef7204bb2b..c9e04143b2b 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 1ef7204bb2ba76f20c22663e5afe3d277e4db310 +Subproject commit c9e04143b2bcae9190f9d517d50ee42998b2d037 diff --git a/qtremoteobjects b/qtremoteobjects index f24ebdbf6f3..b9d6f13c9b5 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit f24ebdbf6f370477a0a5825268b79dda2e2aa316 +Subproject commit b9d6f13c9b53a854fbcfe39848c40a6de3d9cbbb diff --git a/qtscxml b/qtscxml index e35371ad852..d53970ed2d0 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit e35371ad8525cabe5b5befec818ab4547a816701 +Subproject commit d53970ed2d08597e6ae1299916a843f7b7e15860 diff --git a/qtsensors b/qtsensors index f130bd0f652..08479c1faec 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit f130bd0f6527683e121aa6f87b48ac98753afda4 +Subproject commit 08479c1faec2dd2a663cb303113d7febc842f01d diff --git a/qtserialbus b/qtserialbus index 3ad3e045005..1993c8f4296 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 3ad3e045005f6239fc0dbf1c79bccb6c73dd8191 +Subproject commit 1993c8f4296bf5f2fc21c69eba35d4a438719420 diff --git a/qtserialport b/qtserialport index 52f94eebcc5..7b95258758a 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 52f94eebcc5c5eff7d4c6ab83a56f54b69acde7a +Subproject commit 7b95258758a792c66ca6861eec82a898a741a052 diff --git a/qtshadertools b/qtshadertools index 75108030bdd..38c386b3cf9 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 75108030bdd2d11a6e54df5640a0427400fe877a +Subproject commit 38c386b3cf9da6db3c965e4e2f48b197896a403a diff --git a/qtspeech b/qtspeech index fd98f31c2e5..1e5672a6dd2 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit fd98f31c2e57bfc383fef7dbdebe0ce8c8d24690 +Subproject commit 1e5672a6dd2c309ca61dd66c14ffb6faf7b12f26 diff --git a/qtsvg b/qtsvg index be7b33765a6..2c06ea30cb9 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit be7b33765a6e4e17107fd47ce4a2b7f3cfd8e1d8 +Subproject commit 2c06ea30cb98ec7e6b1c7f736162bc71a6cb18df diff --git a/qttools b/qttools index 60bcf96fb77..48f763932ef 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 60bcf96fb77fbf6d1df8391badec388e1a9d62f1 +Subproject commit 48f763932ef28a60c7b58e1bfbe1dc4a10e06a51 diff --git a/qttranslations b/qttranslations index 606559ae60c..f029163a9b8 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 606559ae60c75d9e128bf64bc73e718c8ea2b011 +Subproject commit f029163a9b897a1fe1a8e74af802529bd7ea2fcf diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index d6302bf7cd0..3a7fcbbfbae 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit d6302bf7cd0d87619d3f98850ef813482c391726 +Subproject commit 3a7fcbbfbae0860dc2d2ebd7ea6b4272bccc2ec3 diff --git a/qtwayland b/qtwayland index 59ce90c24fe..7f531a6d911 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 59ce90c24fe02401ebc33da7459aad0f1ad13c95 +Subproject commit 7f531a6d91145ca9d8f851aff8a78e65422726d5 diff --git a/qtwebchannel b/qtwebchannel index c7ac8edeb34..b34232e434c 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit c7ac8edeb34ae113551377256f28df56c7ed0542 +Subproject commit b34232e434c90935a0608196d7c043a75cb4b959 diff --git a/qtwebengine b/qtwebengine index d58b94f505b..92382812810 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit d58b94f505bd94a6d82230ffaa899965191c7c51 +Subproject commit 92382812810c05697eb917d0b4f25d6dbcb6a610 diff --git a/qtwebsockets b/qtwebsockets index 22a8a76944b..28a4f8ddcf8 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 22a8a76944ba785821075425583b21709b09d7f3 +Subproject commit 28a4f8ddcf80163c67f69638b7d08868d3dcb07a diff --git a/qtwebview b/qtwebview index ed387f2700e..3e607574540 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit ed387f2700e1ee1b3dd282be48c70f5338ac9f33 +Subproject commit 3e607574540a9abc3a18fca74caaffd4e2ee6e93 From 3c2be7486cff3405d352a1d0d44db8d591142dc3 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 24 Dec 2024 13:44:48 +0000 Subject: [PATCH 20/75] Update submodules on '6.9 in qt/qt5' Change-Id: Ie3f875d78ded4fe66ac035a60687c9b3a61a3b4a Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qt5compat | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtcharts | 2 +- qtcoap | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgraphs | 2 +- qtgrpc | 2 +- qthttpserver | 2 +- qtimageformats | 2 +- qtlanguageserver | 2 +- qtlocation | 2 +- qtlottie | 2 +- qtmqtt | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtopcua | 2 +- qtpositioning | 2 +- qtquick3d | 2 +- qtquick3dphysics | 2 +- qtquickeffectmaker | 2 +- qtquicktimeline | 2 +- qtremoteobjects | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtshadertools | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- 42 files changed, 42 insertions(+), 42 deletions(-) diff --git a/qt3d b/qt3d index 889d6f8adfe..9e2be897de2 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 889d6f8adfe062276e954f869a9bf741ea4b1f76 +Subproject commit 9e2be897de25313c8d73f42b22884987c323cd12 diff --git a/qt5compat b/qt5compat index 778425ff914..44faf1a253e 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 778425ff914b88e98690858614ff933c9dcbd3f5 +Subproject commit 44faf1a253ee96b95ced10c7428083c10b6f133b diff --git a/qtactiveqt b/qtactiveqt index 0adcdf8be9d..2068a6ae86b 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 0adcdf8be9d163a5f688affa0098696a419276fb +Subproject commit 2068a6ae86b3397f7e812f350add8876ef2c9472 diff --git a/qtbase b/qtbase index 7b5dbe165d0..b6108318c2a 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 7b5dbe165d04725c3d68e7daf844ad0d58bca815 +Subproject commit b6108318c2a7e79c297e6fa7cdc9f6de88b6efa9 diff --git a/qtcharts b/qtcharts index 59dc67cef7c..38e18d9764d 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 59dc67cef7c2eb997b438ab8312488b6f0b7afba +Subproject commit 38e18d9764da8f2f8924e0af2a925a4ed3332d1e diff --git a/qtcoap b/qtcoap index 5bb90542f72..cdfb095bb88 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit 5bb90542f72678613726f351b36fa1a41eff0208 +Subproject commit cdfb095bb88d30c03656bb7b43f72adad40a819a diff --git a/qtconnectivity b/qtconnectivity index b89e80d6cdc..bd0db67b14a 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit b89e80d6cdcffbc3aab2770d44bd2708f83a5d9f +Subproject commit bd0db67b14ad1852237047fa73b92af1ab3a7070 diff --git a/qtdatavis3d b/qtdatavis3d index e26b16640b1..eb39ecf6c4d 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit e26b16640b1eb500865f71307d0727f0ca087688 +Subproject commit eb39ecf6c4dc1a203755bc6a31d502ada6de48c3 diff --git a/qtdeclarative b/qtdeclarative index 4e391d09c8c..b4f913583e8 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 4e391d09c8cd835781afd179014ec014a9764198 +Subproject commit b4f913583e8286caabc48379474a5ac0800ef262 diff --git a/qtdoc b/qtdoc index 506442e0d5f..783766ebb3a 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 506442e0d5fa109c263dcd142b97bfb588377448 +Subproject commit 783766ebb3a9ad077d5b6369a776fea9aa2165fa diff --git a/qtgraphs b/qtgraphs index 1a3c7260a1a..01e99d541c9 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit 1a3c7260a1ad0cb28f3f6f77e438f4f2a8161821 +Subproject commit 01e99d541c93cea61fe3e91cae4868e084961348 diff --git a/qtgrpc b/qtgrpc index 9652a266666..0d0b42aa2b0 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit 9652a266666b3c42104c74fcdb0fca882c910e66 +Subproject commit 0d0b42aa2b0334fca8f4de82a5efb0763b5bc027 diff --git a/qthttpserver b/qthttpserver index a73261d0d71..5ad712dd4c2 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit a73261d0d7182696ea67fbf497b42379d8bda987 +Subproject commit 5ad712dd4c292c7f2b900a517a1f254c9add7db7 diff --git a/qtimageformats b/qtimageformats index d05a0dee027..41ef5001d89 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit d05a0dee027933c39f7017b74d0daed82177c01f +Subproject commit 41ef5001d892c64d2e70db2080f68e212a315170 diff --git a/qtlanguageserver b/qtlanguageserver index 215086d8636..253c2e70e7f 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit 215086d8636daf952dd4116d02c6eb8c51ce6bdc +Subproject commit 253c2e70e7fcb519b068d73f0174894655055ec6 diff --git a/qtlocation b/qtlocation index 59d0cce9678..8b22be19d2b 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 59d0cce967821c956eacb75e60adc926e8a773f9 +Subproject commit 8b22be19d2bf170003b542444aec19a6486b4574 diff --git a/qtlottie b/qtlottie index 6cbbbec7a39..6942110bccb 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 6cbbbec7a39026e4b2ba156406bef3f3ef5c6cbf +Subproject commit 6942110bccb48811144b13e394ab6b07a951f699 diff --git a/qtmqtt b/qtmqtt index dd3a07a72d0..44864f4921d 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit dd3a07a72d09bece972228a501ba929021ff43ec +Subproject commit 44864f4921d5dff0f3756469ba9fe9bf516ff274 diff --git a/qtmultimedia b/qtmultimedia index 71d9766abd8..2818092658e 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 71d9766abd808ac00285b5bde0769d9f1f92e412 +Subproject commit 2818092658eb9ed162d94de5e06aa6ab86e5205a diff --git a/qtnetworkauth b/qtnetworkauth index 068e977e693..d1578d76282 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 068e977e6939a774e60be1662d91153588043d51 +Subproject commit d1578d7628244df4eeb3dc8a338bbd22c050cd5d diff --git a/qtopcua b/qtopcua index db36d15c52c..2633a3ba22d 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit db36d15c52c8d39b30c26126bd0f0c726c9e28cc +Subproject commit 2633a3ba22d53c9b0559c3769ebd1885013725d9 diff --git a/qtpositioning b/qtpositioning index a9412075557..307b6f028fc 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit a941207555706e47b703800924489898839ce88d +Subproject commit 307b6f028fc0abda4989b2d0540982bd350765d4 diff --git a/qtquick3d b/qtquick3d index 8834b5a1275..eafb1405372 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 8834b5a12758b89884ff7a72d40810eff7bcb314 +Subproject commit eafb1405372a30935bfed5d79547934d5aa102c4 diff --git a/qtquick3dphysics b/qtquick3dphysics index e185995382d..88029f7f2af 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit e185995382da43b7a841061b52fa17853ab51562 +Subproject commit 88029f7f2af8ef534a28f272a83516de8f736799 diff --git a/qtquickeffectmaker b/qtquickeffectmaker index f11bbc5bfd0..6960f5b325a 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit f11bbc5bfd0c987ab29902e1cfc8f7f5c8728923 +Subproject commit 6960f5b325a2598a36e538b90d30f20306358879 diff --git a/qtquicktimeline b/qtquicktimeline index c9e04143b2b..a7950ae687f 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit c9e04143b2bcae9190f9d517d50ee42998b2d037 +Subproject commit a7950ae687f05677016a4c171355a47fe9855ddd diff --git a/qtremoteobjects b/qtremoteobjects index b9d6f13c9b5..f435f91aae2 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit b9d6f13c9b53a854fbcfe39848c40a6de3d9cbbb +Subproject commit f435f91aae22261c7c5bcbf3a3a8a559b3f721b9 diff --git a/qtscxml b/qtscxml index d53970ed2d0..45cc4ba3338 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit d53970ed2d08597e6ae1299916a843f7b7e15860 +Subproject commit 45cc4ba333883e955f51db0cf82da747f947b24a diff --git a/qtsensors b/qtsensors index 08479c1faec..95570cc1cb4 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 08479c1faec2dd2a663cb303113d7febc842f01d +Subproject commit 95570cc1cb4d379d6d94457a3f2a502577a575aa diff --git a/qtserialbus b/qtserialbus index 1993c8f4296..64b6e8022ab 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 1993c8f4296bf5f2fc21c69eba35d4a438719420 +Subproject commit 64b6e8022ab83071b4dea0222a1b83349e5a3e4e diff --git a/qtserialport b/qtserialport index 7b95258758a..f4b2a167dfb 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 7b95258758a792c66ca6861eec82a898a741a052 +Subproject commit f4b2a167dfbe4ae62a42111d707865d198b8a6d9 diff --git a/qtshadertools b/qtshadertools index 38c386b3cf9..2bd5c126d33 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 38c386b3cf9da6db3c965e4e2f48b197896a403a +Subproject commit 2bd5c126d335946498f1ad7f7f19841969b24ee3 diff --git a/qtspeech b/qtspeech index 1e5672a6dd2..ca7f2b7949c 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 1e5672a6dd2c309ca61dd66c14ffb6faf7b12f26 +Subproject commit ca7f2b7949c28b7ee626952d99aa76c58657ca1d diff --git a/qtsvg b/qtsvg index 2c06ea30cb9..ed17d67c0b2 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 2c06ea30cb98ec7e6b1c7f736162bc71a6cb18df +Subproject commit ed17d67c0b2761c278d5261a50e1ced2c37c7d9d diff --git a/qttools b/qttools index 48f763932ef..d4354891ff1 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 48f763932ef28a60c7b58e1bfbe1dc4a10e06a51 +Subproject commit d4354891ff103469c50fb95b39eaa83edaba5db5 diff --git a/qttranslations b/qttranslations index f029163a9b8..863cc783ab1 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit f029163a9b897a1fe1a8e74af802529bd7ea2fcf +Subproject commit 863cc783ab1b6b504b859e8ed5ffd59a98cee4c2 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 3a7fcbbfbae..987571d59ae 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 3a7fcbbfbae0860dc2d2ebd7ea6b4272bccc2ec3 +Subproject commit 987571d59ae4d602e700169868aea1a11f8c95f3 diff --git a/qtwayland b/qtwayland index 7f531a6d911..3bbe0027d7a 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 7f531a6d91145ca9d8f851aff8a78e65422726d5 +Subproject commit 3bbe0027d7a6e2205c5df09a9118b1bca5dfdea8 diff --git a/qtwebchannel b/qtwebchannel index b34232e434c..5d012df3886 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit b34232e434c90935a0608196d7c043a75cb4b959 +Subproject commit 5d012df3886e4e214df05f61d26b3dcb0ff3dab9 diff --git a/qtwebengine b/qtwebengine index 92382812810..aba1c597edf 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 92382812810c05697eb917d0b4f25d6dbcb6a610 +Subproject commit aba1c597edfd457acdc30118916269f21dd2230f diff --git a/qtwebsockets b/qtwebsockets index 28a4f8ddcf8..60b9863c16e 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 28a4f8ddcf80163c67f69638b7d08868d3dcb07a +Subproject commit 60b9863c16ede39f1a4652f9fba7d9833c238fb4 diff --git a/qtwebview b/qtwebview index 3e607574540..1aaca7b1bc6 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 3e607574540a9abc3a18fca74caaffd4e2ee6e93 +Subproject commit 1aaca7b1bc6c60330be4489e60d115e5fb14a35c From 0e4d9053fc0119ec6ad5d32ec9ac2ca831e0bd63 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 25 Dec 2024 11:03:51 +0000 Subject: [PATCH 21/75] Update submodules on '6.9 in qt/qt5' Change-Id: I452cd74e35d919c3f5394b7b58952635634642ff Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qt5compat | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgraphs | 2 +- qtgrpc | 2 +- qthttpserver | 2 +- qtlocation | 2 +- qtlottie | 2 +- qtmqtt | 2 +- qtmultimedia | 2 +- qtopcua | 2 +- qtpositioning | 2 +- qtquick3d | 2 +- qtquick3dphysics | 2 +- qtquickeffectmaker | 2 +- qtquicktimeline | 2 +- qtremoteobjects | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtspeech | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- 32 files changed, 32 insertions(+), 32 deletions(-) diff --git a/qt3d b/qt3d index 9e2be897de2..10ca17149da 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 9e2be897de25313c8d73f42b22884987c323cd12 +Subproject commit 10ca17149da17a23fd336cebf3cf16bf1033d3e2 diff --git a/qt5compat b/qt5compat index 44faf1a253e..13d47c03f88 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 44faf1a253ee96b95ced10c7428083c10b6f133b +Subproject commit 13d47c03f88eae03312e84852de3d7fd24fb8f5f diff --git a/qtcharts b/qtcharts index 38e18d9764d..4129ee319be 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 38e18d9764da8f2f8924e0af2a925a4ed3332d1e +Subproject commit 4129ee319be1e66c471ace9494c9a904e5ac7ccf diff --git a/qtconnectivity b/qtconnectivity index bd0db67b14a..ec6118c19ae 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit bd0db67b14ad1852237047fa73b92af1ab3a7070 +Subproject commit ec6118c19ae2c5dcf8cafe880b9ee50bba3075b7 diff --git a/qtdatavis3d b/qtdatavis3d index eb39ecf6c4d..20a9fe2f5bb 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit eb39ecf6c4dc1a203755bc6a31d502ada6de48c3 +Subproject commit 20a9fe2f5bbd0f5285b3e8d0602063fc9f1e37fd diff --git a/qtdeclarative b/qtdeclarative index b4f913583e8..e6cae22239a 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit b4f913583e8286caabc48379474a5ac0800ef262 +Subproject commit e6cae22239a68b68cf3fed39ce0c409ca633564f diff --git a/qtdoc b/qtdoc index 783766ebb3a..60ebc81ce33 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 783766ebb3a9ad077d5b6369a776fea9aa2165fa +Subproject commit 60ebc81ce33c29eecb308c69a1e977b4248264ee diff --git a/qtgraphs b/qtgraphs index 01e99d541c9..901993c22b5 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit 01e99d541c93cea61fe3e91cae4868e084961348 +Subproject commit 901993c22b5267d6eff387de16286f62caa1110d diff --git a/qtgrpc b/qtgrpc index 0d0b42aa2b0..c6f91edcdc9 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit 0d0b42aa2b0334fca8f4de82a5efb0763b5bc027 +Subproject commit c6f91edcdc965f03f0a2077656d913311eec2dc5 diff --git a/qthttpserver b/qthttpserver index 5ad712dd4c2..37b0cd5be8a 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit 5ad712dd4c292c7f2b900a517a1f254c9add7db7 +Subproject commit 37b0cd5be8a4795cf2497e0aa9a7e54938ada053 diff --git a/qtlocation b/qtlocation index 8b22be19d2b..acf7ff8c033 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 8b22be19d2bf170003b542444aec19a6486b4574 +Subproject commit acf7ff8c0337e92d4eebd509c9cba3868a76e575 diff --git a/qtlottie b/qtlottie index 6942110bccb..85dd56668bc 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 6942110bccb48811144b13e394ab6b07a951f699 +Subproject commit 85dd56668bc76feddbedfb275bba3949c0c4a66b diff --git a/qtmqtt b/qtmqtt index 44864f4921d..d5201a8276e 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit 44864f4921d5dff0f3756469ba9fe9bf516ff274 +Subproject commit d5201a8276ef5ec015b85060419045df867736c1 diff --git a/qtmultimedia b/qtmultimedia index 2818092658e..017a23d39d8 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 2818092658eb9ed162d94de5e06aa6ab86e5205a +Subproject commit 017a23d39d84e5c2fc5d82d2915b47a3dafd089b diff --git a/qtopcua b/qtopcua index 2633a3ba22d..b6ee24f7cf5 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit 2633a3ba22d53c9b0559c3769ebd1885013725d9 +Subproject commit b6ee24f7cf5d04af35ede85573566b5723e77115 diff --git a/qtpositioning b/qtpositioning index 307b6f028fc..1e65a152bdc 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit 307b6f028fc0abda4989b2d0540982bd350765d4 +Subproject commit 1e65a152bdc40dcc9996fe09cfb99b179e29ce02 diff --git a/qtquick3d b/qtquick3d index eafb1405372..788d185bd14 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit eafb1405372a30935bfed5d79547934d5aa102c4 +Subproject commit 788d185bd148e6bce6917d8248321dd8b02ffb0f diff --git a/qtquick3dphysics b/qtquick3dphysics index 88029f7f2af..99e4b4077ee 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit 88029f7f2af8ef534a28f272a83516de8f736799 +Subproject commit 99e4b4077eeade4e71700bd279a0c89cc47fbe13 diff --git a/qtquickeffectmaker b/qtquickeffectmaker index 6960f5b325a..dc7d4398229 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit 6960f5b325a2598a36e538b90d30f20306358879 +Subproject commit dc7d4398229272d1e18a77977b5bafc7dc267920 diff --git a/qtquicktimeline b/qtquicktimeline index a7950ae687f..3b517f7a48d 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit a7950ae687f05677016a4c171355a47fe9855ddd +Subproject commit 3b517f7a48df38870b6c0eee10a9ef0510ac767c diff --git a/qtremoteobjects b/qtremoteobjects index f435f91aae2..8bc3f250dec 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit f435f91aae22261c7c5bcbf3a3a8a559b3f721b9 +Subproject commit 8bc3f250dec6ab616ea7b045f37bfb393e0cc85d diff --git a/qtscxml b/qtscxml index 45cc4ba3338..7784e878e15 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 45cc4ba333883e955f51db0cf82da747f947b24a +Subproject commit 7784e878e15b363597cc08de9d23c33b214635dd diff --git a/qtsensors b/qtsensors index 95570cc1cb4..7df2c721737 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 95570cc1cb4d379d6d94457a3f2a502577a575aa +Subproject commit 7df2c721737c3c97c836f803e6ab1cbd4cd1068e diff --git a/qtspeech b/qtspeech index ca7f2b7949c..0df388d61e2 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit ca7f2b7949c28b7ee626952d99aa76c58657ca1d +Subproject commit 0df388d61e224069d2c1a2313464ab91058df158 diff --git a/qttools b/qttools index d4354891ff1..bf6c7f3ded2 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit d4354891ff103469c50fb95b39eaa83edaba5db5 +Subproject commit bf6c7f3ded2608d2e2b206ba8de53cbd048c1851 diff --git a/qttranslations b/qttranslations index 863cc783ab1..1d8a78054ea 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 863cc783ab1b6b504b859e8ed5ffd59a98cee4c2 +Subproject commit 1d8a78054ea96bc01e24809d44cc9f4f2d697658 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 987571d59ae..4a2df5acc83 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 987571d59ae4d602e700169868aea1a11f8c95f3 +Subproject commit 4a2df5acc83d0da09fb3be0ed42a7fb8e42eb0ae diff --git a/qtwayland b/qtwayland index 3bbe0027d7a..a06618834ac 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 3bbe0027d7a6e2205c5df09a9118b1bca5dfdea8 +Subproject commit a06618834ac732fefccc43109c1269922a7eebe9 diff --git a/qtwebchannel b/qtwebchannel index 5d012df3886..5515d49116b 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 5d012df3886e4e214df05f61d26b3dcb0ff3dab9 +Subproject commit 5515d49116b633c3a2994561ad27e208e716a062 diff --git a/qtwebengine b/qtwebengine index aba1c597edf..6fbf00d9211 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit aba1c597edfd457acdc30118916269f21dd2230f +Subproject commit 6fbf00d9211a36bfcd994ac082d903c7106ca8e4 diff --git a/qtwebsockets b/qtwebsockets index 60b9863c16e..36ee5ea3282 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 60b9863c16ede39f1a4652f9fba7d9833c238fb4 +Subproject commit 36ee5ea32822e9e932f15be2727097496d58bb7e diff --git a/qtwebview b/qtwebview index 1aaca7b1bc6..136c9a5d016 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 1aaca7b1bc6c60330be4489e60d115e5fb14a35c +Subproject commit 136c9a5d016e189174df766c9d001da61edf909f From 36aa81cb1b96005db648c7b3adfa229f484657ee Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 26 Dec 2024 14:24:37 +0000 Subject: [PATCH 22/75] Update submodules on '6.9 in qt/qt5' Change-Id: Ib25a71094f2b9237f118769791c355c289929c09 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qt5compat | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtcharts | 2 +- qtcoap | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgraphs | 2 +- qtgrpc | 2 +- qthttpserver | 2 +- qtimageformats | 2 +- qtlanguageserver | 2 +- qtlocation | 2 +- qtlottie | 2 +- qtmqtt | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtopcua | 2 +- qtpositioning | 2 +- qtquick3d | 2 +- qtquick3dphysics | 2 +- qtquickeffectmaker | 2 +- qtquicktimeline | 2 +- qtremoteobjects | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtshadertools | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- 42 files changed, 42 insertions(+), 42 deletions(-) diff --git a/qt3d b/qt3d index 10ca17149da..a6805efabeb 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 10ca17149da17a23fd336cebf3cf16bf1033d3e2 +Subproject commit a6805efabebbbb871807ae3a7b16560857374e98 diff --git a/qt5compat b/qt5compat index 13d47c03f88..1ca873cbcbc 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 13d47c03f88eae03312e84852de3d7fd24fb8f5f +Subproject commit 1ca873cbcbcbe197ef32c3c30e3ea86cbac05d97 diff --git a/qtactiveqt b/qtactiveqt index 2068a6ae86b..5dd013d3767 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 2068a6ae86b3397f7e812f350add8876ef2c9472 +Subproject commit 5dd013d37677854b4f9cd3f0199909bfc10df946 diff --git a/qtbase b/qtbase index b6108318c2a..353d22756fa 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit b6108318c2a7e79c297e6fa7cdc9f6de88b6efa9 +Subproject commit 353d22756fa995e2f50e1af92f49728532cd29ff diff --git a/qtcharts b/qtcharts index 4129ee319be..1c769e0d1f5 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 4129ee319be1e66c471ace9494c9a904e5ac7ccf +Subproject commit 1c769e0d1f569d7b5151cc852555d608759a9b65 diff --git a/qtcoap b/qtcoap index cdfb095bb88..964b325eccf 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit cdfb095bb88d30c03656bb7b43f72adad40a819a +Subproject commit 964b325eccfe214f46c594efe5b151f2064ceb0d diff --git a/qtconnectivity b/qtconnectivity index ec6118c19ae..fc0abcc12b1 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit ec6118c19ae2c5dcf8cafe880b9ee50bba3075b7 +Subproject commit fc0abcc12b10f856b0968ac8e493982aca471a95 diff --git a/qtdatavis3d b/qtdatavis3d index 20a9fe2f5bb..9cc6626e524 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 20a9fe2f5bbd0f5285b3e8d0602063fc9f1e37fd +Subproject commit 9cc6626e5243fa991441e48538567164389b90e8 diff --git a/qtdeclarative b/qtdeclarative index e6cae22239a..42c63d71ae6 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit e6cae22239a68b68cf3fed39ce0c409ca633564f +Subproject commit 42c63d71ae64d859ffcf572bae0754f34cb8c532 diff --git a/qtdoc b/qtdoc index 60ebc81ce33..792a90a9fd7 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 60ebc81ce33c29eecb308c69a1e977b4248264ee +Subproject commit 792a90a9fd74a6f7f05adb3080ef744d258a1aad diff --git a/qtgraphs b/qtgraphs index 901993c22b5..e54b818a84e 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit 901993c22b5267d6eff387de16286f62caa1110d +Subproject commit e54b818a84e0f97611aefa6a2645b5dddc0c860a diff --git a/qtgrpc b/qtgrpc index c6f91edcdc9..12b5373a117 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit c6f91edcdc965f03f0a2077656d913311eec2dc5 +Subproject commit 12b5373a1178447dab0c7c03a416e6a81bf9f0b9 diff --git a/qthttpserver b/qthttpserver index 37b0cd5be8a..0a4a8fcd1a5 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit 37b0cd5be8a4795cf2497e0aa9a7e54938ada053 +Subproject commit 0a4a8fcd1a56a939a9a8369c57e567a0b114a6d1 diff --git a/qtimageformats b/qtimageformats index 41ef5001d89..8bf181b56fd 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 41ef5001d892c64d2e70db2080f68e212a315170 +Subproject commit 8bf181b56fd828c1b32812000160fcf22fb46343 diff --git a/qtlanguageserver b/qtlanguageserver index 253c2e70e7f..f696f899e9c 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit 253c2e70e7fcb519b068d73f0174894655055ec6 +Subproject commit f696f899e9ce8226dc38c88eb1072169656ecbbc diff --git a/qtlocation b/qtlocation index acf7ff8c033..0b34240f39d 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit acf7ff8c0337e92d4eebd509c9cba3868a76e575 +Subproject commit 0b34240f39db3c26f45d59bce6cf589835edfd45 diff --git a/qtlottie b/qtlottie index 85dd56668bc..831975b450a 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 85dd56668bc76feddbedfb275bba3949c0c4a66b +Subproject commit 831975b450aded0c68bfa59ea75c295f1be8ae16 diff --git a/qtmqtt b/qtmqtt index d5201a8276e..a13cf30feae 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit d5201a8276ef5ec015b85060419045df867736c1 +Subproject commit a13cf30feae48ba3628dc6a29e4b86d60cce70de diff --git a/qtmultimedia b/qtmultimedia index 017a23d39d8..ac6be322e2e 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 017a23d39d84e5c2fc5d82d2915b47a3dafd089b +Subproject commit ac6be322e2e49c46ae0f859c2a72274c574cd4c8 diff --git a/qtnetworkauth b/qtnetworkauth index d1578d76282..06d4a83e099 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit d1578d7628244df4eeb3dc8a338bbd22c050cd5d +Subproject commit 06d4a83e0994015ded7e4f5d225f9d1ceda0ef31 diff --git a/qtopcua b/qtopcua index b6ee24f7cf5..8ffa5f25c8a 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit b6ee24f7cf5d04af35ede85573566b5723e77115 +Subproject commit 8ffa5f25c8a08db7d66536591a676241e6e67b94 diff --git a/qtpositioning b/qtpositioning index 1e65a152bdc..d5564893bac 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit 1e65a152bdc40dcc9996fe09cfb99b179e29ce02 +Subproject commit d5564893bac479da222fe15a42612b268c34feb9 diff --git a/qtquick3d b/qtquick3d index 788d185bd14..15ec2b66a8d 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 788d185bd148e6bce6917d8248321dd8b02ffb0f +Subproject commit 15ec2b66a8db562b29ecdcf506a4c4fc2d3c1951 diff --git a/qtquick3dphysics b/qtquick3dphysics index 99e4b4077ee..cda1be93136 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit 99e4b4077eeade4e71700bd279a0c89cc47fbe13 +Subproject commit cda1be93136a6ea946b7ebc3ffe1f59c2693bc3b diff --git a/qtquickeffectmaker b/qtquickeffectmaker index dc7d4398229..79e7c4f46f3 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit dc7d4398229272d1e18a77977b5bafc7dc267920 +Subproject commit 79e7c4f46f3579e4c58e4b988bd5b986d4fa4970 diff --git a/qtquicktimeline b/qtquicktimeline index 3b517f7a48d..91290cac685 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 3b517f7a48df38870b6c0eee10a9ef0510ac767c +Subproject commit 91290cac6856c107a2cff7c2e687c63eb7ab0129 diff --git a/qtremoteobjects b/qtremoteobjects index 8bc3f250dec..f3a0fab5a78 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 8bc3f250dec6ab616ea7b045f37bfb393e0cc85d +Subproject commit f3a0fab5a78cbdc63fe3160124eb74afe70a9824 diff --git a/qtscxml b/qtscxml index 7784e878e15..7041a542b6f 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 7784e878e15b363597cc08de9d23c33b214635dd +Subproject commit 7041a542b6f72ceb4a52fc43aa9e892f0cae35f8 diff --git a/qtsensors b/qtsensors index 7df2c721737..b8cf0d93245 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 7df2c721737c3c97c836f803e6ab1cbd4cd1068e +Subproject commit b8cf0d93245e89839db0ab8a82392f0b67858749 diff --git a/qtserialbus b/qtserialbus index 64b6e8022ab..867168574a6 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 64b6e8022ab83071b4dea0222a1b83349e5a3e4e +Subproject commit 867168574a6c22160515f3e4d3811e6a32dedd32 diff --git a/qtserialport b/qtserialport index f4b2a167dfb..edee4efa918 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit f4b2a167dfbe4ae62a42111d707865d198b8a6d9 +Subproject commit edee4efa918d75c0407516effbfd6dedc5a9ef38 diff --git a/qtshadertools b/qtshadertools index 2bd5c126d33..a662257faef 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 2bd5c126d335946498f1ad7f7f19841969b24ee3 +Subproject commit a662257faeff125fac550df67bb0023fddced4e7 diff --git a/qtspeech b/qtspeech index 0df388d61e2..8234dbbfe09 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 0df388d61e224069d2c1a2313464ab91058df158 +Subproject commit 8234dbbfe09fc315593336347c7b8d426935adf9 diff --git a/qtsvg b/qtsvg index ed17d67c0b2..d0443a2bf30 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit ed17d67c0b2761c278d5261a50e1ced2c37c7d9d +Subproject commit d0443a2bf30243a7126ed6cb9c5b84e967e8d188 diff --git a/qttools b/qttools index bf6c7f3ded2..067c7d94f76 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit bf6c7f3ded2608d2e2b206ba8de53cbd048c1851 +Subproject commit 067c7d94f763624e8792c06da2c2d2f377a35b6b diff --git a/qttranslations b/qttranslations index 1d8a78054ea..74c5ea26f69 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 1d8a78054ea96bc01e24809d44cc9f4f2d697658 +Subproject commit 74c5ea26f692f4e1ee18de391987e526d7662aee diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 4a2df5acc83..b901891bdc6 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 4a2df5acc83d0da09fb3be0ed42a7fb8e42eb0ae +Subproject commit b901891bdc6f8ff37b258acc1d8e15ee948133b4 diff --git a/qtwayland b/qtwayland index a06618834ac..8d8d6c58685 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit a06618834ac732fefccc43109c1269922a7eebe9 +Subproject commit 8d8d6c586851ee00ed3695e70a6af85212f8e3e7 diff --git a/qtwebchannel b/qtwebchannel index 5515d49116b..635aec5668d 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 5515d49116b633c3a2994561ad27e208e716a062 +Subproject commit 635aec5668dda94931ac1f21a82830fbff5c4fcd diff --git a/qtwebengine b/qtwebengine index 6fbf00d9211..aa549396bca 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 6fbf00d9211a36bfcd994ac082d903c7106ca8e4 +Subproject commit aa549396bca718dc26221d6d8d20051ab08b1b69 diff --git a/qtwebsockets b/qtwebsockets index 36ee5ea3282..44cc0334ffd 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 36ee5ea32822e9e932f15be2727097496d58bb7e +Subproject commit 44cc0334ffde8670af23fb378327ea90c0489435 diff --git a/qtwebview b/qtwebview index 136c9a5d016..9b50047e4bf 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 136c9a5d016e189174df766c9d001da61edf909f +Subproject commit 9b50047e4bf0bb8c15147150d256af21f3d0478d From 34f15ccd11f19421e75aab9e4010d395f54c48ea Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 27 Dec 2024 16:41:00 +0000 Subject: [PATCH 23/75] Update submodules on '6.9 in qt/qt5' Change-Id: I9121e04c3187d48dc380164b307be4eaeda6c7f8 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qt5compat | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtcharts | 2 +- qtcoap | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgraphs | 2 +- qtgrpc | 2 +- qthttpserver | 2 +- qtimageformats | 2 +- qtlanguageserver | 2 +- qtlocation | 2 +- qtlottie | 2 +- qtmqtt | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtopcua | 2 +- qtpositioning | 2 +- qtquick3d | 2 +- qtquick3dphysics | 2 +- qtquickeffectmaker | 2 +- qtquicktimeline | 2 +- qtremoteobjects | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtshadertools | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- 42 files changed, 42 insertions(+), 42 deletions(-) diff --git a/qt3d b/qt3d index a6805efabeb..433b16bc6c9 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit a6805efabebbbb871807ae3a7b16560857374e98 +Subproject commit 433b16bc6c96e01e4c2730cd8eefa8dc38f9d76b diff --git a/qt5compat b/qt5compat index 1ca873cbcbc..8b4569819b7 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 1ca873cbcbcbe197ef32c3c30e3ea86cbac05d97 +Subproject commit 8b4569819b7e1597de0aff0fd5573a7dfce98e1d diff --git a/qtactiveqt b/qtactiveqt index 5dd013d3767..589f46ac451 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 5dd013d37677854b4f9cd3f0199909bfc10df946 +Subproject commit 589f46ac4513c347f0c5e508aa3279191fe47c1f diff --git a/qtbase b/qtbase index 353d22756fa..5e6fa3dbc5a 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 353d22756fa995e2f50e1af92f49728532cd29ff +Subproject commit 5e6fa3dbc5abc765c60463fa101692bf40c6055b diff --git a/qtcharts b/qtcharts index 1c769e0d1f5..fbde72732ac 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 1c769e0d1f569d7b5151cc852555d608759a9b65 +Subproject commit fbde72732acf71d8b2847afae520b8d0ec67ed8c diff --git a/qtcoap b/qtcoap index 964b325eccf..aa077d2097e 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit 964b325eccfe214f46c594efe5b151f2064ceb0d +Subproject commit aa077d2097e726b9d61b22db5bdad5a880d26416 diff --git a/qtconnectivity b/qtconnectivity index fc0abcc12b1..ac7ad8efff9 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit fc0abcc12b10f856b0968ac8e493982aca471a95 +Subproject commit ac7ad8efff9f956e44e636003eedb53d007028ad diff --git a/qtdatavis3d b/qtdatavis3d index 9cc6626e524..30e87ad0be5 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 9cc6626e5243fa991441e48538567164389b90e8 +Subproject commit 30e87ad0be59dbc26254ee7a412c3daab7584b1d diff --git a/qtdeclarative b/qtdeclarative index 42c63d71ae6..a2f60de72c7 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 42c63d71ae64d859ffcf572bae0754f34cb8c532 +Subproject commit a2f60de72c7ea5e172e7d036123c260a43e332e9 diff --git a/qtdoc b/qtdoc index 792a90a9fd7..b8f04d057b3 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 792a90a9fd74a6f7f05adb3080ef744d258a1aad +Subproject commit b8f04d057b30bbd823e65928cf65ccf956f09ae9 diff --git a/qtgraphs b/qtgraphs index e54b818a84e..2d79afac3b7 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit e54b818a84e0f97611aefa6a2645b5dddc0c860a +Subproject commit 2d79afac3b705ecfc20feb003d783a2b1a88e85d diff --git a/qtgrpc b/qtgrpc index 12b5373a117..fc2a4c6f652 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit 12b5373a1178447dab0c7c03a416e6a81bf9f0b9 +Subproject commit fc2a4c6f652efe76ea934b74464067193c056f12 diff --git a/qthttpserver b/qthttpserver index 0a4a8fcd1a5..94dd0d94866 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit 0a4a8fcd1a56a939a9a8369c57e567a0b114a6d1 +Subproject commit 94dd0d9486686d281d8917223052f2d3da6925f3 diff --git a/qtimageformats b/qtimageformats index 8bf181b56fd..7c73fb0440d 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 8bf181b56fd828c1b32812000160fcf22fb46343 +Subproject commit 7c73fb0440d96b7ed29828de65438f5bc40feb77 diff --git a/qtlanguageserver b/qtlanguageserver index f696f899e9c..1539b932602 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit f696f899e9ce8226dc38c88eb1072169656ecbbc +Subproject commit 1539b932602fb1b6983f0855d000605b0f5841b4 diff --git a/qtlocation b/qtlocation index 0b34240f39d..9d70ff0b2f9 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 0b34240f39db3c26f45d59bce6cf589835edfd45 +Subproject commit 9d70ff0b2f927311d6543b56e4888d687e52f19a diff --git a/qtlottie b/qtlottie index 831975b450a..21790d69faa 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 831975b450aded0c68bfa59ea75c295f1be8ae16 +Subproject commit 21790d69faacc277727649cf4c104b8b78ddbb49 diff --git a/qtmqtt b/qtmqtt index a13cf30feae..bf9477ab41d 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit a13cf30feae48ba3628dc6a29e4b86d60cce70de +Subproject commit bf9477ab41d3e4d9b1abffbb99821843e4c3170f diff --git a/qtmultimedia b/qtmultimedia index ac6be322e2e..230f1be30d5 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit ac6be322e2e49c46ae0f859c2a72274c574cd4c8 +Subproject commit 230f1be30d5d333eb32bbd6b1a2670d9e1169f2d diff --git a/qtnetworkauth b/qtnetworkauth index 06d4a83e099..5fc08e613a7 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 06d4a83e0994015ded7e4f5d225f9d1ceda0ef31 +Subproject commit 5fc08e613a79c72e7eecee5441be3816d1cf2c83 diff --git a/qtopcua b/qtopcua index 8ffa5f25c8a..e5b2e673ed2 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit 8ffa5f25c8a08db7d66536591a676241e6e67b94 +Subproject commit e5b2e673ed2e9fa32f9fa6a87678fe7b85723ab7 diff --git a/qtpositioning b/qtpositioning index d5564893bac..49cb9a5738c 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit d5564893bac479da222fe15a42612b268c34feb9 +Subproject commit 49cb9a5738c92e25e2f9d163bd5077211cfcd65c diff --git a/qtquick3d b/qtquick3d index 15ec2b66a8d..dc8cee2ff29 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 15ec2b66a8db562b29ecdcf506a4c4fc2d3c1951 +Subproject commit dc8cee2ff29a5a58d21aa78262fb9789058139b8 diff --git a/qtquick3dphysics b/qtquick3dphysics index cda1be93136..a869adec6c2 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit cda1be93136a6ea946b7ebc3ffe1f59c2693bc3b +Subproject commit a869adec6c2b5a0a817d390ce089349a9a021272 diff --git a/qtquickeffectmaker b/qtquickeffectmaker index 79e7c4f46f3..a8aa525eca0 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit 79e7c4f46f3579e4c58e4b988bd5b986d4fa4970 +Subproject commit a8aa525eca0b3b3c7a59b1d48ddb37d4004db5cc diff --git a/qtquicktimeline b/qtquicktimeline index 91290cac685..27ac280a783 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 91290cac6856c107a2cff7c2e687c63eb7ab0129 +Subproject commit 27ac280a7835cc84760bed3bf42f63b734327c5f diff --git a/qtremoteobjects b/qtremoteobjects index f3a0fab5a78..b8c100805c0 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit f3a0fab5a78cbdc63fe3160124eb74afe70a9824 +Subproject commit b8c100805c04f57415894243c8515914553d69c9 diff --git a/qtscxml b/qtscxml index 7041a542b6f..000dfc3a985 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 7041a542b6f72ceb4a52fc43aa9e892f0cae35f8 +Subproject commit 000dfc3a9853a1e7d459ebcfc88b0b8992063730 diff --git a/qtsensors b/qtsensors index b8cf0d93245..c47482eabb4 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit b8cf0d93245e89839db0ab8a82392f0b67858749 +Subproject commit c47482eabb4ea0224fb9b0127ea03086a9f5898e diff --git a/qtserialbus b/qtserialbus index 867168574a6..7494026db4d 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 867168574a6c22160515f3e4d3811e6a32dedd32 +Subproject commit 7494026db4d8a65a4932ce16c3f197bd9d132901 diff --git a/qtserialport b/qtserialport index edee4efa918..709a2baa264 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit edee4efa918d75c0407516effbfd6dedc5a9ef38 +Subproject commit 709a2baa264792663d2ae933ba2a61cba3d07e04 diff --git a/qtshadertools b/qtshadertools index a662257faef..e5b742e73ae 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit a662257faeff125fac550df67bb0023fddced4e7 +Subproject commit e5b742e73aecf206b2d1a187ed88bb756ae2dae6 diff --git a/qtspeech b/qtspeech index 8234dbbfe09..6a8983aeaac 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 8234dbbfe09fc315593336347c7b8d426935adf9 +Subproject commit 6a8983aeaac574ce132845bd9a20e10131e470bb diff --git a/qtsvg b/qtsvg index d0443a2bf30..330976bd4a7 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit d0443a2bf30243a7126ed6cb9c5b84e967e8d188 +Subproject commit 330976bd4a7862e64ea6b2d780de255dec0381ec diff --git a/qttools b/qttools index 067c7d94f76..e1d58e9f8b3 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 067c7d94f763624e8792c06da2c2d2f377a35b6b +Subproject commit e1d58e9f8b33512312ad33e2ccd7b2815baa7140 diff --git a/qttranslations b/qttranslations index 74c5ea26f69..9653abd18e7 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 74c5ea26f692f4e1ee18de391987e526d7662aee +Subproject commit 9653abd18e7074e2b82100e640682eb7c5e4890a diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index b901891bdc6..21e435bf47f 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit b901891bdc6f8ff37b258acc1d8e15ee948133b4 +Subproject commit 21e435bf47f3fbe141e340870ab58d4deeec4b27 diff --git a/qtwayland b/qtwayland index 8d8d6c58685..4c63789ea44 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 8d8d6c586851ee00ed3695e70a6af85212f8e3e7 +Subproject commit 4c63789ea44f31f44d86cedb446503727fa66dbb diff --git a/qtwebchannel b/qtwebchannel index 635aec5668d..3897b06b347 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 635aec5668dda94931ac1f21a82830fbff5c4fcd +Subproject commit 3897b06b347354ff43e72138f6b15839980961d4 diff --git a/qtwebengine b/qtwebengine index aa549396bca..e8ae4b3d6da 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit aa549396bca718dc26221d6d8d20051ab08b1b69 +Subproject commit e8ae4b3d6da276dbb53ff5ded647836943b0598a diff --git a/qtwebsockets b/qtwebsockets index 44cc0334ffd..5ede5ffdc97 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 44cc0334ffde8670af23fb378327ea90c0489435 +Subproject commit 5ede5ffdc975349ad6ce05c226e093754d95141e diff --git a/qtwebview b/qtwebview index 9b50047e4bf..aeb9be65e41 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 9b50047e4bf0bb8c15147150d256af21f3d0478d +Subproject commit aeb9be65e4174a96e438a38855ae0809390080d9 From d777fa29268961196411ef7ebd87262fa93ccb1a Mon Sep 17 00:00:00 2001 From: Elias Toivola Date: Wed, 4 Dec 2024 13:47:13 +0200 Subject: [PATCH 24/75] Android: update emulator version to 35.2.10 The newest stable version of Android emulator should bring more stability. Pick-to: 6.8 6.5 Fixes: QTQAINFRA-6805 Change-Id: Id67d3ec888b486e6aae862588928528788583aae Reviewed-by: Assam Boudjelthia (cherry picked from commit 9078baf0a9b7cb9e56ff681d19b60737532973a0) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/common/linux/android_linux.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index 96b67a17ce2..9f2814ac184 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -136,12 +136,12 @@ cd "$sdkTargetFolder/cmdline-tools/tools/bin" ./sdkmanager --install "emulator" --sdk_root="$sdkTargetFolder" \ | eval "$sdkmanager_no_progress_bar_cmd" -echo "Download and unzip Android Emulator version 34.1.19" -emulatorFileName="emulator-linux_x64-11525734.zip" +echo "Download and unzip Android Emulator version 35.2.10" +emulatorFileName="emulator-linux_x64-12414864.zip" emulatorCiUrl="https://ci-files01-hki.ci.qt.io/input/android/$emulatorFileName" emulatorUrl="http://dl.google.com/android/repository/$emulatorFileName" emulatorTargetFile="$sdkTargetFolder/$emulatorFileName" -emulatorSha1="d6cc94109b081c5f6042dcb71a453144f7e62ce7" +emulatorSha1="41dd213d120f727d8c3840347d234b135793ba10" DownloadURL "$emulatorCiUrl" "$emulatorUrl" "$emulatorSha1" "$emulatorTargetFile" echo "Unzipping the Android Emulator to '$sdkTargetFolder'" sudo unzip -o -q "$emulatorTargetFile" -d "$sdkTargetFolder" From 5e74968c61cc1e0bb421aa7c862261f35833cf14 Mon Sep 17 00:00:00 2001 From: Tero Heikkinen Date: Tue, 3 Dec 2024 22:30:38 +0200 Subject: [PATCH 25/75] Provisioning: Add missing Vulkan library to Windows on ARM Fixes: QTQAINFRA-6830 Pick-to: 6.8 Change-Id: Ia074c55ddd20414f0d6b0dbcc674cc8eb82b1cf8 Reviewed-by: Axel Spoerl Reviewed-by: Jonas Karlsson (cherry picked from commit e17927996244732778b9a5b0e72211ea1e9e0937) Reviewed-by: Qt Cherry-pick Bot --- .../provisioning/common/windows/vulkansdk.ps1 | 31 ++++++++++++++++--- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/coin/provisioning/common/windows/vulkansdk.ps1 b/coin/provisioning/common/windows/vulkansdk.ps1 index aeeff69669f..57fd63a1987 100644 --- a/coin/provisioning/common/windows/vulkansdk.ps1 +++ b/coin/provisioning/common/windows/vulkansdk.ps1 @@ -6,13 +6,36 @@ # This script will install Vulkan SDK # Original Download page: https://vulkan.lunarg.com/sdk/home#windows -$version = "1.2.182.0" +$cpu_arch = Get-CpuArchitecture +Write-Host "Installing $cpu_arch Vulkan SDK" +$version = "1.2.182.0" # TODO: Update to newest 1.3.296.0 +switch ($cpu_arch) { + arm64 { + $version = "1.3.296.0" + $externalUrl = "https://sdk.lunarg.com/sdk/download/$version/warm/InstallVulkanARM64-$version.exe" + $internalUrl = "\\ci-files01-hki.ci.qt.io\provisioning\windows\InstallVulkanARM64-$version.exe" + $sha1 = "7d47d8dd10c09d363e6103925c4a032abf7b2c02" + $installArgs = "--accept-licenses --default-answer --confirm-command install" + Break + } + x64 { + $externalUrl = "https://sdk.lunarg.com/sdk/download/$version/windows/VulkanSDK-$version-Installer.exe" + $internalUrl = "\\ci-files01-hki.ci.qt.io\provisioning\windows\VulkanSDK-$version-Installer.exe" + $sha1 = "1b662f338bfbfdd00fb9b0c09113eacb94f68a0e" + $installArgs = "/S" + Break + } + default { + throw "Unknown architecture $cpu_arch" + } +} + $vulkanPackage = "C:\Windows\Temp\vulkan-installer-$version.exe" -$sha1 = "1b662f338bfbfdd00fb9b0c09113eacb94f68a0e" -Download "https://sdk.lunarg.com/sdk/download/1.2.182.0/windows/VulkanSDK-$version-Installer.exe" "\\ci-files01-hki.ci.qt.io\provisioning\windows\VulkanSDK-$version-Installer.exe" $vulkanPackage + +Download "$externalUrl" "$internalUrl" "$vulkanPackage" Verify-Checksum "$vulkanPackage" "$sha1" -Run-Executable $vulkanPackage "/S" +Run-Executable "$vulkanPackage" "$installArgs" Write-Host "Cleaning $vulkanPackage.." Remove "$vulkanPackage" From 9bfbeb48d9ba94510ac2d160b6351dc57836bb52 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 30 Dec 2024 18:36:54 +0000 Subject: [PATCH 26/75] Update submodules on '6.9 in qt/qt5' Change-Id: I6ec4a671624dc0189fa0ec4b56447b5e93dda99b Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qt5compat | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtcharts | 2 +- qtcoap | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgraphs | 2 +- qtgrpc | 2 +- qthttpserver | 2 +- qtimageformats | 2 +- qtlanguageserver | 2 +- qtlocation | 2 +- qtlottie | 2 +- qtmqtt | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtopcua | 2 +- qtpositioning | 2 +- qtquick3d | 2 +- qtquick3dphysics | 2 +- qtquickeffectmaker | 2 +- qtquicktimeline | 2 +- qtremoteobjects | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtshadertools | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- 42 files changed, 42 insertions(+), 42 deletions(-) diff --git a/qt3d b/qt3d index 433b16bc6c9..46d698b0006 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 433b16bc6c96e01e4c2730cd8eefa8dc38f9d76b +Subproject commit 46d698b0006470eaebfe9fc61c1045b2eb9ffc15 diff --git a/qt5compat b/qt5compat index 8b4569819b7..119765e04d2 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 8b4569819b7e1597de0aff0fd5573a7dfce98e1d +Subproject commit 119765e04d2c1d43cf8e9d77aebae359c32bba93 diff --git a/qtactiveqt b/qtactiveqt index 589f46ac451..3dad1237487 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 589f46ac4513c347f0c5e508aa3279191fe47c1f +Subproject commit 3dad1237487ddfeb75b00e652d9cd12ae0d60b20 diff --git a/qtbase b/qtbase index 5e6fa3dbc5a..d39c4933902 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 5e6fa3dbc5abc765c60463fa101692bf40c6055b +Subproject commit d39c493390202faaa51e4f8ccede82acfdf07f5e diff --git a/qtcharts b/qtcharts index fbde72732ac..13fd82e6b8c 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit fbde72732acf71d8b2847afae520b8d0ec67ed8c +Subproject commit 13fd82e6b8cea339f189267bb94936b1f80a9eda diff --git a/qtcoap b/qtcoap index aa077d2097e..23a3f4f286d 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit aa077d2097e726b9d61b22db5bdad5a880d26416 +Subproject commit 23a3f4f286d3190b1bd5411fbdf1030f08788ecb diff --git a/qtconnectivity b/qtconnectivity index ac7ad8efff9..0b05acb0d5f 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit ac7ad8efff9f956e44e636003eedb53d007028ad +Subproject commit 0b05acb0d5f3aa96ecc6de67e1deeeb52d476d1f diff --git a/qtdatavis3d b/qtdatavis3d index 30e87ad0be5..7d020b1c13e 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 30e87ad0be59dbc26254ee7a412c3daab7584b1d +Subproject commit 7d020b1c13ed6a055395ee4e23309172de049e36 diff --git a/qtdeclarative b/qtdeclarative index a2f60de72c7..3d0dfd4a4e4 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit a2f60de72c7ea5e172e7d036123c260a43e332e9 +Subproject commit 3d0dfd4a4e4c1bf179b328dbbcca15dcc65b1e51 diff --git a/qtdoc b/qtdoc index b8f04d057b3..f4d64372cfd 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit b8f04d057b30bbd823e65928cf65ccf956f09ae9 +Subproject commit f4d64372cfd502d73064d6b11a9c2cb0cb181a87 diff --git a/qtgraphs b/qtgraphs index 2d79afac3b7..8e9fe5e673f 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit 2d79afac3b705ecfc20feb003d783a2b1a88e85d +Subproject commit 8e9fe5e673f294ea329078210a732325e13f572f diff --git a/qtgrpc b/qtgrpc index fc2a4c6f652..3be2508b76b 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit fc2a4c6f652efe76ea934b74464067193c056f12 +Subproject commit 3be2508b76b3b7cb42f4b4cb36c63c6190ec0258 diff --git a/qthttpserver b/qthttpserver index 94dd0d94866..3b34b46c8da 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit 94dd0d9486686d281d8917223052f2d3da6925f3 +Subproject commit 3b34b46c8da0c00ec82e546385d6aaccb192969d diff --git a/qtimageformats b/qtimageformats index 7c73fb0440d..3ea91c00e54 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 7c73fb0440d96b7ed29828de65438f5bc40feb77 +Subproject commit 3ea91c00e54e1bf26bf97416df01c2236649dc70 diff --git a/qtlanguageserver b/qtlanguageserver index 1539b932602..d61ce4ea558 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit 1539b932602fb1b6983f0855d000605b0f5841b4 +Subproject commit d61ce4ea558de7f23d6c7d44b55b28d38540869a diff --git a/qtlocation b/qtlocation index 9d70ff0b2f9..46d4c666347 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 9d70ff0b2f927311d6543b56e4888d687e52f19a +Subproject commit 46d4c666347235ab3ab2e49c87578650bbb782d2 diff --git a/qtlottie b/qtlottie index 21790d69faa..3c6cf39dca8 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 21790d69faacc277727649cf4c104b8b78ddbb49 +Subproject commit 3c6cf39dca8f1f59933cbc5f178b86244afe09c5 diff --git a/qtmqtt b/qtmqtt index bf9477ab41d..410fefdcf05 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit bf9477ab41d3e4d9b1abffbb99821843e4c3170f +Subproject commit 410fefdcf05e16d61c831a0a443b38aefebdeed3 diff --git a/qtmultimedia b/qtmultimedia index 230f1be30d5..704de0def3c 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 230f1be30d5d333eb32bbd6b1a2670d9e1169f2d +Subproject commit 704de0def3c1644c439f7228acbc9c68ad058ff9 diff --git a/qtnetworkauth b/qtnetworkauth index 5fc08e613a7..7830d5c8f7f 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 5fc08e613a79c72e7eecee5441be3816d1cf2c83 +Subproject commit 7830d5c8f7fecb8f8f0db64d7ec0c24f5e61ff6a diff --git a/qtopcua b/qtopcua index e5b2e673ed2..e5470828083 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit e5b2e673ed2e9fa32f9fa6a87678fe7b85723ab7 +Subproject commit e547082808373e751d6de1f053169b82d4806a1d diff --git a/qtpositioning b/qtpositioning index 49cb9a5738c..fcb2d111ea6 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit 49cb9a5738c92e25e2f9d163bd5077211cfcd65c +Subproject commit fcb2d111ea68fe0b5d868aca7db9a1277c25f51b diff --git a/qtquick3d b/qtquick3d index dc8cee2ff29..1fdfa39ebe1 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit dc8cee2ff29a5a58d21aa78262fb9789058139b8 +Subproject commit 1fdfa39ebe121e270956f1b83879694aad8688c7 diff --git a/qtquick3dphysics b/qtquick3dphysics index a869adec6c2..777656cc496 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit a869adec6c2b5a0a817d390ce089349a9a021272 +Subproject commit 777656cc4968b5bba5548b4939e402db0d055405 diff --git a/qtquickeffectmaker b/qtquickeffectmaker index a8aa525eca0..d00eb426ac5 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit a8aa525eca0b3b3c7a59b1d48ddb37d4004db5cc +Subproject commit d00eb426ac5c6fddf9448c840392f833b6e53c20 diff --git a/qtquicktimeline b/qtquicktimeline index 27ac280a783..4aab5077af8 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 27ac280a7835cc84760bed3bf42f63b734327c5f +Subproject commit 4aab5077af882f06c05004a43d606ed1494b69c6 diff --git a/qtremoteobjects b/qtremoteobjects index b8c100805c0..22bcfd4af7e 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit b8c100805c04f57415894243c8515914553d69c9 +Subproject commit 22bcfd4af7ef86b78a080b4035b49220b5792f08 diff --git a/qtscxml b/qtscxml index 000dfc3a985..620f287e877 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 000dfc3a9853a1e7d459ebcfc88b0b8992063730 +Subproject commit 620f287e877f58d898e7d3efefebbb6748f31552 diff --git a/qtsensors b/qtsensors index c47482eabb4..9dddf47073c 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit c47482eabb4ea0224fb9b0127ea03086a9f5898e +Subproject commit 9dddf47073c8e80312e66e1ee462aedc82e81a66 diff --git a/qtserialbus b/qtserialbus index 7494026db4d..53bfe77250e 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 7494026db4d8a65a4932ce16c3f197bd9d132901 +Subproject commit 53bfe77250e48114f5e60622ef77920cf46add00 diff --git a/qtserialport b/qtserialport index 709a2baa264..53ccd9bebf1 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 709a2baa264792663d2ae933ba2a61cba3d07e04 +Subproject commit 53ccd9bebf178e1bd3375222513794eae0d99f70 diff --git a/qtshadertools b/qtshadertools index e5b742e73ae..e28d661686a 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit e5b742e73aecf206b2d1a187ed88bb756ae2dae6 +Subproject commit e28d661686ab2ba51072aa1c155fcef677ec372b diff --git a/qtspeech b/qtspeech index 6a8983aeaac..f331fc3c1ef 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 6a8983aeaac574ce132845bd9a20e10131e470bb +Subproject commit f331fc3c1ef184cde56b9df3bfb41ade0087f590 diff --git a/qtsvg b/qtsvg index 330976bd4a7..f669a075a4a 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 330976bd4a7862e64ea6b2d780de255dec0381ec +Subproject commit f669a075a4afbde6711abaa2b9fd42059739a138 diff --git a/qttools b/qttools index e1d58e9f8b3..f2b24689e52 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit e1d58e9f8b33512312ad33e2ccd7b2815baa7140 +Subproject commit f2b24689e52c86f91c5a2da0c02d662f7b55cff7 diff --git a/qttranslations b/qttranslations index 9653abd18e7..fdbcbef076d 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 9653abd18e7074e2b82100e640682eb7c5e4890a +Subproject commit fdbcbef076dc6764abc6a4d16c0213a8f8989ca0 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 21e435bf47f..6070d9f61c9 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 21e435bf47f3fbe141e340870ab58d4deeec4b27 +Subproject commit 6070d9f61c953a664ae5c4cfdc56d9282d56c972 diff --git a/qtwayland b/qtwayland index 4c63789ea44..62cd5566d87 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 4c63789ea44f31f44d86cedb446503727fa66dbb +Subproject commit 62cd5566d8730385c07f2a44ce6fda9abfc2cb54 diff --git a/qtwebchannel b/qtwebchannel index 3897b06b347..b5d864a65c9 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 3897b06b347354ff43e72138f6b15839980961d4 +Subproject commit b5d864a65c95476c76184d8926e1e3d0a9abc5ef diff --git a/qtwebengine b/qtwebengine index e8ae4b3d6da..785dcab5d65 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit e8ae4b3d6da276dbb53ff5ded647836943b0598a +Subproject commit 785dcab5d65a15370ca806c06cd370cf700bea4c diff --git a/qtwebsockets b/qtwebsockets index 5ede5ffdc97..be2d4a3315f 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 5ede5ffdc975349ad6ce05c226e093754d95141e +Subproject commit be2d4a3315f99cb121405826f6fc81b104bfc1dd diff --git a/qtwebview b/qtwebview index aeb9be65e41..0f5bdb00faa 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit aeb9be65e4174a96e438a38855ae0809390080d9 +Subproject commit 0f5bdb00faa9aba20a9c6d7df4f53640c18d18fd From db53942a70a85547045686a1242f2303a226d42f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johanna=20=C3=84ij=C3=A4l=C3=A4?= Date: Tue, 10 Dec 2024 13:34:47 +0200 Subject: [PATCH 27/75] Provisioning: update Squish 8.1 Remove Squish provisioning from Debian11.6: Squish wont work due GLIBC versiom mismatch. Pick-to: 6.8 Pick-to: 6.8 Change-Id: I7bac15d585a87b402e41c9ab09099e2cabbd09d1 Reviewed-by: Matti Paaso (cherry picked from commit 30a5af347f9375931ee6586271da3dc0f0841aa9) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/common/unix/squishInstall.sh | 10 +++++----- coin/provisioning/common/windows/squishInstall.ps1 | 6 +++--- .../qtci-linux-Debian-11.6-aarch64/90-squish.sh | 6 ------ 3 files changed, 8 insertions(+), 14 deletions(-) delete mode 100644 coin/provisioning/qtci-linux-Debian-11.6-aarch64/90-squish.sh diff --git a/coin/provisioning/common/unix/squishInstall.sh b/coin/provisioning/common/unix/squishInstall.sh index 5f9dc48b0c8..1741cda3aea 100755 --- a/coin/provisioning/common/unix/squishInstall.sh +++ b/coin/provisioning/common/unix/squishInstall.sh @@ -11,8 +11,8 @@ set -ex # This script will fetch and extract pre-buildt squish package for Linux and Mac. # Squish is need by Release Test Automation (RTA) -version="8.0.0" -qtBranch="67x" +version="8.1.0" +qtBranch="68x" installFolder="/opt" squishFolder="$installFolder/squish" preBuildCacheUrl="ci-files01-hki.ci.qt.io:/hdd/www/input/squish/jenkins_build/stable" @@ -24,14 +24,14 @@ testSuiteUrl="ci-files01-hki.ci.qt.io:/hdd/www/input/squish/coin/suite_test_squi testSuiteLocal="/tmp/squish_test_suite" if uname -a |grep -q Darwin; then compressedFolder="prebuild-squish-$version-$qtBranch-mac-x64.tar.gz" - sha1="8ae422b44af9b8e5f0d15cdca08df99973b8699a" + sha1="03a0c713d0d328667df2e7804f2e4d507707b849" else if [ "$PROVISIONING_ARCH" = arm64 ] ; then compressedFolder="prebuild-squish-$version-$qtBranch-linux-arm64.tar.gz" - sha1="06d542579271f88b1527d6ddca2bfd4eaf2dade5" + sha1="f6a2eb69faed64f13b164fb8d056182c41d2952c" else compressedFolder="prebuild-squish-$version-$qtBranch-linux-x64.tar.gz" - sha1="db5c48f359b46a460551cdf9362c63f557cbc04f" + sha1="b798417ddf4b668306cb90d551df906828644152" fi fi diff --git a/coin/provisioning/common/windows/squishInstall.ps1 b/coin/provisioning/common/windows/squishInstall.ps1 index 4766d2e964b..38532a34ece 100644 --- a/coin/provisioning/common/windows/squishInstall.ps1 +++ b/coin/provisioning/common/windows/squishInstall.ps1 @@ -6,8 +6,8 @@ # This script will pre-installed squish package for Windows. # Squish is need by Release Test Automation (RTA) -$version = "8.0.0" -$qtBranch = "67x" +$version = "8.1.0" +$qtBranch = "68x" $targetDir = "C:\Utils\squish" $squishPackage = "C:\Utils\rta_squish" $squishUrl = "\\ci-files01-hki.ci.qt.io\provisioning\squish\jenkins_build\stable" @@ -33,7 +33,7 @@ if (($OSVersion -eq "Windows 10 Enterprise") -or ($OSVersion -eq "Windows 10 Pro # In Windows 11 case $OSVersion is 'Windows 10 Pro' $winVersion = "win10" if (Is64BitWinHost) { - $sha1 = "0f863c261f854ec38032815298f5636e99779bff" + $sha1 = "e7497b925b9a0aa17628344dbdacd6b3acd41c3b" } } else { $winVersion = "n/a" diff --git a/coin/provisioning/qtci-linux-Debian-11.6-aarch64/90-squish.sh b/coin/provisioning/qtci-linux-Debian-11.6-aarch64/90-squish.sh deleted file mode 100644 index f803ccc1fa1..00000000000 --- a/coin/provisioning/qtci-linux-Debian-11.6-aarch64/90-squish.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash -#Copyright (C) 2023 The Qt Company Ltd -#SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only -BASEDIR=$(dirname "$0") -"$BASEDIR/../common/unix/squishInstall.sh" - From 7b7a3ea7028b9eb1ba2e891f7c65800a00b965bc Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 2 Jan 2025 22:54:02 +0000 Subject: [PATCH 28/75] Update submodules on '6.9 in qt/qt5' Change-Id: Ia39a2917db36fee9685fca9c6ead25059407daf1 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qt5compat | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtcharts | 2 +- qtcoap | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgraphs | 2 +- qtgrpc | 2 +- qthttpserver | 2 +- qtimageformats | 2 +- qtlanguageserver | 2 +- qtlocation | 2 +- qtlottie | 2 +- qtmqtt | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtopcua | 2 +- qtpositioning | 2 +- qtquick3d | 2 +- qtquick3dphysics | 2 +- qtquickeffectmaker | 2 +- qtquicktimeline | 2 +- qtremoteobjects | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtshadertools | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- 42 files changed, 42 insertions(+), 42 deletions(-) diff --git a/qt3d b/qt3d index 46d698b0006..831c9c17e41 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 46d698b0006470eaebfe9fc61c1045b2eb9ffc15 +Subproject commit 831c9c17e41be3012cb9b19e4026b33526217513 diff --git a/qt5compat b/qt5compat index 119765e04d2..8f4f997d956 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 119765e04d2c1d43cf8e9d77aebae359c32bba93 +Subproject commit 8f4f997d9561995a15ff27e1dfc2a0cd2b5bfb04 diff --git a/qtactiveqt b/qtactiveqt index 3dad1237487..2c11cab796d 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 3dad1237487ddfeb75b00e652d9cd12ae0d60b20 +Subproject commit 2c11cab796d794c7062aa30772090caac726199c diff --git a/qtbase b/qtbase index d39c4933902..381dca29ff1 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit d39c493390202faaa51e4f8ccede82acfdf07f5e +Subproject commit 381dca29ff125e09986ade5833a59aadde179d92 diff --git a/qtcharts b/qtcharts index 13fd82e6b8c..6a7e7749257 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 13fd82e6b8cea339f189267bb94936b1f80a9eda +Subproject commit 6a7e7749257fb5c799dabbd789cdc6af5401975f diff --git a/qtcoap b/qtcoap index 23a3f4f286d..3e0da53ac5f 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit 23a3f4f286d3190b1bd5411fbdf1030f08788ecb +Subproject commit 3e0da53ac5f7e55fd79d3de81c3e49dc12e1c76e diff --git a/qtconnectivity b/qtconnectivity index 0b05acb0d5f..e270bf643a0 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 0b05acb0d5f3aa96ecc6de67e1deeeb52d476d1f +Subproject commit e270bf643a0ccd2ee58c91ee2f5d65d3f045eb97 diff --git a/qtdatavis3d b/qtdatavis3d index 7d020b1c13e..708fae6ec7d 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 7d020b1c13ed6a055395ee4e23309172de049e36 +Subproject commit 708fae6ec7da67d39cc0011a5ec0e64f3a3f280a diff --git a/qtdeclarative b/qtdeclarative index 3d0dfd4a4e4..9b70cdcbcd2 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 3d0dfd4a4e4c1bf179b328dbbcca15dcc65b1e51 +Subproject commit 9b70cdcbcd271014dae923b54e2a912a39dc4b23 diff --git a/qtdoc b/qtdoc index f4d64372cfd..02701e51a1d 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit f4d64372cfd502d73064d6b11a9c2cb0cb181a87 +Subproject commit 02701e51a1d183e1973fd412b08eab215f451a92 diff --git a/qtgraphs b/qtgraphs index 8e9fe5e673f..2ed8b3a6a3a 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit 8e9fe5e673f294ea329078210a732325e13f572f +Subproject commit 2ed8b3a6a3afb22fb641eea7935c56c61fe175a6 diff --git a/qtgrpc b/qtgrpc index 3be2508b76b..06edd1fec94 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit 3be2508b76b3b7cb42f4b4cb36c63c6190ec0258 +Subproject commit 06edd1fec944fcf31e78c2b436a1c518be92d44f diff --git a/qthttpserver b/qthttpserver index 3b34b46c8da..e8979ab472d 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit 3b34b46c8da0c00ec82e546385d6aaccb192969d +Subproject commit e8979ab472dc85afeb26c5d7c20b54061e4f359c diff --git a/qtimageformats b/qtimageformats index 3ea91c00e54..b7929f021fa 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 3ea91c00e54e1bf26bf97416df01c2236649dc70 +Subproject commit b7929f021fa525c729b2d076f2699f20350e4248 diff --git a/qtlanguageserver b/qtlanguageserver index d61ce4ea558..2cfc0c56b20 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit d61ce4ea558de7f23d6c7d44b55b28d38540869a +Subproject commit 2cfc0c56b20d6048e589f137f268cf85da43499f diff --git a/qtlocation b/qtlocation index 46d4c666347..5fb8f3e7875 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 46d4c666347235ab3ab2e49c87578650bbb782d2 +Subproject commit 5fb8f3e78753892c27f1dc8465d456aaff681227 diff --git a/qtlottie b/qtlottie index 3c6cf39dca8..def08db6cab 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 3c6cf39dca8f1f59933cbc5f178b86244afe09c5 +Subproject commit def08db6caba185a627a95e21602b39e5044b1c7 diff --git a/qtmqtt b/qtmqtt index 410fefdcf05..00d73867bd7 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit 410fefdcf05e16d61c831a0a443b38aefebdeed3 +Subproject commit 00d73867bd7727a094faf64c884029c053463e70 diff --git a/qtmultimedia b/qtmultimedia index 704de0def3c..d103db1c9fe 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 704de0def3c1644c439f7228acbc9c68ad058ff9 +Subproject commit d103db1c9fe2d319a0c7a7756bbd6ffef79e0b5f diff --git a/qtnetworkauth b/qtnetworkauth index 7830d5c8f7f..8e380a80606 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 7830d5c8f7fecb8f8f0db64d7ec0c24f5e61ff6a +Subproject commit 8e380a8060605fa5f871ddb3a2c9c1691b1a7dc2 diff --git a/qtopcua b/qtopcua index e5470828083..cd696fcfa6e 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit e547082808373e751d6de1f053169b82d4806a1d +Subproject commit cd696fcfa6eca7bc6eebd9435d962c3ab0e51c05 diff --git a/qtpositioning b/qtpositioning index fcb2d111ea6..18227ed716e 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit fcb2d111ea68fe0b5d868aca7db9a1277c25f51b +Subproject commit 18227ed716ed497e9a93b98942c9e1356a34abcd diff --git a/qtquick3d b/qtquick3d index 1fdfa39ebe1..3a9806fb297 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 1fdfa39ebe121e270956f1b83879694aad8688c7 +Subproject commit 3a9806fb29716c0fc8aba39fdb82d2f33f3a0439 diff --git a/qtquick3dphysics b/qtquick3dphysics index 777656cc496..491ed0539be 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit 777656cc4968b5bba5548b4939e402db0d055405 +Subproject commit 491ed0539be6f75b36726ab2b162b64fba435cf7 diff --git a/qtquickeffectmaker b/qtquickeffectmaker index d00eb426ac5..ee92160bdb1 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit d00eb426ac5c6fddf9448c840392f833b6e53c20 +Subproject commit ee92160bdb1b5e3d6e71a5195fdb29a9fa45f9cc diff --git a/qtquicktimeline b/qtquicktimeline index 4aab5077af8..54ed4a58afa 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 4aab5077af882f06c05004a43d606ed1494b69c6 +Subproject commit 54ed4a58afa915f6bca3559006e24e6f7f76df35 diff --git a/qtremoteobjects b/qtremoteobjects index 22bcfd4af7e..64eadc42cff 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 22bcfd4af7ef86b78a080b4035b49220b5792f08 +Subproject commit 64eadc42cffef1213d39241c3b0e875f903d7c04 diff --git a/qtscxml b/qtscxml index 620f287e877..6e0570a02fa 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 620f287e877f58d898e7d3efefebbb6748f31552 +Subproject commit 6e0570a02faf2d87917cfe42ab180ca96213e86e diff --git a/qtsensors b/qtsensors index 9dddf47073c..9e2d0de069d 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 9dddf47073c8e80312e66e1ee462aedc82e81a66 +Subproject commit 9e2d0de069d62138eb7a59a84941fb2b51ab8751 diff --git a/qtserialbus b/qtserialbus index 53bfe77250e..8e389632a02 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 53bfe77250e48114f5e60622ef77920cf46add00 +Subproject commit 8e389632a0253b2dbb50732ea94b29d5389bff37 diff --git a/qtserialport b/qtserialport index 53ccd9bebf1..9131f96798a 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 53ccd9bebf178e1bd3375222513794eae0d99f70 +Subproject commit 9131f96798ade19f35b616fc67916fd1bb557511 diff --git a/qtshadertools b/qtshadertools index e28d661686a..92473491dbd 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit e28d661686ab2ba51072aa1c155fcef677ec372b +Subproject commit 92473491dbda7b74f598324824cc6a91bbeae642 diff --git a/qtspeech b/qtspeech index f331fc3c1ef..deef8637af7 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit f331fc3c1ef184cde56b9df3bfb41ade0087f590 +Subproject commit deef8637af794d996298d0da8b404f409081364b diff --git a/qtsvg b/qtsvg index f669a075a4a..0907cfbe69e 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit f669a075a4afbde6711abaa2b9fd42059739a138 +Subproject commit 0907cfbe69e6b45e870d4929c7ba9bc4a498e837 diff --git a/qttools b/qttools index f2b24689e52..1b2d93e9c5e 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit f2b24689e52c86f91c5a2da0c02d662f7b55cff7 +Subproject commit 1b2d93e9c5e842f7572737ca5fb5cf2863badf3c diff --git a/qttranslations b/qttranslations index fdbcbef076d..ebd63e62e0d 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit fdbcbef076dc6764abc6a4d16c0213a8f8989ca0 +Subproject commit ebd63e62e0dc44e6658487871d9d7a1d3a064abb diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 6070d9f61c9..11750ab56e8 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 6070d9f61c953a664ae5c4cfdc56d9282d56c972 +Subproject commit 11750ab56e8712f9abdaa90f748f9f843f40e4e1 diff --git a/qtwayland b/qtwayland index 62cd5566d87..530a315dca9 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 62cd5566d8730385c07f2a44ce6fda9abfc2cb54 +Subproject commit 530a315dca9dd5516a0ba6cf6308d9d253d41841 diff --git a/qtwebchannel b/qtwebchannel index b5d864a65c9..eb219bcadca 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit b5d864a65c95476c76184d8926e1e3d0a9abc5ef +Subproject commit eb219bcadca330c0d9006aede144310af9a8fad1 diff --git a/qtwebengine b/qtwebengine index 785dcab5d65..810cd8d1304 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 785dcab5d65a15370ca806c06cd370cf700bea4c +Subproject commit 810cd8d13040f3b264152ec05bd2a6fa7a980ae0 diff --git a/qtwebsockets b/qtwebsockets index be2d4a3315f..a73edfa122f 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit be2d4a3315f99cb121405826f6fc81b104bfc1dd +Subproject commit a73edfa122f3f2ccf640d47e941e3ed758dd9568 diff --git a/qtwebview b/qtwebview index 0f5bdb00faa..dd4bb6726c2 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 0f5bdb00faa9aba20a9c6d7df4f53640c18d18fd +Subproject commit dd4bb6726c231c8bee56fa98f7c53183406f2861 From d78024c6d59cd9d3664d83f4543557e9d9024b55 Mon Sep 17 00:00:00 2001 From: Antti Kokko Date: Tue, 31 Dec 2024 14:34:34 +0200 Subject: [PATCH 29/75] Add missing documentation target for QtAA build Task-number: QAA-2754 Change-Id: Icfd3bbeb94287e6e9a325af7785df173778044d9 Reviewed-by: Maija Metso (cherry picked from commit e1f67cc3e6148877f33da27a1e730af7d1709b24) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/tqtc-android-automotive.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/coin/platform_configs/tqtc-android-automotive.yaml b/coin/platform_configs/tqtc-android-automotive.yaml index 2d2bfa765ef..f921e8173bc 100644 --- a/coin/platform_configs/tqtc-android-automotive.yaml +++ b/coin/platform_configs/tqtc-android-automotive.yaml @@ -14,7 +14,8 @@ Include: [ 'android-armv7-on-windows', 'android-9-x86-on-linux', 'android-14-x86_64-on-linux' - ] + ], + offline_documentation.yaml ] Configurations: - From 91ba03e3b56a12dc69c77025b230738a07b89329 Mon Sep 17 00:00:00 2001 From: Elias Toivola Date: Thu, 12 Dec 2024 01:23:35 +0200 Subject: [PATCH 30/75] WoA: Install Windows SDK 10.0.26100.1742 Change Windows 22h2 arm64 tier-1 template -54 -> -55, where Windows SDK 10.0.26100.1742 is installed. Task-number: QTQAINFRA-6862 Task-number: COIN-1206 Pick-to: 6.8 Change-Id: Id4b008d12ee092daa1e84c50d9a36240ee680483 Reviewed-by: Michal Klocek (cherry picked from commit 0f18b0bc2f82fa3b0fafbbad0c40d384a23a145a) Reviewed-by: Jukka Jokiniva --- coin/platform_configs/cmake_platforms.yaml | 2 +- .../qtci-windows-11_22H2-aarch64/msvc2022.txt | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index e143636d540..f2b9ffc769c 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -164,7 +164,7 @@ Configurations: ] - Id: 'windows-11_22h2-arm64-msvc2022' - Template: 'qtci-windows-11_22H2-aarch64-54' + Template: 'qtci-windows-11_22H2-aarch64-55' Compiler: 'MSVC2022' Features: ['PinCores', 'Packaging', 'DebugAndRelease', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib -no-opengl -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer' diff --git a/coin/pre-provisioning/qtci-windows-11_22H2-aarch64/msvc2022.txt b/coin/pre-provisioning/qtci-windows-11_22H2-aarch64/msvc2022.txt index 331a2615511..18c4e8882d6 100644 --- a/coin/pre-provisioning/qtci-windows-11_22H2-aarch64/msvc2022.txt +++ b/coin/pre-provisioning/qtci-windows-11_22H2-aarch64/msvc2022.txt @@ -56,6 +56,10 @@ Windows 11 SDK (10.0.22000.0) Windows 11 SDK (10.0.22621.0) Windows Universal C Runtime +Windows SDK (10.0.26100.1742) was later downloaded and installed from: +https://developer.microsoft.com/en-us/windows/downloads/windows-sdk/ +# COIN-1206 + # NOTE! Work loads were added during installation! ############################################################ From 2c0ce8b3f2cebaf8b6bc7fdef793946c3fb2e64f Mon Sep 17 00:00:00 2001 From: Elias Toivola Date: Thu, 12 Dec 2024 00:45:17 +0200 Subject: [PATCH 31/75] Windows 10: Install Windows SDK 10.0.26100.1742 Change Windows 10 22h2 x86_64 tier-1 template -52 -> -53, where Windows SDK 10.0.26100.1742 is installed. Task-number: QTQAINFRA-6862 Task-number: COIN-1206 Pick-to: 6.8 Change-Id: Ia78f8d3b67c3aa546a4f47ad503f44782722631f Reviewed-by: Michal Klocek (cherry picked from commit 75578f016a706773fc7113ff9ed3e882ac5430fa) Reviewed-by: Jukka Jokiniva --- coin/platform_configs/cmake_platforms.yaml | 4 ++-- coin/platform_configs/cmake_platforms_target_android.yaml | 2 +- coin/platform_configs/cmake_platforms_wasm.yaml | 2 +- coin/platform_configs/nightly_qnx710_host_windows.yaml | 2 +- coin/platform_configs/qmake2cmake.yaml | 2 +- coin/platform_configs/qt-creator.yaml | 6 +++--- coin/platform_configs/qtsaferenderer.yaml | 2 +- coin/platform_configs/qtwebkit.yaml | 2 +- .../qtci-windows-10_22H2-x86_64/msvc2022.txt | 4 ++++ 9 files changed, 15 insertions(+), 11 deletions(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index f2b9ffc769c..0332dcaed5a 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -140,7 +140,7 @@ Configurations: ] - Id: 'windows-10_22h2-msvc2022' - Template: 'qtci-windows-10_22H2-x86_64-52' + Template: 'qtci-windows-10_22H2-x86_64-53' Compiler: 'MSVC2022' Features: ['PinCores', 'Sccache', "DebugAndRelease", 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib' @@ -236,7 +236,7 @@ Configurations: ] - Id: 'windows-10_22h2-mingw13' - Template: 'qtci-windows-10_22H2-x86_64-52' + Template: 'qtci-windows-10_22H2-x86_64-53' Compiler: 'Mingw' Features: ['PinCores', 'Packaging', 'Sccache', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples' diff --git a/coin/platform_configs/cmake_platforms_target_android.yaml b/coin/platform_configs/cmake_platforms_target_android.yaml index 32a50fda397..d1a145fdbcd 100644 --- a/coin/platform_configs/cmake_platforms_target_android.yaml +++ b/coin/platform_configs/cmake_platforms_target_android.yaml @@ -17,7 +17,7 @@ Configurations: ] - Id: 'android-armv7-on-windows' - Template: 'qtci-windows-10_22H2-x86_64-52' + Template: 'qtci-windows-10_22H2-x86_64-53' Target os: 'Android_ANY' Target arch: 'armv7' Compiler: 'Mingw' diff --git a/coin/platform_configs/cmake_platforms_wasm.yaml b/coin/platform_configs/cmake_platforms_wasm.yaml index a780d234484..7cdba0741e6 100644 --- a/coin/platform_configs/cmake_platforms_wasm.yaml +++ b/coin/platform_configs/cmake_platforms_wasm.yaml @@ -14,7 +14,7 @@ Configurations: ] - Id: 'webassembly-windows' - Template: 'qtci-windows-10_22H2-x86_64-52' + Template: 'qtci-windows-10_22H2-x86_64-53' Target os: 'WebAssembly' Compiler: 'Mingw' Target compiler: 'Clang' diff --git a/coin/platform_configs/nightly_qnx710_host_windows.yaml b/coin/platform_configs/nightly_qnx710_host_windows.yaml index a4e1bed2022..40a53fd36aa 100644 --- a/coin/platform_configs/nightly_qnx710_host_windows.yaml +++ b/coin/platform_configs/nightly_qnx710_host_windows.yaml @@ -7,7 +7,7 @@ Include: [ Configurations: - Id: 'qnx-710-arm64-on-windows' - Template: 'qtci-windows-10_22H2-x86_64-52' + Template: 'qtci-windows-10_22H2-x86_64-53' Target os: 'QNX_710' Target arch: 'arm64' Compiler: 'MSVC2019' diff --git a/coin/platform_configs/qmake2cmake.yaml b/coin/platform_configs/qmake2cmake.yaml index 9ffcbaee45f..deabdf009b8 100644 --- a/coin/platform_configs/qmake2cmake.yaml +++ b/coin/platform_configs/qmake2cmake.yaml @@ -2,7 +2,7 @@ Version: 2 Module only: True Configurations: - - Template: 'qtci-windows-10_22H2-x86_64-52' + Template: 'qtci-windows-10_22H2-x86_64-53' Compiler: 'MSVC2019' Features: ['DisableTests'] - diff --git a/coin/platform_configs/qt-creator.yaml b/coin/platform_configs/qt-creator.yaml index c30819a54f3..94096a6f97c 100644 --- a/coin/platform_configs/qt-creator.yaml +++ b/coin/platform_configs/qt-creator.yaml @@ -2,7 +2,7 @@ Version: 2 Module only: True Configurations: - - Template: 'qtci-windows-10_22H2-x86_64-52' + Template: 'qtci-windows-10_22H2-x86_64-53' Compiler: 'MSVC2022' Features: ['Sccache', 'DebugAndRelease'] Configure arguments: '' @@ -28,7 +28,7 @@ Configurations: Environment variables: [] # without tests - - Template: 'qtci-windows-10_22H2-x86_64-52' + Template: 'qtci-windows-10_22H2-x86_64-53' Compiler: 'MSVC2022' Features: ['Sccache', 'DebugAndRelease', 'DisableTests'] Configure arguments: '' @@ -36,7 +36,7 @@ Configurations: Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64'] # oldest Qt version - - Template: 'qtci-windows-10_22H2-x86_64-52' + Template: 'qtci-windows-10_22H2-x86_64-53' Compiler: 'MSVC2022' Features: ['Sccache', 'DebugAndRelease', 'OldestQt'] Configure arguments: '' diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index 14fde3597cc..d0da81c1ab3 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -48,7 +48,7 @@ Configurations: ] - Id: 'Windows-MSVC2022_Static' - Template: 'qtci-windows-10_22H2-x86_64-52' + Template: 'qtci-windows-10_22H2-x86_64-53' Compiler: 'MSVC2022' Features: ['Packaging', 'Sccache', 'UseConfigure', 'MinimalStaticTests'] Configure arguments: '-release -headersclean -nomake examples -qt-zlib -static -no-icu -no-sql-mysql -no-sql-odbc -no-sql-psql' diff --git a/coin/platform_configs/qtwebkit.yaml b/coin/platform_configs/qtwebkit.yaml index 7230a74973e..d63d2c6bb96 100644 --- a/coin/platform_configs/qtwebkit.yaml +++ b/coin/platform_configs/qtwebkit.yaml @@ -1,7 +1,7 @@ Version: 2 Configurations: - - Template: 'qtci-windows-10_22H2-x86_64-52' + Template: 'qtci-windows-10_22H2-x86_64-53' Compiler: 'Mingw' Environment variables: ['PATH=C:\MINGW1120_i686\mingw32\bin;$PATH'] Features: ['Packaging', UseLegacyInstructions'] diff --git a/coin/pre-provisioning/qtci-windows-10_22H2-x86_64/msvc2022.txt b/coin/pre-provisioning/qtci-windows-10_22H2-x86_64/msvc2022.txt index 09764b39602..1953083eb06 100644 --- a/coin/pre-provisioning/qtci-windows-10_22H2-x86_64/msvc2022.txt +++ b/coin/pre-provisioning/qtci-windows-10_22H2-x86_64/msvc2022.txt @@ -56,6 +56,10 @@ Windows 10 SDK (10.0.22000.0) Windows 10 SDK (10.0.22621.0) Windows Universal C Runtime +Windows SDK (10.0.26100.1742) was later downloaded and installed from: +https://developer.microsoft.com/en-us/windows/downloads/windows-sdk/ +# COIN-1206 + # NOTE! Work loads were added during installation! ############################################################ From 0148e13038f7de915192604a0b30e8b8b2aaacc1 Mon Sep 17 00:00:00 2001 From: Elias Toivola Date: Tue, 10 Dec 2024 14:35:38 +0200 Subject: [PATCH 32/75] Windows 11 23h2: Install Windows SDK 10.0.26100.1742 Change Windows 11 23h2 x86_64 tier-1 template -53 -> -54, where Windows SDK 10.0.26100.1742 is installed. Task-number: QTQAINFRA-6862 Task-number: COIN-1206 Pick-to: 6.8 Change-Id: I713ea4d5032145a92d7bcbccec6c98543cbc90d2 Reviewed-by: Michal Klocek (cherry picked from commit 4bfe8b9d71296143eb26c1ab08ef986b1a1a527b) Reviewed-by: Jukka Jokiniva --- coin/platform_configs/cmake_platforms.yaml | 10 +++++----- .../cmake_platforms_static_release.yaml | 2 +- .../platform_configs/cmake_platforms_static_tests.yaml | 2 +- coin/platform_configs/nightly_unity_builds.yaml | 2 +- .../qtci-windows-11_23H2-x86_64/msvc2022.txt | 4 ++++ 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 0332dcaed5a..615f5924701 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -152,7 +152,7 @@ Configurations: ] - Id: 'windows-11_23H2-msvc2022' - Template: 'qtci-windows-11_23H2-x86_64-53' + Template: 'qtci-windows-11_23H2-x86_64-54' Compiler: 'MSVC2022' Features: ['PinCores', 'Sccache', "DebugAndRelease", 'UseConfigure', 'Packaging', 'GenerateSBOM', 'VerifySBOM'] Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib' @@ -175,7 +175,7 @@ Configurations: ] - Id: 'windows-11_23H2-msvc2022-arm64' - Template: 'qtci-windows-11_23H2-x86_64-53' + Template: 'qtci-windows-11_23H2-x86_64-54' Compiler: 'MSVC2022' Target arch: 'arm64' Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] @@ -191,7 +191,7 @@ Configurations: ] - Id: 'windows-11_23H2-msvc2022-developer-build' - Template: 'qtci-windows-11_23H2-x86_64-53' + Template: 'qtci-windows-11_23H2-x86_64-54' Compiler: 'MSVC2022' Features: ['PinCores', 'Sccache', 'DebugAndRelease', 'WarningsAreErrors', 'UseConfigure', 'StandaloneExamples'] Configure arguments: '-debug-and-release -force-asserts -make examples -developer-build -force-debug-info -qt-zlib -c++std c++20' @@ -249,7 +249,7 @@ Configurations: ] - Id: 'windows-11_23H2-llvm' - Template: 'qtci-windows-11_23H2-x86_64-53' + Template: 'qtci-windows-11_23H2-x86_64-54' Compiler: 'Clang' Features: ['PinCores', 'Packaging','Sccache', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples' @@ -262,7 +262,7 @@ Configurations: ] - Id: 'windows-11_23H2-mingw13-developer-build' - Template: 'qtci-windows-11_23H2-x86_64-53' + Template: 'qtci-windows-11_23H2-x86_64-54' Compiler: 'Mingw' Features: ['PinCores', 'Sccache', 'WarningsAreErrors', 'UseConfigure', 'StandaloneExamples'] Configure arguments: '-developer-build -release -force-asserts -force-debug-info -separate-debug-info -make examples' diff --git a/coin/platform_configs/cmake_platforms_static_release.yaml b/coin/platform_configs/cmake_platforms_static_release.yaml index 6bd5f994edb..fc7b2952faa 100644 --- a/coin/platform_configs/cmake_platforms_static_release.yaml +++ b/coin/platform_configs/cmake_platforms_static_release.yaml @@ -3,7 +3,7 @@ Configurations: - Id: 'windows-11_23H2-msvc2022-minimal-static-test' - Template: 'qtci-windows-11_23H2-x86_64-53' + Template: 'qtci-windows-11_23H2-x86_64-54' Compiler: 'MSVC2022' Features: ['Sccache', 'UseConfigure', 'Packaging', 'MinimalStaticTests'] Configure arguments: '-static -release -headersclean -nomake examples -qt-libjpeg -no-icu -qt-doubleconversion -qt-zlib -c++std c++20 -no-feature-sql-psql' diff --git a/coin/platform_configs/cmake_platforms_static_tests.yaml b/coin/platform_configs/cmake_platforms_static_tests.yaml index 25bed53ebb5..833fb4365a5 100644 --- a/coin/platform_configs/cmake_platforms_static_tests.yaml +++ b/coin/platform_configs/cmake_platforms_static_tests.yaml @@ -20,7 +20,7 @@ Configurations: ] - Id: 'windows-11_23H2-minimal-static' - Template: 'qtci-windows-11_23H2-x86_64-53' + Template: 'qtci-windows-11_23H2-x86_64-54' Compiler: 'MSVC2022' Features: ['PinCores', 'Sccache', 'MinimalStaticTests', 'UseConfigure'] Configure arguments: '-release -force-debug-info -static -nomake examples -qt-zlib -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer' diff --git a/coin/platform_configs/nightly_unity_builds.yaml b/coin/platform_configs/nightly_unity_builds.yaml index 73bb0b13d51..b8cfc5f9301 100644 --- a/coin/platform_configs/nightly_unity_builds.yaml +++ b/coin/platform_configs/nightly_unity_builds.yaml @@ -2,7 +2,7 @@ Version: 2 Configurations: - Id: 'windows-11_23H2-msvc2022-unity-build' - Template: 'qtci-windows-11_23H2-x86_64-53' + Template: 'qtci-windows-11_23H2-x86_64-54' Compiler: 'MSVC2022' Features: ['Sccache', 'Debug', 'UseConfigure', 'DoNotRunTests'] Configure arguments: '-debug -force-debug-info -headersclean -make examples -qt-zlib' diff --git a/coin/pre-provisioning/qtci-windows-11_23H2-x86_64/msvc2022.txt b/coin/pre-provisioning/qtci-windows-11_23H2-x86_64/msvc2022.txt index a5a0c41284c..2a13096667b 100644 --- a/coin/pre-provisioning/qtci-windows-11_23H2-x86_64/msvc2022.txt +++ b/coin/pre-provisioning/qtci-windows-11_23H2-x86_64/msvc2022.txt @@ -57,6 +57,10 @@ Windows 11 SDK (10.0.22000.0) Windows 11 SDK (10.0.22621.0) Windows Universal C Runtime +Windows SDK (10.0.26100.1742) was later downloaded and installed from: +https://developer.microsoft.com/en-us/windows/downloads/windows-sdk/ +# COIN-1206 + # NOTE! Work loads were added during installation! ############################################################ From b07fbbf935ff452497dc74c46b0c11eb811998e9 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 12 Nov 2024 08:44:49 +0200 Subject: [PATCH 33/75] WoA: update template MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit WoA template got updated in 2151c5510fc1264465429b6d125a584d54c4c3e5 and 0f18b0bc2f82fa3b0fafbbad0c40d384a23a145a, but not everywhere. Pick-to: 6.8 Change-Id: Ie2ee9e62f9bc10753bd527a2b1a7edc5de46ca60 Reviewed-by: Tero Heikkinen Reviewed-by: Simo Fält (cherry picked from commit 69dfa0449cd8843b4e992efaa74ceb785dade96b) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/cmake_platforms_static_release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/cmake_platforms_static_release.yaml b/coin/platform_configs/cmake_platforms_static_release.yaml index fc7b2952faa..cf2918c611c 100644 --- a/coin/platform_configs/cmake_platforms_static_release.yaml +++ b/coin/platform_configs/cmake_platforms_static_release.yaml @@ -15,7 +15,7 @@ Configurations: ] - Id: 'windows-11_22h2-arm64-msvc2022-minimal-static-test' - Template: 'qtci-windows-11_22H2-aarch64-53' + Template: 'qtci-windows-11_22H2-aarch64-55' Compiler: 'MSVC2022' Features: ['UseConfigure', 'InsignificantTests', 'Packaging', 'MinimalStaticTests'] Configure arguments: '-static -release -headersclean -nomake examples -qt-libjpeg -no-icu -qt-doubleconversion -qt-zlib -c++std c++17 -no-sql-psql' From d0ead4f0a392f11778bc018553d035eacb5719b8 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 15 Jan 2025 07:50:53 +0000 Subject: [PATCH 34/75] Update submodules on '6.9 in qt/qt5' Change-Id: Iaa124ff3c7a1b742b809271ea1ef2a96db6978d5 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qt5compat | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtcharts | 2 +- qtcoap | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgraphs | 2 +- qtgrpc | 2 +- qthttpserver | 2 +- qtimageformats | 2 +- qtlanguageserver | 2 +- qtlocation | 2 +- qtlottie | 2 +- qtmqtt | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtopcua | 2 +- qtpositioning | 2 +- qtquick3d | 2 +- qtquick3dphysics | 2 +- qtquickeffectmaker | 2 +- qtquicktimeline | 2 +- qtremoteobjects | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtshadertools | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- 42 files changed, 42 insertions(+), 42 deletions(-) diff --git a/qt3d b/qt3d index 831c9c17e41..59cf8583b62 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 831c9c17e41be3012cb9b19e4026b33526217513 +Subproject commit 59cf8583b621bad03674c1f8a4b16a577a11ac3b diff --git a/qt5compat b/qt5compat index 8f4f997d956..25472decbf1 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 8f4f997d9561995a15ff27e1dfc2a0cd2b5bfb04 +Subproject commit 25472decbf1621c7120d9b0599227016dab6cf8a diff --git a/qtactiveqt b/qtactiveqt index 2c11cab796d..b6514eee4d1 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 2c11cab796d794c7062aa30772090caac726199c +Subproject commit b6514eee4d133e87833ad7c1f3db949519536834 diff --git a/qtbase b/qtbase index 381dca29ff1..6ce164b3e0e 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 381dca29ff125e09986ade5833a59aadde179d92 +Subproject commit 6ce164b3e0e13f3eb376baa4bdb467f9bb331fbb diff --git a/qtcharts b/qtcharts index 6a7e7749257..65f0bd52338 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 6a7e7749257fb5c799dabbd789cdc6af5401975f +Subproject commit 65f0bd523386b1ae5a4e8fa9123d5b17aff081b4 diff --git a/qtcoap b/qtcoap index 3e0da53ac5f..9b0e7b4a07b 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit 3e0da53ac5f7e55fd79d3de81c3e49dc12e1c76e +Subproject commit 9b0e7b4a07b3d24a7cc0c8640dcc407b21bb2bc6 diff --git a/qtconnectivity b/qtconnectivity index e270bf643a0..dc961330fca 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit e270bf643a0ccd2ee58c91ee2f5d65d3f045eb97 +Subproject commit dc961330fca63f4bebe75326842e626f124852a2 diff --git a/qtdatavis3d b/qtdatavis3d index 708fae6ec7d..260dddf67d6 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 708fae6ec7da67d39cc0011a5ec0e64f3a3f280a +Subproject commit 260dddf67d6edada03627556097982a157a414ac diff --git a/qtdeclarative b/qtdeclarative index 9b70cdcbcd2..237decc5ef0 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 9b70cdcbcd271014dae923b54e2a912a39dc4b23 +Subproject commit 237decc5ef072c10dd3d528e768faf08332bbf62 diff --git a/qtdoc b/qtdoc index 02701e51a1d..b09631b9365 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 02701e51a1d183e1973fd412b08eab215f451a92 +Subproject commit b09631b936510685235b38789ce562d8a45ea085 diff --git a/qtgraphs b/qtgraphs index 2ed8b3a6a3a..8e6a1f94158 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit 2ed8b3a6a3afb22fb641eea7935c56c61fe175a6 +Subproject commit 8e6a1f94158d03d12088710f86b6423d705f6526 diff --git a/qtgrpc b/qtgrpc index 06edd1fec94..c3115a7d813 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit 06edd1fec944fcf31e78c2b436a1c518be92d44f +Subproject commit c3115a7d81314115d83f81e08df809ffd4063a21 diff --git a/qthttpserver b/qthttpserver index e8979ab472d..7147117136d 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit e8979ab472dc85afeb26c5d7c20b54061e4f359c +Subproject commit 7147117136d35ac9bfa8a07295d49836c9821079 diff --git a/qtimageformats b/qtimageformats index b7929f021fa..56e2d66799e 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit b7929f021fa525c729b2d076f2699f20350e4248 +Subproject commit 56e2d66799e83bf1639765172e193b85a0f6c234 diff --git a/qtlanguageserver b/qtlanguageserver index 2cfc0c56b20..c9e2f167d35 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit 2cfc0c56b20d6048e589f137f268cf85da43499f +Subproject commit c9e2f167d358f0c07070317e9acdf050d6d6fbf0 diff --git a/qtlocation b/qtlocation index 5fb8f3e7875..790ccfd211b 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 5fb8f3e78753892c27f1dc8465d456aaff681227 +Subproject commit 790ccfd211b5bfd0f27a07a206941e085c6feb7f diff --git a/qtlottie b/qtlottie index def08db6cab..0eef822f64a 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit def08db6caba185a627a95e21602b39e5044b1c7 +Subproject commit 0eef822f64a4bd472f4de77971c483113f057898 diff --git a/qtmqtt b/qtmqtt index 00d73867bd7..90baacbe2a5 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit 00d73867bd7727a094faf64c884029c053463e70 +Subproject commit 90baacbe2a525f6dcf9b32e31ee1f11384ebe5e7 diff --git a/qtmultimedia b/qtmultimedia index d103db1c9fe..ddad4adda0e 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit d103db1c9fe2d319a0c7a7756bbd6ffef79e0b5f +Subproject commit ddad4adda0eb5090eb0a3f1486b489ec777ba8d8 diff --git a/qtnetworkauth b/qtnetworkauth index 8e380a80606..75d249d46ca 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 8e380a8060605fa5f871ddb3a2c9c1691b1a7dc2 +Subproject commit 75d249d46ca328c7605ea7fd2007e0b91fa618f2 diff --git a/qtopcua b/qtopcua index cd696fcfa6e..22a0cf91707 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit cd696fcfa6eca7bc6eebd9435d962c3ab0e51c05 +Subproject commit 22a0cf91707f06fa25e8f95704b3ea71b20bbc8b diff --git a/qtpositioning b/qtpositioning index 18227ed716e..0305d88e062 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit 18227ed716ed497e9a93b98942c9e1356a34abcd +Subproject commit 0305d88e0629db65e4106ad272eead5304f1c6dd diff --git a/qtquick3d b/qtquick3d index 3a9806fb297..9499968a43c 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 3a9806fb29716c0fc8aba39fdb82d2f33f3a0439 +Subproject commit 9499968a43cb1cc5b830ecff2ad735cbbdc04ac8 diff --git a/qtquick3dphysics b/qtquick3dphysics index 491ed0539be..b6dc1c81645 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit 491ed0539be6f75b36726ab2b162b64fba435cf7 +Subproject commit b6dc1c8164529b9f1690f7793bbe319d71bbeb65 diff --git a/qtquickeffectmaker b/qtquickeffectmaker index ee92160bdb1..59d7ce2b817 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit ee92160bdb1b5e3d6e71a5195fdb29a9fa45f9cc +Subproject commit 59d7ce2b817a6ec2eea416a18592f24c93ef4b57 diff --git a/qtquicktimeline b/qtquicktimeline index 54ed4a58afa..d94aeb86416 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 54ed4a58afa915f6bca3559006e24e6f7f76df35 +Subproject commit d94aeb8641690bac7cfe4f71d19e67f7c31de175 diff --git a/qtremoteobjects b/qtremoteobjects index 64eadc42cff..25639d3bb08 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 64eadc42cffef1213d39241c3b0e875f903d7c04 +Subproject commit 25639d3bb08cf24353e87538b9c02b3a6554eb6c diff --git a/qtscxml b/qtscxml index 6e0570a02fa..88d38f260e0 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 6e0570a02faf2d87917cfe42ab180ca96213e86e +Subproject commit 88d38f260e0b509fa967d739f509ea3c5ccc8947 diff --git a/qtsensors b/qtsensors index 9e2d0de069d..d8abcd1e10f 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 9e2d0de069d62138eb7a59a84941fb2b51ab8751 +Subproject commit d8abcd1e10fed1e55a3940aa255694113146c978 diff --git a/qtserialbus b/qtserialbus index 8e389632a02..a4b8c7eb439 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 8e389632a0253b2dbb50732ea94b29d5389bff37 +Subproject commit a4b8c7eb439aa9e9a4e4a63e9011945ac195eb3c diff --git a/qtserialport b/qtserialport index 9131f96798a..cb5b6ae1e9d 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 9131f96798ade19f35b616fc67916fd1bb557511 +Subproject commit cb5b6ae1e9d7151ef3b6aba415be333112dae1d6 diff --git a/qtshadertools b/qtshadertools index 92473491dbd..401ac4af43d 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 92473491dbda7b74f598324824cc6a91bbeae642 +Subproject commit 401ac4af43d2ef5c107cf25b6b0b34eff84472bb diff --git a/qtspeech b/qtspeech index deef8637af7..cf78d60941f 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit deef8637af794d996298d0da8b404f409081364b +Subproject commit cf78d60941f3d4e4595b17f4cfe1d6c1f6e05c61 diff --git a/qtsvg b/qtsvg index 0907cfbe69e..4bbb47dec29 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 0907cfbe69e6b45e870d4929c7ba9bc4a498e837 +Subproject commit 4bbb47dec29b74b1795cbaa42459a878856a9c18 diff --git a/qttools b/qttools index 1b2d93e9c5e..1bfd2525303 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 1b2d93e9c5e842f7572737ca5fb5cf2863badf3c +Subproject commit 1bfd25253033c4d81d8a6e89d08bcffbe6372ec6 diff --git a/qttranslations b/qttranslations index ebd63e62e0d..0a92e653522 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit ebd63e62e0dc44e6658487871d9d7a1d3a064abb +Subproject commit 0a92e6535229bb1e80e4bc95a1433db604260d1f diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 11750ab56e8..cbbf52dcae8 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 11750ab56e8712f9abdaa90f748f9f843f40e4e1 +Subproject commit cbbf52dcae8e2edaee29f01b667caf97d3b0e1cf diff --git a/qtwayland b/qtwayland index 530a315dca9..2f0e602e5e2 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 530a315dca9dd5516a0ba6cf6308d9d253d41841 +Subproject commit 2f0e602e5e25c1a42ad49182379d565ff08a2d24 diff --git a/qtwebchannel b/qtwebchannel index eb219bcadca..0a368c56906 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit eb219bcadca330c0d9006aede144310af9a8fad1 +Subproject commit 0a368c56906e71ccd0bbc77f9fda0a72c4508daf diff --git a/qtwebengine b/qtwebengine index 810cd8d1304..12d2b526241 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 810cd8d13040f3b264152ec05bd2a6fa7a980ae0 +Subproject commit 12d2b5262411af5fd1f546e736c1703edd917d82 diff --git a/qtwebsockets b/qtwebsockets index a73edfa122f..6e6968458ed 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit a73edfa122f3f2ccf640d47e941e3ed758dd9568 +Subproject commit 6e6968458edbfeff07ce490ad8de6a07c1b45aee diff --git a/qtwebview b/qtwebview index dd4bb6726c2..940ca26f50f 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit dd4bb6726c231c8bee56fa98f7c53183406f2861 +Subproject commit 940ca26f50fa9c0fa49b7bba6cce2a12ebcba775 From 81f7f5b413bb7096d2c52d94561e5bd3270b3d7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Fri, 10 Jan 2025 12:45:04 +0100 Subject: [PATCH 35/75] Enable crash reporting via Swift on macOS 15 Swift 5.9 includes built in crash reporting, printing stack traces, libraries, and registers to stdout/err. https://www.swift.org/blog/swift-5.9-backtraces/ As (Core)Foundation is written in Swift nowadays, we get this feature for free even in our "C++" apps, as we always link to CoreFoundation. Our test binaries have been taught how to hook into this, so the remaining step is to enable it via the SWIFT_BACKTRACE env var. Change-Id: I72dbd9ea934ecc3091766456509f4bd42b2bdab8 Reviewed-by: Alexandru Croitor (cherry picked from commit a8b2d9bcdc31d1fa1a62d19fb6ea2dd2801c43f2) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/qtci-macos-15-arm/06-crashreporter.sh | 5 +++++ coin/provisioning/qtci-macos-15-x86_64/06-crashreporter.sh | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/coin/provisioning/qtci-macos-15-arm/06-crashreporter.sh b/coin/provisioning/qtci-macos-15-arm/06-crashreporter.sh index cb7c0774d94..b66bbc38afa 100755 --- a/coin/provisioning/qtci-macos-15-arm/06-crashreporter.sh +++ b/coin/provisioning/qtci-macos-15-arm/06-crashreporter.sh @@ -5,3 +5,8 @@ set -ex defaults write com.apple.CrashReporter DialogType server + +# shellcheck source=../common/unix/SetEnvVar.sh +source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" + +SetEnvVar "SWIFT_BACKTRACE" "enable=yes,output-to=stderr,preset=medium,interactive=false" diff --git a/coin/provisioning/qtci-macos-15-x86_64/06-crashreporter.sh b/coin/provisioning/qtci-macos-15-x86_64/06-crashreporter.sh index cb7c0774d94..b66bbc38afa 100755 --- a/coin/provisioning/qtci-macos-15-x86_64/06-crashreporter.sh +++ b/coin/provisioning/qtci-macos-15-x86_64/06-crashreporter.sh @@ -5,3 +5,8 @@ set -ex defaults write com.apple.CrashReporter DialogType server + +# shellcheck source=../common/unix/SetEnvVar.sh +source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" + +SetEnvVar "SWIFT_BACKTRACE" "enable=yes,output-to=stderr,preset=medium,interactive=false" From 5b0d2e87d0fcef5a56d4f04c0bc0c07bd615ffd7 Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Wed, 15 Jan 2025 15:32:07 +0100 Subject: [PATCH 36/75] Disable top-level configure run for the cross-builds The 'target' configurations currently trigger the 'host' configure command line, and are duplication of the existing rule we have for the host machines. Disable the top-level configure checks for the 'target' builds completely. Fixes: QTBUG-132799 Pick-to: 6.8 Change-Id: Ia06dde53825e882e78a8c6be9e62779aaedcebf4 Reviewed-by: Toni Saario (cherry picked from commit 6f0c6b1614d7f0f336d656da947e7ca09cfe4145) Reviewed-by: Qt Cherry-pick Bot --- coin/instructions/coin_qt_configure.yaml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/coin/instructions/coin_qt_configure.yaml b/coin/instructions/coin_qt_configure.yaml index c165025642c..a8aebd7df56 100644 --- a/coin/instructions/coin_qt_configure.yaml +++ b/coin/instructions/coin_qt_configure.yaml @@ -47,3 +47,20 @@ instructions: condition: property property: features contains_value: UseConfigure +disable_if: + condition: or + conditions: + - condition: property + property: target.osVersion + in_values: [Android_ANY, QEMU, IOS_ANY, QNX_710, WebAssembly, INTEGRITY, VxWorks] + - condition: and + conditions: + - condition: property + property: target.os + equals_value: Windows + - condition: property + property: target.arch + not_equals_property: host.arch + - condition: property + property: features + not_contains_value: "DebianPackaging" From 096d09d1a55c48b26e334c6fa296a9f8208edc2e Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Fri, 20 Dec 2024 08:55:14 +0100 Subject: [PATCH 37/75] Add html5lib to python.3.11 RHEL 8 installs python3-html5lib, however this only affects installed pythnon 3.6, webengine should use 3.11 therefore add it to pip installer. The change for switching webengine to 3.11 is in so installing of python3-htmllib can be removed. Fixes: QTBUG-132584 Change-Id: Ia6f4262971f60b960a61a466f418750c0d956cbc Reviewed-by: Volker Hilsheimer (cherry picked from commit f8e873b1889f392923a4df97fb85663759889241) Reviewed-by: Jani Heikkinen --- .../qtci-linux-RHEL-8.10-x86_64/04-install-packages.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/04-install-packages.sh index 42b62022d91..7e3120b5395 100644 --- a/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/04-install-packages.sh @@ -86,7 +86,6 @@ installPackages+=(libXtst-devel) installPackages+=(libxshmfence-devel) installPackages+=(nspr-devel) installPackages+=(nss-devel) -installPackages+=(python3-html5lib) installPackages+=(libatomic) installPackages+=(mesa-libgbm-devel-21.3.4-1.el8.x86_64) # For Android builds @@ -167,7 +166,7 @@ sudo pip config --user set global.index https://ci-files01-hki.ci.qt.io/input/py sudo pip config --user set global.extra-index-url https://pypi.org/simple/ sudo pip3 install virtualenv wheel -sudo python3.11 -m pip install virtualenv wheel +sudo python3.11 -m pip install virtualenv wheel html5lib sudo python3.11 -m pip install -r "${BASH_SOURCE%/*}/../common/shared/sbom_requirements.txt" # For now we don't set QT_SBOM_PYTHON_APPS_PATH here, and rely on the build system to find the # system python3.11. From f537715537329906842c360c101e8c6be8ecc8eb Mon Sep 17 00:00:00 2001 From: Rami Potinkara Date: Wed, 13 Nov 2024 10:49:06 +0200 Subject: [PATCH 38/75] Android: Android 15 as maximum supported version This patch - Replaces Android 14 with Android 15 as a maximum version - Introduces Android 15 system image to CI cache - Sets Android 15 as significant Task-number: QTQAINFRA-6478 Fixes: QTQAINFRA-6652 Pick-to: 6.8 6.5 Change-Id: Icb6de43f3e2c2f7f98f3172c83d66bebf9603d24 Reviewed-by: Assam Boudjelthia (cherry picked from commit 2c85a91e072241572372c98a667401bf27174a1b) Reviewed-by: Qt Cherry-pick Bot --- .../cmake_platforms_target_android.yaml | 18 +------------ .../linux_android_tests_multi_abi.yaml | 4 +-- .../tqtc-android-automotive.yaml | 2 +- .../common/linux/android_linux.sh | 27 +++++++++---------- 4 files changed, 17 insertions(+), 34 deletions(-) diff --git a/coin/platform_configs/cmake_platforms_target_android.yaml b/coin/platform_configs/cmake_platforms_target_android.yaml index d1a145fdbcd..1020e1e77f0 100644 --- a/coin/platform_configs/cmake_platforms_target_android.yaml +++ b/coin/platform_configs/cmake_platforms_target_android.yaml @@ -47,22 +47,6 @@ Configurations: 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}', 'ANDROID_EMULATOR=emulator_x86_api_28' ] -- - Id: 'android-14-x86_64-on-linux' - Template: 'qtci-linux-RHEL-8.10-x86_64-51' - Target os: 'Android_ANY' - Target arch: 'x86_64' - Compiler: 'GCC' - Target compiler: 'Clang' - Platform dependency: 'rhel-8.10' - Features: ['PinCores', 'Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] - Environment variables: [ - 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64', - 'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', - 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_64}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', - 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}', - 'ANDROID_EMULATOR=emulator_x86_64_api_34' - ] - Id: 'android-15-x86_64-on-linux' Template: 'qtci-linux-RHEL-8.10-x86_64-51' @@ -71,7 +55,7 @@ Configurations: Compiler: 'GCC' Target compiler: 'Clang' Platform dependency: 'rhel-8.10' - Features: ['PinCores', 'Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM', 'InsignificantTests'] + Features: ['PinCores', 'Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64', 'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', diff --git a/coin/platform_configs/linux_android_tests_multi_abi.yaml b/coin/platform_configs/linux_android_tests_multi_abi.yaml index 18af40abaa1..23f9e32db66 100644 --- a/coin/platform_configs/linux_android_tests_multi_abi.yaml +++ b/coin/platform_configs/linux_android_tests_multi_abi.yaml @@ -10,7 +10,7 @@ Configurations: Platform dependency: [ 'rhel-8.10', 'android-9-x86-on-linux', - 'android-14-x86_64-on-linux' + 'android-15-x86_64-on-linux' ] Features: [ 'PinCores', @@ -23,7 +23,7 @@ Configurations: Environment variables: [ 'QT_CI_ARTIFACT_ID_PATH_Android-host=QT_CI_ARTIFACT_ID_PATH_rhel-8.10', 'QT_CI_ARTIFACT_ID_PATH_Android-x86=QT_CI_ARTIFACT_ID_PATH_android-9-x86-on-linux', - 'QT_CI_ARTIFACT_ID_PATH_Android-x86_64=QT_CI_ARTIFACT_ID_PATH_android-14-x86_64-on-linux', + 'QT_CI_ARTIFACT_ID_PATH_Android-x86_64=QT_CI_ARTIFACT_ID_PATH_android-15-x86_64-on-linux', 'COMMON_TARGET_TEST_CMAKE_ARGS=-DQT_ANDROID_ABIS="x86;x86_64"', 'ANDROID_EMULATOR=emulator_x86_api_28' ] diff --git a/coin/platform_configs/tqtc-android-automotive.yaml b/coin/platform_configs/tqtc-android-automotive.yaml index f921e8173bc..518034db182 100644 --- a/coin/platform_configs/tqtc-android-automotive.yaml +++ b/coin/platform_configs/tqtc-android-automotive.yaml @@ -13,7 +13,7 @@ Include: [ 'android-arm64-on-macos', 'android-armv7-on-windows', 'android-9-x86-on-linux', - 'android-14-x86_64-on-linux' + 'android-15-x86_64-on-linux' ], offline_documentation.yaml ] diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index 9f2814ac184..5c4b07ef5e0 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -33,11 +33,6 @@ toolsSha1="9172381ff070ee2a416723c1989770cf4b0d1076" ndkSha1Latest="fdf33d9f6c1b3f16e5459d53a82c7d2201edbcc4" ndkSha1Default=$ndkSha1Latest -# Android 14 avd zip -android14SystemZipName="android14system_UE1A_230829_036.tar.gz" -android14SystemZipSha="ede80c6901e8fad1895c97a86542b8e072bb1ee5" -android14SystemPath="$basePath/$android14SystemZipName" - # Android Automotive max SDK level image sdkApiLevelAutomotiveMax="android-34" androidAutomotiveMaxUrl="$basePath/${sdkApiLevelAutomotiveMax}_automotive.tar.gz" @@ -162,13 +157,20 @@ echo "Unzipping the Android 9 to $minVersionDestination" sudo unzip -o -q "$minVersionFilePath" -d "$minVersionDestination" rm "$minVersionFilePath" -echo "y" | ./sdkmanager --install "system-images;android-35;google_apis;x86_64" \ - | eval "$sdkmanager_no_progress_bar_cmd" +echo "Download and unzip Android 15 System Image" +maxVersionFileName="x86_64-35_r08.zip" +maxVersionDestination="$sdkTargetFolder/system-images/android-35/google_apis/" +maxVersionFilePath="$maxVersionDestination/$maxVersionFileName" +maxVersionCiUrl="$basePath/system-images/google_apis/$maxVersionFileName" +maxVersionUrl="https://dl.google.com/android/repository/sys-img/google_apis/$maxVersionFileName" +maxVersionSha1="d79169884cabc6680cb29d32c2112ad46c858c1b" -echo "Extract stored Android 14 Beta $android14SystemZipName" -DownloadURL "$android14SystemPath" "$android14SystemPath" "$android14SystemZipSha" \ - "/tmp/$android14SystemZipName" -sudo tar -xzf "/tmp/$android14SystemZipName" -C "$sdkTargetFolder/system-images" +mkdir -p "$maxVersionDestination" +DownloadURL "$maxVersionCiUrl" "$maxVersionUrl" "$maxVersionSha1" "$maxVersionFilePath" + +echo "Unzipping the Android 15 to $maxVersionDestination" +sudo unzip -o -q "$maxVersionFilePath" -d "$maxVersionDestination" +rm "$maxVersionFilePath" echo "Checking the contents of Android SDK again..." ls -l "$sdkTargetFolder" @@ -176,9 +178,6 @@ ls -l "$sdkTargetFolder" echo "no" | ./avdmanager create avd -n emulator_x86_api_28 -c 2048M -f \ -k "system-images;android-28;google_apis;x86" -echo "no" | ./avdmanager create avd -n emulator_x86_64_api_34 -c 2048M -f \ - -k "system-images;android-34;google_apis;x86_64" - echo "no" | ./avdmanager create avd -n emulator_x86_64_api_35 -c 2048M -f \ -k "system-images;android-35;google_apis;x86_64" From 3579a0c95ceb37857d82f629eee80d652e182a94 Mon Sep 17 00:00:00 2001 From: Matti Paaso Date: Thu, 9 Jan 2025 15:10:14 +0200 Subject: [PATCH 39/75] Provisioning: Update Axivion bauhaus suite and license file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-6880 Pick-to: 6.8 6.5 Change-Id: I92a70dcb14bbba0ded889894059f2de849b1f557 Reviewed-by: Simo Fält (cherry picked from commit 45491c61fc2ec94b5bf4817be26814fe49eab9fa) Reviewed-by: Qt Cherry-pick Bot --- .../93-axivion-bauhaus-suite.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/93-axivion-bauhaus-suite.sh b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/93-axivion-bauhaus-suite.sh index ba9e8fbf954..6a0c4127858 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/93-axivion-bauhaus-suite.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/93-axivion-bauhaus-suite.sh @@ -22,18 +22,18 @@ DownloadAndExtract () { # Axivion Bauhaus Suite -sourceFile="http://ci-files01-hki.ci.qt.io/input/axivion/bauhaus-suite-7_8_4-x86_64-gnu_linux.tar.gz" -targetFile="bauhaus-suite-7_8_4-x86_64-gnu_linux.tar.gz" -sha1="519f84237a4f55700dfb34767ba5bb342f142012" +sourceFile="http://ci-files01-hki.ci.qt.io/input/axivion/bauhaus-suite-7_9_1-x86_64-gnu_linux.tar.gz" +targetFile="bauhaus-suite-7_9_1-x86_64-gnu_linux.tar.gz" +sha1="43d18d55087ce02009b850553405af55ba4e37e2" cd "$HOME" DownloadAndExtract "$sourceFile" "$sha1" "$targetFile" "$HOME" mkdir "$HOME/.bauhaus" cd "$HOME/.bauhaus" -wget http://ci-files01-hki.ci.qt.io/input/axivion/Qt_Evaluation_QSR_INTERN_20250118.key +wget http://ci-files01-hki.ci.qt.io/input/axivion/QT_11427439_2025-10-07.key cd "$HOME" #Axivion configuration cp -r "${BASH_SOURCE%/*}/../common/linux/axivion/" "$HOME/" -echo "Axivion Bauhaus Suite = 7.8.4" >> ~/versions.txt +echo "Axivion Bauhaus Suite = 7.9.1" >> ~/versions.txt From 1b6c7cfa1790c2fc144c8ff6d79834c916456b80 Mon Sep 17 00:00:00 2001 From: Tero Heikkinen Date: Tue, 14 Jan 2025 12:56:59 +0200 Subject: [PATCH 40/75] SLES 15 SP5: Update timezone package Updates: - Timezone package from 2023c to 2024a - qtci-linux-SLES-15_SP5-x86_64-50 --> 51 Task-number: QTQAINFRA-6901 Pick-to: 6.8 Change-Id: I8ae65d0f8729e9dcf9147f45b09279fb805027ef Reviewed-by: Edward Welbourne Reviewed-by: Jukka Jokiniva (cherry picked from commit 8d0f126d853512ce6bc48a7142bfbb518a837904) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/cmake_platforms.yaml | 2 +- coin/platform_configs/cmake_platforms_static_tests.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 615f5924701..cef7245c431 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -120,7 +120,7 @@ Configurations: ] - Id: 'sles-15_sp5-static' - Template: 'qtci-linux-SLES-15_SP5-x86_64-50' + Template: 'qtci-linux-SLES-15_SP5-x86_64-51' Compiler: 'GCC' Features: ['Sccache', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] Configure arguments: '-nomake examples -static -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer' diff --git a/coin/platform_configs/cmake_platforms_static_tests.yaml b/coin/platform_configs/cmake_platforms_static_tests.yaml index 833fb4365a5..bfc1e08b17a 100644 --- a/coin/platform_configs/cmake_platforms_static_tests.yaml +++ b/coin/platform_configs/cmake_platforms_static_tests.yaml @@ -2,7 +2,7 @@ Version: 2 Configurations: - Id: 'sles-15_sp5-minimal-static' - Template: 'qtci-linux-SLES-15_SP5-x86_64-50' + Template: 'qtci-linux-SLES-15_SP5-x86_64-51' Compiler: 'GCC' Features: ['PinCores', 'Sccache', 'MinimalStaticTests', 'UseConfigure'] Configure arguments: '-nomake examples -static -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer' From 4eac58fb7c83f93a336de8f063047b759f931f04 Mon Sep 17 00:00:00 2001 From: Tero Heikkinen Date: Tue, 7 Jan 2025 13:52:37 +0200 Subject: [PATCH 41/75] Add Perl JSON module Needed with all the machines generating SBOM Task-number: QTQAINFRA-6871 Task-number: QTBUG-131434 Change-Id: I15a79c005f530c551f9026e2cbfb465ed1211e98 Reviewed-by: Alexandru Croitor (cherry picked from commit 6c6faeefd2661c86aee05bb0f32bd90d9bbb9958) Reviewed-by: Qt Cherry-pick Bot --- .../qtci-linux-RHEL-8.10-x86_64/04-install-packages.sh | 2 ++ .../qtci-linux-RHEL-9.4-x86_64/04-install-packages.sh | 2 ++ .../qtci-linux-SLES-15_SP5-x86_64/02-zypperpackages.sh | 3 +++ .../qtci-linux-SLES-15_SP6-x86_64/02-zypperpackages.sh | 3 +++ coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh | 2 ++ .../qtci-linux-openSUSE-15.6-x86_64/04-zypperpackages.sh | 3 +++ 6 files changed, 15 insertions(+) diff --git a/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/04-install-packages.sh index 7e3120b5395..7a9509b28e3 100644 --- a/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/04-install-packages.sh @@ -153,6 +153,8 @@ installPackages+=(zip) installPackages+=(perl-IPC-Cmd) # password management support for Qt Creator installPackages+=(libsecret-devel) +# For tst_license.pl with all the machines generating SBOM +installPackages+=(perl-JSON) sudo yum -y install "${installPackages[@]}" diff --git a/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/04-install-packages.sh index 8b1739632c2..71e7ad8274f 100644 --- a/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/04-install-packages.sh @@ -167,6 +167,8 @@ installPackages+=(perl-IPC-Cmd) installPackages+=(libsecret-devel) # For Firebird in RTA installPackages+=(libtommath-devel) +# For tst_license.pl with all the machines generating SBOM +installPackages+=(perl-JSON) sudo yum -y install "${installPackages[@]}" diff --git a/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/02-zypperpackages.sh b/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/02-zypperpackages.sh index e94a883903c..b9747538c32 100644 --- a/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/02-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/02-zypperpackages.sh @@ -110,6 +110,9 @@ sudo zypper -nq install cifs-utils # For Firebird in RTA sudo zypper -nq install libtommath-devel +# For tst_license.pl with all the machines generating SBOM +sudo zypper -nq install perl-JSON + gccVersion="$(gcc --version |grep gcc |cut -b 17-23)" echo "GCC = $gccVersion" >> versions.txt diff --git a/coin/provisioning/qtci-linux-SLES-15_SP6-x86_64/02-zypperpackages.sh b/coin/provisioning/qtci-linux-SLES-15_SP6-x86_64/02-zypperpackages.sh index 4a5e6e2b01e..ec53510257f 100644 --- a/coin/provisioning/qtci-linux-SLES-15_SP6-x86_64/02-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-SLES-15_SP6-x86_64/02-zypperpackages.sh @@ -113,6 +113,9 @@ sudo zypper -nq install cifs-utils # For Firebird in RTA sudo zypper -nq install libtommath-devel +# For tst_license.pl with all the machines generating SBOM +sudo zypper -nq install perl-JSON + gccVersion="$(gcc --version |grep gcc |cut -b 17-23)" echo "GCC = $gccVersion" >> versions.txt diff --git a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh index 92128c1db6d..cea818c444b 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh @@ -242,6 +242,8 @@ installPackages+=(patchelf) # For Firebird in RTA installPackages+=(libtommath-dev) +# For tst_license.pl with all the machines generating SBOM +installPackages+=(libjson-perl) echo "Running update for apt" waitLoop diff --git a/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/04-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/04-zypperpackages.sh index dd722e4ebc5..1dfb3473365 100644 --- a/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/04-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/04-zypperpackages.sh @@ -87,6 +87,9 @@ sudo zypper -nq install libtommath-devel # Java sudo zypper -nq install java-17-openjdk +# For tst_license.pl with all the machines generating SBOM +sudo zypper -nq install perl-JSON + gccVersion="$(gcc --version |grep gcc |cut -b 17-23)" echo "GCC = $gccVersion" >> versions.txt From e732ea40d7b33feafe717f8b56164b24886256b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Wierci=C5=84ski?= Date: Thu, 21 Nov 2024 14:39:39 +0100 Subject: [PATCH 42/75] wasm: Update Emscripten to 3.1.70 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I2a1250d2744d12f5d3f8122f7931c821c607f71b Reviewed-by: Morten Johan Sørvig Reviewed-by: Piotr Wierciński (cherry picked from commit c052b991b07c97947f300d73a3d3a00b2c26af69) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/cmake_platforms_wasm.yaml | 8 ++++---- coin/provisioning/common/unix/emsdk.sh | 6 +++--- coin/provisioning/common/windows/emsdk.ps1 | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/coin/platform_configs/cmake_platforms_wasm.yaml b/coin/platform_configs/cmake_platforms_wasm.yaml index 7cdba0741e6..90a4a8654fb 100644 --- a/coin/platform_configs/cmake_platforms_wasm.yaml +++ b/coin/platform_configs/cmake_platforms_wasm.yaml @@ -6,7 +6,7 @@ Configurations: Target os: 'WebAssembly' Compiler: 'GCC' Platform dependency: 'opensuse-15.6-developer-build' - Features: ['Sccache', 'DoNotRunTests', 'UseConfigure'] + Features: ['DoNotRunTests', 'UseConfigure'] Environment variables: [ 'EM_CONFIG={{.Env.EMSDK}}/.emscripten', "TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples -feature-thread \ @@ -19,7 +19,7 @@ Configurations: Compiler: 'Mingw' Target compiler: 'Clang' Platform dependency: 'windows-10_22h2-mingw13' - Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] + Features: ['Packaging','DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] Environment variables: [ 'Path={{.Env.EMSDK_PATH}};{{.Env.MINGW_PATH}}\bin;{{.Env.Path}}', 'EM_CONFIG={{.Env.EMSDK}}/.emscripten', @@ -33,7 +33,7 @@ Configurations: Target os: 'WebAssembly' Compiler: 'GCC' Platform dependency: 'opensuse-15.6-developer-build' - Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] + Features: ['Packaging', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] Environment variables: [ 'EM_CONFIG={{.Env.EMSDK}}/.emscripten', 'TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples -feature-thread', @@ -46,7 +46,7 @@ Configurations: Target os: 'WebAssembly' Compiler: 'GCC' Platform dependency: 'opensuse-15.6-developer-build' - Features: ['Sccache', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] + Features: ['DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] Environment variables: [ 'EM_CONFIG={{.Env.EMSDK}}/.emscripten', 'TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -no-feature-thread -nomake tests -nomake examples -shared', diff --git a/coin/provisioning/common/unix/emsdk.sh b/coin/provisioning/common/unix/emsdk.sh index 00f6a7459d7..cd689708568 100755 --- a/coin/provisioning/common/unix/emsdk.sh +++ b/coin/provisioning/common/unix/emsdk.sh @@ -8,15 +8,15 @@ source "${BASH_SOURCE%/*}/SetEnvVar.sh" # shellcheck source=./DownloadURL.sh source "${BASH_SOURCE%/*}/DownloadURL.sh" -version="3.1.56" +version="3.1.70" versionNode="v16.20.0" tarBallVersion="${version//./_}" if uname -a | grep -q Darwin; then tarBallPackage="emsdk_macos_${tarBallVersion}.tar.gz" - sha="24c49db971da4fd7c68f6b71984c3d7775fdfb84" + sha="eafd7b96ab12d84183d2eaa62e8d39bb12c252bf" else tarBallPackage="emsdk_linux_${tarBallVersion}.tar.gz" - sha="410c93bb2ab3b244190c2cb5f0ff1ce5d6ac4eb5" + sha="047a3da9048edc71fb56af544c4bb2448d6c0644" fi cacheUrl="https://ci-files01-hki.ci.qt.io/input/emsdk/$%7BtarBallPackage%7D" target="/tmp/${tarBallPackage}" diff --git a/coin/provisioning/common/windows/emsdk.ps1 b/coin/provisioning/common/windows/emsdk.ps1 index 5dcdd99e2d5..5d8db6dfb39 100644 --- a/coin/provisioning/common/windows/emsdk.ps1 +++ b/coin/provisioning/common/windows/emsdk.ps1 @@ -5,11 +5,11 @@ # This script will install emscripten needed by WebAssembly -$version = "3.1.56" +$version = "3.1.70" $zipVersion = $version -replace '\.', "_" $temp = "$env:tmp" $cacheUrl = "https://ci-files01-hki.ci.qt.io/input/emsdk/emsdk_windows_$%7BzipVersion%7D.zip" -$sha = "ab376d218f1a66302c36770977948f74f0576a42" +$sha = "4d05e378575cb3d74e2740b121730ba1f5822f27" # Python used for '.\emsdk install' $pythonPath = [System.Environment]::GetEnvironmentVariable("PYTHON3_PATH", "Machine") From ffb6de83c92099b6e12d8962a32d0f6804b0db7c Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 28 Jan 2025 03:02:39 +0000 Subject: [PATCH 43/75] Update submodules on '6.9 in qt/qt5' Change-Id: I5c2a745c3db8d7de6efa3466c82744eb7138302a Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qt5compat | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtcharts | 2 +- qtcoap | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgraphs | 2 +- qtgrpc | 2 +- qthttpserver | 2 +- qtimageformats | 2 +- qtlanguageserver | 2 +- qtlocation | 2 +- qtlottie | 2 +- qtmqtt | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtopcua | 2 +- qtpositioning | 2 +- qtquick3d | 2 +- qtquick3dphysics | 2 +- qtquickeffectmaker | 2 +- qtquicktimeline | 2 +- qtremoteobjects | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtshadertools | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- 42 files changed, 42 insertions(+), 42 deletions(-) diff --git a/qt3d b/qt3d index 59cf8583b62..b6df3e11131 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 59cf8583b621bad03674c1f8a4b16a577a11ac3b +Subproject commit b6df3e11131cef2b5ba213617cdac67cf8229ed1 diff --git a/qt5compat b/qt5compat index 25472decbf1..422490f793a 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 25472decbf1621c7120d9b0599227016dab6cf8a +Subproject commit 422490f793a421d1d6710b5e9b7f689674d58e13 diff --git a/qtactiveqt b/qtactiveqt index b6514eee4d1..820b6b000f6 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit b6514eee4d133e87833ad7c1f3db949519536834 +Subproject commit 820b6b000f6bccefc0aef5e165d8280128b33838 diff --git a/qtbase b/qtbase index 6ce164b3e0e..3f5df82334b 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 6ce164b3e0e13f3eb376baa4bdb467f9bb331fbb +Subproject commit 3f5df82334b89102902051726e761180a1a72fec diff --git a/qtcharts b/qtcharts index 65f0bd52338..505049fc254 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 65f0bd523386b1ae5a4e8fa9123d5b17aff081b4 +Subproject commit 505049fc254dae2c92f841fccdd6991179c74cfb diff --git a/qtcoap b/qtcoap index 9b0e7b4a07b..e8b7be0a9bf 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit 9b0e7b4a07b3d24a7cc0c8640dcc407b21bb2bc6 +Subproject commit e8b7be0a9bf0cbef9c37506b0b76fe5b6fb396c3 diff --git a/qtconnectivity b/qtconnectivity index dc961330fca..cc6cb52adee 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit dc961330fca63f4bebe75326842e626f124852a2 +Subproject commit cc6cb52adeedbba6f7e0cffd5f6d8feed6b5b5d9 diff --git a/qtdatavis3d b/qtdatavis3d index 260dddf67d6..22a3553ea5c 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 260dddf67d6edada03627556097982a157a414ac +Subproject commit 22a3553ea5c0836df624573519f40e0168543b9a diff --git a/qtdeclarative b/qtdeclarative index 237decc5ef0..bfa23b1f73d 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 237decc5ef072c10dd3d528e768faf08332bbf62 +Subproject commit bfa23b1f73dcb7bab8d503662aeb76efaf852d4f diff --git a/qtdoc b/qtdoc index b09631b9365..2aefb4a7346 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit b09631b936510685235b38789ce562d8a45ea085 +Subproject commit 2aefb4a73466c6ba39667e8a039177746f8b8ae6 diff --git a/qtgraphs b/qtgraphs index 8e6a1f94158..5b043b102ae 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit 8e6a1f94158d03d12088710f86b6423d705f6526 +Subproject commit 5b043b102ae603108702999be05494cd9d7dede3 diff --git a/qtgrpc b/qtgrpc index c3115a7d813..45bd98a682f 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit c3115a7d81314115d83f81e08df809ffd4063a21 +Subproject commit 45bd98a682f17b883a6162d067a1c4575d2b8bf3 diff --git a/qthttpserver b/qthttpserver index 7147117136d..a0986c7a83b 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit 7147117136d35ac9bfa8a07295d49836c9821079 +Subproject commit a0986c7a83b28ea3e812ef1583a52b0aaa953bdf diff --git a/qtimageformats b/qtimageformats index 56e2d66799e..13839ef5f41 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 56e2d66799e83bf1639765172e193b85a0f6c234 +Subproject commit 13839ef5f412e44fdec9995c2b3383715e284365 diff --git a/qtlanguageserver b/qtlanguageserver index c9e2f167d35..736f3b571f2 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit c9e2f167d358f0c07070317e9acdf050d6d6fbf0 +Subproject commit 736f3b571f23fc7156a2c962372a0d6296a2149a diff --git a/qtlocation b/qtlocation index 790ccfd211b..220115a889c 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 790ccfd211b5bfd0f27a07a206941e085c6feb7f +Subproject commit 220115a889c762c58c9b62b0ac7fbaf0679572d3 diff --git a/qtlottie b/qtlottie index 0eef822f64a..6b2d007eb96 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 0eef822f64a4bd472f4de77971c483113f057898 +Subproject commit 6b2d007eb96cdcb368b5be9d862d59ecc2fead3d diff --git a/qtmqtt b/qtmqtt index 90baacbe2a5..9fd57e757e7 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit 90baacbe2a525f6dcf9b32e31ee1f11384ebe5e7 +Subproject commit 9fd57e757e73221b423b1a69c8649d5a5f4066f9 diff --git a/qtmultimedia b/qtmultimedia index ddad4adda0e..6b718753f65 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit ddad4adda0eb5090eb0a3f1486b489ec777ba8d8 +Subproject commit 6b718753f65d0154ae3727e641e4293f956d8e04 diff --git a/qtnetworkauth b/qtnetworkauth index 75d249d46ca..db120b88f58 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 75d249d46ca328c7605ea7fd2007e0b91fa618f2 +Subproject commit db120b88f58b9435dff7fe5c53e50b9bc88eef12 diff --git a/qtopcua b/qtopcua index 22a0cf91707..e1fb17513dd 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit 22a0cf91707f06fa25e8f95704b3ea71b20bbc8b +Subproject commit e1fb17513dd55a0a4f84a761387fae54a542fe8a diff --git a/qtpositioning b/qtpositioning index 0305d88e062..e7fd817f96c 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit 0305d88e0629db65e4106ad272eead5304f1c6dd +Subproject commit e7fd817f96c035f4c0fcf87c7968cb9595ff4f82 diff --git a/qtquick3d b/qtquick3d index 9499968a43c..81f12fbde43 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 9499968a43cb1cc5b830ecff2ad735cbbdc04ac8 +Subproject commit 81f12fbde43d97df01f93441a286b90a739c1aa9 diff --git a/qtquick3dphysics b/qtquick3dphysics index b6dc1c81645..ab58d0bb5a2 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit b6dc1c8164529b9f1690f7793bbe319d71bbeb65 +Subproject commit ab58d0bb5a2c1d668187a4bf9dca87090c3171cb diff --git a/qtquickeffectmaker b/qtquickeffectmaker index 59d7ce2b817..40a03430aa6 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit 59d7ce2b817a6ec2eea416a18592f24c93ef4b57 +Subproject commit 40a03430aa6423cbf15ca4394874d33b92576e49 diff --git a/qtquicktimeline b/qtquicktimeline index d94aeb86416..dac57b3480f 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit d94aeb8641690bac7cfe4f71d19e67f7c31de175 +Subproject commit dac57b3480fced40c799bc6066406ab187e7a171 diff --git a/qtremoteobjects b/qtremoteobjects index 25639d3bb08..7558e7157a6 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 25639d3bb08cf24353e87538b9c02b3a6554eb6c +Subproject commit 7558e7157a63f6e967e405d97b7aeae480900245 diff --git a/qtscxml b/qtscxml index 88d38f260e0..7607f60a9cd 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 88d38f260e0b509fa967d739f509ea3c5ccc8947 +Subproject commit 7607f60a9cd0eb9bce24aee787cc40fb88ab8129 diff --git a/qtsensors b/qtsensors index d8abcd1e10f..95a6ba3064c 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit d8abcd1e10fed1e55a3940aa255694113146c978 +Subproject commit 95a6ba3064c647a856703a883a6e35f5a1836e5e diff --git a/qtserialbus b/qtserialbus index a4b8c7eb439..3a85b7528df 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit a4b8c7eb439aa9e9a4e4a63e9011945ac195eb3c +Subproject commit 3a85b7528dfd9fb5ad661d624dc04fd142764205 diff --git a/qtserialport b/qtserialport index cb5b6ae1e9d..dc7079f49d7 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit cb5b6ae1e9d7151ef3b6aba415be333112dae1d6 +Subproject commit dc7079f49d720acf5022ef25a3994f2b01a8f1c1 diff --git a/qtshadertools b/qtshadertools index 401ac4af43d..0a5025b7d12 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 401ac4af43d2ef5c107cf25b6b0b34eff84472bb +Subproject commit 0a5025b7d12eadd423dc245e7a2ad4ed1e835fdb diff --git a/qtspeech b/qtspeech index cf78d60941f..ff1145bb21f 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit cf78d60941f3d4e4595b17f4cfe1d6c1f6e05c61 +Subproject commit ff1145bb21f4d20087df455e4ee2c07b2bc7a3e4 diff --git a/qtsvg b/qtsvg index 4bbb47dec29..2213bc559ca 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 4bbb47dec29b74b1795cbaa42459a878856a9c18 +Subproject commit 2213bc559ca0f164a2d91885db7fdc856eb851d6 diff --git a/qttools b/qttools index 1bfd2525303..78e268be119 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 1bfd25253033c4d81d8a6e89d08bcffbe6372ec6 +Subproject commit 78e268be119b9fb475c976f619349474bb262796 diff --git a/qttranslations b/qttranslations index 0a92e653522..8cf9687b1e9 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 0a92e6535229bb1e80e4bc95a1433db604260d1f +Subproject commit 8cf9687b1e94b4891cf6eca6d3ad5f913daf3834 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index cbbf52dcae8..6ab8ebc298b 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit cbbf52dcae8e2edaee29f01b667caf97d3b0e1cf +Subproject commit 6ab8ebc298b24b97a343e5e3e445d0284ddef165 diff --git a/qtwayland b/qtwayland index 2f0e602e5e2..1538f2597b1 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 2f0e602e5e25c1a42ad49182379d565ff08a2d24 +Subproject commit 1538f2597b10938dace32ef89e55937c2c4fb394 diff --git a/qtwebchannel b/qtwebchannel index 0a368c56906..75fca0e5c00 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 0a368c56906e71ccd0bbc77f9fda0a72c4508daf +Subproject commit 75fca0e5c009223f851a6461612ddd0f9fbb36f3 diff --git a/qtwebengine b/qtwebengine index 12d2b526241..edd09e1ec4d 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 12d2b5262411af5fd1f546e736c1703edd917d82 +Subproject commit edd09e1ec4df080deee3977e010b39e3ed140471 diff --git a/qtwebsockets b/qtwebsockets index 6e6968458ed..1ded1c4828f 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 6e6968458edbfeff07ce490ad8de6a07c1b45aee +Subproject commit 1ded1c4828fa1e342853c32afd187a82e567931e diff --git a/qtwebview b/qtwebview index 940ca26f50f..4aef8a30ce9 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 940ca26f50fa9c0fa49b7bba6cce2a12ebcba775 +Subproject commit 4aef8a30ce928f075ddb9e622f6441aad953ad55 From 27b0c6daffdb4bbe513f0ae1d48b61429a37f5e2 Mon Sep 17 00:00:00 2001 From: Piotr Wiercinski Date: Wed, 15 Jan 2025 12:48:48 +0100 Subject: [PATCH 44/75] wasm tests: Update Chrome to 131 and use headless mode MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Newer version of Chrome together with healdess mode should provide more stability. Change-Id: Ifb6b326b90067d9e069ebef662356d28e2c9edd7 Reviewed-by: Morten Johan Sørvig (cherry picked from commit ae85de3cf812686cc94a859d893c388011e2a09d) Reviewed-by: Qt Cherry-pick Bot --- .../platform_configs/cmake_platforms_wasm.yaml | 3 ++- .../80-install-chrome.sh | 18 +++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/coin/platform_configs/cmake_platforms_wasm.yaml b/coin/platform_configs/cmake_platforms_wasm.yaml index 90a4a8654fb..57d7a4c81df 100644 --- a/coin/platform_configs/cmake_platforms_wasm.yaml +++ b/coin/platform_configs/cmake_platforms_wasm.yaml @@ -10,7 +10,8 @@ Configurations: Environment variables: [ 'EM_CONFIG={{.Env.EMSDK}}/.emscripten', "TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples -feature-thread \ - -feature-exceptions -DQT_QMAKE_DEVICE_OPTIONS=\"QT_EMSCRIPTEN_ASYNCIFY=1\"" + -feature-exceptions -DQT_QMAKE_DEVICE_OPTIONS=\"QT_EMSCRIPTEN_ASYNCIFY=1\"", + 'HEADLESS_CHROME_FOR_TESTING=true' ] - Id: 'webassembly-windows' diff --git a/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/80-install-chrome.sh b/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/80-install-chrome.sh index ba54c2c5a7b..7901ea1a468 100644 --- a/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/80-install-chrome.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/80-install-chrome.sh @@ -10,14 +10,14 @@ source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" # shellcheck source=../common/unix/DownloadURL.sh source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" -chromeVersion="chrome-for-testing-115" -sha="7242ece1055bdbf503527f8e87c4b5da37c3c60e" -chromeUrl="https://ci-files01-hki.ci.qt.io/input/wasm/chrome/$%7BchromeVersion%7D.tar.gz" -target="/tmp/chrome-for-testing-115.tar.gz" +chromeVersion="chrome-for-testing-131" +sha="006d8e0438980d5ca8809af6f036e2b802b13cc8" +cachedChromeUrl="https://ci-files01-hki.ci.qt.io/input/wasm/chrome/$%7BchromeVersion%7D.zip" +officialChromeUrl="https://storage.googleapis.com/chrome-for-testing-public/131.0.6778.204/linux64/chrome-linux64.zip" +target="/tmp/${chromeVersion}.zip" -DownloadURL "$chromeUrl" "" "$sha" "$target" -sudo tar -xzf "$target" -C "${HOME}" +DownloadURL "$cachedChromeUrl" "$officialChromeUrl" "$sha" "$target" +sudo unzip -q "$target" -d "${HOME}" sudo rm -f "$target" - -SetEnvVar "BROWSER_FOR_WASM" "${HOME}/${chromeVersion}/chrome" -SetEnvVar "CHROMEDRIVER_PATH" "${HOME}/${chromeVersion}/chromedriver" +chromePath="${HOME}/chrome-linux64/chrome" +SetEnvVar "BROWSER_FOR_WASM" "${chromePath}" From 1bb142175a5447149020a994b83e9ca9c2a58269 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Mon, 27 Jan 2025 13:29:15 +0100 Subject: [PATCH 45/75] Use correct path for libiodbc and forward via ODBC_ROOT env var The hard-coded path paths added to LIBRARY_PATH and CPLUS_INCLUDE_PATH was not correct on Apple Silicon Macs, where homebrew installs into /opt/homebrew/. There's also no point in passing on the library location via compiler environment variables, when we can use ODBC_ROOT. And we don't need to pass it on as a CMake define, as a environment variable works just fine. This decouples the provisioning of libiodbc from the build configurations. Pick-to: 6.8 Change-Id: I40aa3c1852fb0baf3366fa1a9dab85a66eef95e2 Reviewed-by: Joerg Bornemann Reviewed-by: Alexandru Croitor (cherry picked from commit 124957a8cb55a9dc6a068d424a93cc7642bb03d7) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/cmake_platforms_static_release.yaml | 2 +- coin/platform_configs/macos.yaml | 2 +- coin/provisioning/common/macos/libiodbc.sh | 7 ++----- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/coin/platform_configs/cmake_platforms_static_release.yaml b/coin/platform_configs/cmake_platforms_static_release.yaml index cf2918c611c..7b15ba80b4b 100644 --- a/coin/platform_configs/cmake_platforms_static_release.yaml +++ b/coin/platform_configs/cmake_platforms_static_release.yaml @@ -53,7 +53,7 @@ Configurations: Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure', 'MinimalStaticTests'] Configure arguments: '-static -nomake examples -release -no-framework -no-icu -qt-doubleconversion -no-feature-sql-psql' Environment variables: [ - 'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DODBC_ROOT=/usr/local/opt/libiodbc -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/.. -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}', + 'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/.. -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}', 'NON_QTBASE_CMAKE_ARGS=-DCMAKE_BUILD_TYPE=Release -DFEATURE_gds=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DFEATURE_native_grpc=OFF', 'Protobuf_ROOT=/usr/local/lib/cmake/protobuf' ] diff --git a/coin/platform_configs/macos.yaml b/coin/platform_configs/macos.yaml index ee848796c17..b6ceafe63d1 100644 --- a/coin/platform_configs/macos.yaml +++ b/coin/platform_configs/macos.yaml @@ -15,7 +15,7 @@ Configurations: Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -framework' Environment variables: [ - 'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DODBC_ROOT=/usr/local/opt/libiodbc -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/.. -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}', + 'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/.. -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}', 'NON_QTBASE_CMAKE_ARGS=-DFEATURE_gds=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON -DQT_FEATURE_open62541_security=OFF', 'Protobuf_ROOT=/usr/local/lib/cmake/protobuf' ] diff --git a/coin/provisioning/common/macos/libiodbc.sh b/coin/provisioning/common/macos/libiodbc.sh index 059758c8a22..e33ce98ce03 100755 --- a/coin/provisioning/common/macos/libiodbc.sh +++ b/coin/provisioning/common/macos/libiodbc.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Copyright (C) 2018 The Qt Company Ltd. +# Copyright (C) 2025 The Qt Company Ltd. # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only # Install libiodbc @@ -11,12 +11,9 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" brew install --formula "${BASH_SOURCE%/*}/libiodbc.rb" "$@" -# CPLUS_INCLUDE_PATH is set so clang and configure can find libiodbc - read -r -a arr <<< "$(brew list --versions libiodbc)" version=${arr[1]} -SetEnvVar "CPLUS_INCLUDE_PATH" "/usr/local/Cellar/libiodbc/$version/include${CPLUS_INCLUDE_PATH:+:}${CPLUS_INCLUDE_PATH}" -SetEnvVar "LIBRARY_PATH" "/usr/local/Cellar/libiodbc/$version/lib${LIBRARY_PATH:+:}${LIBRARY_PATH}" +SetEnvVar "ODBC_ROOT" "$(brew --prefix libiodbc)" echo "libiodbc = $version" >> ~/versions.txt From 55ef82de88edc64263995a92aced906065b75928 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Mon, 27 Jan 2025 13:44:06 +0100 Subject: [PATCH 46/75] macOS: Set Protobuf_ROOT during provisioning rather than in each config Decouples provisioning from build configurations. Pick-to: 6.8 Change-Id: Ied2b60b360ef5ec5aab1dd4b2e6a0b81032d2938 Reviewed-by: Alexandru Croitor Reviewed-by: Alexey Edelev (cherry picked from commit ac2b15075c5b17596a4b7a07fe53fb8b995df4fd) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/cmake_platforms_static_release.yaml | 1 - coin/platform_configs/macos.yaml | 4 ---- coin/platform_configs/nightly_unity_builds.yaml | 1 - coin/provisioning/common/unix/install_protobuf.sh | 2 ++ 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/coin/platform_configs/cmake_platforms_static_release.yaml b/coin/platform_configs/cmake_platforms_static_release.yaml index 7b15ba80b4b..3a7020cc673 100644 --- a/coin/platform_configs/cmake_platforms_static_release.yaml +++ b/coin/platform_configs/cmake_platforms_static_release.yaml @@ -55,7 +55,6 @@ Configurations: Environment variables: [ 'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/.. -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}', 'NON_QTBASE_CMAKE_ARGS=-DCMAKE_BUILD_TYPE=Release -DFEATURE_gds=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DFEATURE_native_grpc=OFF', - 'Protobuf_ROOT=/usr/local/lib/cmake/protobuf' ] - diff --git a/coin/platform_configs/macos.yaml b/coin/platform_configs/macos.yaml index b6ceafe63d1..2b33d27d971 100644 --- a/coin/platform_configs/macos.yaml +++ b/coin/platform_configs/macos.yaml @@ -17,7 +17,6 @@ Configurations: Environment variables: [ 'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/.. -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}', 'NON_QTBASE_CMAKE_ARGS=-DFEATURE_gds=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON -DQT_FEATURE_open62541_security=OFF', - 'Protobuf_ROOT=/usr/local/lib/cmake/protobuf' ] - @@ -29,7 +28,6 @@ Configurations: Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -framework' Environment variables: [ 'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"', - 'Protobuf_ROOT=/usr/local/lib/cmake/protobuf', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON', ] @@ -119,7 +117,6 @@ Configurations: Environment variables: [ 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE', - 'Protobuf_ROOT=/usr/local/lib/cmake/protobuf', ] - Id: 'macos-14-arm64-developer-build' @@ -129,7 +126,6 @@ Configurations: Configure arguments: '-developer-build -nomake examples -debug -framework' Environment variables: [ 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}', - 'Protobuf_ROOT=/usr/local/lib/cmake/protobuf', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE', ] diff --git a/coin/platform_configs/nightly_unity_builds.yaml b/coin/platform_configs/nightly_unity_builds.yaml index b8cfc5f9301..7743c714936 100644 --- a/coin/platform_configs/nightly_unity_builds.yaml +++ b/coin/platform_configs/nightly_unity_builds.yaml @@ -53,6 +53,5 @@ Configurations: Configure arguments: '-make examples -debug -force-debug-info -separate-debug-info -headersclean -framework' Environment variables: [ 'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"', - 'Protobuf_ROOT=/usr/local/lib/cmake/protobuf', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON -DQT_UNITY_BUILD=ON', ] diff --git a/coin/provisioning/common/unix/install_protobuf.sh b/coin/provisioning/common/unix/install_protobuf.sh index 110d8b9c4b6..bf3a6d90f03 100755 --- a/coin/provisioning/common/unix/install_protobuf.sh +++ b/coin/provisioning/common/unix/install_protobuf.sh @@ -92,6 +92,8 @@ cmake "$targetDir" -G"Ninja Multi-Config" \ ninja all:all sudo env "PATH=$PATH" ninja install:all +SetEnvVar "Protobuf_ROOT" "$installPrefix/lib/cmake/protobuf" + # Refresh shared library cache if OS isn't macOS if uname -a |grep -qv "Darwin"; then sudo ldconfig From 77a614d592ed0da68324284a77cb70f85dd979de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Mon, 27 Jan 2025 13:44:06 +0100 Subject: [PATCH 47/75] macOS: Set PostgreSQL_ROOT during provisioning rather than in each config Decouples provisioning from build configurations. Pick-to: 6.8 Change-Id: I53b0983ab8b20c40568c1b5b9a24bfe3c62cf531 Reviewed-by: Joerg Bornemann (cherry picked from commit 7f51bdbd8df8eae8f9a6d2f081b762ec001056a5) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/cmake_platforms_static_release.yaml | 2 +- coin/platform_configs/macos.yaml | 2 +- coin/provisioning/common/macos/postgresql.sh | 2 +- coin/provisioning/qtci-macos-10.15-x86_64/25-postgresql.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/coin/platform_configs/cmake_platforms_static_release.yaml b/coin/platform_configs/cmake_platforms_static_release.yaml index 3a7020cc673..08d8fe614a3 100644 --- a/coin/platform_configs/cmake_platforms_static_release.yaml +++ b/coin/platform_configs/cmake_platforms_static_release.yaml @@ -53,7 +53,7 @@ Configurations: Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure', 'MinimalStaticTests'] Configure arguments: '-static -nomake examples -release -no-framework -no-icu -qt-doubleconversion -no-feature-sql-psql' Environment variables: [ - 'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/.. -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}', + 'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}', 'NON_QTBASE_CMAKE_ARGS=-DCMAKE_BUILD_TYPE=Release -DFEATURE_gds=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DFEATURE_native_grpc=OFF', ] diff --git a/coin/platform_configs/macos.yaml b/coin/platform_configs/macos.yaml index 2b33d27d971..938c7ca9b1b 100644 --- a/coin/platform_configs/macos.yaml +++ b/coin/platform_configs/macos.yaml @@ -15,7 +15,7 @@ Configurations: Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -framework' Environment variables: [ - 'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/.. -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}', + 'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}', 'NON_QTBASE_CMAKE_ARGS=-DFEATURE_gds=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON -DQT_FEATURE_open62541_security=OFF', ] diff --git a/coin/provisioning/common/macos/postgresql.sh b/coin/provisioning/common/macos/postgresql.sh index 8980d28eccf..e146b018fec 100755 --- a/coin/provisioning/common/macos/postgresql.sh +++ b/coin/provisioning/common/macos/postgresql.sh @@ -37,5 +37,5 @@ umount "$mountpoint" echo "Removing $packageName" rm "/tmp/$packageName" -SetEnvVar "POSTGRESQLBINPATH" "/Applications/Postgres.app/Contents/Versions/$psqlVersion/bin" +SetEnvVar "PostgreSQL_ROOT" "/Applications/Postgres.app/Contents/Versions/$psqlVersion" echo "PostgreSQL = $psqlVersion ($psqlAppVersion)" >> ~/versions.txt diff --git a/coin/provisioning/qtci-macos-10.15-x86_64/25-postgresql.sh b/coin/provisioning/qtci-macos-10.15-x86_64/25-postgresql.sh index 95460b553ba..2c1e4b8faf0 100755 --- a/coin/provisioning/qtci-macos-10.15-x86_64/25-postgresql.sh +++ b/coin/provisioning/qtci-macos-10.15-x86_64/25-postgresql.sh @@ -22,5 +22,5 @@ appPrefix="" InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix" -SetEnvVar "POSTGRESQLBINPATH" "/Applications/Postgres.app/Contents/Versions/9.6/bin" +SetEnvVar "PostgreSQL_ROOT" "/Applications/Postgres.app/Contents/Versions/9.6" echo "PostgreSQL = $psqlVersion" >> ~/versions.txt From 27be5c2f98551abbeaa9cf60e3b280dea9091084 Mon Sep 17 00:00:00 2001 From: Timur Pocheptsov Date: Thu, 19 Dec 2024 14:55:56 +0100 Subject: [PATCH 48/75] Update provisioning script to build FFmpeg for iOS as xcframeworks so that we can provide both arm64 and arm64-simulator versions (the former can be used in App Store, the latter when working with a simulator). Pick-to: 6.8 Task-number: QTBUG-132313 Change-Id: Ic683f58dffcef8a06adb4a915c4e3abc4ab219e5 Reviewed-by: Artem Dyomin (cherry picked from commit 1968adc126bb5b7896e7a12475481f10bb56a543) Reviewed-by: Timur Pocheptsov Reviewed-by: Jukka Jokiniva --- .../common/unix/install-ffmpeg-ios.sh | 184 +++++++++++++----- 1 file changed, 140 insertions(+), 44 deletions(-) diff --git a/coin/provisioning/common/unix/install-ffmpeg-ios.sh b/coin/provisioning/common/unix/install-ffmpeg-ios.sh index 2f18b5c40b8..806a01f4185 100755 --- a/coin/provisioning/common/unix/install-ffmpeg-ios.sh +++ b/coin/provisioning/common/unix/install-ffmpeg-ios.sh @@ -28,48 +28,49 @@ fi ffmpeg_config_options=$(cat "${BASH_SOURCE%/*}/../shared/ffmpeg_config_options.txt") build_ffmpeg_ios() { - local target_arch=$1 - - if [ "$target_arch" == "x86_64" ]; then - target_sdk="iphonesimulator" - target_arch="x86_64" - minos="-mios-simulator-version-min=13.0" - else - target_sdk="iphoneos" - target_arch="arm64" - minos="-miphoneos-version-min=13.0" - fi - - local build_dir="$ffmpeg_source_dir/build_ios/$target_arch" - sudo mkdir -p "$build_dir" - pushd "$build_dir" - - # shellcheck disable=SC2086 - sudo "$ffmpeg_source_dir/configure" $ffmpeg_config_options \ + local target_platform=$1 + if [ "$target_platform" == "arm64-simulator" ]; then + target_sdk="iphonesimulator" + target_platform="arm64" + minos="-mios-simulator-version-min=16.0" + else + target_sdk="iphoneos" + target_platform="arm64" + minos="-miphoneos-version-min=16.0" + # TODO: consider non-arm simulator? + fi + + # Note: unlike similar install-ffmpeg scripts, not $target_platform, + # but $1 (which can be arm64-simulator with arm64 target_platform). + local build_dir="$ffmpeg_source_dir/build_ios/$1" + sudo mkdir -p "$build_dir" + pushd "$build_dir" + + # shellcheck disable=SC2086 + sudo "$ffmpeg_source_dir/configure" $ffmpeg_config_options \ --sysroot="$(xcrun --sdk "$target_sdk" --show-sdk-path)" \ - --enable-cross-compile \ - --enable-optimizations \ - --prefix=$prefix \ - --arch=$target_arch \ - --cc="xcrun --sdk ${target_sdk} clang -arch $target_arch" \ - --cxx="xcrun --sdk ${target_sdk} clang++ -arch $target_arch" \ - --ar="$(xcrun --sdk ${target_sdk} --find ar)" \ - --ranlib="$(xcrun --sdk ${target_sdk} --find ranlib)" \ - --strip="$(xcrun --sdk ${target_sdk} --find strip)" \ - --nm="$(xcrun --sdk ${target_sdk} --find nm)" \ - --target-os=darwin \ - --extra-cflags="$minos" \ - --extra-cxxflags="$minos" \ - --enable-cross-compile \ - --enable-shared \ - --disable-static \ - --install-name-dir='@rpath/Frameworks' \ - --enable-swscale \ - --enable-pthreads \ - --disable-audiotoolbox - - sudo make install DESTDIR="$build_dir/installed" -j4 - popd + --enable-cross-compile \ + --enable-optimizations \ + --prefix=$prefix \ + --arch=$target_platform \ + --cc="xcrun --sdk ${target_sdk} clang -arch $target_platform" \ + --cxx="xcrun --sdk ${target_sdk} clang++ -arch $target_platform" \ + --ar="$(xcrun --sdk ${target_sdk} --find ar)" \ + --ranlib="$(xcrun --sdk ${target_sdk} --find ranlib)" \ + --strip="$(xcrun --sdk ${target_sdk} --find strip)" \ + --nm="$(xcrun --sdk ${target_sdk} --find nm)" \ + --target-os=darwin \ + --extra-ldflags="$minos" \ + --enable-cross-compile \ + --enable-shared \ + --disable-static \ + --install-name-dir='@rpath' \ + --enable-swscale \ + --enable-pthreads \ + --disable-audiotoolbox + + sudo make install DESTDIR="$build_dir/installed" -j4 + popd } install_ffmpeg() { @@ -98,11 +99,106 @@ install_ffmpeg() { popd >/dev/null done sudo cp -r $1$prefix/include $prefix - echo "LS done." } -build_ffmpeg_ios "x86_64" +build_info_plist() { + local file_path="$1" + local framework_name="$2" + local framework_id="$3" + + local minimum_version_key="MinimumOSVersion" + local minimum_os_version="16.0" + local supported_platforms="iPhoneOS" + + info_plist=" + + + + CFBundleDevelopmentRegion + en + CFBundleExecutable + ${framework_name} + CFBundleIdentifier + ${framework_id} + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + ${framework_name} + CFBundlePackageType + FMWK + CFBundleShortVersionString + 7.0.2 + CFBundleVersion + 7.0.2 + CFBundleSignature + ???? + ${minimum_version_key} + ${minimum_os_version} + CFBundleSupportedPlatforms + + ${supported_platforms} + + NSPrincipalClass + + +" + echo $info_plist | sudo tee ${file_path} 1>/dev/null +} + +create_framework() { + # Create a 'traditional' framework from the corresponding dylib. + local framework_name="$1" + local platform="$2" # For now it's either arm64 or arm64-simulator, see below. + local ffmpeg_library_path="$ffmpeg_source_dir/build_ios/${platform}/installed/usr/local/ios/ffmpeg" + local framework_complete_path="${ffmpeg_library_path}/framework/${framework_name}.framework/${framework_name}" + + sudo mkdir -p "${ffmpeg_library_path}/framework/${framework_name}.framework" + sudo cp "${ffmpeg_library_path}/lib/${framework_name}.dylib" "${ffmpeg_library_path}/framework/${framework_name}.framework/${framework_name}" + + # Fix LC_ID_DYLIB (to be libavcodec.framework/libavcodec instead of @rpath/libavcodec.xx.yy.dylib + sudo install_name_tool -id @rpath/${framework_name}.framework/${framework_name} "${framework_complete_path}" + + build_info_plist "${ffmpeg_library_path}/framework/${framework_name}.framework/Info.plist" "${framework_name}" "io.qt.ffmpegkit."${framework_name} + + # Fix all FFmpeg-related LC_LOAD_DYLIB, similar to how we fixed LC_ID_DYLIB above: + otool -L "$framework_complete_path" | awk '/\t/ {print $1}' | egrep "$dylib_regex" | while read -r dependency_path; do + found_name=$(tmp=${dependency_path/*\/}; echo ${tmp/\.*}) + if [ "$found_name" != "$framework_name" ] + then + sudo install_name_tool -change "$dependency_path" @rpath/${found_name}.framework/${found_name} "${framework_complete_path}" + fi + done + #sudo mkdir -p "$prefix/framework/" + #sudo cp -r "${ffmpeg_library_path}/framework/${framework_name}.framework" "$prefix/framework/" +} + +create_xcframework() { + # Create 'traditional' framework from the corresponding dylib, + # also creating + local framework_name="$1" + + local fw1="$ffmpeg_source_dir/build_ios/arm64/installed/usr/local/ios/ffmpeg/framework/${framework_name}.framework" + local fw2="$ffmpeg_source_dir/build_ios/arm64-simulator/installed/usr/local/ios/ffmpeg/framework/${framework_name}.framework" + + sudo mkdir -p "$prefix/framework/" + sudo xcodebuild -create-xcframework -framework $fw1 -framework $fw2 -output "${prefix}/framework/${framework_name}.xcframework" +} + +build_ffmpeg_ios "arm64-simulator" build_ffmpeg_ios "arm64" -install_ffmpeg "$ffmpeg_source_dir/build_ios/x86_64/installed" "$ffmpeg_source_dir/build_ios/arm64/installed" +ffmpeg_libs="libavcodec libavdevice libavfilter libavformat libavutil libswresample libswscale" + +for name in $ffmpeg_libs; do + create_framework $name "arm64" + create_framework $name "arm64-simulator" +done + +# Create corresponding (xc)frameworks containing both arm64 and arm64-simulator frameworks: +for name in $ffmpeg_libs; do + create_xcframework $name +done + +install_ffmpeg "$ffmpeg_source_dir/build_ios/arm64/installed" + SetEnvVar "FFMPEG_DIR_IOS" $prefix From 3b9008ca759412dc84e6538b4c2f78c4751204bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8ger=20Hanseg=C3=A5rd?= Date: Thu, 5 Dec 2024 13:12:07 +0100 Subject: [PATCH 49/75] Update Windows provisioning to use 7z version 24.09 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-6833 Pick-to: 6.8 6.5 5.15 Change-Id: Iebb1a6fe879e3b550479cf109df79199536742e6 Reviewed-by: Axel Spoerl Reviewed-by: Jøger Hansegård Reviewed-by: Dimitrios Apostolou (cherry picked from commit a1c47252fb15c0725dfa074ac8bc731a26be6238) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/common/windows/install-sevenzip.ps1 | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/coin/provisioning/common/windows/install-sevenzip.ps1 b/coin/provisioning/common/windows/install-sevenzip.ps1 index 47a34e2be9d..dad34d90b42 100644 --- a/coin/provisioning/common/windows/install-sevenzip.ps1 +++ b/coin/provisioning/common/windows/install-sevenzip.ps1 @@ -5,24 +5,24 @@ # This script installs 7-Zip -$version = "23.01" -$nonDottedVersion = "2301" +$version = "24.09" +$nonDottedVersion = "2409" $cpu_arch = Get-CpuArchitecture switch ($cpu_arch) { arm64 { $arch = "-arm64" - $sha1 = "be65c2ea6119c04945c66b13413892f2bb03d9a7" + $sha1 = "2f5aaa22a4a591b01a1b06c17565233f0cd70429" Break } x64 { $arch = "-x64" - $sha1 = "7DF28D340D7084647921CC25A8C2068BB192BDBB" + $sha1 = "28b53835fe92c3fa6e0c422fc3b17c6bc1cb27e0" Break } x86 { $arch = "" - $sha1 = "D5D00E6EA8B8E68CE7A704FD478DC950E543C25C" + $sha1 = "2135a90a9f6c3202c32a87b1c5cf805ce294a497" Break } default { From c03c22faaeac0eee41dbc197a9960f92ba8e5e06 Mon Sep 17 00:00:00 2001 From: Toni Saario Date: Wed, 5 Feb 2025 11:39:05 +0200 Subject: [PATCH 50/75] Remove PinCores features Effect of this experiment was inconclusive. In some isolated cases limited benefit was seen, but in overall metrics no change was observed. Remove the feature to gain the lost computing capacity back. If the removal causes noticeably higher flakiness etc, it can be reevaluated. Task-number: QTQAINFRA-6702 Change-Id: I001fc2d3740a287d4546d0f597e81ded9f5449cb (cherry picked from commit 8d51e875cb7361f97d8ac637f4a4d454bbfe5be4) Reviewed-by: Jukka Jokiniva --- .../address_sanitizer_platforms.yaml | 2 +- coin/platform_configs/cmake_platforms.yaml | 32 +++++++++---------- .../cmake_platforms_qemu.yaml | 4 +-- .../cmake_platforms_qemu_qnx710.yaml | 2 +- ...e_platforms_qemu_vxworks_tests_static.yaml | 4 +-- .../cmake_platforms_static_tests.yaml | 8 ++--- .../cmake_platforms_target_android.yaml | 4 +-- coin/platform_configs/ios-tests.yaml | 2 +- .../linux_android_tests_multi_abi.yaml | 1 - coin/platform_configs/qtbase.yaml | 2 +- coin/platform_configs/qtcharts.yaml | 4 +-- coin/platform_configs/qtdeclarative.yaml | 4 +-- coin/platform_configs/qtimageformats.yaml | 2 +- coin/platform_configs/qtquick3d.yaml | 2 +- coin/platform_configs/qtvirtualkeyboard.yaml | 4 +-- coin/platform_configs/wasm_qtbase_tests.yaml | 2 +- 16 files changed, 39 insertions(+), 40 deletions(-) diff --git a/coin/platform_configs/address_sanitizer_platforms.yaml b/coin/platform_configs/address_sanitizer_platforms.yaml index ec06c821fef..587e6ce359f 100644 --- a/coin/platform_configs/address_sanitizer_platforms.yaml +++ b/coin/platform_configs/address_sanitizer_platforms.yaml @@ -4,7 +4,7 @@ Configurations: Id: 'opensuse-15.6-host-asan' Template: 'qtci-linux-openSUSE-15.6-x86_64-51' Compiler: 'GCC' - Features: ['PinCores', 'Sccache', 'WarningsAreErrors', 'UseConfigure', 'UseAddressSanitizer'] + Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure', 'UseAddressSanitizer'] Configure arguments: '-nomake examples -developer-build' Environment variables: [ 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}', diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index cef7245c431..091b56b6250 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -30,13 +30,13 @@ Configurations: Id: 'ubuntu-22.04-developer-build-x11-tests' Template: 'qtci-linux-Ubuntu-22.04-x86_64-51' Compiler: 'GCC' - Features: ['PinCores', 'Sccache', 'TestOnly'] + Features: ['Sccache', 'TestOnly'] Platform dependency: 'ubuntu-22.04-developer-build' - Id: 'ubuntu-22.04-x11-tests' Template: 'qtci-linux-Ubuntu-22.04-x86_64-51' Compiler: 'GCC' - Features: ['PinCores', 'Sccache', 'TestOnly'] + Features: ['Sccache', 'TestOnly'] Platform dependency: 'ubuntu-22.04' # Build on Ubuntu 24.04 ARM64 Wayland and test on offscreen and Wayland later - @@ -65,7 +65,7 @@ Configurations: Id: 'ubuntu-24.04-arm64-offscreen-tests' Template: 'qtci-linux-Ubuntu-24.04-aarch64-50' Compiler: 'GCC' - Features: ['PinCores', 'TestOnly'] + Features: ['TestOnly'] Environment variables: [ 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', 'QT_QPA_OFFSCREEN_NO_GLX=1', @@ -99,19 +99,19 @@ Configurations: Id: 'ubuntu-24.04-x64-developer-build-x11-tests' Template: 'qtci-linux-Ubuntu-24.04-x86_64-51' Compiler: 'GCC' - Features: ['PinCores', 'Sccache', 'TestOnly', 'InsignificantTests'] + Features: ['Sccache', 'TestOnly', 'InsignificantTests'] Platform dependency: 'ubuntu-24.04-x64-developer-build' - Id: 'ubuntu-24.04-x64-x11-tests' Template: 'qtci-linux-Ubuntu-24.04-x86_64-51' Compiler: 'GCC' - Features: ['PinCores', 'Sccache', 'TestOnly', 'InsignificantTests'] + Features: ['Sccache', 'TestOnly', 'InsignificantTests'] Platform dependency: 'ubuntu-24.04-x64' - Id: 'opensuse-15.6-developer-build' Template: 'qtci-linux-openSUSE-15.6-x86_64-51' Compiler: 'GCC' - Features: ['PinCores', 'Sccache', 'WarningsAreErrors', 'UseConfigure'] + Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure'] Configure arguments: '-nomake examples -developer-build' Environment variables: [ 'PATH={{.Env.CMAKE_MIN_SUPPORTED_BIN_PATH}}:{{.Env.PATH}}', @@ -142,7 +142,7 @@ Configurations: Id: 'windows-10_22h2-msvc2022' Template: 'qtci-windows-10_22H2-x86_64-53' Compiler: 'MSVC2022' - Features: ['PinCores', 'Sccache', "DebugAndRelease", 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] + Features: ['Sccache', "DebugAndRelease", 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib' Environment variables: [ 'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DMySQL_ROOT={{.Env.ENV_MySQL_ROOT}} -DMySQL_LIBRARY_DIR={{.Env.ENV_MySQL_LIBRARY_DIR}}', @@ -154,7 +154,7 @@ Configurations: Id: 'windows-11_23H2-msvc2022' Template: 'qtci-windows-11_23H2-x86_64-54' Compiler: 'MSVC2022' - Features: ['PinCores', 'Sccache', "DebugAndRelease", 'UseConfigure', 'Packaging', 'GenerateSBOM', 'VerifySBOM'] + Features: ['Sccache', "DebugAndRelease", 'UseConfigure', 'Packaging', 'GenerateSBOM', 'VerifySBOM'] Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib' Environment variables: [ 'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..', @@ -166,7 +166,7 @@ Configurations: Id: 'windows-11_22h2-arm64-msvc2022' Template: 'qtci-windows-11_22H2-aarch64-55' Compiler: 'MSVC2022' - Features: ['PinCores', 'Packaging', 'DebugAndRelease', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] + Features: ['Packaging', 'DebugAndRelease', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib -no-opengl -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer' Environment variables: [ 'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_arm64}}\..', @@ -193,7 +193,7 @@ Configurations: Id: 'windows-11_23H2-msvc2022-developer-build' Template: 'qtci-windows-11_23H2-x86_64-54' Compiler: 'MSVC2022' - Features: ['PinCores', 'Sccache', 'DebugAndRelease', 'WarningsAreErrors', 'UseConfigure', 'StandaloneExamples'] + Features: ['Sccache', 'DebugAndRelease', 'WarningsAreErrors', 'UseConfigure', 'StandaloneExamples'] Configure arguments: '-debug-and-release -force-asserts -make examples -developer-build -force-debug-info -qt-zlib -c++std c++20' Environment variables: [ 'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DMySQL_ROOT={{.Env.ENV_MySQL_ROOT}} -DMySQL_LIBRARY_DIR={{.Env.ENV_MySQL_LIBRARY_DIR}}', @@ -205,7 +205,7 @@ Configurations: Id: 'rhel-8.10' Template: 'qtci-linux-RHEL-8.10-x86_64-51' Compiler: 'GCC' - Features: ['PinCores', 'Packaging', 'Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'GenerateSBOM', 'VerifySBOM'] + Features: ['Packaging', 'Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'GenerateSBOM', 'VerifySBOM'] Configure arguments: '-nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput' Environment variables: [ 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}', @@ -215,7 +215,7 @@ Configurations: Id: 'rhel-9.4' Template: 'qtci-linux-RHEL-9.4-x86_64-50' Compiler: 'GCC' - Features: ['PinCores', 'Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'GenerateSBOM', 'VerifySBOM'] + Features: ['Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'GenerateSBOM', 'VerifySBOM'] Configure arguments: '-nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput' Environment variables: [ 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', @@ -238,7 +238,7 @@ Configurations: Id: 'windows-10_22h2-mingw13' Template: 'qtci-windows-10_22H2-x86_64-53' Compiler: 'Mingw' - Features: ['PinCores', 'Packaging', 'Sccache', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] + Features: ['Packaging', 'Sccache', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples' Environment variables: [ 'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}', @@ -251,7 +251,7 @@ Configurations: Id: 'windows-11_23H2-llvm' Template: 'qtci-windows-11_23H2-x86_64-54' Compiler: 'Clang' - Features: ['PinCores', 'Packaging','Sccache', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] + Features: ['Packaging','Sccache', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples' Environment variables: [ 'Path=C:\llvm-mingw\bin;{{.Env.Path}}', @@ -264,7 +264,7 @@ Configurations: Id: 'windows-11_23H2-mingw13-developer-build' Template: 'qtci-windows-11_23H2-x86_64-54' Compiler: 'Mingw' - Features: ['PinCores', 'Sccache', 'WarningsAreErrors', 'UseConfigure', 'StandaloneExamples'] + Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure', 'StandaloneExamples'] Configure arguments: '-developer-build -release -force-asserts -force-debug-info -separate-debug-info -make examples' Environment variables: [ 'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}', @@ -309,6 +309,6 @@ Configurations: Id: 'documentation-warnings' Template: 'qtci-linux-Ubuntu-22.04-x86_64-51' Compiler: 'GCC' - Features: ['PinCores', 'Sccache', 'TestOnly', 'TestDocs', 'DoNotRunTestsButCreateTestWorkItem', 'DocsGenerationV2'] + Features: ['Sccache', 'TestOnly', 'TestDocs', 'DoNotRunTestsButCreateTestWorkItem', 'DocsGenerationV2'] Platform dependency: 'ubuntu-22.04' diff --git a/coin/platform_configs/cmake_platforms_qemu.yaml b/coin/platform_configs/cmake_platforms_qemu.yaml index dc42483d07c..8e64879aeb0 100644 --- a/coin/platform_configs/cmake_platforms_qemu.yaml +++ b/coin/platform_configs/cmake_platforms_qemu.yaml @@ -7,7 +7,7 @@ Configurations: Target arch: 'armv7' Compiler: 'GCC' Platform dependency: 'ubuntu-22.04' - Features: ['PinCores', 'Sccache', 'UseConfigure', 'InsignificantTests', 'StandaloneExamples'] + Features: ['Sccache', 'UseConfigure', 'InsignificantTests', 'StandaloneExamples'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-release -force-asserts -force-debug-info -developer-build -no-warnings-are-errors -make examples -qt-harfbuzz -device linux-imx7-g++ -device-option "CROSS_COMPILE={{.Env.QEMUARMV7_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=hard-float boot2qt" -no-feature-forkfd_pidfd', 'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARMV7_TOOLCHAIN_FILE}} -DQT_FORCE_BUILD_TOOLS=ON', @@ -24,7 +24,7 @@ Configurations: Target arch: 'arm64' Compiler: 'GCC' Platform dependency: 'ubuntu-22.04' - Features: ['PinCores', 'Sccache', 'UseConfigure', 'InsignificantTests'] + Features: ['Sccache', 'UseConfigure', 'InsignificantTests'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-release -force-asserts -force-debug-info -developer-build -no-warnings-are-errors -nomake examples -qt-harfbuzz -device linux-generic-g++ -device-option "CROSS_COMPILE={{.Env.QEMUARM64_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=boot2qt" -no-feature-forkfd_pidfd', 'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARM64_TOOLCHAIN_FILE}} -DQT_FORCE_BUILD_TOOLS=ON', diff --git a/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml b/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml index a783cf8eaab..92834126fae 100644 --- a/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml +++ b/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml @@ -8,7 +8,7 @@ Configurations: Compiler: 'GCC' Target compiler: 'QCC' Platform dependency: 'ubuntu-22.04' - Features: ['PinCores', 'Packaging', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] + Features: ['Packaging', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-dbus -nomake examples', 'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-x8664.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', diff --git a/coin/platform_configs/cmake_platforms_qemu_vxworks_tests_static.yaml b/coin/platform_configs/cmake_platforms_qemu_vxworks_tests_static.yaml index 0d11679464a..5bfe98cd761 100644 --- a/coin/platform_configs/cmake_platforms_qemu_vxworks_tests_static.yaml +++ b/coin/platform_configs/cmake_platforms_qemu_vxworks_tests_static.yaml @@ -8,7 +8,7 @@ Configurations: Compiler: 'Clang' Target compiler: 'Clang' Platform dependency: 'vxworks-imx6-buildtest' - Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly'] + Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly'] Environment variables: [ 'WIND_CC_SYSROOT=/opt/fsl_imx6_2_0_6_2_VSB', 'VXWORKS_TEST_LIBS_PATH=/opt/fsl_imx6_2_0_6_2_VSB/usr/lib/common;/opt/fsl_imx6_2_0_6_2_VSB/usr/root/llvm/bin;/opt/fsl_imx6_2_0_6_2_VSB/usr/3pp/develop/usr/lib;/home/qt/work/install/target/lib', @@ -23,7 +23,7 @@ Configurations: Compiler: 'Clang' Target compiler: 'Clang' Platform dependency: 'vxworks-x86_64-buildtest' - Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly'] + Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly'] Environment variables: [ 'WIND_CC_SYSROOT=/opt/itl_generic_skylake_VSB', 'VXWORKS_TEST_LIBS_PATH=/opt/itl_generic_skylake_VSB/usr/lib/common;/opt/itl_generic_skylake_VSB/usr/root/llvm/bin;/opt/itl_generic_skylake_VSB/usr/3pp/develop/usr/lib;/home/qt/work/install/target/lib', diff --git a/coin/platform_configs/cmake_platforms_static_tests.yaml b/coin/platform_configs/cmake_platforms_static_tests.yaml index bfc1e08b17a..8053d8c995b 100644 --- a/coin/platform_configs/cmake_platforms_static_tests.yaml +++ b/coin/platform_configs/cmake_platforms_static_tests.yaml @@ -4,7 +4,7 @@ Configurations: Id: 'sles-15_sp5-minimal-static' Template: 'qtci-linux-SLES-15_SP5-x86_64-51' Compiler: 'GCC' - Features: ['PinCores', 'Sccache', 'MinimalStaticTests', 'UseConfigure'] + Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure'] Configure arguments: '-nomake examples -static -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer' Environment variables: [ 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}' @@ -13,7 +13,7 @@ Configurations: Id: 'sles-15_sp6-minimal-static' Template: 'qtci-linux-SLES-15_SP6-x86_64-51' Compiler: 'GCC' - Features: ['PinCores', 'Sccache', 'MinimalStaticTests', 'UseConfigure', 'InsignificantTests'] + Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure', 'InsignificantTests'] Configure arguments: '-nomake examples -static -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer' Environment variables: [ 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}' @@ -22,7 +22,7 @@ Configurations: Id: 'windows-11_23H2-minimal-static' Template: 'qtci-windows-11_23H2-x86_64-54' Compiler: 'MSVC2022' - Features: ['PinCores', 'Sccache', 'MinimalStaticTests', 'UseConfigure'] + Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure'] Configure arguments: '-release -force-debug-info -static -nomake examples -qt-zlib -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer' Environment variables: [ 'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..', @@ -34,5 +34,5 @@ Configurations: Id: 'macos-minimal-static' Template: 'qtci-macos-14-arm-106' Compiler: 'Clang' - Features: ['PinCores', 'Sccache', 'MinimalStaticTests', 'UseConfigure'] + Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure'] Configure arguments: '-nomake examples -release -force-debug-info -static -no-framework' diff --git a/coin/platform_configs/cmake_platforms_target_android.yaml b/coin/platform_configs/cmake_platforms_target_android.yaml index 1020e1e77f0..369bd5339c1 100644 --- a/coin/platform_configs/cmake_platforms_target_android.yaml +++ b/coin/platform_configs/cmake_platforms_target_android.yaml @@ -39,7 +39,7 @@ Configurations: Compiler: 'GCC' Target compiler: 'Clang' Platform dependency: 'rhel-8.10' - Features: ['PinCores', 'Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] + Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86', 'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', @@ -55,7 +55,7 @@ Configurations: Compiler: 'GCC' Target compiler: 'Clang' Platform dependency: 'rhel-8.10' - Features: ['PinCores', 'Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] + Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64', 'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', diff --git a/coin/platform_configs/ios-tests.yaml b/coin/platform_configs/ios-tests.yaml index b2fd1e0868c..1cfb652f77e 100644 --- a/coin/platform_configs/ios-tests.yaml +++ b/coin/platform_configs/ios-tests.yaml @@ -8,7 +8,7 @@ Configurations: Compiler: 'Clang' Target compiler: 'Clang' Platform dependency: 'macos-universal-on-x86_64' - Features: ['PinCores', 'Sccache', 'DebugAndRelease', 'MinimalStaticTests', 'UseConfigure'] + Features: ['Sccache', 'DebugAndRelease', 'MinimalStaticTests', 'UseConfigure'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-debug-and-release -nomake examples -platform macx-ios-clang' ] diff --git a/coin/platform_configs/linux_android_tests_multi_abi.yaml b/coin/platform_configs/linux_android_tests_multi_abi.yaml index 23f9e32db66..8188a2ba93c 100644 --- a/coin/platform_configs/linux_android_tests_multi_abi.yaml +++ b/coin/platform_configs/linux_android_tests_multi_abi.yaml @@ -13,7 +13,6 @@ Configurations: 'android-15-x86_64-on-linux' ] Features: [ - 'PinCores', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml index bc4c2ee6079..e55ab01f97c 100644 --- a/coin/platform_configs/qtbase.yaml +++ b/coin/platform_configs/qtbase.yaml @@ -17,4 +17,4 @@ Overrides: # Make VxWorks tests insignificant. - Id: 'vxworks-x86_64-tests' - Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests'] + Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests'] diff --git a/coin/platform_configs/qtcharts.yaml b/coin/platform_configs/qtcharts.yaml index f38904c857e..80f720d7ca4 100644 --- a/coin/platform_configs/qtcharts.yaml +++ b/coin/platform_configs/qtcharts.yaml @@ -10,7 +10,7 @@ Overrides: # Make VxWorks tests insignificant. - Id: 'vxworks-imx6-tests' - Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests'] + Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests'] - Id: 'vxworks-x86_64-tests' - Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests'] + Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests'] diff --git a/coin/platform_configs/qtdeclarative.yaml b/coin/platform_configs/qtdeclarative.yaml index f444fd1c5df..d0fe0e60772 100644 --- a/coin/platform_configs/qtdeclarative.yaml +++ b/coin/platform_configs/qtdeclarative.yaml @@ -14,7 +14,7 @@ Overrides: # Make VxWorks tests insignificant. - Id: 'vxworks-imx6-tests' - Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests'] + Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests'] - Id: 'vxworks-x86_64-tests' - Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests'] + Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests'] diff --git a/coin/platform_configs/qtimageformats.yaml b/coin/platform_configs/qtimageformats.yaml index 086990d78cd..ff56d2d5f15 100644 --- a/coin/platform_configs/qtimageformats.yaml +++ b/coin/platform_configs/qtimageformats.yaml @@ -11,4 +11,4 @@ Overrides: # Make VxWorks x86_64 tests insignificant. - Id: 'vxworks-x86_64-tests' - Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests'] + Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests'] diff --git a/coin/platform_configs/qtquick3d.yaml b/coin/platform_configs/qtquick3d.yaml index fac4ba008f5..a055d59bcc5 100644 --- a/coin/platform_configs/qtquick3d.yaml +++ b/coin/platform_configs/qtquick3d.yaml @@ -11,4 +11,4 @@ Overrides: # Make VxWorks x86_64 tests insignificant. - Id: 'vxworks-x86_64-tests' - Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests'] + Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests'] diff --git a/coin/platform_configs/qtvirtualkeyboard.yaml b/coin/platform_configs/qtvirtualkeyboard.yaml index e20587af14a..34b1acbf6c0 100644 --- a/coin/platform_configs/qtvirtualkeyboard.yaml +++ b/coin/platform_configs/qtvirtualkeyboard.yaml @@ -10,7 +10,7 @@ Overrides: # Make VxWorks tests insignificant. - Id: 'vxworks-imx6-tests' - Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests'] + Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests'] - Id: 'vxworks-x86_64-tests' - Features: ['PinCores', 'VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests'] + Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests'] diff --git a/coin/platform_configs/wasm_qtbase_tests.yaml b/coin/platform_configs/wasm_qtbase_tests.yaml index b268c58f506..ff2e5001208 100644 --- a/coin/platform_configs/wasm_qtbase_tests.yaml +++ b/coin/platform_configs/wasm_qtbase_tests.yaml @@ -5,5 +5,5 @@ Configurations: Template: 'qtci-linux-openSUSE-15.6-x86_64-51' Target os: 'WebAssembly' Compiler: 'GCC' - Features: ['PinCores', 'Sccache', 'TestOnly'] + Features: ['Sccache', 'TestOnly'] Platform dependency: 'webassembly-linux-thread-asyncify' From db2d504099e854eddab6e4c71ba21368c33a73e3 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Thu, 13 Feb 2025 10:38:35 +0100 Subject: [PATCH 51/75] COIN/QtCreator: Update to Windows 11 23H2 That is what we are using for packages too. Pick-to: 6.8 Change-Id: I88ab02f577933292c882ec4633d9087b1bf957ea Reviewed-by: Tero Heikkinen (cherry picked from commit 53280b0697e7be0b53c55852957ad2c9a422998f) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/qt-creator.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/coin/platform_configs/qt-creator.yaml b/coin/platform_configs/qt-creator.yaml index 94096a6f97c..e9599303d65 100644 --- a/coin/platform_configs/qt-creator.yaml +++ b/coin/platform_configs/qt-creator.yaml @@ -2,7 +2,7 @@ Version: 2 Module only: True Configurations: - - Template: 'qtci-windows-10_22H2-x86_64-53' + Template: 'qtci-windows-11_23H2-x86_64-53' Compiler: 'MSVC2022' Features: ['Sccache', 'DebugAndRelease'] Configure arguments: '' @@ -28,7 +28,7 @@ Configurations: Environment variables: [] # without tests - - Template: 'qtci-windows-10_22H2-x86_64-53' + Template: 'qtci-windows-11_23H2-x86_64-53' Compiler: 'MSVC2022' Features: ['Sccache', 'DebugAndRelease', 'DisableTests'] Configure arguments: '' @@ -36,7 +36,7 @@ Configurations: Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64'] # oldest Qt version - - Template: 'qtci-windows-10_22H2-x86_64-53' + Template: 'qtci-windows-11_23H2-x86_64-53' Compiler: 'MSVC2022' Features: ['Sccache', 'DebugAndRelease', 'OldestQt'] Configure arguments: '' From 626a22cc74f482e11200838e3789b104352a8ec0 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Fri, 14 Feb 2025 14:49:58 +0100 Subject: [PATCH 52/75] COIN/QtCreator: Move to Ubuntu 24.04 for ARM Debian is no longer supported for Qt 6.8.1 and later Pick-to: 6.8 Change-Id: Ic9ddac3d95451b900f60be6a90efd5fb32985601 Reviewed-by: Patrik Teivonen Reviewed-by: David Schulz (cherry picked from commit 014bdc24ab8c08320df7ca0989ea2eb7a6fb8541) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/qt-creator.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/qt-creator.yaml b/coin/platform_configs/qt-creator.yaml index e9599303d65..d1401e71d78 100644 --- a/coin/platform_configs/qt-creator.yaml +++ b/coin/platform_configs/qt-creator.yaml @@ -15,7 +15,7 @@ Configurations: Configure arguments: '' Environment variables: [] - - Template: 'qtci-linux-Debian-11.6-aarch64-50' + Template: 'qtci-linux-Ubuntu-24.04-aarch64-50' Compiler: 'GCC' Features: ['Sccache', 'DebugAndRelease'] Configure arguments: '' From be88fababd355f4a8dacfe965b7cb4cb613d5aa4 Mon Sep 17 00:00:00 2001 From: Paul Wicking Date: Mon, 17 Feb 2025 09:21:42 +0100 Subject: [PATCH 53/75] Add .gitreview file `git-review` is a command line tool for interacting with Gerrit. Some IDEs offer support for this tool, either natively or through plugins. The tool relies on a configuration file, .gitreview. Adding this configuration file to our repositories simplifies initial setup for contributors that use the tool directly or through their IDE of choice. The configuration file adds a remote called 'gerrit'. This is the default for the tool, and also the name set for codereview.qt-project.org by Qt's `init-repository` script. Thus, the configuration should work seamlessly alongside other repository helpers. Task-number: QTBUG-132604 Pick-to: 6.8 Change-Id: Iea428aeaa1b4cdbaabd3477aaf061b8960efc887 Reviewed-by: Samuel Gaist (cherry picked from commit 9b8cb71d6bb56ae05cb42ea09061b06a12ef9da8) Reviewed-by: Qt Cherry-pick Bot --- .gitreview | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 .gitreview diff --git a/.gitreview b/.gitreview new file mode 100644 index 00000000000..69388ea438a --- /dev/null +++ b/.gitreview @@ -0,0 +1,4 @@ +[gerrit] +host=codereview.qt-project.org +project=qt/qt5 +defaultbranch=dev From 6e5ad2a7e826e37fb379a1ff21427f4312be3b79 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 21 Feb 2025 10:18:56 +0000 Subject: [PATCH 54/75] Update submodules on '6.9 in qt/qt5' Change-Id: Iab5b7d7e49e13195b8e726778f2e35346164ff58 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qt5compat | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtcharts | 2 +- qtcoap | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgraphs | 2 +- qtgrpc | 2 +- qthttpserver | 2 +- qtimageformats | 2 +- qtlanguageserver | 2 +- qtlocation | 2 +- qtlottie | 2 +- qtmqtt | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtopcua | 2 +- qtpositioning | 2 +- qtquick3d | 2 +- qtquick3dphysics | 2 +- qtquickeffectmaker | 2 +- qtquicktimeline | 2 +- qtremoteobjects | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtshadertools | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- 42 files changed, 42 insertions(+), 42 deletions(-) diff --git a/qt3d b/qt3d index b6df3e11131..ac8a0f891ae 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit b6df3e11131cef2b5ba213617cdac67cf8229ed1 +Subproject commit ac8a0f891aec27648f17c878f3bb1ea2aac5abc6 diff --git a/qt5compat b/qt5compat index 422490f793a..db733a992e5 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 422490f793a421d1d6710b5e9b7f689674d58e13 +Subproject commit db733a992e52336527a880cddf27fc81695a11ec diff --git a/qtactiveqt b/qtactiveqt index 820b6b000f6..432ab8dea80 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 820b6b000f6bccefc0aef5e165d8280128b33838 +Subproject commit 432ab8dea8065141d33f6b73ecde00c61a01083c diff --git a/qtbase b/qtbase index 3f5df82334b..22f33e1bd2c 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 3f5df82334b89102902051726e761180a1a72fec +Subproject commit 22f33e1bd2c43e0223cd52b94e6ecead56a2e1b5 diff --git a/qtcharts b/qtcharts index 505049fc254..90fe26d9eb4 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 505049fc254dae2c92f841fccdd6991179c74cfb +Subproject commit 90fe26d9eb494592815422211b1a1e4c36b2bdb1 diff --git a/qtcoap b/qtcoap index e8b7be0a9bf..3af6bfeb034 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit e8b7be0a9bf0cbef9c37506b0b76fe5b6fb396c3 +Subproject commit 3af6bfeb034c9212f320e703636737cb66ef7529 diff --git a/qtconnectivity b/qtconnectivity index cc6cb52adee..8028ed2bf32 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit cc6cb52adeedbba6f7e0cffd5f6d8feed6b5b5d9 +Subproject commit 8028ed2bf32b10bd3e18cfc6d4293cdf6f8cffa5 diff --git a/qtdatavis3d b/qtdatavis3d index 22a3553ea5c..6ee3dd2b492 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 22a3553ea5c0836df624573519f40e0168543b9a +Subproject commit 6ee3dd2b492331ff063f7c83c1bcda41691b57ee diff --git a/qtdeclarative b/qtdeclarative index bfa23b1f73d..2757053dedf 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit bfa23b1f73dcb7bab8d503662aeb76efaf852d4f +Subproject commit 2757053dedfa5f4de715860f913ce4e0c947d323 diff --git a/qtdoc b/qtdoc index 2aefb4a7346..c3acff86cc2 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 2aefb4a73466c6ba39667e8a039177746f8b8ae6 +Subproject commit c3acff86cc2089f5a72663030f6887beac8d9ceb diff --git a/qtgraphs b/qtgraphs index 5b043b102ae..aefe80c95d4 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit 5b043b102ae603108702999be05494cd9d7dede3 +Subproject commit aefe80c95d4289f087a9ad330dd6e3db6a107fbd diff --git a/qtgrpc b/qtgrpc index 45bd98a682f..286ef191517 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit 45bd98a682f17b883a6162d067a1c4575d2b8bf3 +Subproject commit 286ef191517868633664d7b1b84f92a053332204 diff --git a/qthttpserver b/qthttpserver index a0986c7a83b..7316ebf24c5 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit a0986c7a83b28ea3e812ef1583a52b0aaa953bdf +Subproject commit 7316ebf24c5a2306a0335f735c3a92f4a182a591 diff --git a/qtimageformats b/qtimageformats index 13839ef5f41..ac7f9af5378 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 13839ef5f412e44fdec9995c2b3383715e284365 +Subproject commit ac7f9af537885ffd428f6a8d9ba15ee7b1c41420 diff --git a/qtlanguageserver b/qtlanguageserver index 736f3b571f2..0ed776dd418 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit 736f3b571f23fc7156a2c962372a0d6296a2149a +Subproject commit 0ed776dd418e40f8a95ee667e7045a47f1cb2d16 diff --git a/qtlocation b/qtlocation index 220115a889c..9b2de27789b 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 220115a889c762c58c9b62b0ac7fbaf0679572d3 +Subproject commit 9b2de27789b219949cff7d2a2c45b6469dd671f1 diff --git a/qtlottie b/qtlottie index 6b2d007eb96..698dd95f2d9 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 6b2d007eb96cdcb368b5be9d862d59ecc2fead3d +Subproject commit 698dd95f2d999acfa9160ff4138de712671481dc diff --git a/qtmqtt b/qtmqtt index 9fd57e757e7..2310f368fb8 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit 9fd57e757e73221b423b1a69c8649d5a5f4066f9 +Subproject commit 2310f368fb8f137ae1dcf26c0d28bb153c7874c0 diff --git a/qtmultimedia b/qtmultimedia index 6b718753f65..fdf40af34b7 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 6b718753f65d0154ae3727e641e4293f956d8e04 +Subproject commit fdf40af34b77e59edbe1242b67852dc7ff4f2191 diff --git a/qtnetworkauth b/qtnetworkauth index db120b88f58..b2f0d40bf1f 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit db120b88f58b9435dff7fe5c53e50b9bc88eef12 +Subproject commit b2f0d40bf1f508e1e7a095a32cce3f6f8a7c7096 diff --git a/qtopcua b/qtopcua index e1fb17513dd..df46e6c3c92 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit e1fb17513dd55a0a4f84a761387fae54a542fe8a +Subproject commit df46e6c3c92ed67c90996b160fd1fb7f51e3634c diff --git a/qtpositioning b/qtpositioning index e7fd817f96c..db11ce3ac20 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit e7fd817f96c035f4c0fcf87c7968cb9595ff4f82 +Subproject commit db11ce3ac203e9891388756abc178d52e8375911 diff --git a/qtquick3d b/qtquick3d index 81f12fbde43..94139eafc4f 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 81f12fbde43d97df01f93441a286b90a739c1aa9 +Subproject commit 94139eafc4f46ef6c44a69cb19d80646ecdd47d0 diff --git a/qtquick3dphysics b/qtquick3dphysics index ab58d0bb5a2..511f591a6eb 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit ab58d0bb5a2c1d668187a4bf9dca87090c3171cb +Subproject commit 511f591a6ebf226d83b1afd707b77ba227c775c5 diff --git a/qtquickeffectmaker b/qtquickeffectmaker index 40a03430aa6..6e319e82c0e 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit 40a03430aa6423cbf15ca4394874d33b92576e49 +Subproject commit 6e319e82c0e4ad3f26d717c17842411198166251 diff --git a/qtquicktimeline b/qtquicktimeline index dac57b3480f..8661e5daaf1 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit dac57b3480fced40c799bc6066406ab187e7a171 +Subproject commit 8661e5daaf100cca6b3e13f88c2648e54573ec8f diff --git a/qtremoteobjects b/qtremoteobjects index 7558e7157a6..596ad5d6084 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 7558e7157a63f6e967e405d97b7aeae480900245 +Subproject commit 596ad5d6084a2a4df0afb7a7dee42cf9e2c9f433 diff --git a/qtscxml b/qtscxml index 7607f60a9cd..825e012f4c6 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 7607f60a9cd0eb9bce24aee787cc40fb88ab8129 +Subproject commit 825e012f4c6bb57692b7281639060fcd848a6ed9 diff --git a/qtsensors b/qtsensors index 95a6ba3064c..8190b6d330c 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 95a6ba3064c647a856703a883a6e35f5a1836e5e +Subproject commit 8190b6d330ce76b531ef58952a3c122603d88911 diff --git a/qtserialbus b/qtserialbus index 3a85b7528df..3716466f8d2 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 3a85b7528dfd9fb5ad661d624dc04fd142764205 +Subproject commit 3716466f8d20d64fdbc444be31caa49683af14ed diff --git a/qtserialport b/qtserialport index dc7079f49d7..9bdbffa86c2 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit dc7079f49d720acf5022ef25a3994f2b01a8f1c1 +Subproject commit 9bdbffa86c236fcd06c492adcfe4938e9faa02e7 diff --git a/qtshadertools b/qtshadertools index 0a5025b7d12..a946feeede7 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 0a5025b7d12eadd423dc245e7a2ad4ed1e835fdb +Subproject commit a946feeede746e052be01f386506bcaf851b3890 diff --git a/qtspeech b/qtspeech index ff1145bb21f..ec2605db3e1 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit ff1145bb21f4d20087df455e4ee2c07b2bc7a3e4 +Subproject commit ec2605db3e1677436b91ea66d19edee8ceb0e234 diff --git a/qtsvg b/qtsvg index 2213bc559ca..5f1e8ab8030 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 2213bc559ca0f164a2d91885db7fdc856eb851d6 +Subproject commit 5f1e8ab80308f914236aaed8d2a360a71cf60130 diff --git a/qttools b/qttools index 78e268be119..e0b7124fcce 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 78e268be119b9fb475c976f619349474bb262796 +Subproject commit e0b7124fccec6c1cd41dd6d46fd282d42e994257 diff --git a/qttranslations b/qttranslations index 8cf9687b1e9..84dd7fb846e 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 8cf9687b1e94b4891cf6eca6d3ad5f913daf3834 +Subproject commit 84dd7fb846e8385017e64eb5b2a082004700a1dd diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 6ab8ebc298b..55afbd8925c 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 6ab8ebc298b24b97a343e5e3e445d0284ddef165 +Subproject commit 55afbd8925c5e16867752c6738c3b018cee2148a diff --git a/qtwayland b/qtwayland index 1538f2597b1..5e8515fe5e1 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 1538f2597b10938dace32ef89e55937c2c4fb394 +Subproject commit 5e8515fe5e18b3fc1b5f7945da49a2da74165d72 diff --git a/qtwebchannel b/qtwebchannel index 75fca0e5c00..d5b59b26337 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 75fca0e5c009223f851a6461612ddd0f9fbb36f3 +Subproject commit d5b59b2633725ecf156c1db83d1b588705ba46e5 diff --git a/qtwebengine b/qtwebengine index edd09e1ec4d..65d8d8e5c6d 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit edd09e1ec4df080deee3977e010b39e3ed140471 +Subproject commit 65d8d8e5c6da07d3f015eaa6d93fe27846af53af diff --git a/qtwebsockets b/qtwebsockets index 1ded1c4828f..27f126ff0db 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 1ded1c4828fa1e342853c32afd187a82e567931e +Subproject commit 27f126ff0dba67eb51c30c92253396fa4c8a8962 diff --git a/qtwebview b/qtwebview index 4aef8a30ce9..e6502616628 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 4aef8a30ce928f075ddb9e622f6441aad953ad55 +Subproject commit e65026166289be9917dcb86cbeed9bf1af3067a2 From 345aae01f5e0c512d8eeada41bb69865904b6bc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konsta=20Alaj=C3=A4rvi?= Date: Tue, 24 Sep 2024 11:59:57 +0300 Subject: [PATCH 55/75] Provisioning: bump Android sdkApiLevel to 35 This patch bumps the sdkApiLevel used in Coin to 35. Task-number: QTBUG-129461 Task-number: QTBUG-130283 Change-Id: Ia26248982a2807b2d3554d1a7a7394efcf13f834 Reviewed-by: Axel Spoerl --- coin/provisioning/common/linux/android_linux.sh | 2 +- coin/provisioning/common/macos/android.sh | 2 +- coin/provisioning/common/windows/android.ps1 | 2 +- coin/provisioning/qtci-macos-10.15-x86_64/30-android.sh | 2 +- coin/provisioning/qtci-macos-11-arm/30-android.sh | 2 +- coin/provisioning/qtci-macos-11-x86_64/30-android.sh | 2 +- coin/provisioning/qtci-macos-12-arm/30-android.sh | 2 +- coin/provisioning/qtci-macos-13-arm/30-android.sh | 2 +- coin/provisioning/qtci-macos-14-arm/30-android.sh | 2 +- coin/provisioning/qtci-macos-15-arm/30-android.sh | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index 5c4b07ef5e0..81869afd096 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -27,7 +27,7 @@ toolsFile="commandlinetools-linux-6609375_latest.zip" ndkVersionLatest="r26b" ndkVersionDefault=$ndkVersionLatest sdkBuildToolsVersion="34.0.0" -sdkApiLevel="android-34" +sdkApiLevel="android-35" toolsSha1="9172381ff070ee2a416723c1989770cf4b0d1076" ndkSha1Latest="fdf33d9f6c1b3f16e5459d53a82c7d2201edbcc4" diff --git a/coin/provisioning/common/macos/android.sh b/coin/provisioning/common/macos/android.sh index b7dc953f8f3..d8466da5a3c 100755 --- a/coin/provisioning/common/macos/android.sh +++ b/coin/provisioning/common/macos/android.sh @@ -24,7 +24,7 @@ ndkVersionLatest="r26b" ndkVersionDefault="$ndkVersionLatest" sdkBuildToolsVersion="34.0.0" # this is compile sdk version -sdkApiLevel="android-34" +sdkApiLevel="android-35" toolsSourceFile="$basePath/$toolsFile" diff --git a/coin/provisioning/common/windows/android.ps1 b/coin/provisioning/common/windows/android.ps1 index b594238c9f5..cdb69181dcb 100644 --- a/coin/provisioning/common/windows/android.ps1 +++ b/coin/provisioning/common/windows/android.ps1 @@ -24,7 +24,7 @@ $ndkZip = "C:\Windows\Temp\android_ndk.zip" $toolsVersion = "2.1" $toolsFile = "commandlinetools-win-6609375_latest.zip" $sdkApi = "ANDROID_API_VERSION" -$sdkApiLevel = "android-34" +$sdkApiLevel = "android-35" $sdkBuildToolsVersion = "34.0.0" $toolsCachedUrl= "\\ci-files01-hki.ci.qt.io\provisioning\android\$toolsFile" $toolsOfficialUrl = "https://dl.google.com/android/repository/$toolsFile" diff --git a/coin/provisioning/qtci-macos-10.15-x86_64/30-android.sh b/coin/provisioning/qtci-macos-10.15-x86_64/30-android.sh index 3ae2cbf6cbf..b84b7ee1b4c 100755 --- a/coin/provisioning/qtci-macos-10.15-x86_64/30-android.sh +++ b/coin/provisioning/qtci-macos-10.15-x86_64/30-android.sh @@ -24,7 +24,7 @@ ndkVersion="r26b" ndkFile="android-ndk-$ndkVersion-darwin.zip" sdkBuildToolsVersion="34.0.0" # this is compile sdk version -sdkApiLevel="android-34" +sdkApiLevel="android-35" toolsSourceFile="$basePath/$toolsFile" ndkSourceFile="$basePath/$ndkFile" diff --git a/coin/provisioning/qtci-macos-11-arm/30-android.sh b/coin/provisioning/qtci-macos-11-arm/30-android.sh index 3ae2cbf6cbf..b84b7ee1b4c 100755 --- a/coin/provisioning/qtci-macos-11-arm/30-android.sh +++ b/coin/provisioning/qtci-macos-11-arm/30-android.sh @@ -24,7 +24,7 @@ ndkVersion="r26b" ndkFile="android-ndk-$ndkVersion-darwin.zip" sdkBuildToolsVersion="34.0.0" # this is compile sdk version -sdkApiLevel="android-34" +sdkApiLevel="android-35" toolsSourceFile="$basePath/$toolsFile" ndkSourceFile="$basePath/$ndkFile" diff --git a/coin/provisioning/qtci-macos-11-x86_64/30-android.sh b/coin/provisioning/qtci-macos-11-x86_64/30-android.sh index 11bcf7ad809..175be765eca 100755 --- a/coin/provisioning/qtci-macos-11-x86_64/30-android.sh +++ b/coin/provisioning/qtci-macos-11-x86_64/30-android.sh @@ -24,7 +24,7 @@ ndkVersion="r26b" ndkFile="android-ndk-$ndkVersion-darwin.zip" sdkBuildToolsVersion="34.0.0" # this is compile sdk version -sdkApiLevel="android-34" +sdkApiLevel="android-35" toolsSourceFile="$basePath/$toolsFile" ndkSourceFile="$basePath/$ndkFile" diff --git a/coin/provisioning/qtci-macos-12-arm/30-android.sh b/coin/provisioning/qtci-macos-12-arm/30-android.sh index 6259b71ed12..d1c60da2968 100755 --- a/coin/provisioning/qtci-macos-12-arm/30-android.sh +++ b/coin/provisioning/qtci-macos-12-arm/30-android.sh @@ -24,7 +24,7 @@ ndkVersion="r26b" ndkFile="android-ndk-$ndkVersion-darwin.zip" sdkBuildToolsVersion="34.0.0" # this is compile sdk version -sdkApiLevel="android-34" +sdkApiLevel="android-35" toolsSourceFile="$basePath/$toolsFile" ndkSourceFile="$basePath/$ndkFile" diff --git a/coin/provisioning/qtci-macos-13-arm/30-android.sh b/coin/provisioning/qtci-macos-13-arm/30-android.sh index 6259b71ed12..d1c60da2968 100755 --- a/coin/provisioning/qtci-macos-13-arm/30-android.sh +++ b/coin/provisioning/qtci-macos-13-arm/30-android.sh @@ -24,7 +24,7 @@ ndkVersion="r26b" ndkFile="android-ndk-$ndkVersion-darwin.zip" sdkBuildToolsVersion="34.0.0" # this is compile sdk version -sdkApiLevel="android-34" +sdkApiLevel="android-35" toolsSourceFile="$basePath/$toolsFile" ndkSourceFile="$basePath/$ndkFile" diff --git a/coin/provisioning/qtci-macos-14-arm/30-android.sh b/coin/provisioning/qtci-macos-14-arm/30-android.sh index 6259b71ed12..d1c60da2968 100755 --- a/coin/provisioning/qtci-macos-14-arm/30-android.sh +++ b/coin/provisioning/qtci-macos-14-arm/30-android.sh @@ -24,7 +24,7 @@ ndkVersion="r26b" ndkFile="android-ndk-$ndkVersion-darwin.zip" sdkBuildToolsVersion="34.0.0" # this is compile sdk version -sdkApiLevel="android-34" +sdkApiLevel="android-35" toolsSourceFile="$basePath/$toolsFile" ndkSourceFile="$basePath/$ndkFile" diff --git a/coin/provisioning/qtci-macos-15-arm/30-android.sh b/coin/provisioning/qtci-macos-15-arm/30-android.sh index 6259b71ed12..d1c60da2968 100755 --- a/coin/provisioning/qtci-macos-15-arm/30-android.sh +++ b/coin/provisioning/qtci-macos-15-arm/30-android.sh @@ -24,7 +24,7 @@ ndkVersion="r26b" ndkFile="android-ndk-$ndkVersion-darwin.zip" sdkBuildToolsVersion="34.0.0" # this is compile sdk version -sdkApiLevel="android-34" +sdkApiLevel="android-35" toolsSourceFile="$basePath/$toolsFile" ndkSourceFile="$basePath/$ndkFile" From 7228be7f72d69581ed8bcbdb656eda7e3ecd132f Mon Sep 17 00:00:00 2001 From: Rami Potinkara Date: Thu, 13 Feb 2025 09:39:37 +0200 Subject: [PATCH 56/75] Provisioning: bump Android sdkBuildToolsVersion to 35 This patch bumps the sdkBuildToolsVersion used in Coin to 35. Task-number: QTBUG-129461 Task-number: QTBUG-130283 Change-Id: I2e1fbdfd23cb854ec50625ff29331adc61abc32c Reviewed-by: Assam Boudjelthia --- coin/provisioning/common/linux/android_linux.sh | 2 +- coin/provisioning/common/macos/android.sh | 2 +- coin/provisioning/common/windows/android.ps1 | 2 +- coin/provisioning/qtci-macos-10.15-x86_64/30-android.sh | 2 +- coin/provisioning/qtci-macos-11-arm/30-android.sh | 2 +- coin/provisioning/qtci-macos-11-x86_64/30-android.sh | 2 +- coin/provisioning/qtci-macos-12-arm/30-android.sh | 2 +- coin/provisioning/qtci-macos-13-arm/30-android.sh | 2 +- coin/provisioning/qtci-macos-14-arm/30-android.sh | 2 +- coin/provisioning/qtci-macos-15-arm/30-android.sh | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index 81869afd096..e5d8148d2b6 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -26,7 +26,7 @@ toolsVersion="2.1" toolsFile="commandlinetools-linux-6609375_latest.zip" ndkVersionLatest="r26b" ndkVersionDefault=$ndkVersionLatest -sdkBuildToolsVersion="34.0.0" +sdkBuildToolsVersion="35.0.1" sdkApiLevel="android-35" toolsSha1="9172381ff070ee2a416723c1989770cf4b0d1076" diff --git a/coin/provisioning/common/macos/android.sh b/coin/provisioning/common/macos/android.sh index d8466da5a3c..8eaa8dc199a 100755 --- a/coin/provisioning/common/macos/android.sh +++ b/coin/provisioning/common/macos/android.sh @@ -22,7 +22,7 @@ toolsFile="commandlinetools-mac-6609375_latest.zip" ndkVersionLatest="r26b" ndkVersionDefault="$ndkVersionLatest" -sdkBuildToolsVersion="34.0.0" +sdkBuildToolsVersion="35.0.1" # this is compile sdk version sdkApiLevel="android-35" diff --git a/coin/provisioning/common/windows/android.ps1 b/coin/provisioning/common/windows/android.ps1 index cdb69181dcb..418c39312a7 100644 --- a/coin/provisioning/common/windows/android.ps1 +++ b/coin/provisioning/common/windows/android.ps1 @@ -25,7 +25,7 @@ $toolsVersion = "2.1" $toolsFile = "commandlinetools-win-6609375_latest.zip" $sdkApi = "ANDROID_API_VERSION" $sdkApiLevel = "android-35" -$sdkBuildToolsVersion = "34.0.0" +$sdkBuildToolsVersion = "35.0.1" $toolsCachedUrl= "\\ci-files01-hki.ci.qt.io\provisioning\android\$toolsFile" $toolsOfficialUrl = "https://dl.google.com/android/repository/$toolsFile" $toolsChecksum = "e2e19c2ff584efa87ef0cfdd1987f92881323208" diff --git a/coin/provisioning/qtci-macos-10.15-x86_64/30-android.sh b/coin/provisioning/qtci-macos-10.15-x86_64/30-android.sh index b84b7ee1b4c..8381d489122 100755 --- a/coin/provisioning/qtci-macos-10.15-x86_64/30-android.sh +++ b/coin/provisioning/qtci-macos-10.15-x86_64/30-android.sh @@ -22,7 +22,7 @@ toolsFile="commandlinetools-mac-6609375_latest.zip" ndkVersion="r26b" ndkFile="android-ndk-$ndkVersion-darwin.zip" -sdkBuildToolsVersion="34.0.0" +sdkBuildToolsVersion="35.0.1" # this is compile sdk version sdkApiLevel="android-35" diff --git a/coin/provisioning/qtci-macos-11-arm/30-android.sh b/coin/provisioning/qtci-macos-11-arm/30-android.sh index b84b7ee1b4c..8381d489122 100755 --- a/coin/provisioning/qtci-macos-11-arm/30-android.sh +++ b/coin/provisioning/qtci-macos-11-arm/30-android.sh @@ -22,7 +22,7 @@ toolsFile="commandlinetools-mac-6609375_latest.zip" ndkVersion="r26b" ndkFile="android-ndk-$ndkVersion-darwin.zip" -sdkBuildToolsVersion="34.0.0" +sdkBuildToolsVersion="35.0.1" # this is compile sdk version sdkApiLevel="android-35" diff --git a/coin/provisioning/qtci-macos-11-x86_64/30-android.sh b/coin/provisioning/qtci-macos-11-x86_64/30-android.sh index 175be765eca..10b44e0b617 100755 --- a/coin/provisioning/qtci-macos-11-x86_64/30-android.sh +++ b/coin/provisioning/qtci-macos-11-x86_64/30-android.sh @@ -22,7 +22,7 @@ toolsFile="commandlinetools-mac-6609375_latest.zip" ndkVersion="r26b" ndkFile="android-ndk-$ndkVersion-darwin.zip" -sdkBuildToolsVersion="34.0.0" +sdkBuildToolsVersion="35.0.1" # this is compile sdk version sdkApiLevel="android-35" diff --git a/coin/provisioning/qtci-macos-12-arm/30-android.sh b/coin/provisioning/qtci-macos-12-arm/30-android.sh index d1c60da2968..5f4608e74fb 100755 --- a/coin/provisioning/qtci-macos-12-arm/30-android.sh +++ b/coin/provisioning/qtci-macos-12-arm/30-android.sh @@ -22,7 +22,7 @@ toolsFile="commandlinetools-mac-6609375_latest.zip" ndkVersion="r26b" ndkFile="android-ndk-$ndkVersion-darwin.zip" -sdkBuildToolsVersion="34.0.0" +sdkBuildToolsVersion="35.0.1" # this is compile sdk version sdkApiLevel="android-35" diff --git a/coin/provisioning/qtci-macos-13-arm/30-android.sh b/coin/provisioning/qtci-macos-13-arm/30-android.sh index d1c60da2968..5f4608e74fb 100755 --- a/coin/provisioning/qtci-macos-13-arm/30-android.sh +++ b/coin/provisioning/qtci-macos-13-arm/30-android.sh @@ -22,7 +22,7 @@ toolsFile="commandlinetools-mac-6609375_latest.zip" ndkVersion="r26b" ndkFile="android-ndk-$ndkVersion-darwin.zip" -sdkBuildToolsVersion="34.0.0" +sdkBuildToolsVersion="35.0.1" # this is compile sdk version sdkApiLevel="android-35" diff --git a/coin/provisioning/qtci-macos-14-arm/30-android.sh b/coin/provisioning/qtci-macos-14-arm/30-android.sh index d1c60da2968..5f4608e74fb 100755 --- a/coin/provisioning/qtci-macos-14-arm/30-android.sh +++ b/coin/provisioning/qtci-macos-14-arm/30-android.sh @@ -22,7 +22,7 @@ toolsFile="commandlinetools-mac-6609375_latest.zip" ndkVersion="r26b" ndkFile="android-ndk-$ndkVersion-darwin.zip" -sdkBuildToolsVersion="34.0.0" +sdkBuildToolsVersion="35.0.1" # this is compile sdk version sdkApiLevel="android-35" diff --git a/coin/provisioning/qtci-macos-15-arm/30-android.sh b/coin/provisioning/qtci-macos-15-arm/30-android.sh index d1c60da2968..5f4608e74fb 100755 --- a/coin/provisioning/qtci-macos-15-arm/30-android.sh +++ b/coin/provisioning/qtci-macos-15-arm/30-android.sh @@ -22,7 +22,7 @@ toolsFile="commandlinetools-mac-6609375_latest.zip" ndkVersion="r26b" ndkFile="android-ndk-$ndkVersion-darwin.zip" -sdkBuildToolsVersion="34.0.0" +sdkBuildToolsVersion="35.0.1" # this is compile sdk version sdkApiLevel="android-35" From a47c2b4ec7c48a8c8fbd704ca89b89a2127197c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marianne=20Yrj=C3=A4n=C3=A4?= Date: Thu, 16 Jan 2025 16:00:02 +0200 Subject: [PATCH 57/75] Provisioning: Separate QNX710 and QNX800 qemu configs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit QNX qemu configs separated. QNX710 and QNX800 require different set of dependency libraries and there's an extra image creation bug on QNX800 that needs workaround too. QNX800 toolchain updated. Task-number: QTBUG-131708 Pick-to: 6.8 Change-Id: I3bc5c8bb63abbb729d03fcf3afb2f7881bcdd270 Reviewed-by: Simo Fält (cherry picked from commit 4791054b109cffe76d7b30df01cb0e14bf270eba) Reviewed-by: Qt Cherry-pick Bot --- .../cmake_platforms_qemu_qnx710.yaml | 1 + coin/provisioning/common/linux/qnx_710.sh | 6 +- coin/provisioning/common/linux/qnx_800.sh | 14 ++- .../{ => 710}/local/misc_files/etc/hosts | 0 .../local/misc_files/etc/resolv.conf | 0 .../{ => 710}/local/opt_scripts/opt_nfs_qt | 0 .../{ => 710}/local/options | 0 .../local/snippets/data_files.custom | 0 .../{ => 710}/local/snippets/ifs_env.custom | 0 .../local/snippets/passwd_file.builtin | 0 .../local/snippets/post_start.custom | 0 .../local/snippets/shadow_file.builtin | 0 .../local/snippets/system_files.custom | 0 .../{ => 710}/local/snippets/uids.custom | 0 .../800/local/misc_files/etc/hosts | 19 ++++ .../800/local/misc_files/etc/resolv.conf | 2 + .../800/local/opt_scripts/opt_nfs_qt | 46 ++++++++++ .../qnx_qemu_build_files/800/local/options | 88 +++++++++++++++++++ .../800/local/snippets/data_files.custom | 25 ++++++ .../800/local/snippets/ifs_env.custom | 12 +++ .../800/local/snippets/passwd_file.builtin | 3 + .../800/local/snippets/post_start.custom | 29 ++++++ .../800/local/snippets/shadow_file.builtin | 2 + .../800/local/snippets/system_files.custom | 65 ++++++++++++++ .../800/local/snippets/uids.custom | 1 + 25 files changed, 306 insertions(+), 7 deletions(-) rename coin/provisioning/common/linux/qnx_qemu_build_files/{ => 710}/local/misc_files/etc/hosts (100%) rename coin/provisioning/common/linux/qnx_qemu_build_files/{ => 710}/local/misc_files/etc/resolv.conf (100%) rename coin/provisioning/common/linux/qnx_qemu_build_files/{ => 710}/local/opt_scripts/opt_nfs_qt (100%) rename coin/provisioning/common/linux/qnx_qemu_build_files/{ => 710}/local/options (100%) rename coin/provisioning/common/linux/qnx_qemu_build_files/{ => 710}/local/snippets/data_files.custom (100%) rename coin/provisioning/common/linux/qnx_qemu_build_files/{ => 710}/local/snippets/ifs_env.custom (100%) rename coin/provisioning/common/linux/qnx_qemu_build_files/{ => 710}/local/snippets/passwd_file.builtin (100%) rename coin/provisioning/common/linux/qnx_qemu_build_files/{ => 710}/local/snippets/post_start.custom (100%) rename coin/provisioning/common/linux/qnx_qemu_build_files/{ => 710}/local/snippets/shadow_file.builtin (100%) rename coin/provisioning/common/linux/qnx_qemu_build_files/{ => 710}/local/snippets/system_files.custom (100%) rename coin/provisioning/common/linux/qnx_qemu_build_files/{ => 710}/local/snippets/uids.custom (100%) create mode 100644 coin/provisioning/common/linux/qnx_qemu_build_files/800/local/misc_files/etc/hosts create mode 100644 coin/provisioning/common/linux/qnx_qemu_build_files/800/local/misc_files/etc/resolv.conf create mode 100755 coin/provisioning/common/linux/qnx_qemu_build_files/800/local/opt_scripts/opt_nfs_qt create mode 100644 coin/provisioning/common/linux/qnx_qemu_build_files/800/local/options create mode 100644 coin/provisioning/common/linux/qnx_qemu_build_files/800/local/snippets/data_files.custom create mode 100644 coin/provisioning/common/linux/qnx_qemu_build_files/800/local/snippets/ifs_env.custom create mode 100644 coin/provisioning/common/linux/qnx_qemu_build_files/800/local/snippets/passwd_file.builtin create mode 100644 coin/provisioning/common/linux/qnx_qemu_build_files/800/local/snippets/post_start.custom create mode 100644 coin/provisioning/common/linux/qnx_qemu_build_files/800/local/snippets/shadow_file.builtin create mode 100644 coin/provisioning/common/linux/qnx_qemu_build_files/800/local/snippets/system_files.custom create mode 100644 coin/provisioning/common/linux/qnx_qemu_build_files/800/local/snippets/uids.custom diff --git a/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml b/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml index 92834126fae..1dc43a8a64d 100644 --- a/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml +++ b/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml @@ -15,6 +15,7 @@ Configurations: 'QT_CMAKE_DIR=/opt/cmake-3.30.5/bin', 'QNX_TEST_ENV=LD_LIBRARY_PATH={{.Env.QNX_QEMU_LD_LIBRARY_PATH}} QSG_RHI_BACKEND=software QT_QPA_PLATFORM=offscreen QTEST_ENVIRONMENT=ci', 'NON_QTBASE_TARGET_CMAKE_ARGS= -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', + 'QNX_QEMU={{.Env.QNX_710_QEMU}}', ] - Id: 'qnx-710-arm64-on-linux' diff --git a/coin/provisioning/common/linux/qnx_710.sh b/coin/provisioning/common/linux/qnx_710.sh index 41d2d103509..874e7b4a932 100755 --- a/coin/provisioning/common/linux/qnx_710.sh +++ b/coin/provisioning/common/linux/qnx_710.sh @@ -26,12 +26,12 @@ DownloadAndExtract () { aarch64le_toolchain="${BASH_SOURCE%/*}/../shared/cmake_toolchain_files/qnx-toolchain-aarch64le.cmake" armv7le_toolchain="${BASH_SOURCE%/*}/../shared/cmake_toolchain_files/qnx-toolchain-armv7le.cmake" x8664_toolchain="${BASH_SOURCE%/*}/../shared/cmake_toolchain_files/qnx-toolchain-x8664.cmake" -QNX_qemu_bld_files_dir="${BASH_SOURCE%/*}/qnx_qemu_build_files/" +QNX_qemu_bld_files_dir="${BASH_SOURCE%/*}/qnx_qemu_build_files/710/" targetFolder="/opt/" folderName="qnx710" targetPath="$targetFolder$folderName" -qemuTargetPath="$HOME/QNX" +qemuTargetPath="$HOME/QNX710" qemuIpAddress="172.31.1.10" export qemuNetwork="172.31.1.1" qemuSSHuser="root" @@ -81,7 +81,7 @@ fi # Set env variables SetEnvVar "QNX_710" "$targetPath" -SetEnvVar "QNX_QEMU" "$qemuTargetPath" +SetEnvVar "QNX_710_QEMU" "$qemuTargetPath" SetEnvVar "QNX_QEMU_IPADDR" "$qemuIpAddress" SetEnvVar "QNX_QEMU_SSH" "$qemuSSHurl" SetEnvVar "QNX_QEMU_LD_LIBRARY_PATH" "$qemuLDpath" diff --git a/coin/provisioning/common/linux/qnx_800.sh b/coin/provisioning/common/linux/qnx_800.sh index 52545d416ae..77730602a62 100755 --- a/coin/provisioning/common/linux/qnx_800.sh +++ b/coin/provisioning/common/linux/qnx_800.sh @@ -26,12 +26,12 @@ DownloadAndExtract () { aarch64le_toolchain="${BASH_SOURCE%/*}/../shared/cmake_toolchain_files/qnx-toolchain-aarch64le.cmake" armv7le_toolchain="${BASH_SOURCE%/*}/../shared/cmake_toolchain_files/qnx-toolchain-armv7le.cmake" x8664_toolchain="${BASH_SOURCE%/*}/../shared/cmake_toolchain_files/qnx-toolchain-x8664.cmake" -QNX_qemu_bld_files_dir="${BASH_SOURCE%/*}/qnx_qemu_build_files/" +QNX_qemu_bld_files_dir="${BASH_SOURCE%/*}/qnx_qemu_build_files/800/" targetFolder="/opt/" folderName="qnx800" targetPath="$targetFolder$folderName" -qemuTargetPath="$HOME/QNX" +qemuTargetPath="$HOME/QNX800" qemuIpAddress="172.31.1.10" export qemuNetwork="172.31.1.1" qemuSSHuser="root" @@ -43,9 +43,9 @@ if [ ! -d "$targetFolder" ]; then fi # QNX SDP -sourceFile="http://ci-files01-hki.ci.qt.io/input/qnx/qnx800-linux-20240510.tar.xz" +sourceFile="http://ci-files01-hki.ci.qt.io/input/qnx/qnx800-windows-linux-20240930.tar.xz" targetFile="qnx800.tar.xz" -sha1="93245a5bc11b88563328f0763573942fd25b5e18" +sha1="a86d6e001e4ad46f50ed430fb85e8230e730751b" DownloadAndExtract "$sourceFile" "$sha1" "$targetFile" "$targetFolder" sudo cp "$aarch64le_toolchain" "$targetPath" @@ -81,5 +81,11 @@ fi # Set env variables SetEnvVar "QNX_800" "$targetPath" +SetEnvVar "QNX_800_QEMU" "$qemuTargetPath" +# These are common defines with QNX710 +SetEnvVar "QNX_QEMU_IPADDR" "$qemuIpAddress" +SetEnvVar "QNX_QEMU_SSH" "$qemuSSHurl" +SetEnvVar "QNX_QEMU_LD_LIBRARY_PATH" "$qemuLDpath" + echo "QNX SDP = 8.0.0" >> ~/versions.txt diff --git a/coin/provisioning/common/linux/qnx_qemu_build_files/local/misc_files/etc/hosts b/coin/provisioning/common/linux/qnx_qemu_build_files/710/local/misc_files/etc/hosts similarity index 100% rename from coin/provisioning/common/linux/qnx_qemu_build_files/local/misc_files/etc/hosts rename to coin/provisioning/common/linux/qnx_qemu_build_files/710/local/misc_files/etc/hosts diff --git a/coin/provisioning/common/linux/qnx_qemu_build_files/local/misc_files/etc/resolv.conf b/coin/provisioning/common/linux/qnx_qemu_build_files/710/local/misc_files/etc/resolv.conf similarity index 100% rename from coin/provisioning/common/linux/qnx_qemu_build_files/local/misc_files/etc/resolv.conf rename to coin/provisioning/common/linux/qnx_qemu_build_files/710/local/misc_files/etc/resolv.conf diff --git a/coin/provisioning/common/linux/qnx_qemu_build_files/local/opt_scripts/opt_nfs_qt b/coin/provisioning/common/linux/qnx_qemu_build_files/710/local/opt_scripts/opt_nfs_qt similarity index 100% rename from coin/provisioning/common/linux/qnx_qemu_build_files/local/opt_scripts/opt_nfs_qt rename to coin/provisioning/common/linux/qnx_qemu_build_files/710/local/opt_scripts/opt_nfs_qt diff --git a/coin/provisioning/common/linux/qnx_qemu_build_files/local/options b/coin/provisioning/common/linux/qnx_qemu_build_files/710/local/options similarity index 100% rename from coin/provisioning/common/linux/qnx_qemu_build_files/local/options rename to coin/provisioning/common/linux/qnx_qemu_build_files/710/local/options diff --git a/coin/provisioning/common/linux/qnx_qemu_build_files/local/snippets/data_files.custom b/coin/provisioning/common/linux/qnx_qemu_build_files/710/local/snippets/data_files.custom similarity index 100% rename from coin/provisioning/common/linux/qnx_qemu_build_files/local/snippets/data_files.custom rename to coin/provisioning/common/linux/qnx_qemu_build_files/710/local/snippets/data_files.custom diff --git a/coin/provisioning/common/linux/qnx_qemu_build_files/local/snippets/ifs_env.custom b/coin/provisioning/common/linux/qnx_qemu_build_files/710/local/snippets/ifs_env.custom similarity index 100% rename from coin/provisioning/common/linux/qnx_qemu_build_files/local/snippets/ifs_env.custom rename to coin/provisioning/common/linux/qnx_qemu_build_files/710/local/snippets/ifs_env.custom diff --git a/coin/provisioning/common/linux/qnx_qemu_build_files/local/snippets/passwd_file.builtin b/coin/provisioning/common/linux/qnx_qemu_build_files/710/local/snippets/passwd_file.builtin similarity index 100% rename from coin/provisioning/common/linux/qnx_qemu_build_files/local/snippets/passwd_file.builtin rename to coin/provisioning/common/linux/qnx_qemu_build_files/710/local/snippets/passwd_file.builtin diff --git a/coin/provisioning/common/linux/qnx_qemu_build_files/local/snippets/post_start.custom b/coin/provisioning/common/linux/qnx_qemu_build_files/710/local/snippets/post_start.custom similarity index 100% rename from coin/provisioning/common/linux/qnx_qemu_build_files/local/snippets/post_start.custom rename to coin/provisioning/common/linux/qnx_qemu_build_files/710/local/snippets/post_start.custom diff --git a/coin/provisioning/common/linux/qnx_qemu_build_files/local/snippets/shadow_file.builtin b/coin/provisioning/common/linux/qnx_qemu_build_files/710/local/snippets/shadow_file.builtin similarity index 100% rename from coin/provisioning/common/linux/qnx_qemu_build_files/local/snippets/shadow_file.builtin rename to coin/provisioning/common/linux/qnx_qemu_build_files/710/local/snippets/shadow_file.builtin diff --git a/coin/provisioning/common/linux/qnx_qemu_build_files/local/snippets/system_files.custom b/coin/provisioning/common/linux/qnx_qemu_build_files/710/local/snippets/system_files.custom similarity index 100% rename from coin/provisioning/common/linux/qnx_qemu_build_files/local/snippets/system_files.custom rename to coin/provisioning/common/linux/qnx_qemu_build_files/710/local/snippets/system_files.custom diff --git a/coin/provisioning/common/linux/qnx_qemu_build_files/local/snippets/uids.custom b/coin/provisioning/common/linux/qnx_qemu_build_files/710/local/snippets/uids.custom similarity index 100% rename from coin/provisioning/common/linux/qnx_qemu_build_files/local/snippets/uids.custom rename to coin/provisioning/common/linux/qnx_qemu_build_files/710/local/snippets/uids.custom diff --git a/coin/provisioning/common/linux/qnx_qemu_build_files/800/local/misc_files/etc/hosts b/coin/provisioning/common/linux/qnx_qemu_build_files/800/local/misc_files/etc/hosts new file mode 100644 index 00000000000..58b8d5a131d --- /dev/null +++ b/coin/provisioning/common/linux/qnx_qemu_build_files/800/local/misc_files/etc/hosts @@ -0,0 +1,19 @@ +# Need to add all testserver names statically +# as current Docker uses Multicast DNS (mDNS) (avahi) +# Which does not work with QNX qemu +172.31.1.1 apache2 apache2.test-net.qt.local +172.31.1.1 squid squid.test-net.qt.local +172.31.1.1 vsftpd vsftpd.test-net.qt.local +172.31.1.1 ftp-proxy ftp-proxy.test-net.qt.local +172.31.1.1 danted danted.test-net.qt.local +172.31.1.1 cyrus cyrus.test-net.qt.local +172.31.1.1 echo echo.test-net.qt.local +172.31.1.1 iptables iptables.test-net.qt.local + +# For network test server which is still used on some test +# like networkselftest for local dns resolution +172.31.1.1 qt-test-server + +# QtCoap testservers +172.31.1.1 californium californium.test-net.qt.local +172.31.1.1 freecoap freecoap.test-net.qt.local diff --git a/coin/provisioning/common/linux/qnx_qemu_build_files/800/local/misc_files/etc/resolv.conf b/coin/provisioning/common/linux/qnx_qemu_build_files/800/local/misc_files/etc/resolv.conf new file mode 100644 index 00000000000..6765c11f7c6 --- /dev/null +++ b/coin/provisioning/common/linux/qnx_qemu_build_files/800/local/misc_files/etc/resolv.conf @@ -0,0 +1,2 @@ +search test-net.qt.local +nameserver 172.31.1.1 diff --git a/coin/provisioning/common/linux/qnx_qemu_build_files/800/local/opt_scripts/opt_nfs_qt b/coin/provisioning/common/linux/qnx_qemu_build_files/800/local/opt_scripts/opt_nfs_qt new file mode 100755 index 00000000000..13db322b852 --- /dev/null +++ b/coin/provisioning/common/linux/qnx_qemu_build_files/800/local/opt_scripts/opt_nfs_qt @@ -0,0 +1,46 @@ +#!/bin/bash + +function brief() +{ + echo "--nfs=[|no]" +} + +function help() +{ + brief + cat <" will be mounted at + + The default is no. +EOF +} + +function validate() { + exit 0 +} + +function configure() +{ + if [ "$OPT_NFS_QT" != no ]; then + cat >output/option_files/post_start.opt_nfs < Starting NFS" +STARTU_P(fs_nfs3_t,__FS_NFS3_ID__) fs-nfs3 -t 172.31.1.1:$OPT_NFS_QT $OPT_NFS_QT +EOF + fi + + exit 0 +} + +case "$1" in + brief) + brief;; + help) + help;; + validate) + validate;; + configure) + configure;; + default) + echo no;; +esac diff --git a/coin/provisioning/common/linux/qnx_qemu_build_files/800/local/options b/coin/provisioning/common/linux/qnx_qemu_build_files/800/local/options new file mode 100644 index 00000000000..bf1a413eb22 --- /dev/null +++ b/coin/provisioning/common/linux/qnx_qemu_build_files/800/local/options @@ -0,0 +1,88 @@ +OPT_ABLELOCK='no' +DEF_OPT_ABLELOCK='no' +OPT_ARCH='x86_64' +DEF_OPT_ARCH='x86_64' +OPT_ASLR='yes' +DEF_OPT_ASLR='yes' +OPT_CERTICOM='no' +DEF_OPT_CERTICOM='no' +OPT_CRYPTODEV='no' +DEF_OPT_CRYPTODEV='no' +OPT_DATA_INODES='3000' +DEF_OPT_DATA_INODES='3000' +OPT_DATA_SIZE='512' +DEF_OPT_DATA_SIZE='60' +OPT_EXTRA_DIRS='none' +DEF_OPT_EXTRA_DIRS='none' +OPT_GRAPHICS='no' +DEF_OPT_GRAPHICS='no' +OPT_GUEST='none' +DEF_OPT_GUEST='none' +OPT_HOSTNAME='qnx_QEMU_CI' +DEF_OPT_HOSTNAME='noname' +OPT_IP='172.31.1.69' +DEF_OPT_IP='dhcp' +OPT_MACADDR='52:54:00:f1:c4:92' +DEF_OPT_MACADDR='generate' +OPT_NFS='no' +DEF_OPT_NFS='no' +OPT_NFS_QT='/home/qt/work' +DEF_OPT_NFS_QT='/home/qt/work' +OPT_PATHTRUST='no' +DEF_OPT_PATHTRUST='no' +OPT_PERL='no' +DEF_OPT_PERL='no' +OPT_POLICY='none' +DEF_OPT_POLICY='none' +OPT_PYTHON='no' +DEF_OPT_PYTHON='no' +OPT_QAUDIT='no' +DEF_OPT_QAUDIT='no' +OPT_QFIM='no' +DEF_OPT_QFIM='no' +OPT_QTD='no' +DEF_OPT_QTD='no' +OPT_QVM='no' +DEF_OPT_QVM='no' +OPT_REPOS='$QNX_STAGE_nto:$QNX_TARGET' +DEF_OPT_REPOS='$QNX_STAGE_nto:$QNX_TARGET' +OPT_ROOT='no' +DEF_OPT_ROOT='no' +OPT_SAFE='no' +DEF_OPT_SAFE='no' +OPT_SECPOL='no' +DEF_OPT_SECPOL='no' +OPT_SECURE_DATA='no' +DEF_OPT_SECURE_DATA='no' +OPT_SECURE_PROCFS='yes' +DEF_OPT_SECURE_PROCFS='yes' +OPT_SLM='no' +DEF_OPT_SLM='no' +OPT_SSHD_PREGEN='yes' +DEF_OPT_SSHD_PREGEN='yes' +OPT_SSH_IDENT='prompt' +DEF_OPT_SSH_IDENT='prompt' +OPT_SYS_INODES='1000' +DEF_OPT_SYS_INODES='1000' +OPT_SYS_SIZE='20' +DEF_OPT_SYS_SIZE='20' +OPT_TCG='no' +DEF_OPT_TCG='no' +OPT_TELNET='no' +DEF_OPT_TELNET='no' +OPT_TOMCRYPT='no' +DEF_OPT_TOMCRYPT='no' +OPT_TOYBOX='no' +DEF_OPT_TOYBOX='no' +OPT_TYPE='qemu' +DEF_OPT_TYPE='qemu' +OPT_TZ='UTC0' +DEF_OPT_TZ='UTC0' +OPT_UNION='yes' +DEF_OPT_UNION='yes' +OPT_USB='no' +DEF_OPT_USB='no' +OPT_VALGRIND='no' +DEF_OPT_VALGRIND='no' +OPT_ZONEINFO='no' +DEF_OPT_ZONEINFO='no' diff --git a/coin/provisioning/common/linux/qnx_qemu_build_files/800/local/snippets/data_files.custom b/coin/provisioning/common/linux/qnx_qemu_build_files/800/local/snippets/data_files.custom new file mode 100644 index 00000000000..cba74f1f812 --- /dev/null +++ b/coin/provisioning/common/linux/qnx_qemu_build_files/800/local/snippets/data_files.custom @@ -0,0 +1,25 @@ +# local/snippets/data_files.custom +# Placeholder for local list of files to add to data partition + +home/root/.ssh/environment = { +TERM=qansi +PATH=__IFS_PATH__:/system/xbin:. +#LD_LIBRARY_PATH=__PROC_LIB__:/home/qt/work/install/target/lib +#QSG_RHI_BACKEND=software +#QT_QPA_PLATFORM=offscreen +} + +[uid=0 gid=0 dperms=755 type=dir] var/share +var/share/zoneinfo=usr/share/zoneinfo + +[uid=0 gid=0 dperms=755 type=dir] var/share/fonts +var/etc/fontconfig/fonts.conf=etc/fontconfig/fonts.conf +var/share/fonts=usr/share/fonts + +var/etc/hosts=local/misc_files/etc/hosts +var/etc/resolv.conf=local/misc_files/etc/resolv.conf +var/etc/nsswitch.conf=etc/nsswitch.conf + +[uid=0 gid=0 dperms=755 type=dir] var/etc/ssl/certs +var/share/ca-certificates=local/misc_files/ca-certificates +var/etc/ssl/certs=local/misc_files/etc/ssl/certs diff --git a/coin/provisioning/common/linux/qnx_qemu_build_files/800/local/snippets/ifs_env.custom b/coin/provisioning/common/linux/qnx_qemu_build_files/800/local/snippets/ifs_env.custom new file mode 100644 index 00000000000..0ae7a4dc0f3 --- /dev/null +++ b/coin/provisioning/common/linux/qnx_qemu_build_files/800/local/snippets/ifs_env.custom @@ -0,0 +1,12 @@ +# Add root HOME env variable +procmgr_symlink /data/home/root/ /home/root +HOME=/home/root + +# Needed for timezone related tests +TZ=Europe/Oslo +procmgr_symlink /data/var/share /usr/share +procmgr_symlink /data/var/share/zoneinfo/Europe/Oslo /data/var/etc/localtime + +# fontconfig +#procmgr_symlink /data/var/etc/fontconfig/fonts.conf /etc/fontconfig/fonts.conf +#procmgr_symlink /data/var/share/fonts /usr/share/fonts diff --git a/coin/provisioning/common/linux/qnx_qemu_build_files/800/local/snippets/passwd_file.builtin b/coin/provisioning/common/linux/qnx_qemu_build_files/800/local/snippets/passwd_file.builtin new file mode 100644 index 00000000000..142fd04ebe2 --- /dev/null +++ b/coin/provisioning/common/linux/qnx_qemu_build_files/800/local/snippets/passwd_file.builtin @@ -0,0 +1,3 @@ +root:x:0:0:Superuser:/data/home/root:/bin/sh +sshd:x:15:6:sshd:/data/var/chroot/sshd:/bin/false +qnxuser:x:__QNXUSER_UID__:__QNXUSER_GID__:User9:/data/home/qnxuser:/bin/sh diff --git a/coin/provisioning/common/linux/qnx_qemu_build_files/800/local/snippets/post_start.custom b/coin/provisioning/common/linux/qnx_qemu_build_files/800/local/snippets/post_start.custom new file mode 100644 index 00000000000..4c0a65527f4 --- /dev/null +++ b/coin/provisioning/common/linux/qnx_qemu_build_files/800/local/snippets/post_start.custom @@ -0,0 +1,29 @@ +# local/snippets/post_start.custom +# Commands executed from post_startup.sh. Executed at the end of system startup whether slm is in use +# or not +# +# To allow resource managers to be run properly with and without security policies, command lines +# should be written in one of the following forms: +# +# START(resmgr_t) resmgr DROPROOT(resmgr_uid) +# STARTU(resmgr_t, resmgr_uid) resmgr +# Where resmgr_t is the security type name (arbitrary but usually the name of the resmgr with _t appended), +# and resmgr_uid is the id to use for both uid and gid. DROPROOT is used only in cases where the +# resource manager supports a -U option for switching to non-root. +echo "---> Starting Filesystem event manager (fsevmgr)" +STARTU_P(fsevmg_t,__FSEVMG_ID__) fsevmgr -d -F __DEVB_ID__ -N __DEVB_ID__ + +echo "---> Remove large fonts" +rm -rf /data/var/share/fonts/NotoSansCJK* +rm -rf /data/var/share/fonts/NotoSansMonoCJK* +echo "---> Create fontconfig cache" +fc-cache & + +echo "---> Restart ssh daemon" +slay sshd +/system/xbin/sshd -f /system/data/etc/ssh/sshd_config + +# Add default route so QNX knows where to send +# requests for unknown network +echo "---> Add default route" +route add default 172.31.1.1 diff --git a/coin/provisioning/common/linux/qnx_qemu_build_files/800/local/snippets/shadow_file.builtin b/coin/provisioning/common/linux/qnx_qemu_build_files/800/local/snippets/shadow_file.builtin new file mode 100644 index 00000000000..e362b971492 --- /dev/null +++ b/coin/provisioning/common/linux/qnx_qemu_build_files/800/local/snippets/shadow_file.builtin @@ -0,0 +1,2 @@ +root::1475759054:0:0 +qnxuser:@S@f0J4xZibUbKllVqPMzetauCHLRi+9C8wTsxYXE5r7Pfhda5FI7zkObEmKogy01pAX5f/1niG2S2eLXbLs3xoww==@YjBmOTQwNzZiNzYwMzY3N2RkMGQ1NTZmNzA5MDFhMWY=:1476890273:0:0 diff --git a/coin/provisioning/common/linux/qnx_qemu_build_files/800/local/snippets/system_files.custom b/coin/provisioning/common/linux/qnx_qemu_build_files/800/local/snippets/system_files.custom new file mode 100644 index 00000000000..b7e8e28078e --- /dev/null +++ b/coin/provisioning/common/linux/qnx_qemu_build_files/800/local/snippets/system_files.custom @@ -0,0 +1,65 @@ +# local/snippets/system_files.custom +# Placeholder for local list of files to add to system partition + +[perms=444] data/etc/ssh/sshd_config={ +HostKey /data/var/ssh/ssh_host_rsa_key +HostKey /data/var/ssh/ssh_host_ed25519_key +AuthorizedKeysFile .ssh/authorized_keys +PermitUserEnvironment yes +AuthenticationMethods none +PermitEmptyPasswords yes +PermitRootLogin yes +PidFile none +Subsystem sftp /system/xbin/sftp-server +} + +# libraries Qt requires +lib/libicuuc.so.67=usr/lib/libicuuc.so.67 +lib/libicudata.so.67=usr/lib/libicudata.so.67 +lib/libicui18n.so.67=usr/lib/libicui18n.so.67 +lib/libGLESv2.so.1=usr/lib/libGLESv2.so.1 +lib/libEGL.so.1=usr/lib/libEGL.so.1 +lib/libz.so.2=usr/lib/libz.so.2 +lib/libzstd.so.1=usr/lib/libzstd.so.1 +lib/libxml2.so.2=usr/lib/libxml2.so.2 +lib/libfreetype.so.24=usr/lib/libfreetype.so.24 +lib/libbz2.so.1=usr/lib/libbz2.so.1 +lib/liblzma.so.5=usr/lib/liblzma.so.5 +lib/libdbus-1.so=usr/lib//libdbus-1.so +lib/libdbus-1.so.22=usr/lib//libdbus-1.so.22 +lib/libbacktrace.so.1=lib/libbacktrace.so.1 +lib/libm.so.3=lib/libm.so.3 + +############################################# +### Image support +############################################# +etc/system/config/img.conf=etc/system/config/img.conf +lib/libpng16.so.16=usr/lib/libpng16.so.16 +lib/libjpeg.so.9=lib/libjpeg.so.9 +lib/libimg.so.1=lib/libimg.so.1 +lib/dll/img_codec_bmp.so=lib/dll/img_codec_bmp.so +lib/dll/img_codec_gif.so=lib/dll/img_codec_gif.so +lib/dll/img_codec_jpg.so=lib/dll/img_codec_jpg.so +lib/dll/img_codec_png.so=lib/dll/img_codec_png.so +lib/dll/img_codec_sgi.so=lib/dll/img_codec_sgi.so +lib/dll/img_codec_tga.so=lib/dll/img_codec_tga.so +lib/dll/img_codec_tif.so=lib/dll/img_codec_tif.so + +# for inotify +xbin/fsevmgr=sbin/fsevmgr + +############################################## +### Sreen support +############################################## +lib/libscreen.so.1=usr/lib/libscreen.so.1 + +# for fontconfig +lib/libfontconfig.so.1=usr/lib/libfontconfig.so.1 +xbin/fc-cache=bin/fc-cache +xbin/fc-match=local/misc_files/fc-match + +# network +lib/libssl.so=usr/lib/libssl.so +xbin/nslookup=usr/bin/nslookup +xbin/unbound=sbin/unbound +xbin/curl=usr/bin/curl diff --git a/coin/provisioning/common/linux/qnx_qemu_build_files/800/local/snippets/uids.custom b/coin/provisioning/common/linux/qnx_qemu_build_files/800/local/snippets/uids.custom new file mode 100644 index 00000000000..9787971c024 --- /dev/null +++ b/coin/provisioning/common/linux/qnx_qemu_build_files/800/local/snippets/uids.custom @@ -0,0 +1 @@ +#define __FSEVMG_ID__ 50 From b8778d4e634f5c881e74ce0e5425964393607aaa Mon Sep 17 00:00:00 2001 From: Tero Heikkinen Date: Fri, 24 Jan 2025 13:40:24 +0200 Subject: [PATCH 58/75] Synchronize GNOME based Linux gsettings into a common script MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Pick-to: 6.8 Task-number: QTQAINFRA-6967 Change-Id: Ib2f17a49931dc546af82f1e0384814f9f359a3f3 Reviewed-by: Tony Sarajärvi (cherry picked from commit 98e55af0f21a3e563bfc1f66fe1bc05bff753496) Reviewed-by: Liang Qi --- .../common/linux/configure-gnome-shell.sh | 17 +++++++++++++++++ .../01-systemsetup.sh | 10 ++++------ .../01-systemsetup.sh | 8 ++------ .../01-systemsetup.sh | 8 ++------ .../01-systemsetup.sh | 8 ++------ .../01-systemsetup.sh | 8 ++------ .../01-systemsetup.sh | 8 ++------ .../01-systemsetup.sh | 13 ++++--------- .../01-systemsetup.sh | 13 ++++--------- .../01-systemsetup.sh | 13 ++++--------- .../01-systemsetup.sh | 9 ++------- .../01-systemsetup.sh | 9 ++------- .../01-systemsetup.sh | 12 +++++------- .../01-systemsetup.sh | 10 ++++------ .../01-systemsetup.sh | 10 ++++------ .../01-systemsetup.sh | 10 ++++------ .../01-systemsetup.sh | 10 ++++------ .../01-systemsetup.sh | 13 +++++++------ .../01-systemsetup.sh | 13 +++++++------ .../01-systemsetup.sh | 4 ++-- .../01-systemsetup.sh | 4 ++-- .../01-systemsetup.sh | 4 ++-- .../01-systemsetup.sh | 4 ++-- 23 files changed, 90 insertions(+), 128 deletions(-) create mode 100755 coin/provisioning/common/linux/configure-gnome-shell.sh diff --git a/coin/provisioning/common/linux/configure-gnome-shell.sh b/coin/provisioning/common/linux/configure-gnome-shell.sh new file mode 100755 index 00000000000..ff1f4d655ba --- /dev/null +++ b/coin/provisioning/common/linux/configure-gnome-shell.sh @@ -0,0 +1,17 @@ +#!/usr/bin/env bash +# Copyright (C) 2024 The Qt Company Ltd +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only + +# This script modifies GNOME based Linux configurations + +set -ex + +# Desktop +echo "Disable blank screen power saving (timeout 0 = never)" +gsettings set org.gnome.desktop.session idle-delay 0 +echo "Disable Automatic screen lock when screensaver goes active" +gsettings set org.gnome.desktop.screensaver lock-enabled false +echo "Disable window animations." +gsettings set org.gnome.desktop.interface enable-animations false +echo "Disable hot corner feature" +gsettings set org.gnome.desktop.interface enable-hot-corners false diff --git a/coin/provisioning/qtci-linux-Debian-11.6-aarch64/01-systemsetup.sh b/coin/provisioning/qtci-linux-Debian-11.6-aarch64/01-systemsetup.sh index f0288905a2b..169de531886 100755 --- a/coin/provisioning/qtci-linux-Debian-11.6-aarch64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-Debian-11.6-aarch64/01-systemsetup.sh @@ -6,6 +6,7 @@ set -ex +BASEDIR=$(dirname "$0") # shellcheck source=../common/unix/check_and_set_proxy.sh source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" @@ -13,12 +14,9 @@ NTS_IP=10.212.2.216 echo "Set timezone to UTC." sudo timedatectl set-timezone Etc/UTC -echo "Timeout for blanking the screen (0 = never)" -gsettings set org.gnome.desktop.session idle-delay 0 -echo "Prevents screen lock when screesaver goes active." -gsettings set org.gnome.desktop.screensaver lock-enabled false -echo "Disable window animations." -gsettings set org.gnome.desktop.interface enable-animations false + +"$BASEDIR/../common/linux/configure-gnome-shell.sh" + echo "Set grub timeout to 0" sudo sed -i 's|GRUB_TIMEOUT=10|GRUB_TIMEOUT=0|g' /etc/default/grub sudo update-grub diff --git a/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/01-systemsetup.sh index 1645670e613..4f9e20dc9c3 100644 --- a/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/01-systemsetup.sh @@ -9,8 +9,6 @@ BASEDIR=$(dirname "$0") # shellcheck source=../common/shared/network_test_server_ip.txt source "$BASEDIR/../common/shared/network_test_server_ip.txt" -echo "Disable window animations." -gsettings set org.gnome.desktop.interface enable-animations false echo "Set Network Test Server address to $network_test_server_ip in /etc/hosts" echo "$network_test_server_ip qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts echo "Set DISPLAY" @@ -20,10 +18,8 @@ export DISPLAY=:0 # Set timezone to UTC. sudo timedatectl set-timezone Etc/UTC -# disable Automatic screen lock -gsettings set org.gnome.desktop.screensaver lock-enabled false -# disable blank screen power saving -gsettings set org.gnome.desktop.session idle-delay 0 + +"$BASEDIR/../common/linux/configure-gnome-shell.sh" # Set Wayland enable as false. echo "Setting Wayland enable as false" diff --git a/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/01-systemsetup.sh index b39fe793556..46c10f9e0fb 100755 --- a/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/01-systemsetup.sh @@ -8,8 +8,6 @@ BASEDIR=$(dirname "$0") # shellcheck source=../common/shared/network_test_server_ip.txt source "$BASEDIR/../common/shared/network_test_server_ip.txt" -echo "Disable window animations." -gsettings set org.gnome.desktop.interface enable-animations false echo "Set Network Test Server address to $network_test_server_ip in /etc/hosts" echo "$network_test_server_ip qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts echo "Set DISPLAY" @@ -19,10 +17,8 @@ export DISPLAY=:0 # Set timezone to UTC. sudo timedatectl set-timezone Etc/UTC -# disable Automatic screen lock -gsettings set org.gnome.desktop.screensaver lock-enabled false -# disable blank screen power saving -gsettings set org.gnome.desktop.session idle-delay 0 + +"$BASEDIR/../common/linux/configure-gnome-shell.sh" # Set Wayland enable as false. echo "Setting Wayland enable as false" diff --git a/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/01-systemsetup.sh index 46b321dda8e..bd7a63504b9 100755 --- a/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/01-systemsetup.sh @@ -8,8 +8,6 @@ BASEDIR=$(dirname "$0") # shellcheck source=../common/shared/network_test_server_ip.txt source "$BASEDIR/../common/shared/network_test_server_ip.txt" -echo "Disable window animations." -gsettings set org.gnome.desktop.interface enable-animations false echo "Set Network Test Server address to $network_test_server_ip in /etc/hosts" echo "$network_test_server_ip qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts echo "Set DISPLAY" @@ -19,10 +17,8 @@ export DISPLAY=:0 # Set timezone to UTC. sudo timedatectl set-timezone Etc/UTC -# disable Automatic screen lock -gsettings set org.gnome.desktop.screensaver lock-enabled false -# disable blank screen power saving -gsettings set org.gnome.desktop.session idle-delay 0 + +"$BASEDIR/../common/linux/configure-gnome-shell.sh" # Set Wayland enable as false. echo "Setting Wayland enable as false" diff --git a/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/01-systemsetup.sh index 1645670e613..4f9e20dc9c3 100755 --- a/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/01-systemsetup.sh @@ -9,8 +9,6 @@ BASEDIR=$(dirname "$0") # shellcheck source=../common/shared/network_test_server_ip.txt source "$BASEDIR/../common/shared/network_test_server_ip.txt" -echo "Disable window animations." -gsettings set org.gnome.desktop.interface enable-animations false echo "Set Network Test Server address to $network_test_server_ip in /etc/hosts" echo "$network_test_server_ip qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts echo "Set DISPLAY" @@ -20,10 +18,8 @@ export DISPLAY=:0 # Set timezone to UTC. sudo timedatectl set-timezone Etc/UTC -# disable Automatic screen lock -gsettings set org.gnome.desktop.screensaver lock-enabled false -# disable blank screen power saving -gsettings set org.gnome.desktop.session idle-delay 0 + +"$BASEDIR/../common/linux/configure-gnome-shell.sh" # Set Wayland enable as false. echo "Setting Wayland enable as false" diff --git a/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/01-systemsetup.sh index 1645670e613..4f9e20dc9c3 100755 --- a/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/01-systemsetup.sh @@ -9,8 +9,6 @@ BASEDIR=$(dirname "$0") # shellcheck source=../common/shared/network_test_server_ip.txt source "$BASEDIR/../common/shared/network_test_server_ip.txt" -echo "Disable window animations." -gsettings set org.gnome.desktop.interface enable-animations false echo "Set Network Test Server address to $network_test_server_ip in /etc/hosts" echo "$network_test_server_ip qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts echo "Set DISPLAY" @@ -20,10 +18,8 @@ export DISPLAY=:0 # Set timezone to UTC. sudo timedatectl set-timezone Etc/UTC -# disable Automatic screen lock -gsettings set org.gnome.desktop.screensaver lock-enabled false -# disable blank screen power saving -gsettings set org.gnome.desktop.session idle-delay 0 + +"$BASEDIR/../common/linux/configure-gnome-shell.sh" # Set Wayland enable as false. echo "Setting Wayland enable as false" diff --git a/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/01-systemsetup.sh index de6abd0a977..41171ca2b82 100755 --- a/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/01-systemsetup.sh @@ -17,16 +17,11 @@ export DISPLAY=:0 # Set timezone to UTC. sudo timedatectl set-timezone Etc/UTC -# disable Automatic screen lock -gsettings set org.gnome.desktop.screensaver lock-enabled false -# disable blank screen power saving -gsettings set org.gnome.desktop.session idle-delay 0 -# Disable hot corner feature -gsettings set org.gnome.desktop.interface enable-hot-corners false -# Disable windows key from showing the GNOME Shell Activities overlay + +"$BASEDIR/../common/linux/configure-gnome-shell.sh" + +echo "Disable windows key from showing the GNOME Shell Activities overlay" gsettings set org.gnome.mutter overlay-key "" -echo "Disable window animations." -gsettings set org.gnome.desktop.interface enable-animations false # Set Wayland enable as false. echo "Setting Wayland enable as false" diff --git a/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/01-systemsetup.sh index 4fd0b9e71eb..128d6afb4e8 100755 --- a/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/01-systemsetup.sh @@ -17,16 +17,11 @@ export DISPLAY=:0 # Set timezone to UTC. sudo timedatectl set-timezone Etc/UTC -# disable Automatic screen lock -gsettings set org.gnome.desktop.screensaver lock-enabled false -# disable blank screen power saving -gsettings set org.gnome.desktop.session idle-delay 0 -# Disable hot corner feature -gsettings set org.gnome.desktop.interface enable-hot-corners false -# Disable windows key from showing the GNOME Shell Activities overlay + +"$BASEDIR/../common/linux/configure-gnome-shell.sh" + +echo "Disable windows key from showing the GNOME Shell Activities overlay" gsettings set org.gnome.mutter overlay-key "" -echo "Disable window animations." -gsettings set org.gnome.desktop.interface enable-animations false # Set Wayland enable as false. echo "Setting Wayland enable as false" diff --git a/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/01-systemsetup.sh index 4fd0b9e71eb..128d6afb4e8 100644 --- a/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/01-systemsetup.sh @@ -17,16 +17,11 @@ export DISPLAY=:0 # Set timezone to UTC. sudo timedatectl set-timezone Etc/UTC -# disable Automatic screen lock -gsettings set org.gnome.desktop.screensaver lock-enabled false -# disable blank screen power saving -gsettings set org.gnome.desktop.session idle-delay 0 -# Disable hot corner feature -gsettings set org.gnome.desktop.interface enable-hot-corners false -# Disable windows key from showing the GNOME Shell Activities overlay + +"$BASEDIR/../common/linux/configure-gnome-shell.sh" + +echo "Disable windows key from showing the GNOME Shell Activities overlay" gsettings set org.gnome.mutter overlay-key "" -echo "Disable window animations." -gsettings set org.gnome.desktop.interface enable-animations false # Set Wayland enable as false. echo "Setting Wayland enable as false" diff --git a/coin/provisioning/qtci-linux-SLES-15_SP4-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-SLES-15_SP4-x86_64/01-systemsetup.sh index 834843897dc..6fd3c07752d 100755 --- a/coin/provisioning/qtci-linux-SLES-15_SP4-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-SLES-15_SP4-x86_64/01-systemsetup.sh @@ -12,13 +12,8 @@ source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" echo "Set timezone to UTC." sudo timedatectl set-timezone Etc/UTC -echo "Timeout for blanking the screen (0 = never)" -gsettings set org.gnome.desktop.session idle-delay 0 -echo "Prevents screen lock when screesaver goes active." -gsettings set org.gnome.desktop.screensaver lock-enabled false -gsettings set org.gnome.desktop.lockdown disable-lock-screen 'true' -echo "Disable window animations." -gsettings set org.gnome.desktop.interface enable-animations false + +"$BASEDIR/../common/linux/configure-gnome-shell.sh" sudo sed -i 's|GRUB_TIMEOUT=8|GRUB_TIMEOUT=0|g' /etc/default/grub sudo grub2-mkconfig -o /boot/grub2/grub.cfg diff --git a/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/01-systemsetup.sh index 4ecddc9d87c..4fb3c37d34e 100644 --- a/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/01-systemsetup.sh @@ -12,13 +12,8 @@ source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" echo "Set timezone to UTC." sudo timedatectl set-timezone Etc/UTC -echo "Timeout for blanking the screen (0 = never)" -gsettings set org.gnome.desktop.session idle-delay 0 -echo "Prevents screen lock when screesaver goes active." -gsettings set org.gnome.desktop.screensaver lock-enabled false -gsettings set org.gnome.desktop.lockdown disable-lock-screen 'true' -echo "Disable window animations." -gsettings set org.gnome.desktop.interface enable-animations false + +"$BASEDIR/../common/linux/configure-gnome-shell.sh" sudo sed -i 's|GRUB_TIMEOUT=8|GRUB_TIMEOUT=0|g' /etc/default/grub sudo grub2-mkconfig -o /boot/grub2/grub.cfg diff --git a/coin/provisioning/qtci-linux-SLES-15_SP6-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-SLES-15_SP6-x86_64/01-systemsetup.sh index bec34ae3987..32da684442f 100644 --- a/coin/provisioning/qtci-linux-SLES-15_SP6-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-SLES-15_SP6-x86_64/01-systemsetup.sh @@ -14,13 +14,11 @@ source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" echo "Set timezone to UTC." sudo timedatectl set-timezone Etc/UTC -echo "Timeout for blanking the screen (0 = never)" -gsettings set org.gnome.desktop.session idle-delay 0 -echo "Prevents screen lock when screesaver goes active." -gsettings set org.gnome.desktop.screensaver lock-enabled false -gsettings set org.gnome.desktop.lockdown disable-lock-screen 'true' -echo "Disable window animations." -gsettings set org.gnome.desktop.interface enable-animations false + +"$BASEDIR/../common/linux/configure-gnome-shell.sh" + +echo "Disable windows key from showing the GNOME Shell Activities overlay" +gsettings set org.gnome.mutter overlay-key "" sudo sed -i 's|GRUB_TIMEOUT=8|GRUB_TIMEOUT=0|g' /etc/default/grub sudo grub2-mkconfig -o /boot/grub2/grub.cfg diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/01-systemsetup.sh index ecad2f9eef4..8751074cc40 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/01-systemsetup.sh @@ -6,6 +6,7 @@ set -ex +BASEDIR=$(dirname "$0") # shellcheck source=../common/unix/check_and_set_proxy.sh source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" @@ -13,12 +14,9 @@ NTS_IP=10.212.2.216 echo "Set timezone to UTC." sudo timedatectl set-timezone Etc/UTC -echo "Timeout for blanking the screen (0 = never)" -gsettings set org.gnome.desktop.session idle-delay 0 -echo "Prevents screen lock when screesaver goes active." -gsettings set org.gnome.desktop.screensaver lock-enabled false -echo "Disable window animations." -gsettings set org.gnome.desktop.interface enable-animations false + +"$BASEDIR/../common/linux/configure-gnome-shell.sh" + echo "Set grub timeout to 0" sudo sed -i 's|GRUB_TIMEOUT=10|GRUB_TIMEOUT=0|g' /etc/default/grub sudo update-grub diff --git a/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/01-systemsetup.sh index f0288905a2b..169de531886 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/01-systemsetup.sh @@ -6,6 +6,7 @@ set -ex +BASEDIR=$(dirname "$0") # shellcheck source=../common/unix/check_and_set_proxy.sh source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" @@ -13,12 +14,9 @@ NTS_IP=10.212.2.216 echo "Set timezone to UTC." sudo timedatectl set-timezone Etc/UTC -echo "Timeout for blanking the screen (0 = never)" -gsettings set org.gnome.desktop.session idle-delay 0 -echo "Prevents screen lock when screesaver goes active." -gsettings set org.gnome.desktop.screensaver lock-enabled false -echo "Disable window animations." -gsettings set org.gnome.desktop.interface enable-animations false + +"$BASEDIR/../common/linux/configure-gnome-shell.sh" + echo "Set grub timeout to 0" sudo sed -i 's|GRUB_TIMEOUT=10|GRUB_TIMEOUT=0|g' /etc/default/grub sudo update-grub diff --git a/coin/provisioning/qtci-linux-Ubuntu-22.04-aarch64/01-systemsetup.sh b/coin/provisioning/qtci-linux-Ubuntu-22.04-aarch64/01-systemsetup.sh index f0288905a2b..169de531886 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-22.04-aarch64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-22.04-aarch64/01-systemsetup.sh @@ -6,6 +6,7 @@ set -ex +BASEDIR=$(dirname "$0") # shellcheck source=../common/unix/check_and_set_proxy.sh source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" @@ -13,12 +14,9 @@ NTS_IP=10.212.2.216 echo "Set timezone to UTC." sudo timedatectl set-timezone Etc/UTC -echo "Timeout for blanking the screen (0 = never)" -gsettings set org.gnome.desktop.session idle-delay 0 -echo "Prevents screen lock when screesaver goes active." -gsettings set org.gnome.desktop.screensaver lock-enabled false -echo "Disable window animations." -gsettings set org.gnome.desktop.interface enable-animations false + +"$BASEDIR/../common/linux/configure-gnome-shell.sh" + echo "Set grub timeout to 0" sudo sed -i 's|GRUB_TIMEOUT=10|GRUB_TIMEOUT=0|g' /etc/default/grub sudo update-grub diff --git a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/01-systemsetup.sh index f0288905a2b..169de531886 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/01-systemsetup.sh @@ -6,6 +6,7 @@ set -ex +BASEDIR=$(dirname "$0") # shellcheck source=../common/unix/check_and_set_proxy.sh source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" @@ -13,12 +14,9 @@ NTS_IP=10.212.2.216 echo "Set timezone to UTC." sudo timedatectl set-timezone Etc/UTC -echo "Timeout for blanking the screen (0 = never)" -gsettings set org.gnome.desktop.session idle-delay 0 -echo "Prevents screen lock when screesaver goes active." -gsettings set org.gnome.desktop.screensaver lock-enabled false -echo "Disable window animations." -gsettings set org.gnome.desktop.interface enable-animations false + +"$BASEDIR/../common/linux/configure-gnome-shell.sh" + echo "Set grub timeout to 0" sudo sed -i 's|GRUB_TIMEOUT=10|GRUB_TIMEOUT=0|g' /etc/default/grub sudo update-grub diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/01-systemsetup.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/01-systemsetup.sh index f0288905a2b..fdbfe546e9b 100644 --- a/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/01-systemsetup.sh @@ -6,6 +6,7 @@ set -ex +BASEDIR=$(dirname "$0") # shellcheck source=../common/unix/check_and_set_proxy.sh source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" @@ -13,12 +14,12 @@ NTS_IP=10.212.2.216 echo "Set timezone to UTC." sudo timedatectl set-timezone Etc/UTC -echo "Timeout for blanking the screen (0 = never)" -gsettings set org.gnome.desktop.session idle-delay 0 -echo "Prevents screen lock when screesaver goes active." -gsettings set org.gnome.desktop.screensaver lock-enabled false -echo "Disable window animations." -gsettings set org.gnome.desktop.interface enable-animations false + +"$BASEDIR/../common/linux/configure-gnome-shell.sh" + +echo "Disable windows key from showing the GNOME Shell Activities overlay" +gsettings set org.gnome.mutter overlay-key "" + echo "Set grub timeout to 0" sudo sed -i 's|GRUB_TIMEOUT=10|GRUB_TIMEOUT=0|g' /etc/default/grub sudo update-grub diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/01-systemsetup.sh index f0288905a2b..fdbfe546e9b 100644 --- a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/01-systemsetup.sh @@ -6,6 +6,7 @@ set -ex +BASEDIR=$(dirname "$0") # shellcheck source=../common/unix/check_and_set_proxy.sh source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" @@ -13,12 +14,12 @@ NTS_IP=10.212.2.216 echo "Set timezone to UTC." sudo timedatectl set-timezone Etc/UTC -echo "Timeout for blanking the screen (0 = never)" -gsettings set org.gnome.desktop.session idle-delay 0 -echo "Prevents screen lock when screesaver goes active." -gsettings set org.gnome.desktop.screensaver lock-enabled false -echo "Disable window animations." -gsettings set org.gnome.desktop.interface enable-animations false + +"$BASEDIR/../common/linux/configure-gnome-shell.sh" + +echo "Disable windows key from showing the GNOME Shell Activities overlay" +gsettings set org.gnome.mutter overlay-key "" + echo "Set grub timeout to 0" sudo sed -i 's|GRUB_TIMEOUT=10|GRUB_TIMEOUT=0|g' /etc/default/grub sudo update-grub diff --git a/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/01-systemsetup.sh index 1108ba0276d..a2194e2d396 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/01-systemsetup.sh @@ -15,11 +15,11 @@ sudo btrfs quota disable / sed -i '$ a\[Daemon\]\nAutolock=false\nLockOnResume=false' ~/.config/kscreenlockerrc +"$BASEDIR/../common/linux/configure-gnome-shell.sh" + sudo sed -i 's|GRUB_TIMEOUT=8|GRUB_TIMEOUT=0|g' /etc/default/grub sudo grub2-mkconfig -o /boot/grub2/grub.cfg -echo "Disable window animations." -gsettings set org.gnome.desktop.interface enable-animations false echo "Set Network Test Server address to $network_test_server_ip in /etc/hosts" echo "$network_test_server_ip qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts echo "Set DISPLAY" diff --git a/coin/provisioning/qtci-linux-openSUSE-15.4-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-openSUSE-15.4-x86_64/01-systemsetup.sh index d60ccd7f420..61f68eb95a8 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.4-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.4-x86_64/01-systemsetup.sh @@ -15,11 +15,11 @@ sudo btrfs quota disable / sed -i '$ a\[Daemon\]\nAutolock=false\nLockOnResume=false' ~/.config/kscreenlockerrc +"$BASEDIR/../common/linux/configure-gnome-shell.sh" + sudo sed -i 's|GRUB_TIMEOUT=8|GRUB_TIMEOUT=0|g' /etc/default/grub sudo grub2-mkconfig -o /boot/grub2/grub.cfg -echo "Disable window animations." -gsettings set org.gnome.desktop.interface enable-animations false echo "Set Network Test Server address to $network_test_server_ip in /etc/hosts" echo "$network_test_server_ip qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts echo "Set DISPLAY" diff --git a/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/01-systemsetup.sh index 01c8a0483c2..da2900c0167 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/01-systemsetup.sh @@ -14,11 +14,11 @@ sudo btrfs quota disable / sed -i '$ a\[Daemon\]\nAutolock=false\nLockOnResume=false' ~/.config/kscreenlockerrc +"$BASEDIR/../common/linux/configure-gnome-shell.sh" + sudo sed -i 's|GRUB_TIMEOUT=8|GRUB_TIMEOUT=0|g' /etc/default/grub sudo grub2-mkconfig -o /boot/grub2/grub.cfg -echo "Disable window animations." -gsettings set org.gnome.desktop.interface enable-animations false echo "Set Network Test Server address to $network_test_server_ip in /etc/hosts" echo "$network_test_server_ip qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts echo "Set DISPLAY" diff --git a/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/01-systemsetup.sh index 5891a40c222..e5eb34804d3 100644 --- a/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/01-systemsetup.sh @@ -19,8 +19,8 @@ sed -i '$ a\[Daemon\]\nAutolock=false\nLockOnResume=false' ~/.config/kscreenlock sudo sed -i 's|GRUB_TIMEOUT=8|GRUB_TIMEOUT=0|g' /etc/default/grub sudo grub2-mkconfig -o /boot/grub2/grub.cfg -echo "Disable window animations." -gsettings set org.gnome.desktop.interface enable-animations false +"$BASEDIR/../common/linux/configure-gnome-shell.sh" + echo "Set Network Test Server address to $network_test_server_ip in /etc/hosts" echo "$network_test_server_ip qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts echo "Set DISPLAY" From 207ba9b6050d4ecc9b3fdabcbefb1bb6f3f7797c Mon Sep 17 00:00:00 2001 From: Tero Heikkinen Date: Fri, 10 Jan 2025 09:39:34 +0200 Subject: [PATCH 59/75] Linux: Add GCC versions visible in versions.txt Currently only SLES and openSUSE has GCC in versions.txt. Will also make GCC versions visible in Tools and Versions pages. Task-number: QTQAINFRA-5901 Pick-to: 6.8 6.5 Change-Id: I9742c3151e074c503947018a0c7f7c2e0c1077bd Reviewed-by: Ville-Pekka Karhu (cherry picked from commit 5f627786ef640d72c1e71c0fa8c5ce870e8b1052) Reviewed-by: Qt Cherry-pick Bot --- .../qtci-linux-RHEL-8.10-x86_64/04-install-packages.sh | 3 +++ .../qtci-linux-RHEL-8.2-x86_64/04-install-packages.sh | 3 +++ .../qtci-linux-RHEL-8.4-x86_64/04-install-packages.sh | 3 +++ .../qtci-linux-RHEL-8.6-x86_64/04-install-packages.sh | 3 +++ .../qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh | 3 +++ .../qtci-linux-RHEL-9.0-x86_64/04-install-packages.sh | 3 +++ .../qtci-linux-RHEL-9.2-x86_64/04-install-packages.sh | 3 +++ .../qtci-linux-RHEL-9.4-x86_64/04-install-packages.sh | 3 +++ .../qtci-linux-SLES-15_SP4-x86_64/02-zypperpackages.sh | 2 +- .../qtci-linux-SLES-15_SP5-x86_64/02-zypperpackages.sh | 2 +- .../qtci-linux-SLES-15_SP6-x86_64/02-zypperpackages.sh | 2 +- coin/provisioning/qtci-linux-Ubuntu-22.04-aarch64/02-apt.sh | 3 +++ coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh | 3 +++ coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh | 3 +++ coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/02-apt.sh | 3 +++ .../qtci-linux-openSUSE-15.3-x86_64/04-zypperpackages.sh | 2 +- .../qtci-linux-openSUSE-15.4-x86_64/04-zypperpackages.sh | 2 +- .../qtci-linux-openSUSE-15.5-x86_64/04-zypperpackages.sh | 2 +- .../qtci-linux-openSUSE-15.6-x86_64/04-zypperpackages.sh | 2 +- 19 files changed, 43 insertions(+), 7 deletions(-) diff --git a/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/04-install-packages.sh index 7a9509b28e3..82ba2b41485 100644 --- a/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/04-install-packages.sh @@ -176,6 +176,9 @@ sudo python3.11 -m pip install -r "${BASH_SOURCE%/*}/../common/shared/sbom_requi sudo /usr/bin/pip3 install wheel sudo /usr/bin/pip3 install dataclasses +gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)" +echo "GCC = $gccVersion" >> versions.txt + OpenSSLVersion="$(openssl3 version |cut -b 9-14)" echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt diff --git a/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/04-install-packages.sh index 4abf653f53a..0c2422c31e1 100755 --- a/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/04-install-packages.sh @@ -140,5 +140,8 @@ sudo pip3 install virtualenv wheel sudo /usr/bin/pip3 install wheel +gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)" +echo "GCC = $gccVersion" >> versions.txt + OpenSSLVersion="$(openssl version |cut -b 9-14)" echo "OpenSSL = $OpenSSLVersion" >> ~/versions.txt diff --git a/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/04-install-packages.sh index 7057c9f8a92..e24d44d0db2 100755 --- a/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/04-install-packages.sh @@ -152,5 +152,8 @@ sudo python3.8 -m pip install virtualenv wheel sudo /usr/bin/pip3 install wheel +gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)" +echo "GCC = $gccVersion" >> versions.txt + OpenSSLVersion="$(openssl3 version |cut -b 9-14)" echo "OpenSSL = $OpenSSLVersion" >> ~/versions.txt diff --git a/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/04-install-packages.sh index de8b2017fa6..b0d30e444bf 100755 --- a/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/04-install-packages.sh @@ -162,5 +162,8 @@ sudo python3.8 -m pip install virtualenv wheel sudo /usr/bin/pip3 install wheel sudo /usr/bin/pip3 install dataclasses +gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)" +echo "GCC = $gccVersion" >> versions.txt + OpenSSLVersion="$(openssl3 version |cut -b 9-14)" echo "OpenSSL = $OpenSSLVersion" >> ~/versions.txt diff --git a/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh index 14dec198219..ab8903714a7 100755 --- a/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh @@ -177,6 +177,9 @@ sudo /usr/bin/pip3 install wheel sudo /usr/bin/pip3 install dataclasses # No sbom_requirements.txt, because it requires Python 3.9 for poetry_core -> spdx_tools and we have 3.8 +gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)" +echo "GCC = $gccVersion" >> versions.txt + OpenSSLVersion="$(openssl3 version |cut -b 9-14)" echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt diff --git a/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/04-install-packages.sh index 77837171dec..1859acd8426 100755 --- a/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/04-install-packages.sh @@ -166,5 +166,8 @@ sudo /usr/bin/pip3 install wheel # Make FindPython3.cmake to find python3 sudo ln -s /usr/bin/python3 /usr/local/bin/python3 +gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)" +echo "GCC = $gccVersion" >> versions.txt + OpenSSLVersion="$(openssl version |cut -b 9-14)" echo "OpenSSL = $OpenSSLVersion" >> ~/versions.txt diff --git a/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/04-install-packages.sh index 8b1739632c2..32410d861dd 100755 --- a/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/04-install-packages.sh @@ -198,6 +198,9 @@ SetEnvVar "SBOM_PYTHON_APPS_PATH" "/usr/local/bin" # Make FindPython3.cmake to find python3 sudo ln -s /usr/bin/python3 /usr/local/bin/python3 +gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)" +echo "GCC = $gccVersion" >> versions.txt + OpenSSLVersion="$(openssl version |cut -b 9-14)" echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt diff --git a/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/04-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/04-install-packages.sh index 71e7ad8274f..c346dbf4c81 100644 --- a/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/04-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/04-install-packages.sh @@ -200,6 +200,9 @@ SetEnvVar "SBOM_PYTHON_APPS_PATH" "/usr/local/bin" # Make FindPython3.cmake to find python3 sudo ln -s /usr/bin/python3 /usr/local/bin/python3 +gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)" +echo "GCC = $gccVersion" >> versions.txt + OpenSSLVersion="$(openssl version |cut -b 9-14)" echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt diff --git a/coin/provisioning/qtci-linux-SLES-15_SP4-x86_64/02-zypperpackages.sh b/coin/provisioning/qtci-linux-SLES-15_SP4-x86_64/02-zypperpackages.sh index a9fab9bd669..5c492e5f581 100755 --- a/coin/provisioning/qtci-linux-SLES-15_SP4-x86_64/02-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-SLES-15_SP4-x86_64/02-zypperpackages.sh @@ -99,5 +99,5 @@ sudo zypper -nq install nodejs16 # OpenSSL 3 sudo zypper -nq install openssl-3 -gccVersion="$(gcc --version |grep gcc |cut -b 17-23)" +gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)" echo "GCC = $gccVersion" >> versions.txt diff --git a/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/02-zypperpackages.sh b/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/02-zypperpackages.sh index b9747538c32..c6d687a8ca1 100644 --- a/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/02-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/02-zypperpackages.sh @@ -113,7 +113,7 @@ sudo zypper -nq install libtommath-devel # For tst_license.pl with all the machines generating SBOM sudo zypper -nq install perl-JSON -gccVersion="$(gcc --version |grep gcc |cut -b 17-23)" +gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)" echo "GCC = $gccVersion" >> versions.txt OpenSSLVersion="$(openssl-3 version |cut -b 9-14)" diff --git a/coin/provisioning/qtci-linux-SLES-15_SP6-x86_64/02-zypperpackages.sh b/coin/provisioning/qtci-linux-SLES-15_SP6-x86_64/02-zypperpackages.sh index ec53510257f..2a6bfda6753 100644 --- a/coin/provisioning/qtci-linux-SLES-15_SP6-x86_64/02-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-SLES-15_SP6-x86_64/02-zypperpackages.sh @@ -116,7 +116,7 @@ sudo zypper -nq install libtommath-devel # For tst_license.pl with all the machines generating SBOM sudo zypper -nq install perl-JSON -gccVersion="$(gcc --version |grep gcc |cut -b 17-23)" +gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)" echo "GCC = $gccVersion" >> versions.txt OpenSSLVersion="$(openssl version |cut -b 9-14)" diff --git a/coin/provisioning/qtci-linux-Ubuntu-22.04-aarch64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-22.04-aarch64/02-apt.sh index 8395b22ae05..56c4c1a5b0c 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-22.04-aarch64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-22.04-aarch64/02-apt.sh @@ -63,6 +63,9 @@ sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y -o DPkg::Lock::Timeout=300 ins source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" # SetEnvVar "PATH" "/usr/lib/nodejs-mozilla/bin:\$PATH" +gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)" +echo "GCC = $gccVersion" >> versions.txt + OpenSSLVersion="$(openssl version |cut -b 9-14)" echo "OpenSSL = $OpenSSLVersion" >> ~/versions.txt diff --git a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh index cea818c444b..e4dade0d5b3 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh @@ -265,5 +265,8 @@ source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" # hence the explicit assignment to SBOM_PYTHON_APPS_PATH. SetEnvVar "SBOM_PYTHON_APPS_PATH" "/home/qt/.local/bin" +gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)" +echo "GCC = $gccVersion" >> versions.txt + OpenSSLVersion="$(openssl version |cut -b 9-14)" echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh index a87a6e37b11..5f318010b47 100644 --- a/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh @@ -260,5 +260,8 @@ source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" # hence the explicit assignment to SBOM_PYTHON_APPS_PATH. SetEnvVar "SBOM_PYTHON_APPS_PATH" "/home/qt/.local/bin" +gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)" +echo "GCC = $gccVersion" >> versions.txt + OpenSSLVersion="$(openssl version |cut -b 9-14)" echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/02-apt.sh index de40cfeed37..be9d3e0417f 100644 --- a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/02-apt.sh @@ -271,5 +271,8 @@ source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" # hence the explicit assignment to SBOM_PYTHON_APPS_PATH. SetEnvVar "SBOM_PYTHON_APPS_PATH" "/home/qt/.local/bin" +gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)" +echo "GCC = $gccVersion" >> versions.txt + OpenSSLVersion="$(openssl version |cut -b 9-14)" echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt diff --git a/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/04-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/04-zypperpackages.sh index 25bea45b298..3d82dade54c 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/04-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/04-zypperpackages.sh @@ -69,7 +69,7 @@ sudo zypper -nq install autoconf libcurl-devel libexpat-devel # Java sudo zypper -nq install java-17-openjdk -gccVersion="$(gcc --version |grep gcc |cut -b 17-23)" +gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)" echo "GCC = $gccVersion" >> versions.txt OpenSSLVersion="$(openssl version |cut -b 9-14)" diff --git a/coin/provisioning/qtci-linux-openSUSE-15.4-x86_64/04-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-15.4-x86_64/04-zypperpackages.sh index 5ee179e33e6..eab1d584ae1 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.4-x86_64/04-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.4-x86_64/04-zypperpackages.sh @@ -75,7 +75,7 @@ sudo zypper -nq install valgrind-devel # Java sudo zypper -nq install java-17-openjdk -gccVersion="$(gcc --version |grep gcc |cut -b 17-23)" +gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)" echo "GCC = $gccVersion" >> versions.txt OpenSSLVersion="$(openssl-3 version |cut -b 9-14)" diff --git a/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/04-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/04-zypperpackages.sh index 10c0d7de98a..69f3b420d6e 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/04-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/04-zypperpackages.sh @@ -91,7 +91,7 @@ sudo zypper -nq install libtommath-devel # Java sudo zypper -nq install java-17-openjdk -gccVersion="$(gcc --version |grep gcc |cut -b 17-23)" +gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)" echo "GCC = $gccVersion" >> versions.txt OpenSSLVersion="$(openssl-3 version |cut -b 9-14)" diff --git a/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/04-zypperpackages.sh b/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/04-zypperpackages.sh index 1dfb3473365..c2a9641dcf2 100644 --- a/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/04-zypperpackages.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/04-zypperpackages.sh @@ -90,7 +90,7 @@ sudo zypper -nq install java-17-openjdk # For tst_license.pl with all the machines generating SBOM sudo zypper -nq install perl-JSON -gccVersion="$(gcc --version |grep gcc |cut -b 17-23)" +gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)" echo "GCC = $gccVersion" >> versions.txt OpenSSLVersion="$(openssl-3 version |cut -b 9-14)" From ad3f5109f84c356ca0bd6dd6b494b9cb95f8ef48 Mon Sep 17 00:00:00 2001 From: Tero Heikkinen Date: Fri, 24 Jan 2025 13:40:24 +0200 Subject: [PATCH 60/75] Disable Super-key causing windows-overview effect on SLES 15 SP6 (amends 8bec383a8e4ebedca9c359f93549906d8ec70024) Pick-to: 6.8 Task-number: QTBUG-132070 Task-number: QTQAINFRA-6746 Task-number: QTQAINFRA-6745 Change-Id: Iae84ba6dabbc9b9f986b8d3fcf3805549e503704 Reviewed-by: Dimitrios Apostolou (cherry picked from commit 3cbcfb2d52f2e0078d459ab1146d103868772704) Reviewed-by: Qt Cherry-pick Bot --- .../qtci-linux-SLES-15_SP6-x86_64/01-systemsetup.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/coin/provisioning/qtci-linux-SLES-15_SP6-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-SLES-15_SP6-x86_64/01-systemsetup.sh index 32da684442f..096cdeb6829 100644 --- a/coin/provisioning/qtci-linux-SLES-15_SP6-x86_64/01-systemsetup.sh +++ b/coin/provisioning/qtci-linux-SLES-15_SP6-x86_64/01-systemsetup.sh @@ -20,6 +20,9 @@ sudo timedatectl set-timezone Etc/UTC echo "Disable windows key from showing the GNOME Shell Activities overlay" gsettings set org.gnome.mutter overlay-key "" +# Disable windows key from showing the GNOME Shell Activities overlay +gsettings set org.gnome.mutter overlay-key "" + sudo sed -i 's|GRUB_TIMEOUT=8|GRUB_TIMEOUT=0|g' /etc/default/grub sudo grub2-mkconfig -o /boot/grub2/grub.cfg From faa1c2ba7a2dbbff3317f2bdeafae11045c718eb Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 1 Mar 2025 04:26:24 +0000 Subject: [PATCH 61/75] Update submodules on '6.9 in qt/qt5' Change-Id: I2461cc9d2863d9d77c9bfc951fbd0cd95c5a25e4 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qt5compat | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtcharts | 2 +- qtcoap | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgraphs | 2 +- qtgrpc | 2 +- qthttpserver | 2 +- qtimageformats | 2 +- qtlanguageserver | 2 +- qtlocation | 2 +- qtlottie | 2 +- qtmqtt | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtopcua | 2 +- qtpositioning | 2 +- qtquick3d | 2 +- qtquick3dphysics | 2 +- qtquickeffectmaker | 2 +- qtquicktimeline | 2 +- qtremoteobjects | 2 +- qtrepotools | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtshadertools | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- 43 files changed, 43 insertions(+), 43 deletions(-) diff --git a/qt3d b/qt3d index ac8a0f891ae..3dcd1f6b9f6 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit ac8a0f891aec27648f17c878f3bb1ea2aac5abc6 +Subproject commit 3dcd1f6b9f6441416953365e1852fd38801e17ef diff --git a/qt5compat b/qt5compat index db733a992e5..78f02cf1b1c 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit db733a992e52336527a880cddf27fc81695a11ec +Subproject commit 78f02cf1b1c633fc2405e9fff7cea0d892f524c9 diff --git a/qtactiveqt b/qtactiveqt index 432ab8dea80..b817be17328 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 432ab8dea8065141d33f6b73ecde00c61a01083c +Subproject commit b817be173281eab404f96f00e65f792625dd6256 diff --git a/qtbase b/qtbase index 22f33e1bd2c..37c60080dde 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 22f33e1bd2c43e0223cd52b94e6ecead56a2e1b5 +Subproject commit 37c60080ddedb339089e7bccaf25e360c7b3ebb8 diff --git a/qtcharts b/qtcharts index 90fe26d9eb4..8eb789a55ee 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 90fe26d9eb494592815422211b1a1e4c36b2bdb1 +Subproject commit 8eb789a55eed6d04c03f97adfd00dbc43e306879 diff --git a/qtcoap b/qtcoap index 3af6bfeb034..0f887ed8c61 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit 3af6bfeb034c9212f320e703636737cb66ef7529 +Subproject commit 0f887ed8c61cfb11130633c7cc77a88bc195762a diff --git a/qtconnectivity b/qtconnectivity index 8028ed2bf32..62067e329cb 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 8028ed2bf32b10bd3e18cfc6d4293cdf6f8cffa5 +Subproject commit 62067e329cb7185da9779c131d2868c75670eb57 diff --git a/qtdatavis3d b/qtdatavis3d index 6ee3dd2b492..63f3570365d 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 6ee3dd2b492331ff063f7c83c1bcda41691b57ee +Subproject commit 63f3570365d27296077adeb2a4fe6abe13aff6d6 diff --git a/qtdeclarative b/qtdeclarative index 2757053dedf..a9f651c39fd 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 2757053dedfa5f4de715860f913ce4e0c947d323 +Subproject commit a9f651c39fd9f78297b2098da0f66420c1fb1613 diff --git a/qtdoc b/qtdoc index c3acff86cc2..a37d601928e 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit c3acff86cc2089f5a72663030f6887beac8d9ceb +Subproject commit a37d601928e8d91b9e0d6e79bbeaf2c6d5aa6e8a diff --git a/qtgraphs b/qtgraphs index aefe80c95d4..08c2558e84e 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit aefe80c95d4289f087a9ad330dd6e3db6a107fbd +Subproject commit 08c2558e84eb50aefd70b3c3bc1bfbb88d1f5e6a diff --git a/qtgrpc b/qtgrpc index 286ef191517..d85966713cf 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit 286ef191517868633664d7b1b84f92a053332204 +Subproject commit d85966713cf47b0d5254eb86544ba3e20c79f0b1 diff --git a/qthttpserver b/qthttpserver index 7316ebf24c5..2de0075f823 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit 7316ebf24c5a2306a0335f735c3a92f4a182a591 +Subproject commit 2de0075f8235ac5f8f4b6618ae965efd1d9ec77c diff --git a/qtimageformats b/qtimageformats index ac7f9af5378..7497c57a847 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit ac7f9af537885ffd428f6a8d9ba15ee7b1c41420 +Subproject commit 7497c57a8479649d269dbd2a40fc16b2277f2713 diff --git a/qtlanguageserver b/qtlanguageserver index 0ed776dd418..ea986b6c4a2 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit 0ed776dd418e40f8a95ee667e7045a47f1cb2d16 +Subproject commit ea986b6c4a2d8b6538880a3b12f7bcbf703217d7 diff --git a/qtlocation b/qtlocation index 9b2de27789b..19d65f5f1d4 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 9b2de27789b219949cff7d2a2c45b6469dd671f1 +Subproject commit 19d65f5f1d446053f04d97b40954ad09d415cc6a diff --git a/qtlottie b/qtlottie index 698dd95f2d9..1f1447032ab 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 698dd95f2d999acfa9160ff4138de712671481dc +Subproject commit 1f1447032abae25bdeda64c030dedefcbca0d0a2 diff --git a/qtmqtt b/qtmqtt index 2310f368fb8..c1553028925 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit 2310f368fb8f137ae1dcf26c0d28bb153c7874c0 +Subproject commit c1553028925269fd3f03caafef70ad5912b0e20d diff --git a/qtmultimedia b/qtmultimedia index fdf40af34b7..6e3e977975c 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit fdf40af34b77e59edbe1242b67852dc7ff4f2191 +Subproject commit 6e3e977975c4cd91a9d1954cd341f142e7cb6022 diff --git a/qtnetworkauth b/qtnetworkauth index b2f0d40bf1f..e1f17be862e 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit b2f0d40bf1f508e1e7a095a32cce3f6f8a7c7096 +Subproject commit e1f17be862ece42d9ec55aa7d657dc1088498973 diff --git a/qtopcua b/qtopcua index df46e6c3c92..17538c5f0aa 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit df46e6c3c92ed67c90996b160fd1fb7f51e3634c +Subproject commit 17538c5f0aaeadfebc2a433ab336e4c183d9bbc4 diff --git a/qtpositioning b/qtpositioning index db11ce3ac20..9df96e7fd70 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit db11ce3ac203e9891388756abc178d52e8375911 +Subproject commit 9df96e7fd701356cca0993d1c56c3fe9109c2a83 diff --git a/qtquick3d b/qtquick3d index 94139eafc4f..6d96ecd964d 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 94139eafc4f46ef6c44a69cb19d80646ecdd47d0 +Subproject commit 6d96ecd964db3e98134c0f1d258517a9362fdf89 diff --git a/qtquick3dphysics b/qtquick3dphysics index 511f591a6eb..44851b815fa 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit 511f591a6ebf226d83b1afd707b77ba227c775c5 +Subproject commit 44851b815fa282407132bd55af3d64da68b61ae7 diff --git a/qtquickeffectmaker b/qtquickeffectmaker index 6e319e82c0e..391cfe29b93 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit 6e319e82c0e4ad3f26d717c17842411198166251 +Subproject commit 391cfe29b93fa0c2fb871636e937747826f32776 diff --git a/qtquicktimeline b/qtquicktimeline index 8661e5daaf1..9e06d193160 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 8661e5daaf100cca6b3e13f88c2648e54573ec8f +Subproject commit 9e06d193160f3522013bb095b1adf416964b2ed8 diff --git a/qtremoteobjects b/qtremoteobjects index 596ad5d6084..c73e28655e4 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 596ad5d6084a2a4df0afb7a7dee42cf9e2c9f433 +Subproject commit c73e28655e45ebad9b06f2e5d344b8e511520138 diff --git a/qtrepotools b/qtrepotools index c29a3c2801d..0838a754346 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit c29a3c2801d99b128ab68aab6a829d96c231d281 +Subproject commit 0838a754346966c629c575158873fdc779e0060b diff --git a/qtscxml b/qtscxml index 825e012f4c6..f28222eaa0f 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 825e012f4c6bb57692b7281639060fcd848a6ed9 +Subproject commit f28222eaa0ffae69313da745eb8ca78b74f76627 diff --git a/qtsensors b/qtsensors index 8190b6d330c..562eea02c70 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 8190b6d330ce76b531ef58952a3c122603d88911 +Subproject commit 562eea02c70f27ea098a9378126ce97bd99f2151 diff --git a/qtserialbus b/qtserialbus index 3716466f8d2..1a225251563 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 3716466f8d20d64fdbc444be31caa49683af14ed +Subproject commit 1a225251563aa05755cd6fd5b13eb0752bf37f8b diff --git a/qtserialport b/qtserialport index 9bdbffa86c2..30c6b9d7c74 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 9bdbffa86c236fcd06c492adcfe4938e9faa02e7 +Subproject commit 30c6b9d7c7401e130a82e97799ca3f1f346aa71d diff --git a/qtshadertools b/qtshadertools index a946feeede7..ebe040eab52 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit a946feeede746e052be01f386506bcaf851b3890 +Subproject commit ebe040eab520a20c627acf4e755fd4127727e202 diff --git a/qtspeech b/qtspeech index ec2605db3e1..db4403786ac 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit ec2605db3e1677436b91ea66d19edee8ceb0e234 +Subproject commit db4403786ac6c885c5ac8ee99d1f491b5f4decf8 diff --git a/qtsvg b/qtsvg index 5f1e8ab8030..988bff355e0 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 5f1e8ab80308f914236aaed8d2a360a71cf60130 +Subproject commit 988bff355e05d0f6a41c9949de6858998cd833e1 diff --git a/qttools b/qttools index e0b7124fcce..ff3e6cdcca4 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit e0b7124fccec6c1cd41dd6d46fd282d42e994257 +Subproject commit ff3e6cdcca40f0c517dcaaf277e062c297794ab9 diff --git a/qttranslations b/qttranslations index 84dd7fb846e..cc917f8b305 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 84dd7fb846e8385017e64eb5b2a082004700a1dd +Subproject commit cc917f8b305a415b548e61a8b113befeb113ff47 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 55afbd8925c..18656697fb0 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 55afbd8925c5e16867752c6738c3b018cee2148a +Subproject commit 18656697fb0a0545cbee0fb8dde42bd4ca55c922 diff --git a/qtwayland b/qtwayland index 5e8515fe5e1..b84b1d81329 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 5e8515fe5e18b3fc1b5f7945da49a2da74165d72 +Subproject commit b84b1d8132942a0f0a64bd728cb2b00fa142afd2 diff --git a/qtwebchannel b/qtwebchannel index d5b59b26337..bbd575e591a 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit d5b59b2633725ecf156c1db83d1b588705ba46e5 +Subproject commit bbd575e591aee1974b6a63803cba6a224406f8fc diff --git a/qtwebengine b/qtwebengine index 65d8d8e5c6d..d7351efec5b 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 65d8d8e5c6da07d3f015eaa6d93fe27846af53af +Subproject commit d7351efec5bc3d6297b2bc7d6c12d8868510e125 diff --git a/qtwebsockets b/qtwebsockets index 27f126ff0db..1818eeb3cae 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 27f126ff0dba67eb51c30c92253396fa4c8a8962 +Subproject commit 1818eeb3cae48f0bca059a275cf2d023cb2e2c08 diff --git a/qtwebview b/qtwebview index e6502616628..d5ebd8b9e11 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit e65026166289be9917dcb86cbeed9bf1af3067a2 +Subproject commit d5ebd8b9e1140788c7d9d37217eef9ab68f3272e From da35483fb0c7bd1ef1b9bf9d2bf2763ef0bb1d87 Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Mon, 3 Mar 2025 05:55:05 +0000 Subject: [PATCH 62/75] Adjust submodule branches Change-Id: I36d9acb7a7db1ce98451638a84d76793044be0df --- .gitmodules | 86 ++++++++++++++++++++++++++--------------------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/.gitmodules b/.gitmodules index 621a5cd7592..57d732587d0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,40 +1,40 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 6.9 + branch = 6.9.0 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = 6.9 + branch = 6.9.0 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtimageformats qtshadertools qtsvg qtlanguageserver path = qtdeclarative url = ../qtdeclarative.git - branch = 6.9 + branch = 6.9.0 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = 6.9 + branch = 6.9.0 status = addon [submodule "qtmultimedia"] depends = qtbase qtshadertools recommends = qtdeclarative qtquick3d path = qtmultimedia url = ../qtmultimedia.git - branch = 6.9 + branch = 6.9.0 status = addon [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt path = qttools url = ../qttools.git - branch = 6.9 + branch = 6.9.0 status = essential [submodule "qtxmlpatterns"] depends = qtbase @@ -47,7 +47,7 @@ depends = qttools path = qttranslations url = ../qttranslations.git - branch = 6.9 + branch = 6.9.0 status = essential priority = 30 [submodule "qtdoc"] @@ -55,7 +55,7 @@ recommends = qtmultimedia qtshadertools qtwebengine path = qtdoc url = ../qtdoc.git - branch = 6.9 + branch = 6.9.0 status = essential priority = 40 [submodule "qtrepotools"] @@ -68,7 +68,7 @@ depends = qtbase path = qtqa url = ../qtqa.git - branch = 6.9 + branch = 6.9.0 status = essential priority = 50 [submodule "qtlocation"] @@ -76,21 +76,21 @@ recommends = qtdeclarative path = qtlocation url = ../qtlocation.git - branch = 6.9 + branch = 6.9.0 status = preview [submodule "qtpositioning"] depends = qtbase recommends = qtdeclarative qtserialport path = qtpositioning url = ../qtpositioning.git - branch = 6.9 + branch = 6.9.0 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = 6.9 + branch = 6.9.0 status = addon [submodule "qtsystems"] depends = qtbase @@ -117,61 +117,61 @@ recommends = qtdeclarative path = qtconnectivity url = ../qtconnectivity.git - branch = 6.9 + branch = 6.9.0 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = 6.9 + branch = 6.9.0 status = addon [submodule "qt3d"] depends = qtbase recommends = qtdeclarative qtshadertools qtmultimedia path = qt3d url = ../qt3d.git - branch = 6.9 + branch = 6.9.0 status = deprecated [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = 6.9 + branch = 6.9.0 status = addon [submodule "qtserialbus"] depends = qtbase recommends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 6.9 + branch = 6.9.0 status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = 6.9 + branch = 6.9.0 status = addon [submodule "qtwebsockets"] depends = qtbase recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = 6.9 + branch = 6.9.0 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = 6.9 + branch = 6.9.0 status = addon [submodule "qtwebengine"] depends = qtdeclarative recommends = qtwebchannel qttools qtpositioning path = qtwebengine url = ../qtwebengine.git - branch = 6.9 + branch = 6.9.0 status = addon priority = 10 [submodule "qtcanvas3d"] @@ -185,28 +185,28 @@ recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = 6.9 + branch = 6.9.0 status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = 6.9 + branch = 6.9.0 status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = 6.9 + branch = 6.9.0 status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = 6.9 + branch = 6.9.0 status = addon [submodule "qtgamepad"] depends = qtbase @@ -219,27 +219,27 @@ depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml.git - branch = 6.9 + branch = 6.9.0 status = addon [submodule "qtspeech"] depends = qtbase qtmultimedia recommends = qtdeclarative path = qtspeech url = ../qtspeech.git - branch = 6.9 + branch = 6.9.0 status = addon [submodule "qtnetworkauth"] depends = qtbase path = qtnetworkauth url = ../qtnetworkauth.git - branch = 6.9 + branch = 6.9.0 status = addon [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative path = qtremoteobjects url = ../qtremoteobjects.git - branch = 6.9 + branch = 6.9.0 status = addon [submodule "qtwebglplugin"] depends = qtbase qtwebsockets @@ -252,88 +252,88 @@ depends = qtbase qtdeclarative path = qtlottie url = ../qtlottie.git - branch = 6.9 + branch = 6.9.0 status = addon [submodule "qtquicktimeline"] depends = qtbase qtdeclarative path = qtquicktimeline url = ../qtquicktimeline - branch = 6.9 + branch = 6.9.0 status = addon [submodule "qtquick3d"] depends = qtbase qtdeclarative qtshadertools recommends = qtquicktimeline path = qtquick3d url = ../qtquick3d.git - branch = 6.9 + branch = 6.9.0 status = addon [submodule "qtshadertools"] depends = qtbase path = qtshadertools url = ../qtshadertools.git - branch = 6.9 + branch = 6.9.0 status = addon [submodule "qt5compat"] depends = qtbase qtdeclarative path = qt5compat url = ../qt5compat.git - branch = 6.9 + branch = 6.9.0 status = deprecated [submodule "qtcoap"] depends = qtbase path = qtcoap url = ../qtcoap.git - branch = 6.9 + branch = 6.9.0 status = addon [submodule "qtmqtt"] depends = qtbase qtdeclarative recommends = qtwebsockets path = qtmqtt url = ../qtmqtt.git - branch = 6.9 + branch = 6.9.0 status = addon [submodule "qtopcua"] depends = qtbase qtdeclarative path = qtopcua url = ../qtopcua.git - branch = 6.9 + branch = 6.9.0 status = addon [submodule "qtlanguageserver"] depends = qtbase path = qtlanguageserver url = ../qtlanguageserver.git - branch = 6.9 + branch = 6.9.0 status = preview [submodule "qthttpserver"] depends = qtbase recommends = qtwebsockets path = qthttpserver url = ../qthttpserver.git - branch = 6.9 + branch = 6.9.0 status = addon [submodule "qtquick3dphysics"] depends = qtbase qtdeclarative qtquick3d qtshadertools path = qtquick3dphysics url = ../qtquick3dphysics.git - branch = 6.9 + branch = 6.9.0 status = addon [submodule "qtgrpc"] depends = qtbase recommends = qtdeclarative path = qtgrpc url = ../qtgrpc.git - branch = 6.9 + branch = 6.9.0 status = addon [submodule "qtquickeffectmaker"] depends = qtbase qtdeclarative qtshadertools recommends = qtquick3d path = qtquickeffectmaker url = ../qtquickeffectmaker.git - branch = 6.9 + branch = 6.9.0 status = addon [submodule "qtgraphs"] depends = qtbase qtdeclarative qtquick3d path = qtgraphs url = ../qtgraphs.git - branch = 6.9 + branch = 6.9.0 status = addon From 9babd801690fea67028dcb1ee0be68c357f41b06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Fri, 10 Jan 2025 14:39:08 +0200 Subject: [PATCH 63/75] COIN: Add Debian packaging config for Debian 12 Pick-to: dev 6.9 6.8 Change-Id: Ifaf0db9b9d39c6e66003e34e6c19957b60d0289f Reviewed-by: Jani Heikkinen --- coin/platform_configs/cmake_platforms.yaml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 091b56b6250..b22e660cc08 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -299,7 +299,19 @@ Configurations: 'COIN_EXTRA_DEBIAN_REPO=deb http://archive.ubuntu.com/ubuntu/ jammy main universe multiverse', 'COIN_SKIP_DEBIAN_MODULES=qt5 qtqa qtactiveqt qtdoc qtwebengine qtwebview', ] - +- + Id: 'bookworm-gles-arm64-debian-pkg-packaging' + Template: 'qtci-linux-Debian-11.6-aarch64-50' + Compiler: 'GCC' + Features: ['Packaging','DebianPackaging','DisableTests', 'Insignificant'] + Environment variables: [ + 'DEBIAN_RULES_REF=6.9_gles', + 'COIN_TARGET_DIST=tqtc-bookworm', + 'COIN_EXTRA_DEBIAN_PACKAGES={{.Env.HOME}}/debian_packages/', + 'COIN_SBUILD_CHROOT=stable-arm64-sbuild', + 'COIN_EXTRA_DEBIAN_REPO=deb http://deb.debian.org/debian/ bookworm main', + 'COIN_SKIP_DEBIAN_MODULES=qt5 qtqa qtactiveqt qtdoc qtwebengine qtwebview', + ] - # This configuration runs for every submodule, using externally # built qdoc and qattributionscanner binaries, to ensure that no From 42772064c5f6bb12b311b18b575911ef4af4c27c Mon Sep 17 00:00:00 2001 From: Timur Pocheptsov Date: Tue, 4 Mar 2025 12:51:43 +0100 Subject: [PATCH 64/75] install-ffmpeg-ios.sh: use a proper dylib regexp MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit To fix only names of FFmpeg frameworks, not system libraries/dylibs. Fixes: QTBUG-134289 Change-Id: I74ef7700549abdccbe569ecd5d8e780fefca6e11 Reviewed-by: Simo Fält --- coin/provisioning/common/unix/install-ffmpeg-ios.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/coin/provisioning/common/unix/install-ffmpeg-ios.sh b/coin/provisioning/common/unix/install-ffmpeg-ios.sh index 806a01f4185..dbcc6c4bfa5 100755 --- a/coin/provisioning/common/unix/install-ffmpeg-ios.sh +++ b/coin/provisioning/common/unix/install-ffmpeg-ios.sh @@ -19,6 +19,7 @@ ffmpeg_name="FFmpeg-$version" target_dir="$HOME" ffmpeg_source_dir="$target_dir/$ffmpeg_name" prefix="/usr/local/ios/ffmpeg" +dylib_regex="^@rpath/.*\.dylib$" if [ ! -d "$ffmpeg_source_dir" ]; then From 6498e80ba0c91d3e9005413b186743dcbcea243b Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 5 Mar 2025 17:28:32 +0000 Subject: [PATCH 65/75] Update submodules on '6.9.0 in qt/qt5' Change-Id: I88cdf1a3d61154f18b7d76c8a53d1fc7a4119e0a Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qt5compat | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtcharts | 2 +- qtcoap | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgraphs | 2 +- qtgrpc | 2 +- qthttpserver | 2 +- qtimageformats | 2 +- qtlanguageserver | 2 +- qtlocation | 2 +- qtlottie | 2 +- qtmqtt | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtopcua | 2 +- qtpositioning | 2 +- qtquick3d | 2 +- qtquick3dphysics | 2 +- qtquickeffectmaker | 2 +- qtquicktimeline | 2 +- qtremoteobjects | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtshadertools | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- 42 files changed, 42 insertions(+), 42 deletions(-) diff --git a/qt3d b/qt3d index 3dcd1f6b9f6..a0944bd7cf4 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 3dcd1f6b9f6441416953365e1852fd38801e17ef +Subproject commit a0944bd7cf4d490ca3e3df2c4a94bdb6e3d8c1aa diff --git a/qt5compat b/qt5compat index 78f02cf1b1c..ff9203c6dce 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 78f02cf1b1c633fc2405e9fff7cea0d892f524c9 +Subproject commit ff9203c6dce77d03b0704026180cc1d476e94abe diff --git a/qtactiveqt b/qtactiveqt index b817be17328..9060ef4f4d7 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit b817be173281eab404f96f00e65f792625dd6256 +Subproject commit 9060ef4f4d7215e1c359ead63ec5067a08e87ce1 diff --git a/qtbase b/qtbase index 37c60080dde..a234b472d7b 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 37c60080ddedb339089e7bccaf25e360c7b3ebb8 +Subproject commit a234b472d7bab8eda218ff5644ccee8b2011ee60 diff --git a/qtcharts b/qtcharts index 8eb789a55ee..5d475b433ea 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 8eb789a55eed6d04c03f97adfd00dbc43e306879 +Subproject commit 5d475b433ea053e68cbfccbe0b09bf538fc22a94 diff --git a/qtcoap b/qtcoap index 0f887ed8c61..872b265a5eb 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit 0f887ed8c61cfb11130633c7cc77a88bc195762a +Subproject commit 872b265a5eb4bf9d5e47e9dd99cfa74dfef1f506 diff --git a/qtconnectivity b/qtconnectivity index 62067e329cb..25f2722a9b4 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 62067e329cb7185da9779c131d2868c75670eb57 +Subproject commit 25f2722a9b47f68db7c3b0fa88b101781bf2f502 diff --git a/qtdatavis3d b/qtdatavis3d index 63f3570365d..56d74bed6fc 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 63f3570365d27296077adeb2a4fe6abe13aff6d6 +Subproject commit 56d74bed6fc5a3974c5bcc2ee4182db8e134a252 diff --git a/qtdeclarative b/qtdeclarative index a9f651c39fd..4c3584e2256 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit a9f651c39fd9f78297b2098da0f66420c1fb1613 +Subproject commit 4c3584e22563e268e7beb97d592612d8254cfb87 diff --git a/qtdoc b/qtdoc index a37d601928e..aae7b07c58d 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit a37d601928e8d91b9e0d6e79bbeaf2c6d5aa6e8a +Subproject commit aae7b07c58d9f2b14ce29e2de77d9040b189e11a diff --git a/qtgraphs b/qtgraphs index 08c2558e84e..c77ca2c7985 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit 08c2558e84eb50aefd70b3c3bc1bfbb88d1f5e6a +Subproject commit c77ca2c79854711e77950ec364b5ed00d1bfddf9 diff --git a/qtgrpc b/qtgrpc index d85966713cf..ca702d7e313 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit d85966713cf47b0d5254eb86544ba3e20c79f0b1 +Subproject commit ca702d7e3130876dda827460d3b3fea6d2b977c0 diff --git a/qthttpserver b/qthttpserver index 2de0075f823..6aef7225570 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit 2de0075f8235ac5f8f4b6618ae965efd1d9ec77c +Subproject commit 6aef72255704e9721bb5dbc530e808554d207195 diff --git a/qtimageformats b/qtimageformats index 7497c57a847..ff139b9b8f1 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 7497c57a8479649d269dbd2a40fc16b2277f2713 +Subproject commit ff139b9b8f1fe653a2371a70e62c984e676b311a diff --git a/qtlanguageserver b/qtlanguageserver index ea986b6c4a2..e2809763aed 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit ea986b6c4a2d8b6538880a3b12f7bcbf703217d7 +Subproject commit e2809763aed09b9c86af0091027d4d7559355880 diff --git a/qtlocation b/qtlocation index 19d65f5f1d4..11913987880 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 19d65f5f1d446053f04d97b40954ad09d415cc6a +Subproject commit 11913987880f97247207e69f68a819dd2400736c diff --git a/qtlottie b/qtlottie index 1f1447032ab..247add153d2 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 1f1447032abae25bdeda64c030dedefcbca0d0a2 +Subproject commit 247add153d2d80631d32ff656f2e538db0c31d67 diff --git a/qtmqtt b/qtmqtt index c1553028925..13f5956040b 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit c1553028925269fd3f03caafef70ad5912b0e20d +Subproject commit 13f5956040bf6afed102f50739b0ce7b28166c56 diff --git a/qtmultimedia b/qtmultimedia index 6e3e977975c..20298e73a55 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 6e3e977975c4cd91a9d1954cd341f142e7cb6022 +Subproject commit 20298e73a555349536e94bb7e899bc415e20b7ce diff --git a/qtnetworkauth b/qtnetworkauth index e1f17be862e..8131caf75fa 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit e1f17be862ece42d9ec55aa7d657dc1088498973 +Subproject commit 8131caf75fa24366b4830dc17f8477986a01ea6b diff --git a/qtopcua b/qtopcua index 17538c5f0aa..0717e163c85 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit 17538c5f0aaeadfebc2a433ab336e4c183d9bbc4 +Subproject commit 0717e163c85ba41ffdc031128f2a5ca4f671db85 diff --git a/qtpositioning b/qtpositioning index 9df96e7fd70..4444cf04c45 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit 9df96e7fd701356cca0993d1c56c3fe9109c2a83 +Subproject commit 4444cf04c4527b7b28e2d1ae76b17e6714719943 diff --git a/qtquick3d b/qtquick3d index 6d96ecd964d..4828a5d5d62 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 6d96ecd964db3e98134c0f1d258517a9362fdf89 +Subproject commit 4828a5d5d627fcc404a378131f176067f0ac5b6e diff --git a/qtquick3dphysics b/qtquick3dphysics index 44851b815fa..bd59fd24499 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit 44851b815fa282407132bd55af3d64da68b61ae7 +Subproject commit bd59fd244997f721e8b49be0daf6188a1cf05687 diff --git a/qtquickeffectmaker b/qtquickeffectmaker index 391cfe29b93..c91f2e022ca 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit 391cfe29b93fa0c2fb871636e937747826f32776 +Subproject commit c91f2e022ca378f7861967ff9ddcb5911a11e4d0 diff --git a/qtquicktimeline b/qtquicktimeline index 9e06d193160..f35caf37a13 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 9e06d193160f3522013bb095b1adf416964b2ed8 +Subproject commit f35caf37a13adb16a064a7d10732ada1322dee9b diff --git a/qtremoteobjects b/qtremoteobjects index c73e28655e4..927021c6c02 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit c73e28655e45ebad9b06f2e5d344b8e511520138 +Subproject commit 927021c6c021f48918e594786fe25ad7d15ca176 diff --git a/qtscxml b/qtscxml index f28222eaa0f..6638a8518d4 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit f28222eaa0ffae69313da745eb8ca78b74f76627 +Subproject commit 6638a8518d4431e25511ab2e8849836ea835fe2d diff --git a/qtsensors b/qtsensors index 562eea02c70..cd8104cd625 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 562eea02c70f27ea098a9378126ce97bd99f2151 +Subproject commit cd8104cd62588668015c83a30cb6aa2f5f8f683b diff --git a/qtserialbus b/qtserialbus index 1a225251563..73d6abc2625 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 1a225251563aa05755cd6fd5b13eb0752bf37f8b +Subproject commit 73d6abc26254b087073078816b6e4d26c199b321 diff --git a/qtserialport b/qtserialport index 30c6b9d7c74..2db1dc6c207 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 30c6b9d7c7401e130a82e97799ca3f1f346aa71d +Subproject commit 2db1dc6c2076d10447aabe7a943cd333e8b884e7 diff --git a/qtshadertools b/qtshadertools index ebe040eab52..cbbb2d43c0e 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit ebe040eab520a20c627acf4e755fd4127727e202 +Subproject commit cbbb2d43c0e2d58a92086630db06c7a1b1725f00 diff --git a/qtspeech b/qtspeech index db4403786ac..c6b66dcd81b 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit db4403786ac6c885c5ac8ee99d1f491b5f4decf8 +Subproject commit c6b66dcd81bee269511783ed21a062f21df6a771 diff --git a/qtsvg b/qtsvg index 988bff355e0..b182de99c6d 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 988bff355e05d0f6a41c9949de6858998cd833e1 +Subproject commit b182de99c6daa24b762f5da3b08080570df684a5 diff --git a/qttools b/qttools index ff3e6cdcca4..caab1708719 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit ff3e6cdcca40f0c517dcaaf277e062c297794ab9 +Subproject commit caab17087199de67a1bd55363ad31bcb1b1a23af diff --git a/qttranslations b/qttranslations index cc917f8b305..851011d3363 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit cc917f8b305a415b548e61a8b113befeb113ff47 +Subproject commit 851011d3363ced32cd208c6b8aa854847f543707 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 18656697fb0..e648ddcb70f 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 18656697fb0a0545cbee0fb8dde42bd4ca55c922 +Subproject commit e648ddcb70f6636809ab2624af9063ff401867fe diff --git a/qtwayland b/qtwayland index b84b1d81329..dc564e7b835 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit b84b1d8132942a0f0a64bd728cb2b00fa142afd2 +Subproject commit dc564e7b835282c6bcf817377953681aa4551a03 diff --git a/qtwebchannel b/qtwebchannel index bbd575e591a..d2459815509 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit bbd575e591aee1974b6a63803cba6a224406f8fc +Subproject commit d24598155092a4a6f1568f191d87ce1a7c0d60e5 diff --git a/qtwebengine b/qtwebengine index d7351efec5b..4b9be7f5f92 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit d7351efec5bc3d6297b2bc7d6c12d8868510e125 +Subproject commit 4b9be7f5f9211b354fca2b7393f829bf6e82208d diff --git a/qtwebsockets b/qtwebsockets index 1818eeb3cae..58c84619b03 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 1818eeb3cae48f0bca059a275cf2d023cb2e2c08 +Subproject commit 58c84619b034e11a37b8f91c795a2a8b81febe28 diff --git a/qtwebview b/qtwebview index d5ebd8b9e11..ec13e64e834 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit d5ebd8b9e1140788c7d9d37217eef9ab68f3272e +Subproject commit ec13e64e83452c01948091621586954e7687cc10 From 4490f928ea71261538aae324b6dbfef838179093 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 10 Mar 2025 03:39:55 +0000 Subject: [PATCH 66/75] Update submodules on '6.9.0 in qt/qt5' Change-Id: I9c66c19a31fbcbd766e755e730a9a1d97a9b9e1d Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qt5compat | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtcharts | 2 +- qtcoap | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgraphs | 2 +- qtgrpc | 2 +- qthttpserver | 2 +- qtimageformats | 2 +- qtlanguageserver | 2 +- qtlocation | 2 +- qtlottie | 2 +- qtmqtt | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtopcua | 2 +- qtpositioning | 2 +- qtquick3d | 2 +- qtquick3dphysics | 2 +- qtquickeffectmaker | 2 +- qtquicktimeline | 2 +- qtremoteobjects | 2 +- qtrepotools | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtshadertools | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- 43 files changed, 43 insertions(+), 43 deletions(-) diff --git a/qt3d b/qt3d index a0944bd7cf4..92f59ae2ab8 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit a0944bd7cf4d490ca3e3df2c4a94bdb6e3d8c1aa +Subproject commit 92f59ae2ab8a1c80062a3c95130de03b936e0ea1 diff --git a/qt5compat b/qt5compat index ff9203c6dce..0da2895bf12 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit ff9203c6dce77d03b0704026180cc1d476e94abe +Subproject commit 0da2895bf12e05aa2265c0543581ac9e93d9ca22 diff --git a/qtactiveqt b/qtactiveqt index 9060ef4f4d7..951409256f0 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 9060ef4f4d7215e1c359ead63ec5067a08e87ce1 +Subproject commit 951409256f0b73cd94d250e44b9ea33610c879f8 diff --git a/qtbase b/qtbase index a234b472d7b..54555755f87 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit a234b472d7bab8eda218ff5644ccee8b2011ee60 +Subproject commit 54555755f8780e4e7c665a1502309da9fa807066 diff --git a/qtcharts b/qtcharts index 5d475b433ea..d6e3189c156 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 5d475b433ea053e68cbfccbe0b09bf538fc22a94 +Subproject commit d6e3189c1563af4eb24dcb7064a462cb9fd34762 diff --git a/qtcoap b/qtcoap index 872b265a5eb..6dfc215a167 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit 872b265a5eb4bf9d5e47e9dd99cfa74dfef1f506 +Subproject commit 6dfc215a167b991bbc920497ab66811a8875de25 diff --git a/qtconnectivity b/qtconnectivity index 25f2722a9b4..125d114597c 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 25f2722a9b47f68db7c3b0fa88b101781bf2f502 +Subproject commit 125d114597c5f248b442699173a5ef89397240af diff --git a/qtdatavis3d b/qtdatavis3d index 56d74bed6fc..e0193b6b925 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 56d74bed6fc5a3974c5bcc2ee4182db8e134a252 +Subproject commit e0193b6b9253946490da3d731f1c88b80fe3af1c diff --git a/qtdeclarative b/qtdeclarative index 4c3584e2256..47fc3baf9b1 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 4c3584e22563e268e7beb97d592612d8254cfb87 +Subproject commit 47fc3baf9b16f988f34c8f63b5da3e681413412b diff --git a/qtdoc b/qtdoc index aae7b07c58d..9e335919c21 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit aae7b07c58d9f2b14ce29e2de77d9040b189e11a +Subproject commit 9e335919c210e2b55b39d797a67ac023d4d4e1c5 diff --git a/qtgraphs b/qtgraphs index c77ca2c7985..af49b7ff26b 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit c77ca2c79854711e77950ec364b5ed00d1bfddf9 +Subproject commit af49b7ff26bced62c4c35f786b83c816cd303dd7 diff --git a/qtgrpc b/qtgrpc index ca702d7e313..3837c6c375c 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit ca702d7e3130876dda827460d3b3fea6d2b977c0 +Subproject commit 3837c6c375c885759c3b0a0cc1ad017deb5f1a36 diff --git a/qthttpserver b/qthttpserver index 6aef7225570..b708b7dcf3b 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit 6aef72255704e9721bb5dbc530e808554d207195 +Subproject commit b708b7dcf3bd9cf1686326294bba0f25037f257f diff --git a/qtimageformats b/qtimageformats index ff139b9b8f1..53e49eef4ee 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit ff139b9b8f1fe653a2371a70e62c984e676b311a +Subproject commit 53e49eef4ee995ff657bf14030c2d48a67358eb7 diff --git a/qtlanguageserver b/qtlanguageserver index e2809763aed..87803dca301 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit e2809763aed09b9c86af0091027d4d7559355880 +Subproject commit 87803dca30173d655d490ad201643ff279746e8f diff --git a/qtlocation b/qtlocation index 11913987880..38230c2d527 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 11913987880f97247207e69f68a819dd2400736c +Subproject commit 38230c2d527a4dd096203fbbd13f5afee82792e1 diff --git a/qtlottie b/qtlottie index 247add153d2..6d2fec92894 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 247add153d2d80631d32ff656f2e538db0c31d67 +Subproject commit 6d2fec92894c4bce7c7b2bf36c4b898122bd1b86 diff --git a/qtmqtt b/qtmqtt index 13f5956040b..1b67b80ef06 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit 13f5956040bf6afed102f50739b0ce7b28166c56 +Subproject commit 1b67b80ef06849914740d3d1475af89281aca1f8 diff --git a/qtmultimedia b/qtmultimedia index 20298e73a55..edc60be240c 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 20298e73a555349536e94bb7e899bc415e20b7ce +Subproject commit edc60be240c270923eee562d0eb3e76d889ffd1f diff --git a/qtnetworkauth b/qtnetworkauth index 8131caf75fa..e479745d97c 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 8131caf75fa24366b4830dc17f8477986a01ea6b +Subproject commit e479745d97c073c907621413ae84a0e1f048290a diff --git a/qtopcua b/qtopcua index 0717e163c85..6813a7ee203 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit 0717e163c85ba41ffdc031128f2a5ca4f671db85 +Subproject commit 6813a7ee2034e0ca751d3934777b558d302c2c19 diff --git a/qtpositioning b/qtpositioning index 4444cf04c45..6c5e13162d9 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit 4444cf04c4527b7b28e2d1ae76b17e6714719943 +Subproject commit 6c5e13162d913ba0075cbd978cfe0c7bc9f21faf diff --git a/qtquick3d b/qtquick3d index 4828a5d5d62..cdf0aa5ea9a 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 4828a5d5d627fcc404a378131f176067f0ac5b6e +Subproject commit cdf0aa5ea9a992ded30f20f27f2ab68a9e4d7f07 diff --git a/qtquick3dphysics b/qtquick3dphysics index bd59fd24499..708e4f0f896 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit bd59fd244997f721e8b49be0daf6188a1cf05687 +Subproject commit 708e4f0f896a097a85e296eb6bf1d69ca3a925b9 diff --git a/qtquickeffectmaker b/qtquickeffectmaker index c91f2e022ca..5c55ccd52be 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit c91f2e022ca378f7861967ff9ddcb5911a11e4d0 +Subproject commit 5c55ccd52bedd616b3b7bdf1a1f19d12712d63a0 diff --git a/qtquicktimeline b/qtquicktimeline index f35caf37a13..cb32b6fb46a 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit f35caf37a13adb16a064a7d10732ada1322dee9b +Subproject commit cb32b6fb46a3ce513b545c60b3c9666f63e97c5a diff --git a/qtremoteobjects b/qtremoteobjects index 927021c6c02..f89968d6273 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 927021c6c021f48918e594786fe25ad7d15ca176 +Subproject commit f89968d627386b5ef586b1f758490d1ece4219d2 diff --git a/qtrepotools b/qtrepotools index 0838a754346..40d8a7b7a05 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 0838a754346966c629c575158873fdc779e0060b +Subproject commit 40d8a7b7a0594d88c57c96555f53d4bd8935a0fc diff --git a/qtscxml b/qtscxml index 6638a8518d4..0cd9ca71b7b 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 6638a8518d4431e25511ab2e8849836ea835fe2d +Subproject commit 0cd9ca71b7ba3abe09cf4706d12b6cbb1c15dc97 diff --git a/qtsensors b/qtsensors index cd8104cd625..3611073e7a2 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit cd8104cd62588668015c83a30cb6aa2f5f8f683b +Subproject commit 3611073e7a2fa03341857e6029899e79a13a0f0b diff --git a/qtserialbus b/qtserialbus index 73d6abc2625..d3c549b4860 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 73d6abc26254b087073078816b6e4d26c199b321 +Subproject commit d3c549b4860608c5f169066450387245d0e8d682 diff --git a/qtserialport b/qtserialport index 2db1dc6c207..da1fe950476 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 2db1dc6c2076d10447aabe7a943cd333e8b884e7 +Subproject commit da1fe9504763c224d53cc8638bdc93bcfa9be54f diff --git a/qtshadertools b/qtshadertools index cbbb2d43c0e..5f517c5423a 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit cbbb2d43c0e2d58a92086630db06c7a1b1725f00 +Subproject commit 5f517c5423a0d488c53d705457be5a4b5ce43dee diff --git a/qtspeech b/qtspeech index c6b66dcd81b..23e5cea3fc3 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit c6b66dcd81bee269511783ed21a062f21df6a771 +Subproject commit 23e5cea3fc397fa211b9ad52bbd8b55f342fbca3 diff --git a/qtsvg b/qtsvg index b182de99c6d..a33c2597400 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit b182de99c6daa24b762f5da3b08080570df684a5 +Subproject commit a33c2597400547cb8813adfac08f7d85b1a871e3 diff --git a/qttools b/qttools index caab1708719..7914b7fb4d5 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit caab17087199de67a1bd55363ad31bcb1b1a23af +Subproject commit 7914b7fb4d588e0dce3f2cc859c404ea08247567 diff --git a/qttranslations b/qttranslations index 851011d3363..8b63732a4eb 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 851011d3363ced32cd208c6b8aa854847f543707 +Subproject commit 8b63732a4eb3ed2fa4d6aedd75dff5af0b48aa23 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index e648ddcb70f..16df2271b28 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit e648ddcb70f6636809ab2624af9063ff401867fe +Subproject commit 16df2271b28a9f9819afbdb40557277c066fdf14 diff --git a/qtwayland b/qtwayland index dc564e7b835..c943c088de9 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit dc564e7b835282c6bcf817377953681aa4551a03 +Subproject commit c943c088de94da2dc97a687a78286afb4c003be9 diff --git a/qtwebchannel b/qtwebchannel index d2459815509..12ad325289f 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit d24598155092a4a6f1568f191d87ce1a7c0d60e5 +Subproject commit 12ad325289f11a6b4f6979b5ac9956d7a10eaf70 diff --git a/qtwebengine b/qtwebengine index 4b9be7f5f92..f4bef68b018 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 4b9be7f5f9211b354fca2b7393f829bf6e82208d +Subproject commit f4bef68b018fc69f7033d0672f6e477253b719ba diff --git a/qtwebsockets b/qtwebsockets index 58c84619b03..82554112f6a 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 58c84619b034e11a37b8f91c795a2a8b81febe28 +Subproject commit 82554112f6a023d3160c4a840a646ad9713ec2f6 diff --git a/qtwebview b/qtwebview index ec13e64e834..ef2a8a9e9ae 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit ec13e64e83452c01948091621586954e7687cc10 +Subproject commit ef2a8a9e9aece8993c167e1a1945a7b666d4bc0b From 9f043379214df63b3d197ebf924c0cab7a968693 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 10 Mar 2025 14:10:18 +0000 Subject: [PATCH 67/75] Update submodules on '6.9.0 in qt/qt5' Change-Id: I24232ff1dacc8795421e240abc847e95df487878 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qt5compat | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtcharts | 2 +- qtcoap | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgraphs | 2 +- qtgrpc | 2 +- qthttpserver | 2 +- qtimageformats | 2 +- qtlanguageserver | 2 +- qtlocation | 2 +- qtlottie | 2 +- qtmqtt | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtopcua | 2 +- qtpositioning | 2 +- qtquick3d | 2 +- qtquick3dphysics | 2 +- qtquickeffectmaker | 2 +- qtquicktimeline | 2 +- qtremoteobjects | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtshadertools | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- 42 files changed, 42 insertions(+), 42 deletions(-) diff --git a/qt3d b/qt3d index 92f59ae2ab8..893fb9362f4 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 92f59ae2ab8a1c80062a3c95130de03b936e0ea1 +Subproject commit 893fb9362f49a83adcb2b45ad60ab91dab324a36 diff --git a/qt5compat b/qt5compat index 0da2895bf12..d1cfbe90b92 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 0da2895bf12e05aa2265c0543581ac9e93d9ca22 +Subproject commit d1cfbe90b92c4e0e218c5871fa6d9e5e787b012b diff --git a/qtactiveqt b/qtactiveqt index 951409256f0..07781a5be60 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 951409256f0b73cd94d250e44b9ea33610c879f8 +Subproject commit 07781a5be60352b63599319db3af1b959ecf9be6 diff --git a/qtbase b/qtbase index 54555755f87..457a8631546 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 54555755f8780e4e7c665a1502309da9fa807066 +Subproject commit 457a8631546b430195bdb164af5cb8e09858cf7d diff --git a/qtcharts b/qtcharts index d6e3189c156..89b6e037603 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit d6e3189c1563af4eb24dcb7064a462cb9fd34762 +Subproject commit 89b6e0376036885376fb94572729efa6b267aa87 diff --git a/qtcoap b/qtcoap index 6dfc215a167..0ad01fcd091 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit 6dfc215a167b991bbc920497ab66811a8875de25 +Subproject commit 0ad01fcd0910bccd6ff3b520dc089096c566e179 diff --git a/qtconnectivity b/qtconnectivity index 125d114597c..7b437b0c404 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 125d114597c5f248b442699173a5ef89397240af +Subproject commit 7b437b0c404e03722bd1aee3cf30cc93974c721b diff --git a/qtdatavis3d b/qtdatavis3d index e0193b6b925..13d6a11cf64 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit e0193b6b9253946490da3d731f1c88b80fe3af1c +Subproject commit 13d6a11cf64badb2437301295afdea1f46026446 diff --git a/qtdeclarative b/qtdeclarative index 47fc3baf9b1..dce99af4061 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 47fc3baf9b16f988f34c8f63b5da3e681413412b +Subproject commit dce99af4061f6856126c1f8382070ee4fc161062 diff --git a/qtdoc b/qtdoc index 9e335919c21..2ca196b9f64 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 9e335919c210e2b55b39d797a67ac023d4d4e1c5 +Subproject commit 2ca196b9f64d35a7484369bb35b31b8141ec5998 diff --git a/qtgraphs b/qtgraphs index af49b7ff26b..e6d27df80f7 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit af49b7ff26bced62c4c35f786b83c816cd303dd7 +Subproject commit e6d27df80f72aaeeefadef70130154152fc67661 diff --git a/qtgrpc b/qtgrpc index 3837c6c375c..b86e2d7064c 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit 3837c6c375c885759c3b0a0cc1ad017deb5f1a36 +Subproject commit b86e2d7064c1f5a066e09345b78c81c93cfb84e7 diff --git a/qthttpserver b/qthttpserver index b708b7dcf3b..0a757509cb6 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit b708b7dcf3bd9cf1686326294bba0f25037f257f +Subproject commit 0a757509cb65a99bb3c914045c92bd57b33d6c67 diff --git a/qtimageformats b/qtimageformats index 53e49eef4ee..3fa4edf86b8 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 53e49eef4ee995ff657bf14030c2d48a67358eb7 +Subproject commit 3fa4edf86b8ab1b57249d906bf46fcccceaa54d9 diff --git a/qtlanguageserver b/qtlanguageserver index 87803dca301..819520ecceb 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit 87803dca30173d655d490ad201643ff279746e8f +Subproject commit 819520eccebb2a976d041cf8dda1164f21bc9ffb diff --git a/qtlocation b/qtlocation index 38230c2d527..c87b2b1de44 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 38230c2d527a4dd096203fbbd13f5afee82792e1 +Subproject commit c87b2b1de44292035986afadf870fbedf9540422 diff --git a/qtlottie b/qtlottie index 6d2fec92894..823da836023 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 6d2fec92894c4bce7c7b2bf36c4b898122bd1b86 +Subproject commit 823da836023943589b02f3b933537184bbf7402d diff --git a/qtmqtt b/qtmqtt index 1b67b80ef06..bf132c97075 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit 1b67b80ef06849914740d3d1475af89281aca1f8 +Subproject commit bf132c970753ac764d04608e5123208064dc1fb9 diff --git a/qtmultimedia b/qtmultimedia index edc60be240c..42b6aa572a1 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit edc60be240c270923eee562d0eb3e76d889ffd1f +Subproject commit 42b6aa572a1055454a3dbe9cee9caacc44c4fe5c diff --git a/qtnetworkauth b/qtnetworkauth index e479745d97c..2c6406dc2d6 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit e479745d97c073c907621413ae84a0e1f048290a +Subproject commit 2c6406dc2d6f41a8c6fa4a9690280074144536de diff --git a/qtopcua b/qtopcua index 6813a7ee203..f842151124c 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit 6813a7ee2034e0ca751d3934777b558d302c2c19 +Subproject commit f842151124c93c87021df9396094cd0663060c1d diff --git a/qtpositioning b/qtpositioning index 6c5e13162d9..20baf2bc5fc 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit 6c5e13162d913ba0075cbd978cfe0c7bc9f21faf +Subproject commit 20baf2bc5fc6818f1ec209abc7e1a829d7d54edf diff --git a/qtquick3d b/qtquick3d index cdf0aa5ea9a..27367fbef4f 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit cdf0aa5ea9a992ded30f20f27f2ab68a9e4d7f07 +Subproject commit 27367fbef4fd4d203b87865e6e2de8cdfde84c9d diff --git a/qtquick3dphysics b/qtquick3dphysics index 708e4f0f896..36b6eb8a040 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit 708e4f0f896a097a85e296eb6bf1d69ca3a925b9 +Subproject commit 36b6eb8a04043ec7853453c6f8adb205a2120cde diff --git a/qtquickeffectmaker b/qtquickeffectmaker index 5c55ccd52be..7dd9e717346 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit 5c55ccd52bedd616b3b7bdf1a1f19d12712d63a0 +Subproject commit 7dd9e7173462b90b511ae649f450bb9715fab03a diff --git a/qtquicktimeline b/qtquicktimeline index cb32b6fb46a..6da52f783d4 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit cb32b6fb46a3ce513b545c60b3c9666f63e97c5a +Subproject commit 6da52f783d4fce3a733f98582a75d2883b743abb diff --git a/qtremoteobjects b/qtremoteobjects index f89968d6273..5426aebf187 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit f89968d627386b5ef586b1f758490d1ece4219d2 +Subproject commit 5426aebf18784c6ed849eb3b4f8e7c0fbb2ef715 diff --git a/qtscxml b/qtscxml index 0cd9ca71b7b..09d69ab01b7 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 0cd9ca71b7ba3abe09cf4706d12b6cbb1c15dc97 +Subproject commit 09d69ab01b7802aea8f1411ccd48495c0250afc9 diff --git a/qtsensors b/qtsensors index 3611073e7a2..e1a661f9b4a 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 3611073e7a2fa03341857e6029899e79a13a0f0b +Subproject commit e1a661f9b4a19572f106d3c5a69978a2bb03391a diff --git a/qtserialbus b/qtserialbus index d3c549b4860..1c7e200a803 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit d3c549b4860608c5f169066450387245d0e8d682 +Subproject commit 1c7e200a803527b74a01060c16e0389beee096f1 diff --git a/qtserialport b/qtserialport index da1fe950476..926e6acbf61 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit da1fe9504763c224d53cc8638bdc93bcfa9be54f +Subproject commit 926e6acbf61c341b5ef5af3510cd037624e2d06e diff --git a/qtshadertools b/qtshadertools index 5f517c5423a..e4e05099385 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 5f517c5423a0d488c53d705457be5a4b5ce43dee +Subproject commit e4e050993853953bcfa094378faf4682c7994ce1 diff --git a/qtspeech b/qtspeech index 23e5cea3fc3..51980f484d4 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 23e5cea3fc397fa211b9ad52bbd8b55f342fbca3 +Subproject commit 51980f484d4b44578226f74a68a460c5a795dc79 diff --git a/qtsvg b/qtsvg index a33c2597400..509371a71b8 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit a33c2597400547cb8813adfac08f7d85b1a871e3 +Subproject commit 509371a71b82a1a9b30c9bc38dcfddc3a4731d86 diff --git a/qttools b/qttools index 7914b7fb4d5..5a84ea8d2d1 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 7914b7fb4d588e0dce3f2cc859c404ea08247567 +Subproject commit 5a84ea8d2d16444be27cdf660ccfefd1bb4fe744 diff --git a/qttranslations b/qttranslations index 8b63732a4eb..d1baf5920d0 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 8b63732a4eb3ed2fa4d6aedd75dff5af0b48aa23 +Subproject commit d1baf5920d0df06e81378ec8b037c4599f9640bd diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 16df2271b28..358cb737ebc 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 16df2271b28a9f9819afbdb40557277c066fdf14 +Subproject commit 358cb737ebcdbf347ad887fa1ff423a4868f5978 diff --git a/qtwayland b/qtwayland index c943c088de9..2c0f32ec0a5 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit c943c088de94da2dc97a687a78286afb4c003be9 +Subproject commit 2c0f32ec0a5b7456b88e814bc3d6d955d553d0dc diff --git a/qtwebchannel b/qtwebchannel index 12ad325289f..fc37dcc44b4 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 12ad325289f11a6b4f6979b5ac9956d7a10eaf70 +Subproject commit fc37dcc44b4f70d7653a0539d3f09844cdd8b2bf diff --git a/qtwebengine b/qtwebengine index f4bef68b018..0ec2361a051 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit f4bef68b018fc69f7033d0672f6e477253b719ba +Subproject commit 0ec2361a051f1e457336e15565d333ffdba238c7 diff --git a/qtwebsockets b/qtwebsockets index 82554112f6a..272b04fbfd5 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 82554112f6a023d3160c4a840a646ad9713ec2f6 +Subproject commit 272b04fbfd54fcc4ef28a5b7979b7de9b06800d0 diff --git a/qtwebview b/qtwebview index ef2a8a9e9ae..b7ed50b82be 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit ef2a8a9e9aece8993c167e1a1945a7b666d4bc0b +Subproject commit b7ed50b82beba34d9f760a29068ac27732e55fc7 From 427041f885f2522918c62689f43170f24765ace4 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 17 Mar 2025 14:49:16 +0000 Subject: [PATCH 68/75] Update submodules on '6.9.0 in qt/qt5' Change-Id: Iec886e87f8ac6219cbba1a192a709ff453b4e088 Reviewed-by: Qt Submodule Update Bot --- qtdoc | 2 +- qttools | 2 +- qttranslations | 2 +- qtwebengine | 2 +- qtwebview | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qtdoc b/qtdoc index 2ca196b9f64..8e316542860 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 2ca196b9f64d35a7484369bb35b31b8141ec5998 +Subproject commit 8e3165428605b7d7494c91c2149490ba8c9b3a7c diff --git a/qttools b/qttools index 5a84ea8d2d1..b2a09838435 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 5a84ea8d2d16444be27cdf660ccfefd1bb4fe744 +Subproject commit b2a0983843522db440d93e2e43aa7231f8691f5d diff --git a/qttranslations b/qttranslations index d1baf5920d0..f55ff84d216 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit d1baf5920d0df06e81378ec8b037c4599f9640bd +Subproject commit f55ff84d2163648449db641e98841134af510d60 diff --git a/qtwebengine b/qtwebengine index 0ec2361a051..db71c6430a1 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 0ec2361a051f1e457336e15565d333ffdba238c7 +Subproject commit db71c6430a1a9eac443c179dcb521e30d3c47ccb diff --git a/qtwebview b/qtwebview index b7ed50b82be..b457df3b004 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit b7ed50b82beba34d9f760a29068ac27732e55fc7 +Subproject commit b457df3b004aab9ebbe2d88dccc320c8200600d0 From 21128d2ef1899812b6c1cfbe7c4eebb87a163d89 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 18 Mar 2025 14:31:42 +0000 Subject: [PATCH 69/75] Update submodules on '6.9.0 in qt/qt5' Change-Id: Iee3622d6169f4720f71933fd9981d0b33103460c Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qt5compat | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgraphs | 2 +- qtgrpc | 2 +- qthttpserver | 2 +- qtlocation | 2 +- qtlottie | 2 +- qtmqtt | 2 +- qtmultimedia | 2 +- qtopcua | 2 +- qtpositioning | 2 +- qtquick3d | 2 +- qtquick3dphysics | 2 +- qtquickeffectmaker | 2 +- qtquicktimeline | 2 +- qtremoteobjects | 2 +- qtrepotools | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtspeech | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- 33 files changed, 33 insertions(+), 33 deletions(-) diff --git a/qt3d b/qt3d index 893fb9362f4..3943e98c572 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 893fb9362f49a83adcb2b45ad60ab91dab324a36 +Subproject commit 3943e98c572d5c892cf8f17dda061eea178ce2ce diff --git a/qt5compat b/qt5compat index d1cfbe90b92..71446d2e806 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit d1cfbe90b92c4e0e218c5871fa6d9e5e787b012b +Subproject commit 71446d2e806c8e600f5b199395613e7288b40cd8 diff --git a/qtcharts b/qtcharts index 89b6e037603..a9925aab600 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 89b6e0376036885376fb94572729efa6b267aa87 +Subproject commit a9925aab6007366807351486de8672e71d195586 diff --git a/qtconnectivity b/qtconnectivity index 7b437b0c404..59e5140102a 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 7b437b0c404e03722bd1aee3cf30cc93974c721b +Subproject commit 59e5140102a8f938d7295c2889c9b227266925eb diff --git a/qtdatavis3d b/qtdatavis3d index 13d6a11cf64..d17acf7f3b9 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 13d6a11cf64badb2437301295afdea1f46026446 +Subproject commit d17acf7f3b9874560d6fe555454eec11ad407cd4 diff --git a/qtdeclarative b/qtdeclarative index dce99af4061..37b746f78aa 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit dce99af4061f6856126c1f8382070ee4fc161062 +Subproject commit 37b746f78aac89bb5377eae4ffa91caddeec1086 diff --git a/qtdoc b/qtdoc index 8e316542860..27b8979a45e 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 8e3165428605b7d7494c91c2149490ba8c9b3a7c +Subproject commit 27b8979a45e677d7b5ffe63ba0b26a9869596655 diff --git a/qtgraphs b/qtgraphs index e6d27df80f7..5c9271fa87e 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit e6d27df80f72aaeeefadef70130154152fc67661 +Subproject commit 5c9271fa87e6bc7ea623989f81727bd63f77231c diff --git a/qtgrpc b/qtgrpc index b86e2d7064c..13298666c2e 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit b86e2d7064c1f5a066e09345b78c81c93cfb84e7 +Subproject commit 13298666c2e4b0365fe0ec1a51f172aa8f609064 diff --git a/qthttpserver b/qthttpserver index 0a757509cb6..bc2597a8de3 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit 0a757509cb65a99bb3c914045c92bd57b33d6c67 +Subproject commit bc2597a8de32a1df231fa4ba42405386c94d7c16 diff --git a/qtlocation b/qtlocation index c87b2b1de44..ed95e82e5a2 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit c87b2b1de44292035986afadf870fbedf9540422 +Subproject commit ed95e82e5a238a63853b15a569bb2755c755845e diff --git a/qtlottie b/qtlottie index 823da836023..61f92ddee54 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 823da836023943589b02f3b933537184bbf7402d +Subproject commit 61f92ddee54c543e20d11a75e1a7305699432765 diff --git a/qtmqtt b/qtmqtt index bf132c97075..e24c85d1019 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit bf132c970753ac764d04608e5123208064dc1fb9 +Subproject commit e24c85d10191d282d2f66814e883545e685e3598 diff --git a/qtmultimedia b/qtmultimedia index 42b6aa572a1..fc1807a1e38 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 42b6aa572a1055454a3dbe9cee9caacc44c4fe5c +Subproject commit fc1807a1e38127372a5e107932737d20528f68fe diff --git a/qtopcua b/qtopcua index f842151124c..05bcd57a15d 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit f842151124c93c87021df9396094cd0663060c1d +Subproject commit 05bcd57a15d21ea1dfc86b456396b16951338559 diff --git a/qtpositioning b/qtpositioning index 20baf2bc5fc..5f7cb275f4d 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit 20baf2bc5fc6818f1ec209abc7e1a829d7d54edf +Subproject commit 5f7cb275f4d7634ba85a3f09313038b044d1c2f9 diff --git a/qtquick3d b/qtquick3d index 27367fbef4f..1a105217544 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 27367fbef4fd4d203b87865e6e2de8cdfde84c9d +Subproject commit 1a105217544cdb6e3fc76cd845c4b1e3e67d561e diff --git a/qtquick3dphysics b/qtquick3dphysics index 36b6eb8a040..b97317cec32 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit 36b6eb8a04043ec7853453c6f8adb205a2120cde +Subproject commit b97317cec32102d0aa7383f5fc56a89a3ead187a diff --git a/qtquickeffectmaker b/qtquickeffectmaker index 7dd9e717346..4261c1015ec 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit 7dd9e7173462b90b511ae649f450bb9715fab03a +Subproject commit 4261c1015ec12ae5795b3e8a5b847d82183b9d62 diff --git a/qtquicktimeline b/qtquicktimeline index 6da52f783d4..13267ffcf57 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 6da52f783d4fce3a733f98582a75d2883b743abb +Subproject commit 13267ffcf570fb478abc62f10fed537c2a662479 diff --git a/qtremoteobjects b/qtremoteobjects index 5426aebf187..ef70053ca1e 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 5426aebf18784c6ed849eb3b4f8e7c0fbb2ef715 +Subproject commit ef70053ca1e4a92b01fb626fae53e2bce8e246f9 diff --git a/qtrepotools b/qtrepotools index 40d8a7b7a05..4434304a560 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 40d8a7b7a0594d88c57c96555f53d4bd8935a0fc +Subproject commit 4434304a5609ce49fabe59a3925abf0c650736fe diff --git a/qtscxml b/qtscxml index 09d69ab01b7..76dd7092a73 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 09d69ab01b7802aea8f1411ccd48495c0250afc9 +Subproject commit 76dd7092a73a0edda3d4de22941e7a58b5e4bb5f diff --git a/qtsensors b/qtsensors index e1a661f9b4a..ec98e8d3d32 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit e1a661f9b4a19572f106d3c5a69978a2bb03391a +Subproject commit ec98e8d3d32074decebb51b0ac8e7d123e8254ec diff --git a/qtspeech b/qtspeech index 51980f484d4..c8de87bac0c 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 51980f484d4b44578226f74a68a460c5a795dc79 +Subproject commit c8de87bac0c86e0943a04241cd48501101f12ecb diff --git a/qttools b/qttools index b2a09838435..14669ab9e6a 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit b2a0983843522db440d93e2e43aa7231f8691f5d +Subproject commit 14669ab9e6ad04170b2b5012aa08649c7575b1a1 diff --git a/qttranslations b/qttranslations index f55ff84d216..cb323cdfac7 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit f55ff84d2163648449db641e98841134af510d60 +Subproject commit cb323cdfac7995d81194f92888001b34270ccbe8 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 358cb737ebc..1ad6441de22 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 358cb737ebcdbf347ad887fa1ff423a4868f5978 +Subproject commit 1ad6441de222ff2c72dd34d2a1deac5885b473fa diff --git a/qtwayland b/qtwayland index 2c0f32ec0a5..1625c19ef56 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 2c0f32ec0a5b7456b88e814bc3d6d955d553d0dc +Subproject commit 1625c19ef5694f8d7351bec6ed715a90e73786b5 diff --git a/qtwebchannel b/qtwebchannel index fc37dcc44b4..3681b8e7cd7 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit fc37dcc44b4f70d7653a0539d3f09844cdd8b2bf +Subproject commit 3681b8e7cd7b7d118b8696b875a93c2455a9c750 diff --git a/qtwebengine b/qtwebengine index db71c6430a1..8340206d24a 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit db71c6430a1a9eac443c179dcb521e30d3c47ccb +Subproject commit 8340206d24a451576d0ebab2f53d79e5db1c7e67 diff --git a/qtwebsockets b/qtwebsockets index 272b04fbfd5..73be1621b35 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 272b04fbfd54fcc4ef28a5b7979b7de9b06800d0 +Subproject commit 73be1621b35d1abc0250fa2776bf4cb280da03ee diff --git a/qtwebview b/qtwebview index b457df3b004..3cc99bb9f7f 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit b457df3b004aab9ebbe2d88dccc320c8200600d0 +Subproject commit 3cc99bb9f7f3585d29d9355e286fa0bf9b79944d From eda8e5dd0d8512b9e6aec4c8376d01ea8f523b32 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 19 Mar 2025 18:42:49 +0000 Subject: [PATCH 70/75] Update submodules on '6.9.0 in qt/qt5' Change-Id: Id3c5707bf166f2e1052e46fe6f9f92b4c7a45d36 Reviewed-by: Qt Submodule Update Bot --- qtconnectivity | 2 +- qtdoc | 2 +- qtwayland | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtconnectivity b/qtconnectivity index 59e5140102a..2a90b7fbc70 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 59e5140102a8f938d7295c2889c9b227266925eb +Subproject commit 2a90b7fbc7051ede49b2a941a99d7cc826c07ea1 diff --git a/qtdoc b/qtdoc index 27b8979a45e..3560507c964 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 27b8979a45e677d7b5ffe63ba0b26a9869596655 +Subproject commit 3560507c964663e5bc473d668e82d0271d140015 diff --git a/qtwayland b/qtwayland index 1625c19ef56..7829861c09f 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 1625c19ef5694f8d7351bec6ed715a90e73786b5 +Subproject commit 7829861c09f95db037312f6b6b5bd9e8f98fe60b From 609ddf230a37a92780751ea9eea395675411d124 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 24 Mar 2025 03:18:03 +0000 Subject: [PATCH 71/75] Update submodules on '6.9.0 in qt/qt5' Change-Id: I143575ead1a8b4fbf0317c987d50f894aea0dd63 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qt5compat | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtcharts | 2 +- qtcoap | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgraphs | 2 +- qtgrpc | 2 +- qthttpserver | 2 +- qtimageformats | 2 +- qtlanguageserver | 2 +- qtlocation | 2 +- qtlottie | 2 +- qtmqtt | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtopcua | 2 +- qtpositioning | 2 +- qtquick3d | 2 +- qtquick3dphysics | 2 +- qtquickeffectmaker | 2 +- qtquicktimeline | 2 +- qtremoteobjects | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtshadertools | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- 42 files changed, 42 insertions(+), 42 deletions(-) diff --git a/qt3d b/qt3d index 3943e98c572..c061c0bfb39 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 3943e98c572d5c892cf8f17dda061eea178ce2ce +Subproject commit c061c0bfb395b9db76f6793e6591fc7f4f390e3b diff --git a/qt5compat b/qt5compat index 71446d2e806..436e98e49e9 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 71446d2e806c8e600f5b199395613e7288b40cd8 +Subproject commit 436e98e49e9b22442d55709da1e494e1595a2e6a diff --git a/qtactiveqt b/qtactiveqt index 07781a5be60..101c260d4aa 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 07781a5be60352b63599319db3af1b959ecf9be6 +Subproject commit 101c260d4aa6b065239a495a01e00be0d73d1e2a diff --git a/qtbase b/qtbase index 457a8631546..c63c918f3a4 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 457a8631546b430195bdb164af5cb8e09858cf7d +Subproject commit c63c918f3a448436a4279abc0775b97d996f09a7 diff --git a/qtcharts b/qtcharts index a9925aab600..f0094960a4f 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit a9925aab6007366807351486de8672e71d195586 +Subproject commit f0094960a4fccf425577cbeab801f164f4927fb3 diff --git a/qtcoap b/qtcoap index 0ad01fcd091..17c1b7a13f6 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit 0ad01fcd0910bccd6ff3b520dc089096c566e179 +Subproject commit 17c1b7a13f63d909d6f9784446f6498185a6924b diff --git a/qtconnectivity b/qtconnectivity index 2a90b7fbc70..1af89a537fb 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 2a90b7fbc7051ede49b2a941a99d7cc826c07ea1 +Subproject commit 1af89a537fbfcc0cc060e31f5e21c6299e06f9e5 diff --git a/qtdatavis3d b/qtdatavis3d index d17acf7f3b9..aae5f9b6548 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit d17acf7f3b9874560d6fe555454eec11ad407cd4 +Subproject commit aae5f9b65483d493ae13bace5b94d0c89de9137f diff --git a/qtdeclarative b/qtdeclarative index 37b746f78aa..df1155a282a 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 37b746f78aac89bb5377eae4ffa91caddeec1086 +Subproject commit df1155a282ad741495cf2dc0ac4f02f6cbfb60da diff --git a/qtdoc b/qtdoc index 3560507c964..3cb1f504f2a 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 3560507c964663e5bc473d668e82d0271d140015 +Subproject commit 3cb1f504f2a2afa87ef21dbc727ff06089e69e80 diff --git a/qtgraphs b/qtgraphs index 5c9271fa87e..a7e8383b0c6 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit 5c9271fa87e6bc7ea623989f81727bd63f77231c +Subproject commit a7e8383b0c6f0c4a5c20049c71aca92cd2549acc diff --git a/qtgrpc b/qtgrpc index 13298666c2e..443a008d3a8 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit 13298666c2e4b0365fe0ec1a51f172aa8f609064 +Subproject commit 443a008d3a8d95b6981069b40c431be56695b2d8 diff --git a/qthttpserver b/qthttpserver index bc2597a8de3..4d8ec965d77 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit bc2597a8de32a1df231fa4ba42405386c94d7c16 +Subproject commit 4d8ec965d7730b4e9429676e4be293e361d16bdd diff --git a/qtimageformats b/qtimageformats index 3fa4edf86b8..e0e8d8d6b37 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 3fa4edf86b8ab1b57249d906bf46fcccceaa54d9 +Subproject commit e0e8d8d6b37b24465886dc4fc3355f437a467853 diff --git a/qtlanguageserver b/qtlanguageserver index 819520ecceb..85b7811d25e 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit 819520eccebb2a976d041cf8dda1164f21bc9ffb +Subproject commit 85b7811d25e3c37484ac38a9ab2c0617f2ed2cd4 diff --git a/qtlocation b/qtlocation index ed95e82e5a2..1f29be9cbcf 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit ed95e82e5a238a63853b15a569bb2755c755845e +Subproject commit 1f29be9cbcf72ac5fb96940cbdf611d867a469ba diff --git a/qtlottie b/qtlottie index 61f92ddee54..f599628bfa2 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 61f92ddee54c543e20d11a75e1a7305699432765 +Subproject commit f599628bfa23f4ee9066a76df07795916c662d50 diff --git a/qtmqtt b/qtmqtt index e24c85d1019..536e6872c11 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit e24c85d10191d282d2f66814e883545e685e3598 +Subproject commit 536e6872c1190c26f6efb6efb35cc43bcf19879f diff --git a/qtmultimedia b/qtmultimedia index fc1807a1e38..5abcd44698d 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit fc1807a1e38127372a5e107932737d20528f68fe +Subproject commit 5abcd44698ddb237f3b799471b1dffdf97f281e6 diff --git a/qtnetworkauth b/qtnetworkauth index 2c6406dc2d6..724c93f0f33 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 2c6406dc2d6f41a8c6fa4a9690280074144536de +Subproject commit 724c93f0f335fc86c409449a9234962dd275fbae diff --git a/qtopcua b/qtopcua index 05bcd57a15d..5470f2c1d52 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit 05bcd57a15d21ea1dfc86b456396b16951338559 +Subproject commit 5470f2c1d521e57821d56c20b6cc1c8094fcea4b diff --git a/qtpositioning b/qtpositioning index 5f7cb275f4d..1c5a2a7fb06 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit 5f7cb275f4d7634ba85a3f09313038b044d1c2f9 +Subproject commit 1c5a2a7fb06efea1319fdd0ad52f4648803198cb diff --git a/qtquick3d b/qtquick3d index 1a105217544..4a7b5ccbf8a 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 1a105217544cdb6e3fc76cd845c4b1e3e67d561e +Subproject commit 4a7b5ccbf8aa0951dd7960a3e4532e3bb3fe6715 diff --git a/qtquick3dphysics b/qtquick3dphysics index b97317cec32..8e2731cb7be 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit b97317cec32102d0aa7383f5fc56a89a3ead187a +Subproject commit 8e2731cb7bea38356a23d7800d5a82e8608c8702 diff --git a/qtquickeffectmaker b/qtquickeffectmaker index 4261c1015ec..1329e780785 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit 4261c1015ec12ae5795b3e8a5b847d82183b9d62 +Subproject commit 1329e78078566837281c148c4ee2cec9440aea1c diff --git a/qtquicktimeline b/qtquicktimeline index 13267ffcf57..27b735c78ba 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 13267ffcf570fb478abc62f10fed537c2a662479 +Subproject commit 27b735c78ba8881199b5f9dc6373fa3449286e83 diff --git a/qtremoteobjects b/qtremoteobjects index ef70053ca1e..891ee38fc80 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit ef70053ca1e4a92b01fb626fae53e2bce8e246f9 +Subproject commit 891ee38fc8059008c2592ddca84051686aa9ed2b diff --git a/qtscxml b/qtscxml index 76dd7092a73..16b876f0fef 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 76dd7092a73a0edda3d4de22941e7a58b5e4bb5f +Subproject commit 16b876f0fefe406e35e16ec0a3a6ede59c3f501b diff --git a/qtsensors b/qtsensors index ec98e8d3d32..e984f0af0df 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit ec98e8d3d32074decebb51b0ac8e7d123e8254ec +Subproject commit e984f0af0df44a6e7fc1957fc80d05ecab4fb511 diff --git a/qtserialbus b/qtserialbus index 1c7e200a803..c65bfc7af1c 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 1c7e200a803527b74a01060c16e0389beee096f1 +Subproject commit c65bfc7af1c6e42fa50abf2de90ff74a69ea7988 diff --git a/qtserialport b/qtserialport index 926e6acbf61..64138823b4b 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 926e6acbf61c341b5ef5af3510cd037624e2d06e +Subproject commit 64138823b4b410afaef282a95571b8bc38e4974b diff --git a/qtshadertools b/qtshadertools index e4e05099385..11947931a31 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit e4e050993853953bcfa094378faf4682c7994ce1 +Subproject commit 11947931a3148be4c59a00f4033260d3ef00437f diff --git a/qtspeech b/qtspeech index c8de87bac0c..22a6ff56dc3 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit c8de87bac0c86e0943a04241cd48501101f12ecb +Subproject commit 22a6ff56dc3bc6ecdc3213687cec75950d09c017 diff --git a/qtsvg b/qtsvg index 509371a71b8..ea2481cf66d 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 509371a71b82a1a9b30c9bc38dcfddc3a4731d86 +Subproject commit ea2481cf66dc7ed514be3a814f9e1b649b72f359 diff --git a/qttools b/qttools index 14669ab9e6a..99489fc8e58 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 14669ab9e6ad04170b2b5012aa08649c7575b1a1 +Subproject commit 99489fc8e58ae01bed19c6fdcb189f5ea3ce68ad diff --git a/qttranslations b/qttranslations index cb323cdfac7..384be451b9e 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit cb323cdfac7995d81194f92888001b34270ccbe8 +Subproject commit 384be451b9e1fa21faaf99a7fb5f01b752de1831 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 1ad6441de22..37fc3a9ab8f 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 1ad6441de222ff2c72dd34d2a1deac5885b473fa +Subproject commit 37fc3a9ab8f2c65ed4310453b216e5d76543d4c3 diff --git a/qtwayland b/qtwayland index 7829861c09f..532da740084 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 7829861c09f95db037312f6b6b5bd9e8f98fe60b +Subproject commit 532da740084ed04e8799f90aece8c20856780548 diff --git a/qtwebchannel b/qtwebchannel index 3681b8e7cd7..b4d2ca49d1a 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 3681b8e7cd7b7d118b8696b875a93c2455a9c750 +Subproject commit b4d2ca49d1a2b0741c869553587ac2efef72c550 diff --git a/qtwebengine b/qtwebengine index 8340206d24a..6734b4cc4df 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 8340206d24a451576d0ebab2f53d79e5db1c7e67 +Subproject commit 6734b4cc4dfddb9ac114104d3bcaee60445a4c89 diff --git a/qtwebsockets b/qtwebsockets index 73be1621b35..c15898c19a9 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 73be1621b35d1abc0250fa2776bf4cb280da03ee +Subproject commit c15898c19a960434f95d1875ad877471c32a454b diff --git a/qtwebview b/qtwebview index 3cc99bb9f7f..682a60166de 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 3cc99bb9f7f3585d29d9355e286fa0bf9b79944d +Subproject commit 682a60166def1ec0e48e75a19578d09e3090d584 From 0e695e8124f61022076a901ecdf414a22d8117b5 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 25 Mar 2025 23:30:47 +0000 Subject: [PATCH 72/75] Update submodules on '6.9.0 in qt/qt5' Change-Id: I7c2a08436bad63a199b673db35a9b8e92998f81e Reviewed-by: Qt Submodule Update Bot --- qtrepotools | 2 +- qtscxml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtrepotools b/qtrepotools index 4434304a560..557cbde5d11 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 4434304a5609ce49fabe59a3925abf0c650736fe +Subproject commit 557cbde5d1130fc9469cee46f21ea84c22237add diff --git a/qtscxml b/qtscxml index 16b876f0fef..ee921b6b84e 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 16b876f0fefe406e35e16ec0a3a6ede59c3f501b +Subproject commit ee921b6b84e0a382172288bda4270739f2ebe7bb From ef04df88c20f205ef7e97d60256885041ae439d5 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 26 Mar 2025 15:44:00 +0000 Subject: [PATCH 73/75] Update submodules on '6.9.0 in qt/qt5' Change-Id: I9ffa181fd4549747d6df5e5ef45fcf2e43eecac0 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qt5compat | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtcharts | 2 +- qtcoap | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgraphs | 2 +- qtgrpc | 2 +- qthttpserver | 2 +- qtimageformats | 2 +- qtlanguageserver | 2 +- qtlocation | 2 +- qtlottie | 2 +- qtmqtt | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtopcua | 2 +- qtpositioning | 2 +- qtquick3d | 2 +- qtquick3dphysics | 2 +- qtquickeffectmaker | 2 +- qtquicktimeline | 2 +- qtremoteobjects | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtshadertools | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- 42 files changed, 42 insertions(+), 42 deletions(-) diff --git a/qt3d b/qt3d index c061c0bfb39..203eed98e62 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit c061c0bfb395b9db76f6793e6591fc7f4f390e3b +Subproject commit 203eed98e6281c12da1944e6556eaaab945465e7 diff --git a/qt5compat b/qt5compat index 436e98e49e9..f774c455942 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 436e98e49e9b22442d55709da1e494e1595a2e6a +Subproject commit f774c45594242058754580e4317482a6b2750aaf diff --git a/qtactiveqt b/qtactiveqt index 101c260d4aa..25805eab2e8 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 101c260d4aa6b065239a495a01e00be0d73d1e2a +Subproject commit 25805eab2e8fef1b482a2b483d2a45edf2752dc4 diff --git a/qtbase b/qtbase index c63c918f3a4..b5e47fa433f 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit c63c918f3a448436a4279abc0775b97d996f09a7 +Subproject commit b5e47fa433f218a47db98a370fbad97c70455e85 diff --git a/qtcharts b/qtcharts index f0094960a4f..b88b4d519a7 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit f0094960a4fccf425577cbeab801f164f4927fb3 +Subproject commit b88b4d519a7e43f032fd4b1f71fd2b91a5d41c67 diff --git a/qtcoap b/qtcoap index 17c1b7a13f6..418d40287c3 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit 17c1b7a13f63d909d6f9784446f6498185a6924b +Subproject commit 418d40287c38805573c72ada454d3ba3a05f95a0 diff --git a/qtconnectivity b/qtconnectivity index 1af89a537fb..7ba2c7d9668 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 1af89a537fbfcc0cc060e31f5e21c6299e06f9e5 +Subproject commit 7ba2c7d9668b6a3bb01c373cf808ad072960a9c4 diff --git a/qtdatavis3d b/qtdatavis3d index aae5f9b6548..71c5d014c4f 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit aae5f9b65483d493ae13bace5b94d0c89de9137f +Subproject commit 71c5d014c4f733a40c688c35e2e97b66802079be diff --git a/qtdeclarative b/qtdeclarative index df1155a282a..46a6bc2c040 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit df1155a282ad741495cf2dc0ac4f02f6cbfb60da +Subproject commit 46a6bc2c04053f33e4cbd442f8f3c07973583191 diff --git a/qtdoc b/qtdoc index 3cb1f504f2a..cf2d7395268 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 3cb1f504f2a2afa87ef21dbc727ff06089e69e80 +Subproject commit cf2d7395268615b632abf07884ce55ed016fe805 diff --git a/qtgraphs b/qtgraphs index a7e8383b0c6..0f605c73074 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit a7e8383b0c6f0c4a5c20049c71aca92cd2549acc +Subproject commit 0f605c73074631fa5a21eb4a73d64d4474c1390d diff --git a/qtgrpc b/qtgrpc index 443a008d3a8..9e4b3368005 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit 443a008d3a8d95b6981069b40c431be56695b2d8 +Subproject commit 9e4b3368005d687ca85c5de4936987418a946897 diff --git a/qthttpserver b/qthttpserver index 4d8ec965d77..e7040654cc0 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit 4d8ec965d7730b4e9429676e4be293e361d16bdd +Subproject commit e7040654cc02a8a22c600f6b625ab4937f4ec9b5 diff --git a/qtimageformats b/qtimageformats index e0e8d8d6b37..85f1ce41b70 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit e0e8d8d6b37b24465886dc4fc3355f437a467853 +Subproject commit 85f1ce41b70821a12b31509ad8bfb3f39363d7f7 diff --git a/qtlanguageserver b/qtlanguageserver index 85b7811d25e..4babb8db666 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit 85b7811d25e3c37484ac38a9ab2c0617f2ed2cd4 +Subproject commit 4babb8db6662d96ebc16ac549b1f3dfa8d3200aa diff --git a/qtlocation b/qtlocation index 1f29be9cbcf..755809c891e 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 1f29be9cbcf72ac5fb96940cbdf611d867a469ba +Subproject commit 755809c891e8ad030964487bce6b683db53243fb diff --git a/qtlottie b/qtlottie index f599628bfa2..4c57f5d81c6 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit f599628bfa23f4ee9066a76df07795916c662d50 +Subproject commit 4c57f5d81c66116604203cdc02554a1e13b29eb0 diff --git a/qtmqtt b/qtmqtt index 536e6872c11..a77d45d8da4 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit 536e6872c1190c26f6efb6efb35cc43bcf19879f +Subproject commit a77d45d8da445a4f29bf67ba2a66eff04ab1563c diff --git a/qtmultimedia b/qtmultimedia index 5abcd44698d..89319ce6f04 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 5abcd44698ddb237f3b799471b1dffdf97f281e6 +Subproject commit 89319ce6f047ac2d4926576c37ec88be1b7242a9 diff --git a/qtnetworkauth b/qtnetworkauth index 724c93f0f33..9e172f7be9d 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 724c93f0f335fc86c409449a9234962dd275fbae +Subproject commit 9e172f7be9d0b16a1e83b8045d265502abc71d4f diff --git a/qtopcua b/qtopcua index 5470f2c1d52..ee45814fa8c 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit 5470f2c1d521e57821d56c20b6cc1c8094fcea4b +Subproject commit ee45814fa8cf91c0800c4b6555459e6c9bc31fec diff --git a/qtpositioning b/qtpositioning index 1c5a2a7fb06..c7a4b0646a3 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit 1c5a2a7fb06efea1319fdd0ad52f4648803198cb +Subproject commit c7a4b0646a30cf1302bf4df1fcaf833026ffd86b diff --git a/qtquick3d b/qtquick3d index 4a7b5ccbf8a..6094a108580 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 4a7b5ccbf8aa0951dd7960a3e4532e3bb3fe6715 +Subproject commit 6094a108580c2a95bbd61ff9f2c9825e571c9272 diff --git a/qtquick3dphysics b/qtquick3dphysics index 8e2731cb7be..df2132afb06 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit 8e2731cb7bea38356a23d7800d5a82e8608c8702 +Subproject commit df2132afb06a7f8b7bcb21b51ade09fda6e4d38b diff --git a/qtquickeffectmaker b/qtquickeffectmaker index 1329e780785..dcfa3f9f5e5 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit 1329e78078566837281c148c4ee2cec9440aea1c +Subproject commit dcfa3f9f5e5062e3d4555d90e026418d02ab46e5 diff --git a/qtquicktimeline b/qtquicktimeline index 27b735c78ba..3e84898a209 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 27b735c78ba8881199b5f9dc6373fa3449286e83 +Subproject commit 3e84898a2091fa4d0bb56804cd8be5560075f230 diff --git a/qtremoteobjects b/qtremoteobjects index 891ee38fc80..edcc51e1893 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 891ee38fc8059008c2592ddca84051686aa9ed2b +Subproject commit edcc51e1893ed8568aa5b696dd2feff77393308d diff --git a/qtscxml b/qtscxml index ee921b6b84e..6cbd55df450 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit ee921b6b84e0a382172288bda4270739f2ebe7bb +Subproject commit 6cbd55df450c68d7e75a3b531c2fd1feadd07da4 diff --git a/qtsensors b/qtsensors index e984f0af0df..699abf34cfa 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit e984f0af0df44a6e7fc1957fc80d05ecab4fb511 +Subproject commit 699abf34cfa6b52c2e41bdcce87783adce0008ce diff --git a/qtserialbus b/qtserialbus index c65bfc7af1c..f5940635d07 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit c65bfc7af1c6e42fa50abf2de90ff74a69ea7988 +Subproject commit f5940635d076333cc3f7f039dfe8d287ff38694d diff --git a/qtserialport b/qtserialport index 64138823b4b..ac2473ddd37 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 64138823b4b410afaef282a95571b8bc38e4974b +Subproject commit ac2473ddd371414619d8b202082852341e26b5b7 diff --git a/qtshadertools b/qtshadertools index 11947931a31..8aa97c65f93 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 11947931a3148be4c59a00f4033260d3ef00437f +Subproject commit 8aa97c65f937bb9e00bef805667446dfef78fd80 diff --git a/qtspeech b/qtspeech index 22a6ff56dc3..e9fa37cb430 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 22a6ff56dc3bc6ecdc3213687cec75950d09c017 +Subproject commit e9fa37cb430b13e8610dd55db265e3c59e26953f diff --git a/qtsvg b/qtsvg index ea2481cf66d..7614cadc2a0 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit ea2481cf66dc7ed514be3a814f9e1b649b72f359 +Subproject commit 7614cadc2a03dcefdbaae7be12a819aed8880fd9 diff --git a/qttools b/qttools index 99489fc8e58..92f28c17f36 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 99489fc8e58ae01bed19c6fdcb189f5ea3ce68ad +Subproject commit 92f28c17f36c198c7b73e54236f0ff2ad23d12bf diff --git a/qttranslations b/qttranslations index 384be451b9e..23a13b855cc 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 384be451b9e1fa21faaf99a7fb5f01b752de1831 +Subproject commit 23a13b855cc5d8a65379edb95caec7cc968905cb diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 37fc3a9ab8f..e70d2a9b848 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 37fc3a9ab8f2c65ed4310453b216e5d76543d4c3 +Subproject commit e70d2a9b848cc064609d4455e597c974c072202f diff --git a/qtwayland b/qtwayland index 532da740084..b63be611717 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 532da740084ed04e8799f90aece8c20856780548 +Subproject commit b63be6117179843f178714162d840da420124f1b diff --git a/qtwebchannel b/qtwebchannel index b4d2ca49d1a..0e0811bbaa4 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit b4d2ca49d1a2b0741c869553587ac2efef72c550 +Subproject commit 0e0811bbaa4fb6923a941a297c4d22c1d2e4b350 diff --git a/qtwebengine b/qtwebengine index 6734b4cc4df..e2318ae9b7b 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 6734b4cc4dfddb9ac114104d3bcaee60445a4c89 +Subproject commit e2318ae9b7bc392ea0d53da63afd5f60f4a42186 diff --git a/qtwebsockets b/qtwebsockets index c15898c19a9..277af0da003 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit c15898c19a960434f95d1875ad877471c32a454b +Subproject commit 277af0da00315463f7add2379741071f2352f7f0 diff --git a/qtwebview b/qtwebview index 682a60166de..76a5f52f5d3 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 682a60166def1ec0e48e75a19578d09e3090d584 +Subproject commit 76a5f52f5d3411e12b0dd0b264b6115afffeae7c From 3f15b58b95819aa5b6db9f5f623764dcb08282a1 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 29 Mar 2025 12:27:21 +0000 Subject: [PATCH 74/75] Update submodules on '6.9.0 in qt/qt5' Change-Id: I415ed63f140d327bd070b0269ee78021b164a369 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qt5compat | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtcharts | 2 +- qtcoap | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgraphs | 2 +- qtgrpc | 2 +- qthttpserver | 2 +- qtimageformats | 2 +- qtlanguageserver | 2 +- qtlocation | 2 +- qtlottie | 2 +- qtmqtt | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtopcua | 2 +- qtpositioning | 2 +- qtquick3d | 2 +- qtquick3dphysics | 2 +- qtquickeffectmaker | 2 +- qtquicktimeline | 2 +- qtremoteobjects | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtshadertools | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- 42 files changed, 42 insertions(+), 42 deletions(-) diff --git a/qt3d b/qt3d index 203eed98e62..817da71237a 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 203eed98e6281c12da1944e6556eaaab945465e7 +Subproject commit 817da71237ad5dbd330cfa0f4bef6453f0b3b2ca diff --git a/qt5compat b/qt5compat index f774c455942..fc6136cd56d 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit f774c45594242058754580e4317482a6b2750aaf +Subproject commit fc6136cd56dff94f1b361daa455c89b1e7a9f5a6 diff --git a/qtactiveqt b/qtactiveqt index 25805eab2e8..956cb49031e 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 25805eab2e8fef1b482a2b483d2a45edf2752dc4 +Subproject commit 956cb49031eda680033770737a608d4d7b175576 diff --git a/qtbase b/qtbase index b5e47fa433f..25986746947 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit b5e47fa433f218a47db98a370fbad97c70455e85 +Subproject commit 25986746947798e1a22d0830d3bcb11a55fcd3ae diff --git a/qtcharts b/qtcharts index b88b4d519a7..b70ae640035 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit b88b4d519a7e43f032fd4b1f71fd2b91a5d41c67 +Subproject commit b70ae640035d7cfcf7831cb1ae4b03d654f512a1 diff --git a/qtcoap b/qtcoap index 418d40287c3..ca0a28ab51a 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit 418d40287c38805573c72ada454d3ba3a05f95a0 +Subproject commit ca0a28ab51aa0edbc7b933f0bb90e5ace18e26e4 diff --git a/qtconnectivity b/qtconnectivity index 7ba2c7d9668..ece3a0985bf 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 7ba2c7d9668b6a3bb01c373cf808ad072960a9c4 +Subproject commit ece3a0985bfb5decc20237859c03d58e446d555b diff --git a/qtdatavis3d b/qtdatavis3d index 71c5d014c4f..26d79075db7 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 71c5d014c4f733a40c688c35e2e97b66802079be +Subproject commit 26d79075db7ac12b2b1133a5a0b92bc9213dfb61 diff --git a/qtdeclarative b/qtdeclarative index 46a6bc2c040..47ecb4fa226 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 46a6bc2c04053f33e4cbd442f8f3c07973583191 +Subproject commit 47ecb4fa226253c1ac85be8130ba905f95318f36 diff --git a/qtdoc b/qtdoc index cf2d7395268..0bda6f9e022 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit cf2d7395268615b632abf07884ce55ed016fe805 +Subproject commit 0bda6f9e0229610bbe5473da90e5e507ee7309e3 diff --git a/qtgraphs b/qtgraphs index 0f605c73074..ba29aa033b1 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit 0f605c73074631fa5a21eb4a73d64d4474c1390d +Subproject commit ba29aa033b1878429dd1f12d783c57e516f6f32a diff --git a/qtgrpc b/qtgrpc index 9e4b3368005..4b2cd4aa03a 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit 9e4b3368005d687ca85c5de4936987418a946897 +Subproject commit 4b2cd4aa03a6e17b0dce6c3e01877da5e302f0a4 diff --git a/qthttpserver b/qthttpserver index e7040654cc0..c51fe1d95f6 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit e7040654cc02a8a22c600f6b625ab4937f4ec9b5 +Subproject commit c51fe1d95f664ae2e174d83ac28115b53957faa8 diff --git a/qtimageformats b/qtimageformats index 85f1ce41b70..ef67cca6770 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 85f1ce41b70821a12b31509ad8bfb3f39363d7f7 +Subproject commit ef67cca677009a0fee91bac184d80fc99e4d091f diff --git a/qtlanguageserver b/qtlanguageserver index 4babb8db666..d219e5f4333 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit 4babb8db6662d96ebc16ac549b1f3dfa8d3200aa +Subproject commit d219e5f4333afba7fc5b83a0175930247d5acf1b diff --git a/qtlocation b/qtlocation index 755809c891e..276ffe9b4b7 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 755809c891e8ad030964487bce6b683db53243fb +Subproject commit 276ffe9b4b7bd2f72489273c3a2c53ecc5cbde9a diff --git a/qtlottie b/qtlottie index 4c57f5d81c6..7cd6ebe1638 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 4c57f5d81c66116604203cdc02554a1e13b29eb0 +Subproject commit 7cd6ebe1638c6dbeed6354fc5348ec87566f093b diff --git a/qtmqtt b/qtmqtt index a77d45d8da4..f3ef845e68f 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit a77d45d8da445a4f29bf67ba2a66eff04ab1563c +Subproject commit f3ef845e68fd5887b8518582546137d4635d552a diff --git a/qtmultimedia b/qtmultimedia index 89319ce6f04..653ac764f46 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 89319ce6f047ac2d4926576c37ec88be1b7242a9 +Subproject commit 653ac764f4632188df2123e499e8a47364f6addb diff --git a/qtnetworkauth b/qtnetworkauth index 9e172f7be9d..26d7973d560 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 9e172f7be9d0b16a1e83b8045d265502abc71d4f +Subproject commit 26d7973d560c0c3307c7ef895836d95ff79a028c diff --git a/qtopcua b/qtopcua index ee45814fa8c..0904dd6bd99 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit ee45814fa8cf91c0800c4b6555459e6c9bc31fec +Subproject commit 0904dd6bd999f321aa4f4493e5455fe7325167f6 diff --git a/qtpositioning b/qtpositioning index c7a4b0646a3..b345591854d 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit c7a4b0646a30cf1302bf4df1fcaf833026ffd86b +Subproject commit b345591854d8e715ae9dbaac0d2565c74e1225ea diff --git a/qtquick3d b/qtquick3d index 6094a108580..1a50a5d1a5c 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 6094a108580c2a95bbd61ff9f2c9825e571c9272 +Subproject commit 1a50a5d1a5cd4f07d23490325964a599bfea8dc1 diff --git a/qtquick3dphysics b/qtquick3dphysics index df2132afb06..04949741f24 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit df2132afb06a7f8b7bcb21b51ade09fda6e4d38b +Subproject commit 04949741f24bc3c2d5a3793340c47522140373f5 diff --git a/qtquickeffectmaker b/qtquickeffectmaker index dcfa3f9f5e5..2db777f18e2 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit dcfa3f9f5e5062e3d4555d90e026418d02ab46e5 +Subproject commit 2db777f18e256e6507f5d5371bdfd37697b8c591 diff --git a/qtquicktimeline b/qtquicktimeline index 3e84898a209..6c2a7848571 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 3e84898a2091fa4d0bb56804cd8be5560075f230 +Subproject commit 6c2a7848571c3ecf20b9c8c673c6e73c7a11ea29 diff --git a/qtremoteobjects b/qtremoteobjects index edcc51e1893..0985f861806 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit edcc51e1893ed8568aa5b696dd2feff77393308d +Subproject commit 0985f8618069965b66d105d2fac106f72e41473b diff --git a/qtscxml b/qtscxml index 6cbd55df450..9b99f8e446b 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 6cbd55df450c68d7e75a3b531c2fd1feadd07da4 +Subproject commit 9b99f8e446b49b3f527c3d23fbd3470d9c4e881f diff --git a/qtsensors b/qtsensors index 699abf34cfa..9ed2d79ff2f 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 699abf34cfa6b52c2e41bdcce87783adce0008ce +Subproject commit 9ed2d79ff2faf5d3c6afa70a97c51653f76f7e54 diff --git a/qtserialbus b/qtserialbus index f5940635d07..e5476371955 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit f5940635d076333cc3f7f039dfe8d287ff38694d +Subproject commit e547637195589dea21094d670c675b9793197b73 diff --git a/qtserialport b/qtserialport index ac2473ddd37..87eaa4a16ca 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit ac2473ddd371414619d8b202082852341e26b5b7 +Subproject commit 87eaa4a16ca21b7110e36b3ce11c287af30b6193 diff --git a/qtshadertools b/qtshadertools index 8aa97c65f93..d6b8c38ef5b 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 8aa97c65f937bb9e00bef805667446dfef78fd80 +Subproject commit d6b8c38ef5b4ad382bc8bfaf8a9b81e748daba9e diff --git a/qtspeech b/qtspeech index e9fa37cb430..0370bc1fe4d 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit e9fa37cb430b13e8610dd55db265e3c59e26953f +Subproject commit 0370bc1fe4d4071149149d890dce98b78ef09883 diff --git a/qtsvg b/qtsvg index 7614cadc2a0..0d6c7fd8159 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 7614cadc2a03dcefdbaae7be12a819aed8880fd9 +Subproject commit 0d6c7fd8159b7307f53403a4eba21848ecb4dc5c diff --git a/qttools b/qttools index 92f28c17f36..087e300bf28 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 92f28c17f36c198c7b73e54236f0ff2ad23d12bf +Subproject commit 087e300bf286aaee92682d828ee0bd622e00d52a diff --git a/qttranslations b/qttranslations index 23a13b855cc..929f433290b 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 23a13b855cc5d8a65379edb95caec7cc968905cb +Subproject commit 929f433290b79dfcb88d357fb166b358c32e6a3c diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index e70d2a9b848..1dc69c101c8 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit e70d2a9b848cc064609d4455e597c974c072202f +Subproject commit 1dc69c101c8eac14a8f4dfc2b7ba41334bf9b4f7 diff --git a/qtwayland b/qtwayland index b63be611717..9a9a0416e7c 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit b63be6117179843f178714162d840da420124f1b +Subproject commit 9a9a0416e7c8c5a8c6eb59207714af197966cdc5 diff --git a/qtwebchannel b/qtwebchannel index 0e0811bbaa4..bd8526ac42e 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 0e0811bbaa4fb6923a941a297c4d22c1d2e4b350 +Subproject commit bd8526ac42e195501887e387472db0a90b50dbc1 diff --git a/qtwebengine b/qtwebengine index e2318ae9b7b..444c84a6c36 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit e2318ae9b7bc392ea0d53da63afd5f60f4a42186 +Subproject commit 444c84a6c36de4f17d1dbd87710ff5659b71c8bc diff --git a/qtwebsockets b/qtwebsockets index 277af0da003..0707110b34e 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 277af0da00315463f7add2379741071f2352f7f0 +Subproject commit 0707110b34e99ae48b61dbd3087f2edfcc940f93 diff --git a/qtwebview b/qtwebview index 76a5f52f5d3..93adf4e6785 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 76a5f52f5d3411e12b0dd0b264b6115afffeae7c +Subproject commit 93adf4e67859fa50f3800985ff96a188a06719ec From be047a1a142c14b0a5b2c61ff6e54e8c733627fe Mon Sep 17 00:00:00 2001 From: Olli Vuolteenaho Date: Tue, 4 Mar 2025 09:15:46 +0200 Subject: [PATCH 75/75] QtAA: Add "documentation-warnings" config Starting from 6.9 the "ubuntu-22.04-documentation-x11-tests" config was replaced by "ubuntu-22.04-developer-build-x11-tests". The new configuration doesn't test the documentation for warnings which is why we had failures in 6.8 where to docs were checked but not in 6.9 or dev. This commit fixes the issue by adding the relatively new "documentation-warnings" configuration, which will once again check our documentation. See also 434e4a224acf48b9b2648eda393e56b5d22f2e9a . Task-number: QAA-2878 Change-Id: I479a9606ab16f8b87009d26ab03636c4c658fcb5 Reviewed-by: Liang Qi Reviewed-by: Jukka Jokiniva (cherry picked from commit ea1abd55ce62e22cd31ccc0803d5ab4664af37a2) Reviewed-by: Assam Boudjelthia (cherry picked from commit f95d6b1fdb6c3eb70f521efdc8f309f6f2366a6b) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/tqtc-android-automotive.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/coin/platform_configs/tqtc-android-automotive.yaml b/coin/platform_configs/tqtc-android-automotive.yaml index 518034db182..ae0d1bf0cf8 100644 --- a/coin/platform_configs/tqtc-android-automotive.yaml +++ b/coin/platform_configs/tqtc-android-automotive.yaml @@ -1,6 +1,7 @@ Version: 2 Include: [ cmake_platforms.yaml: [ + "documentation-warnings", "rhel-8.10", 'windows-10_22h2-mingw13', 'ubuntu-22.04-developer-build',