From 8f7aafe9d32c56d0d85e7502cab0fe77e1406ca6 Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Mon, 9 Dec 2024 06:11:28 +0000 Subject: [PATCH 001/204] 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 002/204] 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 003/204] 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 004/204] 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 005/204] 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 006/204] 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 007/204] 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 008/204] 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 009/204] 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("${repo_relative_url_with_namespace}" normalized_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("${submodule_url}" submodule_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("${mirror}" mirror) 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("${base_git_path}" base_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 010/204] 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 011/204] 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 012/204] 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 013/204] 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/${tarBallPackage}" 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_${zipVersion}.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 014/204] 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 015/204] 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 016/204] 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 017/204] 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 018/204] 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 019/204] 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 020/204] 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 021/204] 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 022/204] 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 023/204] 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 024/204] 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 025/204] 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 026/204] 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 027/204] 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 028/204] 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 029/204] 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 030/204] 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 031/204] 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 032/204] 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 033/204] 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 034/204] 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 035/204] 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 036/204] 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 037/204] 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 038/204] 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 039/204] 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 040/204] 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 041/204] 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 042/204] 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/${tarBallPackage}" 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_${zipVersion}.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 043/204] 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 044/204] 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/${chromeVersion}.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/${chromeVersion}.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 045/204] 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 046/204] 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 047/204] 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 048/204] 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 049/204] 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 050/204] 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 051/204] 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 052/204] 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 053/204] 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 054/204] 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 055/204] 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 056/204] 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 057/204] 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 058/204] 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 059/204] 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 060/204] 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 061/204] 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 c2fcaa282095c7f57afec949d19b4c8239ac52a8 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Tue, 25 Feb 2025 11:24:39 +0100 Subject: [PATCH 062/204] COIN/QtCreator: Update to qtci-windows-11_23H2-x86_64-54 Use same as other products Change-Id: I2a289cce1a7716017bae6ad3f28d088e322fdc3a Reviewed-by: Tero Heikkinen (cherry picked from commit 75f99d20a73f3b3d31e2e55385cf542e6adb8558) 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 d1401e71d78..9091821a654 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-11_23H2-x86_64-53' + Template: 'qtci-windows-11_23H2-x86_64-54' Compiler: 'MSVC2022' Features: ['Sccache', 'DebugAndRelease'] Configure arguments: '' @@ -28,7 +28,7 @@ Configurations: Environment variables: [] # without tests - - Template: 'qtci-windows-11_23H2-x86_64-53' + Template: 'qtci-windows-11_23H2-x86_64-54' 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-11_23H2-x86_64-53' + Template: 'qtci-windows-11_23H2-x86_64-54' Compiler: 'MSVC2022' Features: ['Sccache', 'DebugAndRelease', 'OldestQt'] Configure arguments: '' From e6386a1a18e6830e7b61eb99fbb05c9d810644f0 Mon Sep 17 00:00:00 2001 From: Timur Pocheptsov Date: Tue, 4 Mar 2025 12:51:43 +0100 Subject: [PATCH 063/204] 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. Pick-to: 6.9.0 6.8 Fixes: QTBUG-134289 Change-Id: I74ef7700549abdccbe569ecd5d8e780fefca6e11 Reviewed-by: Nils Petter Skålerud Reviewed-by: Artem Dyomin --- 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 bcd7a6168cea5125fe7072f8c9531a4147712a3f Mon Sep 17 00:00:00 2001 From: Tuomas Vaarala Date: Wed, 15 Jan 2025 13:07:55 +0200 Subject: [PATCH 064/204] Set CMAKE_OBJCOPY for QNX builds in toolchain file Fixes: QTBUG-132801 Pick-to: 6.8 Change-Id: I9b68ac60cc540524c789fad7af0107b8b023af8e Reviewed-by: Alexandru Croitor (cherry picked from commit f82829a1a2970af68adc379fa52f8a7411f59013) Reviewed-by: Qt Cherry-pick Bot --- .../shared/cmake_toolchain_files/qnx-toolchain-aarch64le.cmake | 1 + .../shared/cmake_toolchain_files/qnx-toolchain-armv7le.cmake | 1 + .../shared/cmake_toolchain_files/qnx-toolchain-x8664.cmake | 1 + 3 files changed, 3 insertions(+) diff --git a/coin/provisioning/common/shared/cmake_toolchain_files/qnx-toolchain-aarch64le.cmake b/coin/provisioning/common/shared/cmake_toolchain_files/qnx-toolchain-aarch64le.cmake index d787d555126..1ceca7c5565 100644 --- a/coin/provisioning/common/shared/cmake_toolchain_files/qnx-toolchain-aarch64le.cmake +++ b/coin/provisioning/common/shared/cmake_toolchain_files/qnx-toolchain-aarch64le.cmake @@ -25,5 +25,6 @@ set(CMAKE_CXX_COMPILER_TARGET ${_qnx_toolchain_arch}) set(CMAKE_STRIP $ENV{QNX_HOST}/usr/bin/ntoaarch64-strip) set(CMAKE_AR $ENV{QNX_HOST}/usr/bin/ntoaarch64-ar) +set(CMAKE_OBJCOPY $ENV{QNX_HOST}/usr/bin/ntoaarch64-objcopy) set(CMAKE_SYSROOT $ENV{QNX_TARGET}) diff --git a/coin/provisioning/common/shared/cmake_toolchain_files/qnx-toolchain-armv7le.cmake b/coin/provisioning/common/shared/cmake_toolchain_files/qnx-toolchain-armv7le.cmake index d270530b815..5bbdd1dbbec 100644 --- a/coin/provisioning/common/shared/cmake_toolchain_files/qnx-toolchain-armv7le.cmake +++ b/coin/provisioning/common/shared/cmake_toolchain_files/qnx-toolchain-armv7le.cmake @@ -25,5 +25,6 @@ set(CMAKE_CXX_COMPILER_TARGET ${_qnx_toolchain_arch}) set(CMAKE_STRIP $ENV{QNX_HOST}/usr/bin/ntoarmv7-strip) set(CMAKE_AR $ENV{QNX_HOST}/usr/bin/ntoarmv7-ar) +set(CMAKE_OBJCOPY $ENV{QNX_HOST}/usr/bin/ntoarmv7-objcopy) set(CMAKE_SYSROOT $ENV{QNX_TARGET}) diff --git a/coin/provisioning/common/shared/cmake_toolchain_files/qnx-toolchain-x8664.cmake b/coin/provisioning/common/shared/cmake_toolchain_files/qnx-toolchain-x8664.cmake index a7bb7b5e1c4..a83160418a6 100644 --- a/coin/provisioning/common/shared/cmake_toolchain_files/qnx-toolchain-x8664.cmake +++ b/coin/provisioning/common/shared/cmake_toolchain_files/qnx-toolchain-x8664.cmake @@ -25,5 +25,6 @@ set(CMAKE_CXX_COMPILER_TARGET ${_qnx_toolchain_arch}) set(CMAKE_STRIP $ENV{QNX_HOST}/usr/bin/ntox86_64-strip) set(CMAKE_AR $ENV{QNX_HOST}/usr/bin/ntox86_64-ar) +set(CMAKE_OBJCOPY $ENV{QNX_HOST}/usr/bin/ntox86_64-objcopy) set(CMAKE_SYSROOT $ENV{QNX_TARGET}) From 6d85e52e64d9523068959ca4835ac5a550b67a50 Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Fri, 17 Jan 2025 17:46:30 +0100 Subject: [PATCH 065/204] Update Protobuf ROOT env variable match package name find_package looks for PackageName_ROOT and the package is now named 'protobuf'. Fixes: QTBUG-132901 Change-Id: Ifb956e4ab52c3df059d2624eb989c97473a662a2 Reviewed-by: Alexandru Croitor Reviewed-by: Alexey Edelev (cherry picked from commit b2e1673d99c64df4d2ac0b3d129a8f4590ea3cb1) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/common/unix/install_protobuf.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/provisioning/common/unix/install_protobuf.sh b/coin/provisioning/common/unix/install_protobuf.sh index bf3a6d90f03..9bb31c1f4b8 100755 --- a/coin/provisioning/common/unix/install_protobuf.sh +++ b/coin/provisioning/common/unix/install_protobuf.sh @@ -92,7 +92,7 @@ cmake "$targetDir" -G"Ninja Multi-Config" \ ninja all:all sudo env "PATH=$PATH" ninja install:all -SetEnvVar "Protobuf_ROOT" "$installPrefix/lib/cmake/protobuf" +SetEnvVar "protobuf_ROOT" "$installPrefix/lib/cmake/protobuf" # Refresh shared library cache if OS isn't macOS if uname -a |grep -qv "Darwin"; then From 62d9b4200c54bb0f7b7ed58904720f3f035b80e8 Mon Sep 17 00:00:00 2001 From: Paul Wicking Date: Sun, 6 Oct 2024 19:33:11 +0200 Subject: [PATCH 066/204] Update Clang libraries for QDoc to 19.1.7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update the version variable used to identify the correct package for download and cache sites. * Update the file names for all platforms, as these libraries are built directly from upstream without other patches applied on top. * Add provisioning package locations for Windows VS2022 x64. * Set 'vs2022' as default toolchain on Windows. * Update call sites for `libclang.ps1` to pass `vs2022` as argument to the script. * Drop Windows configurations with VS2019. * Update cached and official URLs with the major version for Windows platforms. * Update SHA1 for provisioning packages on all platforms. * Move from RHEL 8.8 to 8.10. * Move from RHEL 9.2 to 9.4. Fixes: QTBUG-129506 Fixes: QTQAINFRA-6605 Task-number: QTBUG-129373 Pick-to: 6.8 Change-Id: I5146e6551a1b3c83133803f61ca6f8428cb6a14f Reviewed-by: Topi Reiniö (cherry picked from commit 9ff9d34626bd65c6dd448ed0e232df58a72a0052) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/common/unix/libclang.sh | 38 +++++++++---------- coin/provisioning/common/windows/libclang.ps1 | 26 ++++--------- .../08-libclang.ps1 | 2 +- .../08-libclang.ps1 | 2 +- .../08-libclang.ps1 | 2 +- .../08-libclang.ps1 | 2 +- 6 files changed, 31 insertions(+), 41 deletions(-) diff --git a/coin/provisioning/common/unix/libclang.sh b/coin/provisioning/common/unix/libclang.sh index b720fcf7c3c..1e5ebf4f28e 100755 --- a/coin/provisioning/common/unix/libclang.sh +++ b/coin/provisioning/common/unix/libclang.sh @@ -20,38 +20,38 @@ PROVISIONING_DIR="$(dirname "$0")/../../" # shellcheck source=./common.sourced.sh source "$PROVISIONING_DIR"/common/unix/common.sourced.sh -libclang_version="18.1.7" +libclang_version="19.1.7" if uname -a |grep -q Darwin; then version=$libclang_version - url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version}-based-mac.7z" - url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-release_${version}-based-mac.7z" - sha1="9ea511576645ef4abee6d4c27550406e929334d5" + url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-llvmorg-${version}-macos-universal.7z" + url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-llvmorg-${version}-macos-universal.7z" + sha1="0b30bbe47cefe413a6d2fbc3da6b0b8ac5d84613" elif test -f /etc/redhat-release && grep "Red Hat" /etc/redhat-release | grep "9" ; then version=$libclang_version - url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version}-based-linux-Rhel9.2-gcc10.0-x86_64.7z" - url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-release_${version}-based-linux-Rhel9.2-gcc10.0-x86_64.7z" - sha1="32c29d8df726b035e0a97e767c5c3e392aa331e1" + url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-llvmorg-${version}-linux-Rhel9.4-gcc11.4-x86_64.7z" + url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-llvmorg-${version}-linux-Rhel9.4-gcc11.4-x86_64.7z" + sha1="1657d6a9419e9d3ecf4416cd757f488c079ec779" elif test "$PROVISIONING_OS_ID" == "debian" && test "$PROVISIONING_ARCH" == "arm64" ; then version=$libclang_version - url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version}-based-linux-Debian11.6-gcc10.0-arm64.7z" - url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-release_${version}-based-linux-Debian11.6-gcc10.0-arm64.7z" - sha1="8d876f60c2fe9c55e18fbac0be2acb70bd20d5d1" + url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-llvmorg-${version}-linux-Debian11.6-gcc10.0-arm64.7z" + url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-llvmorg-${version}-linux-Debian11.6-gcc10.0-arm64.7z" + sha1="2536f55987d6240c40fd1127895b0885d41148ed" elif test "$PROVISIONING_OS_ID" == "ubuntu" && test "$PROVISIONING_ARCH" == "arm64" ; then version=$libclang_version - url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version}-based-linux-Ubuntu24.04-gcc11.2-arm64.7z" - url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-release_${version}-based-linux-Ubuntu24.04-gcc11.2-arm64.7z" - sha1="5a7bda4fbd2c52ae66557034591d977ba617482c" + url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-llvmorg-${version}-linux-Ubuntu24.04-gcc11.2-arm64.7z" + url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-llvmorg-${version}-linux-Ubuntu24.04-gcc11.2-arm64.7z" + sha1="0e1c0c492f9fcd669a77fe4480cfa271f408af9e" elif test "$PROVISIONING_OS_ID" == "ubuntu" && test "$PROVISIONING_ARCH" == "x86_64" ; then version=$libclang_version - url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version}-based-linux-Ubuntu22.04-gcc11.2-x86_64.7z" - url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-release_${version}-based-linux-Ubuntu22.04-gcc11.2-x86_64.7z" - sha1="b9f8735a148342174d7d763b5475175cd0827441" + url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-llvmorg-${version}-linux-Ubuntu22.04-gcc11.2-x86_64.7z" + url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-llvmorg-${version}-linux-Ubuntu22.04-gcc11.2-x86_64.7z" + sha1="eed115ea52f3b4283d02d96cd8f4fce95c5aaafe" else version=$libclang_version - url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version}-based-linux-Rhel8.8-gcc10.0-x86_64.7z" - url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-release_${version}-based-linux-Rhel8.8-gcc10.0-x86_64.7z" - sha1="a51c5562c9b071250e7971390d55ef21924271ca" + url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-llvmorg-${version}-linux-Rhel8.10-gcc10.0-x86_64.7z" + url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-llvmorg-${version}-linux-Rhel8.10-gcc10.0-x86_64.7z" + sha1="479fa87ad804ec91a462ccb20fc9acad6982bddb" fi zip="/tmp/libclang.7z" diff --git a/coin/provisioning/common/windows/libclang.ps1 b/coin/provisioning/common/windows/libclang.ps1 index 615c496bef2..4fb44af6eb4 100644 --- a/coin/provisioning/common/windows/libclang.ps1 +++ b/coin/provisioning/common/windows/libclang.ps1 @@ -1,11 +1,11 @@ param( [string]$archVer="32", - [string]$toolchain="vs2019", + [string]$toolchain="vs2022", [bool]$setDefault=$true ) . "$PSScriptRoot\helpers.ps1" -$libclang_version="18.1.7" +$libclang_version="19.1.7" Write-Output "libClang = $libclang_version" >> ~/versions.txt # PySide versions following 5.6 use a C++ parser based on Clang (http://clang.org/). @@ -24,8 +24,8 @@ function install() { $zip = "c:\users\qt\downloads\libclang.7z" - $script:OfficialUrl = "https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_$libclang_version-based-windows-$toolchain`_$archVer.7z" - $script:CachedUrl = "http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-release_$libclang_version-based-windows-$toolchain`_$archVer.7z" + $script:OfficialUrl = "https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-llvmorg-$libclang_version-windows-$toolchain`_$archVer.7z" + $script:CachedUrl = "http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-llvmorg-$libclang_version-windows-$toolchain`_$archVer.7z" Download $OfficialUrl $CachedUrl $zip Verify-Checksum $zip $sha1 @@ -38,20 +38,10 @@ $toolchainSuffix = "" if ( $toolchain -eq "vs2022" ) { if ( $archVer -eq "64" ) { - $sha1 = "7e51f0eabdfe8eea17aaf1dce7b2ffe1ea064f66" + $sha1 = "f56057b8679e21a44b341bb1041cb03fbe6f5c0d" } elseif ( $archVer -eq "arm64" ) { - $sha1 = "986d4d0f253de505ef499345238c101dac1ca3a6" - } - else { - $sha1 = "" - } - $toolchainSuffix = "msvc" -} - -if ( $toolchain -eq "vs2019" ) { - if ( $archVer -eq "64" ) { - $sha1 = "8e0862386caef7e4537599ef980eeb6ebee8767f" + $sha1 = "89fddd8c4bde3e8b70382e21059743637c27d38d" } else { $sha1 = "" @@ -61,7 +51,7 @@ if ( $toolchain -eq "vs2019" ) { if ( $toolchain -eq "mingw" ) { if ( $archVer -eq "64" ) { - $sha1 = "a23cbb0822cf2eb8d1cecf26e8614ef37a7611e3" + $sha1 = "fcc1f06bd395bc133b7828d0be48e8492b9ba807" } else { $sha1 = "" @@ -72,7 +62,7 @@ if ( $toolchain -eq "mingw" ) { if ( $toolchain -eq "llvm-mingw" ) { if ( $archVer -eq "64" ) { - $sha1 = "9c34f99eb575b42c2befe27829c08e6d3f01ae58" + $sha1 = "ee01352eb68bee252cefb1b8ff4ad086baa8ab5f" } else { $sha1 = "" diff --git a/coin/provisioning/qtci-windows-10_22H2-x86_64/08-libclang.ps1 b/coin/provisioning/qtci-windows-10_22H2-x86_64/08-libclang.ps1 index 88247275d9b..e6c78345381 100644 --- a/coin/provisioning/qtci-windows-10_22H2-x86_64/08-libclang.ps1 +++ b/coin/provisioning/qtci-windows-10_22H2-x86_64/08-libclang.ps1 @@ -1,4 +1,4 @@ # Do not set the default LLVM_INSTALL_DIR for mingw, leave it with msvc for compat . "$PSScriptRoot\..\common\windows\libclang.ps1" 64 mingw $False . "$PSScriptRoot\..\common\windows\libclang.ps1" 64 llvm-mingw $False -. "$PSScriptRoot\..\common\windows\libclang.ps1" 64 vs2019 +. "$PSScriptRoot\..\common\windows\libclang.ps1" 64 vs2022 diff --git a/coin/provisioning/qtci-windows-11_21H2-x86_64/08-libclang.ps1 b/coin/provisioning/qtci-windows-11_21H2-x86_64/08-libclang.ps1 index 7681f01a44e..daa06f93c36 100644 --- a/coin/provisioning/qtci-windows-11_21H2-x86_64/08-libclang.ps1 +++ b/coin/provisioning/qtci-windows-11_21H2-x86_64/08-libclang.ps1 @@ -1,3 +1,3 @@ # Do not set the default LLVM_INSTALL_DIR for mingw, leave it with msvc for compat . "$PSScriptRoot\..\common\windows\libclang.ps1" 64 mingw $False -. "$PSScriptRoot\..\common\windows\libclang.ps1" 64 vs2019 +. "$PSScriptRoot\..\common\windows\libclang.ps1" 64 vs2022 diff --git a/coin/provisioning/qtci-windows-11_22H2-x86_64/08-libclang.ps1 b/coin/provisioning/qtci-windows-11_22H2-x86_64/08-libclang.ps1 index 88247275d9b..e6c78345381 100644 --- a/coin/provisioning/qtci-windows-11_22H2-x86_64/08-libclang.ps1 +++ b/coin/provisioning/qtci-windows-11_22H2-x86_64/08-libclang.ps1 @@ -1,4 +1,4 @@ # Do not set the default LLVM_INSTALL_DIR for mingw, leave it with msvc for compat . "$PSScriptRoot\..\common\windows\libclang.ps1" 64 mingw $False . "$PSScriptRoot\..\common\windows\libclang.ps1" 64 llvm-mingw $False -. "$PSScriptRoot\..\common\windows\libclang.ps1" 64 vs2019 +. "$PSScriptRoot\..\common\windows\libclang.ps1" 64 vs2022 diff --git a/coin/provisioning/qtci-windows-11_23H2-x86_64/08-libclang.ps1 b/coin/provisioning/qtci-windows-11_23H2-x86_64/08-libclang.ps1 index 88247275d9b..e6c78345381 100644 --- a/coin/provisioning/qtci-windows-11_23H2-x86_64/08-libclang.ps1 +++ b/coin/provisioning/qtci-windows-11_23H2-x86_64/08-libclang.ps1 @@ -1,4 +1,4 @@ # Do not set the default LLVM_INSTALL_DIR for mingw, leave it with msvc for compat . "$PSScriptRoot\..\common\windows\libclang.ps1" 64 mingw $False . "$PSScriptRoot\..\common\windows\libclang.ps1" 64 llvm-mingw $False -. "$PSScriptRoot\..\common\windows\libclang.ps1" 64 vs2019 +. "$PSScriptRoot\..\common\windows\libclang.ps1" 64 vs2022 From 3dff41a4477712125191c7fdcaf203a79672d15c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aku=20Pietik=C3=A4inen?= Date: Mon, 24 Feb 2025 10:25:29 +0200 Subject: [PATCH 067/204] Homebrew flakiness improvements MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use prebuilt package stored in intranet when possible and use intranet mirror when git is required. Task-number: QTQAINFRA-6903 Pick-to: 6.8 6.5 5.15 Change-Id: I1630098756c2e9b4f551686679e98a40af5eef2d Reviewed-by: Simo Fält (cherry picked from commit f23cd54e7f6a1953030e9c013b030b3e4beadcc9) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/common/macos/homebrew.sh | 68 ++++++++++++++++--- .../common/macos/homebrew_for_arm_mac.sh | 30 -------- .../qtci-macos-10.15-x86_64/25-homebrew.sh | 10 ++- .../qtci-macos-11-arm/23-homebrew.sh | 14 ++-- .../qtci-macos-11-x86_64/25-homebrew.sh | 32 +++------ .../qtci-macos-12-arm/23-homebrew.sh | 14 ++-- .../qtci-macos-12-x86_64/25-homebrew.sh | 32 +++------ .../qtci-macos-13-arm/23-homebrew.sh | 18 ++--- .../qtci-macos-13-x86_64/25-homebrew.sh | 32 +++------ .../qtci-macos-14-arm/23-homebrew.sh | 18 ++--- .../qtci-macos-14-x86_64/25-homebrew.sh | 30 +++----- .../qtci-macos-15-arm/23-homebrew.sh | 18 ++--- .../qtci-macos-15-x86_64/25-homebrew.sh | 30 +++----- 13 files changed, 140 insertions(+), 206 deletions(-) delete mode 100755 coin/provisioning/common/macos/homebrew_for_arm_mac.sh diff --git a/coin/provisioning/common/macos/homebrew.sh b/coin/provisioning/common/macos/homebrew.sh index 4f3a93ba8b1..9c0ef68149b 100755 --- a/coin/provisioning/common/macos/homebrew.sh +++ b/coin/provisioning/common/macos/homebrew.sh @@ -1,23 +1,71 @@ #!/bin/bash -#Copyright (C) 2023 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 # Will install homebrew package manager for macOS. # WARNING: Requires commandlinetools - set -e +INSTALLTYPE="$1" +VERSION="$2" +CHECKSUM="$3" + +DEFAULT_PKG_VERSION="4.4.21" +DEFAULT_PKG_VERSION_CHECKSUM="cd83c4123d5db7d07eb3042f1c785ed7f599183c5c542040bc6abfa722583861" +DEFAULT_GIT_VERSION="deb02e27d99fd2cb27ae16760e3a5272b612fded" +DEFAULT_GIT_VERSION_CHECKSUM="a30b9fbf0d5c2cff3eb1d0643cceee30d8ba6ea1bb7bcabf60d3188bd62e6ba6" + source "$(dirname "$0")"/../../common/unix/DownloadURL.sh +source "$(dirname "$0")"/../../common/unix/SetEnvVar.sh + +installPkg() { + if [ "$VERSION" == "" ]; then + VERSION="$DEFAULT_PKG_VERSION" + CHECKSUM="$DEFAULT_PKG_VERSION_CHECKSUM" + fi + DownloadURL \ + "http://ci-files01-hki.ci.qt.io/input/mac/homebrew/$VERSION/Homebrew-$VERSION.pkg" \ + "https://github.com/Homebrew/brew/releases/download/$VERSION/Homebrew-$VERSION.pkg" \ + "$CHECKSUM" \ + "/tmp/Homebrew-$VERSION.pkg" + + sudo installer -pkg "/tmp/Homebrew-$VERSION.pkg" -target / + # Add homebrew to PATH + SetEnvVar "PATH" "/opt/homebrew/bin:$PATH" + + echo "Homebrew = $VERSION" >> ~/versions.txt +} + +installGit() { + if [ "$VERSION" == "" ]; then + VERSION="$DEFAULT_GIT_VERSION" + CHECKSUM="$DEFAULT_GIT_VERSION_CHECKSUM" + fi + + export HOMEBREW_BREW_GIT_REMOTE="https://git.intra.qt.io/external-repository-mirrors/homebrew/brew.git" # put your Git mirror of Homebrew/brew here + export HOMEBREW_CORE_GIT_REMOTE="https://git.intra.qt.io/external-repository-mirrors/homebrew/homebrew-core.git" # put your Git mirror of Homebrew/homebrew-core here + DownloadURL \ + "https://git.intra.qt.io/external-repository-mirrors/homebrew/install/-/raw/$VERSION/install.sh" \ + "https://git.intra.qt.io/external-repository-mirrors/homebrew/install/-/raw/$VERSION/install.sh" \ + $CHECKSUM \ + /tmp/homebrew_install.sh + DownloadURL "http://ci-files01-hki.ci.qt.io/input/semisecure/sign/pw" "http://ci-files01-hki.ci.qt.io/input/semisecure/sign/pw" "aae58d00d0a1b179a09f21cfc67f9d16fb95ff36" "/Users/qt/pw" + { pw=$(cat "/Users/qt/pw"); } 2> /dev/null + sudo chmod 755 /tmp/homebrew_install.sh + { (echo "$pw" | /tmp/homebrew_install.sh); } 2> /dev/null + rm -f "/Users/qt/pw" +} -DownloadURL \ - http://ci-files01-hki.ci.qt.io/input/mac/homebrew-install.c744a716f9845988d01e6e238eee7117b8c366c9.rb \ - https://raw.githubusercontent.com/Homebrew/install/c744a716f9845988d01e6e238eee7117b8c366c9/install \ - b9782cc0b550229de77b429b56ffce04157e60486ab9df00461ccf3dad565b0a \ - /tmp/homebrew_install -/usr/bin/ruby /tmp/homebrew_install /dev/null -sudo chmod 755 /tmp/homebrew_install.sh -{ (echo "$pw" | /tmp/homebrew_install.sh); } 2> /dev/null -rm -f "/Users/qt/pw" - -# No need to manually do `brew update`, the homebrew installer script does it. -### brew update - -SetEnvVar "PATH" "\$PATH:/opt/homebrew/bin" diff --git a/coin/provisioning/qtci-macos-10.15-x86_64/25-homebrew.sh b/coin/provisioning/qtci-macos-10.15-x86_64/25-homebrew.sh index b26d81daf7a..54321000859 100755 --- a/coin/provisioning/qtci-macos-10.15-x86_64/25-homebrew.sh +++ b/coin/provisioning/qtci-macos-10.15-x86_64/25-homebrew.sh @@ -1,8 +1,12 @@ #!/usr/bin/env bash -#Copyright (C) 2023 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 -set -e +set -ex + +INSTALLTYPE="GIT" BASEDIR=$(dirname "$0") -"$BASEDIR/../common/macos/homebrew.sh" +# Usage "$BASEDIR/../common/macos/homebrew.sh" "$INSTALLTYPE" "$HOMEBREW_VERSION" "$HOMEBREW_HASH" +# Specify HOMEBREW_VERSION and HOMEBREW_HASH only if defaults set in homebrew.sh are not suitable for this platform +"$BASEDIR/../common/macos/homebrew.sh" "$INSTALLTYPE" diff --git a/coin/provisioning/qtci-macos-11-arm/23-homebrew.sh b/coin/provisioning/qtci-macos-11-arm/23-homebrew.sh index c63771140e6..54321000859 100755 --- a/coin/provisioning/qtci-macos-11-arm/23-homebrew.sh +++ b/coin/provisioning/qtci-macos-11-arm/23-homebrew.sh @@ -1,12 +1,12 @@ #!/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 +#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 -# Will install homebrew package manager for macOS. -# WARNING: Requires commandlinetools +set -ex - -set -e +INSTALLTYPE="GIT" BASEDIR=$(dirname "$0") -"$BASEDIR/../common/macos/homebrew_for_arm_mac.sh" +# Usage "$BASEDIR/../common/macos/homebrew.sh" "$INSTALLTYPE" "$HOMEBREW_VERSION" "$HOMEBREW_HASH" +# Specify HOMEBREW_VERSION and HOMEBREW_HASH only if defaults set in homebrew.sh are not suitable for this platform +"$BASEDIR/../common/macos/homebrew.sh" "$INSTALLTYPE" diff --git a/coin/provisioning/qtci-macos-11-x86_64/25-homebrew.sh b/coin/provisioning/qtci-macos-11-x86_64/25-homebrew.sh index f83960f43be..54321000859 100755 --- a/coin/provisioning/qtci-macos-11-x86_64/25-homebrew.sh +++ b/coin/provisioning/qtci-macos-11-x86_64/25-homebrew.sh @@ -1,28 +1,12 @@ #!/usr/bin/env bash -# Copyright (C) 2021 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 +#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 -# Will install homebrew package manager for macOS. -# WARNING: Requires commandlinetools +set -ex +INSTALLTYPE="GIT" -set -e - -. "$(dirname "$0")"/../common/unix/DownloadURL.sh - - -DownloadURL \ - http://ci-files01-hki.ci.qt.io/input/mac/homebrew/a822f0d0f1838c07e86b356fcd2bf93c7a11c2aa/install.sh \ - https://raw.githubusercontent.com/Homebrew/install/c744a716f9845988d01e6e238eee7117b8c366c9/install \ - 3210da71e12a699ab3bba43910a6d5fc64b92000 \ - /tmp/homebrew_install.sh - -DownloadURL "http://ci-files01-hki.ci.qt.io/input/semisecure/sign/pw" "http://ci-files01-hki.ci.qt.io/input/semisecure/sign/pw" "aae58d00d0a1b179a09f21cfc67f9d16fb95ff36" "/Users/qt/pw" -{ pw=$(cat "/Users/qt/pw"); } 2> /dev/null -sudo chmod 755 /tmp/homebrew_install.sh -{ (echo "$pw" | /tmp/homebrew_install.sh); } 2> /dev/null -rm -f "/Users/qt/pw" - -# No need to manually do `brew update`, the homebrew installer script does it. -### brew update - +BASEDIR=$(dirname "$0") +# Usage "$BASEDIR/../common/macos/homebrew.sh" "$INSTALLTYPE" "$HOMEBREW_VERSION" "$HOMEBREW_HASH" +# Specify HOMEBREW_VERSION and HOMEBREW_HASH only if defaults set in homebrew.sh are not suitable for this platform +"$BASEDIR/../common/macos/homebrew.sh" "$INSTALLTYPE" diff --git a/coin/provisioning/qtci-macos-12-arm/23-homebrew.sh b/coin/provisioning/qtci-macos-12-arm/23-homebrew.sh index c63771140e6..54321000859 100755 --- a/coin/provisioning/qtci-macos-12-arm/23-homebrew.sh +++ b/coin/provisioning/qtci-macos-12-arm/23-homebrew.sh @@ -1,12 +1,12 @@ #!/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 +#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 -# Will install homebrew package manager for macOS. -# WARNING: Requires commandlinetools +set -ex - -set -e +INSTALLTYPE="GIT" BASEDIR=$(dirname "$0") -"$BASEDIR/../common/macos/homebrew_for_arm_mac.sh" +# Usage "$BASEDIR/../common/macos/homebrew.sh" "$INSTALLTYPE" "$HOMEBREW_VERSION" "$HOMEBREW_HASH" +# Specify HOMEBREW_VERSION and HOMEBREW_HASH only if defaults set in homebrew.sh are not suitable for this platform +"$BASEDIR/../common/macos/homebrew.sh" "$INSTALLTYPE" diff --git a/coin/provisioning/qtci-macos-12-x86_64/25-homebrew.sh b/coin/provisioning/qtci-macos-12-x86_64/25-homebrew.sh index f83960f43be..54321000859 100755 --- a/coin/provisioning/qtci-macos-12-x86_64/25-homebrew.sh +++ b/coin/provisioning/qtci-macos-12-x86_64/25-homebrew.sh @@ -1,28 +1,12 @@ #!/usr/bin/env bash -# Copyright (C) 2021 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 +#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 -# Will install homebrew package manager for macOS. -# WARNING: Requires commandlinetools +set -ex +INSTALLTYPE="GIT" -set -e - -. "$(dirname "$0")"/../common/unix/DownloadURL.sh - - -DownloadURL \ - http://ci-files01-hki.ci.qt.io/input/mac/homebrew/a822f0d0f1838c07e86b356fcd2bf93c7a11c2aa/install.sh \ - https://raw.githubusercontent.com/Homebrew/install/c744a716f9845988d01e6e238eee7117b8c366c9/install \ - 3210da71e12a699ab3bba43910a6d5fc64b92000 \ - /tmp/homebrew_install.sh - -DownloadURL "http://ci-files01-hki.ci.qt.io/input/semisecure/sign/pw" "http://ci-files01-hki.ci.qt.io/input/semisecure/sign/pw" "aae58d00d0a1b179a09f21cfc67f9d16fb95ff36" "/Users/qt/pw" -{ pw=$(cat "/Users/qt/pw"); } 2> /dev/null -sudo chmod 755 /tmp/homebrew_install.sh -{ (echo "$pw" | /tmp/homebrew_install.sh); } 2> /dev/null -rm -f "/Users/qt/pw" - -# No need to manually do `brew update`, the homebrew installer script does it. -### brew update - +BASEDIR=$(dirname "$0") +# Usage "$BASEDIR/../common/macos/homebrew.sh" "$INSTALLTYPE" "$HOMEBREW_VERSION" "$HOMEBREW_HASH" +# Specify HOMEBREW_VERSION and HOMEBREW_HASH only if defaults set in homebrew.sh are not suitable for this platform +"$BASEDIR/../common/macos/homebrew.sh" "$INSTALLTYPE" diff --git a/coin/provisioning/qtci-macos-13-arm/23-homebrew.sh b/coin/provisioning/qtci-macos-13-arm/23-homebrew.sh index 4983540c2c3..0c4ee4fc6a5 100755 --- a/coin/provisioning/qtci-macos-13-arm/23-homebrew.sh +++ b/coin/provisioning/qtci-macos-13-arm/23-homebrew.sh @@ -1,16 +1,12 @@ #!/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 +#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 -# Will install homebrew package manager for macOS. -# WARNING: Requires commandlinetools +set -ex - -set -e +INSTALLTYPE="PKG" BASEDIR=$(dirname "$0") -"$BASEDIR/../common/macos/homebrew_for_arm_mac.sh" -# Can we force reading bash env this late? -echo "if [ -f ~/.bashrc ]; then - . ~/.bashrc -fi" >> .profile +# Usage "$BASEDIR/../common/macos/homebrew.sh" "$INSTALLTYPE" "$HOMEBREW_VERSION" "$HOMEBREW_HASH" +# Specify HOMEBREW_VERSION and HOMEBREW_HASH only if defaults set in homebrew.sh are not suitable for this platform +"$BASEDIR/../common/macos/homebrew.sh" "$INSTALLTYPE" diff --git a/coin/provisioning/qtci-macos-13-x86_64/25-homebrew.sh b/coin/provisioning/qtci-macos-13-x86_64/25-homebrew.sh index 237dc5076f3..0c4ee4fc6a5 100755 --- a/coin/provisioning/qtci-macos-13-x86_64/25-homebrew.sh +++ b/coin/provisioning/qtci-macos-13-x86_64/25-homebrew.sh @@ -1,28 +1,12 @@ #!/usr/bin/env bash -# Copyright (C) 2022 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 +#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 -# Will install homebrew package manager for macOS. -# WARNING: Requires commandlinetools +set -ex +INSTALLTYPE="PKG" -set -e - -. "$(dirname "$0")"/../common/unix/DownloadURL.sh - - -DownloadURL \ - http://ci-files01-hki.ci.qt.io/input/mac/homebrew/a822f0d0f1838c07e86b356fcd2bf93c7a11c2aa/install.sh \ - https://raw.githubusercontent.com/Homebrew/install/c744a716f9845988d01e6e238eee7117b8c366c9/install \ - 3210da71e12a699ab3bba43910a6d5fc64b92000 \ - /tmp/homebrew_install.sh - -DownloadURL "http://ci-files01-hki.ci.qt.io/input/semisecure/sign/pw" "http://ci-files01-hki.ci.qt.io/input/semisecure/sign/pw" "aae58d00d0a1b179a09f21cfc67f9d16fb95ff36" "/Users/qt/pw" -{ pw=$(cat "/Users/qt/pw"); } 2> /dev/null -sudo chmod 755 /tmp/homebrew_install.sh -{ (echo "$pw" | /tmp/homebrew_install.sh); } 2> /dev/null -rm -f "/Users/qt/pw" - -# No need to manually do `brew update`, the homebrew installer script does it. -### brew update - +BASEDIR=$(dirname "$0") +# Usage "$BASEDIR/../common/macos/homebrew.sh" "$INSTALLTYPE" "$HOMEBREW_VERSION" "$HOMEBREW_HASH" +# Specify HOMEBREW_VERSION and HOMEBREW_HASH only if defaults set in homebrew.sh are not suitable for this platform +"$BASEDIR/../common/macos/homebrew.sh" "$INSTALLTYPE" diff --git a/coin/provisioning/qtci-macos-14-arm/23-homebrew.sh b/coin/provisioning/qtci-macos-14-arm/23-homebrew.sh index 4983540c2c3..0c4ee4fc6a5 100755 --- a/coin/provisioning/qtci-macos-14-arm/23-homebrew.sh +++ b/coin/provisioning/qtci-macos-14-arm/23-homebrew.sh @@ -1,16 +1,12 @@ #!/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 +#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 -# Will install homebrew package manager for macOS. -# WARNING: Requires commandlinetools +set -ex - -set -e +INSTALLTYPE="PKG" BASEDIR=$(dirname "$0") -"$BASEDIR/../common/macos/homebrew_for_arm_mac.sh" -# Can we force reading bash env this late? -echo "if [ -f ~/.bashrc ]; then - . ~/.bashrc -fi" >> .profile +# Usage "$BASEDIR/../common/macos/homebrew.sh" "$INSTALLTYPE" "$HOMEBREW_VERSION" "$HOMEBREW_HASH" +# Specify HOMEBREW_VERSION and HOMEBREW_HASH only if defaults set in homebrew.sh are not suitable for this platform +"$BASEDIR/../common/macos/homebrew.sh" "$INSTALLTYPE" diff --git a/coin/provisioning/qtci-macos-14-x86_64/25-homebrew.sh b/coin/provisioning/qtci-macos-14-x86_64/25-homebrew.sh index 7ff457b710f..0c4ee4fc6a5 100755 --- a/coin/provisioning/qtci-macos-14-x86_64/25-homebrew.sh +++ b/coin/provisioning/qtci-macos-14-x86_64/25-homebrew.sh @@ -1,26 +1,12 @@ #!/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 +#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 -# Will install homebrew package manager for macOS. -# WARNING: Requires commandlinetools +set -ex +INSTALLTYPE="PKG" -set -e - -. "$(dirname "$0")"/../common/unix/DownloadURL.sh - -DownloadURL \ - http://ci-files01-hki.ci.qt.io/input/mac/homebrew/d8f6c666d20a3d42e007ceec161a06651ad92ba331a24a3de62912edb129a522/install.sh \ - http://ci-files01-hki.ci.qt.io/input/mac/homebrew/d8f6c666d20a3d42e007ceec161a06651ad92ba331a24a3de62912edb129a522/install.sh \ - d8f6c666d20a3d42e007ceec161a06651ad92ba331a24a3de62912edb129a522 \ - /tmp/homebrew_install.sh - -DownloadURL "http://ci-files01-hki.ci.qt.io/input/semisecure/sign/pw" "http://ci-files01-hki.ci.qt.io/input/semisecure/sign/pw" "aae58d00d0a1b179a09f21cfc67f9d16fb95ff36" "/Users/qt/pw" -{ pw=$(cat "/Users/qt/pw"); } 2> /dev/null -sudo chmod 755 /tmp/homebrew_install.sh -{ (echo "$pw" | /tmp/homebrew_install.sh); } 2> /dev/null -rm -f "/Users/qt/pw" - -# No need to manually do `brew update`, the homebrew installer script does it. -### brew update +BASEDIR=$(dirname "$0") +# Usage "$BASEDIR/../common/macos/homebrew.sh" "$INSTALLTYPE" "$HOMEBREW_VERSION" "$HOMEBREW_HASH" +# Specify HOMEBREW_VERSION and HOMEBREW_HASH only if defaults set in homebrew.sh are not suitable for this platform +"$BASEDIR/../common/macos/homebrew.sh" "$INSTALLTYPE" diff --git a/coin/provisioning/qtci-macos-15-arm/23-homebrew.sh b/coin/provisioning/qtci-macos-15-arm/23-homebrew.sh index 4983540c2c3..0c4ee4fc6a5 100755 --- a/coin/provisioning/qtci-macos-15-arm/23-homebrew.sh +++ b/coin/provisioning/qtci-macos-15-arm/23-homebrew.sh @@ -1,16 +1,12 @@ #!/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 +#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 -# Will install homebrew package manager for macOS. -# WARNING: Requires commandlinetools +set -ex - -set -e +INSTALLTYPE="PKG" BASEDIR=$(dirname "$0") -"$BASEDIR/../common/macos/homebrew_for_arm_mac.sh" -# Can we force reading bash env this late? -echo "if [ -f ~/.bashrc ]; then - . ~/.bashrc -fi" >> .profile +# Usage "$BASEDIR/../common/macos/homebrew.sh" "$INSTALLTYPE" "$HOMEBREW_VERSION" "$HOMEBREW_HASH" +# Specify HOMEBREW_VERSION and HOMEBREW_HASH only if defaults set in homebrew.sh are not suitable for this platform +"$BASEDIR/../common/macos/homebrew.sh" "$INSTALLTYPE" diff --git a/coin/provisioning/qtci-macos-15-x86_64/25-homebrew.sh b/coin/provisioning/qtci-macos-15-x86_64/25-homebrew.sh index 7ff457b710f..0c4ee4fc6a5 100755 --- a/coin/provisioning/qtci-macos-15-x86_64/25-homebrew.sh +++ b/coin/provisioning/qtci-macos-15-x86_64/25-homebrew.sh @@ -1,26 +1,12 @@ #!/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 +#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 -# Will install homebrew package manager for macOS. -# WARNING: Requires commandlinetools +set -ex +INSTALLTYPE="PKG" -set -e - -. "$(dirname "$0")"/../common/unix/DownloadURL.sh - -DownloadURL \ - http://ci-files01-hki.ci.qt.io/input/mac/homebrew/d8f6c666d20a3d42e007ceec161a06651ad92ba331a24a3de62912edb129a522/install.sh \ - http://ci-files01-hki.ci.qt.io/input/mac/homebrew/d8f6c666d20a3d42e007ceec161a06651ad92ba331a24a3de62912edb129a522/install.sh \ - d8f6c666d20a3d42e007ceec161a06651ad92ba331a24a3de62912edb129a522 \ - /tmp/homebrew_install.sh - -DownloadURL "http://ci-files01-hki.ci.qt.io/input/semisecure/sign/pw" "http://ci-files01-hki.ci.qt.io/input/semisecure/sign/pw" "aae58d00d0a1b179a09f21cfc67f9d16fb95ff36" "/Users/qt/pw" -{ pw=$(cat "/Users/qt/pw"); } 2> /dev/null -sudo chmod 755 /tmp/homebrew_install.sh -{ (echo "$pw" | /tmp/homebrew_install.sh); } 2> /dev/null -rm -f "/Users/qt/pw" - -# No need to manually do `brew update`, the homebrew installer script does it. -### brew update +BASEDIR=$(dirname "$0") +# Usage "$BASEDIR/../common/macos/homebrew.sh" "$INSTALLTYPE" "$HOMEBREW_VERSION" "$HOMEBREW_HASH" +# Specify HOMEBREW_VERSION and HOMEBREW_HASH only if defaults set in homebrew.sh are not suitable for this platform +"$BASEDIR/../common/macos/homebrew.sh" "$INSTALLTYPE" From b6f64b9ef014749d55e974a7cd62b1d47923562b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucie=20G=C3=A9rard?= Date: Tue, 18 Feb 2025 14:00:35 +0100 Subject: [PATCH 068/204] Make repository reuse compliant Task-number: QTBUG-124453 Pick-to: 6.8 Change-Id: If49bd983e2c4726ba30ba5a5d12f63e1c6511f57 Reviewed-by: Joerg Bornemann (cherry picked from commit 749e19973fe7c04eafdfacae0a1a8149542838ed) Reviewed-by: Qt Cherry-pick Bot --- LICENSES/BSD-3-Clause.txt | 9 + LICENSES/GFDL-1.3-no-invariants-only.txt | 451 +++++++++++++++++++++++ REUSE.toml | 39 ++ _clang-format | 4 +- 4 files changed, 500 insertions(+), 3 deletions(-) create mode 100644 LICENSES/BSD-3-Clause.txt create mode 100644 LICENSES/GFDL-1.3-no-invariants-only.txt create mode 100644 REUSE.toml diff --git a/LICENSES/BSD-3-Clause.txt b/LICENSES/BSD-3-Clause.txt new file mode 100644 index 00000000000..b91bbd89468 --- /dev/null +++ b/LICENSES/BSD-3-Clause.txt @@ -0,0 +1,9 @@ +Copyright (c) . + +Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. + 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. + 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/LICENSES/GFDL-1.3-no-invariants-only.txt b/LICENSES/GFDL-1.3-no-invariants-only.txt new file mode 100644 index 00000000000..857214dd845 --- /dev/null +++ b/LICENSES/GFDL-1.3-no-invariants-only.txt @@ -0,0 +1,451 @@ + + GNU Free Documentation License + Version 1.3, 3 November 2008 + + + Copyright (C) 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc. + + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +0. PREAMBLE + +The purpose of this License is to make a manual, textbook, or other +functional and useful document "free" in the sense of freedom: to +assure everyone the effective freedom to copy and redistribute it, +with or without modifying it, either commercially or noncommercially. +Secondarily, this License preserves for the author and publisher a way +to get credit for their work, while not being considered responsible +for modifications made by others. + +This License is a kind of "copyleft", which means that derivative +works of the document must themselves be free in the same sense. It +complements the GNU General Public License, which is a copyleft +license designed for free software. + +We have designed this License in order to use it for manuals for free +software, because free software needs free documentation: a free +program should come with manuals providing the same freedoms that the +software does. But this License is not limited to software manuals; +it can be used for any textual work, regardless of subject matter or +whether it is published as a printed book. We recommend this License +principally for works whose purpose is instruction or reference. + + +1. APPLICABILITY AND DEFINITIONS + +This License applies to any manual or other work, in any medium, that +contains a notice placed by the copyright holder saying it can be +distributed under the terms of this License. Such a notice grants a +world-wide, royalty-free license, unlimited in duration, to use that +work under the conditions stated herein. The "Document", below, +refers to any such manual or work. Any member of the public is a +licensee, and is addressed as "you". You accept the license if you +copy, modify or distribute the work in a way requiring permission +under copyright law. + +A "Modified Version" of the Document means any work containing the +Document or a portion of it, either copied verbatim, or with +modifications and/or translated into another language. + +A "Secondary Section" is a named appendix or a front-matter section of +the Document that deals exclusively with the relationship of the +publishers or authors of the Document to the Document's overall +subject (or to related matters) and contains nothing that could fall +directly within that overall subject. (Thus, if the Document is in +part a textbook of mathematics, a Secondary Section may not explain +any mathematics.) The relationship could be a matter of historical +connection with the subject or with related matters, or of legal, +commercial, philosophical, ethical or political position regarding +them. + +The "Invariant Sections" are certain Secondary Sections whose titles +are designated, as being those of Invariant Sections, in the notice +that says that the Document is released under this License. If a +section does not fit the above definition of Secondary then it is not +allowed to be designated as Invariant. The Document may contain zero +Invariant Sections. If the Document does not identify any Invariant +Sections then there are none. + +The "Cover Texts" are certain short passages of text that are listed, +as Front-Cover Texts or Back-Cover Texts, in the notice that says that +the Document is released under this License. A Front-Cover Text may +be at most 5 words, and a Back-Cover Text may be at most 25 words. + +A "Transparent" copy of the Document means a machine-readable copy, +represented in a format whose specification is available to the +general public, that is suitable for revising the document +straightforwardly with generic text editors or (for images composed of +pixels) generic paint programs or (for drawings) some widely available +drawing editor, and that is suitable for input to text formatters or +for automatic translation to a variety of formats suitable for input +to text formatters. A copy made in an otherwise Transparent file +format whose markup, or absence of markup, has been arranged to thwart +or discourage subsequent modification by readers is not Transparent. +An image format is not Transparent if used for any substantial amount +of text. A copy that is not "Transparent" is called "Opaque". + +Examples of suitable formats for Transparent copies include plain +ASCII without markup, Texinfo input format, LaTeX input format, SGML +or XML using a publicly available DTD, and standard-conforming simple +HTML, PostScript or PDF designed for human modification. Examples of +transparent image formats include PNG, XCF and JPG. Opaque formats +include proprietary formats that can be read and edited only by +proprietary word processors, SGML or XML for which the DTD and/or +processing tools are not generally available, and the +machine-generated HTML, PostScript or PDF produced by some word +processors for output purposes only. + +The "Title Page" means, for a printed book, the title page itself, +plus such following pages as are needed to hold, legibly, the material +this License requires to appear in the title page. For works in +formats which do not have any title page as such, "Title Page" means +the text near the most prominent appearance of the work's title, +preceding the beginning of the body of the text. + +The "publisher" means any person or entity that distributes copies of +the Document to the public. + +A section "Entitled XYZ" means a named subunit of the Document whose +title either is precisely XYZ or contains XYZ in parentheses following +text that translates XYZ in another language. (Here XYZ stands for a +specific section name mentioned below, such as "Acknowledgements", +"Dedications", "Endorsements", or "History".) To "Preserve the Title" +of such a section when you modify the Document means that it remains a +section "Entitled XYZ" according to this definition. + +The Document may include Warranty Disclaimers next to the notice which +states that this License applies to the Document. These Warranty +Disclaimers are considered to be included by reference in this +License, but only as regards disclaiming warranties: any other +implication that these Warranty Disclaimers may have is void and has +no effect on the meaning of this License. + +2. VERBATIM COPYING + +You may copy and distribute the Document in any medium, either +commercially or noncommercially, provided that this License, the +copyright notices, and the license notice saying this License applies +to the Document are reproduced in all copies, and that you add no +other conditions whatsoever to those of this License. You may not use +technical measures to obstruct or control the reading or further +copying of the copies you make or distribute. However, you may accept +compensation in exchange for copies. If you distribute a large enough +number of copies you must also follow the conditions in section 3. + +You may also lend copies, under the same conditions stated above, and +you may publicly display copies. + + +3. COPYING IN QUANTITY + +If you publish printed copies (or copies in media that commonly have +printed covers) of the Document, numbering more than 100, and the +Document's license notice requires Cover Texts, you must enclose the +copies in covers that carry, clearly and legibly, all these Cover +Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on +the back cover. Both covers must also clearly and legibly identify +you as the publisher of these copies. The front cover must present +the full title with all words of the title equally prominent and +visible. You may add other material on the covers in addition. +Copying with changes limited to the covers, as long as they preserve +the title of the Document and satisfy these conditions, can be treated +as verbatim copying in other respects. + +If the required texts for either cover are too voluminous to fit +legibly, you should put the first ones listed (as many as fit +reasonably) on the actual cover, and continue the rest onto adjacent +pages. + +If you publish or distribute Opaque copies of the Document numbering +more than 100, you must either include a machine-readable Transparent +copy along with each Opaque copy, or state in or with each Opaque copy +a computer-network location from which the general network-using +public has access to download using public-standard network protocols +a complete Transparent copy of the Document, free of added material. +If you use the latter option, you must take reasonably prudent steps, +when you begin distribution of Opaque copies in quantity, to ensure +that this Transparent copy will remain thus accessible at the stated +location until at least one year after the last time you distribute an +Opaque copy (directly or through your agents or retailers) of that +edition to the public. + +It is requested, but not required, that you contact the authors of the +Document well before redistributing any large number of copies, to +give them a chance to provide you with an updated version of the +Document. + + +4. MODIFICATIONS + +You may copy and distribute a Modified Version of the Document under +the conditions of sections 2 and 3 above, provided that you release +the Modified Version under precisely this License, with the Modified +Version filling the role of the Document, thus licensing distribution +and modification of the Modified Version to whoever possesses a copy +of it. In addition, you must do these things in the Modified Version: + +A. Use in the Title Page (and on the covers, if any) a title distinct + from that of the Document, and from those of previous versions + (which should, if there were any, be listed in the History section + of the Document). You may use the same title as a previous version + if the original publisher of that version gives permission. +B. List on the Title Page, as authors, one or more persons or entities + responsible for authorship of the modifications in the Modified + Version, together with at least five of the principal authors of the + Document (all of its principal authors, if it has fewer than five), + unless they release you from this requirement. +C. State on the Title page the name of the publisher of the + Modified Version, as the publisher. +D. Preserve all the copyright notices of the Document. +E. Add an appropriate copyright notice for your modifications + adjacent to the other copyright notices. +F. Include, immediately after the copyright notices, a license notice + giving the public permission to use the Modified Version under the + terms of this License, in the form shown in the Addendum below. +G. Preserve in that license notice the full lists of Invariant Sections + and required Cover Texts given in the Document's license notice. +H. Include an unaltered copy of this License. +I. Preserve the section Entitled "History", Preserve its Title, and add + to it an item stating at least the title, year, new authors, and + publisher of the Modified Version as given on the Title Page. If + there is no section Entitled "History" in the Document, create one + stating the title, year, authors, and publisher of the Document as + given on its Title Page, then add an item describing the Modified + Version as stated in the previous sentence. +J. Preserve the network location, if any, given in the Document for + public access to a Transparent copy of the Document, and likewise + the network locations given in the Document for previous versions + it was based on. These may be placed in the "History" section. + You may omit a network location for a work that was published at + least four years before the Document itself, or if the original + publisher of the version it refers to gives permission. +K. For any section Entitled "Acknowledgements" or "Dedications", + Preserve the Title of the section, and preserve in the section all + the substance and tone of each of the contributor acknowledgements + and/or dedications given therein. +L. Preserve all the Invariant Sections of the Document, + unaltered in their text and in their titles. Section numbers + or the equivalent are not considered part of the section titles. +M. Delete any section Entitled "Endorsements". Such a section + may not be included in the Modified Version. +N. Do not retitle any existing section to be Entitled "Endorsements" + or to conflict in title with any Invariant Section. +O. Preserve any Warranty Disclaimers. + +If the Modified Version includes new front-matter sections or +appendices that qualify as Secondary Sections and contain no material +copied from the Document, you may at your option designate some or all +of these sections as invariant. To do this, add their titles to the +list of Invariant Sections in the Modified Version's license notice. +These titles must be distinct from any other section titles. + +You may add a section Entitled "Endorsements", provided it contains +nothing but endorsements of your Modified Version by various +parties--for example, statements of peer review or that the text has +been approved by an organization as the authoritative definition of a +standard. + +You may add a passage of up to five words as a Front-Cover Text, and a +passage of up to 25 words as a Back-Cover Text, to the end of the list +of Cover Texts in the Modified Version. Only one passage of +Front-Cover Text and one of Back-Cover Text may be added by (or +through arrangements made by) any one entity. If the Document already +includes a cover text for the same cover, previously added by you or +by arrangement made by the same entity you are acting on behalf of, +you may not add another; but you may replace the old one, on explicit +permission from the previous publisher that added the old one. + +The author(s) and publisher(s) of the Document do not by this License +give permission to use their names for publicity for or to assert or +imply endorsement of any Modified Version. + + +5. COMBINING DOCUMENTS + +You may combine the Document with other documents released under this +License, under the terms defined in section 4 above for modified +versions, provided that you include in the combination all of the +Invariant Sections of all of the original documents, unmodified, and +list them all as Invariant Sections of your combined work in its +license notice, and that you preserve all their Warranty Disclaimers. + +The combined work need only contain one copy of this License, and +multiple identical Invariant Sections may be replaced with a single +copy. If there are multiple Invariant Sections with the same name but +different contents, make the title of each such section unique by +adding at the end of it, in parentheses, the name of the original +author or publisher of that section if known, or else a unique number. +Make the same adjustment to the section titles in the list of +Invariant Sections in the license notice of the combined work. + +In the combination, you must combine any sections Entitled "History" +in the various original documents, forming one section Entitled +"History"; likewise combine any sections Entitled "Acknowledgements", +and any sections Entitled "Dedications". You must delete all sections +Entitled "Endorsements". + + +6. COLLECTIONS OF DOCUMENTS + +You may make a collection consisting of the Document and other +documents released under this License, and replace the individual +copies of this License in the various documents with a single copy +that is included in the collection, provided that you follow the rules +of this License for verbatim copying of each of the documents in all +other respects. + +You may extract a single document from such a collection, and +distribute it individually under this License, provided you insert a +copy of this License into the extracted document, and follow this +License in all other respects regarding verbatim copying of that +document. + + +7. AGGREGATION WITH INDEPENDENT WORKS + +A compilation of the Document or its derivatives with other separate +and independent documents or works, in or on a volume of a storage or +distribution medium, is called an "aggregate" if the copyright +resulting from the compilation is not used to limit the legal rights +of the compilation's users beyond what the individual works permit. +When the Document is included in an aggregate, this License does not +apply to the other works in the aggregate which are not themselves +derivative works of the Document. + +If the Cover Text requirement of section 3 is applicable to these +copies of the Document, then if the Document is less than one half of +the entire aggregate, the Document's Cover Texts may be placed on +covers that bracket the Document within the aggregate, or the +electronic equivalent of covers if the Document is in electronic form. +Otherwise they must appear on printed covers that bracket the whole +aggregate. + + +8. TRANSLATION + +Translation is considered a kind of modification, so you may +distribute translations of the Document under the terms of section 4. +Replacing Invariant Sections with translations requires special +permission from their copyright holders, but you may include +translations of some or all Invariant Sections in addition to the +original versions of these Invariant Sections. You may include a +translation of this License, and all the license notices in the +Document, and any Warranty Disclaimers, provided that you also include +the original English version of this License and the original versions +of those notices and disclaimers. In case of a disagreement between +the translation and the original version of this License or a notice +or disclaimer, the original version will prevail. + +If a section in the Document is Entitled "Acknowledgements", +"Dedications", or "History", the requirement (section 4) to Preserve +its Title (section 1) will typically require changing the actual +title. + + +9. TERMINATION + +You may not copy, modify, sublicense, or distribute the Document +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense, or distribute it is void, and +will automatically terminate your rights under this License. + +However, if you cease all violation of this License, then your license +from a particular copyright holder is reinstated (a) provisionally, +unless and until the copyright holder explicitly and finally +terminates your license, and (b) permanently, if the copyright holder +fails to notify you of the violation by some reasonable means prior to +60 days after the cessation. + +Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + +Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, receipt of a copy of some or all of the same material does +not give you any rights to use it. + + +10. FUTURE REVISIONS OF THIS LICENSE + +The Free Software Foundation may publish new, revised versions of the +GNU Free Documentation License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in +detail to address new problems or concerns. See +https://www.gnu.org/licenses/. + +Each version of the License is given a distinguishing version number. +If the Document specifies that a particular numbered version of this +License "or any later version" applies to it, you have the option of +following the terms and conditions either of that specified version or +of any later version that has been published (not as a draft) by the +Free Software Foundation. If the Document does not specify a version +number of this License, you may choose any version ever published (not +as a draft) by the Free Software Foundation. If the Document +specifies that a proxy can decide which future versions of this +License can be used, that proxy's public statement of acceptance of a +version permanently authorizes you to choose that version for the +Document. + +11. RELICENSING + +"Massive Multiauthor Collaboration Site" (or "MMC Site") means any +World Wide Web server that publishes copyrightable works and also +provides prominent facilities for anybody to edit those works. A +public wiki that anybody can edit is an example of such a server. A +"Massive Multiauthor Collaboration" (or "MMC") contained in the site +means any set of copyrightable works thus published on the MMC site. + +"CC-BY-SA" means the Creative Commons Attribution-Share Alike 3.0 +license published by Creative Commons Corporation, a not-for-profit +corporation with a principal place of business in San Francisco, +California, as well as future copyleft versions of that license +published by that same organization. + +"Incorporate" means to publish or republish a Document, in whole or in +part, as part of another Document. + +An MMC is "eligible for relicensing" if it is licensed under this +License, and if all works that were first published under this License +somewhere other than this MMC, and subsequently incorporated in whole or +in part into the MMC, (1) had no cover texts or invariant sections, and +(2) were thus incorporated prior to November 1, 2008. + +The operator of an MMC Site may republish an MMC contained in the site +under CC-BY-SA on the same site at any time before August 1, 2009, +provided the MMC is eligible for relicensing. + + +ADDENDUM: How to use this License for your documents + +To use this License in a document you have written, include a copy of +the License in the document and put the following copyright and +license notices just after the title page: + + Copyright (c) YEAR YOUR NAME. + Permission is granted to copy, distribute and/or modify this document + under the terms of the GNU Free Documentation License, Version 1.3 + or any later version published by the Free Software Foundation; + with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. + A copy of the license is included in the section entitled "GNU + Free Documentation License". + +If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts, +replace the "with...Texts." line with this: + + with the Invariant Sections being LIST THEIR TITLES, with the + Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST. + +If you have Invariant Sections without Cover Texts, or some other +combination of the three, merge those two alternatives to suit the +situation. + +If your document contains nontrivial examples of program code, we +recommend releasing these examples in parallel under your choice of +free software license, such as the GNU General Public License, +to permit their use in free software. diff --git a/REUSE.toml b/REUSE.toml new file mode 100644 index 00000000000..aa22c746707 --- /dev/null +++ b/REUSE.toml @@ -0,0 +1,39 @@ +version = 1 + +[[annotations]] +path = ["tests/**"] +comment = "tests" +precedence = "closest" +SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd." +SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR GPL-3.0-only" + +[[annotations]] +path = ["coin/**", "cmake/**", "**.pro", "**.qrc", "**CMakeLists.txt", ".cmake.conf", "**.yaml", + "coin/axivion/ci_config_linux.json", + "**.cfg", "**.plist", "**.pri", "**.prf", "configure.json"] +precedence = "closest" +comment = "build system" +SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd." +SPDX-License-Identifier = "BSD-3-Clause" + +[[annotations]] +path = [".tag", "**/.gitattributes", "**.gitignore", + ".gitmodules"] +precedence = "closest" +comment = "version control system. Licensed as build system" +SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd." +SPDX-License-Identifier = "BSD-3-Clause" + +[[annotations]] +path = ["**README*", "CONTRIBUTING.md", ".commit-template", ".github/pull_request_template.md"] +comment = "documentation" +precedence = "closest" +SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd." +SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only" + +[[annotations]] +path = ["**.toml", "licenseRule.json"] +comment = "documentation" +precedence = "override" +SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd." +SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only" diff --git a/_clang-format b/_clang-format index 2fa7c0b0656..4d05baac1e8 100644 --- a/_clang-format +++ b/_clang-format @@ -1,7 +1,5 @@ # Copyright (C) 2016 Olivier Goffart -# -# You may use this file under the terms of the 3-clause BSD license. -# See the file LICENSE from this package for details. +# SPDX-License-Identifier: BSD-3-Clause # This is the clang-format configuration style to be used by Qt, # based on the rules from https://wiki.qt.io/Qt_Coding_Style and From 998814c9e3e3f3bb3575baf378dcbc95d14590c0 Mon Sep 17 00:00:00 2001 From: Timur Pocheptsov Date: Wed, 19 Feb 2025 11:42:06 +0100 Subject: [PATCH 069/204] FFmpeg: reduce the number of frameworks we create to the same libraries we build e.g. on macOS. Also, clean up the script a bit removing a duplicate configure option. Pick-to: 6.8 Task-number: QTBUG-133502 Change-Id: If06aad102783bc3025155d3427aa68d87ad4d179 Reviewed-by: Artem Dyomin (cherry picked from commit a4110ed94fcdd82328dfbda466cf2bcbc1c72b72) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/common/unix/install-ffmpeg-ios.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/coin/provisioning/common/unix/install-ffmpeg-ios.sh b/coin/provisioning/common/unix/install-ffmpeg-ios.sh index dbcc6c4bfa5..e30b5af4299 100755 --- a/coin/provisioning/common/unix/install-ffmpeg-ios.sh +++ b/coin/provisioning/common/unix/install-ffmpeg-ios.sh @@ -62,7 +62,6 @@ build_ffmpeg_ios() { --nm="$(xcrun --sdk ${target_sdk} --find nm)" \ --target-os=darwin \ --extra-ldflags="$minos" \ - --enable-cross-compile \ --enable-shared \ --disable-static \ --install-name-dir='@rpath' \ @@ -188,7 +187,7 @@ create_xcframework() { build_ffmpeg_ios "arm64-simulator" build_ffmpeg_ios "arm64" -ffmpeg_libs="libavcodec libavdevice libavfilter libavformat libavutil libswresample libswscale" +ffmpeg_libs="libavcodec libavformat libavutil libswresample libswscale" for name in $ffmpeg_libs; do create_framework $name "arm64" From f2118bfad125b6fb1a338ab244d891e4bd361b3f Mon Sep 17 00:00:00 2001 From: Toni Saario Date: Tue, 17 Dec 2024 21:21:07 +0200 Subject: [PATCH 070/204] Update intel VxWorks VSB and VIP MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Increases stack size for intel. Change-Id: Ic40b87582940d03abf4430e2664e55e0a7d322be Reviewed-by: Simo Fält (cherry picked from commit b25251e2baa1f347e7609ae917c7b172538a79a8) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/common/linux/vx_works.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/coin/provisioning/common/linux/vx_works.sh b/coin/provisioning/common/linux/vx_works.sh index f53968eb64e..5f9ff0123dc 100755 --- a/coin/provisioning/common/linux/vx_works.sh +++ b/coin/provisioning/common/linux/vx_works.sh @@ -21,12 +21,12 @@ InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$sha1" "$targetFolder" SetEnvVar "VXWORKS_HOME" "/opt/vxworks" SetEnvVar "VXWORKS_SSH" "WindRiver@172.31.1.10" -VXWORKS_BUILD_VER="07-11-2024" +VXWORKS_BUILD_VER="18-12-2024" ######### VXworks toolchain ######### # Installs to /opt/fsl_imx6_2_0_6_2_VSB PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/vxworks/vxworks_arm_vsb_${VXWORKS_BUILD_VER}.tar.gz" AltUrl="" -sha1="f4745e9b84a781fe2c0a44abee189fcdf1c2c100" +sha1="6b5a264d08a9d34b03ff13cb28e690c5c5178569" targetFolder="/opt/" InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$sha1" "$targetFolder" "" SetEnvVar "WIND_CC_SYSROOT" "/opt/fsl_imx6_2_0_6_2_VSB" @@ -35,20 +35,20 @@ SetEnvVar "WIND_CC_SYSROOT" "/opt/fsl_imx6_2_0_6_2_VSB" # Installs to /opt/fsl_imx6_2_0_6_2_VIP_QEMU PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/vxworks/vxworks_arm_vip_${VXWORKS_BUILD_VER}.tar.gz" AltUrl="" -sha1="186d7da071005d67d898a56cf57b7bec664bb89e" +sha1="117af91a6c93ac89727f8d8bfe4cf840ce4485c9" targetFolder="/opt/" InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$sha1" "$targetFolder" "" # Installs to /opt/itl_generic_skylake_VSB PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/vxworks/vxworks_intel_vsb_${VXWORKS_BUILD_VER}.tar.gz" AltUrl="" -sha1="d5b76b92099dff0304ab97901ff1ad683dd6153d" +sha1="c1b2f2e2903540e8005237ce3641fc043ced0ddf" targetFolder="/opt/" InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$sha1" "$targetFolder" "" # Installs to /opt/itl_generic_skylake_VIP_QEMU PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/vxworks/vxworks_intel_vip_${VXWORKS_BUILD_VER}.tar.gz" AltUrl="" -sha1="1943696ead5d13fba92a5af416bd3f599395fe24" +sha1="2fa12dac1f1460019a418da49b095c743a9fe282" targetFolder="/opt/" InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$sha1" "$targetFolder" "" From 4b1de19ea99523d6a4e087816a9ac34d7281c9fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Thu, 27 Feb 2025 14:05:00 +0100 Subject: [PATCH 071/204] Make macOS 15 a fully significant config In practice it already is, because qtbase sets COIN_CTEST_IGNORE_EXIT_CODE to 0 for macOS 15, and this change has propagated to qt5.git now, but this makes it official. macOS 15 is now a significant platform [CI Platforms] Change-Id: I9dc8b0f56582e08560859a17304e886e7fc3020b Reviewed-by: Jukka Jokiniva (cherry picked from commit 7853bee06015625f05a3e9f2a302a9db217d3151) Reviewed-by: Ville-Pekka Karhu --- coin/platform_configs/macos.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/platform_configs/macos.yaml b/coin/platform_configs/macos.yaml index 938c7ca9b1b..b8723edd573 100644 --- a/coin/platform_configs/macos.yaml +++ b/coin/platform_configs/macos.yaml @@ -51,7 +51,7 @@ Configurations: Id: 'macos-15-x86_64-tests' Template: 'qtci-macos-15-x86_64-103' Compiler: 'Clang' - Features: ['Sccache', 'TestOnly', 'Packaging', 'InsignificantTests'] + Features: ['Sccache', 'TestOnly', 'Packaging'] Platform dependency: 'macos-universal-on-x86_64' # And arm64 @@ -72,7 +72,7 @@ Configurations: Id: 'macos-15-arm64-tests' Template: 'qtci-macos-15-arm-104' Compiler: 'Clang' - Features: ['TestOnly', 'Packaging', 'InsignificantTests'] + Features: ['TestOnly', 'Packaging'] Platform dependency: 'macos-universal-on-x86_64' # Test the universal packaging built on arm64 From a2620ffd1f7664c34bbd88b8964ffe31c21dbaae Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 14 Mar 2025 02:16:41 +0000 Subject: [PATCH 072/204] Update submodules on '6.9 in qt/qt5' Change-Id: I7196c55d5cc128dc93815ad852f2fd893a082801 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 3dcd1f6b9f6..892331d9938 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 3dcd1f6b9f6441416953365e1852fd38801e17ef +Subproject commit 892331d99387034b403b39b65211214f6f3ddd34 diff --git a/qt5compat b/qt5compat index 78f02cf1b1c..e165e96ea6d 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 78f02cf1b1c633fc2405e9fff7cea0d892f524c9 +Subproject commit e165e96ea6d85a2408d49336b3ccacb4dbea6a41 diff --git a/qtactiveqt b/qtactiveqt index b817be17328..c652765703a 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit b817be173281eab404f96f00e65f792625dd6256 +Subproject commit c652765703a596a44c2fb8242bcde556088c2d68 diff --git a/qtbase b/qtbase index 37c60080dde..6d2421d812d 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 37c60080ddedb339089e7bccaf25e360c7b3ebb8 +Subproject commit 6d2421d812dcdd79e0dc06a3db61b95b09b1df8b diff --git a/qtcharts b/qtcharts index 8eb789a55ee..2e26a3314db 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 8eb789a55eed6d04c03f97adfd00dbc43e306879 +Subproject commit 2e26a3314dbc7245bdd6feb47ed40b4c5afa1c38 diff --git a/qtcoap b/qtcoap index 0f887ed8c61..d8aea09b0b7 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit 0f887ed8c61cfb11130633c7cc77a88bc195762a +Subproject commit d8aea09b0b737d5b4202497b9bff7ca1be8a704d diff --git a/qtconnectivity b/qtconnectivity index 62067e329cb..696d6a1f301 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 62067e329cb7185da9779c131d2868c75670eb57 +Subproject commit 696d6a1f30159263dac04a28d9e85c4aeac8c377 diff --git a/qtdatavis3d b/qtdatavis3d index 63f3570365d..438749771d0 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 63f3570365d27296077adeb2a4fe6abe13aff6d6 +Subproject commit 438749771d0c2b7903efe2badd5e7f66df798ee5 diff --git a/qtdeclarative b/qtdeclarative index a9f651c39fd..c81e1e8bd2e 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit a9f651c39fd9f78297b2098da0f66420c1fb1613 +Subproject commit c81e1e8bd2e5bde32c3be7eab729c68e3688fb41 diff --git a/qtdoc b/qtdoc index a37d601928e..92e75759715 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit a37d601928e8d91b9e0d6e79bbeaf2c6d5aa6e8a +Subproject commit 92e7575971507541634e91672720fb47810beae9 diff --git a/qtgraphs b/qtgraphs index 08c2558e84e..44128b8490a 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit 08c2558e84eb50aefd70b3c3bc1bfbb88d1f5e6a +Subproject commit 44128b8490a1a6134f1833a113962f9334b4c1b9 diff --git a/qtgrpc b/qtgrpc index d85966713cf..2c0cb7188d7 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit d85966713cf47b0d5254eb86544ba3e20c79f0b1 +Subproject commit 2c0cb7188d75dd638bbdb7476282af111851d121 diff --git a/qthttpserver b/qthttpserver index 2de0075f823..7f20bbdeb7b 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit 2de0075f8235ac5f8f4b6618ae965efd1d9ec77c +Subproject commit 7f20bbdeb7b0b4f17573d699c3472f4b1e2734cf diff --git a/qtimageformats b/qtimageformats index 7497c57a847..926e5157a63 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 7497c57a8479649d269dbd2a40fc16b2277f2713 +Subproject commit 926e5157a631cfdaee662a8bd6720ecd56f953a6 diff --git a/qtlanguageserver b/qtlanguageserver index ea986b6c4a2..eaa4a022285 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit ea986b6c4a2d8b6538880a3b12f7bcbf703217d7 +Subproject commit eaa4a02228517e6856ca5211a8e2c9be4cad059f diff --git a/qtlocation b/qtlocation index 19d65f5f1d4..6e5acd3ed57 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 19d65f5f1d446053f04d97b40954ad09d415cc6a +Subproject commit 6e5acd3ed57727bf9fd1e064142fdaaaadf0b83f diff --git a/qtlottie b/qtlottie index 1f1447032ab..c479c4b1750 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 1f1447032abae25bdeda64c030dedefcbca0d0a2 +Subproject commit c479c4b175075b740bad808da49fa3fbd90920fb diff --git a/qtmqtt b/qtmqtt index c1553028925..fc92efdaba4 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit c1553028925269fd3f03caafef70ad5912b0e20d +Subproject commit fc92efdaba4e036747b1123b4faec506a204bb0b diff --git a/qtmultimedia b/qtmultimedia index 6e3e977975c..1df88ffc848 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 6e3e977975c4cd91a9d1954cd341f142e7cb6022 +Subproject commit 1df88ffc84895df64376724ba3b522112cebc21d diff --git a/qtnetworkauth b/qtnetworkauth index e1f17be862e..88defc928df 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit e1f17be862ece42d9ec55aa7d657dc1088498973 +Subproject commit 88defc928dfa1f7c72f503c2b71d0900a8988c49 diff --git a/qtopcua b/qtopcua index 17538c5f0aa..7a828f94424 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit 17538c5f0aaeadfebc2a433ab336e4c183d9bbc4 +Subproject commit 7a828f944248dbb134711a58270f12bb95064251 diff --git a/qtpositioning b/qtpositioning index 9df96e7fd70..187c122da37 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit 9df96e7fd701356cca0993d1c56c3fe9109c2a83 +Subproject commit 187c122da37f814fd359f7d21536482cd7f33475 diff --git a/qtquick3d b/qtquick3d index 6d96ecd964d..9a480d14b22 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 6d96ecd964db3e98134c0f1d258517a9362fdf89 +Subproject commit 9a480d14b22e42c837c7e0f2fb0391d8a6db208b diff --git a/qtquick3dphysics b/qtquick3dphysics index 44851b815fa..97bfd906866 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit 44851b815fa282407132bd55af3d64da68b61ae7 +Subproject commit 97bfd906866196fdf0dd8a53a28f26bc273e8834 diff --git a/qtquickeffectmaker b/qtquickeffectmaker index 391cfe29b93..61d8f32b137 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit 391cfe29b93fa0c2fb871636e937747826f32776 +Subproject commit 61d8f32b13798d3bf5646c008bbedbdc949326dd diff --git a/qtquicktimeline b/qtquicktimeline index 9e06d193160..5efc5144b5e 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 9e06d193160f3522013bb095b1adf416964b2ed8 +Subproject commit 5efc5144b5e51fec9b353f7cb4daead52eab2002 diff --git a/qtremoteobjects b/qtremoteobjects index c73e28655e4..65a432de6da 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit c73e28655e45ebad9b06f2e5d344b8e511520138 +Subproject commit 65a432de6da3d4e57efd67200b2126cceadcf116 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 f28222eaa0f..8fabdeb8fb2 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit f28222eaa0ffae69313da745eb8ca78b74f76627 +Subproject commit 8fabdeb8fb27ab1e566957de537ba7da5c261f43 diff --git a/qtsensors b/qtsensors index 562eea02c70..71e64c42893 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 562eea02c70f27ea098a9378126ce97bd99f2151 +Subproject commit 71e64c428930fae9b54a8ce93a47e60e709d50fb diff --git a/qtserialbus b/qtserialbus index 1a225251563..0eca470bc0a 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 1a225251563aa05755cd6fd5b13eb0752bf37f8b +Subproject commit 0eca470bc0a089a91adb08cd7182d7ada138ab18 diff --git a/qtserialport b/qtserialport index 30c6b9d7c74..bb5f1a1bada 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 30c6b9d7c7401e130a82e97799ca3f1f346aa71d +Subproject commit bb5f1a1bada49da791f61947b08be6abbd55f3c6 diff --git a/qtshadertools b/qtshadertools index ebe040eab52..388d9e60f58 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit ebe040eab520a20c627acf4e755fd4127727e202 +Subproject commit 388d9e60f5825b0ca41b7bbc293026bf6c86fefe diff --git a/qtspeech b/qtspeech index db4403786ac..658db684001 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit db4403786ac6c885c5ac8ee99d1f491b5f4decf8 +Subproject commit 658db68400129097e14d49d4edac2eb7ea43cc6e diff --git a/qtsvg b/qtsvg index 988bff355e0..44ef7f11a9a 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 988bff355e05d0f6a41c9949de6858998cd833e1 +Subproject commit 44ef7f11a9a5bff533173390af5e1e722ff7c1b2 diff --git a/qttools b/qttools index ff3e6cdcca4..16f2be32c24 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit ff3e6cdcca40f0c517dcaaf277e062c297794ab9 +Subproject commit 16f2be32c247783698c1507c872006e8cb3bd9d1 diff --git a/qttranslations b/qttranslations index cc917f8b305..f2cffab26b3 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit cc917f8b305a415b548e61a8b113befeb113ff47 +Subproject commit f2cffab26b3f1c00581542aefe8bda668837bac0 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 18656697fb0..2594d062bb3 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 18656697fb0a0545cbee0fb8dde42bd4ca55c922 +Subproject commit 2594d062bb32356fa0f0393a17d8f3ab4e863b3d diff --git a/qtwayland b/qtwayland index b84b1d81329..fca4012a7ab 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit b84b1d8132942a0f0a64bd728cb2b00fa142afd2 +Subproject commit fca4012a7ab33251a75ac58b5e485fbfe67c7cac diff --git a/qtwebchannel b/qtwebchannel index bbd575e591a..444687f6e4b 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit bbd575e591aee1974b6a63803cba6a224406f8fc +Subproject commit 444687f6e4ba1e4b68775888c9a4b77f563dcdc3 diff --git a/qtwebengine b/qtwebengine index d7351efec5b..98424c0f68d 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit d7351efec5bc3d6297b2bc7d6c12d8868510e125 +Subproject commit 98424c0f68dee270019605e516c12a1be7f6da27 diff --git a/qtwebsockets b/qtwebsockets index 1818eeb3cae..f02ba9ffe4a 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 1818eeb3cae48f0bca059a275cf2d023cb2e2c08 +Subproject commit f02ba9ffe4a21fb99182c490e0991e19d25f0c56 diff --git a/qtwebview b/qtwebview index d5ebd8b9e11..451e837d7b3 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit d5ebd8b9e1140788c7d9d37217eef9ab68f3272e +Subproject commit 451e837d7b3b1e9361af9e54263881a83e8daad1 From fb187295fcdb8882dd42b937503d3c360653146f Mon Sep 17 00:00:00 2001 From: Rami Potinkara Date: Sun, 23 Feb 2025 14:59:29 +0200 Subject: [PATCH 073/204] Provisioning: Update Android NDK to LTS version r27c This patch updates Android NDK from LTS r26b to LTS r27c. The version is 27.2.12479018 Task-number: QTQAINFRA-6479 Task-number: QTQAINFRA-6655 Pick-to: 6.8 6.5 Change-Id: Ic791cfd5d5dd2a439f96590b6f6f8ca0ac4fb5ae Reviewed-by: Assam Boudjelthia Reviewed-by: Rami Potinkara (cherry picked from commit a242bb2e3e810abc3c1b7fc4a3aa8cbedc7073e8) Reviewed-by: Jani Heikkinen --- coin/provisioning/common/linux/android_linux.sh | 4 ++-- coin/provisioning/common/macos/android.sh | 2 +- coin/provisioning/common/unix/openssl_3_for_android.sh | 8 ++++---- coin/provisioning/common/unix/openssl_for_android.sh | 6 +++--- coin/provisioning/common/windows/android-openssl.ps1 | 6 +++--- coin/provisioning/common/windows/android.ps1 | 4 ++-- coin/provisioning/common/windows/install-ffmpeg.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 +- 14 files changed, 23 insertions(+), 23 deletions(-) diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index e5d8148d2b6..6d38220f63a 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -24,13 +24,13 @@ basePath="http://ci-files01-hki.ci.qt.io/input/android" toolsVersion="2.1" toolsFile="commandlinetools-linux-6609375_latest.zip" -ndkVersionLatest="r26b" +ndkVersionLatest="r27c" ndkVersionDefault=$ndkVersionLatest sdkBuildToolsVersion="35.0.1" sdkApiLevel="android-35" toolsSha1="9172381ff070ee2a416723c1989770cf4b0d1076" -ndkSha1Latest="fdf33d9f6c1b3f16e5459d53a82c7d2201edbcc4" +ndkSha1Latest="090e8083a715fdb1a3e402d0763c388abb03fb4e" ndkSha1Default=$ndkSha1Latest # Android Automotive max SDK level image diff --git a/coin/provisioning/common/macos/android.sh b/coin/provisioning/common/macos/android.sh index 8eaa8dc199a..57671748a97 100755 --- a/coin/provisioning/common/macos/android.sh +++ b/coin/provisioning/common/macos/android.sh @@ -20,7 +20,7 @@ toolsVersion="2.1" # toolsFile dertermines tools version toolsFile="commandlinetools-mac-6609375_latest.zip" -ndkVersionLatest="r26b" +ndkVersionLatest="r27c" ndkVersionDefault="$ndkVersionLatest" sdkBuildToolsVersion="35.0.1" # this is compile sdk version diff --git a/coin/provisioning/common/unix/openssl_3_for_android.sh b/coin/provisioning/common/unix/openssl_3_for_android.sh index 0ad79315e09..a49da77f15d 100755 --- a/coin/provisioning/common/unix/openssl_3_for_android.sh +++ b/coin/provisioning/common/unix/openssl_3_for_android.sh @@ -12,12 +12,12 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" version="3.0.7" -ndkVersionLatest="r26b" +ndkVersionLatest="r27c" ndkVersionDefault=$ndkVersionLatest -prebuiltOpensslNdkShaLatest="ea925d5a5b696916fb3650403a2eb3189c52b5ce" +prebuiltOpensslNdkShaLatest="733cff853b6ee7738e78b90f46b5f028c8490e1e" prebuiltOpensslNdkShaDefault=$prebuiltOpensslNdkShaLatest -: <<'EOB' SOURCE BUILD INSTRUCTIONS - Openssl prebuilt was made using Android NDK 25 +: <<'EOB' SOURCE BUILD INSTRUCTIONS - Openssl prebuilt was made using Android NDK r27c # Source built requires GCC and Perl to be in PATH. Rhel "requires yum install perl-IPC-Cmd" exports_file="/tmp/export.sh" # source previously made environmental variables. @@ -32,7 +32,7 @@ else fi # ANDROID_NDK_ROOT is required during Configure -export ANDROID_NDK_ROOT=/opt/android/android-ndk-r26b +export ANDROID_NDK_ROOT=/opt/android/android-ndk-r27c officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz" cachedUrl="http://ci-files01-hki.ci.qt.io/input/openssl/openssl-$version.tar.gz" diff --git a/coin/provisioning/common/unix/openssl_for_android.sh b/coin/provisioning/common/unix/openssl_for_android.sh index d555e0ccd9b..c7ea14021ff 100755 --- a/coin/provisioning/common/unix/openssl_for_android.sh +++ b/coin/provisioning/common/unix/openssl_for_android.sh @@ -12,12 +12,12 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" version="3.0.7" -ndkVersionLatest="r26b" +ndkVersionLatest="r27c" ndkVersionDefault=$ndkVersionLatest -prebuiltOpensslNdkShaLatest="ea925d5a5b696916fb3650403a2eb3189c52b5ce" +prebuiltOpensslNdkShaLatest="733cff853b6ee7738e78b90f46b5f028c8490e1e" prebuiltOpensslNdkShaDefault=$prebuiltOpensslNdkShaLatest -: <<'EOB' SOURCE BUILD INSTRUCTIONS - Openssl prebuilt was made using Android NDK r26b +: <<'EOB' SOURCE BUILD INSTRUCTIONS - Openssl prebuilt was made using Android NDK r27c # Source built requires GCC and Perl to be in PATH. Rhel "requires yum install perl-IPC-Cmd" exports_file="/tmp/export.sh" # source previously made environmental variables. diff --git a/coin/provisioning/common/windows/android-openssl.ps1 b/coin/provisioning/common/windows/android-openssl.ps1 index 3542c907691..5c431a26536 100644 --- a/coin/provisioning/common/windows/android-openssl.ps1 +++ b/coin/provisioning/common/windows/android-openssl.ps1 @@ -16,11 +16,11 @@ if (Is64BitWinHost) { # More info and building instructions can be found from http://doc.qt.io/qt-5/opensslsupport.html $openssl_version = "3.0.7" -$ndk_version_latest = "r26b" +$ndk_version_latest = "r27c" $ndk_version_default = "$ndk_version_latest" $openssl_compressed = Get-DownloadLocation ("openssl-${openssl_version}.tar.gz") $openssl_sha1 = "f20736d6aae36bcbfa9aba0d358c71601833bf27" -$prebuilt_sha1_ndk_latest = "ea925d5a5b696916fb3650403a2eb3189c52b5ce" +$prebuilt_sha1_ndk_latest = "733cff853b6ee7738e78b90f46b5f028c8490e1e" $prebuilt_sha1_ndk_default = "$prebuilt_sha1_ndk_latest" $destination_prefix = "C:\Utils\prebuilt-openssl-${openssl_version}-for-android-ndk" @@ -70,7 +70,7 @@ function Install($1, $2) { } # ANDROID_NDK_ROOT needs to be in environment variables before running this script - # Set-EnvironmentVariable "ANDROID_NDK_ROOT" "C:\Utils\Android\android-ndk-r26b" + # Set-EnvironmentVariable "ANDROID_NDK_ROOT" "C:\Utils\Android\android-ndk-r27c" $make_install = Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"yes | pacman -S make`"") CheckExitCode $make_install diff --git a/coin/provisioning/common/windows/android.ps1 b/coin/provisioning/common/windows/android.ps1 index 418c39312a7..5b2039d1136 100644 --- a/coin/provisioning/common/windows/android.ps1 +++ b/coin/provisioning/common/windows/android.ps1 @@ -10,9 +10,9 @@ # That's why we need to use Andoid-21 API version in Qt 5.9. # NDK -$ndkVersionLatest = "r26b" +$ndkVersionLatest = "r27c" $ndkVersionDefault = $ndkVersionLatest -$ndkChecksumLatest = "17453c61a59e848cffb8634f2c7b322417f1732e" +$ndkChecksumLatest = "ac5f7762764b1f15341094e148ad4f847d050c38" $ndkChecksumDefault = $ndkChecksumLatest $ndkCachedUrlLatest = "\\ci-files01-hki.ci.qt.io\provisioning\android\android-ndk-$ndkVersionLatest-windows.zip" $ndkOfficialUrlLatest = "https://dl.google.com/android/repository/android-ndk-$ndkVersionLatest-windows.zip" diff --git a/coin/provisioning/common/windows/install-ffmpeg.ps1 b/coin/provisioning/common/windows/install-ffmpeg.ps1 index e960b076c94..3fbfd72a7c7 100644 --- a/coin/provisioning/common/windows/install-ffmpeg.ps1 +++ b/coin/provisioning/common/windows/install-ffmpeg.ps1 @@ -144,7 +144,7 @@ function InstallAndroidArmv7 { $target_cpu="armv7-a" $api_version="24" - $ndkVersionLatest = "r26b" + $ndkVersionLatest = "r27c" $ndkFolderLatest = "/c/Utils/Android/android-ndk-$ndkVersionLatest" $toolchain="${ndkFolderLatest}/toolchains/llvm/prebuilt/windows-x86_64" 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 8381d489122..e164cb9545a 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 @@ -20,7 +20,7 @@ toolsVersion="2.1" # toolsFile dertermines tools version toolsFile="commandlinetools-mac-6609375_latest.zip" -ndkVersion="r26b" +ndkVersion="r27c" ndkFile="android-ndk-$ndkVersion-darwin.zip" sdkBuildToolsVersion="35.0.1" # this is compile sdk version diff --git a/coin/provisioning/qtci-macos-11-arm/30-android.sh b/coin/provisioning/qtci-macos-11-arm/30-android.sh index 8381d489122..e164cb9545a 100755 --- a/coin/provisioning/qtci-macos-11-arm/30-android.sh +++ b/coin/provisioning/qtci-macos-11-arm/30-android.sh @@ -20,7 +20,7 @@ toolsVersion="2.1" # toolsFile dertermines tools version toolsFile="commandlinetools-mac-6609375_latest.zip" -ndkVersion="r26b" +ndkVersion="r27c" ndkFile="android-ndk-$ndkVersion-darwin.zip" sdkBuildToolsVersion="35.0.1" # this is compile sdk version 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 10b44e0b617..b1568e4d368 100755 --- a/coin/provisioning/qtci-macos-11-x86_64/30-android.sh +++ b/coin/provisioning/qtci-macos-11-x86_64/30-android.sh @@ -20,7 +20,7 @@ toolsVersion="2.1" # toolsFile dertermines tools version toolsFile="commandlinetools-mac-6609375_latest.zip" -ndkVersion="r26b" +ndkVersion="r27c" ndkFile="android-ndk-$ndkVersion-darwin.zip" sdkBuildToolsVersion="35.0.1" # this is compile sdk version diff --git a/coin/provisioning/qtci-macos-12-arm/30-android.sh b/coin/provisioning/qtci-macos-12-arm/30-android.sh index 5f4608e74fb..acd2d4b9e88 100755 --- a/coin/provisioning/qtci-macos-12-arm/30-android.sh +++ b/coin/provisioning/qtci-macos-12-arm/30-android.sh @@ -20,7 +20,7 @@ toolsVersion="2.1" # toolsFile dertermines tools version toolsFile="commandlinetools-mac-6609375_latest.zip" -ndkVersion="r26b" +ndkVersion="r27c" ndkFile="android-ndk-$ndkVersion-darwin.zip" sdkBuildToolsVersion="35.0.1" # this is compile sdk version diff --git a/coin/provisioning/qtci-macos-13-arm/30-android.sh b/coin/provisioning/qtci-macos-13-arm/30-android.sh index 5f4608e74fb..acd2d4b9e88 100755 --- a/coin/provisioning/qtci-macos-13-arm/30-android.sh +++ b/coin/provisioning/qtci-macos-13-arm/30-android.sh @@ -20,7 +20,7 @@ toolsVersion="2.1" # toolsFile dertermines tools version toolsFile="commandlinetools-mac-6609375_latest.zip" -ndkVersion="r26b" +ndkVersion="r27c" ndkFile="android-ndk-$ndkVersion-darwin.zip" sdkBuildToolsVersion="35.0.1" # this is compile sdk version diff --git a/coin/provisioning/qtci-macos-14-arm/30-android.sh b/coin/provisioning/qtci-macos-14-arm/30-android.sh index 5f4608e74fb..acd2d4b9e88 100755 --- a/coin/provisioning/qtci-macos-14-arm/30-android.sh +++ b/coin/provisioning/qtci-macos-14-arm/30-android.sh @@ -20,7 +20,7 @@ toolsVersion="2.1" # toolsFile dertermines tools version toolsFile="commandlinetools-mac-6609375_latest.zip" -ndkVersion="r26b" +ndkVersion="r27c" ndkFile="android-ndk-$ndkVersion-darwin.zip" sdkBuildToolsVersion="35.0.1" # this is compile sdk version diff --git a/coin/provisioning/qtci-macos-15-arm/30-android.sh b/coin/provisioning/qtci-macos-15-arm/30-android.sh index 5f4608e74fb..acd2d4b9e88 100755 --- a/coin/provisioning/qtci-macos-15-arm/30-android.sh +++ b/coin/provisioning/qtci-macos-15-arm/30-android.sh @@ -20,7 +20,7 @@ toolsVersion="2.1" # toolsFile dertermines tools version toolsFile="commandlinetools-mac-6609375_latest.zip" -ndkVersion="r26b" +ndkVersion="r27c" ndkFile="android-ndk-$ndkVersion-darwin.zip" sdkBuildToolsVersion="35.0.1" # this is compile sdk version From 16981acca4ddca0d79ac3006b2444c5be1b632c4 Mon Sep 17 00:00:00 2001 From: Axel Spoerl Date: Wed, 15 Jan 2025 17:52:09 +0100 Subject: [PATCH 074/204] Handle tgz extensions in InstallFromCompressedFileFromURL.sh InstallFromCompressedFileFromURL.sh handles tar.gz, but not tgz. Add the missing extension. Change-Id: Ie7e10e9b6963d5c24e21818dfd67bea9ab571541 Reviewed-by: Dimitrios Apostolou (cherry picked from commit 03d05c8781e2127f930ccb08464a77c832a64370) Reviewed-by: Qt Cherry-pick Bot --- .../common/unix/InstallFromCompressedFileFromURL.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/coin/provisioning/common/unix/InstallFromCompressedFileFromURL.sh b/coin/provisioning/common/unix/InstallFromCompressedFileFromURL.sh index c1358fddc52..12a04f0c0b9 100755 --- a/coin/provisioning/common/unix/InstallFromCompressedFileFromURL.sh +++ b/coin/provisioning/common/unix/InstallFromCompressedFileFromURL.sh @@ -27,6 +27,9 @@ function InstallFromCompressedFileFromURL { DownloadURL "$url" "$url_alt" "$expectedSha1" "$targetFile" echo "Uncompress $targetFile" case $extension in + "tgz") + tar -xzf "$targetFile" --directory "$targetDirectory" + ;; "tar.gz") tar -xzf "$targetFile" --directory "$targetDirectory" ;; From bc518401285a4d0a164cc72774c554d182eed3ef 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 075/204] COIN: Add Debian packaging config for Debian 12 Pick-to: 6.8 Change-Id: Ifaf0db9b9d39c6e66003e34e6c19957b60d0289f Reviewed-by: Jani Heikkinen (cherry picked from commit 9babd801690fea67028dcb1ee0be68c357f41b06) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 2035320e5789c9eeb5d98b921c03396dbc1a5a0e) --- 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 42e0846a18af6d67838d93e963fb0cd0052f31ff Mon Sep 17 00:00:00 2001 From: Tero Heikkinen Date: Tue, 4 Mar 2025 11:56:30 +0200 Subject: [PATCH 076/204] RHEL: Add ca-certificate install to fix missing certificate issues MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Other linux distros have similar ca-certificate install/update in use. Issue was noticed in RTA, and if similar happens again, these RHELs need new provisioning to get up-to-date ca-certificates available. Task-number: QTQAINFRA-7014 Pick-to: 6.8 Change-Id: Id0ef369b0d714b40b66117d6e62ddd6a787cae71 Reviewed-by: Simo Fält (cherry picked from commit 1144b145842a5e197a60d4f113bc88c7ec565e2d) Reviewed-by: Qt Cherry-pick Bot --- .../qtci-linux-RHEL-8.10-x86_64/04-install-packages.sh | 2 ++ .../qtci-linux-RHEL-8.2-x86_64/04-install-packages.sh | 2 ++ .../qtci-linux-RHEL-8.4-x86_64/04-install-packages.sh | 2 ++ .../qtci-linux-RHEL-8.6-x86_64/04-install-packages.sh | 2 ++ .../qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh | 2 ++ .../qtci-linux-RHEL-9.0-x86_64/04-install-packages.sh | 2 ++ .../qtci-linux-RHEL-9.2-x86_64/04-install-packages.sh | 2 ++ .../qtci-linux-RHEL-9.4-x86_64/04-install-packages.sh | 2 ++ 8 files changed, 16 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 82ba2b41485..62a37bd974c 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 @@ -12,6 +12,8 @@ sudo yum -y remove PackageKit gnome-software sudo yum -y update installPackages=() +# Make sure needed ca-certificates are available +installPackages+=(ca-certificates) installPackages+=(git) installPackages+=(zlib-devel) installPackages+=(glib2-devel) 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 0c2422c31e1..f852a9df4ee 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 @@ -11,6 +11,8 @@ sudo yum -y remove PackageKit gnome-software sudo yum -y update installPackages=() +# Make sure needed ca-certificates are available +installPackages+=(ca-certificates) installPackages+=(git) installPackages+=(zlib-devel) installPackages+=(glib2-devel) 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 e24d44d0db2..30c045fd4eb 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 @@ -11,6 +11,8 @@ sudo yum -y remove PackageKit gnome-software sudo yum -y update installPackages=() +# Make sure needed ca-certificates are available +installPackages+=(ca-certificates) installPackages+=(git) installPackages+=(zlib-devel) installPackages+=(glib2-devel) 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 b0d30e444bf..2114aa5f9cf 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 @@ -12,6 +12,8 @@ sudo yum -y remove PackageKit gnome-software sudo yum -y update installPackages=() +# Make sure needed ca-certificates are available +installPackages+=(ca-certificates) installPackages+=(git) installPackages+=(zlib-devel) installPackages+=(glib2-devel) 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 ab8903714a7..b2477251e3d 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 @@ -12,6 +12,8 @@ sudo yum -y remove PackageKit gnome-software sudo yum -y update installPackages=() +# Make sure needed ca-certificates are available +installPackages+=(ca-certificates) installPackages+=(git) installPackages+=(zlib-devel) installPackages+=(glib2-devel) 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 1859acd8426..2942dd8af54 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 @@ -11,6 +11,8 @@ sudo yum -y remove PackageKit gnome-software sudo yum -y update installPackages=() +# Make sure needed ca-certificates are available +installPackages+=(ca-certificates) installPackages+=(git) installPackages+=(zlib-devel) installPackages+=(glib2-devel) 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 32410d861dd..ed091f0e1e0 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 @@ -11,6 +11,8 @@ sudo yum -y remove PackageKit gnome-software sudo yum -y update installPackages=() +# Make sure needed ca-certificates are available +installPackages+=(ca-certificates) installPackages+=(git) installPackages+=(zlib-devel) installPackages+=(glib2-devel) 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 c346dbf4c81..15d5c3fe55d 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 @@ -11,6 +11,8 @@ sudo yum -y remove PackageKit gnome-software sudo yum -y update installPackages=() +# Make sure needed ca-certificates are available +installPackages+=(ca-certificates) installPackages+=(git) installPackages+=(zlib-devel) installPackages+=(glib2-devel) From 8605087d3ab0a4f40cd260475368f1993ac17564 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marianne=20Yrj=C3=A4n=C3=A4?= Date: Tue, 4 Mar 2025 15:27:02 +0200 Subject: [PATCH 077/204] Fix QNX nightly build config for Windows host Previous dependency platform had been removed from CI, leading nightly builds failing silently. Changed also from MSCV to mingw since it seems to be more commonly used among customers. Task-number: QTQAINFRA-7017 Task-number: QTQAINFRA-7000 Pick-to: 6.8 Change-Id: I009dd5e5c5ad28434816f831de37849a53f2c24f Reviewed-by: Jukka Jokiniva Reviewed-by: Tero Heikkinen (cherry picked from commit c47f750e65f0673ded16fb764d2a3d6bfacdcc7b) Reviewed-by: Qt Cherry-pick Bot --- .../platform_configs/nightly_qnx710_host_windows.yaml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/coin/platform_configs/nightly_qnx710_host_windows.yaml b/coin/platform_configs/nightly_qnx710_host_windows.yaml index 40a53fd36aa..134283082ef 100644 --- a/coin/platform_configs/nightly_qnx710_host_windows.yaml +++ b/coin/platform_configs/nightly_qnx710_host_windows.yaml @@ -1,7 +1,7 @@ Version: 2 Include: [ cmake_platforms.yaml: [ - windows-10_22h2-msvc2019-developer-build + windows-10_22h2-mingw13 ] ] Configurations: @@ -10,12 +10,13 @@ Configurations: Template: 'qtci-windows-10_22H2-x86_64-53' Target os: 'QNX_710' Target arch: 'arm64' - Compiler: 'MSVC2019' + Compiler: 'Mingw' Target compiler: 'QCC' - Platform dependency: 'windows-10_22h2-msvc2019-developer-build' + Platform dependency: 'windows-10_22h2-mingw13' Features: ['DisableTests', 'UseConfigure'] Environment variables: [ + 'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}', 'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples -no-pch', - 'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}\qnx-toolchain-aarch64le.cmake -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON -G "Ninja"', - 'NON_QTBASE_TARGET_CMAKE_ARGS=-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON' + 'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}\qnx-toolchain-aarch64le.cmake -DCMAKE_BUILD_WITH_INSTALL_RPATH=ON', + 'NON_QTBASE_TARGET_CMAKE_ARGS=-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON -DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH={{.Env.Protobuf_ROOT_mingw}} -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR={{.Env.Protobuf_ROOT_mingw}}/include' ] From 7d17c5a0a145a563bc782a1ce841b48eb5acb40a Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Wed, 19 Feb 2025 13:03:30 +0200 Subject: [PATCH 078/204] Android: update the sha for Gradle script for provisioning Use the sha from last update of Gradle and update AGP version to match qtbase's 0e4f9ffa55c2b77fbe79e96362bc68a968982b48 commit. Task-number: QTBUG-132852 Change-Id: Iab851b08bc11290ee51a22f3bdd64369928dff22 Reviewed-by: Tero Heikkinen (cherry picked from commit 1c20066c693df356f4b5fb923a65817df66e9818) Reviewed-by: Qt Cherry-pick Bot --- .../linux/android/gradle_project/gradle/libs.versions.toml | 3 +-- coin/provisioning/common/linux/android_linux.sh | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/coin/provisioning/common/linux/android/gradle_project/gradle/libs.versions.toml b/coin/provisioning/common/linux/android/gradle_project/gradle/libs.versions.toml index f45e66b0903..5e65aa4e2f8 100644 --- a/coin/provisioning/common/linux/android/gradle_project/gradle/libs.versions.toml +++ b/coin/provisioning/common/linux/android/gradle_project/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -agp = "8.6.0" +agp = "8.8.0" core = "1.13.1" appcompat = "1.6.1" material = "1.11.0" @@ -15,4 +15,3 @@ constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayo androidApplication = { id = "com.android.application", version.ref = "agp" } [bundles] - diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index 6d38220f63a..90156b1ebc1 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -210,7 +210,7 @@ cp -r "${scripts_dir_name}/android/gradle_project" /tmp/gradle_project cd /tmp/gradle_project # Get Gradle files from qtbase qtbaseGradleUrl="https://code.qt.io/cgit/qt/qtbase.git/plain/src/3rdparty/gradle" -commit_sha="8436455e2740000a817e0b8154e13f47e6abb68c" +commit_sha="e5f79573fe2f21cf7bea8f63386f39bb18b351f0" curl "$qtbaseGradleUrl/gradle.properties?h=$commit_sha" > gradle.properties curl "$qtbaseGradleUrl/gradlew?h=$commit_sha" > gradlew curl "$qtbaseGradleUrl/gradlew.bat?h=$commit_sha" > gradlew.bat From faf67533c364716fe5bd0613f49311ca2e77739c Mon Sep 17 00:00:00 2001 From: Cristian Le Date: Wed, 12 Feb 2025 11:01:27 +0100 Subject: [PATCH 079/204] Remove `RunCMake` helpers from top-level repo These test helpers are moved to qtbase submodule. Pick-to: 6.8 Change-Id: If8aa31fe1d9a93f2667249abd90ae9b8cb81d07a Reviewed-by: Alexandru Croitor (cherry picked from commit e552513c9f4d5cf3ab31be4a6bf72462a965b6e1) --- cmake/3rdparty/cmake/Copyright.txt | 136 -------- cmake/3rdparty/cmake/QtIRRunCMake.cmake | 349 --------------------- cmake/3rdparty/cmake/QtIRTestHelpers.cmake | 39 --- cmake/3rdparty/cmake/qt_attribution.json | 16 - cmake/QtIRHelpers.cmake | 1 - cmake/QtIRScript.cmake | 1 - cmake/QtTopLevelConfigureScript.cmake | 1 - tests/manual/RunCMake/Common.cmake | 10 +- 8 files changed, 9 insertions(+), 544 deletions(-) delete mode 100644 cmake/3rdparty/cmake/Copyright.txt delete mode 100644 cmake/3rdparty/cmake/QtIRRunCMake.cmake delete mode 100644 cmake/3rdparty/cmake/QtIRTestHelpers.cmake delete mode 100644 cmake/3rdparty/cmake/qt_attribution.json diff --git a/cmake/3rdparty/cmake/Copyright.txt b/cmake/3rdparty/cmake/Copyright.txt deleted file mode 100644 index 2074109b019..00000000000 --- a/cmake/3rdparty/cmake/Copyright.txt +++ /dev/null @@ -1,136 +0,0 @@ -CMake - Cross Platform Makefile Generator -Copyright 2000-2024 Kitware, Inc. and Contributors -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: - -* Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - -* Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - -* Neither the name of Kitware, Inc. nor the names of Contributors - may be used to endorse or promote products derived from this - software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - ------------------------------------------------------------------------------- - -The following individuals and institutions are among the Contributors: - -* Aaron C. Meadows -* Adriaan de Groot -* Aleksey Avdeev -* Alexander Neundorf -* Alexander Smorkalov -* Alexey Sokolov -* Alex Merry -* Alex Turbov -* Andreas Pakulat -* Andreas Schneider -* André Rigland Brodtkorb -* Axel Huebl, Helmholtz-Zentrum Dresden - Rossendorf -* Benjamin Eikel -* Bjoern Ricks -* Brad Hards -* Christopher Harvey -* Christoph Grüninger -* Clement Creusot -* Daniel Blezek -* Daniel Pfeifer -* Dawid Wróbel -* Enrico Scholz -* Eran Ifrah -* Esben Mose Hansen, Ange Optimization ApS -* Geoffrey Viola -* Google Inc -* Gregor Jasny -* Helio Chissini de Castro -* Ilya Lavrenov -* Insight Software Consortium -* Intel Corporation -* Jan Woetzel -* Jordan Williams -* Julien Schueller -* Kelly Thompson -* Konstantin Podsvirov -* Laurent Montel -* Mario Bensi -* Martin Gräßlin -* Mathieu Malaterre -* Matthaeus G. Chajdas -* Matthias Kretz -* Matthias Maennich -* Michael Hirsch, Ph.D. -* Michael Stürmer -* Miguel A. Figueroa-Villanueva -* Mike Durso -* Mike Jackson -* Mike McQuaid -* Nicolas Bock -* Nicolas Despres -* Nikita Krupen'ko -* NVIDIA Corporation -* OpenGamma Ltd. -* Patrick Stotko -* Per Øyvind Karlsen -* Peter Collingbourne -* Petr Gotthard -* Philip Lowman -* Philippe Proulx -* Raffi Enficiaud, Max Planck Society -* Raumfeld -* Roger Leigh -* Rolf Eike Beer -* Roman Donchenko -* Roman Kharitonov -* Ruslan Baratov -* Sebastian Holtermann -* Stephen Kelly -* Sylvain Joubert -* The Qt Company Ltd. -* Thomas Sondergaard -* Tobias Hunger -* Todd Gamblin -* Tristan Carel -* University of Dundee -* Vadim Zhukov -* Will Dicharry - -See version control history for details of individual contributions. - -The above copyright and license notice applies to distributions of -CMake in source and binary form. Third-party software packages supplied -with CMake under compatible licenses provide their own copyright notices -documented in corresponding subdirectories or source files. - ------------------------------------------------------------------------------- - -CMake was initially developed by Kitware with the following sponsorship: - - * National Library of Medicine at the National Institutes of Health - as part of the Insight Segmentation and Registration Toolkit (ITK). - - * US National Labs (Los Alamos, Livermore, Sandia) ASC Parallel - Visualization Initiative. - - * National Alliance for Medical Image Computing (NAMIC) is funded by the - National Institutes of Health through the NIH Roadmap for Medical Research, - Grant U54 EB005149. - - * Kitware, Inc. diff --git a/cmake/3rdparty/cmake/QtIRRunCMake.cmake b/cmake/3rdparty/cmake/QtIRRunCMake.cmake deleted file mode 100644 index dd6a10de1cd..00000000000 --- a/cmake/3rdparty/cmake/QtIRRunCMake.cmake +++ /dev/null @@ -1,349 +0,0 @@ -# Distributed under the OSI-approved BSD 3-Clause License. See accompanying -# file Copyright.txt or https://cmake.org/licensing for details. -# -# Original file location was Tests/RunCMake/RunCMake.cmake - -foreach( - arg - IN ITEMS - RunCMake_GENERATOR - RunCMake_SOURCE_DIR - RunCMake_BINARY_DIR - ) - if(NOT DEFINED ${arg}) - message(FATAL_ERROR "${arg} not given!") - endif() -endforeach() - -function(run_cmake test) - if(DEFINED ENV{RunCMake_TEST_FILTER}) - set(test_and_variant "${test}${RunCMake_TEST_VARIANT_DESCRIPTION}") - if(NOT test_and_variant MATCHES "$ENV{RunCMake_TEST_FILTER}") - return() - endif() - unset(test_and_variant) - endif() - - set(top_src "${RunCMake_SOURCE_DIR}") - set(top_bin "${RunCMake_BINARY_DIR}") - if(EXISTS ${top_src}/${test}-result.txt) - file(READ ${top_src}/${test}-result.txt expect_result) - string(REGEX REPLACE "\n+$" "" expect_result "${expect_result}") - elseif(DEFINED RunCMake_TEST_EXPECT_RESULT) - set(expect_result "${RunCMake_TEST_EXPECT_RESULT}") - else() - set(expect_result 0) - endif() - - string(TOLOWER ${CMAKE_HOST_SYSTEM_NAME} platform_name) - #remove all additional bits from cygwin/msys name - if(platform_name MATCHES cygwin) - set(platform_name cygwin) - endif() - if(platform_name MATCHES msys) - set(platform_name msys) - endif() - - foreach(o IN ITEMS stdout stderr config) - if(RunCMake-${o}-file AND EXISTS ${top_src}/${RunCMake-${o}-file}) - file(READ ${top_src}/${RunCMake-${o}-file} expect_${o}) - string(REGEX REPLACE "\n+$" "" expect_${o} "${expect_${o}}") - elseif(EXISTS ${top_src}/${test}-${o}-${platform_name}.txt) - file(READ ${top_src}/${test}-${o}-${platform_name}.txt expect_${o}) - string(REGEX REPLACE "\n+$" "" expect_${o} "${expect_${o}}") - elseif(EXISTS ${top_src}/${test}-${o}.txt) - file(READ ${top_src}/${test}-${o}.txt expect_${o}) - string(REGEX REPLACE "\n+$" "" expect_${o} "${expect_${o}}") - elseif(DEFINED RunCMake_TEST_EXPECT_${o}) - string(REGEX REPLACE "\n+$" "" expect_${o} "${RunCMake_TEST_EXPECT_${o}}") - else() - unset(expect_${o}) - endif() - endforeach() - foreach(o IN ITEMS stdout stderr config) - if(DEFINED RunCMake_TEST_NOT_EXPECT_${o}) - string(REGEX REPLACE "\n+$" "" not_expect_${o} "${RunCMake_TEST_NOT_EXPECT_${o}}") - endif() - endforeach() - if (NOT expect_stderr) - if (NOT RunCMake_DEFAULT_stderr) - set(RunCMake_DEFAULT_stderr "^$") - endif() - set(expect_stderr ${RunCMake_DEFAULT_stderr}) - endif() - - if (NOT RunCMake_TEST_SOURCE_DIR) - set(RunCMake_TEST_SOURCE_DIR "${top_src}") - endif() - if(NOT RunCMake_TEST_BINARY_DIR) - set(RunCMake_TEST_BINARY_DIR "${top_bin}/${test}-build") - endif() - if(NOT RunCMake_TEST_NO_CLEAN) - file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}") - endif() - file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}") - if(RunCMake-prep-file AND EXISTS ${top_src}/${RunCMake-prep-file}) - include(${top_src}/${RunCMake-prep-file}) - else() - include(${top_src}/${test}-prep.cmake OPTIONAL) - endif() - if(RunCMake_TEST_OUTPUT_MERGE) - set(actual_stderr_var actual_stdout) - set(actual_stderr "") - else() - set(actual_stderr_var actual_stderr) - endif() - if(DEFINED RunCMake_TEST_TIMEOUT) - set(maybe_timeout TIMEOUT ${RunCMake_TEST_TIMEOUT}) - else() - set(maybe_timeout "") - endif() - if(RunCMake-stdin-file AND EXISTS ${top_src}/${RunCMake-stdin-file}) - set(maybe_input_file INPUT_FILE ${top_src}/${RunCMake-stdin-file}) - elseif(EXISTS ${top_src}/${test}-stdin.txt) - set(maybe_input_file INPUT_FILE ${top_src}/${test}-stdin.txt) - else() - set(maybe_input_file "") - endif() - if(NOT RunCMake_TEST_COMMAND) - if(NOT DEFINED RunCMake_TEST_OPTIONS) - set(RunCMake_TEST_OPTIONS "") - endif() - if(APPLE) - list(APPEND RunCMake_TEST_OPTIONS -DCMAKE_POLICY_DEFAULT_CMP0025=NEW) - endif() - if(RunCMake_TEST_LCC AND NOT RunCMake_TEST_NO_CMP0129) - list(APPEND RunCMake_TEST_OPTIONS -DCMAKE_POLICY_DEFAULT_CMP0129=NEW) - endif() - if(RunCMake_MAKE_PROGRAM) - list(APPEND RunCMake_TEST_OPTIONS "-DCMAKE_MAKE_PROGRAM=${RunCMake_MAKE_PROGRAM}") - endif() - set(RunCMake_TEST_COMMAND ${CMAKE_COMMAND}) - if(NOT RunCMake_TEST_NO_SOURCE_DIR) - list(APPEND RunCMake_TEST_COMMAND "${RunCMake_TEST_SOURCE_DIR}") - endif() - list(APPEND RunCMake_TEST_COMMAND -G "${RunCMake_GENERATOR}") - if(RunCMake_GENERATOR_PLATFORM) - list(APPEND RunCMake_TEST_COMMAND -A "${RunCMake_GENERATOR_PLATFORM}") - endif() - if(RunCMake_GENERATOR_TOOLSET) - list(APPEND RunCMake_TEST_COMMAND -T "${RunCMake_GENERATOR_TOOLSET}") - endif() - if(RunCMake_GENERATOR_INSTANCE) - list(APPEND RunCMake_TEST_COMMAND "-DCMAKE_GENERATOR_INSTANCE=${RunCMake_GENERATOR_INSTANCE}") - endif() - list(APPEND RunCMake_TEST_COMMAND - -DRunCMake_TEST=${test} - --no-warn-unused-cli - ) - else() - set(RunCMake_TEST_OPTIONS "") - endif() - if(NOT DEFINED RunCMake_TEST_RAW_ARGS) - set(RunCMake_TEST_RAW_ARGS "") - endif() - if(NOT RunCMake_TEST_COMMAND_WORKING_DIRECTORY) - set(RunCMake_TEST_COMMAND_WORKING_DIRECTORY "${RunCMake_TEST_BINARY_DIR}") - endif() - string(CONCAT _code [[execute_process( - COMMAND ${RunCMake_TEST_COMMAND} - ${RunCMake_TEST_OPTIONS} - ]] "${RunCMake_TEST_RAW_ARGS}\n" [[ - WORKING_DIRECTORY "${RunCMake_TEST_COMMAND_WORKING_DIRECTORY}" - OUTPUT_VARIABLE actual_stdout - ERROR_VARIABLE ${actual_stderr_var} - RESULT_VARIABLE actual_result - ENCODING UTF8 - ${maybe_timeout} - ${maybe_input_file} - )]]) - if(DEFINED ENV{PWD}) - set(old_pwd "$ENV{PWD}") - else() - set(old_pwd) - endif() - # Emulate a shell using this directory. - set(ENV{PWD} "${RunCMake_TEST_COMMAND_WORKING_DIRECTORY}") - cmake_language(EVAL CODE "${_code}") - if(DEFINED old_pwd) - set(ENV{PWD} "${old_pwd}") - else() - set(ENV{PWD}) - endif() - set(msg "") - if(NOT "${actual_result}" MATCHES "${expect_result}") - string(APPEND msg "Result is [${actual_result}], not [${expect_result}].\n") - endif() - set(config_file "${RunCMake_TEST_COMMAND_WORKING_DIRECTORY}/CMakeFiles/CMakeConfigureLog.yaml") - if(EXISTS "${config_file}") - file(READ "${config_file}" actual_config) - else() - set(actual_config "") - endif() - - # Special case: remove ninja no-op line from stderr, but not stdout. - # Test cases that look for it should use RunCMake_TEST_OUTPUT_MERGE. - string(REGEX REPLACE "(^|\r?\n)ninja: no work to do\\.\r?\n" "\\1" actual_stderr "${actual_stderr}") - - # Remove incidental content from both stdout and stderr. - string(CONCAT ignore_line_regex - "(^|\n)((==[0-9]+==" - "|BullseyeCoverage" - "|[a-z]+\\([0-9]+\\) malloc:" - "|clang[^:]*: warning: the object size sanitizer has no effect at -O0, but is explicitly enabled:" - "|flang-new: warning: argument unused during compilation: .-flang-experimental-exec." - "|icp?x: remark: Note that use of .-g. without any optimization-level option will turn off most compiler optimizations" - "|ifx: remark #10440: Note that use of a debug option without any optimization-level option will turnoff most compiler optimizations" - "|lld-link: warning: procedure symbol record for .* refers to PDB item index [0-9A-Fa-fx]+ which is not a valid function ID record" - "|Error kstat returned" - "|Hit xcodebuild bug" - "|Recompacting log\\.\\.\\." - - "|LICENSE WARNING:" - "|Your license to use PGI[^\n]*expired" - "|Please obtain a new version at" - "|contact PGI Sales at" - "|ic(p?c|l): remark #10441: The Intel\\(R\\) C\\+\\+ Compiler Classic \\(ICC\\) is deprecated" - - "|[^\n]*install_name_tool: warning: changes being made to the file will invalidate the code signature in:" - "|[^\n]*(createItemModels|_NSMainThread|Please file a bug at)" - "|[^\n]*xcodebuild[^\n]*DVTAssertions: Warning" - "|[^\n]*xcodebuild[^\n]*DVTCoreDeviceEnabledState: DVTCoreDeviceEnabledState_Disabled set via user default" - "|[^\n]*xcodebuild[^\n]*DVTPlugInManager" - "|[^\n]*xcodebuild[^\n]*DVTSDK: Warning: SDK path collision for path" - "|[^\n]*xcodebuild[^\n]*Requested but did not find extension point with identifier" - "|[^\n]*xcodebuild[^\n]*nil host used in call to allows.*HTTPSCertificateForHost" - "|[^\n]*xcodebuild[^\n]*warning: file type[^\n]*is based on missing file type" - "|[^\n]*objc[^\n]*: Class [^\n]* One of the two will be used. Which one is undefined." - "|[^\n]*is a member of multiple groups" - "|[^\n]*offset in archive not a multiple of 8" - "|[^\n]*from Time Machine by path" - "|[^\n]*Bullseye Testing Technology" - ${RunCMake_TEST_EXTRA_IGNORE_LINE_REGEX} - ")[^\n]*\n)+" - ) - if(RunCMake_IGNORE_POLICY_VERSION_DEPRECATION) - string(REGEX REPLACE [[ -^CMake Deprecation Warning at [^ -]*CMakeLists.txt:1 \(cmake_minimum_required\): - Compatibility with CMake < 3\.5 will be removed from a future version of - CMake. - - Update the VERSION argument value or use a \.\.\. suffix to tell - CMake that the project does not need compatibility with older versions\. -+ -]] "" actual_stderr "${actual_stderr}") - endif() - foreach(o IN ITEMS stdout stderr config) - string(REGEX REPLACE "\r\n" "\n" actual_${o} "${actual_${o}}") - string(REGEX REPLACE "${ignore_line_regex}" "\\1" actual_${o} "${actual_${o}}") - string(REGEX REPLACE "\n+$" "" actual_${o} "${actual_${o}}") - if(DEFINED expect_${o}) - if(NOT "${actual_${o}}" MATCHES "${expect_${o}}") - string(APPEND msg "${o} does not match that expected.\n") - endif() - endif() - if(DEFINED not_expect_${o}) - if("${actual_${o}}" MATCHES "${not_expect_${o}}") - string(APPEND msg "${o} matches that not expected.\n") - endif() - endif() - endforeach() - unset(RunCMake_TEST_FAILED) - if(RunCMake-check-file AND EXISTS ${top_src}/${RunCMake-check-file}) - include(${top_src}/${RunCMake-check-file}) - else() - include(${top_src}/${test}-check.cmake OPTIONAL) - endif() - if(RunCMake_TEST_FAILED) - set(msg "${RunCMake_TEST_FAILED}\n${msg}") - endif() - if(msg) - string(REPLACE ";" "\" \"" command "\"${RunCMake_TEST_COMMAND}\"") - if(RunCMake_TEST_OPTIONS) - string(REPLACE ";" "\" \"" options "\"${RunCMake_TEST_OPTIONS}\"") - string(APPEND command " ${options}") - endif() - if(RunCMake_TEST_RAW_ARGS) - string(APPEND command " ${RunCMake_TEST_RAW_ARGS}") - endif() - string(APPEND msg "Command was:\n command> ${command}\n") - endif() - if(msg) - foreach(o IN ITEMS stdout stderr config) - if(DEFINED expect_${o}) - string(REGEX REPLACE "\n" "\n expect-${o}> " expect_${o} " expect-${o}> ${expect_${o}}") - string(APPEND msg "Expected ${o} to match:\n${expect_${o}}\n") - endif() - if(NOT o STREQUAL "config" OR DEFINED expect_${o}) - string(REGEX REPLACE "\n" "\n actual-${o}> " actual_${o} " actual-${o}> ${actual_${o}}") - string(APPEND msg "Actual ${o}:\n${actual_${o}}\n") - endif() - endforeach() - message(SEND_ERROR "${test}${RunCMake_TEST_VARIANT_DESCRIPTION} - FAILED:\n${msg}") - else() - message(STATUS "${test}${RunCMake_TEST_VARIANT_DESCRIPTION} - PASSED") - endif() -endfunction() - -function(run_cmake_command test) - set(RunCMake_TEST_COMMAND "${ARGN}") - run_cmake(${test}) -endfunction() - -function(run_cmake_script test) - set(RunCMake_TEST_COMMAND ${CMAKE_COMMAND} ${ARGN} -P ${RunCMake_SOURCE_DIR}/${test}.cmake) - run_cmake(${test}) -endfunction() - -function(run_cmake_with_options test) - set(RunCMake_TEST_OPTIONS "${ARGN}") - run_cmake(${test}) -endfunction() - -function(run_cmake_with_raw_args test args) - set(RunCMake_TEST_RAW_ARGS "${args}") - run_cmake(${test}) -endfunction() - -function(ensure_files_match expected_file actual_file) - if(NOT EXISTS "${expected_file}") - message(FATAL_ERROR "Expected file does not exist:\n ${expected_file}") - endif() - if(NOT EXISTS "${actual_file}") - message(FATAL_ERROR "Actual file does not exist:\n ${actual_file}") - endif() - file(READ "${expected_file}" expected_file_content) - file(READ "${actual_file}" actual_file_content) - if(NOT "${expected_file_content}" STREQUAL "${actual_file_content}") - message(FATAL_ERROR "Actual file content does not match expected:\n - \n - expected file: ${expected_file}\n - expected content:\n - ${expected_file_content}\n - \n - actual file: ${actual_file}\n - actual content:\n - ${actual_file_content}\n - ") - endif() -endfunction() - -# Get the user id on unix if possible. -function(get_unix_uid var) - set("${var}" "" PARENT_SCOPE) - if(UNIX) - set(ID "id") - if(CMAKE_SYSTEM_NAME STREQUAL "SunOS" AND EXISTS "/usr/xpg4/bin/id") - set (ID "/usr/xpg4/bin/id") - endif() - execute_process(COMMAND ${ID} -u $ENV{USER} OUTPUT_VARIABLE uid ERROR_QUIET - RESULT_VARIABLE status OUTPUT_STRIP_TRAILING_WHITESPACE) - if(status EQUAL 0) - set("${var}" "${uid}" PARENT_SCOPE) - endif() - endif() -endfunction() - -# Protect RunCMake tests from calling environment. -unset(ENV{MAKEFLAGS}) diff --git a/cmake/3rdparty/cmake/QtIRTestHelpers.cmake b/cmake/3rdparty/cmake/QtIRTestHelpers.cmake deleted file mode 100644 index 804e20f0f44..00000000000 --- a/cmake/3rdparty/cmake/QtIRTestHelpers.cmake +++ /dev/null @@ -1,39 +0,0 @@ -# Distributed under the OSI-approved BSD 3-Clause License. See accompanying -# file Copyright.txt or https://cmake.org/licensing for details. -# -# Original file location was Tests/RunCMake/CMakeLists.txt - -macro(add_RunCMake_test test) - set(TEST_ARGS ${ARGN}) - if ("${ARGV1}" STREQUAL "TEST_DIR") - if ("${ARGV2}" STREQUAL "") - message(FATAL_ERROR "Invalid args") - endif() - set(Test_Dir ${ARGV2}) - list(REMOVE_AT TEST_ARGS 0) - list(REMOVE_AT TEST_ARGS 0) - else() - set(Test_Dir ${test}) - endif() - if(CMAKE_C_COMPILER_ID STREQUAL "LCC") - list(APPEND TEST_ARGS -DRunCMake_TEST_LCC=1) - endif() - add_test(NAME RunCMake.${test} COMMAND ${CMAKE_CMAKE_COMMAND} - -DCMAKE_MODULE_PATH=${CMAKE_CURRENT_SOURCE_DIR} - -DRunCMake_GENERATOR_IS_MULTI_CONFIG=${_isMultiConfig} - -DRunCMake_GENERATOR=${CMAKE_GENERATOR} - -DRunCMake_GENERATOR_INSTANCE=${CMAKE_GENERATOR_INSTANCE} - -DRunCMake_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM} - -DRunCMake_GENERATOR_TOOLSET=${CMAKE_GENERATOR_TOOLSET} - -DRunCMake_MAKE_PROGRAM=${CMake_TEST_EXPLICIT_MAKE_PROGRAM} - -DRunCMake_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}/${Test_Dir} - -DRunCMake_BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR}/${test} - ${${test}_ARGS} - ${TEST_ARGS} - -P "${CMAKE_CURRENT_SOURCE_DIR}/${Test_Dir}/RunCMakeTest.cmake" - ) - set_tests_properties("RunCMake.${test}" PROPERTIES LABELS "CMake;run") - if(${test} MATCHES ^CMP) - set_property(TEST "RunCMake.${test}" APPEND PROPERTY LABELS "policy") - endif() -endmacro() diff --git a/cmake/3rdparty/cmake/qt_attribution.json b/cmake/3rdparty/cmake/qt_attribution.json deleted file mode 100644 index 8ba8a1e73ac..00000000000 --- a/cmake/3rdparty/cmake/qt_attribution.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "Id": "cmake-test-modules", - "Name": "cmake-test-modules", - "QDocModule": "qtcore", - "QtUsage": "Used as part of the build system.", - "QtParts" : [ "tests" ], - - "Description": "CMake helpers for running CMake tests.", - "Homepage": "https://cmake.org/", - "Version": "3.29.0", - - "License": "BSD 3-Clause \"New\" or \"Revised\" License", - "LicenseId": "BSD-3-Clause", - "LicenseFile": "Copyright.txt", - "Copyright": "Copyright © 2000-2024 Kitware, Inc. and Contributors" -} diff --git a/cmake/QtIRHelpers.cmake b/cmake/QtIRHelpers.cmake index 678848f6cbf..c305ae803b2 100644 --- a/cmake/QtIRHelpers.cmake +++ b/cmake/QtIRHelpers.cmake @@ -8,7 +8,6 @@ macro(qt_ir_include_all_helpers) include(QtIROptionsHelpers) include(QtIRParsingHelpers) include(QtIRProcessHelpers) - include(QtIRTestHelpers) include(QtTopLevelHelpers) endmacro() diff --git a/cmake/QtIRScript.cmake b/cmake/QtIRScript.cmake index fc5ffba9c3d..bd2b97c7f23 100644 --- a/cmake/QtIRScript.cmake +++ b/cmake/QtIRScript.cmake @@ -7,7 +7,6 @@ cmake_minimum_required(VERSION 3.16) macro(qt_ir_setup_include_paths) list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}" - "${CMAKE_CURRENT_LIST_DIR}/3rdparty/cmake" ) include(QtIRHelpers) endmacro() diff --git a/cmake/QtTopLevelConfigureScript.cmake b/cmake/QtTopLevelConfigureScript.cmake index 304bf7b751d..b0f92fa38f1 100644 --- a/cmake/QtTopLevelConfigureScript.cmake +++ b/cmake/QtTopLevelConfigureScript.cmake @@ -7,7 +7,6 @@ cmake_minimum_required(VERSION 3.16) macro(qt_tl_setup_include_paths) list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}" - "${CMAKE_CURRENT_LIST_DIR}/3rdparty/cmake" ) include(QtTopLevelHelpers) endmacro() diff --git a/tests/manual/RunCMake/Common.cmake b/tests/manual/RunCMake/Common.cmake index c4e782d765d..63418cfda45 100644 --- a/tests/manual/RunCMake/Common.cmake +++ b/tests/manual/RunCMake/Common.cmake @@ -3,15 +3,23 @@ set(top_repo_dir_path "${CMAKE_CURRENT_LIST_DIR}/../../..") get_filename_component(top_repo_dir_path "${top_repo_dir_path}" ABSOLUTE) +if(NOT IS_DIRECTORY ${top_repo_dir_path}/qtbase/cmake/3rdparty/cmake) + message(FATAL_ERROR + "qtbase submodule is not initialized or it is missing the QtRunCMakeTestHelpers.\n" + " Cannot run these tests without them." + ) +endif() macro(qt_ir_setup_test_include_paths) set(ir_script_path "${top_repo_dir_path}/cmake") list(APPEND CMAKE_MODULE_PATH "${ir_script_path}" - "${ir_script_path}/3rdparty/cmake" + "${top_repo_dir_path}/qtbase/cmake/3rdparty/cmake" ) include(QtIRHelpers) qt_ir_include_all_helpers() + # RunCMakeTestHelpers from qtbase/cmake/3rdparty/cmake + include(QtRunCMakeTestHelpers) endmacro() qt_ir_setup_test_include_paths() From 033cc2c181fd0de6929eb56654af52002446235b Mon Sep 17 00:00:00 2001 From: Tero Heikkinen Date: Fri, 14 Mar 2025 08:25:06 +0200 Subject: [PATCH 080/204] Provisioning: Add Root Certificate update for Windows Windows usually updates certificates once a week, but due to disabling Windows background updates there is need to install and update certificates manually. Updating certificates during provisioning is selected method as it's aligned with the same procedure how linux machines have handled the same. Task-number: QTQAINFRA-7001 Pick-to: 6.8 5.15 Change-Id: I7c077b5e08328b12c481a3501736f06baf85e71e Reviewed-by: Oliver Wolff Reviewed-by: Matti Paaso (cherry picked from commit ebcc9a1d10f2f974bff2cbc8f4db89725e914ecf) Reviewed-by: Qt Cherry-pick Bot --- .../common/windows/certificate-updates.ps1 | 12 ++++++++++++ .../00-certificate-updates.ps1 | 1 + .../00-certificate-updates.ps1 | 1 + .../00-certificate-updates.ps1 | 1 + .../00-certificate-updates.ps1 | 1 + .../00-certificate-updates.ps1 | 1 + .../00-certificate-updates.ps1 | 1 + .../00-certificate-updates.ps1 | 1 + 8 files changed, 19 insertions(+) create mode 100644 coin/provisioning/common/windows/certificate-updates.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/00-certificate-updates.ps1 create mode 100644 coin/provisioning/qtci-windows-10_21H2-x86_64/00-certificate-updates.ps1 create mode 100644 coin/provisioning/qtci-windows-10_22H2-x86_64/00-certificate-updates.ps1 create mode 100644 coin/provisioning/qtci-windows-11_21H2-x86_64/00-certificate-updates.ps1 create mode 100644 coin/provisioning/qtci-windows-11_22H2-aarch64/00-certificate-updates.ps1 create mode 100644 coin/provisioning/qtci-windows-11_22H2-x86_64/00-certificate-updates.ps1 create mode 100644 coin/provisioning/qtci-windows-11_23H2-x86_64/00-certificate-updates.ps1 diff --git a/coin/provisioning/common/windows/certificate-updates.ps1 b/coin/provisioning/common/windows/certificate-updates.ps1 new file mode 100644 index 00000000000..f22a97a479b --- /dev/null +++ b/coin/provisioning/common/windows/certificate-updates.ps1 @@ -0,0 +1,12 @@ +# 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 + +# This script updates Windows Root Certifications which are usually updated weekly by Windows update + +. "$PSScriptRoot\helpers.ps1" + +$sstCerts = "C:\Windows\Temp\certificates.sst" +Run-Executable "certutil.exe" "-generateSSTFromWU $sstCerts" +$sstCertsPath = (Get-ChildItem -Path $sstCerts) +$sstCertsPath | Import-Certificate -CertStoreLocation "Cert:\LocalMachine\Root" | Out-String | Measure-Object -Line +Remove-Item -Path $sstCerts diff --git a/coin/provisioning/qtci-windows-10-x86_64/00-certificate-updates.ps1 b/coin/provisioning/qtci-windows-10-x86_64/00-certificate-updates.ps1 new file mode 100644 index 00000000000..3691baf20b7 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/00-certificate-updates.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\certificate-updates.ps1" diff --git a/coin/provisioning/qtci-windows-10_21H2-x86_64/00-certificate-updates.ps1 b/coin/provisioning/qtci-windows-10_21H2-x86_64/00-certificate-updates.ps1 new file mode 100644 index 00000000000..3691baf20b7 --- /dev/null +++ b/coin/provisioning/qtci-windows-10_21H2-x86_64/00-certificate-updates.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\certificate-updates.ps1" diff --git a/coin/provisioning/qtci-windows-10_22H2-x86_64/00-certificate-updates.ps1 b/coin/provisioning/qtci-windows-10_22H2-x86_64/00-certificate-updates.ps1 new file mode 100644 index 00000000000..3691baf20b7 --- /dev/null +++ b/coin/provisioning/qtci-windows-10_22H2-x86_64/00-certificate-updates.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\certificate-updates.ps1" diff --git a/coin/provisioning/qtci-windows-11_21H2-x86_64/00-certificate-updates.ps1 b/coin/provisioning/qtci-windows-11_21H2-x86_64/00-certificate-updates.ps1 new file mode 100644 index 00000000000..3691baf20b7 --- /dev/null +++ b/coin/provisioning/qtci-windows-11_21H2-x86_64/00-certificate-updates.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\certificate-updates.ps1" diff --git a/coin/provisioning/qtci-windows-11_22H2-aarch64/00-certificate-updates.ps1 b/coin/provisioning/qtci-windows-11_22H2-aarch64/00-certificate-updates.ps1 new file mode 100644 index 00000000000..3691baf20b7 --- /dev/null +++ b/coin/provisioning/qtci-windows-11_22H2-aarch64/00-certificate-updates.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\certificate-updates.ps1" diff --git a/coin/provisioning/qtci-windows-11_22H2-x86_64/00-certificate-updates.ps1 b/coin/provisioning/qtci-windows-11_22H2-x86_64/00-certificate-updates.ps1 new file mode 100644 index 00000000000..3691baf20b7 --- /dev/null +++ b/coin/provisioning/qtci-windows-11_22H2-x86_64/00-certificate-updates.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\certificate-updates.ps1" diff --git a/coin/provisioning/qtci-windows-11_23H2-x86_64/00-certificate-updates.ps1 b/coin/provisioning/qtci-windows-11_23H2-x86_64/00-certificate-updates.ps1 new file mode 100644 index 00000000000..3691baf20b7 --- /dev/null +++ b/coin/provisioning/qtci-windows-11_23H2-x86_64/00-certificate-updates.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\certificate-updates.ps1" From 7a1b5e4e1387f677a055ce79f4bba1b95b4eca89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aku=20Pietik=C3=A4inen?= Date: Wed, 26 Feb 2025 13:39:16 +0200 Subject: [PATCH 081/204] Add missing escape when adding Homebrew to PATH Task-number: QTQAINFRA-6903 Pick-to: 6.8 6.5 5.15 Change-Id: I2f97621d3413df17f9b969113e863974bd739cac Reviewed-by: Ville-Pekka Karhu (cherry picked from commit cf026224ddb4e62f115083e7408d83bd6becc227) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/common/macos/homebrew.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/provisioning/common/macos/homebrew.sh b/coin/provisioning/common/macos/homebrew.sh index 9c0ef68149b..8f68209c2ff 100755 --- a/coin/provisioning/common/macos/homebrew.sh +++ b/coin/provisioning/common/macos/homebrew.sh @@ -33,7 +33,7 @@ installPkg() { sudo installer -pkg "/tmp/Homebrew-$VERSION.pkg" -target / # Add homebrew to PATH - SetEnvVar "PATH" "/opt/homebrew/bin:$PATH" + SetEnvVar "PATH" "/opt/homebrew/bin:\$PATH" echo "Homebrew = $VERSION" >> ~/versions.txt } From 6f01dea4d8a810f892b41bd3defd9186e0b337cd Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 7 Mar 2025 09:32:11 +0100 Subject: [PATCH 082/204] Reapply "platform_configs: remove InsignificantTests for u2404 x11 non-dev" This reverts commit 7525c795e7ca03befa0830e9f4b40de340ef70d8. Task-number: QTQAINFRA-6898 Task-number: QTQAINFRA-6098 Pick-to: 6.8 Change-Id: I74f3d4de45c6f4aa99ef397b19906fcef44c2a16 Reviewed-by: Tero Heikkinen (cherry picked from commit 7111a62bb1e8fa36ebbf673f84f296fb758385c3) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/cmake_platforms.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index b22e660cc08..885fd245214 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -105,7 +105,7 @@ Configurations: Id: 'ubuntu-24.04-x64-x11-tests' Template: 'qtci-linux-Ubuntu-24.04-x86_64-51' Compiler: 'GCC' - Features: ['Sccache', 'TestOnly', 'InsignificantTests'] + Features: ['Sccache', 'TestOnly'] Platform dependency: 'ubuntu-24.04-x64' - Id: 'opensuse-15.6-developer-build' From ca26b90f260221dae301772eedfaf74b319fc85f Mon Sep 17 00:00:00 2001 From: Tero Heikkinen Date: Fri, 10 Jan 2025 19:27:21 +0200 Subject: [PATCH 083/204] Fix System's openssl version read for openSUSE 15.6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit openSUSE 15.6 doesn't have explicit openssl-3, same was earlier seen with SLES 15.6 as well. Therefore System's OpenSSL is read from openssl. Pick-to: 6.8 Change-Id: I38d81b5484732e225036530e5326433ab90ef92b Reviewed-by: Tony Sarajärvi (cherry picked from commit 882e6e61af2650d817dc203c859196ef80ce79f0) Reviewed-by: Qt Cherry-pick Bot --- .../qtci-linux-openSUSE-15.6-x86_64/04-zypperpackages.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 c2a9641dcf2..e3c5cf9e0ab 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 @@ -93,5 +93,5 @@ sudo zypper -nq install perl-JSON 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)" +OpenSSLVersion="$(openssl version |cut -b 9-14)" echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt From 139837ad9cff13fe6c8d05dfd434d1f3f97316cd Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 1 Apr 2025 06:24:57 +0000 Subject: [PATCH 084/204] Update submodules on '6.9 in qt/qt5' Change-Id: I798a674d699fb3d85cc94388dfc3b9fdf31ad57e 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 892331d9938..45eb05d412b 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 892331d99387034b403b39b65211214f6f3ddd34 +Subproject commit 45eb05d412bb5fe7f447a72552fded8fbe667526 diff --git a/qt5compat b/qt5compat index e165e96ea6d..782b9536c20 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit e165e96ea6d85a2408d49336b3ccacb4dbea6a41 +Subproject commit 782b9536c2003ddf81d58907b90c5af2be06c989 diff --git a/qtactiveqt b/qtactiveqt index c652765703a..467f82aa9cd 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit c652765703a596a44c2fb8242bcde556088c2d68 +Subproject commit 467f82aa9cdb565450003a761f230d43c8a01708 diff --git a/qtbase b/qtbase index 6d2421d812d..64fd9edb2c5 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 6d2421d812dcdd79e0dc06a3db61b95b09b1df8b +Subproject commit 64fd9edb2c5e935ffc58ce12434b582e32d4e93b diff --git a/qtcharts b/qtcharts index 2e26a3314db..c647fee9cab 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 2e26a3314dbc7245bdd6feb47ed40b4c5afa1c38 +Subproject commit c647fee9cab5d273264c595c4e2410137f84e072 diff --git a/qtcoap b/qtcoap index d8aea09b0b7..6f2c85d0a1a 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit d8aea09b0b737d5b4202497b9bff7ca1be8a704d +Subproject commit 6f2c85d0a1a26521cfd9a580b606410e4c2a1d17 diff --git a/qtconnectivity b/qtconnectivity index 696d6a1f301..117e71bc932 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 696d6a1f30159263dac04a28d9e85c4aeac8c377 +Subproject commit 117e71bc93266ee5a12d2b8ac9ef6c7d8b319605 diff --git a/qtdatavis3d b/qtdatavis3d index 438749771d0..3be6a60d1cd 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 438749771d0c2b7903efe2badd5e7f66df798ee5 +Subproject commit 3be6a60d1cd9c54381a0b78bc237f447a9fd5e44 diff --git a/qtdeclarative b/qtdeclarative index c81e1e8bd2e..32d4b690b82 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit c81e1e8bd2e5bde32c3be7eab729c68e3688fb41 +Subproject commit 32d4b690b82730173db22cd0275b76537ff77f1a diff --git a/qtdoc b/qtdoc index 92e75759715..9be125a3744 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 92e7575971507541634e91672720fb47810beae9 +Subproject commit 9be125a37449f65d494762ae151fd27d34418aab diff --git a/qtgraphs b/qtgraphs index 44128b8490a..798ca3057be 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit 44128b8490a1a6134f1833a113962f9334b4c1b9 +Subproject commit 798ca3057be774d18add10a41253a0f7ef75cfdc diff --git a/qtgrpc b/qtgrpc index 2c0cb7188d7..f1227d3d121 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit 2c0cb7188d75dd638bbdb7476282af111851d121 +Subproject commit f1227d3d1213f3cc1c53956abc7400abcce4ab8f diff --git a/qthttpserver b/qthttpserver index 7f20bbdeb7b..1ee5210ce31 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit 7f20bbdeb7b0b4f17573d699c3472f4b1e2734cf +Subproject commit 1ee5210ce31ef12000eb701674f71f14997897e9 diff --git a/qtimageformats b/qtimageformats index 926e5157a63..e5afa80b6de 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 926e5157a631cfdaee662a8bd6720ecd56f953a6 +Subproject commit e5afa80b6dead8fb6734ae041c39a2b13f84365a diff --git a/qtlanguageserver b/qtlanguageserver index eaa4a022285..cced788b73c 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit eaa4a02228517e6856ca5211a8e2c9be4cad059f +Subproject commit cced788b73c2774a33d5522761ba835cd242a26c diff --git a/qtlocation b/qtlocation index 6e5acd3ed57..ab5582880c1 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 6e5acd3ed57727bf9fd1e064142fdaaaadf0b83f +Subproject commit ab5582880c1e657c715d0b32d6d862c254245ae6 diff --git a/qtlottie b/qtlottie index c479c4b1750..efb7e44282a 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit c479c4b175075b740bad808da49fa3fbd90920fb +Subproject commit efb7e44282a41d1e4a4bdf7e914445352f465192 diff --git a/qtmqtt b/qtmqtt index fc92efdaba4..d2546291dcf 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit fc92efdaba4e036747b1123b4faec506a204bb0b +Subproject commit d2546291dcf3f86f60988461670dfc48d729e9bb diff --git a/qtmultimedia b/qtmultimedia index 1df88ffc848..1922b1cb82f 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 1df88ffc84895df64376724ba3b522112cebc21d +Subproject commit 1922b1cb82feea719195332329ab6eb24c144706 diff --git a/qtnetworkauth b/qtnetworkauth index 88defc928df..fedf506ba7f 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 88defc928dfa1f7c72f503c2b71d0900a8988c49 +Subproject commit fedf506ba7f5157ec2b89846d4e810a95a014069 diff --git a/qtopcua b/qtopcua index 7a828f94424..261b327020a 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit 7a828f944248dbb134711a58270f12bb95064251 +Subproject commit 261b327020ae059766a1c7cf36d6871dd36783e9 diff --git a/qtpositioning b/qtpositioning index 187c122da37..1657389945d 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit 187c122da37f814fd359f7d21536482cd7f33475 +Subproject commit 1657389945d5152c31dec2220d16eca63e437ab4 diff --git a/qtquick3d b/qtquick3d index 9a480d14b22..c319a454f30 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 9a480d14b22e42c837c7e0f2fb0391d8a6db208b +Subproject commit c319a454f3005c451946decb9c2a4b82ee289881 diff --git a/qtquick3dphysics b/qtquick3dphysics index 97bfd906866..b0f5da1bab5 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit 97bfd906866196fdf0dd8a53a28f26bc273e8834 +Subproject commit b0f5da1bab58b806523dcb1487faccc49f809ac9 diff --git a/qtquickeffectmaker b/qtquickeffectmaker index 61d8f32b137..575347f3687 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit 61d8f32b13798d3bf5646c008bbedbdc949326dd +Subproject commit 575347f3687c6e950b97bbc1e763385d09734223 diff --git a/qtquicktimeline b/qtquicktimeline index 5efc5144b5e..f395c3f90f7 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 5efc5144b5e51fec9b353f7cb4daead52eab2002 +Subproject commit f395c3f90f7a9182f3a52955da9f1f4c0b66cefb diff --git a/qtremoteobjects b/qtremoteobjects index 65a432de6da..8e9a5a3f15b 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 65a432de6da3d4e57efd67200b2126cceadcf116 +Subproject commit 8e9a5a3f15b83a7a9ed0580a623ec72a5c2683f2 diff --git a/qtrepotools b/qtrepotools index 40d8a7b7a05..557cbde5d11 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 40d8a7b7a0594d88c57c96555f53d4bd8935a0fc +Subproject commit 557cbde5d1130fc9469cee46f21ea84c22237add diff --git a/qtscxml b/qtscxml index 8fabdeb8fb2..b6f235bc0ba 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 8fabdeb8fb27ab1e566957de537ba7da5c261f43 +Subproject commit b6f235bc0ba8caaaa227b81f88bde456663ef54e diff --git a/qtsensors b/qtsensors index 71e64c42893..106be3198c3 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 71e64c428930fae9b54a8ce93a47e60e709d50fb +Subproject commit 106be3198c32447d67c71d9c7320bc78ab60bda2 diff --git a/qtserialbus b/qtserialbus index 0eca470bc0a..509aa2933a4 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 0eca470bc0a089a91adb08cd7182d7ada138ab18 +Subproject commit 509aa2933a4e5aba132fc5c407c5d06faa24a4d8 diff --git a/qtserialport b/qtserialport index bb5f1a1bada..35c007e27a9 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit bb5f1a1bada49da791f61947b08be6abbd55f3c6 +Subproject commit 35c007e27a9c6ed204dfa1ce96ac84804d1e44e4 diff --git a/qtshadertools b/qtshadertools index 388d9e60f58..4d991e3fb5b 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 388d9e60f5825b0ca41b7bbc293026bf6c86fefe +Subproject commit 4d991e3fb5b50bbae39b688a3fa63eff180bfbf0 diff --git a/qtspeech b/qtspeech index 658db684001..49235e440cb 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 658db68400129097e14d49d4edac2eb7ea43cc6e +Subproject commit 49235e440cb05efea5bb95f3b44af2603d0b2b47 diff --git a/qtsvg b/qtsvg index 44ef7f11a9a..00843e611e2 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 44ef7f11a9a5bff533173390af5e1e722ff7c1b2 +Subproject commit 00843e611e2f6e46a6569ecfad5c5b5988bd33dc diff --git a/qttools b/qttools index 16f2be32c24..60ec383a939 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 16f2be32c247783698c1507c872006e8cb3bd9d1 +Subproject commit 60ec383a939d6d49c62bb7afa10ab98075f1f66a diff --git a/qttranslations b/qttranslations index f2cffab26b3..707c4e476e6 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit f2cffab26b3f1c00581542aefe8bda668837bac0 +Subproject commit 707c4e476e6cc02f79fdb16b2a96537d0e4b5a63 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 2594d062bb3..35d4ed3b29c 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 2594d062bb32356fa0f0393a17d8f3ab4e863b3d +Subproject commit 35d4ed3b29c53feb289418c366220c0fb8786283 diff --git a/qtwayland b/qtwayland index fca4012a7ab..37a02cc552e 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit fca4012a7ab33251a75ac58b5e485fbfe67c7cac +Subproject commit 37a02cc552e850a39d1c0e8561109d2de937d743 diff --git a/qtwebchannel b/qtwebchannel index 444687f6e4b..565f19a8911 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 444687f6e4ba1e4b68775888c9a4b77f563dcdc3 +Subproject commit 565f19a8911278b64c1055e163917ba48899f334 diff --git a/qtwebengine b/qtwebengine index 98424c0f68d..9dcdb538839 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 98424c0f68dee270019605e516c12a1be7f6da27 +Subproject commit 9dcdb538839f95d74490ae0d65af679d73216fbb diff --git a/qtwebsockets b/qtwebsockets index f02ba9ffe4a..ebeb0820593 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit f02ba9ffe4a21fb99182c490e0991e19d25f0c56 +Subproject commit ebeb08205934f9c47bcda402ef805fe43a359e58 diff --git a/qtwebview b/qtwebview index 451e837d7b3..a78198bac10 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 451e837d7b3b1e9361af9e54263881a83e8daad1 +Subproject commit a78198bac103191deee5a7b86849b3ade78d5eb2 From 5393e187d349f7972777aa8bacebdd9bfc28e679 Mon Sep 17 00:00:00 2001 From: Rami Potinkara Date: Wed, 26 Feb 2025 12:04:59 +0200 Subject: [PATCH 085/204] Provisioning: update Gradle cache to Android SDK 35 This task updated the build.gradle of Gradle cache to use SDK 35 for compile and target. Task-number: QTBUG-130285 Task-number: QTBUG-129461 Pick-to: 6.8 6.5 Change-Id: I076211baf896e65aae3b616a3d6286258c3d0640 Reviewed-by: Rami Potinkara Reviewed-by: Assam Boudjelthia (cherry picked from commit ed0dc6ad5a2cebbeb5fbe98dbe5603b41e309872) Reviewed-by: Qt Cherry-pick Bot --- .../common/linux/android/gradle_project/app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/common/linux/android/gradle_project/app/build.gradle b/coin/provisioning/common/linux/android/gradle_project/app/build.gradle index 7f6b66acc9a..207c2dc8bf8 100644 --- a/coin/provisioning/common/linux/android/gradle_project/app/build.gradle +++ b/coin/provisioning/common/linux/android/gradle_project/app/build.gradle @@ -4,12 +4,12 @@ plugins { android { namespace 'com.example.gradle_project' - compileSdk 34 + compileSdk 35 defaultConfig { applicationId "com.example.gradle_project" minSdk 28 - targetSdk 34 + targetSdk 35 versionCode 1 versionName "1.0" } From f95d6b1fdb6c3eb70f521efdc8f309f6f2366a6b Mon Sep 17 00:00:00 2001 From: Olli Vuolteenaho Date: Tue, 4 Mar 2025 09:15:46 +0200 Subject: [PATCH 086/204] 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 Pick-to: 6.9.0 Change-Id: I479a9606ab16f8b87009d26ab03636c4c658fcb5 Reviewed-by: Liang Qi Reviewed-by: Jukka Jokiniva (cherry picked from commit ea1abd55ce62e22cd31ccc0803d5ab4664af37a2) Reviewed-by: Assam Boudjelthia --- 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', From 999e66fb4ac72d7cc8d8620e4468af991df29f3b Mon Sep 17 00:00:00 2001 From: Timur Pocheptsov Date: Wed, 5 Mar 2025 13:02:53 +0100 Subject: [PATCH 087/204] install-ffmpeg-ios.sh: remove redundant configure options While writing a documentation for FFmpeg build on iOS it was found that many options are redundant. Remove them to simplify the provisioning script and to reduce the amount of cargo cult code. Pick-to: 6.8 Fixes: QTBUG-133502 Change-Id: I26aab49365eaca83bcdbfeb86de0638ac701bb80 Reviewed-by: Artem Dyomin Reviewed-by: Jukka Jokiniva (cherry picked from commit d7d7c522b65d7dd53b66efdf02eb5dfa1576261b) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/common/unix/install-ffmpeg-ios.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/coin/provisioning/common/unix/install-ffmpeg-ios.sh b/coin/provisioning/common/unix/install-ffmpeg-ios.sh index e30b5af4299..f77537d6520 100755 --- a/coin/provisioning/common/unix/install-ffmpeg-ios.sh +++ b/coin/provisioning/common/unix/install-ffmpeg-ios.sh @@ -56,17 +56,11 @@ build_ffmpeg_ios() { --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-shared \ --disable-static \ --install-name-dir='@rpath' \ - --enable-swscale \ - --enable-pthreads \ --disable-audiotoolbox sudo make install DESTDIR="$build_dir/installed" -j4 From 5df9315b1fc1a061895cb258c1929bac69c37e13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nils=20Petter=20Ska=CC=8Alerud?= Date: Fri, 14 Mar 2025 15:03:04 +0100 Subject: [PATCH 088/204] iOS, FFmpeg: Replace arm64-simulator build with x86_64 Currently this provisioning script builds for arm64 architecture when on iOS simulator. Qt ships x86_64 binaries for iOS simulator, and we should build FFmpeg similarly. This patch introduces support for x86_64-simulator in the iOS FFmpeg provisioning script and uses it in place of arm64-simulator. Pick-to: 6.8 Task-number: QTQAINFRA-7034 Change-Id: Ie93cffba51924cd1d78651d20dec211817cb0cef Reviewed-by: Artem Dyomin (cherry picked from commit aa613ed85d48122bcb834749537284f8f8b91715) Reviewed-by: Qt Cherry-pick Bot --- .../common/unix/install-ffmpeg-ios.sh | 32 ++++++++++++------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/coin/provisioning/common/unix/install-ffmpeg-ios.sh b/coin/provisioning/common/unix/install-ffmpeg-ios.sh index f77537d6520..96ef4bf65ff 100755 --- a/coin/provisioning/common/unix/install-ffmpeg-ios.sh +++ b/coin/provisioning/common/unix/install-ffmpeg-ios.sh @@ -34,11 +34,17 @@ build_ffmpeg_ios() { target_sdk="iphonesimulator" target_platform="arm64" minos="-mios-simulator-version-min=16.0" - else + elif [ "$target_platform" == "x86_64-simulator" ]; then + target_sdk="iphonesimulator" + target_platform="x86_64" + minos="-mios-simulator-version-min=16.0" + elif [ "$target_platform" == "arm64-iphoneos" ]; then target_sdk="iphoneos" target_platform="arm64" minos="-miphoneos-version-min=16.0" - # TODO: consider non-arm simulator? + else + echo "Error when building FFmpeg for iOS. Unknown parameter given for target_platform: '${target_platform}'" + exit 1 fi # Note: unlike similar install-ffmpeg scripts, not $target_platform, @@ -104,6 +110,8 @@ build_info_plist() { local minimum_os_version="16.0" local supported_platforms="iPhoneOS" + # TODO: This should be filled out with the actual version of FFmpeg that we are + # deploying. info_plist=" @@ -170,29 +178,31 @@ create_xcframework() { # Create 'traditional' framework from the corresponding dylib, # also creating local framework_name="$1" + local target_platform_a="$2" + local target_platform_b="$3" - 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" + local fw_a="$ffmpeg_source_dir/build_ios/${target_platform_a}/installed/usr/local/ios/ffmpeg/framework/${framework_name}.framework" + local fw_b="$ffmpeg_source_dir/build_ios/${target_platform_b}/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" + sudo xcodebuild -create-xcframework -framework $fw_a -framework $fw_b -output "${prefix}/framework/${framework_name}.xcframework" } -build_ffmpeg_ios "arm64-simulator" -build_ffmpeg_ios "arm64" +build_ffmpeg_ios "x86_64-simulator" +build_ffmpeg_ios "arm64-iphoneos" ffmpeg_libs="libavcodec libavformat libavutil libswresample libswscale" for name in $ffmpeg_libs; do - create_framework $name "arm64" - create_framework $name "arm64-simulator" + create_framework $name "arm64-iphoneos" + create_framework $name "x86_64-simulator" done # Create corresponding (xc)frameworks containing both arm64 and arm64-simulator frameworks: for name in $ffmpeg_libs; do - create_xcframework $name + create_xcframework $name "arm64-iphoneos" "x86_64-simulator" done -install_ffmpeg "$ffmpeg_source_dir/build_ios/arm64/installed" +install_ffmpeg "$ffmpeg_source_dir/build_ios/arm64-iphoneos/installed" SetEnvVar "FFMPEG_DIR_IOS" $prefix From 68b4ef5b4efe8acf0637c0ca49bc708b5e39abfa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nils=20Petter=20Ska=CC=8Alerud?= Date: Tue, 25 Mar 2025 13:03:01 +0100 Subject: [PATCH 089/204] iOS, FFmpeg: Improve variable naming in FFmpeg provisioning Currently this script overwrites a local variables and reuses it for a (slightly) different purpose. This makes the code a bit hard to follow. This patch introduces a separate local variable to improve readability. No functional changes. Pick-to: 6.8 Change-Id: Ifa1904482f498d9b380d1ed19ab6b0104afda19b Reviewed-by: Artem Dyomin (cherry picked from commit c4315452cb376e3c6b4878bc98206529271da89b) Reviewed-by: Qt Cherry-pick Bot --- .../common/unix/install-ffmpeg-ios.sh | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/coin/provisioning/common/unix/install-ffmpeg-ios.sh b/coin/provisioning/common/unix/install-ffmpeg-ios.sh index 96ef4bf65ff..07be8e57534 100755 --- a/coin/provisioning/common/unix/install-ffmpeg-ios.sh +++ b/coin/provisioning/common/unix/install-ffmpeg-ios.sh @@ -30,26 +30,25 @@ ffmpeg_config_options=$(cat "${BASH_SOURCE%/*}/../shared/ffmpeg_config_options.t build_ffmpeg_ios() { local target_platform=$1 + local target_cpu_arch="" if [ "$target_platform" == "arm64-simulator" ]; then target_sdk="iphonesimulator" - target_platform="arm64" + target_cpu_arch="arm64" minos="-mios-simulator-version-min=16.0" elif [ "$target_platform" == "x86_64-simulator" ]; then target_sdk="iphonesimulator" - target_platform="x86_64" + target_cpu_arch="x86_64" minos="-mios-simulator-version-min=16.0" elif [ "$target_platform" == "arm64-iphoneos" ]; then target_sdk="iphoneos" - target_platform="arm64" + target_cpu_arch="arm64" minos="-miphoneos-version-min=16.0" else echo "Error when building FFmpeg for iOS. Unknown parameter given for target_platform: '${target_platform}'" exit 1 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" + local build_dir="$ffmpeg_source_dir/build_ios/$target_platform" sudo mkdir -p "$build_dir" pushd "$build_dir" @@ -59,9 +58,9 @@ build_ffmpeg_ios() { --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" \ + --arch=$target_cpu_arch \ + --cc="xcrun --sdk ${target_sdk} clang -arch $target_cpu_arch" \ + --cxx="xcrun --sdk ${target_sdk} clang++ -arch $target_cpu_arch" \ --target-os=darwin \ --extra-ldflags="$minos" \ --enable-shared \ From e0e3e4738cca4a4e6a4a1d38aecc1ea0e4dbafce Mon Sep 17 00:00:00 2001 From: Paul Wicking Date: Thu, 13 Mar 2025 05:02:46 +0100 Subject: [PATCH 090/204] Update Clang libraries for QDoc to 20.1.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update the version variable used to identify the correct package for download and cache sites. * Update SHA1 for provisioning packages on all platforms. Fixes: QTBUG-134304 Pick-to: 6.8 Change-Id: I2577600296e75080d503dc1a537ddbc00d0f207f Reviewed-by: Topi Reiniö (cherry picked from commit 8c9fe2074b6b902433b53e16b11a042d0dbb3810) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/common/unix/libclang.sh | 14 +++++++------- coin/provisioning/common/windows/libclang.ps1 | 10 +++++----- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/coin/provisioning/common/unix/libclang.sh b/coin/provisioning/common/unix/libclang.sh index 1e5ebf4f28e..b7761b465d9 100755 --- a/coin/provisioning/common/unix/libclang.sh +++ b/coin/provisioning/common/unix/libclang.sh @@ -20,38 +20,38 @@ PROVISIONING_DIR="$(dirname "$0")/../../" # shellcheck source=./common.sourced.sh source "$PROVISIONING_DIR"/common/unix/common.sourced.sh -libclang_version="19.1.7" +libclang_version="20.1.0" if uname -a |grep -q Darwin; then version=$libclang_version url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-llvmorg-${version}-macos-universal.7z" url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-llvmorg-${version}-macos-universal.7z" - sha1="0b30bbe47cefe413a6d2fbc3da6b0b8ac5d84613" + sha1="a0061a2b7a7411323ae3d81fdb2071ad522ddd5f" elif test -f /etc/redhat-release && grep "Red Hat" /etc/redhat-release | grep "9" ; then version=$libclang_version url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-llvmorg-${version}-linux-Rhel9.4-gcc11.4-x86_64.7z" url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-llvmorg-${version}-linux-Rhel9.4-gcc11.4-x86_64.7z" - sha1="1657d6a9419e9d3ecf4416cd757f488c079ec779" + sha1="041036bb2b360c18448c993671507bbb16b9b76d" elif test "$PROVISIONING_OS_ID" == "debian" && test "$PROVISIONING_ARCH" == "arm64" ; then version=$libclang_version url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-llvmorg-${version}-linux-Debian11.6-gcc10.0-arm64.7z" url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-llvmorg-${version}-linux-Debian11.6-gcc10.0-arm64.7z" - sha1="2536f55987d6240c40fd1127895b0885d41148ed" + sha1="ad3244f76cb5dab8e3d5dfe839e21a9bac3039e9" elif test "$PROVISIONING_OS_ID" == "ubuntu" && test "$PROVISIONING_ARCH" == "arm64" ; then version=$libclang_version url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-llvmorg-${version}-linux-Ubuntu24.04-gcc11.2-arm64.7z" url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-llvmorg-${version}-linux-Ubuntu24.04-gcc11.2-arm64.7z" - sha1="0e1c0c492f9fcd669a77fe4480cfa271f408af9e" + sha1="bde39a28872cc618983d231ffd1df2c104ff1992" elif test "$PROVISIONING_OS_ID" == "ubuntu" && test "$PROVISIONING_ARCH" == "x86_64" ; then version=$libclang_version url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-llvmorg-${version}-linux-Ubuntu22.04-gcc11.2-x86_64.7z" url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-llvmorg-${version}-linux-Ubuntu22.04-gcc11.2-x86_64.7z" - sha1="eed115ea52f3b4283d02d96cd8f4fce95c5aaafe" + sha1="3f5e5214cf31adfb01be21fcf4f27b9adf8f13b0" else version=$libclang_version url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-llvmorg-${version}-linux-Rhel8.10-gcc10.0-x86_64.7z" url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-llvmorg-${version}-linux-Rhel8.10-gcc10.0-x86_64.7z" - sha1="479fa87ad804ec91a462ccb20fc9acad6982bddb" + sha1="1fdc23ae0fce48ed82508b1bad0c68d2e5a30c8b" fi zip="/tmp/libclang.7z" diff --git a/coin/provisioning/common/windows/libclang.ps1 b/coin/provisioning/common/windows/libclang.ps1 index 4fb44af6eb4..18f6bdef546 100644 --- a/coin/provisioning/common/windows/libclang.ps1 +++ b/coin/provisioning/common/windows/libclang.ps1 @@ -5,7 +5,7 @@ param( ) . "$PSScriptRoot\helpers.ps1" -$libclang_version="19.1.7" +$libclang_version="20.1.0" Write-Output "libClang = $libclang_version" >> ~/versions.txt # PySide versions following 5.6 use a C++ parser based on Clang (http://clang.org/). @@ -38,10 +38,10 @@ $toolchainSuffix = "" if ( $toolchain -eq "vs2022" ) { if ( $archVer -eq "64" ) { - $sha1 = "f56057b8679e21a44b341bb1041cb03fbe6f5c0d" + $sha1 = "60c840e627b5bb03663f00db17bf249b37936428" } elseif ( $archVer -eq "arm64" ) { - $sha1 = "89fddd8c4bde3e8b70382e21059743637c27d38d" + $sha1 = "68ead0e3135dfccae21b226f187fc305803ede3d" } else { $sha1 = "" @@ -51,7 +51,7 @@ if ( $toolchain -eq "vs2022" ) { if ( $toolchain -eq "mingw" ) { if ( $archVer -eq "64" ) { - $sha1 = "fcc1f06bd395bc133b7828d0be48e8492b9ba807" + $sha1 = "2180859572dd6ad2029ecffffcc785cba334e037" } else { $sha1 = "" @@ -62,7 +62,7 @@ if ( $toolchain -eq "mingw" ) { if ( $toolchain -eq "llvm-mingw" ) { if ( $archVer -eq "64" ) { - $sha1 = "ee01352eb68bee252cefb1b8ff4ad086baa8ab5f" + $sha1 = "3e917d002f363c225e5ee2b7d8999a3cabd8b467" } else { $sha1 = "" From 6d5955d1a57eefb16cda51fffdb2f483f02c4792 Mon Sep 17 00:00:00 2001 From: Elias Toivola Date: Thu, 13 Mar 2025 12:59:12 +0200 Subject: [PATCH 091/204] RTA: remove Squish from Ubuntu 22.04 aarch64 provisioning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Squish for Qt 6.8 has glibc 2.38 and glibcxx 3.4.32 dependencies, while Ubuntu 22.04 LTS supports glibc 2.35 and glibcxx 3.4.30. Pick-to: 6.8 Change-Id: Ia401daf444fbc3e460477fd1f5397781b902cf9d Reviewed-by: Johanna Äijälä Reviewed-by: Matti Paaso (cherry picked from commit 6170adb71fee63beb6b868b492c6db404be05761) Reviewed-by: Qt Cherry-pick Bot --- .../qtci-linux-Ubuntu-22.04-aarch64/90-squish.sh | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 coin/provisioning/qtci-linux-Ubuntu-22.04-aarch64/90-squish.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-22.04-aarch64/90-squish.sh b/coin/provisioning/qtci-linux-Ubuntu-22.04-aarch64/90-squish.sh deleted file mode 100644 index f803ccc1fa1..00000000000 --- a/coin/provisioning/qtci-linux-Ubuntu-22.04-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 7437ef45f9c76d102a182d8cbc6697de0b8ae525 Mon Sep 17 00:00:00 2001 From: Elias Toivola Date: Thu, 13 Mar 2025 13:49:17 +0200 Subject: [PATCH 092/204] RTA: disable auto-upgrades in Ubuntu 22.04 aarch64 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Disable auto-upgrades as it may lock and block scripts from running, resulting an error in /var/lib/dpkg/lock-frontend. Also remove 01-disable_auto_suspend.sh as auto suspend is already disabled in tier-1. Pick-to: 6.8 Change-Id: Ia4420de72b26c7b4fd851f079fd4686624e5bf02 Reviewed-by: Matti Paaso (cherry picked from commit 078bd29e2498c779a0c344561fa6f1b3800aa025) Reviewed-by: Johanna Äijälä Reviewed-by: Qt Cherry-pick Bot --- .../01-disable-updates.sh | 9 +++++++++ .../01-disable_auto_suspend.sh | 6 ------ 2 files changed, 9 insertions(+), 6 deletions(-) create mode 100644 coin/provisioning/qtci-linux-Ubuntu-22.04-aarch64/01-disable-updates.sh delete mode 100755 coin/provisioning/qtci-linux-Ubuntu-22.04-aarch64/01-disable_auto_suspend.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-22.04-aarch64/01-disable-updates.sh b/coin/provisioning/qtci-linux-Ubuntu-22.04-aarch64/01-disable-updates.sh new file mode 100644 index 00000000000..2a64a3ee56f --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-22.04-aarch64/01-disable-updates.sh @@ -0,0 +1,9 @@ +#!/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 + +set -ex + +# Disable updates +echo "Disabling auto-upgrades" +sudo sed -i 's/"1"/"0"/g' /etc/apt/apt.conf.d/20auto-upgrades diff --git a/coin/provisioning/qtci-linux-Ubuntu-22.04-aarch64/01-disable_auto_suspend.sh b/coin/provisioning/qtci-linux-Ubuntu-22.04-aarch64/01-disable_auto_suspend.sh deleted file mode 100755 index 8ad69bfaf3b..00000000000 --- a/coin/provisioning/qtci-linux-Ubuntu-22.04-aarch64/01-disable_auto_suspend.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -#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 - -sudo systemctl mask sleep.target suspend.target hibernate.target hybrid-sleep.target - From 910069f72d5421930f6fce2b257954cb41961210 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Mon, 14 Apr 2025 19:26:13 +0200 Subject: [PATCH 093/204] Coin: make tests on VxWorks platforms insignificant MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit They frequently fail tests. Since 6.9 is not an LTS branch, we can ignore test failures for this platform. Change-Id: I2e69bd9b123937366e73c1f30e063494f43a6ca7 Reviewed-by: Reviewed-by: Jani Heikkinen Reviewed-by: Axel Spoerl Reviewed-by: Jarno Lämsä --- .../cmake_platforms_qemu_vxworks_tests_static.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 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 5bfe98cd761..86a49720da2 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: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly'] + Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests'] 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: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly'] + Features: ['VMSize8', 'UseConfigure', 'BuildTestsInTest', 'TestOnly', 'InsignificantTests'] 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', From 6d7ce3ee6e614786a549d457af238e24abae6d70 Mon Sep 17 00:00:00 2001 From: Artem Dyomin Date: Mon, 28 Oct 2024 11:15:36 +0100 Subject: [PATCH 094/204] Add ffmpeg-installation-utils.sh file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There're code duplications in install-ffmpeg scripts. Let's have a file with FFmpeg installation utils and reuse the functionality on unix platforms. The utility functions make the code more robust and get around code duplications. This cherry-pick had a minor merge conflict because a patch for switching arm64-simulator to x86_64-simulator was merged before this patch. This cherry-oick was updated to work with this change correctly. Pick-to: 6.8 6.5 Change-Id: I28639d18c7110109e52ff09ce602da52f8857281 Reviewed-by: Jøger Hansegård (cherry picked from commit 51dad84914bf3e3650556c3dc0503ad9af51c731) Reviewed-by: Volker Hilsheimer --- .../common/unix/ffmpeg-installation-utils.sh | 67 +++++++++++++++++++ .../common/unix/install-ffmpeg-android.sh | 42 +++--------- .../common/unix/install-ffmpeg-ios.sh | 28 ++------ .../common/unix/install-ffmpeg.sh | 57 +++++----------- 4 files changed, 101 insertions(+), 93 deletions(-) create mode 100755 coin/provisioning/common/unix/ffmpeg-installation-utils.sh diff --git a/coin/provisioning/common/unix/ffmpeg-installation-utils.sh b/coin/provisioning/common/unix/ffmpeg-installation-utils.sh new file mode 100755 index 00000000000..26d9484d840 --- /dev/null +++ b/coin/provisioning/common/unix/ffmpeg-installation-utils.sh @@ -0,0 +1,67 @@ +#!/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 + +download_ffmpeg() { + local version="${1:-n7.1}" + local sha1="${2:-f008a93710a7577e3f85a90f4b632cc615164712}" + + local ffmpeg_name="FFmpeg-$version" + local target_dir="$HOME" + local ffmpeg_source_dir="$target_dir/$ffmpeg_name" + + if [ ! -d "$ffmpeg_source_dir" ]; then + local url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz" + local url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz" + local app_prefix="" + + source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" + InstallFromCompressedFileFromURL "$url_cached" "$url_public" "$sha1" "$target_dir" "$app_prefix" > /dev/null + fi + + echo "$ffmpeg_source_dir" +} + +get_ffmpeg_config_options() { + local build_type="$1" + local result + + result=$(cat "${BASH_SOURCE%/*}/../shared/ffmpeg_config_options.txt") + + if [ "$build_type" != "static" ]; then + result+=" --enable-shared --disable-static" + fi + + echo "$result" +} + + +get_ffmpeg_build_type() { + local result="${1:-shared}" + + if [ "$result" != "static" ] && [ "$result" != "shared" ]; then + >&2 echo "Invalid build_type: $result. The shared build type will be used." + result="shared" + fi + + echo "$result" +} + +set_ffmpeg_dir_env_var() { + local envvar="$1" + local dir="$2" + + if [ ! -d "$dir" ]; then + >&2 echo "the FFmpeg dir $dir doesn't exist" + exit 1 + fi + + # minimal validity check, more checks can be added + if [ ! -d "$dir/include" ] || [ ! -d "$dir/lib" ]; then + >&2 echo "The FFmpeg dir $dir is not valid" + exit 1 + fi + + source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" + SetEnvVar "$envvar" "$dir" +} diff --git a/coin/provisioning/common/unix/install-ffmpeg-android.sh b/coin/provisioning/common/unix/install-ffmpeg-android.sh index 66feaf2ee89..d96b83afba4 100755 --- a/coin/provisioning/common/unix/install-ffmpeg-android.sh +++ b/coin/provisioning/common/unix/install-ffmpeg-android.sh @@ -4,33 +4,18 @@ # This script will build and install FFmpeg shared libs set -ex -os="$1" - -# shellcheck source=../unix/InstallFromCompressedFileFromURL.sh -source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" -# shellcheck source=../unix/SetEnvVar.sh -source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -version="n7.1" -url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz" -sha1="f008a93710a7577e3f85a90f4b632cc615164712" -url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz" -ffmpeg_name="FFmpeg-$version" +source "${BASH_SOURCE%/*}/../unix/ffmpeg-installation-utils.sh" +os="$1" +build_type=$(get_ffmpeg_build_type) target_dir="$HOME" -app_prefix="" -ffmpeg_source_dir="$target_dir/$ffmpeg_name" - -if [ ! -d "$ffmpeg_source_dir" ]; -then - InstallFromCompressedFileFromURL "$url_cached" "$url_public" "$sha1" "$target_dir" "$app_prefix" -fi +ffmpeg_source_dir=$(download_ffmpeg) build_ffmpeg_android() { target_arch=$1 target_dir=$2 - shared="${3:-no}" sudo mkdir -p "$target_dir" @@ -77,11 +62,8 @@ build_ffmpeg_android() { ar=${toolchain_bin}/llvm-ar ranlib=${toolchain_bin}/llvm-ranlib - ffmpeg_config_options=$(cat "${BASH_SOURCE%/*}/../shared/ffmpeg_config_options.txt") + ffmpeg_config_options=$(get_ffmpeg_config_options $build_type) ffmpeg_config_options+=" --enable-cross-compile --target-os=android --enable-jni --enable-mediacodec --enable-openssl --enable-pthreads --enable-neon --disable-asm --disable-indev=android_camera" - if [[ "$shared" == "yes" ]]; then - ffmpeg_config_options+=" --enable-shared --disable-static" - fi ffmpeg_config_options+=" --arch=$target_arch --cpu=${target_cpu} --sysroot=${sysroot} --sysinclude=${sysroot}/usr/include/" ffmpeg_config_options+=" --cc=${cc} --cxx=${cxx} --ar=${ar} --ranlib=${ranlib}" ffmpeg_config_options+=" --extra-cflags=-I${openssl_include} --extra-ldflags=-L${openssl_libs}" @@ -100,7 +82,7 @@ build_ffmpeg_android() { rm -f "${openssl_libs}/libcrypto.so" rm -f "${openssl_libs}/libssl.so" - if [[ "$shared" == "yes" ]]; then + if [[ "$build_type" == "shared" ]]; then fix_dependencies="${BASH_SOURCE%/*}/../shared/fix_ffmpeg_dependencies.sh" sudo "${fix_dependencies}" "${target_dir}" "${libs_prefix}" "no" fi @@ -109,18 +91,16 @@ build_ffmpeg_android() { if [ "$os" == "android-x86" ]; then target_arch=x86 target_dir="/usr/local/android/ffmpeg-x86" - - SetEnvVar "FFMPEG_DIR_ANDROID_X86" "$target_dir" + envvar="FFMPEG_DIR_ANDROID_X86" elif [ "$os" == "android-x86_64" ]; then target_arch=x86_64 target_dir="/usr/local/android/ffmpeg-x86_64" - - SetEnvVar "FFMPEG_DIR_ANDROID_X86_64" "$target_dir" + envvar="FFMPEG_DIR_ANDROID_X86_64" elif [ "$os" == "android-arm64" ]; then target_arch=arm64 target_dir="/usr/local/android/ffmpeg-arm64" - - SetEnvVar "FFMPEG_DIR_ANDROID_ARM64" "$target_dir" + envvar="FFMPEG_DIR_ANDROID_ARM64" fi -build_ffmpeg_android "$target_arch" "$target_dir" "yes" +build_ffmpeg_android "$target_arch" "$target_dir" +set_ffmpeg_dir_env_var "$envvar" "$target_dir" diff --git a/coin/provisioning/common/unix/install-ffmpeg-ios.sh b/coin/provisioning/common/unix/install-ffmpeg-ios.sh index 07be8e57534..c35cf1d06d5 100755 --- a/coin/provisioning/common/unix/install-ffmpeg-ios.sh +++ b/coin/provisioning/common/unix/install-ffmpeg-ios.sh @@ -5,29 +5,13 @@ # This script will build and install FFmpeg static libs set -ex -# shellcheck source=../unix/InstallFromCompressedFileFromURL.sh -source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" -# shellcheck source=../unix/SetEnvVar.sh -source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" - -version="n7.1" -url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz" -sha1="f008a93710a7577e3f85a90f4b632cc615164712" -url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz" -ffmpeg_name="FFmpeg-$version" - -target_dir="$HOME" -ffmpeg_source_dir="$target_dir/$ffmpeg_name" +source "${BASH_SOURCE%/*}/../unix/ffmpeg-installation-utils.sh" + +ffmpeg_source_dir=$(download_ffmpeg) +ffmpeg_config_options=$(get_ffmpeg_config_options "shared") prefix="/usr/local/ios/ffmpeg" dylib_regex="^@rpath/.*\.dylib$" -if [ ! -d "$ffmpeg_source_dir" ]; -then - InstallFromCompressedFileFromURL "$url_cached" "$url_public" "$sha1" "$target_dir" -fi - -ffmpeg_config_options=$(cat "${BASH_SOURCE%/*}/../shared/ffmpeg_config_options.txt") - build_ffmpeg_ios() { local target_platform=$1 local target_cpu_arch="" @@ -202,6 +186,6 @@ for name in $ffmpeg_libs; do create_xcframework $name "arm64-iphoneos" "x86_64-simulator" done -install_ffmpeg "$ffmpeg_source_dir/build_ios/arm64-iphoneos/installed" +install_ffmpeg "$ffmpeg_source_dir/build_ios/x86_64-simulator/installed" "$ffmpeg_source_dir/build_ios/arm64-iphoneos/installed" -SetEnvVar "FFMPEG_DIR_IOS" $prefix +set_ffmpeg_dir_env_var "FFMPEG_DIR_IOS" $prefix diff --git a/coin/provisioning/common/unix/install-ffmpeg.sh b/coin/provisioning/common/unix/install-ffmpeg.sh index 43e5820af03..e5512d553f5 100755 --- a/coin/provisioning/common/unix/install-ffmpeg.sh +++ b/coin/provisioning/common/unix/install-ffmpeg.sh @@ -4,48 +4,27 @@ # This script will build and install FFmpeg static libs set -ex -os="$1" -build_type="$2" - -if [ ! -n "$build_type" ] && [ "$build_type" != "static" ] && [ "$build_type" != "shared" ]; then - >&2 echo "Invalid build_type: $build_type. The shared build type will be used." - build_type="shared" -fi - -# shellcheck source=../unix/InstallFromCompressedFileFromURL.sh -source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" -# shellcheck source=../unix/SetEnvVar.sh -source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" - -version="n7.1" -url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz" -sha1="f008a93710a7577e3f85a90f4b632cc615164712" -url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz" -ffmpeg_name="FFmpeg-$version" -target_dir="$HOME" -app_prefix="" -ffmpeg_source_dir="$target_dir/$ffmpeg_name" +source "${BASH_SOURCE%/*}/../unix/ffmpeg-installation-utils.sh" -if [ ! -d "$ffmpeg_source_dir" ] -then - InstallFromCompressedFileFromURL "$url_cached" "$url_public" "$sha1" "$target_dir" "$app_prefix" -fi +os="$1" +build_type=$(get_ffmpeg_build_type "$2") -ffmpeg_config_options=$(cat "${BASH_SOURCE%/*}/../shared/ffmpeg_config_options.txt") -if [ "$build_type" != "static" ]; then - ffmpeg_config_options+=" --enable-shared --disable-static" -fi +ffmpeg_source_dir=$(download_ffmpeg) +ffmpeg_name=$(basename $ffmpeg_source_dir) +ffmpeg_config_options=$(get_ffmpeg_config_options $build_type) install_ff_nvcodec_headers() { - nv_codec_version="11.1" # use 11.1 to ensure compatibility with 470 nvidia drivers; might be upated to 12.0 - nv_codec_url_public="https://github.com/FFmpeg/nv-codec-headers/archive/refs/heads/sdk/$nv_codec_version.zip" - nv_codec_url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/nv-codec-headers/nv-codec-headers-sdk-$nv_codec_version.zip" - nv_codec_sha1="ceb4966ab01b2e41f02074675a8ac5b331bf603e" + local nv_codec_version="11.1" # use 11.1 to ensure compatibility with 470 nvidia drivers; might be upated to 12.0 + local nv_codec_url_public="https://github.com/FFmpeg/nv-codec-headers/archive/refs/heads/sdk/$nv_codec_version.zip" + local nv_codec_url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/nv-codec-headers/nv-codec-headers-sdk-$nv_codec_version.zip" + local nv_codec_sha1="ceb4966ab01b2e41f02074675a8ac5b331bf603e" #nv_codec_sha1="4f30539f8dd31945da4c3da32e66022f9ca59c08" // 12.0 - nv_codec_dir="$target_dir/nv-codec-headers-sdk-$nv_codec_version" - if [ ! -d "$nv_codec_dir" ] - then + local target_dir="$HOME" + local nv_codec_dir="$target_dir/nv-codec-headers-sdk-$nv_codec_version" + + if [ ! -d "$nv_codec_dir" ]; then + source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" InstallFromCompressedFileFromURL "$nv_codec_url_cached" "$nv_codec_url_public" "$nv_codec_sha1" "$target_dir" "" fi @@ -119,13 +98,12 @@ if [ "$os" == "linux" ]; then output_dir="$ffmpeg_source_dir/build/installed/usr/local/$ffmpeg_name" - if [ "$build_type" != "static" ]; then + if [ "$build_type" == "shared" ]; then fix_dependencies="${BASH_SOURCE%/*}/../shared/fix_ffmpeg_dependencies.sh" "$fix_dependencies" "$output_dir" fi sudo mv "$output_dir" "/usr/local" - SetEnvVar "FFMPEG_DIR" "/usr/local/$ffmpeg_name" elif [ "$os" == "macos" ] || [ "$os" == "macos-universal" ]; then brew install yasm @@ -149,8 +127,7 @@ elif [ "$os" == "macos" ] || [ "$os" == "macos-universal" ]; then sudo "${BASH_SOURCE%/*}/../macos/makeuniversal.sh" "$arm64_install_dir" "$x86_64_install_dir" fi - - SetEnvVar "FFMPEG_DIR" "/usr/local/$ffmpeg_name" fi +set_ffmpeg_dir_env_var "FFMPEG_DIR" "/usr/local/$ffmpeg_name" From a1427fbd4c9c93ffd896e528215d57208e770040 Mon Sep 17 00:00:00 2001 From: Artem Dyomin Date: Mon, 28 Oct 2024 14:52:03 +0100 Subject: [PATCH 095/204] Decouple install-ffmpeg on linux and macos specific files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The FFmpeg building flow has become too different on linux and macos. Decoupling the logic makes it more simple to follow. The CR also fixes nits and shellcheck warnings in install-ffmpeg. Pick-to: 6.8 Change-Id: I28639d28c7210809e52ff18ce612da52f8754285 Reviewed-by: Jøger Hansegård (cherry picked from commit 39ad0317d11842f8ce9690e40595d1e861edb24d) Reviewed-by: Qt Cherry-pick Bot --- .../common/linux/install-ffmpeg-linux.sh | 99 +++++++++++++ .../common/macos/install-ffmpeg-macos.sh | 66 +++++++++ .../common/unix/install-ffmpeg.sh | 133 ------------------ .../90-install-ffmpeg.sh | 3 +- .../90-install-ffmpeg.sh | 2 +- .../90-install-ffmpeg.sh | 2 +- .../90-install-ffmpeg.sh | 2 +- .../90-install-ffmpeg.sh | 3 +- .../90-install-ffmpeg.sh | 2 +- .../90-install-ffmpeg.sh | 2 +- .../90-install-ffmpeg.sh | 2 +- .../90-install-ffmpeg.sh | 2 +- .../90-install-ffmpeg.sh | 2 +- .../90-install-ffmpeg.sh | 2 +- .../90-install-ffmpeg.sh | 2 +- .../90-install-ffmpeg.sh | 2 +- .../90-install-ffmpeg.sh | 2 +- .../90-install-ffmpeg.sh | 2 +- .../90-install-ffmpeg.sh | 2 +- .../90-install-ffmpeg.sh | 2 +- .../90-install-ffmpeg.sh | 2 +- .../90-install-ffmpeg.sh | 2 +- .../90-install-ffmpeg.sh | 2 +- .../90-install-ffmpeg.sh | 2 +- .../qtci-macos-11-arm/90-install-ffmpeg.sh | 2 +- .../qtci-macos-11-x86_64/90-install-ffmpeg.sh | 2 +- .../qtci-macos-12-arm/90-install-ffmpeg.sh | 2 +- .../qtci-macos-12-x86_64/90-install-ffmpeg.sh | 2 +- .../qtci-macos-13-arm/90-install-ffmpeg.sh | 2 +- .../qtci-macos-13-x86_64/90-install-ffmpeg.sh | 2 +- .../qtci-macos-14-arm/90-install-ffmpeg.sh | 2 +- .../qtci-macos-14-x86_64/90-install-ffmpeg.sh | 2 +- .../qtci-macos-15-arm/90-install-ffmpeg.sh | 2 +- .../qtci-macos-15-x86_64/90-install-ffmpeg.sh | 2 +- 34 files changed, 196 insertions(+), 166 deletions(-) create mode 100755 coin/provisioning/common/linux/install-ffmpeg-linux.sh create mode 100755 coin/provisioning/common/macos/install-ffmpeg-macos.sh delete mode 100755 coin/provisioning/common/unix/install-ffmpeg.sh diff --git a/coin/provisioning/common/linux/install-ffmpeg-linux.sh b/coin/provisioning/common/linux/install-ffmpeg-linux.sh new file mode 100755 index 00000000000..583c0b3a031 --- /dev/null +++ b/coin/provisioning/common/linux/install-ffmpeg-linux.sh @@ -0,0 +1,99 @@ +#!/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 builds and installs FFmpeg static or shared (default) libs +set -ex + +source "${BASH_SOURCE%/*}/../unix/ffmpeg-installation-utils.sh" + +build_type=$(get_ffmpeg_build_type "$1") + +ffmpeg_source_dir=$(download_ffmpeg) +ffmpeg_name=$(basename "$ffmpeg_source_dir") +ffmpeg_config_options=$(get_ffmpeg_config_options "$build_type") +prefix="/usr/local/$ffmpeg_name" +pkgconfig_path="$PKG_CONFIG_PATH" + +install_ff_nvcodec_headers() { + local nv_codec_version="11.1" # use 11.1 to ensure compatibility with 470 nvidia drivers; might be upated to 12.0 + local nv_codec_url_public="https://github.com/FFmpeg/nv-codec-headers/archive/refs/heads/sdk/$nv_codec_version.zip" + local nv_codec_url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/nv-codec-headers/nv-codec-headers-sdk-$nv_codec_version.zip" + local nv_codec_sha1="ceb4966ab01b2e41f02074675a8ac5b331bf603e" + #nv_codec_sha1="4f30539f8dd31945da4c3da32e66022f9ca59c08" // 12.0 + local target_dir="$HOME" + local nv_codec_dir="$target_dir/nv-codec-headers-sdk-$nv_codec_version" + + if [ ! -d "$nv_codec_dir" ]; then + source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" + InstallFromCompressedFileFromURL "$nv_codec_url_cached" "$nv_codec_url_public" "$nv_codec_sha1" "$target_dir" "" + fi + + sudo make -C "$nv_codec_dir" install -j + + # Might be not detected by default on RHEL + pkgconfig_path="$pkgconfig_path:/usr/local/lib/pkgconfig" +} + +fix_openssl3_pc_files() { + # On RHEL 8, openssl3 pc files are libopenssl3.pc, libssl3.pc, libcrypto3.pc, + # and FFmpeg cannot find them. Instead, it finds FFmpeg 1.x.x if it's installed. + # The function fixes the files with copying them to a custom directory + + # assign to 'local' to ignore failure exit codes + local -r openssl3_pcfiledir=$(pkg-config --variable=pcfiledir openssl3) + if [ -z "$openssl3_pcfiledir" ]; then + return + fi + + local pcfiles=("libssl" "libcrypto" "openssl") + + for pcfile in "${pcfiles[@]}"; do + if [ ! -f "$openssl3_pcfiledir/${pcfile}3.pc" ]; then + echo "pkgconfig has found openssl3 but the file $openssl3_pcfiledir/${pcfile}3.pc does't exist" + return + fi + done + + local new_pkgconfig_dir="$ffmpeg_source_dir/openssl3_pkgconfig" + mkdir -p "$new_pkgconfig_dir" + + for pcfile in "${pcfiles[@]}"; do + sed -E '/^Requires(\.private)?:/s/ (libssl|libcrypto)3/ \1/g;' "$openssl3_pcfiledir/${pcfile}3.pc" > "$new_pkgconfig_dir/${pcfile}.pc" + done + + pkgconfig_path="$new_pkgconfig_dir:$pkgconfig_path" +} + +build_ffmpeg() { + local build_dir="$ffmpeg_source_dir/build" + mkdir -p "$build_dir" + pushd "$build_dir" + + # shellcheck disable=SC2086 + PKG_CONFIG_PATH="$pkgconfig_path" "$ffmpeg_source_dir/configure" $ffmpeg_config_options --prefix="$prefix" + # shellcheck disable= + + # on RHEL patchelf is not visible under sudo, so we install to a temporary directory + make install DESTDIR="$build_dir/installed" -j + popd +} + + +ffmpeg_config_options+=" --enable-openssl" +fix_openssl3_pc_files +echo "pkg-config openssl version: $(pkg-config --modversion openssl)" + +install_ff_nvcodec_headers + +build_ffmpeg + +output_dir="$ffmpeg_source_dir/build/installed/$prefix" + +if [ "$build_type" == "shared" ]; then + fix_dependencies="${BASH_SOURCE%/*}/../shared/fix_ffmpeg_dependencies.sh" + "$fix_dependencies" "$output_dir" +fi + +sudo mv "$output_dir" "/usr/local" +set_ffmpeg_dir_env_var "FFMPEG_DIR" "$prefix" diff --git a/coin/provisioning/common/macos/install-ffmpeg-macos.sh b/coin/provisioning/common/macos/install-ffmpeg-macos.sh new file mode 100755 index 00000000000..4fc8f1c41bb --- /dev/null +++ b/coin/provisioning/common/macos/install-ffmpeg-macos.sh @@ -0,0 +1,66 @@ +#!/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 builds and installs FFmpeg shared libs + +set -ex + +os="$1" + +if [ "$os" != "macos" ] && [ "$os" != "macos-universal" ]; then + >&2 echo "invalid os paremeter: $os" + exit 1 +fi + +source "${BASH_SOURCE%/*}/../unix/ffmpeg-installation-utils.sh" + +ffmpeg_source_dir=$(download_ffmpeg) +ffmpeg_name=$(basename "$ffmpeg_source_dir") +ffmpeg_config_options=$(get_ffmpeg_config_options "shared") +prefix="/usr/local/$ffmpeg_name" + +build_ffmpeg() { + local arch="$1" + local build_dir="$ffmpeg_source_dir/build/$arch" + mkdir -p "$build_dir" + pushd "$build_dir" + + # shellcheck disable=SC2086 + if [ -n "$arch" ]; then + local cc="clang -arch $arch" + "$ffmpeg_source_dir/configure" $ffmpeg_config_options --prefix="$prefix" --enable-cross-compile --arch="$arch" --cc="$cc" + else + "$ffmpeg_source_dir/configure" $ffmpeg_config_options --prefix="$prefix" + fi + # shellcheck disable= + + make install DESTDIR="$build_dir/installed" -j4 + popd +} + +brew install yasm +export MACOSX_DEPLOYMENT_TARGET=12 +fix_relative_dependencies="${BASH_SOURCE%/*}/../macos/fix_relative_dependencies.sh" + +if [ "$os" == "macos" ]; then + build_ffmpeg + + install_dir="$ffmpeg_source_dir/build/installed" + "$fix_relative_dependencies" "$install_dir/usr/local/$ffmpeg_name/lib" + sudo mv "$install_dir/usr/local/$ffmpeg_name" "/usr/local" +else + build_ffmpeg "arm64" + build_ffmpeg "x86_64" + + arm64_install_dir="$ffmpeg_source_dir/build/arm64/installed" + x86_64_install_dir="$ffmpeg_source_dir/build/x86_64/installed" + + "$fix_relative_dependencies" "$arm64_install_dir/usr/local/$ffmpeg_name/lib" + "$fix_relative_dependencies" "$x86_64_install_dir/usr/local/$ffmpeg_name/lib" + + sudo rm -rf "/usr/local/$ffmpeg_name" # lipo fails upon 2nd run + sudo "${BASH_SOURCE%/*}/../macos/makeuniversal.sh" "$arm64_install_dir" "$x86_64_install_dir" +fi + +set_ffmpeg_dir_env_var "FFMPEG_DIR" "/usr/local/$ffmpeg_name" diff --git a/coin/provisioning/common/unix/install-ffmpeg.sh b/coin/provisioning/common/unix/install-ffmpeg.sh deleted file mode 100755 index e5512d553f5..00000000000 --- a/coin/provisioning/common/unix/install-ffmpeg.sh +++ /dev/null @@ -1,133 +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 - -# This script will build and install FFmpeg static libs -set -ex - -source "${BASH_SOURCE%/*}/../unix/ffmpeg-installation-utils.sh" - -os="$1" -build_type=$(get_ffmpeg_build_type "$2") - -ffmpeg_source_dir=$(download_ffmpeg) -ffmpeg_name=$(basename $ffmpeg_source_dir) -ffmpeg_config_options=$(get_ffmpeg_config_options $build_type) - -install_ff_nvcodec_headers() { - local nv_codec_version="11.1" # use 11.1 to ensure compatibility with 470 nvidia drivers; might be upated to 12.0 - local nv_codec_url_public="https://github.com/FFmpeg/nv-codec-headers/archive/refs/heads/sdk/$nv_codec_version.zip" - local nv_codec_url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/nv-codec-headers/nv-codec-headers-sdk-$nv_codec_version.zip" - local nv_codec_sha1="ceb4966ab01b2e41f02074675a8ac5b331bf603e" - #nv_codec_sha1="4f30539f8dd31945da4c3da32e66022f9ca59c08" // 12.0 - local target_dir="$HOME" - local nv_codec_dir="$target_dir/nv-codec-headers-sdk-$nv_codec_version" - - if [ ! -d "$nv_codec_dir" ]; then - source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" - InstallFromCompressedFileFromURL "$nv_codec_url_cached" "$nv_codec_url_public" "$nv_codec_sha1" "$target_dir" "" - fi - - sudo make -C "$nv_codec_dir" install -j - - # Might be not detected by default on RHEL - export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/lib/pkgconfig" -} - -fix_openssl3_pc_files() { - # On RHEL 8, openssl3 pc files are libopenssl3.pc, libssl3.pc, libcrypto3.pc, - # and FFmpeg cannot find them. Instead, it finds FFmpeg 1.x.x if it's installed. - # The function fixes the files with copying them to a custom directory - - local openssl3_pcfiledir=$(pkg-config --variable=pcfiledir openssl3) - if [ ! -n "$openssl3_pcfiledir" ]; then - return - fi - - local pcfiles=("libssl" "libcrypto" "openssl") - - for pcfile in ${pcfiles[@]}; do - if [ ! -f "$openssl3_pcfiledir/${pcfile}3.pc" ]; then - echo "pkgconfig has found openssl3 but the file $openssl3_pcfiledir/${pcfile}3.pc does't exist" - return - fi - done - - local new_pkgconfig_dir="$ffmpeg_source_dir/openssl3_pkgconfig" - mkdir -p $new_pkgconfig_dir - - for pcfile in ${pcfiles[@]}; do - sed -E '/^Requires(\.private)?:/s/ (libssl|libcrypto)3/ \1/g;' "$openssl3_pcfiledir/${pcfile}3.pc" > "$new_pkgconfig_dir/${pcfile}.pc" - done - - export PKG_CONFIG_PATH="$new_pkgconfig_dir:$PKG_CONFIG_PATH" -} - -build_ffmpeg() { - local arch="$1" - local prefix="$2" - local build_dir="$ffmpeg_source_dir/build/$arch" - mkdir -p "$build_dir" - pushd "$build_dir" - - if [ -z "$prefix" ] - then prefix="/usr/local/$ffmpeg_name" - fi - - if [ -n "$arch" ] - then cc="clang -arch $arch" - fi - - # shellcheck disable=SC2086 - if [ -n "$arch" ] - then "$ffmpeg_source_dir/configure" $ffmpeg_config_options --prefix="$prefix" --enable-cross-compile --arch="$arch" --cc="$cc" - else "$ffmpeg_source_dir/configure" $ffmpeg_config_options --prefix="$prefix" - fi - make install DESTDIR="$build_dir/installed" -j4 - popd -} - -if [ "$os" == "linux" ]; then - install_ff_nvcodec_headers - - ffmpeg_config_options+=" --enable-openssl" - fix_openssl3_pc_files - echo "pkg-config openssl version: $(pkg-config --modversion openssl)" - - build_ffmpeg - - output_dir="$ffmpeg_source_dir/build/installed/usr/local/$ffmpeg_name" - - if [ "$build_type" == "shared" ]; then - fix_dependencies="${BASH_SOURCE%/*}/../shared/fix_ffmpeg_dependencies.sh" - "$fix_dependencies" "$output_dir" - fi - - sudo mv "$output_dir" "/usr/local" - -elif [ "$os" == "macos" ] || [ "$os" == "macos-universal" ]; then - brew install yasm - export MACOSX_DEPLOYMENT_TARGET=12 - fix_relative_dependencies="${BASH_SOURCE%/*}/../macos/fix_relative_dependencies.sh" - - if [ "$os" == "macos" ]; then - build_ffmpeg - install_dir="$ffmpeg_source_dir/build/installed" - "$fix_relative_dependencies" "$install_dir/usr/local/$ffmpeg_name/lib" - sudo mv "$install_dir/usr/local/$ffmpeg_name" "/usr/local" - else - build_ffmpeg "arm64" - build_ffmpeg "x86_64" - - arm64_install_dir="$ffmpeg_source_dir/build/arm64/installed" - x86_64_install_dir="$ffmpeg_source_dir/build/x86_64/installed" - - "$fix_relative_dependencies" "$arm64_install_dir/usr/local/$ffmpeg_name/lib" - "$fix_relative_dependencies" "$x86_64_install_dir/usr/local/$ffmpeg_name/lib" - - sudo "${BASH_SOURCE%/*}/../macos/makeuniversal.sh" "$arm64_install_dir" "$x86_64_install_dir" - fi -fi - -set_ffmpeg_dir_env_var "FFMPEG_DIR" "/usr/local/$ffmpeg_name" - diff --git a/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/90-install-ffmpeg.sh b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/90-install-ffmpeg.sh index 2c805227332..8dcbdf7c925 100644 --- a/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/90-install-ffmpeg.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/90-install-ffmpeg.sh @@ -2,7 +2,6 @@ #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 -# TODO: investigate why the FFmpeg plugin can't find shared FFmpeg on rhel-8.8 / 8.10 -source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux" +source "${BASH_SOURCE%/*}/../common/linux/install-ffmpeg-linux.sh" source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-x86_64" source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-x86" diff --git a/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/90-install-ffmpeg.sh b/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/90-install-ffmpeg.sh index 61da9b7b3a4..882680b7fa0 100755 --- a/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/90-install-ffmpeg.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/90-install-ffmpeg.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash -source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux" +source "${BASH_SOURCE%/*}/../common/linux/install-ffmpeg-linux.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/90-install-ffmpeg.sh b/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/90-install-ffmpeg.sh index 333885a384e..90c52cd361b 100755 --- a/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/90-install-ffmpeg.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/90-install-ffmpeg.sh @@ -2,6 +2,6 @@ #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 -source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux" +source "${BASH_SOURCE%/*}/../common/linux/install-ffmpeg-linux.sh" source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-x86" source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-x86_64" diff --git a/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/90-install-ffmpeg.sh b/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/90-install-ffmpeg.sh index a3252c08edd..1184e5a5ada 100755 --- a/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/90-install-ffmpeg.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/90-install-ffmpeg.sh @@ -2,5 +2,5 @@ #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 -source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux" +source "${BASH_SOURCE%/*}/../common/linux/install-ffmpeg-linux.sh" source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-x86_64" diff --git a/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/90-install-ffmpeg.sh b/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/90-install-ffmpeg.sh index 08d455cf5f2..8dcbdf7c925 100755 --- a/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/90-install-ffmpeg.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/90-install-ffmpeg.sh @@ -2,7 +2,6 @@ #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 -# TODO: investigate why the FFmpeg plugin can't find shared FFmpeg on rhel-8.8 -source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux" +source "${BASH_SOURCE%/*}/../common/linux/install-ffmpeg-linux.sh" source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-x86_64" source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-x86" diff --git a/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/90-install-ffmpeg.sh b/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/90-install-ffmpeg.sh index 61da9b7b3a4..882680b7fa0 100755 --- a/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/90-install-ffmpeg.sh +++ b/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/90-install-ffmpeg.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash -source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux" +source "${BASH_SOURCE%/*}/../common/linux/install-ffmpeg-linux.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/90-install-ffmpeg.sh b/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/90-install-ffmpeg.sh index 61da9b7b3a4..882680b7fa0 100755 --- a/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/90-install-ffmpeg.sh +++ b/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/90-install-ffmpeg.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash -source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux" +source "${BASH_SOURCE%/*}/../common/linux/install-ffmpeg-linux.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/90-install-ffmpeg.sh b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/90-install-ffmpeg.sh index 61da9b7b3a4..882680b7fa0 100644 --- a/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/90-install-ffmpeg.sh +++ b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/90-install-ffmpeg.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash -source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux" +source "${BASH_SOURCE%/*}/../common/linux/install-ffmpeg-linux.sh" diff --git a/coin/provisioning/qtci-linux-SLES-15_SP4-x86_64/90-install-ffmpeg.sh b/coin/provisioning/qtci-linux-SLES-15_SP4-x86_64/90-install-ffmpeg.sh index 27ff04dc6cf..bafe9daf8f8 100755 --- a/coin/provisioning/qtci-linux-SLES-15_SP4-x86_64/90-install-ffmpeg.sh +++ b/coin/provisioning/qtci-linux-SLES-15_SP4-x86_64/90-install-ffmpeg.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash -source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux" "static" +source "${BASH_SOURCE%/*}/../common/linux/install-ffmpeg-linux.sh" "static" diff --git a/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/90-install-ffmpeg.sh b/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/90-install-ffmpeg.sh index cd65475bc72..9af69cadc59 100644 --- a/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/90-install-ffmpeg.sh +++ b/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/90-install-ffmpeg.sh @@ -2,4 +2,4 @@ # 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 -source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux" "static" +source "${BASH_SOURCE%/*}/../common/linux/install-ffmpeg-linux.sh" "static" diff --git a/coin/provisioning/qtci-linux-SLES-15_SP6-x86_64/90-install-ffmpeg.sh b/coin/provisioning/qtci-linux-SLES-15_SP6-x86_64/90-install-ffmpeg.sh index 08a2ea94164..b21dcc1b840 100644 --- a/coin/provisioning/qtci-linux-SLES-15_SP6-x86_64/90-install-ffmpeg.sh +++ b/coin/provisioning/qtci-linux-SLES-15_SP6-x86_64/90-install-ffmpeg.sh @@ -2,4 +2,4 @@ # 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 -source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux" "static" +source "${BASH_SOURCE%/*}/../common/linux/install-ffmpeg-linux.sh" "static" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/90-install-ffmpeg.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/90-install-ffmpeg.sh index 61da9b7b3a4..882680b7fa0 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/90-install-ffmpeg.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/90-install-ffmpeg.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash -source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux" +source "${BASH_SOURCE%/*}/../common/linux/install-ffmpeg-linux.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/90-install-ffmpeg.sh b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/90-install-ffmpeg.sh index 61da9b7b3a4..882680b7fa0 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/90-install-ffmpeg.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/90-install-ffmpeg.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash -source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux" +source "${BASH_SOURCE%/*}/../common/linux/install-ffmpeg-linux.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/90-install-ffmpeg.sh b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/90-install-ffmpeg.sh index 61da9b7b3a4..882680b7fa0 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/90-install-ffmpeg.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/90-install-ffmpeg.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash -source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux" +source "${BASH_SOURCE%/*}/../common/linux/install-ffmpeg-linux.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/90-install-ffmpeg.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/90-install-ffmpeg.sh index 61da9b7b3a4..882680b7fa0 100644 --- a/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/90-install-ffmpeg.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/90-install-ffmpeg.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash -source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux" +source "${BASH_SOURCE%/*}/../common/linux/install-ffmpeg-linux.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/90-install-ffmpeg.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/90-install-ffmpeg.sh index 61da9b7b3a4..882680b7fa0 100644 --- a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/90-install-ffmpeg.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/90-install-ffmpeg.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash -source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux" +source "${BASH_SOURCE%/*}/../common/linux/install-ffmpeg-linux.sh" diff --git a/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/90-install-ffmpeg.sh b/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/90-install-ffmpeg.sh index 61da9b7b3a4..882680b7fa0 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/90-install-ffmpeg.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.3-x86_64/90-install-ffmpeg.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash -source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux" +source "${BASH_SOURCE%/*}/../common/linux/install-ffmpeg-linux.sh" diff --git a/coin/provisioning/qtci-linux-openSUSE-15.4-x86_64/90-install-ffmpeg.sh b/coin/provisioning/qtci-linux-openSUSE-15.4-x86_64/90-install-ffmpeg.sh index 61da9b7b3a4..882680b7fa0 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.4-x86_64/90-install-ffmpeg.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.4-x86_64/90-install-ffmpeg.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash -source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux" +source "${BASH_SOURCE%/*}/../common/linux/install-ffmpeg-linux.sh" diff --git a/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/90-install-ffmpeg.sh b/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/90-install-ffmpeg.sh index 61da9b7b3a4..882680b7fa0 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/90-install-ffmpeg.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/90-install-ffmpeg.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash -source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux" +source "${BASH_SOURCE%/*}/../common/linux/install-ffmpeg-linux.sh" diff --git a/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/90-install-ffmpeg.sh b/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/90-install-ffmpeg.sh index 61da9b7b3a4..882680b7fa0 100644 --- a/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/90-install-ffmpeg.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/90-install-ffmpeg.sh @@ -1,3 +1,3 @@ #!/usr/bin/env bash -source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux" +source "${BASH_SOURCE%/*}/../common/linux/install-ffmpeg-linux.sh" diff --git a/coin/provisioning/qtci-macos-10.15-x86_64/90-install-ffmpeg.sh b/coin/provisioning/qtci-macos-10.15-x86_64/90-install-ffmpeg.sh index 4a41cb74d3c..fd9cfbf7666 100755 --- a/coin/provisioning/qtci-macos-10.15-x86_64/90-install-ffmpeg.sh +++ b/coin/provisioning/qtci-macos-10.15-x86_64/90-install-ffmpeg.sh @@ -4,4 +4,4 @@ set -ex -source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "macos" +source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-macos.sh" diff --git a/coin/provisioning/qtci-macos-11-arm/90-install-ffmpeg.sh b/coin/provisioning/qtci-macos-11-arm/90-install-ffmpeg.sh index 23cb13e141c..d5e9d5d0ff2 100755 --- a/coin/provisioning/qtci-macos-11-arm/90-install-ffmpeg.sh +++ b/coin/provisioning/qtci-macos-11-arm/90-install-ffmpeg.sh @@ -4,4 +4,4 @@ set -ex -source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "macos-universal" +source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-macos.sh" "macos-universal" diff --git a/coin/provisioning/qtci-macos-11-x86_64/90-install-ffmpeg.sh b/coin/provisioning/qtci-macos-11-x86_64/90-install-ffmpeg.sh index 23cb13e141c..d5e9d5d0ff2 100755 --- a/coin/provisioning/qtci-macos-11-x86_64/90-install-ffmpeg.sh +++ b/coin/provisioning/qtci-macos-11-x86_64/90-install-ffmpeg.sh @@ -4,4 +4,4 @@ set -ex -source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "macos-universal" +source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-macos.sh" "macos-universal" diff --git a/coin/provisioning/qtci-macos-12-arm/90-install-ffmpeg.sh b/coin/provisioning/qtci-macos-12-arm/90-install-ffmpeg.sh index 4d4169bb657..e6b40aa1d8a 100755 --- a/coin/provisioning/qtci-macos-12-arm/90-install-ffmpeg.sh +++ b/coin/provisioning/qtci-macos-12-arm/90-install-ffmpeg.sh @@ -4,6 +4,6 @@ set -ex -source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "macos-universal" +source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-macos.sh" "macos-universal" #source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-arm64" source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-ios.sh" diff --git a/coin/provisioning/qtci-macos-12-x86_64/90-install-ffmpeg.sh b/coin/provisioning/qtci-macos-12-x86_64/90-install-ffmpeg.sh index dfdc1022c27..c36eda4526b 100755 --- a/coin/provisioning/qtci-macos-12-x86_64/90-install-ffmpeg.sh +++ b/coin/provisioning/qtci-macos-12-x86_64/90-install-ffmpeg.sh @@ -4,6 +4,6 @@ set -ex -source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "macos-universal" +source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-macos.sh" "macos-universal" source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-arm64" source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-ios.sh" diff --git a/coin/provisioning/qtci-macos-13-arm/90-install-ffmpeg.sh b/coin/provisioning/qtci-macos-13-arm/90-install-ffmpeg.sh index 4d4169bb657..e6b40aa1d8a 100755 --- a/coin/provisioning/qtci-macos-13-arm/90-install-ffmpeg.sh +++ b/coin/provisioning/qtci-macos-13-arm/90-install-ffmpeg.sh @@ -4,6 +4,6 @@ set -ex -source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "macos-universal" +source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-macos.sh" "macos-universal" #source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-arm64" source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-ios.sh" diff --git a/coin/provisioning/qtci-macos-13-x86_64/90-install-ffmpeg.sh b/coin/provisioning/qtci-macos-13-x86_64/90-install-ffmpeg.sh index dfdc1022c27..c36eda4526b 100755 --- a/coin/provisioning/qtci-macos-13-x86_64/90-install-ffmpeg.sh +++ b/coin/provisioning/qtci-macos-13-x86_64/90-install-ffmpeg.sh @@ -4,6 +4,6 @@ set -ex -source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "macos-universal" +source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-macos.sh" "macos-universal" source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-arm64" source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-ios.sh" diff --git a/coin/provisioning/qtci-macos-14-arm/90-install-ffmpeg.sh b/coin/provisioning/qtci-macos-14-arm/90-install-ffmpeg.sh index 4d4169bb657..e6b40aa1d8a 100755 --- a/coin/provisioning/qtci-macos-14-arm/90-install-ffmpeg.sh +++ b/coin/provisioning/qtci-macos-14-arm/90-install-ffmpeg.sh @@ -4,6 +4,6 @@ set -ex -source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "macos-universal" +source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-macos.sh" "macos-universal" #source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-arm64" source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-ios.sh" diff --git a/coin/provisioning/qtci-macos-14-x86_64/90-install-ffmpeg.sh b/coin/provisioning/qtci-macos-14-x86_64/90-install-ffmpeg.sh index dfdc1022c27..c36eda4526b 100755 --- a/coin/provisioning/qtci-macos-14-x86_64/90-install-ffmpeg.sh +++ b/coin/provisioning/qtci-macos-14-x86_64/90-install-ffmpeg.sh @@ -4,6 +4,6 @@ set -ex -source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "macos-universal" +source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-macos.sh" "macos-universal" source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-arm64" source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-ios.sh" diff --git a/coin/provisioning/qtci-macos-15-arm/90-install-ffmpeg.sh b/coin/provisioning/qtci-macos-15-arm/90-install-ffmpeg.sh index 4d4169bb657..e6b40aa1d8a 100755 --- a/coin/provisioning/qtci-macos-15-arm/90-install-ffmpeg.sh +++ b/coin/provisioning/qtci-macos-15-arm/90-install-ffmpeg.sh @@ -4,6 +4,6 @@ set -ex -source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "macos-universal" +source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-macos.sh" "macos-universal" #source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-arm64" source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-ios.sh" diff --git a/coin/provisioning/qtci-macos-15-x86_64/90-install-ffmpeg.sh b/coin/provisioning/qtci-macos-15-x86_64/90-install-ffmpeg.sh index dfdc1022c27..c36eda4526b 100755 --- a/coin/provisioning/qtci-macos-15-x86_64/90-install-ffmpeg.sh +++ b/coin/provisioning/qtci-macos-15-x86_64/90-install-ffmpeg.sh @@ -4,6 +4,6 @@ set -ex -source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "macos-universal" +source "${BASH_SOURCE%/*}/../common/macos/install-ffmpeg-macos.sh" "macos-universal" source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-arm64" source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-ios.sh" From 144715f585cd46b852d30fc0f65dac12596506fe Mon Sep 17 00:00:00 2001 From: Artem Dyomin Date: Mon, 28 Oct 2024 21:54:12 +0100 Subject: [PATCH 096/204] Cleanup in install-ffmpeg-android.sh MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Non-functional changes: * fix alignment * add the keyword 'local' to local function variables Pick-to: 6.8 Change-Id: I28639d28c7211809e52f118c1612db52f8954286 Reviewed-by: Jøger Hansegård Reviewed-by: Pavel Dubsky (cherry picked from commit 151c0dd58f7529ec255e0def0850f5859df0dadb) Reviewed-by: Qt Cherry-pick Bot --- .../common/unix/install-ffmpeg-android.sh | 173 +++++++++--------- 1 file changed, 90 insertions(+), 83 deletions(-) diff --git a/coin/provisioning/common/unix/install-ffmpeg-android.sh b/coin/provisioning/common/unix/install-ffmpeg-android.sh index d96b83afba4..c4926305e57 100755 --- a/coin/provisioning/common/unix/install-ffmpeg-android.sh +++ b/coin/provisioning/common/unix/install-ffmpeg-android.sh @@ -9,97 +9,104 @@ source "${BASH_SOURCE%/*}/../unix/ffmpeg-installation-utils.sh" os="$1" build_type=$(get_ffmpeg_build_type) -target_dir="$HOME" ffmpeg_source_dir=$(download_ffmpeg) build_ffmpeg_android() { - - target_arch=$1 - target_dir=$2 - - sudo mkdir -p "$target_dir" - - openssl_include="$OPENSSL_ANDROID_HOME_DEFAULT/include" - openssl_libs="" - libs_prefix="" - if [ "$target_arch" == "x86_64" ]; then - target_toolchain_arch="x86_64-linux-android" - target_arch=x86_64 - target_cpu=x86-64 - openssl_libs="$OPENSSL_ANDROID_HOME_DEFAULT/x86_64" - libs_prefix="_x86_64" - elif [ "$target_arch" == "x86" ]; then - target_toolchain_arch="i686-linux-android" - target_arch=x86 - target_cpu=i686 - openssl_libs="$OPENSSL_ANDROID_HOME_DEFAULT/x86" - libs_prefix="_x86" - elif [ "$target_arch" == "arm64" ]; then - target_toolchain_arch="aarch64-linux-android" - target_arch=aarch64 - target_cpu=armv8-a - openssl_libs="$OPENSSL_ANDROID_HOME_DEFAULT/arm64-v8a" - libs_prefix="_arm64-v8a" - fi - - ln -Ffs "${openssl_libs}/libcrypto_3.so" "${openssl_libs}/libcrypto.so" - ln -Ffs "${openssl_libs}/libssl_3.so" "${openssl_libs}/libssl.so" - - api_version=24 - - ndk_root=$ANDROID_NDK_ROOT_DEFAULT - if uname -a |grep -q "Darwin"; then - ndk_host=darwin-x86_64 - else - ndk_host=linux-x86_64 - fi - - toolchain=${ndk_root}/toolchains/llvm/prebuilt/${ndk_host} - toolchain_bin=${toolchain}/bin - sysroot=${toolchain}/sysroot - cxx=${toolchain_bin}/${target_toolchain_arch}${api_version}-clang++ - cc=${toolchain_bin}/${target_toolchain_arch}${api_version}-clang - ar=${toolchain_bin}/llvm-ar - ranlib=${toolchain_bin}/llvm-ranlib - - ffmpeg_config_options=$(get_ffmpeg_config_options $build_type) - ffmpeg_config_options+=" --enable-cross-compile --target-os=android --enable-jni --enable-mediacodec --enable-openssl --enable-pthreads --enable-neon --disable-asm --disable-indev=android_camera" - ffmpeg_config_options+=" --arch=$target_arch --cpu=${target_cpu} --sysroot=${sysroot} --sysinclude=${sysroot}/usr/include/" - ffmpeg_config_options+=" --cc=${cc} --cxx=${cxx} --ar=${ar} --ranlib=${ranlib}" - ffmpeg_config_options+=" --extra-cflags=-I${openssl_include} --extra-ldflags=-L${openssl_libs}" - - local build_dir="$ffmpeg_source_dir/build/$target_arch" - sudo mkdir -p "$build_dir" - pushd "$build_dir" - - # shellcheck disable=SC2086 - sudo "$ffmpeg_source_dir/configure" $ffmpeg_config_options --prefix="$target_dir" - - sudo make install -j4 - - popd - - rm -f "${openssl_libs}/libcrypto.so" - rm -f "${openssl_libs}/libssl.so" - - if [[ "$build_type" == "shared" ]]; then - fix_dependencies="${BASH_SOURCE%/*}/../shared/fix_ffmpeg_dependencies.sh" - sudo "${fix_dependencies}" "${target_dir}" "${libs_prefix}" "no" - fi + local target_arch=$1 + local target_dir=$2 + + sudo mkdir -p "$target_dir" + + local openssl_include="$OPENSSL_ANDROID_HOME_DEFAULT/include" + local openssl_libs + local libs_prefix + local target_cpu + local target_toolchain_arch + + if [ "$target_arch" == "x86_64" ]; then + target_toolchain_arch="x86_64-linux-android" + target_arch=x86_64 + target_cpu=x86-64 + openssl_libs="$OPENSSL_ANDROID_HOME_DEFAULT/x86_64" + libs_prefix="_x86_64" + elif [ "$target_arch" == "x86" ]; then + target_toolchain_arch="i686-linux-android" + target_arch=x86 + target_cpu=i686 + openssl_libs="$OPENSSL_ANDROID_HOME_DEFAULT/x86" + libs_prefix="_x86" + elif [ "$target_arch" == "arm64" ]; then + target_toolchain_arch="aarch64-linux-android" + target_arch=aarch64 + target_cpu=armv8-a + openssl_libs="$OPENSSL_ANDROID_HOME_DEFAULT/arm64-v8a" + libs_prefix="_arm64-v8a" + fi + + ln -Ffs "${openssl_libs}/libcrypto_3.so" "${openssl_libs}/libcrypto.so" + ln -Ffs "${openssl_libs}/libssl_3.so" "${openssl_libs}/libssl.so" + + local api_version=24 + + local ndk_root=$ANDROID_NDK_ROOT_DEFAULT + local ndk_host + if uname -a |grep -q "Darwin"; then + ndk_host=darwin-x86_64 + else + ndk_host=linux-x86_64 + fi + + local toolchain=${ndk_root}/toolchains/llvm/prebuilt/${ndk_host} + local toolchain_bin=${toolchain}/bin + local sysroot=${toolchain}/sysroot + local cxx=${toolchain_bin}/${target_toolchain_arch}${api_version}-clang++ + local cc=${toolchain_bin}/${target_toolchain_arch}${api_version}-clang + local ar=${toolchain_bin}/llvm-ar + local ranlib=${toolchain_bin}/llvm-ranlib + local ffmpeg_config_options + + ffmpeg_config_options=$(get_ffmpeg_config_options $build_type) + ffmpeg_config_options+=" --enable-cross-compile --target-os=android --enable-jni --enable-mediacodec --enable-openssl --enable-pthreads --enable-neon --disable-asm --disable-indev=android_camera" + ffmpeg_config_options+=" --arch=$target_arch --cpu=${target_cpu} --sysroot=${sysroot} --sysinclude=${sysroot}/usr/include/" + ffmpeg_config_options+=" --cc=${cc} --cxx=${cxx} --ar=${ar} --ranlib=${ranlib}" + ffmpeg_config_options+=" --extra-cflags=-I${openssl_include} --extra-ldflags=-L${openssl_libs}" + + local build_dir="$ffmpeg_source_dir/build_android/$target_arch" + mkdir -p "$build_dir" + pushd "$build_dir" + + # shellcheck disable=SC2086 + sudo "$ffmpeg_source_dir/configure" $ffmpeg_config_options --prefix="$target_dir" + # shellcheck disable= + + sudo make install -j4 + + popd + + rm -f "${openssl_libs}/libcrypto.so" + rm -f "${openssl_libs}/libssl.so" + + if [[ "$build_type" == "shared" ]]; then + local fix_dependencies="${BASH_SOURCE%/*}/../shared/fix_ffmpeg_dependencies.sh" + sudo "${fix_dependencies}" "${target_dir}" "${libs_prefix}" "no" + fi } if [ "$os" == "android-x86" ]; then - target_arch=x86 - target_dir="/usr/local/android/ffmpeg-x86" - envvar="FFMPEG_DIR_ANDROID_X86" + target_arch=x86 + target_dir="/usr/local/android/ffmpeg-x86" + envvar="FFMPEG_DIR_ANDROID_X86" elif [ "$os" == "android-x86_64" ]; then - target_arch=x86_64 - target_dir="/usr/local/android/ffmpeg-x86_64" - envvar="FFMPEG_DIR_ANDROID_X86_64" + target_arch=x86_64 + target_dir="/usr/local/android/ffmpeg-x86_64" + envvar="FFMPEG_DIR_ANDROID_X86_64" elif [ "$os" == "android-arm64" ]; then - target_arch=arm64 - target_dir="/usr/local/android/ffmpeg-arm64" - envvar="FFMPEG_DIR_ANDROID_ARM64" + target_arch=arm64 + target_dir="/usr/local/android/ffmpeg-arm64" + envvar="FFMPEG_DIR_ANDROID_ARM64" +else + >&2 echo "Unhandled android os param: $os" + exit 1 fi build_ffmpeg_android "$target_arch" "$target_dir" From ea84dba3134666179364c18ad4462c0145e38ff0 Mon Sep 17 00:00:00 2001 From: Artem Dyomin Date: Tue, 29 Oct 2024 09:59:22 +0100 Subject: [PATCH 097/204] Improve the script fix_ffmpeg_dependencies MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * add FFmpeg stubs to the 'Required.private' section. This will make the logic more robust after integration this in qt multimedia. * add some script comments. * fix shellcheck. * add validity checks. Pick-to: 6.8 Change-Id: I28639d21c7210109e52ff98ce682da51f8744287 Reviewed-by: Jøger Hansegård Reviewed-by: Pavel Dubsky (cherry picked from commit a442e4893f18e7d25d7596e565f1331fce9d7501) Reviewed-by: Qt Cherry-pick Bot --- .../common/shared/fix_ffmpeg_dependencies.sh | 39 ++++++++++++++++--- .../common/unix/install-patchelf.sh | 1 + 2 files changed, 34 insertions(+), 6 deletions(-) diff --git a/coin/provisioning/common/shared/fix_ffmpeg_dependencies.sh b/coin/provisioning/common/shared/fix_ffmpeg_dependencies.sh index f3972f07221..bfc04a911d5 100755 --- a/coin/provisioning/common/shared/fix_ffmpeg_dependencies.sh +++ b/coin/provisioning/common/shared/fix_ffmpeg_dependencies.sh @@ -15,10 +15,12 @@ if [ "$(uname -s)" = "Darwin" ]; then fi ffmpeg_libs=("avcodec" "avdevice" "avfilter" "avformat" "avutil" "swresample" "swscale") +stub_prefix="Qt6FFmpegStub-" for lib_name in "${ffmpeg_libs[@]}"; do lib_path="$lib_dir/lib$lib_name.so" pkg_config_file_path="$lib_dir/pkgconfig/lib$lib_name.pc" + stubs_required_versions="" if [ ! -f "$lib_path" ]; then echo "FFmpeg lib $lib_path hasn't been found" @@ -30,21 +32,46 @@ for lib_name in "${ffmpeg_libs[@]}"; do exit 1 fi + read_needed_deps() { + readelf -d "$lib_path" | grep '(NEEDED)' + } + while read -r line; do if [[ $line =~ .*\[(lib((ssl|crypto|va|va-x11|va-drm)(_3)?\.so(\.[0-9]+)*))\].* ]]; then - stub_name="libQt6FFmpegStub-${BASH_REMATCH[2]}" - if [[ ${BASH_REMATCH[4]} == "_3" ]]; then + stub_name="lib$stub_prefix${BASH_REMATCH[2]}" + android_ssl_suffix=${BASH_REMATCH[4]} + soversion=${BASH_REMATCH[5]} + + if [ -n "$android_ssl_suffix" ] && [ -n "$soversion" ]; then + >&2 echo "both, android_ssl_suffix $android_ssl_suffix and soversion $soversion are found" + continue + fi + + if [[ "$android_ssl_suffix" == "_3" ]]; then stub_name="${stub_name/_3/}" # Remove "_3" from stub_name + stubs_required_versions+=" ${stub_name/.so/ = 3}," + elif [[ -n "$soversion" ]]; then + stubs_required_versions+=" ${stub_name/.so./ = }," fi + if [[ -n "$additional_suffix" ]]; then stub_name="${stub_name%%.*}${additional_suffix}.${stub_name#*.}" # Add additional_suffix fi - patchelf --replace-needed "${BASH_REMATCH[1]}" "${stub_name}" $lib_path + + patchelf --replace-needed "${BASH_REMATCH[1]}" "${stub_name}" "$lib_path" fi - done <<< "$(readelf -d $lib_path | grep '(NEEDED)' )" + done <<< "$(read_needed_deps)" + + sed_cmd="/^Libs.private:/s/ -l(va|va-x11|va-drm|ssl|crypto)/ -l$stub_prefix\\1/g;" + if [[ -n "$stubs_required_versions" ]]; then + stubs_required_versions="${stubs_required_versions%?}" # remove the last comma + sed_cmd+="s/(^Requires.private:[^,]*(,)?.*$)/\\1\\2$stubs_required_versions/g;" + fi - sed -i.bak -E '/^Libs.private:/s/ -l(va|va-x11|va-drm|ssl|crypto)/ -lQt6FFmpegStub-\1/g;' $pkg_config_file_path && rm -f ${pkg_config_file_path}.bak + # sed -i doesn't work without parameter on macOS 13 + sed -i.bak -E "$sed_cmd" "$pkg_config_file_path" && rm -f "${pkg_config_file_path}.bak" if [[ "$set_rpath" == "yes" ]]; then - patchelf --set-rpath '$ORIGIN' $lib_path + # shellcheck disable=SC2016 + patchelf --set-rpath '$ORIGIN' "$lib_path" fi done diff --git a/coin/provisioning/common/unix/install-patchelf.sh b/coin/provisioning/common/unix/install-patchelf.sh index 3779478a935..44ad9b882d5 100755 --- a/coin/provisioning/common/unix/install-patchelf.sh +++ b/coin/provisioning/common/unix/install-patchelf.sh @@ -4,6 +4,7 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" +# version 0.18.0 doesn't work correctly for Android binaries, so we use 0.17.2 patchelf_version="0.17.2" url_cached="https://ci-files01-hki.ci.qt.io/input/android/patchelf/$patchelf_version.tar.gz" From 1a1d923c83c5b09e77aa8b7d9cba4278f72080f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nils=20Petter=20Ska=CC=8Alerud?= Date: Fri, 21 Mar 2025 15:48:54 +0100 Subject: [PATCH 098/204] Android, FFmpeg: Allow specifying target output in FFpeg install script The provisioning script install-ffmpeg-android.sh can be useful to run locally to make sure we build FFmpeg with the same configuration as we do in CI. This patch introduce an optional parameter to this provisioning script that allows us to specify where to install the compiled binaries. Change-Id: I7ea30bffa4753ac1fab707ed2876ddcbbca06175 Reviewed-by: Assam Boudjelthia (cherry picked from commit 07775b2ad22c063204d0e5c778320a7215465413) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/common/unix/install-ffmpeg-android.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/coin/provisioning/common/unix/install-ffmpeg-android.sh b/coin/provisioning/common/unix/install-ffmpeg-android.sh index c4926305e57..8a855d31148 100755 --- a/coin/provisioning/common/unix/install-ffmpeg-android.sh +++ b/coin/provisioning/common/unix/install-ffmpeg-android.sh @@ -8,6 +8,8 @@ set -ex source "${BASH_SOURCE%/*}/../unix/ffmpeg-installation-utils.sh" os="$1" +# Optional parameter to set output installation directory. Useful for local builds. +target_install_dir_param="$2" build_type=$(get_ffmpeg_build_type) ffmpeg_source_dir=$(download_ffmpeg) @@ -109,5 +111,10 @@ else exit 1 fi +# If parameter is set, use it as the target output directory. +if [ ! -z $target_install_dir_param ]; then + target_dir=$target_install_dir_param +fi + build_ffmpeg_android "$target_arch" "$target_dir" set_ffmpeg_dir_env_var "$envvar" "$target_dir" From fc3521a2912d78b6fcf4b59fcfbedf45af61bf0c Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 22 Apr 2025 17:47:27 +0000 Subject: [PATCH 099/204] Update submodules on '6.9 in qt/qt5' Change-Id: I666a9e3d78ce2310748bc0ef3447cf7067a7cc7d 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 45eb05d412b..650a4aba91d 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 45eb05d412bb5fe7f447a72552fded8fbe667526 +Subproject commit 650a4aba91d71ebb380acaa5a414e325efbfbd3a diff --git a/qt5compat b/qt5compat index 782b9536c20..3e363cab7c9 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 782b9536c2003ddf81d58907b90c5af2be06c989 +Subproject commit 3e363cab7c969d934bddb374fd400bf0031c4b1f diff --git a/qtactiveqt b/qtactiveqt index 467f82aa9cd..8efdda95043 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 467f82aa9cdb565450003a761f230d43c8a01708 +Subproject commit 8efdda9504340ead45c4175b37a53a8f347fc0c7 diff --git a/qtbase b/qtbase index 64fd9edb2c5..a223eca4aec 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 64fd9edb2c5e935ffc58ce12434b582e32d4e93b +Subproject commit a223eca4aecde508d8c2d50dc859612eda8f3dc1 diff --git a/qtcharts b/qtcharts index c647fee9cab..ea96e22114d 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit c647fee9cab5d273264c595c4e2410137f84e072 +Subproject commit ea96e22114dfd036835ffa74241de9f37d1a3f7e diff --git a/qtcoap b/qtcoap index 6f2c85d0a1a..ed1c01c4de5 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit 6f2c85d0a1a26521cfd9a580b606410e4c2a1d17 +Subproject commit ed1c01c4de55e598a477b6040c767dc5318e4fab diff --git a/qtconnectivity b/qtconnectivity index 117e71bc932..931571759e0 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 117e71bc93266ee5a12d2b8ac9ef6c7d8b319605 +Subproject commit 931571759e0741642f1c389a3d389c89a738d90e diff --git a/qtdatavis3d b/qtdatavis3d index 3be6a60d1cd..4b1a9248dfa 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 3be6a60d1cd9c54381a0b78bc237f447a9fd5e44 +Subproject commit 4b1a9248dfa6472c84dae1e0cbbc0aa8c0284249 diff --git a/qtdeclarative b/qtdeclarative index 32d4b690b82..b81b82bc5cc 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 32d4b690b82730173db22cd0275b76537ff77f1a +Subproject commit b81b82bc5cc7f69b1fbeed5064a9aba0b63cbeaf diff --git a/qtdoc b/qtdoc index 9be125a3744..20c3005b37d 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 9be125a37449f65d494762ae151fd27d34418aab +Subproject commit 20c3005b37d52d8b951d830f286af27d29e0d8ad diff --git a/qtgraphs b/qtgraphs index 798ca3057be..791ebcd8d14 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit 798ca3057be774d18add10a41253a0f7ef75cfdc +Subproject commit 791ebcd8d14002f950e57681cf952b94156f7837 diff --git a/qtgrpc b/qtgrpc index f1227d3d121..2f636a9b04b 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit f1227d3d1213f3cc1c53956abc7400abcce4ab8f +Subproject commit 2f636a9b04b95ff3a6fccb0ce9590f45f0359a26 diff --git a/qthttpserver b/qthttpserver index 1ee5210ce31..09c3f439414 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit 1ee5210ce31ef12000eb701674f71f14997897e9 +Subproject commit 09c3f43941444a7f1e195f40892f200083a9ae95 diff --git a/qtimageformats b/qtimageformats index e5afa80b6de..6bc75dab552 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit e5afa80b6dead8fb6734ae041c39a2b13f84365a +Subproject commit 6bc75dab552ee006da976656ebd79c733dcb860f diff --git a/qtlanguageserver b/qtlanguageserver index cced788b73c..0eeba5bc5bd 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit cced788b73c2774a33d5522761ba835cd242a26c +Subproject commit 0eeba5bc5bd0eed647a4a310244156e6f4b519e1 diff --git a/qtlocation b/qtlocation index ab5582880c1..4d87b384b11 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit ab5582880c1e657c715d0b32d6d862c254245ae6 +Subproject commit 4d87b384b1104cbe18520e782a1535895b5f7860 diff --git a/qtlottie b/qtlottie index efb7e44282a..cb4883d38ab 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit efb7e44282a41d1e4a4bdf7e914445352f465192 +Subproject commit cb4883d38ab659d712ba0332ac08b71eeb794aed diff --git a/qtmqtt b/qtmqtt index d2546291dcf..343cfe186c1 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit d2546291dcf3f86f60988461670dfc48d729e9bb +Subproject commit 343cfe186c11602f0344363c87a4bd560edd901b diff --git a/qtmultimedia b/qtmultimedia index 1922b1cb82f..ae2029b731f 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 1922b1cb82feea719195332329ab6eb24c144706 +Subproject commit ae2029b731fe45ed99fbb1df47fa4c589453684b diff --git a/qtnetworkauth b/qtnetworkauth index fedf506ba7f..bd697a57112 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit fedf506ba7f5157ec2b89846d4e810a95a014069 +Subproject commit bd697a57112e3d32b098f23def0453ede8e6be5e diff --git a/qtopcua b/qtopcua index 261b327020a..7191fb4c85c 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit 261b327020ae059766a1c7cf36d6871dd36783e9 +Subproject commit 7191fb4c85cbcd8f6f0e9c3c41f8a56cbbde9501 diff --git a/qtpositioning b/qtpositioning index 1657389945d..50fe58c5c8f 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit 1657389945d5152c31dec2220d16eca63e437ab4 +Subproject commit 50fe58c5c8f7cf39dfa1ad1fb3b1159665d43a40 diff --git a/qtquick3d b/qtquick3d index c319a454f30..48fc492f0d2 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit c319a454f3005c451946decb9c2a4b82ee289881 +Subproject commit 48fc492f0d253550faaf1f6f05504b6f266a0024 diff --git a/qtquick3dphysics b/qtquick3dphysics index b0f5da1bab5..bfe6a602e97 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit b0f5da1bab58b806523dcb1487faccc49f809ac9 +Subproject commit bfe6a602e97c52f1313d7dc557670bb92baf7311 diff --git a/qtquickeffectmaker b/qtquickeffectmaker index 575347f3687..5830c618465 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit 575347f3687c6e950b97bbc1e763385d09734223 +Subproject commit 5830c6184653fac4f442a6b8c4043dda13bf7e33 diff --git a/qtquicktimeline b/qtquicktimeline index f395c3f90f7..6a907187463 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit f395c3f90f7a9182f3a52955da9f1f4c0b66cefb +Subproject commit 6a907187463c28c5c16714d5bbf021dcc03cd8ca diff --git a/qtremoteobjects b/qtremoteobjects index 8e9a5a3f15b..1b80896a652 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 8e9a5a3f15b83a7a9ed0580a623ec72a5c2683f2 +Subproject commit 1b80896a6523df82c45de5788492689abf8d886c diff --git a/qtscxml b/qtscxml index b6f235bc0ba..75c430a5bc5 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit b6f235bc0ba8caaaa227b81f88bde456663ef54e +Subproject commit 75c430a5bc598b8335a1f9b84a2a3df573591cea diff --git a/qtsensors b/qtsensors index 106be3198c3..dabc83724da 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 106be3198c32447d67c71d9c7320bc78ab60bda2 +Subproject commit dabc83724daa3e7fe82c3761f6fd3e771256a16b diff --git a/qtserialbus b/qtserialbus index 509aa2933a4..0e9765bd644 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 509aa2933a4e5aba132fc5c407c5d06faa24a4d8 +Subproject commit 0e9765bd6446941cd508113c9484bd522493cf1d diff --git a/qtserialport b/qtserialport index 35c007e27a9..6f46d0df253 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 35c007e27a9c6ed204dfa1ce96ac84804d1e44e4 +Subproject commit 6f46d0df2532ff7af08bc756bd4085751e291d31 diff --git a/qtshadertools b/qtshadertools index 4d991e3fb5b..6e5a10ba4ea 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 4d991e3fb5b50bbae39b688a3fa63eff180bfbf0 +Subproject commit 6e5a10ba4eacdb2c762eb74200ec08576fa9da73 diff --git a/qtspeech b/qtspeech index 49235e440cb..cfd556b9cd9 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 49235e440cb05efea5bb95f3b44af2603d0b2b47 +Subproject commit cfd556b9cd94fb03120765916c8810d1995befa2 diff --git a/qtsvg b/qtsvg index 00843e611e2..72c6eb3ceab 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 00843e611e2f6e46a6569ecfad5c5b5988bd33dc +Subproject commit 72c6eb3ceaba0c6e5d5d741f49f195dbffb750ee diff --git a/qttools b/qttools index 60ec383a939..86451665f63 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 60ec383a939d6d49c62bb7afa10ab98075f1f66a +Subproject commit 86451665f63c823bb39c92cdb823bbd3b1933356 diff --git a/qttranslations b/qttranslations index 707c4e476e6..42f67c1b999 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 707c4e476e6cc02f79fdb16b2a96537d0e4b5a63 +Subproject commit 42f67c1b99909f95cd057b9973be54223afa87c5 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 35d4ed3b29c..a94439a69b8 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 35d4ed3b29c53feb289418c366220c0fb8786283 +Subproject commit a94439a69b8517bde6337f60e313b20d85fe8d6a diff --git a/qtwayland b/qtwayland index 37a02cc552e..40c85b89bc2 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 37a02cc552e850a39d1c0e8561109d2de937d743 +Subproject commit 40c85b89bc22b834c16bdd9d5766bbf37134c1f4 diff --git a/qtwebchannel b/qtwebchannel index 565f19a8911..3b298b47783 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 565f19a8911278b64c1055e163917ba48899f334 +Subproject commit 3b298b47783c42b3c04f2e1dea5d757b3ce84eb0 diff --git a/qtwebengine b/qtwebengine index 9dcdb538839..fb2d7d346b3 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 9dcdb538839f95d74490ae0d65af679d73216fbb +Subproject commit fb2d7d346b31b9807eff77dfd73b7c018564a5f6 diff --git a/qtwebsockets b/qtwebsockets index ebeb0820593..4ecc602f3d0 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit ebeb08205934f9c47bcda402ef805fe43a359e58 +Subproject commit 4ecc602f3d0ddef95ac4674f5e90c0401c3ff526 diff --git a/qtwebview b/qtwebview index a78198bac10..9d6e3c1c676 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit a78198bac103191deee5a7b86849b3ade78d5eb2 +Subproject commit 9d6e3c1c67600e03cc4b8009c2a3d725e40d293c From 52a03b30464a33a27b9e62f3c1e93affa10252e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Tue, 8 Apr 2025 22:42:24 +0200 Subject: [PATCH 100/204] Bump build host for macOS to macOS 15 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Which gets us Xcode 16, with the macOS 15 SDK. Change-Id: I755c27f64f903b281f5d1c7947fbf370ddc3ee17 Reviewed-by: Tero Heikkinen (cherry picked from commit e19ea33f09ca95364955e6c240d5b6b921e7e73c) Reviewed-by: Jani Heikkinen Reviewed-by: Tor Arne Vestbø Reviewed-by: Volker Hilsheimer --- coin/platform_configs/macos.yaml | 2 +- coin/provisioning/qtci-macos-15-arm/25-python.sh | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/coin/platform_configs/macos.yaml b/coin/platform_configs/macos.yaml index b8723edd573..12d03ad4076 100644 --- a/coin/platform_configs/macos.yaml +++ b/coin/platform_configs/macos.yaml @@ -9,7 +9,7 @@ Configurations: - Id: 'macos-universal-on-x86_64' - Template: 'qtci-macos-14-x86_64-105' + Template: 'qtci-macos-15-x86_64-103' Compiler: 'Clang' Target arch: 'x86_64-arm64' Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] diff --git a/coin/provisioning/qtci-macos-15-arm/25-python.sh b/coin/provisioning/qtci-macos-15-arm/25-python.sh index 36bbc0e14ab..37c61881cc8 100755 --- a/coin/provisioning/qtci-macos-15-arm/25-python.sh +++ b/coin/provisioning/qtci-macos-15-arm/25-python.sh @@ -18,4 +18,9 @@ SetEnvVar "PIP3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/" # Use 3.9 as a default python SetEnvVar "PATH" "\$PYTHON3_PATH:\$PATH" +# Provisioning during installation says: +# 'The script sbom2doc is installed in '$HOME/.local/bin' which is not on PATH.' +# hence the explicit assignment to SBOM_PYTHON_APPS_PATH. +SetEnvVar "SBOM_PYTHON_APPS_PATH" "/Users/qt/.local/bin" + echo "python3 = 3.9.7" >> ~/versions.txt From 8f5f00b3d0cab6b00376be81f693cb93f30c1a32 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 30 Apr 2025 05:26:01 +0000 Subject: [PATCH 101/204] Update submodules on '6.9 in qt/qt5' Change-Id: I46b12bc080664ea406694820e93cdbbd31e969d2 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 650a4aba91d..4b7a383ef18 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 650a4aba91d71ebb380acaa5a414e325efbfbd3a +Subproject commit 4b7a383ef18123add6c277e064abc045eb7bbddb diff --git a/qt5compat b/qt5compat index 3e363cab7c9..32d339d51a0 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 3e363cab7c969d934bddb374fd400bf0031c4b1f +Subproject commit 32d339d51a0518b877a5179c15d4434c4768a730 diff --git a/qtactiveqt b/qtactiveqt index 8efdda95043..f8fa8abe793 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 8efdda9504340ead45c4175b37a53a8f347fc0c7 +Subproject commit f8fa8abe793241496747307474f1d07046511e3c diff --git a/qtbase b/qtbase index a223eca4aec..814587f3cc4 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit a223eca4aecde508d8c2d50dc859612eda8f3dc1 +Subproject commit 814587f3cc43cf0e2340c3efdbb217e1911193f4 diff --git a/qtcharts b/qtcharts index ea96e22114d..2e3be1b3fb7 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit ea96e22114dfd036835ffa74241de9f37d1a3f7e +Subproject commit 2e3be1b3fb7be75aaa69205ad21cf042ff4bf5b5 diff --git a/qtcoap b/qtcoap index ed1c01c4de5..c68b91502a0 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit ed1c01c4de55e598a477b6040c767dc5318e4fab +Subproject commit c68b91502a07a1d51a9e620c1169563dc69c7b15 diff --git a/qtconnectivity b/qtconnectivity index 931571759e0..bba3b303498 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 931571759e0741642f1c389a3d389c89a738d90e +Subproject commit bba3b3034981e9fcb32cb7f6238e0f0e90e583aa diff --git a/qtdatavis3d b/qtdatavis3d index 4b1a9248dfa..a0cf0cf3ece 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 4b1a9248dfa6472c84dae1e0cbbc0aa8c0284249 +Subproject commit a0cf0cf3ece22f269f77fd1d2b43c167d1c55284 diff --git a/qtdeclarative b/qtdeclarative index b81b82bc5cc..6af9dd4eae7 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit b81b82bc5cc7f69b1fbeed5064a9aba0b63cbeaf +Subproject commit 6af9dd4eae7eae9d32f5bd1b9091f3e0b60fe0f9 diff --git a/qtdoc b/qtdoc index 20c3005b37d..f679f81ff18 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 20c3005b37d52d8b951d830f286af27d29e0d8ad +Subproject commit f679f81ff18574b07db27253a9a59b686ea1842d diff --git a/qtgraphs b/qtgraphs index 791ebcd8d14..08285286dc2 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit 791ebcd8d14002f950e57681cf952b94156f7837 +Subproject commit 08285286dc239d4aef1a614f04c8ced75a34042c diff --git a/qtgrpc b/qtgrpc index 2f636a9b04b..56b3dfef611 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit 2f636a9b04b95ff3a6fccb0ce9590f45f0359a26 +Subproject commit 56b3dfef611bc390fa1c7da622a7c7668cf5afad diff --git a/qthttpserver b/qthttpserver index 09c3f439414..fe2d80583e6 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit 09c3f43941444a7f1e195f40892f200083a9ae95 +Subproject commit fe2d80583e60b430f6f5e848277fd282e78664a3 diff --git a/qtimageformats b/qtimageformats index 6bc75dab552..b30ebbfc942 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 6bc75dab552ee006da976656ebd79c733dcb860f +Subproject commit b30ebbfc94241da6585c28728811eb746d589fcf diff --git a/qtlanguageserver b/qtlanguageserver index 0eeba5bc5bd..e7f5626f7b6 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit 0eeba5bc5bd0eed647a4a310244156e6f4b519e1 +Subproject commit e7f5626f7b6c1db2beed513409024882fe758941 diff --git a/qtlocation b/qtlocation index 4d87b384b11..1a5ff0420fb 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 4d87b384b1104cbe18520e782a1535895b5f7860 +Subproject commit 1a5ff0420fbbb338456f885f385ffb62024ccc29 diff --git a/qtlottie b/qtlottie index cb4883d38ab..c8336e10f5c 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit cb4883d38ab659d712ba0332ac08b71eeb794aed +Subproject commit c8336e10f5cfc9382535c4f8731e4b86e4c9d84c diff --git a/qtmqtt b/qtmqtt index 343cfe186c1..5afb0bf5000 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit 343cfe186c11602f0344363c87a4bd560edd901b +Subproject commit 5afb0bf5000825291733b12673c7d01d6b48065c diff --git a/qtmultimedia b/qtmultimedia index ae2029b731f..7264a34a1ee 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit ae2029b731fe45ed99fbb1df47fa4c589453684b +Subproject commit 7264a34a1ee376e88a2a9d442e95fb2786c1f161 diff --git a/qtnetworkauth b/qtnetworkauth index bd697a57112..9b9bde28982 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit bd697a57112e3d32b098f23def0453ede8e6be5e +Subproject commit 9b9bde28982b1935937c8736a1f4c7574c0dfaf3 diff --git a/qtopcua b/qtopcua index 7191fb4c85c..c634e1955e2 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit 7191fb4c85cbcd8f6f0e9c3c41f8a56cbbde9501 +Subproject commit c634e1955e2d50bc06a4ca139a969b8892283e60 diff --git a/qtpositioning b/qtpositioning index 50fe58c5c8f..b0dc033bb43 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit 50fe58c5c8f7cf39dfa1ad1fb3b1159665d43a40 +Subproject commit b0dc033bb435cd0d8544bf869085dcd5ef256ff4 diff --git a/qtquick3d b/qtquick3d index 48fc492f0d2..daa6eb1c48b 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 48fc492f0d253550faaf1f6f05504b6f266a0024 +Subproject commit daa6eb1c48b7aa332e59da50813545b71e1b2499 diff --git a/qtquick3dphysics b/qtquick3dphysics index bfe6a602e97..7977eb83d01 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit bfe6a602e97c52f1313d7dc557670bb92baf7311 +Subproject commit 7977eb83d016379f02d7e292acfa2e80fb27d7c3 diff --git a/qtquickeffectmaker b/qtquickeffectmaker index 5830c618465..44320d02eda 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit 5830c6184653fac4f442a6b8c4043dda13bf7e33 +Subproject commit 44320d02edacfa2c935babdd5f390e8685340755 diff --git a/qtquicktimeline b/qtquicktimeline index 6a907187463..1fe153a1715 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 6a907187463c28c5c16714d5bbf021dcc03cd8ca +Subproject commit 1fe153a17159cdb6a1c4870cbeb66970e6cad9f8 diff --git a/qtremoteobjects b/qtremoteobjects index 1b80896a652..9a91250a03a 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 1b80896a6523df82c45de5788492689abf8d886c +Subproject commit 9a91250a03abe9dd25291e0cbfe0c6388dfc2fcf diff --git a/qtscxml b/qtscxml index 75c430a5bc5..dc5ac463fa0 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 75c430a5bc598b8335a1f9b84a2a3df573591cea +Subproject commit dc5ac463fa0de369333257617221f08025678240 diff --git a/qtsensors b/qtsensors index dabc83724da..1dbe2d78e5c 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit dabc83724daa3e7fe82c3761f6fd3e771256a16b +Subproject commit 1dbe2d78e5cb1cbfbc7f1beacc31a9bef2efa966 diff --git a/qtserialbus b/qtserialbus index 0e9765bd644..b6f0cf1ea81 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 0e9765bd6446941cd508113c9484bd522493cf1d +Subproject commit b6f0cf1ea81edab5115e571f6ca13322268c2792 diff --git a/qtserialport b/qtserialport index 6f46d0df253..046894634d5 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 6f46d0df2532ff7af08bc756bd4085751e291d31 +Subproject commit 046894634d57f135c381f10228b403caa322c40b diff --git a/qtshadertools b/qtshadertools index 6e5a10ba4ea..a7a819de6cb 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 6e5a10ba4eacdb2c762eb74200ec08576fa9da73 +Subproject commit a7a819de6cbad5272ae68782c18e1b532757ded9 diff --git a/qtspeech b/qtspeech index cfd556b9cd9..eebf6765f65 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit cfd556b9cd94fb03120765916c8810d1995befa2 +Subproject commit eebf6765f65115dcbf328af7cfdc2b57b08efabc diff --git a/qtsvg b/qtsvg index 72c6eb3ceab..3e699e3ff3d 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 72c6eb3ceaba0c6e5d5d741f49f195dbffb750ee +Subproject commit 3e699e3ff3d90ee2819f667ba24923465f913667 diff --git a/qttools b/qttools index 86451665f63..ed1cab3b287 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 86451665f63c823bb39c92cdb823bbd3b1933356 +Subproject commit ed1cab3b28737f2aae66f1af951ff94fbb48460e diff --git a/qttranslations b/qttranslations index 42f67c1b999..7f94a3c1d6a 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 42f67c1b99909f95cd057b9973be54223afa87c5 +Subproject commit 7f94a3c1d6a9cc193b27890118ee31c26fca54f2 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index a94439a69b8..c3393b8407c 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit a94439a69b8517bde6337f60e313b20d85fe8d6a +Subproject commit c3393b8407c566600e115b0c2eecdd0d32361897 diff --git a/qtwayland b/qtwayland index 40c85b89bc2..fb54201a165 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 40c85b89bc22b834c16bdd9d5766bbf37134c1f4 +Subproject commit fb54201a1659a49fb8af519d2160e22ae4d0d655 diff --git a/qtwebchannel b/qtwebchannel index 3b298b47783..41654f57cfa 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 3b298b47783c42b3c04f2e1dea5d757b3ce84eb0 +Subproject commit 41654f57cfa4b52f220bf346a7ba032ad4e8d353 diff --git a/qtwebengine b/qtwebengine index fb2d7d346b3..279f5f6a45b 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit fb2d7d346b31b9807eff77dfd73b7c018564a5f6 +Subproject commit 279f5f6a45b19b5277fe5ab0840ab339ec948f09 diff --git a/qtwebsockets b/qtwebsockets index 4ecc602f3d0..b815e2353ac 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 4ecc602f3d0ddef95ac4674f5e90c0401c3ff526 +Subproject commit b815e2353acf3a9fd9ba3191350b0e1b8a534f2d diff --git a/qtwebview b/qtwebview index 9d6e3c1c676..0da7e5b220d 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 9d6e3c1c67600e03cc4b8009c2a3d725e40d293c +Subproject commit 0da7e5b220d4dfe35aee58314985571bef21f77b From 5457ea47e12c966e1cb543f64a349bcab40fa031 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 1 May 2025 16:32:35 +0000 Subject: [PATCH 102/204] Update submodules on '6.9 in qt/qt5' Change-Id: I99b12ca3839bbaa7f6f4ee922cd8e04092a08355 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 4b7a383ef18..6a47efd5c39 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 4b7a383ef18123add6c277e064abc045eb7bbddb +Subproject commit 6a47efd5c39727747699c38cc4e380914ec326b9 diff --git a/qt5compat b/qt5compat index 32d339d51a0..26687803e3b 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 32d339d51a0518b877a5179c15d4434c4768a730 +Subproject commit 26687803e3bd95577212a6fe27ae2a87b516c95c diff --git a/qtactiveqt b/qtactiveqt index f8fa8abe793..a1cf14fd05f 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit f8fa8abe793241496747307474f1d07046511e3c +Subproject commit a1cf14fd05f1fe6deedfc6e7aa07bf30d421e0b6 diff --git a/qtbase b/qtbase index 814587f3cc4..e7247e9acda 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 814587f3cc43cf0e2340c3efdbb217e1911193f4 +Subproject commit e7247e9acda04186f4647bc1d93cb1501737813c diff --git a/qtcharts b/qtcharts index 2e3be1b3fb7..bcb08d3a631 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 2e3be1b3fb7be75aaa69205ad21cf042ff4bf5b5 +Subproject commit bcb08d3a63139f4036da3b33008beef85bb9ae19 diff --git a/qtcoap b/qtcoap index c68b91502a0..34eff580866 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit c68b91502a07a1d51a9e620c1169563dc69c7b15 +Subproject commit 34eff580866f2f6dfce21cda37c12ff96a7265f4 diff --git a/qtconnectivity b/qtconnectivity index bba3b303498..d3b836e884c 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit bba3b3034981e9fcb32cb7f6238e0f0e90e583aa +Subproject commit d3b836e884c9191a3353d475bb09cd8ab0cb6561 diff --git a/qtdatavis3d b/qtdatavis3d index a0cf0cf3ece..ac5da0a1665 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit a0cf0cf3ece22f269f77fd1d2b43c167d1c55284 +Subproject commit ac5da0a166502809401795c5d1ed6968ad638ef9 diff --git a/qtdeclarative b/qtdeclarative index 6af9dd4eae7..bebefa893bb 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 6af9dd4eae7eae9d32f5bd1b9091f3e0b60fe0f9 +Subproject commit bebefa893bb1bd0dca0607e244dc363314d0cfc3 diff --git a/qtdoc b/qtdoc index f679f81ff18..f03a49c6baf 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit f679f81ff18574b07db27253a9a59b686ea1842d +Subproject commit f03a49c6bafcb125a00bef12d7e3f109bd79cce8 diff --git a/qtgraphs b/qtgraphs index 08285286dc2..003df419bf6 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit 08285286dc239d4aef1a614f04c8ced75a34042c +Subproject commit 003df419bf6dbcd6483f86568d973defc263a30a diff --git a/qtgrpc b/qtgrpc index 56b3dfef611..892468b3ee0 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit 56b3dfef611bc390fa1c7da622a7c7668cf5afad +Subproject commit 892468b3ee05745b98c153080385d73b0469de37 diff --git a/qthttpserver b/qthttpserver index fe2d80583e6..208b4e627ce 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit fe2d80583e60b430f6f5e848277fd282e78664a3 +Subproject commit 208b4e627cefcd625822bf15d6c9da05091339ca diff --git a/qtimageformats b/qtimageformats index b30ebbfc942..5bcbc2a50e1 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit b30ebbfc94241da6585c28728811eb746d589fcf +Subproject commit 5bcbc2a50e1b5fc47edd0c3c5434706034e398bb diff --git a/qtlanguageserver b/qtlanguageserver index e7f5626f7b6..a7c7c253c64 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit e7f5626f7b6c1db2beed513409024882fe758941 +Subproject commit a7c7c253c640eed40a3bd567ca6b2ad672b61804 diff --git a/qtlocation b/qtlocation index 1a5ff0420fb..32904776380 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 1a5ff0420fbbb338456f885f385ffb62024ccc29 +Subproject commit 32904776380b0708c5280a00786e037f6b57c82f diff --git a/qtlottie b/qtlottie index c8336e10f5c..5848d2a6471 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit c8336e10f5cfc9382535c4f8731e4b86e4c9d84c +Subproject commit 5848d2a6471d58ff378ff477863daf7d3d861087 diff --git a/qtmqtt b/qtmqtt index 5afb0bf5000..f5604256992 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit 5afb0bf5000825291733b12673c7d01d6b48065c +Subproject commit f56042569922a089185b7db501fcd0d149984dc4 diff --git a/qtmultimedia b/qtmultimedia index 7264a34a1ee..f296007fdb9 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 7264a34a1ee376e88a2a9d442e95fb2786c1f161 +Subproject commit f296007fdb911fb2fed0fb105d2e76b091ac1ac1 diff --git a/qtnetworkauth b/qtnetworkauth index 9b9bde28982..e19a8985db3 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 9b9bde28982b1935937c8736a1f4c7574c0dfaf3 +Subproject commit e19a8985db3381698d72c6ff985e289a68d3b7cc diff --git a/qtopcua b/qtopcua index c634e1955e2..8126af09bf3 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit c634e1955e2d50bc06a4ca139a969b8892283e60 +Subproject commit 8126af09bf30b7255daf8898c4e9469f617e1231 diff --git a/qtpositioning b/qtpositioning index b0dc033bb43..b45b307fd06 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit b0dc033bb435cd0d8544bf869085dcd5ef256ff4 +Subproject commit b45b307fd06a32cc68b9e2f2340e2556a8c284c8 diff --git a/qtquick3d b/qtquick3d index daa6eb1c48b..2869090188d 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit daa6eb1c48b7aa332e59da50813545b71e1b2499 +Subproject commit 2869090188df2a7180f940d30e37b0db66732470 diff --git a/qtquick3dphysics b/qtquick3dphysics index 7977eb83d01..8f3e0f9c612 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit 7977eb83d016379f02d7e292acfa2e80fb27d7c3 +Subproject commit 8f3e0f9c612cf9fd0ea05a1ebc6d638254138711 diff --git a/qtquickeffectmaker b/qtquickeffectmaker index 44320d02eda..08e801a7800 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit 44320d02edacfa2c935babdd5f390e8685340755 +Subproject commit 08e801a78006be1b9833cbb729b2de4a3b9b688a diff --git a/qtquicktimeline b/qtquicktimeline index 1fe153a1715..bebcaea62b4 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 1fe153a17159cdb6a1c4870cbeb66970e6cad9f8 +Subproject commit bebcaea62b4946744e918d897d659c4a7ba9204c diff --git a/qtremoteobjects b/qtremoteobjects index 9a91250a03a..2579a3ba6f3 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 9a91250a03abe9dd25291e0cbfe0c6388dfc2fcf +Subproject commit 2579a3ba6f360f381b60f8498fa662774e581d7c diff --git a/qtscxml b/qtscxml index dc5ac463fa0..7e2b2b787c9 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit dc5ac463fa0de369333257617221f08025678240 +Subproject commit 7e2b2b787c997a594fc00428efc223a19b83e504 diff --git a/qtsensors b/qtsensors index 1dbe2d78e5c..667ce972577 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 1dbe2d78e5cb1cbfbc7f1beacc31a9bef2efa966 +Subproject commit 667ce9725779e6b2f4d0791c5341e00ee29b891b diff --git a/qtserialbus b/qtserialbus index b6f0cf1ea81..d87b890c790 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit b6f0cf1ea81edab5115e571f6ca13322268c2792 +Subproject commit d87b890c7901056acdb07b9eb59a087b6d12b054 diff --git a/qtserialport b/qtserialport index 046894634d5..500cf260f78 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 046894634d57f135c381f10228b403caa322c40b +Subproject commit 500cf260f7801a08fbb48529a582343df0b9e35e diff --git a/qtshadertools b/qtshadertools index a7a819de6cb..55d65fc9339 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit a7a819de6cbad5272ae68782c18e1b532757ded9 +Subproject commit 55d65fc93399ed6d74ae60f840c5a9c7ebce3fb4 diff --git a/qtspeech b/qtspeech index eebf6765f65..714f9fec8d1 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit eebf6765f65115dcbf328af7cfdc2b57b08efabc +Subproject commit 714f9fec8d1d51e11e6048469f1aadeb87061815 diff --git a/qtsvg b/qtsvg index 3e699e3ff3d..1b2dee8bae3 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 3e699e3ff3d90ee2819f667ba24923465f913667 +Subproject commit 1b2dee8bae332fd97dec0a40c296ba16d4764817 diff --git a/qttools b/qttools index ed1cab3b287..b664daa0c45 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit ed1cab3b28737f2aae66f1af951ff94fbb48460e +Subproject commit b664daa0c4561f1e2eaaf91cfaa81f792afee4fb diff --git a/qttranslations b/qttranslations index 7f94a3c1d6a..f104c498b63 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 7f94a3c1d6a9cc193b27890118ee31c26fca54f2 +Subproject commit f104c498b6396c68b038b1fca7d16bb3f1a45d32 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index c3393b8407c..7d5f4b61b7e 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit c3393b8407c566600e115b0c2eecdd0d32361897 +Subproject commit 7d5f4b61b7eff77f5b32d673bc9f27bb460543a3 diff --git a/qtwayland b/qtwayland index fb54201a165..606ad8c7b52 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit fb54201a1659a49fb8af519d2160e22ae4d0d655 +Subproject commit 606ad8c7b5222ae13c283de746282c264fb5c921 diff --git a/qtwebchannel b/qtwebchannel index 41654f57cfa..e11d5bb76b3 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 41654f57cfa4b52f220bf346a7ba032ad4e8d353 +Subproject commit e11d5bb76b3247400ce7a931d47312c021f86750 diff --git a/qtwebengine b/qtwebengine index 279f5f6a45b..87750c71227 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 279f5f6a45b19b5277fe5ab0840ab339ec948f09 +Subproject commit 87750c712270ff2b536eb0b3d7490507ffd13b27 diff --git a/qtwebsockets b/qtwebsockets index b815e2353ac..c64c9940d0c 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit b815e2353acf3a9fd9ba3191350b0e1b8a534f2d +Subproject commit c64c9940d0c76d3468c45225d1e62af4d994b010 diff --git a/qtwebview b/qtwebview index 0da7e5b220d..230c4a96d3c 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 0da7e5b220d4dfe35aee58314985571bef21f77b +Subproject commit 230c4a96d3c4edb390d3a875f2a7c6ef83a1c842 From 43d9b6bee34fd3befb472ec39fbae6c51432cb5a Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 3 May 2025 01:08:29 +0000 Subject: [PATCH 103/204] Update submodules on '6.9 in qt/qt5' Change-Id: Ia6a0ee1633b7c44c334e0092e16247365346c269 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 6a47efd5c39..7bf2dbc8157 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 6a47efd5c39727747699c38cc4e380914ec326b9 +Subproject commit 7bf2dbc8157b339bc503a22f39d816f33ad109ee diff --git a/qt5compat b/qt5compat index 26687803e3b..519225f9e82 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 26687803e3bd95577212a6fe27ae2a87b516c95c +Subproject commit 519225f9e82320ffa6a2ac7897020fd1b609224d diff --git a/qtactiveqt b/qtactiveqt index a1cf14fd05f..3fdf33563d3 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit a1cf14fd05f1fe6deedfc6e7aa07bf30d421e0b6 +Subproject commit 3fdf33563d3a0b5c60129d1a50e41613350e9f1f diff --git a/qtbase b/qtbase index e7247e9acda..e4e88d9137d 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit e7247e9acda04186f4647bc1d93cb1501737813c +Subproject commit e4e88d9137d37dd7b8233db969c665754edc5d3f diff --git a/qtcharts b/qtcharts index bcb08d3a631..90ffaed54f7 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit bcb08d3a63139f4036da3b33008beef85bb9ae19 +Subproject commit 90ffaed54f702ffc62e8b8c5449574533b4f1422 diff --git a/qtcoap b/qtcoap index 34eff580866..3627f96880a 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit 34eff580866f2f6dfce21cda37c12ff96a7265f4 +Subproject commit 3627f96880a990763af0560aa4839ab9a0458483 diff --git a/qtconnectivity b/qtconnectivity index d3b836e884c..87a259d48a8 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit d3b836e884c9191a3353d475bb09cd8ab0cb6561 +Subproject commit 87a259d48a8cca0720a7607cb08fb20cf5f9809d diff --git a/qtdatavis3d b/qtdatavis3d index ac5da0a1665..b1dafb1c902 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit ac5da0a166502809401795c5d1ed6968ad638ef9 +Subproject commit b1dafb1c9020036ce4b40efe65a98d421a82d988 diff --git a/qtdeclarative b/qtdeclarative index bebefa893bb..83d901cd3e7 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit bebefa893bb1bd0dca0607e244dc363314d0cfc3 +Subproject commit 83d901cd3e72b8f9392f6e7282ce04553ccc5d5f diff --git a/qtdoc b/qtdoc index f03a49c6baf..88734ea1d8b 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit f03a49c6bafcb125a00bef12d7e3f109bd79cce8 +Subproject commit 88734ea1d8ba4e9a970c445085ae4099ba6db0bb diff --git a/qtgraphs b/qtgraphs index 003df419bf6..77a47a42ace 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit 003df419bf6dbcd6483f86568d973defc263a30a +Subproject commit 77a47a42acee77ba9048c5f463a5b93b18444118 diff --git a/qtgrpc b/qtgrpc index 892468b3ee0..9a695348aa1 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit 892468b3ee05745b98c153080385d73b0469de37 +Subproject commit 9a695348aa1576de534988f729871c1d8bfb7aeb diff --git a/qthttpserver b/qthttpserver index 208b4e627ce..7ddf67d6ff4 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit 208b4e627cefcd625822bf15d6c9da05091339ca +Subproject commit 7ddf67d6ff42e0d0a61c585ad5bd1a8912b7eacf diff --git a/qtimageformats b/qtimageformats index 5bcbc2a50e1..93333b25180 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 5bcbc2a50e1b5fc47edd0c3c5434706034e398bb +Subproject commit 93333b2518029e211c1c069d129d5289c85e6c9a diff --git a/qtlanguageserver b/qtlanguageserver index a7c7c253c64..591d27f3555 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit a7c7c253c640eed40a3bd567ca6b2ad672b61804 +Subproject commit 591d27f3555c543815bb8be0f85e4ba088981d1a diff --git a/qtlocation b/qtlocation index 32904776380..c2576cdc227 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 32904776380b0708c5280a00786e037f6b57c82f +Subproject commit c2576cdc2279051062d6303159b1ea27175ba2fa diff --git a/qtlottie b/qtlottie index 5848d2a6471..5cd642bbe6b 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 5848d2a6471d58ff378ff477863daf7d3d861087 +Subproject commit 5cd642bbe6bb57c60f483f4c1bafb787212b19e3 diff --git a/qtmqtt b/qtmqtt index f5604256992..0b92ad4f68e 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit f56042569922a089185b7db501fcd0d149984dc4 +Subproject commit 0b92ad4f68eabe8ffb829793272b88700fea9784 diff --git a/qtmultimedia b/qtmultimedia index f296007fdb9..50b676040ca 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit f296007fdb911fb2fed0fb105d2e76b091ac1ac1 +Subproject commit 50b676040ca12c7a8e420c3c7c9ec95403a8e980 diff --git a/qtnetworkauth b/qtnetworkauth index e19a8985db3..3016e3b5d91 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit e19a8985db3381698d72c6ff985e289a68d3b7cc +Subproject commit 3016e3b5d9128ef6b2d0ed7bf7ade784011c27f2 diff --git a/qtopcua b/qtopcua index 8126af09bf3..d4dfeccbc19 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit 8126af09bf30b7255daf8898c4e9469f617e1231 +Subproject commit d4dfeccbc19db66f655c9140eecc0e78719ae2cb diff --git a/qtpositioning b/qtpositioning index b45b307fd06..5579beba0b4 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit b45b307fd06a32cc68b9e2f2340e2556a8c284c8 +Subproject commit 5579beba0b416e675b177ba26fe8f4dc037c2f77 diff --git a/qtquick3d b/qtquick3d index 2869090188d..46abb1acd72 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 2869090188df2a7180f940d30e37b0db66732470 +Subproject commit 46abb1acd7290df0f49ab2619c579e8741efe7df diff --git a/qtquick3dphysics b/qtquick3dphysics index 8f3e0f9c612..da3166d6b53 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit 8f3e0f9c612cf9fd0ea05a1ebc6d638254138711 +Subproject commit da3166d6b533eb60a316c55f7b49a426ae92890e diff --git a/qtquickeffectmaker b/qtquickeffectmaker index 08e801a7800..86748f7585a 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit 08e801a78006be1b9833cbb729b2de4a3b9b688a +Subproject commit 86748f7585a37dc56ab66f7803bed0cf8acba886 diff --git a/qtquicktimeline b/qtquicktimeline index bebcaea62b4..14116ced154 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit bebcaea62b4946744e918d897d659c4a7ba9204c +Subproject commit 14116ced1540e8c29ede85b61699adedde75e129 diff --git a/qtremoteobjects b/qtremoteobjects index 2579a3ba6f3..aed5d076cf0 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 2579a3ba6f360f381b60f8498fa662774e581d7c +Subproject commit aed5d076cf089f318f122e17891af3fb574ee299 diff --git a/qtscxml b/qtscxml index 7e2b2b787c9..b202d8631ce 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 7e2b2b787c997a594fc00428efc223a19b83e504 +Subproject commit b202d8631ce1c0616df8a53765482f319df9f8d1 diff --git a/qtsensors b/qtsensors index 667ce972577..e1d43ffff63 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 667ce9725779e6b2f4d0791c5341e00ee29b891b +Subproject commit e1d43ffff63a487bac5c1ccab5d2395ac13d2750 diff --git a/qtserialbus b/qtserialbus index d87b890c790..e2747a1162f 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit d87b890c7901056acdb07b9eb59a087b6d12b054 +Subproject commit e2747a1162f552a04adf30d5fa0904151446c094 diff --git a/qtserialport b/qtserialport index 500cf260f78..6bd4563ab20 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 500cf260f7801a08fbb48529a582343df0b9e35e +Subproject commit 6bd4563ab20dc512fa5a9bda659f5414c36a7919 diff --git a/qtshadertools b/qtshadertools index 55d65fc9339..fa0384fcc10 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 55d65fc93399ed6d74ae60f840c5a9c7ebce3fb4 +Subproject commit fa0384fcc108ee6c318efb378a34b7cd0523f6be diff --git a/qtspeech b/qtspeech index 714f9fec8d1..99c35ceaf06 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 714f9fec8d1d51e11e6048469f1aadeb87061815 +Subproject commit 99c35ceaf06b4ce9471cdcfa401fec2447b4bbff diff --git a/qtsvg b/qtsvg index 1b2dee8bae3..17c1fe748a9 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 1b2dee8bae332fd97dec0a40c296ba16d4764817 +Subproject commit 17c1fe748a96711e7e7cbd06debfd2bb5c7d9d77 diff --git a/qttools b/qttools index b664daa0c45..56a5f9790e5 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit b664daa0c4561f1e2eaaf91cfaa81f792afee4fb +Subproject commit 56a5f9790e5de400acca1111fc9d85233bab8349 diff --git a/qttranslations b/qttranslations index f104c498b63..93cc4ef0dc1 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit f104c498b6396c68b038b1fca7d16bb3f1a45d32 +Subproject commit 93cc4ef0dc1a900f605f8fbb2a3a60cd86f6f03d diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 7d5f4b61b7e..c2c7b96e7f4 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 7d5f4b61b7eff77f5b32d673bc9f27bb460543a3 +Subproject commit c2c7b96e7f4d2504ec8ea9ce1c3045394fa3621e diff --git a/qtwayland b/qtwayland index 606ad8c7b52..659c9d60df7 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 606ad8c7b5222ae13c283de746282c264fb5c921 +Subproject commit 659c9d60df7b11366291a789b145dbd9121ceed6 diff --git a/qtwebchannel b/qtwebchannel index e11d5bb76b3..9f95690249c 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit e11d5bb76b3247400ce7a931d47312c021f86750 +Subproject commit 9f95690249c853983d7eb65ce606b988e7d8e26a diff --git a/qtwebengine b/qtwebengine index 87750c71227..9b2b4d814ec 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 87750c712270ff2b536eb0b3d7490507ffd13b27 +Subproject commit 9b2b4d814ec7240184528725e7a8c4c523a0d8d2 diff --git a/qtwebsockets b/qtwebsockets index c64c9940d0c..6d027700a4c 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit c64c9940d0c76d3468c45225d1e62af4d994b010 +Subproject commit 6d027700a4cd341d55ce66c120389fe61f411a9a diff --git a/qtwebview b/qtwebview index 230c4a96d3c..65f8312a7d9 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 230c4a96d3c4edb390d3a875f2a7c6ef83a1c842 +Subproject commit 65f8312a7d97da1168eda17915a6799af4b63de1 From a6b86bf58cbc926b549c3057a5d1c60a7cf4e1d8 Mon Sep 17 00:00:00 2001 From: Paul Dubsky Date: Tue, 1 Apr 2025 14:32:30 +0200 Subject: [PATCH 104/204] Update FFmpeg version to n7.1.1 Task-number: QTBUG-134621 Pick-to: 6.8 6.5 Change-Id: I6255f615be533521bf1c3da85b29f96e855197e1 Reviewed-by: Bartlomiej Moskal Reviewed-by: Tim Blechmann (cherry picked from commit 24bba3c8b5455500eab473fff6c70e98076b5d5b) Reviewed-by: Volker Hilsheimer --- coin/provisioning/common/unix/ffmpeg-installation-utils.sh | 4 ++-- coin/provisioning/common/windows/install-ffmpeg.ps1 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/coin/provisioning/common/unix/ffmpeg-installation-utils.sh b/coin/provisioning/common/unix/ffmpeg-installation-utils.sh index 26d9484d840..9588ca17527 100755 --- a/coin/provisioning/common/unix/ffmpeg-installation-utils.sh +++ b/coin/provisioning/common/unix/ffmpeg-installation-utils.sh @@ -3,8 +3,8 @@ # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only download_ffmpeg() { - local version="${1:-n7.1}" - local sha1="${2:-f008a93710a7577e3f85a90f4b632cc615164712}" + local version="${1:-n7.1.1}" + local sha1="${2:-479291e8555fe036ca760f95cea829a21e9b8365}" local ffmpeg_name="FFmpeg-$version" local target_dir="$HOME" diff --git a/coin/provisioning/common/windows/install-ffmpeg.ps1 b/coin/provisioning/common/windows/install-ffmpeg.ps1 index 3fbfd72a7c7..ee8c2f2fc4c 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.1" +$version="n7.1.1" $url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz" -$sha1="f008a93710a7577e3f85a90f4b632cc615164712" +$sha1="479291e8555fe036ca760f95cea829a21e9b8365" $url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz" $ffmpeg_name="FFmpeg-$version" From 56c03772c7091fbf01215de80bd1fb4e551cb48e Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 8 May 2025 06:09:37 +0000 Subject: [PATCH 105/204] Update submodules on '6.9 in qt/qt5' Change-Id: Ic8e6c5ac066e34177424d9a05621dc499169c321 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 7bf2dbc8157..6bd2aa77216 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 7bf2dbc8157b339bc503a22f39d816f33ad109ee +Subproject commit 6bd2aa772161cdf7b469be462130ae79f1b3c6aa diff --git a/qt5compat b/qt5compat index 519225f9e82..26eb1ad4aab 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 519225f9e82320ffa6a2ac7897020fd1b609224d +Subproject commit 26eb1ad4aabf5d788e334b8b21931fdb74a811e6 diff --git a/qtactiveqt b/qtactiveqt index 3fdf33563d3..995166c9c15 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 3fdf33563d3a0b5c60129d1a50e41613350e9f1f +Subproject commit 995166c9c1579fade93c8edf3ac7ad82120730cf diff --git a/qtbase b/qtbase index e4e88d9137d..5adb9741940 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit e4e88d9137d37dd7b8233db969c665754edc5d3f +Subproject commit 5adb97419400af769f0639d8dce592f36a260af1 diff --git a/qtcharts b/qtcharts index 90ffaed54f7..7b956b42c73 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 90ffaed54f702ffc62e8b8c5449574533b4f1422 +Subproject commit 7b956b42c73d7615e7ed270498a2f7661521c6b3 diff --git a/qtcoap b/qtcoap index 3627f96880a..b045e597e78 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit 3627f96880a990763af0560aa4839ab9a0458483 +Subproject commit b045e597e78f49cd75b89c9443eeaec4469086f2 diff --git a/qtconnectivity b/qtconnectivity index 87a259d48a8..8a71f75ac49 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 87a259d48a8cca0720a7607cb08fb20cf5f9809d +Subproject commit 8a71f75ac498f1b9966969b93e65a49e63d3d7dc diff --git a/qtdatavis3d b/qtdatavis3d index b1dafb1c902..8a0254d9e67 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit b1dafb1c9020036ce4b40efe65a98d421a82d988 +Subproject commit 8a0254d9e673ff95ea9800e6744b4d1663fe3f00 diff --git a/qtdeclarative b/qtdeclarative index 83d901cd3e7..e7d89f1de6e 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 83d901cd3e72b8f9392f6e7282ce04553ccc5d5f +Subproject commit e7d89f1de6e6afd84210a044a52bc6d6a78964cf diff --git a/qtdoc b/qtdoc index 88734ea1d8b..9d858f8579d 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 88734ea1d8ba4e9a970c445085ae4099ba6db0bb +Subproject commit 9d858f8579d03f341d9983114a997f592f7e333a diff --git a/qtgraphs b/qtgraphs index 77a47a42ace..a60c6e0b303 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit 77a47a42acee77ba9048c5f463a5b93b18444118 +Subproject commit a60c6e0b30352217bf18fb9cad7435a3266820c2 diff --git a/qtgrpc b/qtgrpc index 9a695348aa1..b5a481a1559 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit 9a695348aa1576de534988f729871c1d8bfb7aeb +Subproject commit b5a481a1559dc0b1c09604ba7042255a6403ef08 diff --git a/qthttpserver b/qthttpserver index 7ddf67d6ff4..c95f4449e0a 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit 7ddf67d6ff42e0d0a61c585ad5bd1a8912b7eacf +Subproject commit c95f4449e0a8694a02a315b37dbb64f9ec7ad76e diff --git a/qtimageformats b/qtimageformats index 93333b25180..64f38b13bb4 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 93333b2518029e211c1c069d129d5289c85e6c9a +Subproject commit 64f38b13bb46c1ac6a72ca58b41cac405b8c0044 diff --git a/qtlanguageserver b/qtlanguageserver index 591d27f3555..edb366949fe 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit 591d27f3555c543815bb8be0f85e4ba088981d1a +Subproject commit edb366949fed50f3b59010ab8c60785240d9a3dd diff --git a/qtlocation b/qtlocation index c2576cdc227..54248bb050b 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit c2576cdc2279051062d6303159b1ea27175ba2fa +Subproject commit 54248bb050b472dddff4d3984e28d25afdeb9519 diff --git a/qtlottie b/qtlottie index 5cd642bbe6b..3071532b157 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 5cd642bbe6bb57c60f483f4c1bafb787212b19e3 +Subproject commit 3071532b15786bb2e7f9588c827d2c6b0c4a30b8 diff --git a/qtmqtt b/qtmqtt index 0b92ad4f68e..b7a226f8e0b 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit 0b92ad4f68eabe8ffb829793272b88700fea9784 +Subproject commit b7a226f8e0b063a2637d56d43207298b170c3e1b diff --git a/qtmultimedia b/qtmultimedia index 50b676040ca..9a700a46b9b 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 50b676040ca12c7a8e420c3c7c9ec95403a8e980 +Subproject commit 9a700a46b9b84a95f68452575c45d90c934d68c4 diff --git a/qtnetworkauth b/qtnetworkauth index 3016e3b5d91..9948f42e074 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 3016e3b5d9128ef6b2d0ed7bf7ade784011c27f2 +Subproject commit 9948f42e074523b7ccd88061ab73fbcc02513c77 diff --git a/qtopcua b/qtopcua index d4dfeccbc19..af2ca5e3fc2 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit d4dfeccbc19db66f655c9140eecc0e78719ae2cb +Subproject commit af2ca5e3fc294444ee5b49ac378a6e3526930d5a diff --git a/qtpositioning b/qtpositioning index 5579beba0b4..eba02c7cd93 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit 5579beba0b416e675b177ba26fe8f4dc037c2f77 +Subproject commit eba02c7cd9352887ea07d183e2c862313029047d diff --git a/qtquick3d b/qtquick3d index 46abb1acd72..3eb75404b43 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 46abb1acd7290df0f49ab2619c579e8741efe7df +Subproject commit 3eb75404b4310d771c9dab0eca44d9a7020ac3f5 diff --git a/qtquick3dphysics b/qtquick3dphysics index da3166d6b53..2e9d1cd69ae 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit da3166d6b533eb60a316c55f7b49a426ae92890e +Subproject commit 2e9d1cd69ae123f98bba8aa60711ee7110865060 diff --git a/qtquickeffectmaker b/qtquickeffectmaker index 86748f7585a..d214af4224a 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit 86748f7585a37dc56ab66f7803bed0cf8acba886 +Subproject commit d214af4224ade20c60ad5607de0f0a95c8293c29 diff --git a/qtquicktimeline b/qtquicktimeline index 14116ced154..67598083bad 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 14116ced1540e8c29ede85b61699adedde75e129 +Subproject commit 67598083bad26c1e846978d2d0fb32b597223c8f diff --git a/qtremoteobjects b/qtremoteobjects index aed5d076cf0..cb9902b99e4 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit aed5d076cf089f318f122e17891af3fb574ee299 +Subproject commit cb9902b99e411bad6c0c938f6826d39a32dc3829 diff --git a/qtscxml b/qtscxml index b202d8631ce..20b5352294d 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit b202d8631ce1c0616df8a53765482f319df9f8d1 +Subproject commit 20b5352294d75f84a8402275c38900eecf8e3a32 diff --git a/qtsensors b/qtsensors index e1d43ffff63..d219881d39e 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit e1d43ffff63a487bac5c1ccab5d2395ac13d2750 +Subproject commit d219881d39e5b14390022bc70602a8455f4c7f24 diff --git a/qtserialbus b/qtserialbus index e2747a1162f..8911bd5a0af 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit e2747a1162f552a04adf30d5fa0904151446c094 +Subproject commit 8911bd5a0af2c8cf5f19a1b68277f9d0411b51f0 diff --git a/qtserialport b/qtserialport index 6bd4563ab20..ddd1e0ed4de 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 6bd4563ab20dc512fa5a9bda659f5414c36a7919 +Subproject commit ddd1e0ed4de798febb4808cbde77520eac13daf0 diff --git a/qtshadertools b/qtshadertools index fa0384fcc10..23e89db8ba7 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit fa0384fcc108ee6c318efb378a34b7cd0523f6be +Subproject commit 23e89db8ba7c570c9383fc9055a5bdc3a2d1efa3 diff --git a/qtspeech b/qtspeech index 99c35ceaf06..48a7fb9704c 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 99c35ceaf06b4ce9471cdcfa401fec2447b4bbff +Subproject commit 48a7fb9704c3f7fe3444e0b9302e15f3833e1358 diff --git a/qtsvg b/qtsvg index 17c1fe748a9..3373cf860cd 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 17c1fe748a96711e7e7cbd06debfd2bb5c7d9d77 +Subproject commit 3373cf860cd0ed840423759124ca5c983cd038ab diff --git a/qttools b/qttools index 56a5f9790e5..1e374e862ba 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 56a5f9790e5de400acca1111fc9d85233bab8349 +Subproject commit 1e374e862ba4d870f67e34e9da284965c01ee989 diff --git a/qttranslations b/qttranslations index 93cc4ef0dc1..48f7966a340 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 93cc4ef0dc1a900f605f8fbb2a3a60cd86f6f03d +Subproject commit 48f7966a34080f6093a0eda1df4c6f0ef145bf26 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index c2c7b96e7f4..89c0986ef44 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit c2c7b96e7f4d2504ec8ea9ce1c3045394fa3621e +Subproject commit 89c0986ef447207f430db1bb77d3eb16ff2bbfe4 diff --git a/qtwayland b/qtwayland index 659c9d60df7..f974670d302 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 659c9d60df7b11366291a789b145dbd9121ceed6 +Subproject commit f974670d30204933f9126c8d5482f3f9fb1a59f6 diff --git a/qtwebchannel b/qtwebchannel index 9f95690249c..e9771262106 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 9f95690249c853983d7eb65ce606b988e7d8e26a +Subproject commit e9771262106f3596656ae12027f6c56fe893c784 diff --git a/qtwebengine b/qtwebengine index 9b2b4d814ec..e6eccdc5710 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 9b2b4d814ec7240184528725e7a8c4c523a0d8d2 +Subproject commit e6eccdc5710487076f4f6fa0efb9d6da7bd05e78 diff --git a/qtwebsockets b/qtwebsockets index 6d027700a4c..c53c4d09c16 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 6d027700a4cd341d55ce66c120389fe61f411a9a +Subproject commit c53c4d09c16b01f854ac2a2678b3d04d7970c448 diff --git a/qtwebview b/qtwebview index 65f8312a7d9..db1ba49433b 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 65f8312a7d97da1168eda17915a6799af4b63de1 +Subproject commit db1ba49433b9b01a67df04ab9b5320ea449a5979 From dcf0ce644b3141a243212c4bb5753eb961ff4e2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Tue, 29 Apr 2025 12:15:59 +0200 Subject: [PATCH 106/204] Update macOS developer build precheck config ID Change-Id: Ib7a35710f1f7eb870cefab1701fee8f6d4150253 Reviewed-by: Toni Saario (cherry picked from commit bfe2dc9d45aee75941122e89334dd261f7a743ef) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/precheck.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/precheck.yaml b/coin/platform_configs/precheck.yaml index 04010258194..c32948295bc 100644 --- a/coin/platform_configs/precheck.yaml +++ b/coin/platform_configs/precheck.yaml @@ -9,7 +9,7 @@ Include: [ "ios-universal" ], macos.yaml: [ - "macos-14-arm64-developer-build", + "macos-arm64-developer-build", "macos-14-arm64-developer-build-tests", ], cmake_platforms_target_android.yaml: [ From 0b585e72bd4175bd3cb7e4ef9b9c94e66b62b955 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Wed, 30 Apr 2025 15:41:54 +0200 Subject: [PATCH 107/204] CMake: Don't enable ASM language Enable ASM only for non-Android Unix. Pick-to: 6.8 6.5 Change-Id: I435ab55f7daf190ce7be5f8eb80b0c1e43b90d94 Reviewed-by: Alexandru Croitor (cherry picked from commit b330de576f1381eaf7c0d7d276f8eda809826382) Reviewed-by: Qt Cherry-pick Bot --- CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b163500cc21..0247f67e418 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,9 +16,13 @@ project(Qt VERSION "${QT_REPO_MODULE_VERSION}" DESCRIPTION "Qt Libraries" HOMEPAGE_URL "https://qt.io/" - LANGUAGES CXX C ASM + LANGUAGES CXX C ) +if(UNIX AND NOT ANDROID) + enable_language(ASM) +endif() + qt_internal_top_level_setup_after_project() list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") From 838a4db99e6ddc548daf0ae1739c9349cb75c554 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Tue, 8 Apr 2025 22:42:24 +0200 Subject: [PATCH 108/204] Bump developer build host for macOS to macOS 15 Which gets us Xcode 16, with the macOS 15 SDK. Change-Id: I3c7936885e97e479873c4d012adca0d67765c907 Reviewed-by: Alexandru Croitor Reviewed-by: Timur Pocheptsov (cherry picked from commit eb290c48d41ca99e7e13def0f8fb39b687fb707a) Reviewed-by: Ville-Pekka Karhu --- coin/platform_configs/macos.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/coin/platform_configs/macos.yaml b/coin/platform_configs/macos.yaml index 12d03ad4076..e3d2dfbd6c3 100644 --- a/coin/platform_configs/macos.yaml +++ b/coin/platform_configs/macos.yaml @@ -109,8 +109,8 @@ Configurations: # Build on recent macOS version with latest Xcode - - Id: 'macos-14-x86_64-developer-build' - Template: 'qtci-macos-14-x86_64-105' + Id: 'macos-x86_64-developer-build' + Template: 'qtci-macos-15-x86_64-103' Compiler: 'Clang' Features: ['Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure', 'StandaloneExamples'] Configure arguments: '-developer-build -release -force-asserts -force-debug-info -no-pch -no-framework -qtnamespace TestNamespace -make examples' @@ -119,8 +119,8 @@ Configurations: 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE', ] - - Id: 'macos-14-arm64-developer-build' - Template: 'qtci-macos-14-arm-106' + Id: 'macos-arm64-developer-build' + Template: 'qtci-macos-15-arm-104' Compiler: 'Clang' Features: ['DoNotRunTests', 'WarningsAreErrors', 'UseConfigure'] Configure arguments: '-developer-build -nomake examples -debug -framework' @@ -135,16 +135,16 @@ Configurations: Template: 'qtci-macos-13-arm-107' Compiler: 'Clang' Features: ['TestOnly'] - Platform dependency: 'macos-14-arm64-developer-build' + Platform dependency: 'macos-arm64-developer-build' - Id: 'macos-14-arm64-developer-build-tests' Template: 'qtci-macos-14-arm-106' Compiler: 'Clang' Features: ['TestOnly'] - Platform dependency: 'macos-14-arm64-developer-build' + Platform dependency: 'macos-arm64-developer-build' - Id: 'macos-15-arm64-developer-build-tests' Template: 'qtci-macos-15-arm-104' Compiler: 'Clang' Features: ['TestOnly', 'InsignificantTests'] - Platform dependency: 'macos-14-arm64-developer-build' + Platform dependency: 'macos-arm64-developer-build' From 02218009fc9986b79fbd6be4d2826bf338371c56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nils=20Petter=20Ska=CC=8Alerud?= Date: Thu, 27 Mar 2025 10:35:45 +0100 Subject: [PATCH 109/204] Coin, iOS, FFmpeg: Stop installing .dylibs in iOS FFmpeg provisioning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On iOS we no longer deploy FFmpeg .dylibs directly. As such, there is no need to install the .dylibs during provisoning. This patch removes this installation step during provisioning. Pick-to: 6.8 Change-Id: I6f901113caca4b8d602490ba05db0c9dacb8f80d Reviewed-by: Timur Pocheptsov (cherry picked from commit 9c7e564d7ef8787f7fe74a2bc8e9d84c00301ebc) Reviewed-by: Nils Petter Skålerud Reviewed-by: Simo Fält --- .../common/unix/install-ffmpeg-ios.sh | 36 ++++--------------- 1 file changed, 7 insertions(+), 29 deletions(-) diff --git a/coin/provisioning/common/unix/install-ffmpeg-ios.sh b/coin/provisioning/common/unix/install-ffmpeg-ios.sh index c35cf1d06d5..d9ee4c5e545 100755 --- a/coin/provisioning/common/unix/install-ffmpeg-ios.sh +++ b/coin/provisioning/common/unix/install-ffmpeg-ios.sh @@ -56,34 +56,6 @@ build_ffmpeg_ios() { popd } -install_ffmpeg() { - for dir in "$@"; do - echo "Processing files in $dir ..." - pushd "$dir" >/dev/null - find . -type l -name '*.*.dylib' | while read -r f; do - dst="${f:1}" - dstdir="$(dirname "$dst")" - sudo mkdir -p "$dstdir" - - if [[ ! -f "$dst" ]]; then - echo "/dev/null 2>&1; then - echo "Lipoing $dir/$f into $dst" - sudo lipo -create -output "$dst" "$dst" "$f" - elif ! diff "$f" "$dst"; then - echo "Error: File $f in $dir doesn't match destination $dst" - exit 1 - fi - done - echo "LS" - popd >/dev/null - done - sudo cp -r $1$prefix/include $prefix -} - build_info_plist() { local file_path="$1" local framework_name="$2" @@ -186,6 +158,12 @@ for name in $ffmpeg_libs; do create_xcframework $name "arm64-iphoneos" "x86_64-simulator" done -install_ffmpeg "$ffmpeg_source_dir/build_ios/x86_64-simulator/installed" "$ffmpeg_source_dir/build_ios/arm64-iphoneos/installed" +# xcframeworks are already installed directly into the target output directory. +# We need to install headers +sudo cp -r "$ffmpeg_source_dir/build_ios/arm64-iphoneos/installed/usr/local/ios/ffmpeg/include" $prefix +# The set_ffmpeg_dir_env_var requires the presence of the "lib" subfolder in order to validate +# our FFmpeg install. On iOS we don't use this subfolder, we only rely on the "framework" subfolder. +# So we create a dummy "lib" folder to pass the check. +sudo mkdir -p "${prefix}/lib" set_ffmpeg_dir_env_var "FFMPEG_DIR_IOS" $prefix From 2fe2930aee365047426d1e3cc7e2f0cc3c8e2936 Mon Sep 17 00:00:00 2001 From: Rami Potinkara Date: Mon, 28 Apr 2025 18:01:53 +0300 Subject: [PATCH 110/204] Coin: Add Android 16 to CI as insignificant This patch introduces Android 16 as insignificant to CI. Task-number: QTBUG-132638 Pick-to: 6.8 Change-Id: I29577503c50440d6b4821b1b7d6a5135935bf365 Reviewed-by: Assam Boudjelthia (cherry picked from commit 8f51576951f06c92e4cd14fb76018dfe2d984bbb) Reviewed-by: Qt Cherry-pick Bot --- .../cmake_platforms_target_android.yaml | 17 ++++++++++++++++- .../provisioning/common/linux/android_linux.sh | 18 ++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) diff --git a/coin/platform_configs/cmake_platforms_target_android.yaml b/coin/platform_configs/cmake_platforms_target_android.yaml index 369bd5339c1..bb522dbd6a6 100644 --- a/coin/platform_configs/cmake_platforms_target_android.yaml +++ b/coin/platform_configs/cmake_platforms_target_android.yaml @@ -63,4 +63,19 @@ Configurations: 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}', 'ANDROID_EMULATOR=emulator_x86_64_api_35' ] - +- + Id: 'android-16-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: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM', 'InsignificantTests'] + 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_36' + ] diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index 90156b1ebc1..4cad2b65037 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -172,6 +172,21 @@ echo "Unzipping the Android 15 to $maxVersionDestination" sudo unzip -o -q "$maxVersionFilePath" -d "$maxVersionDestination" rm "$maxVersionFilePath" +echo "Download and unzip Android 16 System Image for insignificant" +insignificantMaxVersionFileName="x86_64-36_r06.zip" +insignificantMaxVersionDestination="$sdkTargetFolder/system-images/android-36/google_apis/" +insignificantMaxVersionFilePath="$insignificantMaxVersionDestination/$insignificantMaxVersionFileName" +insignificantMaxVersionCiUrl="$basePath/system-images/google_apis/$insignificantMaxVersionFileName" +insignificantMaxVersionUrl="https://dl.google.com/android/repository/sys-img/google_apis/$insignificantMaxVersionFileName" +insignificantMaxVersionSha1="a9b0b4a0488e0c6c380f5485507950f011388511" + +mkdir -p "$insignificantMaxVersionDestination" +DownloadURL "$insignificantMaxVersionCiUrl" "$insignificantMaxVersionUrl" "$insignificantMaxVersionSha1" "$insignificantMaxVersionFilePath" + +echo "Unzipping the Android 16 insignicant to $insignificantMaxVersionDestination" +sudo unzip -o -q "$insignificantMaxVersionFilePath" -d "$insignificantMaxVersionDestination" +rm "$insignificantMaxVersionFilePath" + echo "Checking the contents of Android SDK again..." ls -l "$sdkTargetFolder" @@ -181,6 +196,9 @@ echo "no" | ./avdmanager create avd -n emulator_x86_api_28 -c 2048M -f \ echo "no" | ./avdmanager create avd -n emulator_x86_64_api_35 -c 2048M -f \ -k "system-images;android-35;google_apis;x86_64" +echo "no" | ./avdmanager create avd -n emulator_x86_64_api_36 -c 2048M -f \ + -k "system-images;android-36;google_apis;x86_64" + echo "Install maximum supported SDK level image for Android Automotive $sdkApiLevelAutomotiveMax" DownloadURL "$androidAutomotiveMaxUrl" "$androidAutomotiveMaxUrl" "$androidAutomotiveMaxSha" \ "/tmp/${sdkApiLevelAutomotiveMax}_automotive.tar.gz" From e08df192a211c3a3f2d118ce269a6b25cac5ca62 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 16 May 2025 04:54:42 +0000 Subject: [PATCH 111/204] Update submodules on '6.9 in qt/qt5' Change-Id: I1a4b72b27e82321d6f61ce6dd3b49675356e738e 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 6bd2aa77216..bf330268d13 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 6bd2aa772161cdf7b469be462130ae79f1b3c6aa +Subproject commit bf330268d13f54609b2171ec648617eac64be1d0 diff --git a/qt5compat b/qt5compat index 26eb1ad4aab..27dacd6562d 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 26eb1ad4aabf5d788e334b8b21931fdb74a811e6 +Subproject commit 27dacd6562d362411bbe652bd932cecacc301ce0 diff --git a/qtactiveqt b/qtactiveqt index 995166c9c15..9ddd1f64eaf 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 995166c9c1579fade93c8edf3ac7ad82120730cf +Subproject commit 9ddd1f64eaff327b54a4eb56d529746ab40083c4 diff --git a/qtbase b/qtbase index 5adb9741940..d711d9bc606 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 5adb97419400af769f0639d8dce592f36a260af1 +Subproject commit d711d9bc6067d9e8cecddbb4c71726a0b5c09d36 diff --git a/qtcharts b/qtcharts index 7b956b42c73..4c98527fe3b 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 7b956b42c73d7615e7ed270498a2f7661521c6b3 +Subproject commit 4c98527fe3bcae75b846d1fc65abb854a0c1d850 diff --git a/qtcoap b/qtcoap index b045e597e78..c43a4ac7b0c 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit b045e597e78f49cd75b89c9443eeaec4469086f2 +Subproject commit c43a4ac7b0c69d55c2bdaf28f0096abd049cfbb3 diff --git a/qtconnectivity b/qtconnectivity index 8a71f75ac49..e7133e72a5e 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 8a71f75ac498f1b9966969b93e65a49e63d3d7dc +Subproject commit e7133e72a5ed6141cda0732213458f2abf584807 diff --git a/qtdatavis3d b/qtdatavis3d index 8a0254d9e67..e68c5aa4fee 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 8a0254d9e673ff95ea9800e6744b4d1663fe3f00 +Subproject commit e68c5aa4fee35a3ef223f9c18245b96d8027488f diff --git a/qtdeclarative b/qtdeclarative index e7d89f1de6e..cac5d952279 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit e7d89f1de6e6afd84210a044a52bc6d6a78964cf +Subproject commit cac5d952279d6c5211e11f2a2a498ec7343b02fe diff --git a/qtdoc b/qtdoc index 9d858f8579d..f2e5018f69a 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 9d858f8579d03f341d9983114a997f592f7e333a +Subproject commit f2e5018f69a86b821e4c21ab5a4413f148308098 diff --git a/qtgraphs b/qtgraphs index a60c6e0b303..e94ed28762c 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit a60c6e0b30352217bf18fb9cad7435a3266820c2 +Subproject commit e94ed28762c19a3d52dce283a6e7398f67a0af51 diff --git a/qtgrpc b/qtgrpc index b5a481a1559..1a3151af707 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit b5a481a1559dc0b1c09604ba7042255a6403ef08 +Subproject commit 1a3151af70759a669fbdd795518e8e59dce83113 diff --git a/qthttpserver b/qthttpserver index c95f4449e0a..1cb557bf700 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit c95f4449e0a8694a02a315b37dbb64f9ec7ad76e +Subproject commit 1cb557bf70013b9c58b2aff9ad534436a277ac2f diff --git a/qtimageformats b/qtimageformats index 64f38b13bb4..631daf84a12 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 64f38b13bb46c1ac6a72ca58b41cac405b8c0044 +Subproject commit 631daf84a121a6855d7cdcd77d9eb3bd1948c071 diff --git a/qtlanguageserver b/qtlanguageserver index edb366949fe..2818ef5fda0 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit edb366949fed50f3b59010ab8c60785240d9a3dd +Subproject commit 2818ef5fda07bceccae0552ebbf97e7e2b79a93f diff --git a/qtlocation b/qtlocation index 54248bb050b..afd21d1f067 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 54248bb050b472dddff4d3984e28d25afdeb9519 +Subproject commit afd21d1f067cfa93c1eab9d761116523a29d99ca diff --git a/qtlottie b/qtlottie index 3071532b157..a25ef37b563 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 3071532b15786bb2e7f9588c827d2c6b0c4a30b8 +Subproject commit a25ef37b563df4b0a27aa3de889c54bbde7ed599 diff --git a/qtmqtt b/qtmqtt index b7a226f8e0b..d27c3695509 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit b7a226f8e0b063a2637d56d43207298b170c3e1b +Subproject commit d27c369550988e2732843f122b1efc1895ee1978 diff --git a/qtmultimedia b/qtmultimedia index 9a700a46b9b..f49f6ee45fd 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 9a700a46b9b84a95f68452575c45d90c934d68c4 +Subproject commit f49f6ee45fd141cd2b953e185877556644fa6bcb diff --git a/qtnetworkauth b/qtnetworkauth index 9948f42e074..be0866a45d1 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 9948f42e074523b7ccd88061ab73fbcc02513c77 +Subproject commit be0866a45d1f66c2d05fb145092c478975086c49 diff --git a/qtopcua b/qtopcua index af2ca5e3fc2..ecf97ba552f 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit af2ca5e3fc294444ee5b49ac378a6e3526930d5a +Subproject commit ecf97ba552f513846cd94e814a75249c50749549 diff --git a/qtpositioning b/qtpositioning index eba02c7cd93..4212a1580c2 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit eba02c7cd9352887ea07d183e2c862313029047d +Subproject commit 4212a1580c25781061873f3eff30872099e0c6d9 diff --git a/qtquick3d b/qtquick3d index 3eb75404b43..0c096cad06a 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 3eb75404b4310d771c9dab0eca44d9a7020ac3f5 +Subproject commit 0c096cad06adda286572cdd585777f77f895f026 diff --git a/qtquick3dphysics b/qtquick3dphysics index 2e9d1cd69ae..d0e6193d23a 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit 2e9d1cd69ae123f98bba8aa60711ee7110865060 +Subproject commit d0e6193d23a491d091586493f7fadc40b89a9760 diff --git a/qtquickeffectmaker b/qtquickeffectmaker index d214af4224a..622f15231df 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit d214af4224ade20c60ad5607de0f0a95c8293c29 +Subproject commit 622f15231df04facb6559f96304ea4e0065b1a25 diff --git a/qtquicktimeline b/qtquicktimeline index 67598083bad..c3351634f6e 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 67598083bad26c1e846978d2d0fb32b597223c8f +Subproject commit c3351634f6e296344899c930cb396994f32e692a diff --git a/qtremoteobjects b/qtremoteobjects index cb9902b99e4..42ed48c3ac1 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit cb9902b99e411bad6c0c938f6826d39a32dc3829 +Subproject commit 42ed48c3ac17525c9e3162360843d2166930d9c6 diff --git a/qtrepotools b/qtrepotools index 557cbde5d11..c4da0dbfd0c 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 557cbde5d1130fc9469cee46f21ea84c22237add +Subproject commit c4da0dbfd0c0eb5ce15b2f0cca52502f8fba5007 diff --git a/qtscxml b/qtscxml index 20b5352294d..bb50d5bf8dc 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 20b5352294d75f84a8402275c38900eecf8e3a32 +Subproject commit bb50d5bf8dcf57b0a1f04c3a0b069175db261ea1 diff --git a/qtsensors b/qtsensors index d219881d39e..47428fddfab 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit d219881d39e5b14390022bc70602a8455f4c7f24 +Subproject commit 47428fddfabf6863c8c49becdfe73a58909167ef diff --git a/qtserialbus b/qtserialbus index 8911bd5a0af..60221094d3a 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 8911bd5a0af2c8cf5f19a1b68277f9d0411b51f0 +Subproject commit 60221094d3a360b9dc9d8b6204f643db9622801c diff --git a/qtserialport b/qtserialport index ddd1e0ed4de..f4909adf904 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit ddd1e0ed4de798febb4808cbde77520eac13daf0 +Subproject commit f4909adf9045e25d33a107fb4880ca05d9ce8d3d diff --git a/qtshadertools b/qtshadertools index 23e89db8ba7..ed4e032aec7 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 23e89db8ba7c570c9383fc9055a5bdc3a2d1efa3 +Subproject commit ed4e032aec7a568164f213ffffc0e6036f58e1e2 diff --git a/qtspeech b/qtspeech index 48a7fb9704c..b34dc06540d 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 48a7fb9704c3f7fe3444e0b9302e15f3833e1358 +Subproject commit b34dc06540d1c4debf351995f57229978a13efd9 diff --git a/qtsvg b/qtsvg index 3373cf860cd..84c88f7785b 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 3373cf860cd0ed840423759124ca5c983cd038ab +Subproject commit 84c88f7785b564d3e01cb396047dcd5551d7288c diff --git a/qttools b/qttools index 1e374e862ba..df16f817657 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 1e374e862ba4d870f67e34e9da284965c01ee989 +Subproject commit df16f817657a2f1a3d46b3e5624ab45ace8ac79d diff --git a/qttranslations b/qttranslations index 48f7966a340..c02f51bc837 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 48f7966a34080f6093a0eda1df4c6f0ef145bf26 +Subproject commit c02f51bc837d68c20d9bb143f769479611bc3c98 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 89c0986ef44..1efc9012f1b 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 89c0986ef447207f430db1bb77d3eb16ff2bbfe4 +Subproject commit 1efc9012f1bf78d346460de19b848dfe82d69245 diff --git a/qtwayland b/qtwayland index f974670d302..02326cd01ba 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit f974670d30204933f9126c8d5482f3f9fb1a59f6 +Subproject commit 02326cd01bad578d8a46045635d29741790d9089 diff --git a/qtwebchannel b/qtwebchannel index e9771262106..afc23d959c6 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit e9771262106f3596656ae12027f6c56fe893c784 +Subproject commit afc23d959c6c8559fee8c3b0ea760649f9699bb5 diff --git a/qtwebengine b/qtwebengine index e6eccdc5710..f49c5cd1b10 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit e6eccdc5710487076f4f6fa0efb9d6da7bd05e78 +Subproject commit f49c5cd1b10d8118f52f3910e86a8090a70018cb diff --git a/qtwebsockets b/qtwebsockets index c53c4d09c16..4bbcba60ec7 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit c53c4d09c16b01f854ac2a2678b3d04d7970c448 +Subproject commit 4bbcba60ec7421e772d8d222b05c46ab990894f7 diff --git a/qtwebview b/qtwebview index db1ba49433b..84d41cabc49 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit db1ba49433b9b01a67df04ab9b5320ea449a5979 +Subproject commit 84d41cabc4975c814348eee4857b72487cba98c3 From 1acbcc6afd522687dafce2d78d1307ba0988a48c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Thu, 15 May 2025 11:48:51 +0000 Subject: [PATCH 112/204] Provisioning: Disable Windows Delivery Optimization service We don't want Windows VMs to spam mDNS messages about optimizing Windows updates, when the updates themselves are disabled. Pick-to: 6.8 Task-number: QTQAINFRA-6761 Change-Id: I1452ebbb612f784c96f07de0a29cb2cfb54f1e75 Reviewed-by: Tero Heikkinen (cherry picked from commit f77919a48b9b39b551111280dbaa099123f8fa57) Reviewed-by: Qt Cherry-pick Bot --- .../windows/disable-windows-delivery-optimization.ps1 | 8 ++++++++ .../01-disable-windows-delivery-optimization.ps1 | 1 + .../01-disable-windows-delivery-optimization.ps1 | 1 + .../01-disable-windows-delivery-optimization.ps1 | 1 + .../01-disable-windows-delivery-optimization.ps1 | 1 + .../01-disable-windows-delivery-optimization.ps1 | 1 + .../01-disable-windows-delivery-optimization.ps1 | 1 + .../01-disable-windows-delivery-optimization.ps1 | 1 + .../01-disable-windows-delivery-optimization.ps1 | 1 + .../01-disable-windows-delivery-optimization.ps1 | 1 + 10 files changed, 17 insertions(+) create mode 100644 coin/provisioning/common/windows/disable-windows-delivery-optimization.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86/01-disable-windows-delivery-optimization.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/01-disable-windows-delivery-optimization.ps1 create mode 100644 coin/provisioning/qtci-windows-10_21H2-x86_64/01-disable-windows-delivery-optimization.ps1 create mode 100644 coin/provisioning/qtci-windows-10_22H2-x86_64/01-disable-windows-delivery-optimization.ps1 create mode 100644 coin/provisioning/qtci-windows-11_21H2-x86_64/01-disable-windows-delivery-optimization.ps1 create mode 100644 coin/provisioning/qtci-windows-11_22H2-aarch64/01-disable-windows-delivery-optimization.ps1 create mode 100644 coin/provisioning/qtci-windows-11_22H2-x86_64/01-disable-windows-delivery-optimization.ps1 create mode 100644 coin/provisioning/qtci-windows-11_23H2-x86_64/01-disable-windows-delivery-optimization.ps1 create mode 100644 coin/provisioning/qtci-windows-11_24H2-x86_64/01-disable-windows-delivery-optimization.ps1 diff --git a/coin/provisioning/common/windows/disable-windows-delivery-optimization.ps1 b/coin/provisioning/common/windows/disable-windows-delivery-optimization.ps1 new file mode 100644 index 00000000000..9ea7b0f96f1 --- /dev/null +++ b/coin/provisioning/common/windows/disable-windows-delivery-optimization.ps1 @@ -0,0 +1,8 @@ +# 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 + +# This script disables the Delivery Optimization service + +. "$PSScriptRoot\helpers.ps1" + +Set-ItemProperty -Path "HKLM:\SYSTEM\CurrentControlSet\Services\DoSvc" -Name "Start" -Value 4 diff --git a/coin/provisioning/qtci-windows-10-x86/01-disable-windows-delivery-optimization.ps1 b/coin/provisioning/qtci-windows-10-x86/01-disable-windows-delivery-optimization.ps1 new file mode 100644 index 00000000000..908df46fde4 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/01-disable-windows-delivery-optimization.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-windows-delivery-optimization.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/01-disable-windows-delivery-optimization.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-disable-windows-delivery-optimization.ps1 new file mode 100644 index 00000000000..908df46fde4 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/01-disable-windows-delivery-optimization.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-windows-delivery-optimization.ps1" diff --git a/coin/provisioning/qtci-windows-10_21H2-x86_64/01-disable-windows-delivery-optimization.ps1 b/coin/provisioning/qtci-windows-10_21H2-x86_64/01-disable-windows-delivery-optimization.ps1 new file mode 100644 index 00000000000..908df46fde4 --- /dev/null +++ b/coin/provisioning/qtci-windows-10_21H2-x86_64/01-disable-windows-delivery-optimization.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-windows-delivery-optimization.ps1" diff --git a/coin/provisioning/qtci-windows-10_22H2-x86_64/01-disable-windows-delivery-optimization.ps1 b/coin/provisioning/qtci-windows-10_22H2-x86_64/01-disable-windows-delivery-optimization.ps1 new file mode 100644 index 00000000000..908df46fde4 --- /dev/null +++ b/coin/provisioning/qtci-windows-10_22H2-x86_64/01-disable-windows-delivery-optimization.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-windows-delivery-optimization.ps1" diff --git a/coin/provisioning/qtci-windows-11_21H2-x86_64/01-disable-windows-delivery-optimization.ps1 b/coin/provisioning/qtci-windows-11_21H2-x86_64/01-disable-windows-delivery-optimization.ps1 new file mode 100644 index 00000000000..908df46fde4 --- /dev/null +++ b/coin/provisioning/qtci-windows-11_21H2-x86_64/01-disable-windows-delivery-optimization.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-windows-delivery-optimization.ps1" diff --git a/coin/provisioning/qtci-windows-11_22H2-aarch64/01-disable-windows-delivery-optimization.ps1 b/coin/provisioning/qtci-windows-11_22H2-aarch64/01-disable-windows-delivery-optimization.ps1 new file mode 100644 index 00000000000..908df46fde4 --- /dev/null +++ b/coin/provisioning/qtci-windows-11_22H2-aarch64/01-disable-windows-delivery-optimization.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-windows-delivery-optimization.ps1" diff --git a/coin/provisioning/qtci-windows-11_22H2-x86_64/01-disable-windows-delivery-optimization.ps1 b/coin/provisioning/qtci-windows-11_22H2-x86_64/01-disable-windows-delivery-optimization.ps1 new file mode 100644 index 00000000000..908df46fde4 --- /dev/null +++ b/coin/provisioning/qtci-windows-11_22H2-x86_64/01-disable-windows-delivery-optimization.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-windows-delivery-optimization.ps1" diff --git a/coin/provisioning/qtci-windows-11_23H2-x86_64/01-disable-windows-delivery-optimization.ps1 b/coin/provisioning/qtci-windows-11_23H2-x86_64/01-disable-windows-delivery-optimization.ps1 new file mode 100644 index 00000000000..908df46fde4 --- /dev/null +++ b/coin/provisioning/qtci-windows-11_23H2-x86_64/01-disable-windows-delivery-optimization.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-windows-delivery-optimization.ps1" diff --git a/coin/provisioning/qtci-windows-11_24H2-x86_64/01-disable-windows-delivery-optimization.ps1 b/coin/provisioning/qtci-windows-11_24H2-x86_64/01-disable-windows-delivery-optimization.ps1 new file mode 100644 index 00000000000..908df46fde4 --- /dev/null +++ b/coin/provisioning/qtci-windows-11_24H2-x86_64/01-disable-windows-delivery-optimization.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-windows-delivery-optimization.ps1" From b3b9fa2017161497d2e9470336f3f50171f599e2 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 7 Mar 2025 09:33:44 +0100 Subject: [PATCH 113/204] platform_configs: remove InsignificantTests for u2404 x11 dev MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-7098 Pick-to: 6.8 Change-Id: I9229f35a3e42e6155e9a27b759aabc38901f128b Reviewed-by: Simo Fält Reviewed-by: Tero Heikkinen (cherry picked from commit 365860ce425a24a6452833fd7b8693b486062025) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/cmake_platforms.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 885fd245214..24787dfec7c 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -99,7 +99,7 @@ Configurations: Id: 'ubuntu-24.04-x64-developer-build-x11-tests' Template: 'qtci-linux-Ubuntu-24.04-x86_64-51' Compiler: 'GCC' - Features: ['Sccache', 'TestOnly', 'InsignificantTests'] + Features: ['Sccache', 'TestOnly'] Platform dependency: 'ubuntu-24.04-x64-developer-build' - Id: 'ubuntu-24.04-x64-x11-tests' From 70b251003dcd3bd16b98d5a1926c3229ff572140 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Fri, 16 May 2025 13:58:22 +0200 Subject: [PATCH 114/204] COIN: Provision golang and upx on Ubuntu24/ARM This is needed for building cmdbridge for remote Linux support in Qt Creator. This got lost for Linux/ARM prebuilt packages for Qt Creator when moving from Debian/ARM to Ubuntu24/ARM. Task-number: QTCREATORBUG-32928 Pick-to: 6.8 Change-Id: Ic993eaadacec21882e1e2f1b6e0d73bc4ffbf6d4 Reviewed-by: Marcus Tillmanns (cherry picked from commit ae3484739c41a85ea14278c64cf4146bc74fbd7f) Reviewed-by: Qt Cherry-pick Bot --- .../qtci-linux-Ubuntu-24.04-aarch64/41-install-golang.sh | 7 +++++++ .../qtci-linux-Ubuntu-24.04-aarch64/41-install-upx.sh | 7 +++++++ 2 files changed, 14 insertions(+) create mode 100755 coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/41-install-golang.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/41-install-upx.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/41-install-golang.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/41-install-golang.sh new file mode 100755 index 00000000000..6b72bc47515 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/41-install-golang.sh @@ -0,0 +1,7 @@ +#!/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 + +source "${BASH_SOURCE%/*}/../common/linux/install-golang.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/41-install-upx.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/41-install-upx.sh new file mode 100755 index 00000000000..0bccc01efac --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/41-install-upx.sh @@ -0,0 +1,7 @@ +#!/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 + +source "${BASH_SOURCE%/*}/../common/linux/install-upx.sh" From 752ae4bb90ef6aab97b92981274b4349066d4a84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marianne=20Yrj=C3=A4n=C3=A4?= Date: Tue, 6 May 2025 10:06:15 +0300 Subject: [PATCH 115/204] QNX: Add QXN8.0 to Ubuntu24.04 provisioning Pick-to: 6.9.1 6.8 Change-Id: I5a4011ce5f23517d4dd7c9f64738e7be97b4c73d Reviewed-by: Tero Heikkinen (cherry picked from commit e7075b5472ff1a4df34375f3125819721bd14fc0) Reviewed-by: Qt Cherry-pick Bot --- .../qtci-linux-Ubuntu-24.04-x86_64/70-qnx800.sh | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100755 coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/70-qnx800.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/70-qnx800.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/70-qnx800.sh new file mode 100755 index 00000000000..45d9e43e1d6 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/70-qnx800.sh @@ -0,0 +1,9 @@ +#!/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/linux/qnx_800.sh +source "${BASH_SOURCE%/*}/../common/linux/qnx_800.sh" + From 1f2f4d5c01d20cfb76bf08f08d9fbf7af664982a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nils=20Petter=20Ska=CC=8Alerud?= Date: Tue, 13 May 2025 14:01:54 +0200 Subject: [PATCH 116/204] Coin, FFmpeg, macOS: Apply 'prefix' consistently In the provisioning script 'install-ffmpeg-macos.sh', we have a variable 'prefix' controlling where to install the finalized library. The value of this prefix is sometimes hardcoded into some of the temporary build directories, making the script break if we actually modify the 'prefix' variable. This means we currently cannot easily change the output directory. This patch modifies 'install-ffmpeg-macos.sh' so that the 'prefix' is applied consistently throughout the script, allowing us to change the output directory in the future. Pick-to: 6.8 Change-Id: Id0b1bb23513b7bccf02f0c4073e4177f651792dd Reviewed-by: Artem Dyomin (cherry picked from commit 03d15483a1137ca783e8a18bf15cdbc8ebf986bd) Reviewed-by: Qt Cherry-pick Bot --- .../common/macos/install-ffmpeg-macos.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/coin/provisioning/common/macos/install-ffmpeg-macos.sh b/coin/provisioning/common/macos/install-ffmpeg-macos.sh index 4fc8f1c41bb..571c48cd08c 100755 --- a/coin/provisioning/common/macos/install-ffmpeg-macos.sh +++ b/coin/provisioning/common/macos/install-ffmpeg-macos.sh @@ -47,8 +47,9 @@ if [ "$os" == "macos" ]; then build_ffmpeg install_dir="$ffmpeg_source_dir/build/installed" - "$fix_relative_dependencies" "$install_dir/usr/local/$ffmpeg_name/lib" - sudo mv "$install_dir/usr/local/$ffmpeg_name" "/usr/local" + "$fix_relative_dependencies" "$install_dir$prefix/lib" + sudo mkdir -p "$prefix" + sudo mv "$install_dir$prefix" "$prefix/../" else build_ffmpeg "arm64" build_ffmpeg "x86_64" @@ -56,11 +57,11 @@ else arm64_install_dir="$ffmpeg_source_dir/build/arm64/installed" x86_64_install_dir="$ffmpeg_source_dir/build/x86_64/installed" - "$fix_relative_dependencies" "$arm64_install_dir/usr/local/$ffmpeg_name/lib" - "$fix_relative_dependencies" "$x86_64_install_dir/usr/local/$ffmpeg_name/lib" + "$fix_relative_dependencies" "$arm64_install_dir$prefix/lib" + "$fix_relative_dependencies" "$x86_64_install_dir$prefix/lib" - sudo rm -rf "/usr/local/$ffmpeg_name" # lipo fails upon 2nd run + sudo rm -rf "$prefix" # lipo fails upon 2nd run sudo "${BASH_SOURCE%/*}/../macos/makeuniversal.sh" "$arm64_install_dir" "$x86_64_install_dir" fi -set_ffmpeg_dir_env_var "FFMPEG_DIR" "/usr/local/$ffmpeg_name" +set_ffmpeg_dir_env_var "FFMPEG_DIR" "$prefix" From 9a8ab3d98a89022c4bda0ac9a0893682225590e0 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 22 May 2025 04:59:37 +0000 Subject: [PATCH 117/204] Update submodules on '6.9 in qt/qt5' Change-Id: I5e8dae612d7a447c8c10a000cc5ad0f8720082ba 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 bf330268d13..2c9b9ece6d9 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit bf330268d13f54609b2171ec648617eac64be1d0 +Subproject commit 2c9b9ece6d959ef9b6f2e0fe9e535aec524855a5 diff --git a/qt5compat b/qt5compat index 27dacd6562d..73b274fed9c 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 27dacd6562d362411bbe652bd932cecacc301ce0 +Subproject commit 73b274fed9cf4caed1e9da048957a8ac7a7fd4e3 diff --git a/qtactiveqt b/qtactiveqt index 9ddd1f64eaf..d562d083ea4 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 9ddd1f64eaff327b54a4eb56d529746ab40083c4 +Subproject commit d562d083ea42fc97f930116f18b0df7d3a425cf9 diff --git a/qtbase b/qtbase index d711d9bc606..9a45fea9d1f 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit d711d9bc6067d9e8cecddbb4c71726a0b5c09d36 +Subproject commit 9a45fea9d1f6e445fb488693b107cdec6e42cccd diff --git a/qtcharts b/qtcharts index 4c98527fe3b..3ecc6ff4294 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 4c98527fe3bcae75b846d1fc65abb854a0c1d850 +Subproject commit 3ecc6ff429421c15b1d6f3f2c306081ffe3322b3 diff --git a/qtcoap b/qtcoap index c43a4ac7b0c..71903558abf 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit c43a4ac7b0c69d55c2bdaf28f0096abd049cfbb3 +Subproject commit 71903558abf8e390332042fb8e72404c0ba3e5c0 diff --git a/qtconnectivity b/qtconnectivity index e7133e72a5e..82c52bf711f 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit e7133e72a5ed6141cda0732213458f2abf584807 +Subproject commit 82c52bf711fd2b77d40b2f57b7fd2ef88eb14d9e diff --git a/qtdatavis3d b/qtdatavis3d index e68c5aa4fee..f2f8ceda155 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit e68c5aa4fee35a3ef223f9c18245b96d8027488f +Subproject commit f2f8ceda1553687c6fe6952ac0482fb0556ed752 diff --git a/qtdeclarative b/qtdeclarative index cac5d952279..2572db088ba 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit cac5d952279d6c5211e11f2a2a498ec7343b02fe +Subproject commit 2572db088ba6301f6b0bd27bde09582d9557b859 diff --git a/qtdoc b/qtdoc index f2e5018f69a..1f34aadad75 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit f2e5018f69a86b821e4c21ab5a4413f148308098 +Subproject commit 1f34aadad75e6422eb0f7d4a3c293bb3ba752c22 diff --git a/qtgraphs b/qtgraphs index e94ed28762c..f15d98c1a98 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit e94ed28762c19a3d52dce283a6e7398f67a0af51 +Subproject commit f15d98c1a982521b1116615bc48b61592e61db8f diff --git a/qtgrpc b/qtgrpc index 1a3151af707..b6426ab1679 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit 1a3151af70759a669fbdd795518e8e59dce83113 +Subproject commit b6426ab1679c0c316cea879f9ef2f90e48ef4608 diff --git a/qthttpserver b/qthttpserver index 1cb557bf700..1c0a5bec5c0 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit 1cb557bf70013b9c58b2aff9ad534436a277ac2f +Subproject commit 1c0a5bec5c0286820a13e83203712a2314d0eadf diff --git a/qtimageformats b/qtimageformats index 631daf84a12..737811d939c 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 631daf84a121a6855d7cdcd77d9eb3bd1948c071 +Subproject commit 737811d939c2658349d2961357bbcb77ff734823 diff --git a/qtlanguageserver b/qtlanguageserver index 2818ef5fda0..2d2ba5649f6 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit 2818ef5fda07bceccae0552ebbf97e7e2b79a93f +Subproject commit 2d2ba5649f6885ada85db7e76572b52770b07ba5 diff --git a/qtlocation b/qtlocation index afd21d1f067..4bf65509b20 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit afd21d1f067cfa93c1eab9d761116523a29d99ca +Subproject commit 4bf65509b20fb63d154225e98373eb1b70186769 diff --git a/qtlottie b/qtlottie index a25ef37b563..51afe9ef446 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit a25ef37b563df4b0a27aa3de889c54bbde7ed599 +Subproject commit 51afe9ef44605aad997156f479a6d2022c70c95f diff --git a/qtmqtt b/qtmqtt index d27c3695509..45b68a2b3c1 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit d27c369550988e2732843f122b1efc1895ee1978 +Subproject commit 45b68a2b3c1c58e97695752d33fd654b56e7db73 diff --git a/qtmultimedia b/qtmultimedia index f49f6ee45fd..c988f46c9c6 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit f49f6ee45fd141cd2b953e185877556644fa6bcb +Subproject commit c988f46c9c6edc28e0b26384bf898365f04b668c diff --git a/qtnetworkauth b/qtnetworkauth index be0866a45d1..d632f84643f 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit be0866a45d1f66c2d05fb145092c478975086c49 +Subproject commit d632f84643fab7c963ba98d741f7ba9bfe55e006 diff --git a/qtopcua b/qtopcua index ecf97ba552f..d438ce2624c 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit ecf97ba552f513846cd94e814a75249c50749549 +Subproject commit d438ce2624cd84d5c2aba05ba3720f430c9705ef diff --git a/qtpositioning b/qtpositioning index 4212a1580c2..b8b7a1d0e4b 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit 4212a1580c25781061873f3eff30872099e0c6d9 +Subproject commit b8b7a1d0e4b50ce1299e3ca3718edf1c09aa3da2 diff --git a/qtquick3d b/qtquick3d index 0c096cad06a..7ff7b8d3d29 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 0c096cad06adda286572cdd585777f77f895f026 +Subproject commit 7ff7b8d3d29a3976586824c19269757a013c45e5 diff --git a/qtquick3dphysics b/qtquick3dphysics index d0e6193d23a..93152ed8e0c 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit d0e6193d23a491d091586493f7fadc40b89a9760 +Subproject commit 93152ed8e0cc1e20d3906d39849f208aaeac2e15 diff --git a/qtquickeffectmaker b/qtquickeffectmaker index 622f15231df..ab06c0ce942 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit 622f15231df04facb6559f96304ea4e0065b1a25 +Subproject commit ab06c0ce94297395b70d9dc9355749b6549ed767 diff --git a/qtquicktimeline b/qtquicktimeline index c3351634f6e..2e831eba36a 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit c3351634f6e296344899c930cb396994f32e692a +Subproject commit 2e831eba36a4bd62e2677a730787f1ef3c71d90a diff --git a/qtremoteobjects b/qtremoteobjects index 42ed48c3ac1..afc74d02797 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 42ed48c3ac17525c9e3162360843d2166930d9c6 +Subproject commit afc74d02797c8d68e324f04f39f0783ac3ee7900 diff --git a/qtscxml b/qtscxml index bb50d5bf8dc..f8207710da9 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit bb50d5bf8dcf57b0a1f04c3a0b069175db261ea1 +Subproject commit f8207710da9dbdf3eae4a598ec39f57cd26d2fe9 diff --git a/qtsensors b/qtsensors index 47428fddfab..78b947db8bd 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 47428fddfabf6863c8c49becdfe73a58909167ef +Subproject commit 78b947db8bdc9db885c01a7218b2660b443f5fb2 diff --git a/qtserialbus b/qtserialbus index 60221094d3a..16e3a590d27 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 60221094d3a360b9dc9d8b6204f643db9622801c +Subproject commit 16e3a590d2738c4db12d4d9ba957d08f52579b51 diff --git a/qtserialport b/qtserialport index f4909adf904..e3209dee944 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit f4909adf9045e25d33a107fb4880ca05d9ce8d3d +Subproject commit e3209dee944b6a52c9ab6cf70b485e2442be5664 diff --git a/qtshadertools b/qtshadertools index ed4e032aec7..942a88212a2 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit ed4e032aec7a568164f213ffffc0e6036f58e1e2 +Subproject commit 942a88212a209e5bae808ea7a67c7e05a17b172e diff --git a/qtspeech b/qtspeech index b34dc06540d..018a1d98740 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit b34dc06540d1c4debf351995f57229978a13efd9 +Subproject commit 018a1d98740be4d6beb2731cbac7a307f330bfe4 diff --git a/qtsvg b/qtsvg index 84c88f7785b..ac34f636cd9 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 84c88f7785b564d3e01cb396047dcd5551d7288c +Subproject commit ac34f636cd92c8da2c0f28c5b8d762f20f9b2746 diff --git a/qttools b/qttools index df16f817657..2069e86c367 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit df16f817657a2f1a3d46b3e5624ab45ace8ac79d +Subproject commit 2069e86c36779791ce2b63e0828429d7e9adf968 diff --git a/qttranslations b/qttranslations index c02f51bc837..53d2de4aa71 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit c02f51bc837d68c20d9bb143f769479611bc3c98 +Subproject commit 53d2de4aa718689660bdb626ac9c5e0b05a6afc1 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 1efc9012f1b..7dd58692a50 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 1efc9012f1bf78d346460de19b848dfe82d69245 +Subproject commit 7dd58692a508a1dda10cec320fe568b8627fa9cd diff --git a/qtwayland b/qtwayland index 02326cd01ba..58e10f00602 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 02326cd01bad578d8a46045635d29741790d9089 +Subproject commit 58e10f006024991ad60b184875a1cfd672bd1e87 diff --git a/qtwebchannel b/qtwebchannel index afc23d959c6..3f5c1142bc6 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit afc23d959c6c8559fee8c3b0ea760649f9699bb5 +Subproject commit 3f5c1142bc65b924f5f2a123b8bca4866fca976d diff --git a/qtwebengine b/qtwebengine index f49c5cd1b10..585b7f9ba3e 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit f49c5cd1b10d8118f52f3910e86a8090a70018cb +Subproject commit 585b7f9ba3e2abd640fc5569eb0146d8ca889eb9 diff --git a/qtwebsockets b/qtwebsockets index 4bbcba60ec7..5ea5387d08b 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 4bbcba60ec7421e772d8d222b05c46ab990894f7 +Subproject commit 5ea5387d08b8adebcaaeb7fca36682937c7fa1a7 diff --git a/qtwebview b/qtwebview index 84d41cabc49..ce9585594f3 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 84d41cabc4975c814348eee4857b72487cba98c3 +Subproject commit ce9585594f3824e5888cb7685eb11f5c6ab054a8 From 5633ed80130f3f7804b61121313fb646ba8927a0 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 28 May 2025 00:06:38 +0000 Subject: [PATCH 118/204] Update submodules on '6.9 in qt/qt5' Change-Id: I61053df5ab62e37494e48e6dbb4e9bd0b58ff6af 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 2c9b9ece6d9..bbdd1f83015 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 2c9b9ece6d959ef9b6f2e0fe9e535aec524855a5 +Subproject commit bbdd1f830152b1766476960e17a3770fd98354d3 diff --git a/qt5compat b/qt5compat index 73b274fed9c..2131207b88f 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 73b274fed9cf4caed1e9da048957a8ac7a7fd4e3 +Subproject commit 2131207b88fc71e3cec8a984af56fe09c8d119c7 diff --git a/qtactiveqt b/qtactiveqt index d562d083ea4..630f8f7c1e5 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit d562d083ea42fc97f930116f18b0df7d3a425cf9 +Subproject commit 630f8f7c1e5255aba5cf38f83499d0b57c3c61c0 diff --git a/qtbase b/qtbase index 9a45fea9d1f..36ddb4d4b29 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 9a45fea9d1f6e445fb488693b107cdec6e42cccd +Subproject commit 36ddb4d4b2960edf5fc767aa75df4331b88d9bd8 diff --git a/qtcharts b/qtcharts index 3ecc6ff4294..e13eee91eaf 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 3ecc6ff429421c15b1d6f3f2c306081ffe3322b3 +Subproject commit e13eee91eaf44c2c68d89572ce4c692dd4df6260 diff --git a/qtcoap b/qtcoap index 71903558abf..a8de6ae37e3 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit 71903558abf8e390332042fb8e72404c0ba3e5c0 +Subproject commit a8de6ae37e3a61c850fa96f3c81071440abc35b2 diff --git a/qtconnectivity b/qtconnectivity index 82c52bf711f..cbc03430356 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 82c52bf711fd2b77d40b2f57b7fd2ef88eb14d9e +Subproject commit cbc03430356c98384acf15725ef3de697f21b5e1 diff --git a/qtdatavis3d b/qtdatavis3d index f2f8ceda155..782321038eb 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit f2f8ceda1553687c6fe6952ac0482fb0556ed752 +Subproject commit 782321038eb90d9ef45f5ee502c32d659d7989d2 diff --git a/qtdeclarative b/qtdeclarative index 2572db088ba..e14f5c7c1e3 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 2572db088ba6301f6b0bd27bde09582d9557b859 +Subproject commit e14f5c7c1e34d3e3abefe2d214ae78fde6c32087 diff --git a/qtdoc b/qtdoc index 1f34aadad75..30d59d7d41d 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 1f34aadad75e6422eb0f7d4a3c293bb3ba752c22 +Subproject commit 30d59d7d41df31928a64ca012ba8ad49bd47bc51 diff --git a/qtgraphs b/qtgraphs index f15d98c1a98..9b0cf0eba19 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit f15d98c1a982521b1116615bc48b61592e61db8f +Subproject commit 9b0cf0eba19c0d669b19484cf58336a0eebebe83 diff --git a/qtgrpc b/qtgrpc index b6426ab1679..5977808891e 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit b6426ab1679c0c316cea879f9ef2f90e48ef4608 +Subproject commit 5977808891e4e76ea45f42ee4b31650b08ca0f43 diff --git a/qthttpserver b/qthttpserver index 1c0a5bec5c0..9dc53f3fd30 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit 1c0a5bec5c0286820a13e83203712a2314d0eadf +Subproject commit 9dc53f3fd309f007702fc6e5c7f9ec3cb33a9087 diff --git a/qtimageformats b/qtimageformats index 737811d939c..63a5736df27 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 737811d939c2658349d2961357bbcb77ff734823 +Subproject commit 63a5736df27968c6cf768459d357ffebbc133074 diff --git a/qtlanguageserver b/qtlanguageserver index 2d2ba5649f6..45ac12d9e63 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit 2d2ba5649f6885ada85db7e76572b52770b07ba5 +Subproject commit 45ac12d9e63332f76b96e2792dd1ef13b9c57ab4 diff --git a/qtlocation b/qtlocation index 4bf65509b20..68746ce4d10 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 4bf65509b20fb63d154225e98373eb1b70186769 +Subproject commit 68746ce4d105127c49956dcdece6c16092dd7601 diff --git a/qtlottie b/qtlottie index 51afe9ef446..6b89bb7e3a9 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 51afe9ef44605aad997156f479a6d2022c70c95f +Subproject commit 6b89bb7e3a9c38f7d39c8095b7e65edb8037acec diff --git a/qtmqtt b/qtmqtt index 45b68a2b3c1..7108ceb09df 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit 45b68a2b3c1c58e97695752d33fd654b56e7db73 +Subproject commit 7108ceb09dfc0dec513be2b31001ef09ccdbfd57 diff --git a/qtmultimedia b/qtmultimedia index c988f46c9c6..f1410b66457 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit c988f46c9c6edc28e0b26384bf898365f04b668c +Subproject commit f1410b664573ede6ffef16dd921558149f745552 diff --git a/qtnetworkauth b/qtnetworkauth index d632f84643f..d4c64803ab2 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit d632f84643fab7c963ba98d741f7ba9bfe55e006 +Subproject commit d4c64803ab229d0704d889651f05d7fff2c3fd1a diff --git a/qtopcua b/qtopcua index d438ce2624c..1562f8371a7 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit d438ce2624cd84d5c2aba05ba3720f430c9705ef +Subproject commit 1562f8371a7d42536a7e552a887362c3bc926e78 diff --git a/qtpositioning b/qtpositioning index b8b7a1d0e4b..a30e7452273 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit b8b7a1d0e4b50ce1299e3ca3718edf1c09aa3da2 +Subproject commit a30e7452273451cee7cd420de5e4c00dab336a0f diff --git a/qtquick3d b/qtquick3d index 7ff7b8d3d29..4af3c6b8785 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 7ff7b8d3d29a3976586824c19269757a013c45e5 +Subproject commit 4af3c6b87857433a5e5abbe3a66999352ff19362 diff --git a/qtquick3dphysics b/qtquick3dphysics index 93152ed8e0c..6eb989f4516 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit 93152ed8e0cc1e20d3906d39849f208aaeac2e15 +Subproject commit 6eb989f45169e758d69a0cb40ea3ae2a1d3183df diff --git a/qtquickeffectmaker b/qtquickeffectmaker index ab06c0ce942..c8c7e93bbe1 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit ab06c0ce94297395b70d9dc9355749b6549ed767 +Subproject commit c8c7e93bbe1f415cc45a00e04b82b28fce3c2588 diff --git a/qtquicktimeline b/qtquicktimeline index 2e831eba36a..eb6e80f2146 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 2e831eba36a4bd62e2677a730787f1ef3c71d90a +Subproject commit eb6e80f2146ed709d7c6196fac9cf4a735c71eff diff --git a/qtremoteobjects b/qtremoteobjects index afc74d02797..900add8f5c5 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit afc74d02797c8d68e324f04f39f0783ac3ee7900 +Subproject commit 900add8f5c5b0a6ebcfcf1c62e66b61187eb9dae diff --git a/qtscxml b/qtscxml index f8207710da9..8e0022862cf 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit f8207710da9dbdf3eae4a598ec39f57cd26d2fe9 +Subproject commit 8e0022862cf33f8fb9988fe2d65d3653bd7114b6 diff --git a/qtsensors b/qtsensors index 78b947db8bd..ae3fd39613a 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 78b947db8bdc9db885c01a7218b2660b443f5fb2 +Subproject commit ae3fd39613afb513fececf7119fc71a81b343e6a diff --git a/qtserialbus b/qtserialbus index 16e3a590d27..4f26bb8011b 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 16e3a590d2738c4db12d4d9ba957d08f52579b51 +Subproject commit 4f26bb8011bb41b38f806f2155c946b725045c67 diff --git a/qtserialport b/qtserialport index e3209dee944..f448ef514da 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit e3209dee944b6a52c9ab6cf70b485e2442be5664 +Subproject commit f448ef514dadeba4fc0a7da0e0f549f46f94a45b diff --git a/qtshadertools b/qtshadertools index 942a88212a2..7eaae6758bc 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 942a88212a209e5bae808ea7a67c7e05a17b172e +Subproject commit 7eaae6758bce3bc9f49119b7cb93b21b9e1cc04b diff --git a/qtspeech b/qtspeech index 018a1d98740..81bfcf57d93 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 018a1d98740be4d6beb2731cbac7a307f330bfe4 +Subproject commit 81bfcf57d932b84f18e245aec1ece70ed3ac67a0 diff --git a/qtsvg b/qtsvg index ac34f636cd9..1589b7e2485 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit ac34f636cd92c8da2c0f28c5b8d762f20f9b2746 +Subproject commit 1589b7e2485aa79d1bac2ea656eabb0f833f063d diff --git a/qttools b/qttools index 2069e86c367..f66e8a1c362 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 2069e86c36779791ce2b63e0828429d7e9adf968 +Subproject commit f66e8a1c362d5d2da7edb16a9e55a6468b75f682 diff --git a/qttranslations b/qttranslations index 53d2de4aa71..719d1527985 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 53d2de4aa718689660bdb626ac9c5e0b05a6afc1 +Subproject commit 719d15279854a926faeaa51c2cf915cf17ea5aed diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 7dd58692a50..9c02a480153 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 7dd58692a508a1dda10cec320fe568b8627fa9cd +Subproject commit 9c02a480153ad10840c2b370d53370fb2d8792a5 diff --git a/qtwayland b/qtwayland index 58e10f00602..314889644a1 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 58e10f006024991ad60b184875a1cfd672bd1e87 +Subproject commit 314889644a14243b0699faaf7433198a0e969e41 diff --git a/qtwebchannel b/qtwebchannel index 3f5c1142bc6..09fec2306cc 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 3f5c1142bc65b924f5f2a123b8bca4866fca976d +Subproject commit 09fec2306cc50ddfb24ab62b5e40cac35f40310c diff --git a/qtwebengine b/qtwebengine index 585b7f9ba3e..806b1717e6d 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 585b7f9ba3e2abd640fc5569eb0146d8ca889eb9 +Subproject commit 806b1717e6d75e81f118a96756c08d130ccfeead diff --git a/qtwebsockets b/qtwebsockets index 5ea5387d08b..bd4c595fb90 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 5ea5387d08b8adebcaaeb7fca36682937c7fa1a7 +Subproject commit bd4c595fb90dddd07803540a4f081fc28d6c833e diff --git a/qtwebview b/qtwebview index ce9585594f3..c1a0f6a5706 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit ce9585594f3824e5888cb7685eb11f5c6ab054a8 +Subproject commit c1a0f6a5706df8c6b15b5931d1d12a2682fc9d8a From 4ae497686b17ef033649394837ef934de47a2cb4 Mon Sep 17 00:00:00 2001 From: Elias Toivola Date: Wed, 21 May 2025 15:34:27 +0300 Subject: [PATCH 119/204] SLES 15 SP6: Install gcc11 instead of gcc10 gcc10 was removed from official and SUSE community repositories for SP6. The missing gcc10 is blocking provisioning so install gcc11 instead. SP5 still has gcc10 and it is active in dev branch. Task-number: QTQAINFRA-7187 Change-Id: Ie7c9f2175553c29654cf5b358ead6dd76e635d60 Reviewed-by: Tero Heikkinen (cherry picked from commit 10f0d1443c5aec1d5017ed3ea4dd5e9e37310c44) Reviewed-by: Jukka Jokiniva --- .../qtci-linux-SLES-15_SP6-x86_64/02-zypperpackages.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 2a6bfda6753..5614fbcb5fa 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 @@ -8,15 +8,15 @@ sudo zypper -nq install elfutils binutils sudo zypper addrepo --no-gpgcheck https://download.opensuse.org/repositories/devel:gcc/SLE-15/devel:gcc.repo sudo zypper refresh -sudo zypper -nq install --force-resolution gcc10 gcc10-c++ +sudo zypper -nq install --force-resolution gcc11 gcc11-c++ # Make sure needed ca-certificates are available sudo zypper -nq install ca-certificates -sudo /usr/sbin/update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 1 \ - --slave /usr/bin/g++ g++ /usr/bin/g++-10 \ - --slave /usr/bin/cc cc /usr/bin/gcc-10 \ - --slave /usr/bin/c++ c++ /usr/bin/g++-10 +sudo /usr/sbin/update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 1 \ + --slave /usr/bin/g++ g++ /usr/bin/g++-11 \ + --slave /usr/bin/cc cc /usr/bin/gcc-11 \ + --slave /usr/bin/c++ c++ /usr/bin/g++-11 sudo zypper -nq install git ninja make patch wget tar From ea1e38c1c4a01818e4a137e2be0c63a51934ed7d Mon Sep 17 00:00:00 2001 From: Axel Spoerl Date: Fri, 16 May 2025 08:30:28 +0200 Subject: [PATCH 120/204] Pre-provisioning SLES SP6: Select Gnome Classic session type The Gnome session type boots into the autostart user's Activty Overview. This overview doesn't allow window activation and fails tst_selftest. This can't be prevented with gnome-settings or gnome-tweaks. Add pre-provisioning instruction to select Gnome Classic session type, which boots into the normal desktop mode. Fixes: QTBUG-136467 Change-Id: Id189dd948a9a912179e0c86a6cf56f4a2417dfce Reviewed-by: Tero Heikkinen Reviewed-by: Jukka Jokiniva (cherry picked from commit b3c634b4a51c9c1f662227b9d3d8e93bb7f7c990) Reviewed-by: Axel Spoerl --- .../README_MANUAL_INSTALLATIONS | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/coin/pre-provisioning/qtci-linux-SLES-15_SP6-x86_64/README_MANUAL_INSTALLATIONS b/coin/pre-provisioning/qtci-linux-SLES-15_SP6-x86_64/README_MANUAL_INSTALLATIONS index 3a4dbd345d9..d4c82c0214c 100644 --- a/coin/pre-provisioning/qtci-linux-SLES-15_SP6-x86_64/README_MANUAL_INSTALLATIONS +++ b/coin/pre-provisioning/qtci-linux-SLES-15_SP6-x86_64/README_MANUAL_INSTALLATIONS @@ -78,3 +78,10 @@ chmod 755 ./coin-setup run ./coin-setup sudo reboot now + +# Select login session type +After reboot into user qt: +- log out +- select session type "Gnome Classic" in session selector on the login sreen (gear wheel on bottom right) +- reboot again with sudo reboot now +- verify that auto login lands in normal desktop From 35f01e6d9d58e2fe5e1ba902ee733c68e486dfb3 Mon Sep 17 00:00:00 2001 From: Tero Heikkinen Date: Fri, 16 May 2025 15:24:25 +0300 Subject: [PATCH 121/204] SLES 15 SP6: Change session type to GNOME Classic in Tier1 Change is done in Tier 1 image: qtci-linux-SLES-15_SP6-x86_64-52 Task-number: QTBUG-136467 Change-Id: I2924f3250dbe914b0c6bc687241725175d5f7aa5 Reviewed-by: Jukka Jokiniva (cherry picked from commit 45ffa611103f7966d8781ac26015244b2250a387) Reviewed-by: Axel Spoerl --- 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 24787dfec7c..278d2187264 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -130,7 +130,7 @@ Configurations: ] - Id: 'sles-15_sp6-static' - Template: 'qtci-linux-SLES-15_SP6-x86_64-51' + Template: 'qtci-linux-SLES-15_SP6-x86_64-52' 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 8053d8c995b..f16cc06aa1c 100644 --- a/coin/platform_configs/cmake_platforms_static_tests.yaml +++ b/coin/platform_configs/cmake_platforms_static_tests.yaml @@ -11,7 +11,7 @@ Configurations: ] - Id: 'sles-15_sp6-minimal-static' - Template: 'qtci-linux-SLES-15_SP6-x86_64-51' + Template: 'qtci-linux-SLES-15_SP6-x86_64-52' Compiler: 'GCC' 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' From a4e7d853ffa37ffc3e86f48a847dccfc5d864743 Mon Sep 17 00:00:00 2001 From: Tero Heikkinen Date: Fri, 6 Jun 2025 15:09:22 +0300 Subject: [PATCH 122/204] Make SLES 15 SP6 tests as blocking in CI [CI Platforms] Task-number: QTQAINFRA-6746 Change-Id: I697140edff662fc7846d7c6df411fa4f444906bc Reviewed-by: Jukka Jokiniva (cherry picked from commit fcd4b99100a2a582350a55d5d908547a9ff0fb18) Reviewed-by: Axel Spoerl --- coin/platform_configs/cmake_platforms_static_tests.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/cmake_platforms_static_tests.yaml b/coin/platform_configs/cmake_platforms_static_tests.yaml index f16cc06aa1c..d4892eebd57 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-52' Compiler: 'GCC' - Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure', 'InsignificantTests'] + 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}}' From b6a19985cf5aedf7fd1ee2dc6162ae76c2e0be7f Mon Sep 17 00:00:00 2001 From: Tero Heikkinen Date: Fri, 6 Jun 2025 15:16:58 +0300 Subject: [PATCH 123/204] Remove SLES 15 SP5 from CI [CI Platforms] Task-number: QTQAINFRA-6746 Change-Id: Ib7466af205c11b3576bbc86f64024e9a7d46126b Reviewed-by: Jukka Jokiniva (cherry picked from commit 9c97715ff323e2daa42daba99b3acad092033e3d) Reviewed-by: Axel Spoerl --- coin/platform_configs/cmake_platforms.yaml | 10 ---------- .../platform_configs/cmake_platforms_static_tests.yaml | 9 --------- coin/platform_configs/qtsaferenderer-runtime.yaml | 1 - coin/platform_configs/qtsaferenderer.yaml | 1 - 4 files changed, 21 deletions(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 278d2187264..3b990ce123a 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -118,16 +118,6 @@ Configurations: 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE' ] -- - Id: 'sles-15_sp5-static' - 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' - Environment variables: [ - 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}', - 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}' - ] - Id: 'sles-15_sp6-static' Template: 'qtci-linux-SLES-15_SP6-x86_64-52' diff --git a/coin/platform_configs/cmake_platforms_static_tests.yaml b/coin/platform_configs/cmake_platforms_static_tests.yaml index d4892eebd57..e1f9cfe2054 100644 --- a/coin/platform_configs/cmake_platforms_static_tests.yaml +++ b/coin/platform_configs/cmake_platforms_static_tests.yaml @@ -1,14 +1,5 @@ Version: 2 Configurations: -- - Id: 'sles-15_sp5-minimal-static' - Template: 'qtci-linux-SLES-15_SP5-x86_64-51' - Compiler: 'GCC' - 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}}' - ] - Id: 'sles-15_sp6-minimal-static' Template: 'qtci-linux-SLES-15_SP6-x86_64-52' diff --git a/coin/platform_configs/qtsaferenderer-runtime.yaml b/coin/platform_configs/qtsaferenderer-runtime.yaml index 3a3e93ff21f..0c2c952d43f 100644 --- a/coin/platform_configs/qtsaferenderer-runtime.yaml +++ b/coin/platform_configs/qtsaferenderer-runtime.yaml @@ -9,7 +9,6 @@ Include: [ "ubuntu-22.04", "ubuntu-22.04-developer-build", "opensuse-15.6-developer-build", - "sles-15_sp5-static", "sles-15_sp6-static", "windows-10_22h2-msvc2022", "rhel-8.10", diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index d0da81c1ab3..153e5aefc90 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -9,7 +9,6 @@ Include: [ "ubuntu-22.04", "ubuntu-22.04-developer-build", "opensuse-15.6-developer-build", - "sles-15_sp5-static", "sles-15_sp6-static", "windows-10_22h2-msvc2022", "rhel-8.10", From 767f9677b84e197f5f4642990617af410d347bbc Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Thu, 17 Apr 2025 22:26:38 +0200 Subject: [PATCH 124/204] iOS, FFmpeg: Add variable for controlling minimum iOS version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently this script relies on hard-coded values specify minimum iOS version to link against. This patch unifies the hard-coded values into a single variable. No functional changes. There was some trivial merge conflict resolution due to there being a tiny mismatch between how external sources are included. Pick-to: 6.8 Change-Id: I12bddeb53f0fe3388ea55c841a9864722a1d5f82 Reviewed-by: Timur Pocheptsov (cherry picked from commit d39ac6a4ec08bcf4b53acf53c603c715cfd595b8) Reviewed-by: Volker Hilsheimer Reviewed-by: Nils Petter Skålerud --- coin/provisioning/common/unix/install-ffmpeg-ios.sh | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/coin/provisioning/common/unix/install-ffmpeg-ios.sh b/coin/provisioning/common/unix/install-ffmpeg-ios.sh index d9ee4c5e545..2f6fbab44a0 100755 --- a/coin/provisioning/common/unix/install-ffmpeg-ios.sh +++ b/coin/provisioning/common/unix/install-ffmpeg-ios.sh @@ -5,6 +5,10 @@ # This script will build and install FFmpeg static libs set -ex +# Must match or be lower than the minimum iOS version supported by the version of Qt that is +# is currently being built. +readonly MINIMUM_IOS_VERSION="16.0" + source "${BASH_SOURCE%/*}/../unix/ffmpeg-installation-utils.sh" ffmpeg_source_dir=$(download_ffmpeg) @@ -18,15 +22,15 @@ build_ffmpeg_ios() { if [ "$target_platform" == "arm64-simulator" ]; then target_sdk="iphonesimulator" target_cpu_arch="arm64" - minos="-mios-simulator-version-min=16.0" + minos="-mios-simulator-version-min=$MINIMUM_IOS_VERSION" elif [ "$target_platform" == "x86_64-simulator" ]; then target_sdk="iphonesimulator" target_cpu_arch="x86_64" - minos="-mios-simulator-version-min=16.0" + minos="-mios-simulator-version-min=$MINIMUM_IOS_VERSION" elif [ "$target_platform" == "arm64-iphoneos" ]; then target_sdk="iphoneos" target_cpu_arch="arm64" - minos="-miphoneos-version-min=16.0" + minos="-miphoneos-version-min=$MINIMUM_IOS_VERSION" else echo "Error when building FFmpeg for iOS. Unknown parameter given for target_platform: '${target_platform}'" exit 1 @@ -62,7 +66,6 @@ build_info_plist() { local framework_id="$3" local minimum_version_key="MinimumOSVersion" - local minimum_os_version="16.0" local supported_platforms="iPhoneOS" # TODO: This should be filled out with the actual version of FFmpeg that we are @@ -90,7 +93,7 @@ build_info_plist() { CFBundleSignature ???? ${minimum_version_key} - ${minimum_os_version} + ${MINIMUM_IOS_VERSION} CFBundleSupportedPlatforms ${supported_platforms} From 99e4e8beb327b8afb50ccaa3511c5c895601e181 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 23 May 2025 09:43:29 +0200 Subject: [PATCH 125/204] Linux: install devel package for libxcb-util MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It's needed for static linking with static xcb libs. xcb-image depends on xcb_aux.h which is in xcb-util package. Debian-11.6, Ubuntu, openSUSE, SLES already have it. Pick-to: 6.8 Task-number: QTBUG-137004 Change-Id: Iffb9ab7d62a2bea3cb8e27354d25957c49911859 Reviewed-by: Tor Arne Vestbø (cherry picked from commit 3d9bbd5324f26f73064c2895836cc6dd214c99a4) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit ef73e7eaa646cb672818badae83e23c5a355ae79) --- .../qtci-linux-RHEL-8.10-x86_64/04-install-packages.sh | 1 + .../qtci-linux-RHEL-9.4-x86_64/04-install-packages.sh | 1 + 2 files changed, 2 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 62a37bd974c..c8c468f47a3 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 @@ -118,6 +118,7 @@ installPackages+=(libxkbcommon-devel) installPackages+=(libxkbcommon-x11-devel) # xcb-util-* libraries installPackages+=(xcb-util) +installPackages+=(xcb-util-devel) installPackages+=(xcb-util-image-devel) installPackages+=(xcb-util-keysyms-devel) installPackages+=(xcb-util-wm-devel) 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 15d5c3fe55d..f9cd20fd450 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 @@ -127,6 +127,7 @@ installPackages+=(libxkbcommon-devel) installPackages+=(libxkbcommon-x11-devel) # xcb-util-* libraries installPackages+=(xcb-util) +installPackages+=(xcb-util-devel) installPackages+=(xcb-util-image-devel) installPackages+=(xcb-util-keysyms-devel) installPackages+=(xcb-util-wm-devel) From 19ee55215ea3e7f2534e50a25d4396b483b95a7c Mon Sep 17 00:00:00 2001 From: Olli Vuolteenaho Date: Mon, 26 May 2025 15:01:46 +0300 Subject: [PATCH 126/204] QtAA: Drop developer-builds from CI We used to build the documentation with these configurations but they changed to developer-builds and the documentation was moved to a separate configurations (documentation-warnings, offline-documentation). We added those configurations but ignored the developer-builds, and at the moment they are not doing anything expect wasting resources when acquiring VMs, so let's get rid of them. Fixes: QAA-2976 Change-Id: Ia9509e43aec2974bae098de8a2d13ac9d29e2fad Reviewed-by: Petri Virkkunen (cherry picked from commit aae8dc578bfdfa89e676d8b12b5cef446144976c) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 9c6e9e26c42d3c98776694b77ca74f0bf23d5117) --- coin/platform_configs/tqtc-android-automotive.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/coin/platform_configs/tqtc-android-automotive.yaml b/coin/platform_configs/tqtc-android-automotive.yaml index ae0d1bf0cf8..7da90222dd9 100644 --- a/coin/platform_configs/tqtc-android-automotive.yaml +++ b/coin/platform_configs/tqtc-android-automotive.yaml @@ -4,8 +4,6 @@ Include: [ "documentation-warnings", "rhel-8.10", 'windows-10_22h2-mingw13', - 'ubuntu-22.04-developer-build', - 'ubuntu-22.04-developer-build-x11-tests' ], macos.yaml: [ 'macos-universal-on-x86_64' From adf4036e0733632584e23d4e5e49139cfa11f2cd Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 14 May 2025 17:19:58 +0200 Subject: [PATCH 127/204] platform_configs: remove two tests configs on Wayland MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Qt Wayland client was moved into qtbase. We will try to enable them from qtbase to all modules in the future in dev. For 6.9 and 6.8, they are InsignificantTests, waste some CI resources. Perhaps we can fix them later, but I don't think it's worthy. Pick-to: 6.8 Change-Id: I0f26312284bec4f02da915e829d3a68aac820ceb Reviewed-by: Tor Arne Vestbø (cherry picked from commit 57340da29101de6a3e9a6c9402a8978e74ed0d7c) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 28335a188b290e26e673bdc399fc9f299db6b35a) --- coin/platform_configs/qtwayland.yaml | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/coin/platform_configs/qtwayland.yaml b/coin/platform_configs/qtwayland.yaml index dff594bf182..7e8e4a89d83 100644 --- a/coin/platform_configs/qtwayland.yaml +++ b/coin/platform_configs/qtwayland.yaml @@ -3,18 +3,4 @@ Include: [ cmake_platforms.yaml, address_sanitizer_platforms.yaml ] -Configurations: -# Test on Ubuntu 24.04 ARM64 Wayland -- - Id: 'ubuntu-24.04-arm64-developer-build-wayland-tests' - Template: 'qtci-linux-Ubuntu-24.04-aarch64-50' - Compiler: 'GCC' - Features: ['TestOnly', 'RunDependencyTests', 'InsignificantTests'] - Platform dependency: 'ubuntu-24.04-arm64-developer-build' -# Test on Ubuntu 24.04 x64 Wayland -- - Id: 'ubuntu-24.04-x64-wayland-tests' - Template: 'qtci-linux-Ubuntu-24.04-x86_64-50' - Compiler: 'GCC' - Features: ['TestOnly', 'RunDependencyTests', 'InsignificantTests'] - Platform dependency: 'ubuntu-24.04-x64' +Configurations: [] From 68c38ad6338c9f269c51d17cc0dbaee2de30ee5a Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 21 May 2025 11:27:39 +0200 Subject: [PATCH 128/204] platform_configs: remove two u2204 tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We already have two tests on u2404. Replace the usage of ubuntu-22.04-developer-build-x11-tests with u2404 one. Pick-to: 6.8 Task-number: QTQAINFRA-7146 Change-Id: Ib3b1888e1bbb70637432ac70f6116b723e71320d Reviewed-by: Tor Arne Vestbø (cherry picked from commit e2e25e8a66211dea81b4f5b38dde04e8e0560580) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit e4cc5bd5c106d2a4f1618938498d989fff4a8d8d) --- coin/platform_configs/cmake_platforms.yaml | 13 ------------- coin/platform_configs/precheck.yaml | 2 +- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 3b990ce123a..7d71eaa184a 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -25,19 +25,6 @@ Configurations: 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DINPUT_headersclean=ON -DQT_DEPLOY_FFMPEG=TRUE' ] -# Test on Ubuntu 22.04 X11 -- - Id: 'ubuntu-22.04-developer-build-x11-tests' - Template: 'qtci-linux-Ubuntu-22.04-x86_64-51' - Compiler: 'GCC' - 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: ['Sccache', 'TestOnly'] - Platform dependency: 'ubuntu-22.04' # Build on Ubuntu 24.04 ARM64 Wayland and test on offscreen and Wayland later - Id: 'ubuntu-24.04-arm64-developer-build' diff --git a/coin/platform_configs/precheck.yaml b/coin/platform_configs/precheck.yaml index c32948295bc..ac88661d387 100644 --- a/coin/platform_configs/precheck.yaml +++ b/coin/platform_configs/precheck.yaml @@ -4,7 +4,7 @@ Include: [ cmake_platforms.yaml: [ "ubuntu-22.04", "ubuntu-22.04-developer-build", - "ubuntu-22.04-developer-build-x11-tests", + "ubuntu-24.04-x64-developer-build-x11-tests", "windows-11_23H2-msvc2022-developer-build", "ios-universal" ], From c072264ca1085c11f3964b4bdc4187f41b2fd927 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nils=20Petter=20Ska=CC=8Alerud?= Date: Thu, 5 Jun 2025 10:18:56 +0200 Subject: [PATCH 129/204] Coin, FFmpeg: Check for valid envvars in install-ffmpeg-android.sh This script requires that we have setup specific environment variables ahead of time. If they are missing, we are prone to receiving non-descriptive error messages. This patch adds checks for the required environment variables, and gives useful error messages if they are not set correctly. Pick-to: 6.8 Change-Id: I0cfb99187f303b22dbdd46a7a848b85dbf571aad Reviewed-by: Assam Boudjelthia (cherry picked from commit 058329272829c147afcd1ae01f4ee4dc8867d110) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 64ee2cb321b44652ceefd67a494f3105c9c980ad) --- .../common/unix/install-ffmpeg-android.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/coin/provisioning/common/unix/install-ffmpeg-android.sh b/coin/provisioning/common/unix/install-ffmpeg-android.sh index 8a855d31148..62ee173fa8c 100755 --- a/coin/provisioning/common/unix/install-ffmpeg-android.sh +++ b/coin/provisioning/common/unix/install-ffmpeg-android.sh @@ -13,6 +13,17 @@ target_install_dir_param="$2" build_type=$(get_ffmpeg_build_type) ffmpeg_source_dir=$(download_ffmpeg) +assert_envvar_is_populated_dir() { + local envvar="$1" + local value="${!envvar}" + if [ -z "$value" ] || [ ! -d "$value" ] || [ -z "$(find "$value" -mindepth 1 -type f | head -n 1)" ]; then + echo "Environment variable '$envvar' is unset, not a directory, or the directory is empty." + exit 1 + fi +} +assert_envvar_is_populated_dir "OPENSSL_ANDROID_HOME_DEFAULT" +assert_envvar_is_populated_dir "ANDROID_NDK_ROOT_DEFAULT" + build_ffmpeg_android() { local target_arch=$1 local target_dir=$2 From d17d04b363204a4cb31d91165e5d4bc4ae1b58f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nils=20Petter=20Ska=CC=8Alerud?= Date: Tue, 20 May 2025 11:03:53 +0200 Subject: [PATCH 130/204] Coin, FFmpeg: Fool-proof fix_ffmpeg_dependencies.sh This script has previously failed under some configurations, while also failing to stop provisioning. This patch enables fast-fail behavior, catches potential issues with missing executables early with a descriptive error message. This should allow us to detect if the required packages are missing in the future, and stop provisioning accordingly. This patch also installs the necessary packages on the relevant CI build targets. Task-number: QTBUG-136930 Pick-to: 6.8 Change-Id: I7c781264ad67508d19fd44556a9caf0f201638d4 Reviewed-by: Assam Boudjelthia (cherry picked from commit 0706273c76e64d982c5ec7a23d50b5ac4afacac3) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 532005d76070462adc0d2e81db26ed8533d549a3) --- .../common/shared/fix_ffmpeg_dependencies.sh | 21 +++++++++++++++++-- .../qtci-macos-14-arm/27-binutils.sh | 9 ++++++++ .../qtci-macos-14-arm/28-patchelf.sh | 7 +++++++ .../qtci-macos-14-x86_64/27-binutils.sh | 9 ++++++++ .../qtci-macos-15-x86_64/27-binutils.sh | 9 ++++++++ 5 files changed, 53 insertions(+), 2 deletions(-) create mode 100755 coin/provisioning/qtci-macos-14-arm/27-binutils.sh create mode 100755 coin/provisioning/qtci-macos-14-arm/28-patchelf.sh create mode 100755 coin/provisioning/qtci-macos-14-x86_64/27-binutils.sh create mode 100755 coin/provisioning/qtci-macos-15-x86_64/27-binutils.sh diff --git a/coin/provisioning/common/shared/fix_ffmpeg_dependencies.sh b/coin/provisioning/common/shared/fix_ffmpeg_dependencies.sh index bfc04a911d5..5e492d2efaf 100755 --- a/coin/provisioning/common/shared/fix_ffmpeg_dependencies.sh +++ b/coin/provisioning/common/shared/fix_ffmpeg_dependencies.sh @@ -2,16 +2,33 @@ # 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 -x +set -euox pipefail lib_dir="$1/lib" additional_suffix="${2:-}" set_rpath="${3:-yes}" +# readelf and patchelf are prerequisite tools for this script. Check +# that they are available. if [ "$(uname -s)" = "Darwin" ]; then # Under Homebrew, binutils package is not symlinked into PATH. # This lets us use readelf provided by Homebrew. - readelf() { "$(brew --prefix binutils)/bin/readelf" "$@"; } + readelf_homebrew_path="$(brew --prefix binutils)/bin/readelf" + if [[ ! -x "$readelf_homebrew_path" ]]; then + echo "Found no valid readelf executable. It is possible it was not correctly installed through Homebrew." + exit 1 + fi + readelf() { "$readelf_homebrew_path" "$@"; } +fi + +if ! command -v readelf; then + echo "Found no valid readelf command. It is possible it was not correctly installed." + exit 1 +fi + +if ! command -v patchelf; then + echo "Found no valid patchelf command. It is possible it was not correctly installed." + exit 1 fi ffmpeg_libs=("avcodec" "avdevice" "avfilter" "avformat" "avutil" "swresample" "swscale") diff --git a/coin/provisioning/qtci-macos-14-arm/27-binutils.sh b/coin/provisioning/qtci-macos-14-arm/27-binutils.sh new file mode 100755 index 00000000000..c4c74e7b214 --- /dev/null +++ b/coin/provisioning/qtci-macos-14-arm/27-binutils.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash +#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 + +set -ex + +# binutils is installed with an error: The formula built, but is not symlinked into /usr/local +# To avoid stopping the configuration due to this problem, "|| true" is added. +brew install binutils || true diff --git a/coin/provisioning/qtci-macos-14-arm/28-patchelf.sh b/coin/provisioning/qtci-macos-14-arm/28-patchelf.sh new file mode 100755 index 00000000000..414ed936a34 --- /dev/null +++ b/coin/provisioning/qtci-macos-14-arm/28-patchelf.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash +#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 + +set -ex + +brew install patchelf diff --git a/coin/provisioning/qtci-macos-14-x86_64/27-binutils.sh b/coin/provisioning/qtci-macos-14-x86_64/27-binutils.sh new file mode 100755 index 00000000000..c4c74e7b214 --- /dev/null +++ b/coin/provisioning/qtci-macos-14-x86_64/27-binutils.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash +#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 + +set -ex + +# binutils is installed with an error: The formula built, but is not symlinked into /usr/local +# To avoid stopping the configuration due to this problem, "|| true" is added. +brew install binutils || true diff --git a/coin/provisioning/qtci-macos-15-x86_64/27-binutils.sh b/coin/provisioning/qtci-macos-15-x86_64/27-binutils.sh new file mode 100755 index 00000000000..c4c74e7b214 --- /dev/null +++ b/coin/provisioning/qtci-macos-15-x86_64/27-binutils.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash +#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 + +set -ex + +# binutils is installed with an error: The formula built, but is not symlinked into /usr/local +# To avoid stopping the configuration due to this problem, "|| true" is added. +brew install binutils || true From 97e898f8f6341933867350a6dfcdf7cffb0dc77e Mon Sep 17 00:00:00 2001 From: Elias Toivola Date: Tue, 10 Jun 2025 13:13:05 +0300 Subject: [PATCH 131/204] Windows: Enable LSO back Large Send Offload (LSO) was originally disabled because it caused deterioration in network throughput but the cause of that deterioration is now fixed in infra and LSO should be enabled back as it improves network performance. LSO is enabled in Windows by default. Pick-to: 6.8 6.5 Task-number: QTQAINFRA-7236 Change-Id: I243632d958007142792df0cbd9a341fb2b86df69 Reviewed-by: Tero Heikkinen (cherry picked from commit 4aaba78cb43a652522965b67839a9f30139a0163) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 2fe0aec0da0ac5a9f513a58dcbb328186b89e6f4) --- coin/provisioning/common/windows/disable-netadapterlso.ps1 | 3 --- .../qtci-windows-10-x86/00-disable-netadapterlso.ps1 | 1 - .../qtci-windows-10-x86_64/00-disable-netadapterlso.ps1 | 1 - .../qtci-windows-10_21H2-x86_64/00-disable-netadapterlso.ps1 | 1 - .../qtci-windows-10_22H2-x86_64/00-disable-netadapterlso.ps1 | 1 - .../qtci-windows-11_21H2-x86_64/00-disable-netadapterlso.ps1 | 1 - .../qtci-windows-11_22H2-aarch64/00-disable-netadapterlso.ps1 | 1 - .../qtci-windows-11_22H2-x86_64/00-disable-netadapterlso.ps1 | 1 - .../qtci-windows-11_23H2-x86_64/00-disable-netadapterlso.ps1 | 1 - .../qtci-windows-8.1-x86/00-disable-netadapterlso.ps1 | 1 - .../qtci-windows-8.1-x86_64/00-disable-netadapterlso.ps1 | 1 - 11 files changed, 13 deletions(-) delete mode 100644 coin/provisioning/common/windows/disable-netadapterlso.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86/00-disable-netadapterlso.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86_64/00-disable-netadapterlso.ps1 delete mode 100644 coin/provisioning/qtci-windows-10_21H2-x86_64/00-disable-netadapterlso.ps1 delete mode 100644 coin/provisioning/qtci-windows-10_22H2-x86_64/00-disable-netadapterlso.ps1 delete mode 100644 coin/provisioning/qtci-windows-11_21H2-x86_64/00-disable-netadapterlso.ps1 delete mode 100644 coin/provisioning/qtci-windows-11_22H2-aarch64/00-disable-netadapterlso.ps1 delete mode 100644 coin/provisioning/qtci-windows-11_22H2-x86_64/00-disable-netadapterlso.ps1 delete mode 100644 coin/provisioning/qtci-windows-11_23H2-x86_64/00-disable-netadapterlso.ps1 delete mode 100644 coin/provisioning/qtci-windows-8.1-x86/00-disable-netadapterlso.ps1 delete mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/00-disable-netadapterlso.ps1 diff --git a/coin/provisioning/common/windows/disable-netadapterlso.ps1 b/coin/provisioning/common/windows/disable-netadapterlso.ps1 deleted file mode 100644 index 29c1bbbd086..00000000000 --- a/coin/provisioning/common/windows/disable-netadapterlso.ps1 +++ /dev/null @@ -1,3 +0,0 @@ -Get-NetAdapter | Disable-NetAdapterLso -Start-Sleep -s 15 # Give windows some time to adjust network settings -Get-NetAdapter diff --git a/coin/provisioning/qtci-windows-10-x86/00-disable-netadapterlso.ps1 b/coin/provisioning/qtci-windows-10-x86/00-disable-netadapterlso.ps1 deleted file mode 100644 index d20f1402601..00000000000 --- a/coin/provisioning/qtci-windows-10-x86/00-disable-netadapterlso.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-netadapterlso.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/00-disable-netadapterlso.ps1 b/coin/provisioning/qtci-windows-10-x86_64/00-disable-netadapterlso.ps1 deleted file mode 100644 index d20f1402601..00000000000 --- a/coin/provisioning/qtci-windows-10-x86_64/00-disable-netadapterlso.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-netadapterlso.ps1" diff --git a/coin/provisioning/qtci-windows-10_21H2-x86_64/00-disable-netadapterlso.ps1 b/coin/provisioning/qtci-windows-10_21H2-x86_64/00-disable-netadapterlso.ps1 deleted file mode 100644 index d20f1402601..00000000000 --- a/coin/provisioning/qtci-windows-10_21H2-x86_64/00-disable-netadapterlso.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-netadapterlso.ps1" diff --git a/coin/provisioning/qtci-windows-10_22H2-x86_64/00-disable-netadapterlso.ps1 b/coin/provisioning/qtci-windows-10_22H2-x86_64/00-disable-netadapterlso.ps1 deleted file mode 100644 index d20f1402601..00000000000 --- a/coin/provisioning/qtci-windows-10_22H2-x86_64/00-disable-netadapterlso.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-netadapterlso.ps1" diff --git a/coin/provisioning/qtci-windows-11_21H2-x86_64/00-disable-netadapterlso.ps1 b/coin/provisioning/qtci-windows-11_21H2-x86_64/00-disable-netadapterlso.ps1 deleted file mode 100644 index d20f1402601..00000000000 --- a/coin/provisioning/qtci-windows-11_21H2-x86_64/00-disable-netadapterlso.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-netadapterlso.ps1" diff --git a/coin/provisioning/qtci-windows-11_22H2-aarch64/00-disable-netadapterlso.ps1 b/coin/provisioning/qtci-windows-11_22H2-aarch64/00-disable-netadapterlso.ps1 deleted file mode 100644 index d20f1402601..00000000000 --- a/coin/provisioning/qtci-windows-11_22H2-aarch64/00-disable-netadapterlso.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-netadapterlso.ps1" diff --git a/coin/provisioning/qtci-windows-11_22H2-x86_64/00-disable-netadapterlso.ps1 b/coin/provisioning/qtci-windows-11_22H2-x86_64/00-disable-netadapterlso.ps1 deleted file mode 100644 index d20f1402601..00000000000 --- a/coin/provisioning/qtci-windows-11_22H2-x86_64/00-disable-netadapterlso.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-netadapterlso.ps1" diff --git a/coin/provisioning/qtci-windows-11_23H2-x86_64/00-disable-netadapterlso.ps1 b/coin/provisioning/qtci-windows-11_23H2-x86_64/00-disable-netadapterlso.ps1 deleted file mode 100644 index d20f1402601..00000000000 --- a/coin/provisioning/qtci-windows-11_23H2-x86_64/00-disable-netadapterlso.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-netadapterlso.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/00-disable-netadapterlso.ps1 b/coin/provisioning/qtci-windows-8.1-x86/00-disable-netadapterlso.ps1 deleted file mode 100644 index d20f1402601..00000000000 --- a/coin/provisioning/qtci-windows-8.1-x86/00-disable-netadapterlso.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-netadapterlso.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/00-disable-netadapterlso.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/00-disable-netadapterlso.ps1 deleted file mode 100644 index d20f1402601..00000000000 --- a/coin/provisioning/qtci-windows-8.1-x86_64/00-disable-netadapterlso.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\windows\disable-netadapterlso.ps1" From ecdc5116b2b487d5877e10660d9f34d63d46915a Mon Sep 17 00:00:00 2001 From: Elias Toivola Date: Fri, 16 May 2025 12:51:08 +0300 Subject: [PATCH 132/204] Provisioning: Disable Windows multicast device discoveries Our CI does not need some mDNS multicast services by Windows and they are spammed by Windows VMs in network with mdns.mcast.net requests. Pick-to: 6.8 6.5 Task-number: QTQAINFRA-6761 Change-Id: Ie676f94b81e7281ec84d9fbbfa2fd7f1d28dfbca Reviewed-by: Tero Heikkinen (cherry picked from commit 066371f7cd2618246c7e4fb34d96c77a943a2a53) Reviewed-by: Jukka Jokiniva (cherry picked from commit 00d2f82e35ad0827a19bcacce0c182d75361414e) Reviewed-by: Qt Cherry-pick Bot --- .../common/windows/disable-windows-mdns.ps1 | 27 +++++++++++++++++++ .../01-disable-windows-mdns.ps1 | 5 ++++ .../01-disable-windows-mdns.ps1 | 5 ++++ .../01-disable-windows-mdns.ps1 | 5 ++++ .../01-disable-windows-mdns.ps1 | 5 ++++ .../01-disable-windows-mdns.ps1 | 5 ++++ .../01-disable-windows-mdns.ps1 | 5 ++++ .../01-disable-windows-mdns.ps1 | 5 ++++ .../01-disable-windows-mdns.ps1 | 5 ++++ .../01-disable-windows-mdns.ps1 | 5 ++++ 10 files changed, 72 insertions(+) create mode 100644 coin/provisioning/common/windows/disable-windows-mdns.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86/01-disable-windows-mdns.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/01-disable-windows-mdns.ps1 create mode 100644 coin/provisioning/qtci-windows-10_21H2-x86_64/01-disable-windows-mdns.ps1 create mode 100644 coin/provisioning/qtci-windows-10_22H2-x86_64/01-disable-windows-mdns.ps1 create mode 100644 coin/provisioning/qtci-windows-11_21H2-x86_64/01-disable-windows-mdns.ps1 create mode 100644 coin/provisioning/qtci-windows-11_22H2-aarch64/01-disable-windows-mdns.ps1 create mode 100644 coin/provisioning/qtci-windows-11_22H2-x86_64/01-disable-windows-mdns.ps1 create mode 100644 coin/provisioning/qtci-windows-11_23H2-x86_64/01-disable-windows-mdns.ps1 create mode 100644 coin/provisioning/qtci-windows-11_24H2-x86_64/01-disable-windows-mdns.ps1 diff --git a/coin/provisioning/common/windows/disable-windows-mdns.ps1 b/coin/provisioning/common/windows/disable-windows-mdns.ps1 new file mode 100644 index 00000000000..db8c4330d40 --- /dev/null +++ b/coin/provisioning/common/windows/disable-windows-mdns.ps1 @@ -0,0 +1,27 @@ +# 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 + +# This script disables device discovery services related to Windows mDNS multicast + +. "$PSScriptRoot\helpers.ps1" + +# Miracast / Wireless Display +$regPath2 = "HKLM:\Software\Policies\Microsoft\Windows\Connect" +New-Item -Path $regPath2 -Force | Out-Null +Set-ItemProperty -Path $regPath2 -Name "DisableWirelessDisplay" -Type DWord -Value 1 + +# Function Discovery Resource Publication, printer/service publisher +Stop-Service -Name FDResPub +Set-Service -Name FDResPub -StartupType Disabled + +# Windows Media Player Network Sharing Service +Stop-Service -Name WMPNetworkSvc -Force +Set-Service -Name WMPNetworkSvc -StartupType Disabled + +# Function Discovery Provider Host +Stop-Service -Name fdPHost +Set-Service -Name fdPHost -StartupType Disabled + +# Windows Connect Now +Stop-Service -Name wcncsvc +Set-Service -Name wcncsvc -StartupType Disabled diff --git a/coin/provisioning/qtci-windows-10-x86/01-disable-windows-mdns.ps1 b/coin/provisioning/qtci-windows-10-x86/01-disable-windows-mdns.ps1 new file mode 100644 index 00000000000..bffb9f0548d --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/01-disable-windows-mdns.ps1 @@ -0,0 +1,5 @@ +# 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 + +# QTQAINFRA-6761 +. "$PSScriptRoot\..\common\windows\disable-windows-mdns.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/01-disable-windows-mdns.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-disable-windows-mdns.ps1 new file mode 100644 index 00000000000..bffb9f0548d --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/01-disable-windows-mdns.ps1 @@ -0,0 +1,5 @@ +# 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 + +# QTQAINFRA-6761 +. "$PSScriptRoot\..\common\windows\disable-windows-mdns.ps1" diff --git a/coin/provisioning/qtci-windows-10_21H2-x86_64/01-disable-windows-mdns.ps1 b/coin/provisioning/qtci-windows-10_21H2-x86_64/01-disable-windows-mdns.ps1 new file mode 100644 index 00000000000..bffb9f0548d --- /dev/null +++ b/coin/provisioning/qtci-windows-10_21H2-x86_64/01-disable-windows-mdns.ps1 @@ -0,0 +1,5 @@ +# 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 + +# QTQAINFRA-6761 +. "$PSScriptRoot\..\common\windows\disable-windows-mdns.ps1" diff --git a/coin/provisioning/qtci-windows-10_22H2-x86_64/01-disable-windows-mdns.ps1 b/coin/provisioning/qtci-windows-10_22H2-x86_64/01-disable-windows-mdns.ps1 new file mode 100644 index 00000000000..bffb9f0548d --- /dev/null +++ b/coin/provisioning/qtci-windows-10_22H2-x86_64/01-disable-windows-mdns.ps1 @@ -0,0 +1,5 @@ +# 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 + +# QTQAINFRA-6761 +. "$PSScriptRoot\..\common\windows\disable-windows-mdns.ps1" diff --git a/coin/provisioning/qtci-windows-11_21H2-x86_64/01-disable-windows-mdns.ps1 b/coin/provisioning/qtci-windows-11_21H2-x86_64/01-disable-windows-mdns.ps1 new file mode 100644 index 00000000000..bffb9f0548d --- /dev/null +++ b/coin/provisioning/qtci-windows-11_21H2-x86_64/01-disable-windows-mdns.ps1 @@ -0,0 +1,5 @@ +# 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 + +# QTQAINFRA-6761 +. "$PSScriptRoot\..\common\windows\disable-windows-mdns.ps1" diff --git a/coin/provisioning/qtci-windows-11_22H2-aarch64/01-disable-windows-mdns.ps1 b/coin/provisioning/qtci-windows-11_22H2-aarch64/01-disable-windows-mdns.ps1 new file mode 100644 index 00000000000..bffb9f0548d --- /dev/null +++ b/coin/provisioning/qtci-windows-11_22H2-aarch64/01-disable-windows-mdns.ps1 @@ -0,0 +1,5 @@ +# 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 + +# QTQAINFRA-6761 +. "$PSScriptRoot\..\common\windows\disable-windows-mdns.ps1" diff --git a/coin/provisioning/qtci-windows-11_22H2-x86_64/01-disable-windows-mdns.ps1 b/coin/provisioning/qtci-windows-11_22H2-x86_64/01-disable-windows-mdns.ps1 new file mode 100644 index 00000000000..bffb9f0548d --- /dev/null +++ b/coin/provisioning/qtci-windows-11_22H2-x86_64/01-disable-windows-mdns.ps1 @@ -0,0 +1,5 @@ +# 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 + +# QTQAINFRA-6761 +. "$PSScriptRoot\..\common\windows\disable-windows-mdns.ps1" diff --git a/coin/provisioning/qtci-windows-11_23H2-x86_64/01-disable-windows-mdns.ps1 b/coin/provisioning/qtci-windows-11_23H2-x86_64/01-disable-windows-mdns.ps1 new file mode 100644 index 00000000000..bffb9f0548d --- /dev/null +++ b/coin/provisioning/qtci-windows-11_23H2-x86_64/01-disable-windows-mdns.ps1 @@ -0,0 +1,5 @@ +# 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 + +# QTQAINFRA-6761 +. "$PSScriptRoot\..\common\windows\disable-windows-mdns.ps1" diff --git a/coin/provisioning/qtci-windows-11_24H2-x86_64/01-disable-windows-mdns.ps1 b/coin/provisioning/qtci-windows-11_24H2-x86_64/01-disable-windows-mdns.ps1 new file mode 100644 index 00000000000..bffb9f0548d --- /dev/null +++ b/coin/provisioning/qtci-windows-11_24H2-x86_64/01-disable-windows-mdns.ps1 @@ -0,0 +1,5 @@ +# 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 + +# QTQAINFRA-6761 +. "$PSScriptRoot\..\common\windows\disable-windows-mdns.ps1" From f6f11c7ec0c40dee25efca4849d26e5144c3c862 Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Mon, 17 Feb 2025 17:13:12 +0100 Subject: [PATCH 133/204] Switch winarm64 host qt to mingw Reduce ci integration time for qtqwebengine winarm64, where doing qthost msvc22 target takes ~5h compared to mingw ~15 min. Add mingw runtime to path for WoA cross compile node. Task-number: COIN-1211 Change-Id: Iecd6f924544d2a17a595ac85473f51b599f24202 Reviewed-by: Oliver Wolff Reviewed-by: Alexandru Croitor (cherry picked from commit c9423aea6c28346c6028df7d646e0414b69f5472) --- coin/platform_configs/cmake_platforms.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 7d71eaa184a..e9e658e126c 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -156,8 +156,9 @@ Configurations: Compiler: 'MSVC2022' Target arch: 'arm64' Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] - Platform dependency: 'windows-11_23H2-msvc2022' + Platform dependency: 'windows-10_22h2-mingw13' Environment variables: [ + 'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}', 'TARGET_CONFIGURE_ARGS=-debug-and-release -force-debug-info -platform win32-arm64-msvc -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer', 'TARGET_CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ROOT_DIR_x64_arm64}}', 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC_ARM64}} -DQT_DEPLOY_FFMPEG=TRUE', From a048dbfa4c636d745fb90afc2071ccb8befb29b1 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 28 Jun 2025 01:05:10 +0000 Subject: [PATCH 134/204] Update submodules on '6.9 in qt/qt5' Change-Id: I7b501229cdf017ad7f5b3c5d8f3874eb39cd5335 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 bbdd1f83015..170edd63ded 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit bbdd1f830152b1766476960e17a3770fd98354d3 +Subproject commit 170edd63dedcceb3fbed7d1d5ae1d0861d337bee diff --git a/qt5compat b/qt5compat index 2131207b88f..3aa25cd4233 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 2131207b88fc71e3cec8a984af56fe09c8d119c7 +Subproject commit 3aa25cd42339bfbabc02a6c790d3082867046371 diff --git a/qtactiveqt b/qtactiveqt index 630f8f7c1e5..e89629e9085 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 630f8f7c1e5255aba5cf38f83499d0b57c3c61c0 +Subproject commit e89629e908596556d5aec97d0e3188064521dc9c diff --git a/qtbase b/qtbase index 36ddb4d4b29..45b63d3208c 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 36ddb4d4b2960edf5fc767aa75df4331b88d9bd8 +Subproject commit 45b63d3208cae59f1d023cf2f133602a12270465 diff --git a/qtcharts b/qtcharts index e13eee91eaf..a5a3c489f5c 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit e13eee91eaf44c2c68d89572ce4c692dd4df6260 +Subproject commit a5a3c489f5c0630c98de02fc222d8456d426efab diff --git a/qtcoap b/qtcoap index a8de6ae37e3..01fc27e753b 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit a8de6ae37e3a61c850fa96f3c81071440abc35b2 +Subproject commit 01fc27e753b9cb2dc1efab37afe51341e4cafa5d diff --git a/qtconnectivity b/qtconnectivity index cbc03430356..f39054d9fcf 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit cbc03430356c98384acf15725ef3de697f21b5e1 +Subproject commit f39054d9fcf10404562a7b5edad241940dd2a9c2 diff --git a/qtdatavis3d b/qtdatavis3d index 782321038eb..352840a1c36 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 782321038eb90d9ef45f5ee502c32d659d7989d2 +Subproject commit 352840a1c36cd5863c107290e8488943bbd91a17 diff --git a/qtdeclarative b/qtdeclarative index e14f5c7c1e3..b4aa023c968 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit e14f5c7c1e34d3e3abefe2d214ae78fde6c32087 +Subproject commit b4aa023c9683f3868b27ff3d48016a29d2903026 diff --git a/qtdoc b/qtdoc index 30d59d7d41d..a426d517172 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 30d59d7d41df31928a64ca012ba8ad49bd47bc51 +Subproject commit a426d51717239e36d06d4152595f8acaf8fd0e6f diff --git a/qtgraphs b/qtgraphs index 9b0cf0eba19..af837833103 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit 9b0cf0eba19c0d669b19484cf58336a0eebebe83 +Subproject commit af837833103198258c05fdf97d18d648664ae42e diff --git a/qtgrpc b/qtgrpc index 5977808891e..ca06fdda0b3 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit 5977808891e4e76ea45f42ee4b31650b08ca0f43 +Subproject commit ca06fdda0b360534de5147cd8ec378dcbc5f4a72 diff --git a/qthttpserver b/qthttpserver index 9dc53f3fd30..9681e923501 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit 9dc53f3fd309f007702fc6e5c7f9ec3cb33a9087 +Subproject commit 9681e92350184709395c9673dcd3ea33f0d735c7 diff --git a/qtimageformats b/qtimageformats index 63a5736df27..c5e05eec885 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 63a5736df27968c6cf768459d357ffebbc133074 +Subproject commit c5e05eec88576b25779af9c5ca3123639f0041ea diff --git a/qtlanguageserver b/qtlanguageserver index 45ac12d9e63..dec27368f86 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit 45ac12d9e63332f76b96e2792dd1ef13b9c57ab4 +Subproject commit dec27368f86f8fccf80d754e883199a093fd3682 diff --git a/qtlocation b/qtlocation index 68746ce4d10..d49f53d405e 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 68746ce4d105127c49956dcdece6c16092dd7601 +Subproject commit d49f53d405ec5f21bddb25ac9cc21283a7512da8 diff --git a/qtlottie b/qtlottie index 6b89bb7e3a9..460fe064656 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 6b89bb7e3a9c38f7d39c8095b7e65edb8037acec +Subproject commit 460fe064656317c53a29bc2651c0d831ef80eb52 diff --git a/qtmqtt b/qtmqtt index 7108ceb09df..95cf90d973c 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit 7108ceb09dfc0dec513be2b31001ef09ccdbfd57 +Subproject commit 95cf90d973cd30d2c1484fb758381af069bcf52d diff --git a/qtmultimedia b/qtmultimedia index f1410b66457..10ade0d915e 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit f1410b664573ede6ffef16dd921558149f745552 +Subproject commit 10ade0d915e1e478395bbb51815c4d39b32aa8d8 diff --git a/qtnetworkauth b/qtnetworkauth index d4c64803ab2..d5837915dd3 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit d4c64803ab229d0704d889651f05d7fff2c3fd1a +Subproject commit d5837915dd32db7593e083c1a2d302431f021da1 diff --git a/qtopcua b/qtopcua index 1562f8371a7..f1dcf93760d 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit 1562f8371a7d42536a7e552a887362c3bc926e78 +Subproject commit f1dcf93760dea370f23848755be0007721c7bfa6 diff --git a/qtpositioning b/qtpositioning index a30e7452273..efad4e756f4 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit a30e7452273451cee7cd420de5e4c00dab336a0f +Subproject commit efad4e756f40f6bf9e85148e393f2b71382a7997 diff --git a/qtquick3d b/qtquick3d index 4af3c6b8785..7c6cf387012 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 4af3c6b87857433a5e5abbe3a66999352ff19362 +Subproject commit 7c6cf387012d9666035b8c518836104894ed64c6 diff --git a/qtquick3dphysics b/qtquick3dphysics index 6eb989f4516..36c82e33ce9 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit 6eb989f45169e758d69a0cb40ea3ae2a1d3183df +Subproject commit 36c82e33ce90888240d76399c5c7d1d3d71146ae diff --git a/qtquickeffectmaker b/qtquickeffectmaker index c8c7e93bbe1..45903506dc5 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit c8c7e93bbe1f415cc45a00e04b82b28fce3c2588 +Subproject commit 45903506dc529464b9450300874673232a475462 diff --git a/qtquicktimeline b/qtquicktimeline index eb6e80f2146..83a634d5403 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit eb6e80f2146ed709d7c6196fac9cf4a735c71eff +Subproject commit 83a634d5403c7ecc66a93c597fc9552c0cbe723c diff --git a/qtremoteobjects b/qtremoteobjects index 900add8f5c5..a0f19dbc065 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 900add8f5c5b0a6ebcfcf1c62e66b61187eb9dae +Subproject commit a0f19dbc0656f383fb5d352df4434d76af9d80a8 diff --git a/qtrepotools b/qtrepotools index c4da0dbfd0c..5053c692ade 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit c4da0dbfd0c0eb5ce15b2f0cca52502f8fba5007 +Subproject commit 5053c692ade69896655aa30a1d1fc6f29bce12f8 diff --git a/qtscxml b/qtscxml index 8e0022862cf..e766b183a46 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 8e0022862cf33f8fb9988fe2d65d3653bd7114b6 +Subproject commit e766b183a46cb87ca6eb1c4b86d1742a05a7c19d diff --git a/qtsensors b/qtsensors index ae3fd39613a..0b0ffff60b9 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit ae3fd39613afb513fececf7119fc71a81b343e6a +Subproject commit 0b0ffff60b9e3f31dc76dbc9c94759ee6cad8ef7 diff --git a/qtserialbus b/qtserialbus index 4f26bb8011b..c6b436dd07e 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 4f26bb8011bb41b38f806f2155c946b725045c67 +Subproject commit c6b436dd07e4c2aeb5744dae06abf33f223a6a1b diff --git a/qtserialport b/qtserialport index f448ef514da..c504cb89546 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit f448ef514dadeba4fc0a7da0e0f549f46f94a45b +Subproject commit c504cb89546c7eb352eed8d48381d2f6b5b7f3d5 diff --git a/qtshadertools b/qtshadertools index 7eaae6758bc..f46ed897e67 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 7eaae6758bce3bc9f49119b7cb93b21b9e1cc04b +Subproject commit f46ed897e67d098c7076fdc4068f0df54d1c156e diff --git a/qtspeech b/qtspeech index 81bfcf57d93..e923426c312 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 81bfcf57d932b84f18e245aec1ece70ed3ac67a0 +Subproject commit e923426c312af3c74756b00f4ba9d86fb50f5513 diff --git a/qtsvg b/qtsvg index 1589b7e2485..f40e5e28a30 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 1589b7e2485aa79d1bac2ea656eabb0f833f063d +Subproject commit f40e5e28a3008a19482f38c5d179817a276638b0 diff --git a/qttools b/qttools index f66e8a1c362..0b695d911d8 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit f66e8a1c362d5d2da7edb16a9e55a6468b75f682 +Subproject commit 0b695d911d8ba499de69a2541b5e7cb6749cc648 diff --git a/qttranslations b/qttranslations index 719d1527985..a282eb11946 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 719d15279854a926faeaa51c2cf915cf17ea5aed +Subproject commit a282eb11946c41d132063e2503b2d1f06a3ab928 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 9c02a480153..0a555fc5093 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 9c02a480153ad10840c2b370d53370fb2d8792a5 +Subproject commit 0a555fc5093effcb4f9434a2ac57585aaea413f6 diff --git a/qtwayland b/qtwayland index 314889644a1..321fa347f99 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 314889644a14243b0699faaf7433198a0e969e41 +Subproject commit 321fa347f9974dcbb4a3d8f6542b8c5c13c65895 diff --git a/qtwebchannel b/qtwebchannel index 09fec2306cc..1f9cde3083b 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 09fec2306cc50ddfb24ab62b5e40cac35f40310c +Subproject commit 1f9cde3083bb4ee02f780a75ac4113833beb14c4 diff --git a/qtwebengine b/qtwebengine index 806b1717e6d..c6009b088ad 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 806b1717e6d75e81f118a96756c08d130ccfeead +Subproject commit c6009b088ad437914f23442e1009d6a1fe06f1d2 diff --git a/qtwebsockets b/qtwebsockets index bd4c595fb90..00a25a5cf9f 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit bd4c595fb90dddd07803540a4f081fc28d6c833e +Subproject commit 00a25a5cf9f750e6545b2bd1901dafecc8603c62 diff --git a/qtwebview b/qtwebview index c1a0f6a5706..2f3c3c4d22a 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit c1a0f6a5706df8c6b15b5931d1d12a2682fc9d8a +Subproject commit 2f3c3c4d22a1441478d2d4689b53caa272ae697a From 46c1dedc0c158438e7d08a554764669016415087 Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Fri, 21 Mar 2025 10:12:51 +0100 Subject: [PATCH 135/204] Point to protobuf install prefix but not the CMake dir in protobuf_ROOT The _ROOT should point to the package prefix, where CMake should look for the respective cmake/, lib/cmake, and other CMake package directories. Setting directly it to package path is incorrect. Pick-to: 6.8 Change-Id: Id8859c29da08144c60ed3d6301d2c65c8d602d1f Reviewed-by: Joerg Bornemann (cherry picked from commit 9c39ae1424c4fb298678d70b0333cebcfb125779) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/common/unix/install_protobuf.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/provisioning/common/unix/install_protobuf.sh b/coin/provisioning/common/unix/install_protobuf.sh index 9bb31c1f4b8..1f4ee37acf1 100755 --- a/coin/provisioning/common/unix/install_protobuf.sh +++ b/coin/provisioning/common/unix/install_protobuf.sh @@ -92,7 +92,7 @@ cmake "$targetDir" -G"Ninja Multi-Config" \ ninja all:all sudo env "PATH=$PATH" ninja install:all -SetEnvVar "protobuf_ROOT" "$installPrefix/lib/cmake/protobuf" +SetEnvVar "protobuf_ROOT" "$installPrefix" # Refresh shared library cache if OS isn't macOS if uname -a |grep -qv "Darwin"; then From 64278e333b12d1efe39d3d5298c22ef14deac839 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 1 Jul 2025 22:44:27 +0000 Subject: [PATCH 136/204] Update submodules on '6.9 in qt/qt5' Change-Id: I0d105856c2428dbe4d1eba223e5cc0381355a899 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 170edd63ded..7d2d19cf03f 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 170edd63dedcceb3fbed7d1d5ae1d0861d337bee +Subproject commit 7d2d19cf03ffcd92fe600cacdc0f854c3551da32 diff --git a/qt5compat b/qt5compat index 3aa25cd4233..2b8b5a69863 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 3aa25cd42339bfbabc02a6c790d3082867046371 +Subproject commit 2b8b5a69863b3537de40cc8c414451732e0a04b9 diff --git a/qtactiveqt b/qtactiveqt index e89629e9085..9a8e4fcfa54 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit e89629e908596556d5aec97d0e3188064521dc9c +Subproject commit 9a8e4fcfa543dd307df751d8e15d74feb4c528e8 diff --git a/qtbase b/qtbase index 45b63d3208c..963afb90895 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 45b63d3208cae59f1d023cf2f133602a12270465 +Subproject commit 963afb90895b4a3442fd45fbc6e9f0cd5f36d9c1 diff --git a/qtcharts b/qtcharts index a5a3c489f5c..ae4a2111b63 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit a5a3c489f5c0630c98de02fc222d8456d426efab +Subproject commit ae4a2111b63e3e98e959f93ebdf3c9ad93541e2b diff --git a/qtcoap b/qtcoap index 01fc27e753b..2d737b73808 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit 01fc27e753b9cb2dc1efab37afe51341e4cafa5d +Subproject commit 2d737b73808a7e7976be45e8b238bdcfc8c6b271 diff --git a/qtconnectivity b/qtconnectivity index f39054d9fcf..76a41b24679 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit f39054d9fcf10404562a7b5edad241940dd2a9c2 +Subproject commit 76a41b24679c00d07d9d69ef49ef8031cbbedf41 diff --git a/qtdatavis3d b/qtdatavis3d index 352840a1c36..44b0fc37db1 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 352840a1c36cd5863c107290e8488943bbd91a17 +Subproject commit 44b0fc37db1b20fbf8032328b5ee807a6d7fce19 diff --git a/qtdeclarative b/qtdeclarative index b4aa023c968..05417260c73 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit b4aa023c9683f3868b27ff3d48016a29d2903026 +Subproject commit 05417260c733f8a2d8bd8626262fd7e19303d415 diff --git a/qtdoc b/qtdoc index a426d517172..6cd8ac12282 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit a426d51717239e36d06d4152595f8acaf8fd0e6f +Subproject commit 6cd8ac1228277ff2a17fb05b9d2dd387c8602409 diff --git a/qtgraphs b/qtgraphs index af837833103..6b9169479ad 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit af837833103198258c05fdf97d18d648664ae42e +Subproject commit 6b9169479ad6ff32fb6eddaf00f9c5476893962a diff --git a/qtgrpc b/qtgrpc index ca06fdda0b3..9a06b11c2b1 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit ca06fdda0b360534de5147cd8ec378dcbc5f4a72 +Subproject commit 9a06b11c2b1042348cd287aa78a4619995981cf7 diff --git a/qthttpserver b/qthttpserver index 9681e923501..ab34b826269 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit 9681e92350184709395c9673dcd3ea33f0d735c7 +Subproject commit ab34b82626989188107abc90bac9bfbbec598b16 diff --git a/qtimageformats b/qtimageformats index c5e05eec885..7ac3725c7fd 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit c5e05eec88576b25779af9c5ca3123639f0041ea +Subproject commit 7ac3725c7fd59db1b39048b072dea6f5a6da4a4f diff --git a/qtlanguageserver b/qtlanguageserver index dec27368f86..ceb4073b14e 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit dec27368f86f8fccf80d754e883199a093fd3682 +Subproject commit ceb4073b14ea50f1481c29ee80b67bcc8b031734 diff --git a/qtlocation b/qtlocation index d49f53d405e..e48da018a1f 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit d49f53d405ec5f21bddb25ac9cc21283a7512da8 +Subproject commit e48da018a1f22c713759bf97caa5b67f3faf6a15 diff --git a/qtlottie b/qtlottie index 460fe064656..43a50673bc2 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 460fe064656317c53a29bc2651c0d831ef80eb52 +Subproject commit 43a50673bc23c540d5b97b6de6eca56ba7b9af01 diff --git a/qtmqtt b/qtmqtt index 95cf90d973c..5f1a9be71da 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit 95cf90d973cd30d2c1484fb758381af069bcf52d +Subproject commit 5f1a9be71da425c0db4e6e88b8048f784e897a76 diff --git a/qtmultimedia b/qtmultimedia index 10ade0d915e..65fdebbc898 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 10ade0d915e1e478395bbb51815c4d39b32aa8d8 +Subproject commit 65fdebbc898c691c1aee87f9e117b1720f23dcd5 diff --git a/qtnetworkauth b/qtnetworkauth index d5837915dd3..4491a1422a0 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit d5837915dd32db7593e083c1a2d302431f021da1 +Subproject commit 4491a1422a0207714c5143d4fc13de113b8290aa diff --git a/qtopcua b/qtopcua index f1dcf93760d..a7b9e95249d 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit f1dcf93760dea370f23848755be0007721c7bfa6 +Subproject commit a7b9e95249d09c8d8098c4d404fa28cf987e106f diff --git a/qtpositioning b/qtpositioning index efad4e756f4..5a906568e4c 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit efad4e756f40f6bf9e85148e393f2b71382a7997 +Subproject commit 5a906568e4c197c3105eb43b1441e25b4fb7e97d diff --git a/qtquick3d b/qtquick3d index 7c6cf387012..9c4d7252e60 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 7c6cf387012d9666035b8c518836104894ed64c6 +Subproject commit 9c4d7252e600ff374503fd53fac3a01153213e26 diff --git a/qtquick3dphysics b/qtquick3dphysics index 36c82e33ce9..4f93408d0a6 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit 36c82e33ce90888240d76399c5c7d1d3d71146ae +Subproject commit 4f93408d0a61253124851ba62b0a4e15ced22230 diff --git a/qtquickeffectmaker b/qtquickeffectmaker index 45903506dc5..6ec87964c74 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit 45903506dc529464b9450300874673232a475462 +Subproject commit 6ec87964c74a12c24aed36b2a4c404bf869d215b diff --git a/qtquicktimeline b/qtquicktimeline index 83a634d5403..d9b84956b83 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 83a634d5403c7ecc66a93c597fc9552c0cbe723c +Subproject commit d9b84956b832bab2abb148b3e8f9c0c8b5561028 diff --git a/qtremoteobjects b/qtremoteobjects index a0f19dbc065..2110353acc8 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit a0f19dbc0656f383fb5d352df4434d76af9d80a8 +Subproject commit 2110353acc89ead60794efcf888cb78f222f462c diff --git a/qtscxml b/qtscxml index e766b183a46..ba9a5608cc9 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit e766b183a46cb87ca6eb1c4b86d1742a05a7c19d +Subproject commit ba9a5608cc9cc65796a0534c89b4043f18e921e1 diff --git a/qtsensors b/qtsensors index 0b0ffff60b9..2e8f2b23632 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 0b0ffff60b9e3f31dc76dbc9c94759ee6cad8ef7 +Subproject commit 2e8f2b236329d4b3b317f5428e49b71564ac9458 diff --git a/qtserialbus b/qtserialbus index c6b436dd07e..fb2777feb94 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit c6b436dd07e4c2aeb5744dae06abf33f223a6a1b +Subproject commit fb2777feb94ffb1d13514f20337da5be74f53105 diff --git a/qtserialport b/qtserialport index c504cb89546..377e75d0fbe 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit c504cb89546c7eb352eed8d48381d2f6b5b7f3d5 +Subproject commit 377e75d0fbefc50311741a50c0b1ed30c4f5d89b diff --git a/qtshadertools b/qtshadertools index f46ed897e67..b2a8addfa35 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit f46ed897e67d098c7076fdc4068f0df54d1c156e +Subproject commit b2a8addfa3509c0d7ec8d9e6705532a485988d16 diff --git a/qtspeech b/qtspeech index e923426c312..51f924f8eab 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit e923426c312af3c74756b00f4ba9d86fb50f5513 +Subproject commit 51f924f8eab9859bf127ba4387838890d8be1a4c diff --git a/qtsvg b/qtsvg index f40e5e28a30..1ab63e4c239 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit f40e5e28a3008a19482f38c5d179817a276638b0 +Subproject commit 1ab63e4c239a8cc090c99ab80467133654e45af4 diff --git a/qttools b/qttools index 0b695d911d8..91bac010fb9 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 0b695d911d8ba499de69a2541b5e7cb6749cc648 +Subproject commit 91bac010fb982e3a133b285660d122f1bae59778 diff --git a/qttranslations b/qttranslations index a282eb11946..7394e7590bf 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit a282eb11946c41d132063e2503b2d1f06a3ab928 +Subproject commit 7394e7590bfbc6b7ee67e007648df46070c20d89 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 0a555fc5093..e418856a4c7 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 0a555fc5093effcb4f9434a2ac57585aaea413f6 +Subproject commit e418856a4c71b08871fe5f1fc518a4771182a770 diff --git a/qtwayland b/qtwayland index 321fa347f99..2b3dd667c15 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 321fa347f9974dcbb4a3d8f6542b8c5c13c65895 +Subproject commit 2b3dd667c156342111b0daeaf0e5b2f707a72732 diff --git a/qtwebchannel b/qtwebchannel index 1f9cde3083b..b5b807e721a 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 1f9cde3083bb4ee02f780a75ac4113833beb14c4 +Subproject commit b5b807e721a47a158e3213257669fb828017028b diff --git a/qtwebengine b/qtwebengine index c6009b088ad..8f3273901ae 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit c6009b088ad437914f23442e1009d6a1fe06f1d2 +Subproject commit 8f3273901ae0c0a9be41e8884683b073996b7207 diff --git a/qtwebsockets b/qtwebsockets index 00a25a5cf9f..4f914e7f52c 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 00a25a5cf9f750e6545b2bd1901dafecc8603c62 +Subproject commit 4f914e7f52c151d7adff35ba9fe747dc58fe4683 diff --git a/qtwebview b/qtwebview index 2f3c3c4d22a..b5bccc66a3c 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 2f3c3c4d22a1441478d2d4689b53caa272ae697a +Subproject commit b5bccc66a3c128e75a5e7544bca2ea7c92f1363d From 997080fa0b698f1e66760163f6a9540423e50d32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Wed, 2 Jul 2025 10:40:27 +0300 Subject: [PATCH 137/204] COIN: Remove 'Packaging' feature from android-16 Linux config If used it might over write package that we want to release. Pick-to: 6.8 Change-Id: I8c0403065cff7354699df6f4d16b5a8125277195 Reviewed-by: Assam Boudjelthia Reviewed-by: Tero Heikkinen Reviewed-by: Akseli Salovaara Reviewed-by: Rami Potinkara (cherry picked from commit 789dff5f26be8ed3691a3539f048af33b54b734d) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit e89a978ef6487ffddb45fcfbb372a351bca5305d) --- coin/platform_configs/cmake_platforms_target_android.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/cmake_platforms_target_android.yaml b/coin/platform_configs/cmake_platforms_target_android.yaml index bb522dbd6a6..90d949549b6 100644 --- a/coin/platform_configs/cmake_platforms_target_android.yaml +++ b/coin/platform_configs/cmake_platforms_target_android.yaml @@ -71,7 +71,7 @@ Configurations: Compiler: 'GCC' Target compiler: 'Clang' Platform dependency: 'rhel-8.10' - Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM', 'InsignificantTests'] + Features: ['Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM', 'InsignificantTests'] 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', From 6b14b80e61bba1fa99c560c4e08588d76c794fee Mon Sep 17 00:00:00 2001 From: Tim Blechmann Date: Fri, 20 Jun 2025 10:56:21 +0800 Subject: [PATCH 138/204] provisioning: install flite for ubuntu 24.04, debian 11 and rhel The flite plugin for QtSpeech wasn't tested on CI as the development files weren't installed. Pick-to: 6.8 Change-Id: Ieefe42f67009b99cc95f54567f224972d12c1538 Reviewed-by: Axel Spoerl Reviewed-by: Tim Blechmann (cherry picked from commit fb878af9e710a5c32f1d0ae1a882dd9ff4db07e6) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 37880472c768d6df3ecce2a18fb92ddf678a2293) --- coin/provisioning/qtci-linux-Debian-11.6-aarch64/02-apt.sh | 1 + .../qtci-linux-RHEL-8.10-x86_64/04-install-packages.sh | 3 ++- .../qtci-linux-RHEL-8.8-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 ++- coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh | 1 + coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/02-apt.sh | 1 + 7 files changed, 11 insertions(+), 4 deletions(-) diff --git a/coin/provisioning/qtci-linux-Debian-11.6-aarch64/02-apt.sh b/coin/provisioning/qtci-linux-Debian-11.6-aarch64/02-apt.sh index a6ecb6ad501..eedc8a68dfe 100755 --- a/coin/provisioning/qtci-linux-Debian-11.6-aarch64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Debian-11.6-aarch64/02-apt.sh @@ -145,6 +145,7 @@ installPackages+=(libbluetooth-dev) installPackages+=(dkms) # Needed for qtspeech installPackages+=(libspeechd-dev) +installPackages+=(flite1-dev) #Pypdf for PDF reading in RTA tests installPackages+=(python3-pypdf2) # Needed for b2qt 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 c8c468f47a3..b076f2a949f 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 @@ -69,8 +69,9 @@ installPackages+=(libva-devel) installPackages+=(gtk3-devel) # libusb1 for tqtc-boot2qt/qdb installPackages+=(libusbx-devel) -# speech-dispatcher-devel for QtSpeech, otherwise it has no backend on Linux +# speech-dispatcher-devel / flite-devel for QtSpeech installPackages+=(speech-dispatcher-devel) +installPackages+=(flite-devel) # Python for pyside installPackages+=(python3.11) installPackages+=(python3.11-pip) 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 b2477251e3d..0b32e2a8942 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 @@ -69,8 +69,9 @@ installPackages+=(libva-devel) installPackages+=(gtk3-devel) # libusb1 for tqtc-boot2qt/qdb installPackages+=(libusbx-devel) -# speech-dispatcher-devel for QtSpeech, otherwise it has no backend on Linux +# speech-dispatcher-devel / flite-devel for QtSpeech installPackages+=(speech-dispatcher-devel) +installPackages+=(flite-devel) # Python 3.8 for pyside. Qt for Python support for Python 3.6 will be deprecated in within pyside6.3 installPackages+=(python3.11) installPackages+=(python3.11-pip) 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 ed091f0e1e0..45dc3943bdb 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 @@ -74,8 +74,9 @@ installPackages+=(yasm) installPackages+=(gtk3-devel) # libusb1 for tqtc-boot2qt/qdb installPackages+=(libusbx-devel) -# speech-dispatcher-devel for QtSpeech, otherwise it has no backend on Linux +# speech-dispatcher-devel / flite-devel for QtSpeech installPackages+=(speech-dispatcher-devel) +installPackages+=(flite-devel) # Python 2 devel and pip. python-pip requires the EPEL repository to be added # Python 2 no longer supported # installPackages+=(python2-devel python2-pip) 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 f9cd20fd450..c22b5891d47 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 @@ -74,8 +74,9 @@ installPackages+=(yasm) installPackages+=(gtk3-devel) # libusb1 for tqtc-boot2qt/qdb installPackages+=(libusbx-devel) -# speech-dispatcher-devel for QtSpeech, otherwise it has no backend on Linux +# speech-dispatcher-devel / flite-devel for QtSpeech installPackages+=(speech-dispatcher-devel) +installPackages+=(flite-devel) # Python 2 devel and pip. python-pip requires the EPEL repository to be added # Python 2 no longer supported # installPackages+=(python2-devel python2-pip) 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 5f318010b47..d2bc4afb206 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 @@ -179,6 +179,7 @@ installPackages+=(libopenal-dev) installPackages+=(libbluetooth-dev) # Needed for qtspeech installPackages+=(libspeechd-dev) +installPackages+=(flite1-dev) #Pypdf for PDF reading in RTA tests installPackages+=(python3-pypdf2) # Needed for b2qt 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 be9d3e0417f..1e997a33180 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 @@ -186,6 +186,7 @@ installPackages+=(virtualbox) installPackages+=(dkms) # Needed for qtspeech installPackages+=(libspeechd-dev) +installPackages+=(flite1-dev) #Pypdf for PDF reading in RTA tests installPackages+=(python3-pypdf2) # Needed for b2qt From bc72d1259b6bba1d228160eb86fc95b892eac7fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nils=20Petter=20Ska=CC=8Alerud?= Date: Tue, 13 May 2025 19:12:24 +0200 Subject: [PATCH 139/204] Coin, FFmpeg, macOS: Add output parameter to 'install-ffmpeg-macos.sh' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This patch adds an optional parameter to the provisioning script 'install-ffmpeg-macos.sh', allowing us to override the output directory for which the finalized library is installed. This is particularly useful for local builds, where we often need multiple different versions of FFmpeg installed, for different Qt versions. This patch has no impact for existing coin workflows. Pick-to: 6.8 Change-Id: If31922e931db19ab189850b975ce0131a64321b4 Reviewed-by: Simo Fält (cherry picked from commit 708548742b0e5f23fecf3f2a928b0082f6e74a93) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 298d280d64af4d643f6b36e3e905416fea0203df) --- coin/provisioning/common/macos/install-ffmpeg-macos.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/coin/provisioning/common/macos/install-ffmpeg-macos.sh b/coin/provisioning/common/macos/install-ffmpeg-macos.sh index 571c48cd08c..65d7ed6b85e 100755 --- a/coin/provisioning/common/macos/install-ffmpeg-macos.sh +++ b/coin/provisioning/common/macos/install-ffmpeg-macos.sh @@ -3,6 +3,7 @@ # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only # This script builds and installs FFmpeg shared libs +# Can take an optional final parameter to control installation directory set -ex @@ -18,7 +19,8 @@ source "${BASH_SOURCE%/*}/../unix/ffmpeg-installation-utils.sh" ffmpeg_source_dir=$(download_ffmpeg) ffmpeg_name=$(basename "$ffmpeg_source_dir") ffmpeg_config_options=$(get_ffmpeg_config_options "shared") -prefix="/usr/local/$ffmpeg_name" +default_prefix="/usr/local/$ffmpeg_name" +prefix="${2:-$default_prefix}" build_ffmpeg() { local arch="$1" From 73e0e9b5b9cd8db5d97c740725c39c37a7d25bfa Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 8 Jul 2025 23:03:54 +0000 Subject: [PATCH 140/204] Update submodules on '6.9 in qt/qt5' Change-Id: I6eb28142db3f02d3bece0d64d0bbd4f0daa9d392 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 7d2d19cf03f..3964894cbfa 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 7d2d19cf03ffcd92fe600cacdc0f854c3551da32 +Subproject commit 3964894cbfa84398655d9d8d59ad30a0cccafd98 diff --git a/qt5compat b/qt5compat index 2b8b5a69863..ed7e7fd823e 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 2b8b5a69863b3537de40cc8c414451732e0a04b9 +Subproject commit ed7e7fd823eec99b7e8e256cf8cfb80738f7e8df diff --git a/qtactiveqt b/qtactiveqt index 9a8e4fcfa54..6f2a027770f 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 9a8e4fcfa543dd307df751d8e15d74feb4c528e8 +Subproject commit 6f2a027770f5ddbfc924209e0e2b50a2e1fa0a39 diff --git a/qtbase b/qtbase index 963afb90895..3c2bafa10ae 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 963afb90895b4a3442fd45fbc6e9f0cd5f36d9c1 +Subproject commit 3c2bafa10aed628afd24872444cedb43d90daf4d diff --git a/qtcharts b/qtcharts index ae4a2111b63..4b3ecf33c0d 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit ae4a2111b63e3e98e959f93ebdf3c9ad93541e2b +Subproject commit 4b3ecf33c0df598229eae854d81ba356bd215df9 diff --git a/qtcoap b/qtcoap index 2d737b73808..a226acb06ef 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit 2d737b73808a7e7976be45e8b238bdcfc8c6b271 +Subproject commit a226acb06ef4f56ae74b360ec199ea311c69dea1 diff --git a/qtconnectivity b/qtconnectivity index 76a41b24679..12dca4c03aa 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 76a41b24679c00d07d9d69ef49ef8031cbbedf41 +Subproject commit 12dca4c03aa626b7ce921d5e97dfd93f0141d408 diff --git a/qtdatavis3d b/qtdatavis3d index 44b0fc37db1..bfd4bfa177f 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 44b0fc37db1b20fbf8032328b5ee807a6d7fce19 +Subproject commit bfd4bfa177fdfa61fcf39de7b4852c5333331ce3 diff --git a/qtdeclarative b/qtdeclarative index 05417260c73..23f13c5aa12 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 05417260c733f8a2d8bd8626262fd7e19303d415 +Subproject commit 23f13c5aa12bb15d9033bbd9b8d299c97a71966d diff --git a/qtdoc b/qtdoc index 6cd8ac12282..7182b53d6b1 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 6cd8ac1228277ff2a17fb05b9d2dd387c8602409 +Subproject commit 7182b53d6b12ed49ed9efc4a6d50c8ed257493d2 diff --git a/qtgraphs b/qtgraphs index 6b9169479ad..6ac732478f0 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit 6b9169479ad6ff32fb6eddaf00f9c5476893962a +Subproject commit 6ac732478f0f189d6809c115ddcbc729bc75480a diff --git a/qtgrpc b/qtgrpc index 9a06b11c2b1..0a80e114d26 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit 9a06b11c2b1042348cd287aa78a4619995981cf7 +Subproject commit 0a80e114d267061985e269d0074c7a3cfbfa18ce diff --git a/qthttpserver b/qthttpserver index ab34b826269..72ad5a765af 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit ab34b82626989188107abc90bac9bfbbec598b16 +Subproject commit 72ad5a765af24ae1d9825a6df907baed697b9074 diff --git a/qtimageformats b/qtimageformats index 7ac3725c7fd..c03edca09ce 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 7ac3725c7fd59db1b39048b072dea6f5a6da4a4f +Subproject commit c03edca09ced10cb8654139f80c24825a3426970 diff --git a/qtlanguageserver b/qtlanguageserver index ceb4073b14e..f3d4158d821 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit ceb4073b14ea50f1481c29ee80b67bcc8b031734 +Subproject commit f3d4158d8219d378c10e1fe7ae5a08c3de7185c6 diff --git a/qtlocation b/qtlocation index e48da018a1f..940d744ac92 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit e48da018a1f22c713759bf97caa5b67f3faf6a15 +Subproject commit 940d744ac92dd96351fc29b9ecc1d7497cbf8952 diff --git a/qtlottie b/qtlottie index 43a50673bc2..c2d13d55346 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 43a50673bc23c540d5b97b6de6eca56ba7b9af01 +Subproject commit c2d13d553462e214eeb030c0094c5519ca7b3f64 diff --git a/qtmqtt b/qtmqtt index 5f1a9be71da..986fe75c13e 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit 5f1a9be71da425c0db4e6e88b8048f784e897a76 +Subproject commit 986fe75c13e9033b2ca02c1f1d4d701b987ca9bf diff --git a/qtmultimedia b/qtmultimedia index 65fdebbc898..505c74c19c7 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 65fdebbc898c691c1aee87f9e117b1720f23dcd5 +Subproject commit 505c74c19c7f8fe2b43d0d8214b340312f9bc567 diff --git a/qtnetworkauth b/qtnetworkauth index 4491a1422a0..3f174f39d30 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 4491a1422a0207714c5143d4fc13de113b8290aa +Subproject commit 3f174f39d3061f345ba777d530f1f3459c7d7de1 diff --git a/qtopcua b/qtopcua index a7b9e95249d..1f3653c6a80 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit a7b9e95249d09c8d8098c4d404fa28cf987e106f +Subproject commit 1f3653c6a80f3f6143a75bd4c9c43b37ae18729a diff --git a/qtpositioning b/qtpositioning index 5a906568e4c..3b2ea6bc3d7 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit 5a906568e4c197c3105eb43b1441e25b4fb7e97d +Subproject commit 3b2ea6bc3d7030fca01c4760b02479727791ed3e diff --git a/qtquick3d b/qtquick3d index 9c4d7252e60..78a50307be7 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 9c4d7252e600ff374503fd53fac3a01153213e26 +Subproject commit 78a50307be7783a51d9d2684165c57ffd8f74b43 diff --git a/qtquick3dphysics b/qtquick3dphysics index 4f93408d0a6..67766f424df 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit 4f93408d0a61253124851ba62b0a4e15ced22230 +Subproject commit 67766f424df42196455bb4e7cbc803cd10328bec diff --git a/qtquickeffectmaker b/qtquickeffectmaker index 6ec87964c74..c46a9ffe2fe 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit 6ec87964c74a12c24aed36b2a4c404bf869d215b +Subproject commit c46a9ffe2fe7c2c553c1cb0e4bd9250b4edd7121 diff --git a/qtquicktimeline b/qtquicktimeline index d9b84956b83..ec0be796dbc 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit d9b84956b832bab2abb148b3e8f9c0c8b5561028 +Subproject commit ec0be796dbc4e2c45fffa43bc3217ccdd6e92d99 diff --git a/qtremoteobjects b/qtremoteobjects index 2110353acc8..4eaf92ef816 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 2110353acc89ead60794efcf888cb78f222f462c +Subproject commit 4eaf92ef8164c5e5fd9dbf64bcb9494778b1bfbb diff --git a/qtrepotools b/qtrepotools index 5053c692ade..07e83fe9511 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 5053c692ade69896655aa30a1d1fc6f29bce12f8 +Subproject commit 07e83fe951143178260eee045010700da6351416 diff --git a/qtscxml b/qtscxml index ba9a5608cc9..77d7749ed0f 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit ba9a5608cc9cc65796a0534c89b4043f18e921e1 +Subproject commit 77d7749ed0f8d69217ac9faf391ff5edf58470af diff --git a/qtsensors b/qtsensors index 2e8f2b23632..f1f3d2ea2ac 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 2e8f2b236329d4b3b317f5428e49b71564ac9458 +Subproject commit f1f3d2ea2ac5b781c05ef804ff42e6929911d63a diff --git a/qtserialbus b/qtserialbus index fb2777feb94..f610fa7c14f 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit fb2777feb94ffb1d13514f20337da5be74f53105 +Subproject commit f610fa7c14f3985779eb500e1846d120cad8de46 diff --git a/qtserialport b/qtserialport index 377e75d0fbe..e5793da50e1 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 377e75d0fbefc50311741a50c0b1ed30c4f5d89b +Subproject commit e5793da50e184e5db30b2430b92fadbc7bd0781d diff --git a/qtshadertools b/qtshadertools index b2a8addfa35..8b481d2b844 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit b2a8addfa3509c0d7ec8d9e6705532a485988d16 +Subproject commit 8b481d2b844bc70d948d0d2caecad860a38d5b00 diff --git a/qtspeech b/qtspeech index 51f924f8eab..9bf057b5555 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 51f924f8eab9859bf127ba4387838890d8be1a4c +Subproject commit 9bf057b55558e56c17c09ad2ee256d26be476d89 diff --git a/qtsvg b/qtsvg index 1ab63e4c239..42fb07bcb7c 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 1ab63e4c239a8cc090c99ab80467133654e45af4 +Subproject commit 42fb07bcb7c08ca87f395fede772222dc517bbcf diff --git a/qttools b/qttools index 91bac010fb9..80d6d6877f5 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 91bac010fb982e3a133b285660d122f1bae59778 +Subproject commit 80d6d6877f5f55e519e8f35838cd7c592443117d diff --git a/qttranslations b/qttranslations index 7394e7590bf..bc80a95bd00 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 7394e7590bfbc6b7ee67e007648df46070c20d89 +Subproject commit bc80a95bd0088e8a4b7ff0bd0b68a4e670e2d90e diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index e418856a4c7..bbc225670bc 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit e418856a4c71b08871fe5f1fc518a4771182a770 +Subproject commit bbc225670bc2cae8acf428a1b08445c25054cf91 diff --git a/qtwayland b/qtwayland index 2b3dd667c15..973cd776c5b 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 2b3dd667c156342111b0daeaf0e5b2f707a72732 +Subproject commit 973cd776c5bc8e502ec0689ac9e3a99fb23e96c5 diff --git a/qtwebchannel b/qtwebchannel index b5b807e721a..4c25717f81a 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit b5b807e721a47a158e3213257669fb828017028b +Subproject commit 4c25717f81a8ed1ac49185cde0390e91e38e3a62 diff --git a/qtwebengine b/qtwebengine index 8f3273901ae..bff164c89e0 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 8f3273901ae0c0a9be41e8884683b073996b7207 +Subproject commit bff164c89e087ca2ad7d25597fc3db816d0d42b9 diff --git a/qtwebsockets b/qtwebsockets index 4f914e7f52c..e25cd1e7db6 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 4f914e7f52c151d7adff35ba9fe747dc58fe4683 +Subproject commit e25cd1e7db6053acffc2f975ec5f09b19c58b913 diff --git a/qtwebview b/qtwebview index b5bccc66a3c..8de5373762c 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit b5bccc66a3c128e75a5e7544bca2ea7c92f1363d +Subproject commit 8de5373762cbff0808ab3a57a4d920194d0f5ff8 From 364c4851524cdfb60394b7fe329d051c1394832f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nils=20Petter=20Ska=CC=8Alerud?= Date: Tue, 13 May 2025 14:07:33 +0200 Subject: [PATCH 141/204] Coin, FFmpeg, iOS: Apply 'prefix' consistently MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In the provisioning script 'install-ffmpeg-ios.sh', we have a variable 'prefix' controlling where to install the finalized library. The value of this prefix is sometimes hardcoded into some of the temporary build directories, making the script break if we actually modify the 'prefix' variable. This means we currently cannot easily change the output directory. This patch modifies 'install-ffmpeg-ios.sh' so that the 'prefix' is applied consistently throughout the script, allowing us to change the output directory in the future. Pick-to: 6.8 Change-Id: I3458984aa22f8c82ed4d0bfac8ac8e71356e8789 Reviewed-by: Simo Fält (cherry picked from commit d72ace1a0d592072132d05a8fe38ebe0fdf2f7a7) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 2f2c8bf34725d3125fb9937a345a57625ab59552) --- coin/provisioning/common/unix/install-ffmpeg-ios.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/coin/provisioning/common/unix/install-ffmpeg-ios.sh b/coin/provisioning/common/unix/install-ffmpeg-ios.sh index 2f6fbab44a0..cbf00c74648 100755 --- a/coin/provisioning/common/unix/install-ffmpeg-ios.sh +++ b/coin/provisioning/common/unix/install-ffmpeg-ios.sh @@ -109,7 +109,7 @@ 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 ffmpeg_library_path="$ffmpeg_source_dir/build_ios/${platform}/installed$prefix" local framework_complete_path="${ffmpeg_library_path}/framework/${framework_name}.framework/${framework_name}" sudo mkdir -p "${ffmpeg_library_path}/framework/${framework_name}.framework" @@ -139,8 +139,8 @@ create_xcframework() { local target_platform_a="$2" local target_platform_b="$3" - local fw_a="$ffmpeg_source_dir/build_ios/${target_platform_a}/installed/usr/local/ios/ffmpeg/framework/${framework_name}.framework" - local fw_b="$ffmpeg_source_dir/build_ios/${target_platform_b}/installed/usr/local/ios/ffmpeg/framework/${framework_name}.framework" + local fw_a="$ffmpeg_source_dir/build_ios/${target_platform_a}/installed$prefix/framework/${framework_name}.framework" + local fw_b="$ffmpeg_source_dir/build_ios/${target_platform_b}/installed$prefix/framework/${framework_name}.framework" sudo mkdir -p "$prefix/framework/" sudo xcodebuild -create-xcframework -framework $fw_a -framework $fw_b -output "${prefix}/framework/${framework_name}.xcframework" @@ -163,7 +163,7 @@ done # xcframeworks are already installed directly into the target output directory. # We need to install headers -sudo cp -r "$ffmpeg_source_dir/build_ios/arm64-iphoneos/installed/usr/local/ios/ffmpeg/include" $prefix +sudo cp -r "$ffmpeg_source_dir/build_ios/arm64-iphoneos/installed$prefix/include" $prefix # The set_ffmpeg_dir_env_var requires the presence of the "lib" subfolder in order to validate # our FFmpeg install. On iOS we don't use this subfolder, we only rely on the "framework" subfolder. # So we create a dummy "lib" folder to pass the check. From 243d64cca2dc98ef87014a5c75376baf59aa4f88 Mon Sep 17 00:00:00 2001 From: Toni Saario Date: Thu, 20 Feb 2025 11:50:00 +0200 Subject: [PATCH 142/204] Build and run tests for windows arm cross-compilation Enables WOA test running in webengine. Which is unable to build the native WOA target. Add 'fake' configure argument -corss-compiled to so test instruction on native windows arm have a chance to bailout (qquickeffect maker is never cross-compiled) Task-number: COIN-1211 Change-Id: Ie920f65f9ec260c0c1a7111e495fd9a86adee5f6 Reviewed-by: Alexandru Croitor (cherry picked from commit 56e326ae31127526911126ef29e725b8aacdea82) --- coin/platform_configs/cmake_platforms.yaml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index e9e658e126c..51707a4db9b 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -155,7 +155,7 @@ Configurations: Template: 'qtci-windows-11_23H2-x86_64-54' Compiler: 'MSVC2022' Target arch: 'arm64' - Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] + Features: ['Sccache', 'DoNotRunTests', 'TargetBuildOnly', 'Packaging', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] Platform dependency: 'windows-10_22h2-mingw13' Environment variables: [ 'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}', @@ -167,6 +167,13 @@ Configurations: 'OPENSSL_LIB_x64={{.Env.OPENSSL_LIB_x64_arm64}}', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', ] +- + Id: 'windows-11-x86_64-arm64-tests' + Template: 'qtci-windows-11_22H2-aarch64-55' + Compiler: 'MSVC2022' + Features: ['TestOnly'] + Configure arguments: '-no-opengl -cross-compiled' + Platform dependency: 'windows-11_23H2-msvc2022-arm64' - Id: 'windows-11_23H2-msvc2022-developer-build' Template: 'qtci-windows-11_23H2-x86_64-54' From f492c446ac0eadc1b8dc261476d066d0b69b27a4 Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Wed, 21 May 2025 17:49:06 +0200 Subject: [PATCH 143/204] Use run-opengl-test feature Native WoA builds are done with -no-opengl switch, therefore native test coin nodes do not need to have openglsw installed. (ms-windows-store://pdp/?productid=9NQPSL29BFFF) However, when trying to run cross compiled WoA on native test nodes this ends up with: tst_QOpenGLWindow::create() Failed to load opengl32sw (%1 is not a valid tst_QOpenGLWindow::create() Failed to load and resolve WGL/OpenGL function However, adding no-opengl flag would affect our release binaries and would remove qt3d and qtdatavisualisation from packaging. Use run-opengl-test feature instead. Task-number: COIN-1211 Change-Id: Ib7d3eca7045598825f7a5ad774f60d2bc9db2458 Reviewed-by: Alexandru Croitor --- coin/platform_configs/cmake_platforms.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 51707a4db9b..1b660de5adf 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -159,7 +159,7 @@ Configurations: Platform dependency: 'windows-10_22h2-mingw13' Environment variables: [ 'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}', - 'TARGET_CONFIGURE_ARGS=-debug-and-release -force-debug-info -platform win32-arm64-msvc -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer', + 'TARGET_CONFIGURE_ARGS=-debug-and-release -force-debug-info -platform win32-arm64-msvc -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer -no-feature-run-opengl-tests', 'TARGET_CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ROOT_DIR_x64_arm64}}', 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC_ARM64}} -DQT_DEPLOY_FFMPEG=TRUE', 'OPENSSL_CONF_x64={{.Env.OPENSSL_CONF_x64_arm64}}', From 54da29db5d03bbb140aa576f7c96a6760d1c30ad Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 15 Jul 2025 06:52:31 +0000 Subject: [PATCH 144/204] Update submodules on '6.9 in qt/qt5' Change-Id: Ic9c574670621eb76c0ef775a7cc7833b1fd9b7f6 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 3964894cbfa..461a7267de0 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 3964894cbfa84398655d9d8d59ad30a0cccafd98 +Subproject commit 461a7267de04fde5348c9647a6988457884cc4d9 diff --git a/qt5compat b/qt5compat index ed7e7fd823e..d4367f482f5 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit ed7e7fd823eec99b7e8e256cf8cfb80738f7e8df +Subproject commit d4367f482f57b79923aaf672874a2aa7b3f029af diff --git a/qtactiveqt b/qtactiveqt index 6f2a027770f..7a326013c90 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 6f2a027770f5ddbfc924209e0e2b50a2e1fa0a39 +Subproject commit 7a326013c9083fec8532c6f2029b37850b12f23a diff --git a/qtbase b/qtbase index 3c2bafa10ae..16daf30d043 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 3c2bafa10aed628afd24872444cedb43d90daf4d +Subproject commit 16daf30d043f8d068dcdff24275a378db8f54b57 diff --git a/qtcharts b/qtcharts index 4b3ecf33c0d..25c02ebd536 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 4b3ecf33c0df598229eae854d81ba356bd215df9 +Subproject commit 25c02ebd5362f0cf50f0541ef2f214ce7fa85c7f diff --git a/qtcoap b/qtcoap index a226acb06ef..50a00fd6bd6 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit a226acb06ef4f56ae74b360ec199ea311c69dea1 +Subproject commit 50a00fd6bd6feda0923a4c48c421d7cddf7b0b61 diff --git a/qtconnectivity b/qtconnectivity index 12dca4c03aa..7ba0cab693b 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 12dca4c03aa626b7ce921d5e97dfd93f0141d408 +Subproject commit 7ba0cab693bd7e6860a761e5225538136b6c09e0 diff --git a/qtdatavis3d b/qtdatavis3d index bfd4bfa177f..66309df0ffd 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit bfd4bfa177fdfa61fcf39de7b4852c5333331ce3 +Subproject commit 66309df0ffd19611f361c09ae2db6d0922c7181c diff --git a/qtdeclarative b/qtdeclarative index 23f13c5aa12..52a284bf82a 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 23f13c5aa12bb15d9033bbd9b8d299c97a71966d +Subproject commit 52a284bf82abd9dc857773285eb40885ea2a0415 diff --git a/qtdoc b/qtdoc index 7182b53d6b1..9d6a7738ee2 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 7182b53d6b12ed49ed9efc4a6d50c8ed257493d2 +Subproject commit 9d6a7738ee28a47093778589341232b806738417 diff --git a/qtgraphs b/qtgraphs index 6ac732478f0..a1961a8f5af 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit 6ac732478f0f189d6809c115ddcbc729bc75480a +Subproject commit a1961a8f5af16fd8d09aeab38b23360b66b23724 diff --git a/qtgrpc b/qtgrpc index 0a80e114d26..3db1fe504fc 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit 0a80e114d267061985e269d0074c7a3cfbfa18ce +Subproject commit 3db1fe504fcc449140bc0b1047cdfde0eb457d3f diff --git a/qthttpserver b/qthttpserver index 72ad5a765af..2d118b93929 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit 72ad5a765af24ae1d9825a6df907baed697b9074 +Subproject commit 2d118b939291535e7da3c31c91d0f0437365db1b diff --git a/qtimageformats b/qtimageformats index c03edca09ce..f15e45117b7 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit c03edca09ced10cb8654139f80c24825a3426970 +Subproject commit f15e45117b730c6d077d74f32b3e788d7460ded7 diff --git a/qtlanguageserver b/qtlanguageserver index f3d4158d821..20b2b6773a8 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit f3d4158d8219d378c10e1fe7ae5a08c3de7185c6 +Subproject commit 20b2b6773a8b475407a42f48c91309dd4b28e4d0 diff --git a/qtlocation b/qtlocation index 940d744ac92..8975f4cbe7e 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 940d744ac92dd96351fc29b9ecc1d7497cbf8952 +Subproject commit 8975f4cbe7ee5f8d600e19085b892b6e9a6d39a8 diff --git a/qtlottie b/qtlottie index c2d13d55346..9d181f798da 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit c2d13d553462e214eeb030c0094c5519ca7b3f64 +Subproject commit 9d181f798daf001a52fe5160761c29392a920db0 diff --git a/qtmqtt b/qtmqtt index 986fe75c13e..7e6ee1bb25f 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit 986fe75c13e9033b2ca02c1f1d4d701b987ca9bf +Subproject commit 7e6ee1bb25f8dc9275f5537599d8833327065088 diff --git a/qtmultimedia b/qtmultimedia index 505c74c19c7..778bb8bd932 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 505c74c19c7f8fe2b43d0d8214b340312f9bc567 +Subproject commit 778bb8bd93250c71d44736c8309d0a8115a27255 diff --git a/qtnetworkauth b/qtnetworkauth index 3f174f39d30..c0fe472c576 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 3f174f39d3061f345ba777d530f1f3459c7d7de1 +Subproject commit c0fe472c576122e710724362c286e95d792cf07d diff --git a/qtopcua b/qtopcua index 1f3653c6a80..4d59d330e1e 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit 1f3653c6a80f3f6143a75bd4c9c43b37ae18729a +Subproject commit 4d59d330e1e929440b963430295f6dde9fbd1c65 diff --git a/qtpositioning b/qtpositioning index 3b2ea6bc3d7..053e9769303 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit 3b2ea6bc3d7030fca01c4760b02479727791ed3e +Subproject commit 053e9769303186a9e1f69caced32274f27dbbac4 diff --git a/qtquick3d b/qtquick3d index 78a50307be7..51bdeb25d00 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 78a50307be7783a51d9d2684165c57ffd8f74b43 +Subproject commit 51bdeb25d0035b9a9e86aae4060fbf12e1110667 diff --git a/qtquick3dphysics b/qtquick3dphysics index 67766f424df..85d97f12e53 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit 67766f424df42196455bb4e7cbc803cd10328bec +Subproject commit 85d97f12e5391337baa46f3aa8be2f2025b848d0 diff --git a/qtquickeffectmaker b/qtquickeffectmaker index c46a9ffe2fe..ad4e1bcc347 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit c46a9ffe2fe7c2c553c1cb0e4bd9250b4edd7121 +Subproject commit ad4e1bcc347cd8283d7644fe273b6fd8304bda89 diff --git a/qtquicktimeline b/qtquicktimeline index ec0be796dbc..c44fd6e93b6 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit ec0be796dbc4e2c45fffa43bc3217ccdd6e92d99 +Subproject commit c44fd6e93b64bbcef934c964fd337056e4756449 diff --git a/qtremoteobjects b/qtremoteobjects index 4eaf92ef816..d39289fe646 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 4eaf92ef8164c5e5fd9dbf64bcb9494778b1bfbb +Subproject commit d39289fe64670e26089d8289a01a251df87d6037 diff --git a/qtscxml b/qtscxml index 77d7749ed0f..dd8d8b44c3b 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 77d7749ed0f8d69217ac9faf391ff5edf58470af +Subproject commit dd8d8b44c3b45fae82828b7d361b19df8fbdcde5 diff --git a/qtsensors b/qtsensors index f1f3d2ea2ac..a549213db37 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit f1f3d2ea2ac5b781c05ef804ff42e6929911d63a +Subproject commit a549213db37ae8d51895af21d26d24a4adb3f385 diff --git a/qtserialbus b/qtserialbus index f610fa7c14f..49cb63079a3 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit f610fa7c14f3985779eb500e1846d120cad8de46 +Subproject commit 49cb63079a3dd42bed7c9e5794ba8fedbd39b6eb diff --git a/qtserialport b/qtserialport index e5793da50e1..83f8acf52ab 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit e5793da50e184e5db30b2430b92fadbc7bd0781d +Subproject commit 83f8acf52ab8b3365bb209008a0028aa7b804026 diff --git a/qtshadertools b/qtshadertools index 8b481d2b844..d51c80f80d9 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 8b481d2b844bc70d948d0d2caecad860a38d5b00 +Subproject commit d51c80f80d9875cea1e8ccd8c162af8aaf7986fc diff --git a/qtspeech b/qtspeech index 9bf057b5555..b8af3c2cd1a 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 9bf057b55558e56c17c09ad2ee256d26be476d89 +Subproject commit b8af3c2cd1a324ad0d120ccf2318db0607594e36 diff --git a/qtsvg b/qtsvg index 42fb07bcb7c..ab3b6327935 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 42fb07bcb7c08ca87f395fede772222dc517bbcf +Subproject commit ab3b6327935028b53a5904337eb3244d31238ceb diff --git a/qttools b/qttools index 80d6d6877f5..780f526c2ba 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 80d6d6877f5f55e519e8f35838cd7c592443117d +Subproject commit 780f526c2baed443d0ea3d7542fe42f8263ea616 diff --git a/qttranslations b/qttranslations index bc80a95bd00..e5e818a63bc 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit bc80a95bd0088e8a4b7ff0bd0b68a4e670e2d90e +Subproject commit e5e818a63bce39271d9f1526d8010bee3e45737d diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index bbc225670bc..f5462502c8d 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit bbc225670bc2cae8acf428a1b08445c25054cf91 +Subproject commit f5462502c8d622615da1990ae1462ad73d7cf1b8 diff --git a/qtwayland b/qtwayland index 973cd776c5b..72533a24894 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 973cd776c5bc8e502ec0689ac9e3a99fb23e96c5 +Subproject commit 72533a24894eb8f43916e442b7f8459cc001c588 diff --git a/qtwebchannel b/qtwebchannel index 4c25717f81a..d4adfa6fcd5 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 4c25717f81a8ed1ac49185cde0390e91e38e3a62 +Subproject commit d4adfa6fcd591ba497080f10a0a955bd2e48d4a4 diff --git a/qtwebengine b/qtwebengine index bff164c89e0..409bb3f0161 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit bff164c89e087ca2ad7d25597fc3db816d0d42b9 +Subproject commit 409bb3f0161d623a89f00fce3f16a106cc46c189 diff --git a/qtwebsockets b/qtwebsockets index e25cd1e7db6..6844fc2e405 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit e25cd1e7db6053acffc2f975ec5f09b19c58b913 +Subproject commit 6844fc2e40551e89a9f0b6c4fca74ccab62d60eb diff --git a/qtwebview b/qtwebview index 8de5373762c..ed8d398208d 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 8de5373762cbff0808ab3a57a4d920194d0f5ff8 +Subproject commit ed8d398208daa5ee3e4889f863955ffffa06c542 From 30c0522a15064d50392fd585963da52e656af3d5 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 23 Jul 2025 06:45:12 +0000 Subject: [PATCH 145/204] Update submodules on '6.9 in qt/qt5' Change-Id: I0af2f1aa2a073336942414424705f2332e36e699 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 461a7267de0..874f0247cc2 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 461a7267de04fde5348c9647a6988457884cc4d9 +Subproject commit 874f0247cc20a883392ed1c139e8c56f922fb602 diff --git a/qt5compat b/qt5compat index d4367f482f5..05021917beb 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit d4367f482f57b79923aaf672874a2aa7b3f029af +Subproject commit 05021917beb433b83c0f857150143e3b0d31b114 diff --git a/qtactiveqt b/qtactiveqt index 7a326013c90..345ec829f1b 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 7a326013c9083fec8532c6f2029b37850b12f23a +Subproject commit 345ec829f1b28a909241bd3574d79dbb48ff75fd diff --git a/qtbase b/qtbase index 16daf30d043..d6f0d901f88 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 16daf30d043f8d068dcdff24275a378db8f54b57 +Subproject commit d6f0d901f880a1a80c04f5ac6a4f05ff6b4a8f63 diff --git a/qtcharts b/qtcharts index 25c02ebd536..8dae65e0380 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 25c02ebd5362f0cf50f0541ef2f214ce7fa85c7f +Subproject commit 8dae65e03805afb12c87d49a44904a4f2f1f436e diff --git a/qtcoap b/qtcoap index 50a00fd6bd6..cbe28263afa 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit 50a00fd6bd6feda0923a4c48c421d7cddf7b0b61 +Subproject commit cbe28263afab183948ab2cdde25deeba9165e98d diff --git a/qtconnectivity b/qtconnectivity index 7ba0cab693b..637603110d4 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 7ba0cab693bd7e6860a761e5225538136b6c09e0 +Subproject commit 637603110d49dc2a0ea4afc394ed29302d8186cb diff --git a/qtdatavis3d b/qtdatavis3d index 66309df0ffd..20703c53a23 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 66309df0ffd19611f361c09ae2db6d0922c7181c +Subproject commit 20703c53a23e7d96bb41471d8fc0538c84980aeb diff --git a/qtdeclarative b/qtdeclarative index 52a284bf82a..d8094c3203a 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 52a284bf82abd9dc857773285eb40885ea2a0415 +Subproject commit d8094c3203a64691791877a5903686912cf4e268 diff --git a/qtdoc b/qtdoc index 9d6a7738ee2..0123137fd94 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 9d6a7738ee28a47093778589341232b806738417 +Subproject commit 0123137fd949e6b30eecf464aa8d9a07626a6daf diff --git a/qtgraphs b/qtgraphs index a1961a8f5af..7db898ce4dd 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit a1961a8f5af16fd8d09aeab38b23360b66b23724 +Subproject commit 7db898ce4ddc0b5e2e9fe4cc0b4d81a48340163a diff --git a/qtgrpc b/qtgrpc index 3db1fe504fc..f8433009cc0 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit 3db1fe504fcc449140bc0b1047cdfde0eb457d3f +Subproject commit f8433009cc097508ea6d470ef6e3212c0f9dbd06 diff --git a/qthttpserver b/qthttpserver index 2d118b93929..c8b13168b84 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit 2d118b939291535e7da3c31c91d0f0437365db1b +Subproject commit c8b13168b84c5f5842fa67e1f32798458d2541ac diff --git a/qtimageformats b/qtimageformats index f15e45117b7..36e4327a8a3 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit f15e45117b730c6d077d74f32b3e788d7460ded7 +Subproject commit 36e4327a8a37636736494b57adc224461c2b9e53 diff --git a/qtlanguageserver b/qtlanguageserver index 20b2b6773a8..df3d7a470d2 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit 20b2b6773a8b475407a42f48c91309dd4b28e4d0 +Subproject commit df3d7a470d251584b112e261a355260badf62f97 diff --git a/qtlocation b/qtlocation index 8975f4cbe7e..6c84084ede1 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 8975f4cbe7ee5f8d600e19085b892b6e9a6d39a8 +Subproject commit 6c84084ede19c946b96868eb8f286c5059e73648 diff --git a/qtlottie b/qtlottie index 9d181f798da..27b149751cd 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 9d181f798daf001a52fe5160761c29392a920db0 +Subproject commit 27b149751cddc47cfdd6d10b260f34de3246e603 diff --git a/qtmqtt b/qtmqtt index 7e6ee1bb25f..251799eb258 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit 7e6ee1bb25f8dc9275f5537599d8833327065088 +Subproject commit 251799eb2581d5c270e1ef628d20a5cd115a9362 diff --git a/qtmultimedia b/qtmultimedia index 778bb8bd932..14cccead004 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 778bb8bd93250c71d44736c8309d0a8115a27255 +Subproject commit 14cccead004212de084c6964c51d72f0455a41c0 diff --git a/qtnetworkauth b/qtnetworkauth index c0fe472c576..7bc5e8c220b 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit c0fe472c576122e710724362c286e95d792cf07d +Subproject commit 7bc5e8c220b9c3a1729a66d92d76d7903ac33045 diff --git a/qtopcua b/qtopcua index 4d59d330e1e..95ec4c0f525 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit 4d59d330e1e929440b963430295f6dde9fbd1c65 +Subproject commit 95ec4c0f5256b968a213d2aab625a09915432399 diff --git a/qtpositioning b/qtpositioning index 053e9769303..424878cfcb2 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit 053e9769303186a9e1f69caced32274f27dbbac4 +Subproject commit 424878cfcb2d683a369753b795666211203f5955 diff --git a/qtquick3d b/qtquick3d index 51bdeb25d00..dfeaad54b27 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 51bdeb25d0035b9a9e86aae4060fbf12e1110667 +Subproject commit dfeaad54b275ea7664ce4ae787dfbe6b121c0045 diff --git a/qtquick3dphysics b/qtquick3dphysics index 85d97f12e53..6b7db92709e 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit 85d97f12e5391337baa46f3aa8be2f2025b848d0 +Subproject commit 6b7db92709eac86af35e0e54fde36cd745596802 diff --git a/qtquickeffectmaker b/qtquickeffectmaker index ad4e1bcc347..81ac5ba13e1 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit ad4e1bcc347cd8283d7644fe273b6fd8304bda89 +Subproject commit 81ac5ba13e14a60dab7bf4c24cd118598656a552 diff --git a/qtquicktimeline b/qtquicktimeline index c44fd6e93b6..316cb99e91b 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit c44fd6e93b64bbcef934c964fd337056e4756449 +Subproject commit 316cb99e91bd2d4287751149f46788dcefde8484 diff --git a/qtremoteobjects b/qtremoteobjects index d39289fe646..65546ec4d5e 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit d39289fe64670e26089d8289a01a251df87d6037 +Subproject commit 65546ec4d5e8cd7f72bc9c98b5f95fabe4e3543c diff --git a/qtscxml b/qtscxml index dd8d8b44c3b..6048e6e0df5 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit dd8d8b44c3b45fae82828b7d361b19df8fbdcde5 +Subproject commit 6048e6e0df5b59ff9e41d6204d6caafc27f8f746 diff --git a/qtsensors b/qtsensors index a549213db37..8d1d8fa0001 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit a549213db37ae8d51895af21d26d24a4adb3f385 +Subproject commit 8d1d8fa0001882e064394692dcff6e495b65943b diff --git a/qtserialbus b/qtserialbus index 49cb63079a3..0e9e1726b41 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 49cb63079a3dd42bed7c9e5794ba8fedbd39b6eb +Subproject commit 0e9e1726b413ac17a5ece091394f16eb3eacc183 diff --git a/qtserialport b/qtserialport index 83f8acf52ab..26c75598696 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 83f8acf52ab8b3365bb209008a0028aa7b804026 +Subproject commit 26c75598696ebb7bf68237b9ba446012dbb42569 diff --git a/qtshadertools b/qtshadertools index d51c80f80d9..d43acc9ff00 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit d51c80f80d9875cea1e8ccd8c162af8aaf7986fc +Subproject commit d43acc9ff00e61fd6c2848d2726fbe1e6366277d diff --git a/qtspeech b/qtspeech index b8af3c2cd1a..f72b3313166 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit b8af3c2cd1a324ad0d120ccf2318db0607594e36 +Subproject commit f72b3313166a03e8bce192583b083434aa5ec9dc diff --git a/qtsvg b/qtsvg index ab3b6327935..d835bda92d2 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit ab3b6327935028b53a5904337eb3244d31238ceb +Subproject commit d835bda92d2ae7b75d6e3988eaf5b965eee658d1 diff --git a/qttools b/qttools index 780f526c2ba..4772f8e2e10 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 780f526c2baed443d0ea3d7542fe42f8263ea616 +Subproject commit 4772f8e2e10591ab05312711a00cadc27c45e80d diff --git a/qttranslations b/qttranslations index e5e818a63bc..e368faaceb4 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit e5e818a63bce39271d9f1526d8010bee3e45737d +Subproject commit e368faaceb40253aab4d71b71b1588c75c4b089a diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index f5462502c8d..36fb41be6f9 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit f5462502c8d622615da1990ae1462ad73d7cf1b8 +Subproject commit 36fb41be6f97f32084f42120ff09553b6f7b9788 diff --git a/qtwayland b/qtwayland index 72533a24894..5ba9c684c53 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 72533a24894eb8f43916e442b7f8459cc001c588 +Subproject commit 5ba9c684c53e6258084986383a3cc39ccfdfb750 diff --git a/qtwebchannel b/qtwebchannel index d4adfa6fcd5..fef94330c1f 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit d4adfa6fcd591ba497080f10a0a955bd2e48d4a4 +Subproject commit fef94330c1f59f6dadf5cedbd1bcfdd502492d18 diff --git a/qtwebengine b/qtwebengine index 409bb3f0161..908bee95faf 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 409bb3f0161d623a89f00fce3f16a106cc46c189 +Subproject commit 908bee95faf65c63eef3de90a612eb756c9a16db diff --git a/qtwebsockets b/qtwebsockets index 6844fc2e405..4df816d622b 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 6844fc2e40551e89a9f0b6c4fca74ccab62d60eb +Subproject commit 4df816d622baa45fb8d282acb92a2853d397377e diff --git a/qtwebview b/qtwebview index ed8d398208d..bb4967b5213 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit ed8d398208daa5ee3e4889f863955ffffa06c542 +Subproject commit bb4967b52134474f6d2de49d177b294eb7b76e03 From a2a261d0ad8e4eab91e0ca19e05d4c01a9b89a53 Mon Sep 17 00:00:00 2001 From: Pavel Dubsky Date: Tue, 22 Jul 2025 20:37:21 +0200 Subject: [PATCH 146/204] Prevent Enter-VsDevShell from changing current working directory Pick-to: 6.8 6.5 Change-Id: I6de981c06326a6d70bc200af74164a1021f8c138 Reviewed-by: Artem Dyomin (cherry picked from commit 814bfb1923f68e844d41906ea8d24ce24f1ca15d) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit f91eb1e821647dc41bd33413625491077df64c0d) --- coin/provisioning/common/windows/helpers.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/provisioning/common/windows/helpers.ps1 b/coin/provisioning/common/windows/helpers.ps1 index ad01c499489..1fb394fbb2f 100644 --- a/coin/provisioning/common/windows/helpers.ps1 +++ b/coin/provisioning/common/windows/helpers.ps1 @@ -358,7 +358,7 @@ function EnterVSDevShell { Write-Host "Enter VisualStudio developer shell (-host_arch=$HostArch -arch=$Arch -VsInstallPath='$VSPath')" try { Import-Module "$VSPath\Common7\Tools\Microsoft.VisualStudio.DevShell.dll" - Enter-VsDevShell -VsInstallPath $VSPath -DevCmdArguments "-host_arch=$HostArch -arch=$Arch -no_logo" + Enter-VsDevShell -SkipAutomaticLocation -VsInstallPath $VSPath -DevCmdArguments "-host_arch=$HostArch -arch=$Arch -no_logo" } catch { Write-Host "Failed to enter VisualStudio DevShell" return $false From 64f594afc936b6db993a0de86f1adcb0ab398c5a Mon Sep 17 00:00:00 2001 From: Pavel Dubsky Date: Tue, 22 Jul 2025 21:01:54 +0200 Subject: [PATCH 147/204] Build zlib while provisioning on Windows Task-number: QTBUG-103332 Pick-to: 6.8 6.5 Change-Id: I65289d393f3085c9a3ebc5bbbb1805490d270125 Reviewed-by: Artem Dyomin (cherry picked from commit 97e80c153803d5c466215b811b29f57fd088a308) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 837922faee911a11f0c98c900e7907c09036389c) --- .../common/windows/zlib-helpers.ps1 | 80 +++++++ coin/provisioning/common/windows/zlib.ps1 | 204 ++++++++++++++++++ .../qtci-windows-10-x86_64/89-zlib.ps1 | 1 + .../qtci-windows-10_21H2-x86_64/89-zlib.ps1 | 1 + .../qtci-windows-10_22H2-x86_64/89-zlib.ps1 | 1 + .../qtci-windows-11_21H2-x86_64/89-zlib.ps1 | 1 + .../qtci-windows-11_22H2-aarch64/89-zlib.ps1 | 1 + .../qtci-windows-11_22H2-x86_64/89-zlib.ps1 | 1 + .../qtci-windows-11_23H2-aarch64/89-zlib.ps1 | 1 + .../qtci-windows-11_23H2-x86_64/89-zlib.ps1 | 1 + .../qtci-windows-11_24H2-x86_64/89-zlib.ps1 | 1 + 11 files changed, 293 insertions(+) create mode 100644 coin/provisioning/common/windows/zlib-helpers.ps1 create mode 100644 coin/provisioning/common/windows/zlib.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/89-zlib.ps1 create mode 100644 coin/provisioning/qtci-windows-10_21H2-x86_64/89-zlib.ps1 create mode 100644 coin/provisioning/qtci-windows-10_22H2-x86_64/89-zlib.ps1 create mode 100644 coin/provisioning/qtci-windows-11_21H2-x86_64/89-zlib.ps1 create mode 100644 coin/provisioning/qtci-windows-11_22H2-aarch64/89-zlib.ps1 create mode 100644 coin/provisioning/qtci-windows-11_22H2-x86_64/89-zlib.ps1 create mode 100644 coin/provisioning/qtci-windows-11_23H2-aarch64/89-zlib.ps1 create mode 100644 coin/provisioning/qtci-windows-11_23H2-x86_64/89-zlib.ps1 create mode 100644 coin/provisioning/qtci-windows-11_24H2-x86_64/89-zlib.ps1 diff --git a/coin/provisioning/common/windows/zlib-helpers.ps1 b/coin/provisioning/common/windows/zlib-helpers.ps1 new file mode 100644 index 00000000000..ea3a9ba64be --- /dev/null +++ b/coin/provisioning/common/windows/zlib-helpers.ps1 @@ -0,0 +1,80 @@ +# 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 + +. "$PSScriptRoot\helpers.ps1" + +function CpuArchToString { + param ( + [Parameter(Mandatory)] + [CpuArch] $Architecture + ) + + $arhitecture = switch ($Architecture) { + ([CpuArch]::arm64) { + 'arm64' + } + ([CpuArch]::x64) { + 'amd64' + } + default { + throw "Unsupported architecture: '$Architecture'" + } + } + + return $arhitecture +} + +function StringToCpuArch { + param ( + [Parameter(Mandatory)] + [string] $Architecture + ) + + $arhitecture = switch ($Architecture) { + 'arm64' { + [CpuArch]::arm64 + } + 'amd64' { + [CpuArch]::x64 + } + default { + throw "Unsupported architecture: '$Architecture'" + } + } + + return $arhitecture +} + +function GetZlibEnvironmentVariableName { + param ( + [Parameter(Mandatory)] + [CpuArch] $TargetArchitecture + ) + + $architecture = CpuArchToString -Architecture $TargetArchitecture + $environmentVariableName = "ZLIB_PATH_$architecture".ToUpper() + + return $environmentVariableName +} + +function GetZlibPathByCpuArch { + param ( + [Parameter(Mandatory)] + [CpuArch] $TargetArchitecture + ) + + $environmentVariableName = GetZlibEnvironmentVariableName -TargetArchitecture $TargetArchitecture + + return [System.Environment]::GetEnvironmentVariable($environmentVariableName, [System.EnvironmentVariableTarget]::Machine) +} + +function GetZlibPathByString { + param ( + [Parameter(Mandatory)] + [string] $TargetArchitecture + ) + + $targetArchitecture = StringToCpuArch -Architecture $TargetArchitecture + + return GetZlibPathByCpuArch -TargetArchitecture $targetArchitecture +} diff --git a/coin/provisioning/common/windows/zlib.ps1 b/coin/provisioning/common/windows/zlib.ps1 new file mode 100644 index 00000000000..f725f8f67a0 --- /dev/null +++ b/coin/provisioning/common/windows/zlib.ps1 @@ -0,0 +1,204 @@ +# 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 + +# This script performs manual copying and patching of the zlib source to support +# multi-architecture builds on Windows using Microsoft's nmake and Makefile.msc. +# +# Reasons for this approach: +# +# 1. In-source build system: +# zlib's build system (Makefile.msc) writes all build artifacts directly into the source +# directory. To allow concurrent builds for different architectures (e.g., x64 and arm64), +# we copy the relevant source files into per-architecture build directories to isolate artifacts. +# +# 2. Incompatible linker base address: +# The default Makefile.msc contains a hardcoded image base address ('-base:0x5A4C0000') for the +# linker. This is invalid for ARM64 targets, which require base addresses above 4 GB. The script +# patches this line out to prevent linker errors. +# +# 3. Broken #include in zconf.h: +# Based on FFmpeg documentation (https://ffmpeg.org/platform.html#Microsoft-Visual-C_002b_002b-or-Intel-C_002b_002b-Compiler-for-Windows), +# zconf.h may erroneously include '', which doesn't exist on Windows. While Visual Studio 2022 +# builds tolerate this, we patch it out to ensure compatibility with older toolchains. +# +# These workarounds allow us to run reproducible, architecture-specific builds in CI without modifying +# the original source tree or requiring upstream changes. + +. "$PSScriptRoot\helpers.ps1" +. "$PSScriptRoot\zlib-helpers.ps1" + +$VERSION='1.3.1' +$SHA1='f535367b1a11e2f9ac3bec723fb007fbc0d189e5' + +$WIN32_DIRECTORY='win32' +$MAKEFILE="$WIN32_DIRECTORY\Makefile.msc" + +function BuildZlib { + param ( + [Parameter(Mandatory)] + [CpuArch] $HostArchitecture, + [Parameter(Mandatory)] + [CpuArch] $TargetArchitecture + ) + + PrepareBuildEnvironment -HostArchitecture $HostArchitecture -TargetArchitecture $TargetArchitecture + + nmake /f $MAKEFILE +} + +function CopySource { + param ( + [Parameter(Mandatory)] + [CpuArch] $TargetArchitecture + ) + + $testDirectory='test' + + $buildDirectory = GetBuildDirectory -TargetArchitecture $TargetArchitecture + $win32BuildDirectory = "$buildDirectory\$WIN32_DIRECTORY" + $testBuildDirectory = "$buildDirectory\$testDirectory" + + New-Item -Path $buildDirectory -ItemType 'Directory' + New-Item -Path $win32BuildDirectory -ItemType 'Directory' + New-Item -Path $testBuildDirectory -ItemType 'Directory' + + Copy-Item '*' -Include '*.c','*.h' -Destination $buildDirectory + Copy-Item "$WIN32_DIRECTORY\*" -Include '*.def','*.msc','*.rc' -Destination $win32BuildDirectory + Copy-Item "$testDirectory\*" -Include '*.c' -Destination $testBuildDirectory +} + +function GetBuildDirectory { + param ( + [Parameter(Mandatory)] + [CpuArch] $TargetArchitecture + ) + + $architectureDirectory = CpuArchToString -Architecture $TargetArchitecture + + return "build\$architectureDirectory" +} + +function GetSource { + $unzipDirectory = "C:\" + $zlibName="zlib-$VERSION" + + $zlibDirectory = "$unzipDirectory$zlibName" + + $urlCached="http://ci-files01-hki.ci.qt.io/input/zlib/zlib-$VERSION.tar.gz" + $urlPublic="https://github.com/madler/zlib/releases/download/v$VERSION/zlib-$VERSION.tar.gz" + + $downloadPath = "C:\Windows\Temp\$zlibName.tar.gz" + + Write-Host "Fetching zlib $VERSION..." + + Download $urlPublic $urlCached $downloadPath + Verify-Checksum $downloadPath $SHA1 + Extract-tar_gz $downloadPath $unzipDirectory + Remove $downloadPath + + return $zlibDirectory +} + +function GetTargetArchitectures { + param ( + [Parameter(Mandatory)] + [CpuArch] $HostArchitecture + ) + + $targetArhitectures = @([CpuArch]::arm64) + + if ($HostArchitecture -eq [CpuArch]::x64) { + $targetArhitectures += [CpuArch]::x64 + } + + return $targetArhitectures +} + +function PatchMakefile { + $pattern = '-base:\s*0x[0-9A-Fa-f]+' + + (Get-Content $MAKEFILE) | ForEach-Object { + $_ -replace $pattern, '' + } | Set-Content $MAKEFILE +} + +function PatchSource { + PatchZconf + PatchMakefile +} + +function PatchZconf { + $zconf = 'zconf.h' + $pattern = '#\s*include\s*' + + (Get-Content $zconf) | Where-Object { + $_ -notmatch $pattern + } | Set-Content $zconf +} + +function PrepareBuild { + param ( + [Parameter(Mandatory)] + [CpuArch] $TargetArchitecture + ) + + CopySource -TargetArchitecture $TargetArchitecture +} + +function PrepareBuildEnvironment { + param ( + [Parameter(Mandatory)] + [CpuArch] $HostArchitecture, + [Parameter(Mandatory)] + [CpuArch] $TargetArchitecture + ) + + $hostArhitecture = CpuArchToString -Architecture $HostArchitecture + $targetArhitecture = CpuArchToString -Architecture $TargetArchitecture + + if (-not $(EnterVSDevShell -HostArch $hostArhitecture -Arch $targetArhitecture)) { + throw "Failed to prepare build environment for ${hostArhitecture}_${targetArhitecture}" + } +} + +function SetZlibEnvironmentVariable { + param ( + [Parameter(Mandatory)] + [CpuArch] $TargetArchitecture, + [Parameter(Mandatory)] + [string] $ZlibDirectory + ) + + $buildDirectory = GetBuildDirectory -TargetArchitecture $TargetArchitecture + $environmentVariableName = GetZlibEnvironmentVariableName -TargetArchitecture $TargetArchitecture + $environmentVariableValue = "$ZlibDirectory\$buildDirectory" + + Set-EnvironmentVariable $environmentVariableName $environmentVariableValue +} + +$zlibDirectory = GetSource +$hostArchitecture = Get-CpuArchitecture +$targetArchitectures = GetTargetArchitectures -HostArchitecture $hostArchitecture + +Push-Location $zlibDirectory + +try { + foreach ($targetArchitecture in $targetArchitectures) { + PrepareBuild -TargetArchitecture $targetArchitecture + + $buildDirectory = GetBuildDirectory -TargetArchitecture $targetArchitecture + Push-Location $buildDirectory + + try { + PatchSource + BuildZlib -HostArchitecture $hostArchitecture -TargetArchitecture $targetArchitecture + SetZlibEnvironmentVariable -TargetArchitecture $targetArchitecture -ZlibDirectory $zlibDirectory + } + finally { + Pop-Location + } + } +} +finally { + Pop-Location +} diff --git a/coin/provisioning/qtci-windows-10-x86_64/89-zlib.ps1 b/coin/provisioning/qtci-windows-10-x86_64/89-zlib.ps1 new file mode 100644 index 00000000000..90751c34830 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/89-zlib.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\zlib.ps1" diff --git a/coin/provisioning/qtci-windows-10_21H2-x86_64/89-zlib.ps1 b/coin/provisioning/qtci-windows-10_21H2-x86_64/89-zlib.ps1 new file mode 100644 index 00000000000..90751c34830 --- /dev/null +++ b/coin/provisioning/qtci-windows-10_21H2-x86_64/89-zlib.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\zlib.ps1" diff --git a/coin/provisioning/qtci-windows-10_22H2-x86_64/89-zlib.ps1 b/coin/provisioning/qtci-windows-10_22H2-x86_64/89-zlib.ps1 new file mode 100644 index 00000000000..90751c34830 --- /dev/null +++ b/coin/provisioning/qtci-windows-10_22H2-x86_64/89-zlib.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\zlib.ps1" diff --git a/coin/provisioning/qtci-windows-11_21H2-x86_64/89-zlib.ps1 b/coin/provisioning/qtci-windows-11_21H2-x86_64/89-zlib.ps1 new file mode 100644 index 00000000000..90751c34830 --- /dev/null +++ b/coin/provisioning/qtci-windows-11_21H2-x86_64/89-zlib.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\zlib.ps1" diff --git a/coin/provisioning/qtci-windows-11_22H2-aarch64/89-zlib.ps1 b/coin/provisioning/qtci-windows-11_22H2-aarch64/89-zlib.ps1 new file mode 100644 index 00000000000..90751c34830 --- /dev/null +++ b/coin/provisioning/qtci-windows-11_22H2-aarch64/89-zlib.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\zlib.ps1" diff --git a/coin/provisioning/qtci-windows-11_22H2-x86_64/89-zlib.ps1 b/coin/provisioning/qtci-windows-11_22H2-x86_64/89-zlib.ps1 new file mode 100644 index 00000000000..90751c34830 --- /dev/null +++ b/coin/provisioning/qtci-windows-11_22H2-x86_64/89-zlib.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\zlib.ps1" diff --git a/coin/provisioning/qtci-windows-11_23H2-aarch64/89-zlib.ps1 b/coin/provisioning/qtci-windows-11_23H2-aarch64/89-zlib.ps1 new file mode 100644 index 00000000000..90751c34830 --- /dev/null +++ b/coin/provisioning/qtci-windows-11_23H2-aarch64/89-zlib.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\zlib.ps1" diff --git a/coin/provisioning/qtci-windows-11_23H2-x86_64/89-zlib.ps1 b/coin/provisioning/qtci-windows-11_23H2-x86_64/89-zlib.ps1 new file mode 100644 index 00000000000..90751c34830 --- /dev/null +++ b/coin/provisioning/qtci-windows-11_23H2-x86_64/89-zlib.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\zlib.ps1" diff --git a/coin/provisioning/qtci-windows-11_24H2-x86_64/89-zlib.ps1 b/coin/provisioning/qtci-windows-11_24H2-x86_64/89-zlib.ps1 new file mode 100644 index 00000000000..90751c34830 --- /dev/null +++ b/coin/provisioning/qtci-windows-11_24H2-x86_64/89-zlib.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\zlib.ps1" From 8ba37c9b4aa34b9a605aa316e7c5cbc6af30c249 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 28 Jul 2025 17:04:19 +0000 Subject: [PATCH 148/204] Update submodules on '6.9 in qt/qt5' Change-Id: I111f35721f34fe20f89465388af18b224ba02c7c 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 874f0247cc2..2bc4e286760 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 874f0247cc20a883392ed1c139e8c56f922fb602 +Subproject commit 2bc4e286760dace59aa631edf99f9422e7dc4855 diff --git a/qt5compat b/qt5compat index 05021917beb..2f17cb7cf6e 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 05021917beb433b83c0f857150143e3b0d31b114 +Subproject commit 2f17cb7cf6eb1ae3e99795441c3fbd3a1d5d0b62 diff --git a/qtactiveqt b/qtactiveqt index 345ec829f1b..44e25a182ef 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 345ec829f1b28a909241bd3574d79dbb48ff75fd +Subproject commit 44e25a182efc00c75fa9f4d301d71e700f5fdf82 diff --git a/qtbase b/qtbase index d6f0d901f88..d1586ebd89b 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit d6f0d901f880a1a80c04f5ac6a4f05ff6b4a8f63 +Subproject commit d1586ebd89b4db4343d42fb8258bd5cb1c7aa12b diff --git a/qtcharts b/qtcharts index 8dae65e0380..5803acb5b98 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 8dae65e03805afb12c87d49a44904a4f2f1f436e +Subproject commit 5803acb5b980be1da44a36a704f771d6243faaf6 diff --git a/qtcoap b/qtcoap index cbe28263afa..029269e05c3 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit cbe28263afab183948ab2cdde25deeba9165e98d +Subproject commit 029269e05c304a670b4487ad18f3da76892600c9 diff --git a/qtconnectivity b/qtconnectivity index 637603110d4..f354da467cd 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 637603110d49dc2a0ea4afc394ed29302d8186cb +Subproject commit f354da467cd8daae80d5371d739892325abd44f4 diff --git a/qtdatavis3d b/qtdatavis3d index 20703c53a23..30d2dd7c999 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 20703c53a23e7d96bb41471d8fc0538c84980aeb +Subproject commit 30d2dd7c999891d14e510a1a0120d6bdb4ddca59 diff --git a/qtdeclarative b/qtdeclarative index d8094c3203a..23b906184c6 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit d8094c3203a64691791877a5903686912cf4e268 +Subproject commit 23b906184c6929e3a94965f561c0bd87679e2f7a diff --git a/qtdoc b/qtdoc index 0123137fd94..3b45cce4a4b 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 0123137fd949e6b30eecf464aa8d9a07626a6daf +Subproject commit 3b45cce4a4bc94dcc07fe463067052e0b1ab70ea diff --git a/qtgraphs b/qtgraphs index 7db898ce4dd..6ef76ef35e9 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit 7db898ce4ddc0b5e2e9fe4cc0b4d81a48340163a +Subproject commit 6ef76ef35e981f80e16658ad487104e7e8655367 diff --git a/qtgrpc b/qtgrpc index f8433009cc0..c24d1fc5e58 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit f8433009cc097508ea6d470ef6e3212c0f9dbd06 +Subproject commit c24d1fc5e58b1dcbef0152c105dc04aa8ce7a354 diff --git a/qthttpserver b/qthttpserver index c8b13168b84..6c04896d6b5 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit c8b13168b84c5f5842fa67e1f32798458d2541ac +Subproject commit 6c04896d6b516af85b556c4aa211b2c386adbb66 diff --git a/qtimageformats b/qtimageformats index 36e4327a8a3..da951e9d9a9 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 36e4327a8a37636736494b57adc224461c2b9e53 +Subproject commit da951e9d9a937382e5687941cb94867dbc548f46 diff --git a/qtlanguageserver b/qtlanguageserver index df3d7a470d2..e6d9c65c677 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit df3d7a470d251584b112e261a355260badf62f97 +Subproject commit e6d9c65c677d920a69a8d32d73f82b61f11c3a46 diff --git a/qtlocation b/qtlocation index 6c84084ede1..b09caa04c9f 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 6c84084ede19c946b96868eb8f286c5059e73648 +Subproject commit b09caa04c9fea9a91ec9adcfffb451f6f16277af diff --git a/qtlottie b/qtlottie index 27b149751cd..cd21e198b2b 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 27b149751cddc47cfdd6d10b260f34de3246e603 +Subproject commit cd21e198b2bfdc4441779f1e3a81b68bf1a2e2fa diff --git a/qtmqtt b/qtmqtt index 251799eb258..5caf4bfc335 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit 251799eb2581d5c270e1ef628d20a5cd115a9362 +Subproject commit 5caf4bfc335126cd40d69a6a3300e88ae142ca90 diff --git a/qtmultimedia b/qtmultimedia index 14cccead004..c34d1dce85c 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 14cccead004212de084c6964c51d72f0455a41c0 +Subproject commit c34d1dce85c0f28cf74975d358a37e3d76786b81 diff --git a/qtnetworkauth b/qtnetworkauth index 7bc5e8c220b..75f3e54983e 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 7bc5e8c220b9c3a1729a66d92d76d7903ac33045 +Subproject commit 75f3e54983e638f452878dd5fa009484afcb9cfe diff --git a/qtopcua b/qtopcua index 95ec4c0f525..dab6d3f3140 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit 95ec4c0f5256b968a213d2aab625a09915432399 +Subproject commit dab6d3f3140cfb1267e21c6a8305e884c8607ec0 diff --git a/qtpositioning b/qtpositioning index 424878cfcb2..09b999d9ab3 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit 424878cfcb2d683a369753b795666211203f5955 +Subproject commit 09b999d9ab3c881db50e58bac1663ae4b11149b7 diff --git a/qtquick3d b/qtquick3d index dfeaad54b27..a3c8f39353b 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit dfeaad54b275ea7664ce4ae787dfbe6b121c0045 +Subproject commit a3c8f39353b776fbd6c016f90a4835af4b1ab201 diff --git a/qtquick3dphysics b/qtquick3dphysics index 6b7db92709e..d72b33f5e2c 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit 6b7db92709eac86af35e0e54fde36cd745596802 +Subproject commit d72b33f5e2ce8d8a9810479952cf72e47cdf15c5 diff --git a/qtquickeffectmaker b/qtquickeffectmaker index 81ac5ba13e1..26c339d25c3 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit 81ac5ba13e14a60dab7bf4c24cd118598656a552 +Subproject commit 26c339d25c3b50c9b03a155b703dbf2a65534779 diff --git a/qtquicktimeline b/qtquicktimeline index 316cb99e91b..5f755e4499b 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 316cb99e91bd2d4287751149f46788dcefde8484 +Subproject commit 5f755e4499b48667e9576fd702ca0b7e928100dc diff --git a/qtremoteobjects b/qtremoteobjects index 65546ec4d5e..97bcb187636 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 65546ec4d5e8cd7f72bc9c98b5f95fabe4e3543c +Subproject commit 97bcb187636eaa8e2dbdbb0b791b07e4a1ab9e09 diff --git a/qtscxml b/qtscxml index 6048e6e0df5..32bbd807f4b 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 6048e6e0df5b59ff9e41d6204d6caafc27f8f746 +Subproject commit 32bbd807f4bc2a3bb24c05a86bd2e9334b5e001d diff --git a/qtsensors b/qtsensors index 8d1d8fa0001..fa734f92281 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 8d1d8fa0001882e064394692dcff6e495b65943b +Subproject commit fa734f9228103fd68533ae64397413bf764d3a9d diff --git a/qtserialbus b/qtserialbus index 0e9e1726b41..c2ef4e58455 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 0e9e1726b413ac17a5ece091394f16eb3eacc183 +Subproject commit c2ef4e584554cc6c029d7caa8e25a02bf7adfa6d diff --git a/qtserialport b/qtserialport index 26c75598696..bd33368004c 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 26c75598696ebb7bf68237b9ba446012dbb42569 +Subproject commit bd33368004cd294761bed4ab4622fcf346864dd1 diff --git a/qtshadertools b/qtshadertools index d43acc9ff00..3fb86c73373 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit d43acc9ff00e61fd6c2848d2726fbe1e6366277d +Subproject commit 3fb86c733733dc331c17995afa6fbb3f33b00fb2 diff --git a/qtspeech b/qtspeech index f72b3313166..61fd1366803 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit f72b3313166a03e8bce192583b083434aa5ec9dc +Subproject commit 61fd1366803dc5dda2dd0dad39233d574fd9f25a diff --git a/qtsvg b/qtsvg index d835bda92d2..fa99a2f9117 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit d835bda92d2ae7b75d6e3988eaf5b965eee658d1 +Subproject commit fa99a2f9117c7a721022229ad2587410b7373d83 diff --git a/qttools b/qttools index 4772f8e2e10..c96d4890ac5 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 4772f8e2e10591ab05312711a00cadc27c45e80d +Subproject commit c96d4890ac5f9ffb216385ae75e376625656b6c2 diff --git a/qttranslations b/qttranslations index e368faaceb4..34eb532565f 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit e368faaceb40253aab4d71b71b1588c75c4b089a +Subproject commit 34eb532565f8582338f47edc1d6fafa59b2d7abc diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 36fb41be6f9..872d0fd2025 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 36fb41be6f97f32084f42120ff09553b6f7b9788 +Subproject commit 872d0fd2025d925c94589d7a5177e057076c4c08 diff --git a/qtwayland b/qtwayland index 5ba9c684c53..eec52200c53 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 5ba9c684c53e6258084986383a3cc39ccfdfb750 +Subproject commit eec52200c53740a56f6515144924077c1682a3ba diff --git a/qtwebchannel b/qtwebchannel index fef94330c1f..6eb5f921a32 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit fef94330c1f59f6dadf5cedbd1bcfdd502492d18 +Subproject commit 6eb5f921a32edd9930bb4c13bf22cf76c23a99df diff --git a/qtwebengine b/qtwebengine index 908bee95faf..28e1fadfb1a 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 908bee95faf65c63eef3de90a612eb756c9a16db +Subproject commit 28e1fadfb1a735c279eec8a211d86436794f8ba5 diff --git a/qtwebsockets b/qtwebsockets index 4df816d622b..dd590d89a5a 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 4df816d622baa45fb8d282acb92a2853d397377e +Subproject commit dd590d89a5a17805773f907c75008a0445befcdf diff --git a/qtwebview b/qtwebview index bb4967b5213..68eaef18b51 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit bb4967b52134474f6d2de49d177b294eb7b76e03 +Subproject commit 68eaef18b514f58dfcf9bf157784c2e30a697243 From 0b82c52c0dc979dc7a32c5a4e235a83469bba303 Mon Sep 17 00:00:00 2001 From: Tero Heikkinen Date: Tue, 15 Apr 2025 08:33:48 +0300 Subject: [PATCH 149/204] Add Windows 11 23h2 ARM with non-blocking tests in CI MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit New target: - windows-11_23h2-arm64-msvc2022 With latest versions - Visual Studio Professional 2022: 17.14.7 - MSVC: 14.44.35207 OpenGL is still disabled, but 'OpenCL, OpenGL, and Vulkan Compatibility pack' has been installed to WoA 11 23h2 Tier1 image to support OpenGL usage with QtWebengine, Qt3D etc. These targets will be added later: - windows-11_23h2-arm64-msvc2022-minimal-static-test - Windows-MSVC2022-arm64_Static-23H2 This target has no match in 6.9 (skipped): - windows-11-x86_64-arm64-tests-23H2 (cross-compiled) Task-number: QTQAINFRA-6973 Change-Id: I049f84ad7df91cd62e7f40044d8ef40705ac34e1 Reviewed-by: Simo Fält (cherry picked from commit 657ac0bcbbdeb4589e5c37afce43c0c38d2a2017) (cherry picked from commit ad7ab32f4401ecfe9593dff253a0f830481da2b4) --- coin/platform_configs/cmake_platforms.yaml | 11 +++ .../README_MANUAL_INSTALLATIONS | 90 +++++++++++++++++++ .../disable-clean-manager.ps1 | 8 ++ .../disable-defragment.ps1 | 42 +++++++++ .../disable-ntp.ps1 | 4 + .../disable-schedule-tasks.ps1 | 72 +++++++++++++++ .../disable-smart-app-control.ps1 | 4 + .../disable-update-orchestrator.ps1 | 13 +++ .../disable-windefender.ps1 | 21 +++++ .../disable-windows-file-protector.ps1 | 4 + .../disable-windows-update-medic.ps1 | 25 ++++++ .../disable-windows-updates.ps1 | 24 +++++ .../qtci-windows-11_23H2-aarch64/msvc2022.txt | 81 +++++++++++++++++ .../00-certificate-updates.ps1 | 1 + .../00-install-sevenzip.ps1 | 1 + .../01-allow-remote-desktop-access.ps1 | 1 + .../01-change-resolution.ps1 | 28 ++++++ .../01-disable-notifications.ps1 | 9 ++ .../01-disable-runtimebroker.ps1 | 4 + ...-disable-windows-delivery-optimization.ps1 | 1 + .../01-disable-windows-mdns.ps1 | 5 ++ .../01-disable-windows-telemetry.ps1 | 7 ++ .../01-enable-guest-logon.ps1 | 2 + .../01-install_telegraf.ps1 | 1 + .../01-set-proxy.ps1 | 1 + .../02-disable-autoreboot.ps1 | 1 + .../02-disable-sleep.ps1 | 1 + .../03-nodejs.ps1 | 1 + .../05-enable-devmode.ps1 | 1 + .../05-wsearch-off.ps1 | 1 + .../06-longpath.ps1 | 2 + .../06-mesa_llvmpipe.ps1 | 1 + .../qtci-windows-11_23H2-aarch64/06-ninja.ps1 | 1 + .../08-install-git.ps1 | 1 + .../08-install-jdk.ps1 | 1 + .../08-libclang.ps1 | 2 + .../08-python3.ps1 | 9 ++ .../09-install-dependencywalker.ps1 | 1 + .../09-install-openssh.ps1 | 1 + .../09-install-sed.ps1 | 1 + .../09-openssl-arm64.ps1 | 1 + .../09-openssl.ps1 | 4 + .../09-set-network-test-server.ps1 | 1 + .../09-vulkansdk.ps1 | 1 + .../10-install-msys2.ps1 | 1 + .../12-install-golang.ps1 | 1 + .../22-mqtt_broker.ps1 | 1 + .../23-winrtrunner.ps1 | 1 + .../25-llvm-mingw.ps1 | 20 +++++ .../29-libusb.ps1 | 3 + .../35-install-breakpad.ps1 | 1 + .../36-install-gnuwin32.ps1 | 2 + .../qtci-windows-11_23H2-aarch64/60-jom.ps1 | 1 + .../qtci-windows-11_23H2-aarch64/70-cmake.ps1 | 1 + .../85-disable_quickedit_powershell.ps1 | 1 + .../90-3dstudio_3rdparty.ps1 | 1 + .../90-install-dotnet.ps1 | 2 + .../90-install-ffmpeg.ps1 | 1 + .../90-install-notepad++.ps1 | 1 + .../90-install-stm32cubeprogrammer.ps1 | 1 + .../90-libusb.ps1 | 1 + .../90-python-modules.ps1 | 5 ++ .../90-squish.ps1 | 1 + .../91-install-azure-tool.ps1 | 1 + .../96-disable-windows-module-installer.ps1 | 1 + .../98-unset-proxy.ps1 | 1 + .../99-share-test-folders.ps1 | 1 + .../99-version.ps1 | 1 + 68 files changed, 543 insertions(+) create mode 100644 coin/pre-provisioning/qtci-windows-11_23H2-aarch64/README_MANUAL_INSTALLATIONS create mode 100644 coin/pre-provisioning/qtci-windows-11_23H2-aarch64/disable-clean-manager.ps1 create mode 100644 coin/pre-provisioning/qtci-windows-11_23H2-aarch64/disable-defragment.ps1 create mode 100644 coin/pre-provisioning/qtci-windows-11_23H2-aarch64/disable-ntp.ps1 create mode 100644 coin/pre-provisioning/qtci-windows-11_23H2-aarch64/disable-schedule-tasks.ps1 create mode 100644 coin/pre-provisioning/qtci-windows-11_23H2-aarch64/disable-smart-app-control.ps1 create mode 100644 coin/pre-provisioning/qtci-windows-11_23H2-aarch64/disable-update-orchestrator.ps1 create mode 100644 coin/pre-provisioning/qtci-windows-11_23H2-aarch64/disable-windefender.ps1 create mode 100644 coin/pre-provisioning/qtci-windows-11_23H2-aarch64/disable-windows-file-protector.ps1 create mode 100644 coin/pre-provisioning/qtci-windows-11_23H2-aarch64/disable-windows-update-medic.ps1 create mode 100644 coin/pre-provisioning/qtci-windows-11_23H2-aarch64/disable-windows-updates.ps1 create mode 100644 coin/pre-provisioning/qtci-windows-11_23H2-aarch64/msvc2022.txt create mode 100644 coin/provisioning/qtci-windows-11_23H2-aarch64/00-certificate-updates.ps1 create mode 100644 coin/provisioning/qtci-windows-11_23H2-aarch64/00-install-sevenzip.ps1 create mode 100644 coin/provisioning/qtci-windows-11_23H2-aarch64/01-allow-remote-desktop-access.ps1 create mode 100644 coin/provisioning/qtci-windows-11_23H2-aarch64/01-change-resolution.ps1 create mode 100644 coin/provisioning/qtci-windows-11_23H2-aarch64/01-disable-notifications.ps1 create mode 100644 coin/provisioning/qtci-windows-11_23H2-aarch64/01-disable-runtimebroker.ps1 create mode 100644 coin/provisioning/qtci-windows-11_23H2-aarch64/01-disable-windows-delivery-optimization.ps1 create mode 100644 coin/provisioning/qtci-windows-11_23H2-aarch64/01-disable-windows-mdns.ps1 create mode 100644 coin/provisioning/qtci-windows-11_23H2-aarch64/01-disable-windows-telemetry.ps1 create mode 100644 coin/provisioning/qtci-windows-11_23H2-aarch64/01-enable-guest-logon.ps1 create mode 100644 coin/provisioning/qtci-windows-11_23H2-aarch64/01-install_telegraf.ps1 create mode 100644 coin/provisioning/qtci-windows-11_23H2-aarch64/01-set-proxy.ps1 create mode 100644 coin/provisioning/qtci-windows-11_23H2-aarch64/02-disable-autoreboot.ps1 create mode 100644 coin/provisioning/qtci-windows-11_23H2-aarch64/02-disable-sleep.ps1 create mode 100644 coin/provisioning/qtci-windows-11_23H2-aarch64/03-nodejs.ps1 create mode 100644 coin/provisioning/qtci-windows-11_23H2-aarch64/05-enable-devmode.ps1 create mode 100644 coin/provisioning/qtci-windows-11_23H2-aarch64/05-wsearch-off.ps1 create mode 100644 coin/provisioning/qtci-windows-11_23H2-aarch64/06-longpath.ps1 create mode 100644 coin/provisioning/qtci-windows-11_23H2-aarch64/06-mesa_llvmpipe.ps1 create mode 100644 coin/provisioning/qtci-windows-11_23H2-aarch64/06-ninja.ps1 create mode 100644 coin/provisioning/qtci-windows-11_23H2-aarch64/08-install-git.ps1 create mode 100644 coin/provisioning/qtci-windows-11_23H2-aarch64/08-install-jdk.ps1 create mode 100644 coin/provisioning/qtci-windows-11_23H2-aarch64/08-libclang.ps1 create mode 100644 coin/provisioning/qtci-windows-11_23H2-aarch64/08-python3.ps1 create mode 100644 coin/provisioning/qtci-windows-11_23H2-aarch64/09-install-dependencywalker.ps1 create mode 100644 coin/provisioning/qtci-windows-11_23H2-aarch64/09-install-openssh.ps1 create mode 100644 coin/provisioning/qtci-windows-11_23H2-aarch64/09-install-sed.ps1 create mode 100644 coin/provisioning/qtci-windows-11_23H2-aarch64/09-openssl-arm64.ps1 create mode 100644 coin/provisioning/qtci-windows-11_23H2-aarch64/09-openssl.ps1 create mode 100644 coin/provisioning/qtci-windows-11_23H2-aarch64/09-set-network-test-server.ps1 create mode 100644 coin/provisioning/qtci-windows-11_23H2-aarch64/09-vulkansdk.ps1 create mode 100644 coin/provisioning/qtci-windows-11_23H2-aarch64/10-install-msys2.ps1 create mode 100644 coin/provisioning/qtci-windows-11_23H2-aarch64/12-install-golang.ps1 create mode 100644 coin/provisioning/qtci-windows-11_23H2-aarch64/22-mqtt_broker.ps1 create mode 100644 coin/provisioning/qtci-windows-11_23H2-aarch64/23-winrtrunner.ps1 create mode 100644 coin/provisioning/qtci-windows-11_23H2-aarch64/25-llvm-mingw.ps1 create mode 100644 coin/provisioning/qtci-windows-11_23H2-aarch64/29-libusb.ps1 create mode 100644 coin/provisioning/qtci-windows-11_23H2-aarch64/35-install-breakpad.ps1 create mode 100644 coin/provisioning/qtci-windows-11_23H2-aarch64/36-install-gnuwin32.ps1 create mode 100644 coin/provisioning/qtci-windows-11_23H2-aarch64/60-jom.ps1 create mode 100644 coin/provisioning/qtci-windows-11_23H2-aarch64/70-cmake.ps1 create mode 100644 coin/provisioning/qtci-windows-11_23H2-aarch64/85-disable_quickedit_powershell.ps1 create mode 100644 coin/provisioning/qtci-windows-11_23H2-aarch64/90-3dstudio_3rdparty.ps1 create mode 100644 coin/provisioning/qtci-windows-11_23H2-aarch64/90-install-dotnet.ps1 create mode 100644 coin/provisioning/qtci-windows-11_23H2-aarch64/90-install-ffmpeg.ps1 create mode 100644 coin/provisioning/qtci-windows-11_23H2-aarch64/90-install-notepad++.ps1 create mode 100644 coin/provisioning/qtci-windows-11_23H2-aarch64/90-install-stm32cubeprogrammer.ps1 create mode 100644 coin/provisioning/qtci-windows-11_23H2-aarch64/90-libusb.ps1 create mode 100644 coin/provisioning/qtci-windows-11_23H2-aarch64/90-python-modules.ps1 create mode 100644 coin/provisioning/qtci-windows-11_23H2-aarch64/90-squish.ps1 create mode 100644 coin/provisioning/qtci-windows-11_23H2-aarch64/91-install-azure-tool.ps1 create mode 100644 coin/provisioning/qtci-windows-11_23H2-aarch64/96-disable-windows-module-installer.ps1 create mode 100644 coin/provisioning/qtci-windows-11_23H2-aarch64/98-unset-proxy.ps1 create mode 100644 coin/provisioning/qtci-windows-11_23H2-aarch64/99-share-test-folders.ps1 create mode 100644 coin/provisioning/qtci-windows-11_23H2-aarch64/99-version.ps1 diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 1b660de5adf..1d81671695c 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -150,6 +150,17 @@ Configurations: 'NON_QTBASE_CMAKE_ARGS= -DFEATURE_clangcpp=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC_ARM64}} -DQT_DEPLOY_FFMPEG=TRUE', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', ] +- + Id: 'windows-11_23h2-arm64-msvc2022' + Template: 'qtci-windows-11_23H2-aarch64-53' + Compiler: 'MSVC2022' + Features: ['DebugAndRelease', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM', 'InsignificantTests', 'DoNotAbortTestingOnFirstFailure'] + 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}}\..', + 'NON_QTBASE_CMAKE_ARGS= -DFEATURE_clangcpp=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC_ARM64}} -DQT_DEPLOY_FFMPEG=TRUE', + 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', + ] - Id: 'windows-11_23H2-msvc2022-arm64' Template: 'qtci-windows-11_23H2-x86_64-54' diff --git a/coin/pre-provisioning/qtci-windows-11_23H2-aarch64/README_MANUAL_INSTALLATIONS b/coin/pre-provisioning/qtci-windows-11_23H2-aarch64/README_MANUAL_INSTALLATIONS new file mode 100644 index 00000000000..01bb28ff1cc --- /dev/null +++ b/coin/pre-provisioning/qtci-windows-11_23H2-aarch64/README_MANUAL_INSTALLATIONS @@ -0,0 +1,90 @@ +# Follow manual pre-setup from intra to install Windows 11 ARM and virtio drivers: +# "How to create a Windows 11 ARM tier1 image using Qemu" + +# Configure Windows after pre-setup +* Enable Remote Desktop: + - Settings - System - Remote Desktop - On + - Note: Display settings cannot be changed by remote +* Resolution set to 1280x800 + - System > Display > Custom scaling > Advanced display + - 1024 x 768 is unchangable by default +* Coin-setup: + - Download from https://[Coin_IP_from_build_logs]/coin/setup --> Windows Setup ARM64 .exe + - Open PowerShell as Administrator + - Run Windows Setup ARM64 .exe + - Verify from output that all these are OK + - Installing Boostrap agent + - Disabling fast boot + - Disabling firewall + - Disabling UAC + - Enabling autologin + - Automatic login + - Disabling windows updates +* Turn off Windows defender: + - Microsoft Defender Antivirus turned off: Open 'gpedit.msc': 'Computer Configuration' - 'Administrative Templates' - 'Windows Components' - 'Microsoft Defender Antivirus' + - Edit 'Turn off Microsoft Defender Antivirus' > 'Enabled' > 'Apply' + - Reboot on Safe mode: + - Open msconfig - Boot tab - enable “Safe boot“ - apply - restart + - In Safe mode: + - Take Ownership of Defender: + - Open properties - Right click "C:\Program Files\Windows Defender\Platform" and select 'Properties' + - Open Security tab - Advanced - Owner: Change - Advanced - Find now - Select Administrators - Ok - Ok - Apply + - Close 'Platform Properties' window for actions to take effect and open 'Properties' again + - This should get 'Disable inheritance' available for the next step + - Remove all Permissions: Permissions tab - Select 'Disable inheritance' + - Remove all entries + -Select 'Remove all inherited permissions from this object' + -Select 'Replace all child object permi…' - Apply + - Disable Windows defender also from RegEdit: + - Open regedit - Navigate to 'HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services' + - Change the following folders the key Start to 4 + - Sense (Windows defender advanced threat protection) + - WdBoot (Windows defender boot) + - WdFilter (Microsoft antimalware file system filter driver) + - WdNisDrv (Windows Defender Network Inspection Driver) + - WdNisSvc (Windows Defender Network Inspection Service) + - WinDefend (Windows Defender Antivirus Service) + - mpssvc (Windows Defender Firewall) + - NOTE! Without these step windows defender can't be disabled! + - Reboot back to normal mode +* Background defrag disabled: 'Defragment And Optimize Drives' - 'change settings' - unchecked "run on a schedule" + - Run in terminal: 'schtasks /Delete /TN "Microsoft\Windows\Defrag\ScheduledDefrag"' + - (Running optimize drivers doesn't seem to fix the status, if there's a 10% space optimization recommended) +* Time: + - Settings - System - Date & time - Time zone: '(UTC) Coordinated Universal Time' + - Settings - System - Date & time - "Set the time automatically: Off" +* Regional format: + - Settings - Time & language - Language and region - regional format - English (United States) +* Power saver: + - Settings - System - Power - Screen and sleep: set 'When plugged in, turn off my screen after' to 'never' +* Windows search disabled: + - 'C:\ProgramData\Microsoft\Windows\Start Menu\Programs\Administrative Tools\Services' - 'Windows search' - stop & disable +* Sysmain disabled: + - 'C:\ProgramData\Microsoft\Windows\Start Menu\Programs\Administrative Tools\Services' - 'SysMain' - stop & disable +* Windows update: + - Settings - Windows Update - run available updates + - (Windows update2025-06 Cumulative Update for Windows 11 Version 23H2 for arm64-based Systems (KB5060999)) + - After reboot disable windows updates: + - 'C:\ProgramData\Microsoft\Windows\Start Menu\Programs\Administrative Tools\Services' - 'Windows update' - stop & disable +* Turn windows features on or off -> Check the "SMB 1.0/CIFS File Sharing Support" +* Disable Windows Restore Points: Search 'Create a restore point' -> 'System Protection' tab -> Configure C: drive -> Disable & Delete restore points. +* Disable widgets: Right click the task bar -> 'Taskbar settings' -> toggle off anything related to widgets. +* (Restart Windows: shutdown /r) +* Google Chrome installed for RTA +* Virus & threat protection settings: + * Check that there's no active antivirus providers +* Run .NET runtime optimization service: open terminal and run: + Start-Process -NoNewWindow -FilePath "C:\WINDOWS\Microsoft.NET\Framework64\v4.0.30319\ngen.exe" -ArgumentList ExecuteQueuedItems -Wait + - It may be needed to rerun after installing Visual Studio. Just run it until it prints: + "All compilation targets are up to date." +* Activate Windows + +# Next +Install Visual Studio 2022 by following msvc2022.txt + +Proceed to install pre-provisioning scripts manually to Tier1 image + * Copying scripts happens easiest via Remote Desktop + * Ensure to have sourced scripts e.g. helpers.ps1 included + * If running scripts is restricted: Use these to allow scripts in Tier1 + * Get-ExecutionPolicy -List # To check the status + * Set-ExecutionPolicy RemoteSigned -Scope CurrentUser -Force diff --git a/coin/pre-provisioning/qtci-windows-11_23H2-aarch64/disable-clean-manager.ps1 b/coin/pre-provisioning/qtci-windows-11_23H2-aarch64/disable-clean-manager.ps1 new file mode 100644 index 00000000000..45ce141f787 --- /dev/null +++ b/coin/pre-provisioning/qtci-windows-11_23H2-aarch64/disable-clean-manager.ps1 @@ -0,0 +1,8 @@ +# This script will disable automatic disk cleanup + +. "$PSScriptRoot\..\..\provisioning\common\windows\helpers.ps1" + +Run-Executable "reg.exe" "ADD `"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\StorageSense\Parameters\StoragePolicy`" /V 04 /T REG_dWORD /D 0 /F" + +# Maintenance task used by the system to launch a silent auto disk cleanup when running low on free disk space. +DisableSchedulerTask "DiskCleanup\SilentCleanup" diff --git a/coin/pre-provisioning/qtci-windows-11_23H2-aarch64/disable-defragment.ps1 b/coin/pre-provisioning/qtci-windows-11_23H2-aarch64/disable-defragment.ps1 new file mode 100644 index 00000000000..f8834f35fac --- /dev/null +++ b/coin/pre-provisioning/qtci-windows-11_23H2-aarch64/disable-defragment.ps1 @@ -0,0 +1,42 @@ +# 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 + +# Windows 7 does not have Get-ScheduledTask and Unregister-ScheduledTask +# thus needing its own version. +Write-Host "Disabling defragmentation" +$version = Get-CimInstance Win32_OperatingSystem | Select-Object -ExpandProperty Caption +if ($version -like '*Windows 7*'){ + $pi = New-Object System.Diagnostics.ProcessStartInfo + $pi.FileName = "C:\Windows\System32\schtasks.exe" + $pi.RedirectStandardError = $true + $pi.UseShellExecute = $false + $pi.Arguments = "/Delete /TN `"\Microsoft\Windows\Defrag\ScheduledDefrag`" /F" + $prog = New-Object System.Diagnostics.Process + $prog.StartInfo = $pi + $prog.Start() | Out-Null + $err = $prog.StandardError.ReadToEnd() + $prog.WaitForExit() + if ($prog.ExitCode -eq 0){ + Write-Host "Scheduled defragmentation removed" + } else { + if ($err -like '*cannot find the file*'){ + Write-Host "No scheduled defragmentation task found" + exit 0 + } else { + Write-Host "Error while deleting scheduled defragmentation task: $err" + } + } +} +else { + try { + $state = (Get-ScheduledTask -ErrorAction Stop -TaskName "ScheduledDefrag").State + Write-Host "Scheduled defragmentation task found in state: $state" + } + catch { + Write-Host "No scheduled defragmentation task found" + exit 0 + } + Write-Host "Unregistering scheduled defragmentation task" + Unregister-ScheduledTask -ErrorAction Stop -Confirm:$false -TaskName ScheduledDefrag + Write-Host "Scheduled Defragmentation task was cancelled" +} diff --git a/coin/pre-provisioning/qtci-windows-11_23H2-aarch64/disable-ntp.ps1 b/coin/pre-provisioning/qtci-windows-11_23H2-aarch64/disable-ntp.ps1 new file mode 100644 index 00000000000..226517633d4 --- /dev/null +++ b/coin/pre-provisioning/qtci-windows-11_23H2-aarch64/disable-ntp.ps1 @@ -0,0 +1,4 @@ +. "$PSScriptRoot\..\..\provisioning\common\windows\helpers.ps1" + +# Disable the NTP from syncing +Run-Executable "w32tm.exe" "/config /syncfromflags:NO" diff --git a/coin/pre-provisioning/qtci-windows-11_23H2-aarch64/disable-schedule-tasks.ps1 b/coin/pre-provisioning/qtci-windows-11_23H2-aarch64/disable-schedule-tasks.ps1 new file mode 100644 index 00000000000..88b8387955e --- /dev/null +++ b/coin/pre-provisioning/qtci-windows-11_23H2-aarch64/disable-schedule-tasks.ps1 @@ -0,0 +1,72 @@ +. "$PSScriptRoot\..\..\provisioning\common\windows\helpers.ps1" + +# This script will remove unneeded Tasks from Task Scheduler + +# Application Experience 'Microsoft Compatibility Appraiser' - "Collects program telemetry information if opted-in to the Microsoft Customer Experience Improvement Program." +DisableSchedulerTask "Application Experience\Microsoft Compatibility Appraiser" + +# Application Experience 'ProgramDataUpdater' - "Collects program telemetry information if opted-in to the Microsoft Customer Experience Improvement Program" +DisableSchedulerTask "Application Experience\ProgramDataUpdater" + +# Autochk 'Proxy' - "This task collects and uploads autochk SQM data if opted-in to the Microsoft Customer Experience Improvement Program." +DisableSchedulerTask "Autochk\Proxy" + +# Chkdsk 'ProactiveScan' - "NTFS Volume Health Scan" +DisableSchedulerTask "Chkdsk\ProactiveScan" + +# Chkdsk 'SyspartRepair' +DeleteSchedulerTask "Chkdsk\SyspartRepair" + +# Customer Experience Improvement Program 'Consolidator' - "If the user has consented to participate in the Windows Customer Experience Improvement Program, this job collects and sends usage data to Microsoft." +DisableSchedulerTask "Customer Experience Improvement Program\Consolidator" + +# Customer Experience Improvement Program 'sbCeip' - "The USB CEIP (Customer Experience Improvement Program) task collects Universal Serial Bus related statistics and information about your machine and sends it to the Windows Device Connectivity engineering group at Microsoft. The information received is used to help improve the reliability, stability, and overall functionality of USB in Windows. If the user has not consented to participate in Windows CEIP, this task does not do anything." +DisableSchedulerTask "Customer Experience Improvement Program\UsbCeip" + +# Device Information 'Device' +DisableSchedulerTask "Device Information\Device" + +# Diagnosis 'Scheduled' - "The Windows Scheduled Maintenance Task performs periodic maintenance of the computer system by fixing problems automatically or reporting them through Security and Maintenance." +DisableSchedulerTask "Diagnosis\Scheduled" + +# DiskDiagnostic 'Microsoft-Windows-DiskDiagnosticDataCollector' - "The Windows Disk Diagnostic reports general disk and system information to Microsoft for users participating in the Customer Experience Program." +DisableSchedulerTask "DiskDiagnostic\Microsoft-Windows-DiskDiagnosticDataCollector" + +# ExploitGuard 'ExploitGuard MDM policy Refresh' - "Task for applying changes to the machine's Exploit Protection settings." +DisableSchedulerTask "ExploitGuard\ExploitGuard MDM policy Refresh" + +# Feedback/Siuf 'DmClient' +DisableSchedulerTask "Feedback\Siuf\DmClient" + +# Feedback/Siuf 'DmClient'OnScenarioDownload' +DisableSchedulerTask "Feedback\Siuf\DmClientOnScenarioDownload" + +# File Classification Infrastructure 'Property Definition Sync' +DisableSchedulerTask "File Classification Infrastructure\Property Definition Sync" + +# InstallService 'ScanForUpdates' +DisableSchedulerTask "InstallService\ScanForUpdates" + +# InstallService 'ScanForUpdatesAsUser' +DisableSchedulerTask "InstallService\ScanForUpdatesAsUser" + +# LanguageComponentsInstaller 'Installation' - "Install language components that match the user's language list." +DisableSchedulerTask "LanguageComponentsInstaller\Installation" + +# LanguageComponentsInstaller 'ReconcileLanguageResources' - "Install language components that match the user's language list." +DisableSchedulerTask "LanguageComponentsInstaller\ReconcileLanguageResources" + +# PI 'Secure-Boot-Update' - "This task updates the Secure Boot variables." +DisableSchedulerTask "PI\Secure-Boot-Update" + +# PI 'Sqm-Tasks' - "This task gathers information about the Trusted Platform Module (TPM), Secure Boot, and Measured Boot." +DisableSchedulerTask "PI\Sqm-Tasks" + +# Power Efficiency Diagnotics 'AnalyzeSystem' - "This task analyzes the system looking for conditions that may cause high energy use." +DisableSchedulerTask "PushToInstall\Registration" + +# Servicing 'StartComponentCleanup' +DisableSchedulerTask "Servicing\StartComponentCleanup" + +# SoftwareProtectionPlatform 'SvcRestartTaskNetwork' - "This task restarts the Software Protection Platform service when a new network is detected" +DisableSchedulerTask "SoftwareProtectionPlatform\SvcRestartTaskNetwork" diff --git a/coin/pre-provisioning/qtci-windows-11_23H2-aarch64/disable-smart-app-control.ps1 b/coin/pre-provisioning/qtci-windows-11_23H2-aarch64/disable-smart-app-control.ps1 new file mode 100644 index 00000000000..27c7d07891d --- /dev/null +++ b/coin/pre-provisioning/qtci-windows-11_23H2-aarch64/disable-smart-app-control.ps1 @@ -0,0 +1,4 @@ +# Disable Smart app control +# Smart app control makes installations extremely slow after defender is disabled. +reg.exe ADD "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\CI\Policy" /V VerifiedAndReputablePolicyState /T REG_dWORD /D 0 /F +# Verify: Settings -> Privacy & security -> Windows security -> App & browser control -> Smart App Control settings -> Off diff --git a/coin/pre-provisioning/qtci-windows-11_23H2-aarch64/disable-update-orchestrator.ps1 b/coin/pre-provisioning/qtci-windows-11_23H2-aarch64/disable-update-orchestrator.ps1 new file mode 100644 index 00000000000..72473d8f6ff --- /dev/null +++ b/coin/pre-provisioning/qtci-windows-11_23H2-aarch64/disable-update-orchestrator.ps1 @@ -0,0 +1,13 @@ +# Disable UpdateOrchestrator + +$name = "UpdateOrchestrator" +$path = "C:\Windows\System32\Tasks\Microsoft\Windows\$name" + +takeown /F $path /A /R +icacls $path /grant Administrators:F /T +del "$path\Schedule Scan" +del "$path\Schedule Scan Static Task" +del "$path\USO_UxBroker" + +# Disable Update orchestrator service +reg.exe ADD "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\UsoSvc" /V Start /T REG_dWORD /D 4 /F diff --git a/coin/pre-provisioning/qtci-windows-11_23H2-aarch64/disable-windefender.ps1 b/coin/pre-provisioning/qtci-windows-11_23H2-aarch64/disable-windefender.ps1 new file mode 100644 index 00000000000..36258f638e0 --- /dev/null +++ b/coin/pre-provisioning/qtci-windows-11_23H2-aarch64/disable-windefender.ps1 @@ -0,0 +1,21 @@ +# 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 + +# Turning off win defender. +# +# If disabled manually, windows will automatically enable it after +# some period of time. Disabling it speeds up the builds. +# NOTE! Windows Defender Antivirus needs to be turned off! +# Open 'gpedit.msc': 'Computer Configuration' - 'Administrative Templates' - 'Windows Components' - 'Windows Defender Antivirus' +# Edit 'Turn off Windows Defender Antivirus' > 'Enabled' > 'Apply' + +. "$PSScriptRoot\..\..\provisioning\common\windows\helpers.ps1" + +Run-Executable "reg.exe" "ADD `"HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender`" /V DisableAntiSpyware /T REG_dWORD /D 1 /F" +Run-Executable "reg.exe" "ADD `"HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender`" /V DisableRoutinelyTakingAction /T REG_dWORD /D 1 /F" + +# Disable 'QueueReporting' - "Windows Error Reporting task to process queued reports." +DisableSchedulerTask "Windows Error Reporting\QueueReporting" + +# Disable WindowsUpdate from Task Scheduler +DisableSchedulerTask "WindowsUpdate\Scheduled Start" diff --git a/coin/pre-provisioning/qtci-windows-11_23H2-aarch64/disable-windows-file-protector.ps1 b/coin/pre-provisioning/qtci-windows-11_23H2-aarch64/disable-windows-file-protector.ps1 new file mode 100644 index 00000000000..f1d09fb5b9e --- /dev/null +++ b/coin/pre-provisioning/qtci-windows-11_23H2-aarch64/disable-windows-file-protector.ps1 @@ -0,0 +1,4 @@ +# Disable Windows File Protection +# Windows File Protection feature in Microsoft Windows prevents programs from replacing critical Windows system files. + +reg.exe ADD "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon" /V SFCDisable /T REG_dWORD /D 0xffffff9d /F diff --git a/coin/pre-provisioning/qtci-windows-11_23H2-aarch64/disable-windows-update-medic.ps1 b/coin/pre-provisioning/qtci-windows-11_23H2-aarch64/disable-windows-update-medic.ps1 new file mode 100644 index 00000000000..6accbd3ba79 --- /dev/null +++ b/coin/pre-provisioning/qtci-windows-11_23H2-aarch64/disable-windows-update-medic.ps1 @@ -0,0 +1,25 @@ +# Windows Update Medic Service (WaaSMedicSvc)'PerformRemediation' helps recover update-related services to the supported configuration. +# WaasMedicSvc keeps re-starting Windows Update, even if it disabled manually. +# Even Admin user don't have privileged to disable PerformRemediation from Task Scheduler which means that WaaSMedicSvc.dll need's to be removed from the system + +$limit = (Get-Date).AddMinutes(20) +$path = "C:\Windows\System32\WaaSMedicSvc.dll" + +DO { + takeown /F $path + icacls $path /grant Administrators:f + Write-host "Deleting $path" + + Try { + del $path + } + Catch [System.UnauthorizedAccessException] { + Write-host "Access to the path '$path' is denied." + Continue + } + + if ((Get-Date) -gt $limit) { + exit 1 + } + +}while (Test-Path -Path "$path") diff --git a/coin/pre-provisioning/qtci-windows-11_23H2-aarch64/disable-windows-updates.ps1 b/coin/pre-provisioning/qtci-windows-11_23H2-aarch64/disable-windows-updates.ps1 new file mode 100644 index 00000000000..62e19814cc8 --- /dev/null +++ b/coin/pre-provisioning/qtci-windows-11_23H2-aarch64/disable-windows-updates.ps1 @@ -0,0 +1,24 @@ +# Copyright (C) 2017 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 disables the automatic Windows updates + +$service = get-service wuauserv +if (-not $service) { + Write-Host "Windows Update service not found." + exit 0 +} + +if ($service.Status -eq "Stopped") { + Write-Host "Windows Update service already stopped." +} else { + Write-Host "Stopping Windows Update service." + Stop-Service -Name "wuauserv" -Force +} + +$startup = Get-WmiObject Win32_Service | Where-Object {$_.Name -eq "wuauserv"} | Select -ExpandProperty "StartMode" +if ($startup -ne "Disabled") { + set-service wuauserv -startup disabled +} else { + Write-Host "Windows Update service startup already disabled." +} diff --git a/coin/pre-provisioning/qtci-windows-11_23H2-aarch64/msvc2022.txt b/coin/pre-provisioning/qtci-windows-11_23H2-aarch64/msvc2022.txt new file mode 100644 index 00000000000..3a5bd3ecbdd --- /dev/null +++ b/coin/pre-provisioning/qtci-windows-11_23H2-aarch64/msvc2022.txt @@ -0,0 +1,81 @@ +### Visual Studio Professional 2022 Official release ### +Visual Studio Professional 2022 version 17.14.7 was installed manually using installer: http://ci-files01-hki.ci.qt.io/input/windows/vs_professional__msvc2022_1339502178.1525841376.exe +This VS installer 17.14.7 version sets (Latest) MSVC version as: 14.44.35207 + +Installed MSVC-2022 Components: + +.NET Framework 4.8.1 targeting pack +.NET Framework 4.8.1 SDK +.NET Framework 4.8 targeting pack +.NET Framework 4.8 SDK +.NET Native +.NET Portable Library targeting pack +CLR data types for SQL Server +Data sources for SQL Server support +SQL Server Command Linne Utilities +SQL Server Data Tools +SQL Server Express 2019 LocalDB +SQL Server ODBC Driver +ClickOnce Publishing +Developer Analytics tools +NuGet package manager +Text Template Transformation +C# and Visual Basic Roslyn compilers +C++ 2022 Redistributable Update +C++ Cmake tools for Windows +C++/CLI support for v143 build tools (14.44-17.14) +C++/CLI support for v143 build tools (Latest) +MSBuild +MSVC v143 - VS 2022 C++ ARM64/ARM64EC build tools (Latest) +MSVC v143 - VS 2022 C++ ARM64/ARM64EC build tools (v14.44-17.14) +.NET profiling tools +C++ profiling tools +JavaScript diagnostics +Just-In-Time debugger +C# and Visual Basic +C++ core features +JavaScript and TypeScript language support +Razor Language Services +Image and 3D model editors +C++ ATL for latest v143 build tools (ARM) +C++ ATL for latest v143 build tools (ARM64/ARM64EC) +TypeScript Server +Windows 10 SDK (10.0.18362.0) +Windows 10 SDK (10.0.19041.0) +Windows 10 SDK (10.0.20348.0) +Windows 11 SDK (10.0.22000.0) +Windows 11 SDK (10.0.22621.0) +Windows 11 SDK (10.0.26100.3916) # This was available --> installed for COIN-1206 (see later comment) +Windows Universal C Runtime + +Windows SDK (10.0.26100.1742) has been earlier downloaded for WoA 22h2 and installed from: +https://developer.microsoft.com/en-us/windows/downloads/windows-sdk/ +# COIN-1206 + +These Components were not found for WoA: + +Connectivity and publishing tools +Graphics debugger and GPU profiler for DirectX +TypeScript 4.7 SDK + +# NOTE! Workloads were added during installation! + +############################################################ +### Visual Studio 2022 build tools ### + + Visual studio 2022 build tools version 17.14.7 was installed manually using installer: "http://ci-files01-hki.ci.qt.io/input/windows/vs_BuildTools_msvc2022.exe" + * Only default installation, no additional selections + +# NOTE! Installing Visual Studio on ARM-powered device is not supported + * Otherwise Visual Studio might be slow or unusable + * Installer recommends "remote targeting" which is suitable for cross-platform development + * VS 2022 build tools has been installed as it is - VS has ARM support since 17.4, but not full support with some workloads + * https://learn.microsoft.com/en-us/visualstudio/install/visual-studio-on-arm-devices?view=vs-2022#supported-workloads + +############################################################ +### Debugging tools ### + +* Check that debugging tools are installed in all installed Windows SDK versions + * Modify 'Windows Software Development Kit - Windows ' from 'Add or remove programs' + - Add feature 'Debugging Tools for Windows' +############################################################ diff --git a/coin/provisioning/qtci-windows-11_23H2-aarch64/00-certificate-updates.ps1 b/coin/provisioning/qtci-windows-11_23H2-aarch64/00-certificate-updates.ps1 new file mode 100644 index 00000000000..3691baf20b7 --- /dev/null +++ b/coin/provisioning/qtci-windows-11_23H2-aarch64/00-certificate-updates.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\certificate-updates.ps1" diff --git a/coin/provisioning/qtci-windows-11_23H2-aarch64/00-install-sevenzip.ps1 b/coin/provisioning/qtci-windows-11_23H2-aarch64/00-install-sevenzip.ps1 new file mode 100644 index 00000000000..a9044256862 --- /dev/null +++ b/coin/provisioning/qtci-windows-11_23H2-aarch64/00-install-sevenzip.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-sevenzip.ps1" diff --git a/coin/provisioning/qtci-windows-11_23H2-aarch64/01-allow-remote-desktop-access.ps1 b/coin/provisioning/qtci-windows-11_23H2-aarch64/01-allow-remote-desktop-access.ps1 new file mode 100644 index 00000000000..af05e838e2b --- /dev/null +++ b/coin/provisioning/qtci-windows-11_23H2-aarch64/01-allow-remote-desktop-access.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\allow-remote-desktop-access.ps1" diff --git a/coin/provisioning/qtci-windows-11_23H2-aarch64/01-change-resolution.ps1 b/coin/provisioning/qtci-windows-11_23H2-aarch64/01-change-resolution.ps1 new file mode 100644 index 00000000000..c1e73a62dc9 --- /dev/null +++ b/coin/provisioning/qtci-windows-11_23H2-aarch64/01-change-resolution.ps1 @@ -0,0 +1,28 @@ +$x_value = "1280" +$y_value = "800" + +Function ChangeResolution { + Param ( + [string]$driver + ) + + $path = "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\GraphicsDrivers\Configuration" + + reg.exe ADD "$path\$driver\00\" /V PrimSurfSize.cx /T REG_dWORD /D $x_value /F + reg.exe ADD "$path\$driver\00\" /V PrimSurfSize.cy /T REG_dWORD /D $y_value /F + reg.exe ADD "$path\$driver\00\00" /V DwmClipBox.bottom /T REG_dWORD /D $y_value /F + reg.exe ADD "$path\$driver\00\00" /V DwmClipBox.right /T REG_dWORD /D $x_value /F + reg.exe ADD "$path\$driver\00\00" /V PrimSurfSize.cx /T REG_dWORD /D $x_value /F + reg.exe ADD "$path\$driver\00\00" /V PrimSurfSize.cy /T REG_dWORD /D $y_value /F + reg.exe ADD "$path\$driver\00\00" /V ActiveSize.cy /T REG_dWORD /D $y_value /F + reg.exe ADD "$path\$driver\00\00" /V ActiveSize.cx /T REG_dWORD /D $x_value /F + +} + +Write-Host "Changing the resolution to ${x_value}x${y_value}" +ChangeResolution "MSBDD_NOEDID_1234_1111_00000000_00020000_0^E3701873EC28AFCFF631E725354CDC2D" +ChangeResolution "MSBDD_NOEDID_15AD_0405_00000000_000F0000_0^C13AE38966E73205F75BFACA84EB83A5" +ChangeResolution "MSBDD_RHT12340_2A_07DE_3A_1234_1111_00000000_00020000_0^EC6E4468E7627A114F1F86EA72F3C134" +ChangeResolution "MSBDD_RHT12340_2A_07DE_3D_1234_1111_00000000_00010000_0^4189234F4C5A30C0FE2E08AED7E5F516" +ChangeResolution "MSBDD_RHT12340_2A_07DE_3D_1234_1111_00000000_00020000_0^0E45B5CD7061674FC90A8064A6FE81F4" +ChangeResolution "MSNILNOEDID_1414_008D_FFFFFFFF_FFFFFFFF_0^030B4FCE00727AC1593E5B6FD18648D6" diff --git a/coin/provisioning/qtci-windows-11_23H2-aarch64/01-disable-notifications.ps1 b/coin/provisioning/qtci-windows-11_23H2-aarch64/01-disable-notifications.ps1 new file mode 100644 index 00000000000..ada20147db3 --- /dev/null +++ b/coin/provisioning/qtci-windows-11_23H2-aarch64/01-disable-notifications.ps1 @@ -0,0 +1,9 @@ +# Windows 'Notifications & actions' +# Disable 'Get notifications from apps and other senders' +reg.exe ADD "HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\PushNotifications" /V ToastEnabled /T REG_dWORD /D 0 /F + +# Disable 'Show me the Windows welcome experience after udpates and occasionally when I sign in to highlight what's new and suggested' +reg.exe ADD "HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /V SubscribedContent-310093Enabled /T REG_dWORD /D 0 /F + +# Disable 'Get tips, tricks and suggestions as you use Windows' +reg.exe ADD "HKEY_CURRENT_USER\SOFTWARE\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /V SubscribedContent-338389Enabled /T REG_dWORD /D 0 /F diff --git a/coin/provisioning/qtci-windows-11_23H2-aarch64/01-disable-runtimebroker.ps1 b/coin/provisioning/qtci-windows-11_23H2-aarch64/01-disable-runtimebroker.ps1 new file mode 100644 index 00000000000..8ae8190d23d --- /dev/null +++ b/coin/provisioning/qtci-windows-11_23H2-aarch64/01-disable-runtimebroker.ps1 @@ -0,0 +1,4 @@ +# Disable RunTime Broker +# The RunTime Broker is a Windows system process, which helps to manage app permissions on your pc between Windows apps and ensures apps are behaving themselves. +# Coordinates execution of background work for WinRT application. If this service is stopped or disabled, then background work might not be triggered. +reg.exe ADD "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\TimeBrokerSvc" /V Start /T REG_dWORD /D 4 /F diff --git a/coin/provisioning/qtci-windows-11_23H2-aarch64/01-disable-windows-delivery-optimization.ps1 b/coin/provisioning/qtci-windows-11_23H2-aarch64/01-disable-windows-delivery-optimization.ps1 new file mode 100644 index 00000000000..908df46fde4 --- /dev/null +++ b/coin/provisioning/qtci-windows-11_23H2-aarch64/01-disable-windows-delivery-optimization.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-windows-delivery-optimization.ps1" diff --git a/coin/provisioning/qtci-windows-11_23H2-aarch64/01-disable-windows-mdns.ps1 b/coin/provisioning/qtci-windows-11_23H2-aarch64/01-disable-windows-mdns.ps1 new file mode 100644 index 00000000000..bffb9f0548d --- /dev/null +++ b/coin/provisioning/qtci-windows-11_23H2-aarch64/01-disable-windows-mdns.ps1 @@ -0,0 +1,5 @@ +# 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 + +# QTQAINFRA-6761 +. "$PSScriptRoot\..\common\windows\disable-windows-mdns.ps1" diff --git a/coin/provisioning/qtci-windows-11_23H2-aarch64/01-disable-windows-telemetry.ps1 b/coin/provisioning/qtci-windows-11_23H2-aarch64/01-disable-windows-telemetry.ps1 new file mode 100644 index 00000000000..3f5a75f47cb --- /dev/null +++ b/coin/provisioning/qtci-windows-11_23H2-aarch64/01-disable-windows-telemetry.ps1 @@ -0,0 +1,7 @@ +# Disable Connected User Experiences and Telemetry service +# The Connected User Experiences and Telemetry service enables features that support in-application and connected user experiences. +# Additionally, this service manages the event driven collection and transmission of diagnostic and usage information +# (used to improve the experience and quality of the Windows Platform) when the diagnostics and usage privacy option settings are enabled under Feedback and Diagnostics. +reg.exe ADD "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\Data Collection" /V AllowTelemetry /T REG_dWORD /D 0 /F +stop-service diagtrack +set-service diagtrack -startuptype disabled diff --git a/coin/provisioning/qtci-windows-11_23H2-aarch64/01-enable-guest-logon.ps1 b/coin/provisioning/qtci-windows-11_23H2-aarch64/01-enable-guest-logon.ps1 new file mode 100644 index 00000000000..3cf989d37b6 --- /dev/null +++ b/coin/provisioning/qtci-windows-11_23H2-aarch64/01-enable-guest-logon.ps1 @@ -0,0 +1,2 @@ +# Allow SMB client guest logons to SMB server. +reg.exe ADD "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\LanmanWorkstation\Parameters" /V AllowInsecureGuestAuth /T REG_dWORD /D 1 /F diff --git a/coin/provisioning/qtci-windows-11_23H2-aarch64/01-install_telegraf.ps1 b/coin/provisioning/qtci-windows-11_23H2-aarch64/01-install_telegraf.ps1 new file mode 100644 index 00000000000..77fa8cbfe69 --- /dev/null +++ b/coin/provisioning/qtci-windows-11_23H2-aarch64/01-install_telegraf.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install_telegraf.ps1" diff --git a/coin/provisioning/qtci-windows-11_23H2-aarch64/01-set-proxy.ps1 b/coin/provisioning/qtci-windows-11_23H2-aarch64/01-set-proxy.ps1 new file mode 100644 index 00000000000..13b1ec602ec --- /dev/null +++ b/coin/provisioning/qtci-windows-11_23H2-aarch64/01-set-proxy.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\set-proxy.ps1" diff --git a/coin/provisioning/qtci-windows-11_23H2-aarch64/02-disable-autoreboot.ps1 b/coin/provisioning/qtci-windows-11_23H2-aarch64/02-disable-autoreboot.ps1 new file mode 100644 index 00000000000..73430b76117 --- /dev/null +++ b/coin/provisioning/qtci-windows-11_23H2-aarch64/02-disable-autoreboot.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-autoreboot.ps1" diff --git a/coin/provisioning/qtci-windows-11_23H2-aarch64/02-disable-sleep.ps1 b/coin/provisioning/qtci-windows-11_23H2-aarch64/02-disable-sleep.ps1 new file mode 100644 index 00000000000..5bf811efb22 --- /dev/null +++ b/coin/provisioning/qtci-windows-11_23H2-aarch64/02-disable-sleep.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-sleep.ps1" diff --git a/coin/provisioning/qtci-windows-11_23H2-aarch64/03-nodejs.ps1 b/coin/provisioning/qtci-windows-11_23H2-aarch64/03-nodejs.ps1 new file mode 100644 index 00000000000..6032e94565e --- /dev/null +++ b/coin/provisioning/qtci-windows-11_23H2-aarch64/03-nodejs.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\nodejs.ps1" diff --git a/coin/provisioning/qtci-windows-11_23H2-aarch64/05-enable-devmode.ps1 b/coin/provisioning/qtci-windows-11_23H2-aarch64/05-enable-devmode.ps1 new file mode 100644 index 00000000000..01e6f8b0baf --- /dev/null +++ b/coin/provisioning/qtci-windows-11_23H2-aarch64/05-enable-devmode.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\win10-enable-devmode.ps1" diff --git a/coin/provisioning/qtci-windows-11_23H2-aarch64/05-wsearch-off.ps1 b/coin/provisioning/qtci-windows-11_23H2-aarch64/05-wsearch-off.ps1 new file mode 100644 index 00000000000..eed6b734f55 --- /dev/null +++ b/coin/provisioning/qtci-windows-11_23H2-aarch64/05-wsearch-off.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\wsearch-off.ps1" diff --git a/coin/provisioning/qtci-windows-11_23H2-aarch64/06-longpath.ps1 b/coin/provisioning/qtci-windows-11_23H2-aarch64/06-longpath.ps1 new file mode 100644 index 00000000000..6561d57b1e9 --- /dev/null +++ b/coin/provisioning/qtci-windows-11_23H2-aarch64/06-longpath.ps1 @@ -0,0 +1,2 @@ +. "$PSScriptRoot\..\common\windows\longpath.ps1" + diff --git a/coin/provisioning/qtci-windows-11_23H2-aarch64/06-mesa_llvmpipe.ps1 b/coin/provisioning/qtci-windows-11_23H2-aarch64/06-mesa_llvmpipe.ps1 new file mode 100644 index 00000000000..1b1a07e9f6f --- /dev/null +++ b/coin/provisioning/qtci-windows-11_23H2-aarch64/06-mesa_llvmpipe.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\mesa_llvmpipe.ps1" diff --git a/coin/provisioning/qtci-windows-11_23H2-aarch64/06-ninja.ps1 b/coin/provisioning/qtci-windows-11_23H2-aarch64/06-ninja.ps1 new file mode 100644 index 00000000000..ba571a1efb9 --- /dev/null +++ b/coin/provisioning/qtci-windows-11_23H2-aarch64/06-ninja.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\ninja.ps1" diff --git a/coin/provisioning/qtci-windows-11_23H2-aarch64/08-install-git.ps1 b/coin/provisioning/qtci-windows-11_23H2-aarch64/08-install-git.ps1 new file mode 100644 index 00000000000..38106de75e6 --- /dev/null +++ b/coin/provisioning/qtci-windows-11_23H2-aarch64/08-install-git.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-git.ps1" diff --git a/coin/provisioning/qtci-windows-11_23H2-aarch64/08-install-jdk.ps1 b/coin/provisioning/qtci-windows-11_23H2-aarch64/08-install-jdk.ps1 new file mode 100644 index 00000000000..15065b55c71 --- /dev/null +++ b/coin/provisioning/qtci-windows-11_23H2-aarch64/08-install-jdk.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-jdk.ps1" diff --git a/coin/provisioning/qtci-windows-11_23H2-aarch64/08-libclang.ps1 b/coin/provisioning/qtci-windows-11_23H2-aarch64/08-libclang.ps1 new file mode 100644 index 00000000000..516adaf0643 --- /dev/null +++ b/coin/provisioning/qtci-windows-11_23H2-aarch64/08-libclang.ps1 @@ -0,0 +1,2 @@ +# Do not set the default LLVM_INSTALL_DIR for mingw, leave it with msvc for compat +. "$PSScriptRoot\..\common\windows\libclang.ps1" arm64 vs2022 diff --git a/coin/provisioning/qtci-windows-11_23H2-aarch64/08-python3.ps1 b/coin/provisioning/qtci-windows-11_23H2-aarch64/08-python3.ps1 new file mode 100644 index 00000000000..74cb6997fff --- /dev/null +++ b/coin/provisioning/qtci-windows-11_23H2-aarch64/08-python3.ps1 @@ -0,0 +1,9 @@ +# Parameters: +# - Arch 32/64 +# - installer sha1 +# - install target dir +# - version +# - Optional true/false if set as default with PYTHON3/PIP3_PATH variables, default false + +# Downloading https://www.python.org/ftp/python/3.11.9/python-3.11.9-arm64.exe +. "$PSScriptRoot\..\common\windows\python3.ps1" 64 "9e0487af5f0472978b7b6d4f4d3d8fd56865ff97" "C:\Python311_64" "3.11.9" $true diff --git a/coin/provisioning/qtci-windows-11_23H2-aarch64/09-install-dependencywalker.ps1 b/coin/provisioning/qtci-windows-11_23H2-aarch64/09-install-dependencywalker.ps1 new file mode 100644 index 00000000000..331de489564 --- /dev/null +++ b/coin/provisioning/qtci-windows-11_23H2-aarch64/09-install-dependencywalker.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-dependencywalker.ps1" diff --git a/coin/provisioning/qtci-windows-11_23H2-aarch64/09-install-openssh.ps1 b/coin/provisioning/qtci-windows-11_23H2-aarch64/09-install-openssh.ps1 new file mode 100644 index 00000000000..9de844da181 --- /dev/null +++ b/coin/provisioning/qtci-windows-11_23H2-aarch64/09-install-openssh.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-openssh.ps1" diff --git a/coin/provisioning/qtci-windows-11_23H2-aarch64/09-install-sed.ps1 b/coin/provisioning/qtci-windows-11_23H2-aarch64/09-install-sed.ps1 new file mode 100644 index 00000000000..b3c8fded3c8 --- /dev/null +++ b/coin/provisioning/qtci-windows-11_23H2-aarch64/09-install-sed.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-sed.ps1" diff --git a/coin/provisioning/qtci-windows-11_23H2-aarch64/09-openssl-arm64.ps1 b/coin/provisioning/qtci-windows-11_23H2-aarch64/09-openssl-arm64.ps1 new file mode 100644 index 00000000000..c1bbf27107f --- /dev/null +++ b/coin/provisioning/qtci-windows-11_23H2-aarch64/09-openssl-arm64.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\openssl-arm64.ps1" diff --git a/coin/provisioning/qtci-windows-11_23H2-aarch64/09-openssl.ps1 b/coin/provisioning/qtci-windows-11_23H2-aarch64/09-openssl.ps1 new file mode 100644 index 00000000000..db3013e0559 --- /dev/null +++ b/coin/provisioning/qtci-windows-11_23H2-aarch64/09-openssl.ps1 @@ -0,0 +1,4 @@ +# Windows ARM has own common script +# - "$PSScriptRoot\..\common\windows\openssl-arm64.ps1" +# - need to check should these be combined or excluded +#. "$PSScriptRoot\..\common\windows\openssl.ps1" diff --git a/coin/provisioning/qtci-windows-11_23H2-aarch64/09-set-network-test-server.ps1 b/coin/provisioning/qtci-windows-11_23H2-aarch64/09-set-network-test-server.ps1 new file mode 100644 index 00000000000..7918fabfadc --- /dev/null +++ b/coin/provisioning/qtci-windows-11_23H2-aarch64/09-set-network-test-server.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\set-network-test-server.ps1" diff --git a/coin/provisioning/qtci-windows-11_23H2-aarch64/09-vulkansdk.ps1 b/coin/provisioning/qtci-windows-11_23H2-aarch64/09-vulkansdk.ps1 new file mode 100644 index 00000000000..54a3d563dfc --- /dev/null +++ b/coin/provisioning/qtci-windows-11_23H2-aarch64/09-vulkansdk.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\vulkansdk.ps1" diff --git a/coin/provisioning/qtci-windows-11_23H2-aarch64/10-install-msys2.ps1 b/coin/provisioning/qtci-windows-11_23H2-aarch64/10-install-msys2.ps1 new file mode 100644 index 00000000000..be9a36349c8 --- /dev/null +++ b/coin/provisioning/qtci-windows-11_23H2-aarch64/10-install-msys2.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-msys2.ps1" diff --git a/coin/provisioning/qtci-windows-11_23H2-aarch64/12-install-golang.ps1 b/coin/provisioning/qtci-windows-11_23H2-aarch64/12-install-golang.ps1 new file mode 100644 index 00000000000..c68f16a154e --- /dev/null +++ b/coin/provisioning/qtci-windows-11_23H2-aarch64/12-install-golang.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-golang.ps1" diff --git a/coin/provisioning/qtci-windows-11_23H2-aarch64/22-mqtt_broker.ps1 b/coin/provisioning/qtci-windows-11_23H2-aarch64/22-mqtt_broker.ps1 new file mode 100644 index 00000000000..71deb0d48e3 --- /dev/null +++ b/coin/provisioning/qtci-windows-11_23H2-aarch64/22-mqtt_broker.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\mqtt_broker.ps1" diff --git a/coin/provisioning/qtci-windows-11_23H2-aarch64/23-winrtrunner.ps1 b/coin/provisioning/qtci-windows-11_23H2-aarch64/23-winrtrunner.ps1 new file mode 100644 index 00000000000..078f862ef37 --- /dev/null +++ b/coin/provisioning/qtci-windows-11_23H2-aarch64/23-winrtrunner.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\winrtrunner.ps1" diff --git a/coin/provisioning/qtci-windows-11_23H2-aarch64/25-llvm-mingw.ps1 b/coin/provisioning/qtci-windows-11_23H2-aarch64/25-llvm-mingw.ps1 new file mode 100644 index 00000000000..9ce91521328 --- /dev/null +++ b/coin/provisioning/qtci-windows-11_23H2-aarch64/25-llvm-mingw.ps1 @@ -0,0 +1,20 @@ +# 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 + +. "$PSScriptRoot\..\common\windows\helpers.ps1" + +# This script installs LLVM-Mingw by mstorsjo +# https://github.com/mstorsjo/llvm-mingw/releases/tag/20240320 + +$zip = Get-DownloadLocation "llvm-mingw-20240320-ucrt-aarch64.zip" +$url_cache = "http://ci-files01-hki.ci.qt.io/input/windows/llvm-mingw-20240320-ucrt-aarch64.zip" +$url_official = "https://github.com/mstorsjo/llvm-mingw/releases/download/20240320/llvm-mingw-20240320-ucrt-aarch64.zip" + +Download $url_official $url_cache $zip +Verify-Checksum $zip "1ea4870551a6aaf0d51332be1ea10ce776ee3b42" +Extract-7Zip $zip C:\ + +Rename-Item C:\llvm-mingw-20240320-ucrt-aarch64 C:\llvm-mingw + +Write-Output "llvm-mingw = 18.1.2" >> ~/versions.txt +Remove-Item -Path $zip diff --git a/coin/provisioning/qtci-windows-11_23H2-aarch64/29-libusb.ps1 b/coin/provisioning/qtci-windows-11_23H2-aarch64/29-libusb.ps1 new file mode 100644 index 00000000000..6035912d0aa --- /dev/null +++ b/coin/provisioning/qtci-windows-11_23H2-aarch64/29-libusb.ps1 @@ -0,0 +1,3 @@ + + +. "$PSScriptRoot\..\common\windows\libusb.ps1" diff --git a/coin/provisioning/qtci-windows-11_23H2-aarch64/35-install-breakpad.ps1 b/coin/provisioning/qtci-windows-11_23H2-aarch64/35-install-breakpad.ps1 new file mode 100644 index 00000000000..9360a326cf5 --- /dev/null +++ b/coin/provisioning/qtci-windows-11_23H2-aarch64/35-install-breakpad.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-breakpad.ps1" diff --git a/coin/provisioning/qtci-windows-11_23H2-aarch64/36-install-gnuwin32.ps1 b/coin/provisioning/qtci-windows-11_23H2-aarch64/36-install-gnuwin32.ps1 new file mode 100644 index 00000000000..0e2abbac2e7 --- /dev/null +++ b/coin/provisioning/qtci-windows-11_23H2-aarch64/36-install-gnuwin32.ps1 @@ -0,0 +1,2 @@ +. "$PSScriptRoot\..\common\windows\install-gnuwin32.ps1" + diff --git a/coin/provisioning/qtci-windows-11_23H2-aarch64/60-jom.ps1 b/coin/provisioning/qtci-windows-11_23H2-aarch64/60-jom.ps1 new file mode 100644 index 00000000000..b246ce25669 --- /dev/null +++ b/coin/provisioning/qtci-windows-11_23H2-aarch64/60-jom.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\jom.ps1" diff --git a/coin/provisioning/qtci-windows-11_23H2-aarch64/70-cmake.ps1 b/coin/provisioning/qtci-windows-11_23H2-aarch64/70-cmake.ps1 new file mode 100644 index 00000000000..73dc7bc291c --- /dev/null +++ b/coin/provisioning/qtci-windows-11_23H2-aarch64/70-cmake.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\cmake.ps1" diff --git a/coin/provisioning/qtci-windows-11_23H2-aarch64/85-disable_quickedit_powershell.ps1 b/coin/provisioning/qtci-windows-11_23H2-aarch64/85-disable_quickedit_powershell.ps1 new file mode 100644 index 00000000000..547e15a88c8 --- /dev/null +++ b/coin/provisioning/qtci-windows-11_23H2-aarch64/85-disable_quickedit_powershell.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-quickedit.ps1" diff --git a/coin/provisioning/qtci-windows-11_23H2-aarch64/90-3dstudio_3rdparty.ps1 b/coin/provisioning/qtci-windows-11_23H2-aarch64/90-3dstudio_3rdparty.ps1 new file mode 100644 index 00000000000..114f52f99ff --- /dev/null +++ b/coin/provisioning/qtci-windows-11_23H2-aarch64/90-3dstudio_3rdparty.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\3dstudio_3rdparty.ps1" diff --git a/coin/provisioning/qtci-windows-11_23H2-aarch64/90-install-dotnet.ps1 b/coin/provisioning/qtci-windows-11_23H2-aarch64/90-install-dotnet.ps1 new file mode 100644 index 00000000000..a2ecfba2b81 --- /dev/null +++ b/coin/provisioning/qtci-windows-11_23H2-aarch64/90-install-dotnet.ps1 @@ -0,0 +1,2 @@ +. "$PSScriptRoot\..\common\windows\install-dotnet.ps1" + diff --git a/coin/provisioning/qtci-windows-11_23H2-aarch64/90-install-ffmpeg.ps1 b/coin/provisioning/qtci-windows-11_23H2-aarch64/90-install-ffmpeg.ps1 new file mode 100644 index 00000000000..cd8df72f926 --- /dev/null +++ b/coin/provisioning/qtci-windows-11_23H2-aarch64/90-install-ffmpeg.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-ffmpeg.ps1" diff --git a/coin/provisioning/qtci-windows-11_23H2-aarch64/90-install-notepad++.ps1 b/coin/provisioning/qtci-windows-11_23H2-aarch64/90-install-notepad++.ps1 new file mode 100644 index 00000000000..455d92bf0e3 --- /dev/null +++ b/coin/provisioning/qtci-windows-11_23H2-aarch64/90-install-notepad++.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-notepad++.ps1" diff --git a/coin/provisioning/qtci-windows-11_23H2-aarch64/90-install-stm32cubeprogrammer.ps1 b/coin/provisioning/qtci-windows-11_23H2-aarch64/90-install-stm32cubeprogrammer.ps1 new file mode 100644 index 00000000000..25c2bb4229a --- /dev/null +++ b/coin/provisioning/qtci-windows-11_23H2-aarch64/90-install-stm32cubeprogrammer.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-stm32cubeprogrammer.ps1" diff --git a/coin/provisioning/qtci-windows-11_23H2-aarch64/90-libusb.ps1 b/coin/provisioning/qtci-windows-11_23H2-aarch64/90-libusb.ps1 new file mode 100644 index 00000000000..29a1cfa4001 --- /dev/null +++ b/coin/provisioning/qtci-windows-11_23H2-aarch64/90-libusb.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\libusb.ps1" diff --git a/coin/provisioning/qtci-windows-11_23H2-aarch64/90-python-modules.ps1 b/coin/provisioning/qtci-windows-11_23H2-aarch64/90-python-modules.ps1 new file mode 100644 index 00000000000..adf9e30b530 --- /dev/null +++ b/coin/provisioning/qtci-windows-11_23H2-aarch64/90-python-modules.ps1 @@ -0,0 +1,5 @@ +. "$PSScriptRoot\..\common\windows\helpers.ps1" + +# Needed by packaging scripts +$scriptsPath = [System.Environment]::GetEnvironmentVariable('PIP3_PATH', [System.EnvironmentVariableTarget]::Machine) +Run-Executable "$scriptsPath\pip3.exe" "install bs4" diff --git a/coin/provisioning/qtci-windows-11_23H2-aarch64/90-squish.ps1 b/coin/provisioning/qtci-windows-11_23H2-aarch64/90-squish.ps1 new file mode 100644 index 00000000000..ff758845941 --- /dev/null +++ b/coin/provisioning/qtci-windows-11_23H2-aarch64/90-squish.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\squishInstall.ps1" diff --git a/coin/provisioning/qtci-windows-11_23H2-aarch64/91-install-azure-tool.ps1 b/coin/provisioning/qtci-windows-11_23H2-aarch64/91-install-azure-tool.ps1 new file mode 100644 index 00000000000..f1d5acc390e --- /dev/null +++ b/coin/provisioning/qtci-windows-11_23H2-aarch64/91-install-azure-tool.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-azure-tool.ps1" diff --git a/coin/provisioning/qtci-windows-11_23H2-aarch64/96-disable-windows-module-installer.ps1 b/coin/provisioning/qtci-windows-11_23H2-aarch64/96-disable-windows-module-installer.ps1 new file mode 100644 index 00000000000..fb8ec54157a --- /dev/null +++ b/coin/provisioning/qtci-windows-11_23H2-aarch64/96-disable-windows-module-installer.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-windows-module-installer.ps1" diff --git a/coin/provisioning/qtci-windows-11_23H2-aarch64/98-unset-proxy.ps1 b/coin/provisioning/qtci-windows-11_23H2-aarch64/98-unset-proxy.ps1 new file mode 100644 index 00000000000..0c25a0fb1aa --- /dev/null +++ b/coin/provisioning/qtci-windows-11_23H2-aarch64/98-unset-proxy.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\unset-proxy.ps1" diff --git a/coin/provisioning/qtci-windows-11_23H2-aarch64/99-share-test-folders.ps1 b/coin/provisioning/qtci-windows-11_23H2-aarch64/99-share-test-folders.ps1 new file mode 100644 index 00000000000..576fcfdc373 --- /dev/null +++ b/coin/provisioning/qtci-windows-11_23H2-aarch64/99-share-test-folders.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\share-test-folders.ps1" diff --git a/coin/provisioning/qtci-windows-11_23H2-aarch64/99-version.ps1 b/coin/provisioning/qtci-windows-11_23H2-aarch64/99-version.ps1 new file mode 100644 index 00000000000..36e498bcf95 --- /dev/null +++ b/coin/provisioning/qtci-windows-11_23H2-aarch64/99-version.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\version.ps1" From b2591e3d74fd1ed7689b683c388eb86b05bf0a26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Wed, 23 Jul 2025 12:23:46 +0300 Subject: [PATCH 150/204] Provisioning: Use bullseye-backports repo from archive Bullseye-backports has reached end-of-life and is no longer supported or updated. Pick-to: 6.8 Change-Id: If154155507e159333c0d0b638fc6910b1814665a Reviewed-by: Patrik Teivonen (cherry picked from commit 8882c8cac407eecbefe9fbe00def984ce05e71f3) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit ab6e833690f8942d4ba58f7e86239d86dc242372) --- coin/provisioning/qtci-linux-Debian-11.6-aarch64/02-apt.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/qtci-linux-Debian-11.6-aarch64/02-apt.sh b/coin/provisioning/qtci-linux-Debian-11.6-aarch64/02-apt.sh index eedc8a68dfe..bd83f96c0bb 100755 --- a/coin/provisioning/qtci-linux-Debian-11.6-aarch64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Debian-11.6-aarch64/02-apt.sh @@ -21,9 +21,9 @@ done echo "Using public repositories for now. Repo-clones isn't set yet for Debian use" # (ping -c 3 repo-clones.ci.qt.io && set_internal_repo) || echo "Internal package repository not found. Using public repositories." -echo "deb http://deb.debian.org/debian bullseye-backports main" | sudo tee -a /etc/apt/sources.list -echo "deb-src http://deb.debian.org/debian bullseye-backports main" | sudo tee -a /etc/apt/sources.list +echo "deb https://archive.debian.org/debian bullseye-backports main" | sudo tee -a /etc/apt/sources.list +echo "deb-src https://archive.debian.org/debian bullseye-backports main" | sudo tee -a /etc/apt/sources.list # Make sure needed ca-certificates are available installPackages+=(ca-certificates) # Git is not needed by builds themselves, but is nice to have From 1e32bb0afebf1c62d10a520821cf1e0d34e4f70d Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 31 Jul 2025 01:36:24 +0000 Subject: [PATCH 151/204] Update submodules on '6.9 in qt/qt5' Change-Id: I5d6c2184e0b6bed2828f32eb1d36afbab324ecad 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 2bc4e286760..d839af06e0f 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 2bc4e286760dace59aa631edf99f9422e7dc4855 +Subproject commit d839af06e0f0fef829a84e5c4e24dece89757812 diff --git a/qt5compat b/qt5compat index 2f17cb7cf6e..d0d7dedaea8 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 2f17cb7cf6eb1ae3e99795441c3fbd3a1d5d0b62 +Subproject commit d0d7dedaea89bdc9d2be27e7727dd3f8bbaa7f19 diff --git a/qtactiveqt b/qtactiveqt index 44e25a182ef..caa5d56fca2 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 44e25a182efc00c75fa9f4d301d71e700f5fdf82 +Subproject commit caa5d56fca212cdd04b0247e541d3ae8825702b4 diff --git a/qtbase b/qtbase index d1586ebd89b..c4f1c6ebf82 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit d1586ebd89b4db4343d42fb8258bd5cb1c7aa12b +Subproject commit c4f1c6ebf8281fe3467fcab722a4242f57ce0790 diff --git a/qtcharts b/qtcharts index 5803acb5b98..32960ef5013 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 5803acb5b980be1da44a36a704f771d6243faaf6 +Subproject commit 32960ef50130b080cef9374e4caa32a5c49053f7 diff --git a/qtcoap b/qtcoap index 029269e05c3..2c224a5e671 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit 029269e05c304a670b4487ad18f3da76892600c9 +Subproject commit 2c224a5e67185ce4cc5151f54619a3529aeff3c3 diff --git a/qtconnectivity b/qtconnectivity index f354da467cd..a55ec80ce3b 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit f354da467cd8daae80d5371d739892325abd44f4 +Subproject commit a55ec80ce3b5b6f08ba3d82af4b97dcade71dc98 diff --git a/qtdatavis3d b/qtdatavis3d index 30d2dd7c999..f10e70f545a 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 30d2dd7c999891d14e510a1a0120d6bdb4ddca59 +Subproject commit f10e70f545afd67aefa7c180cb68473b79587240 diff --git a/qtdeclarative b/qtdeclarative index 23b906184c6..b6b92b223b4 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 23b906184c6929e3a94965f561c0bd87679e2f7a +Subproject commit b6b92b223b4d6996dcd8ddbea257262975decb42 diff --git a/qtdoc b/qtdoc index 3b45cce4a4b..f4b56c54780 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 3b45cce4a4bc94dcc07fe463067052e0b1ab70ea +Subproject commit f4b56c547802b66aaacbceb5df72e00b522e2883 diff --git a/qtgraphs b/qtgraphs index 6ef76ef35e9..65a47c35410 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit 6ef76ef35e981f80e16658ad487104e7e8655367 +Subproject commit 65a47c35410fce99606113160da982877afdd7dc diff --git a/qtgrpc b/qtgrpc index c24d1fc5e58..6b178fb57d1 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit c24d1fc5e58b1dcbef0152c105dc04aa8ce7a354 +Subproject commit 6b178fb57d184139046b4a4d5fed57a9cec65e1f diff --git a/qthttpserver b/qthttpserver index 6c04896d6b5..4d026537e79 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit 6c04896d6b516af85b556c4aa211b2c386adbb66 +Subproject commit 4d026537e792934559f8dd927cf6f3ff0de973f0 diff --git a/qtimageformats b/qtimageformats index da951e9d9a9..e95f15bc7bc 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit da951e9d9a937382e5687941cb94867dbc548f46 +Subproject commit e95f15bc7bcbab51cd13b31b6165acea796905fb diff --git a/qtlanguageserver b/qtlanguageserver index e6d9c65c677..010d1a78117 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit e6d9c65c677d920a69a8d32d73f82b61f11c3a46 +Subproject commit 010d1a78117e049a66b412ac3b13de0057d69485 diff --git a/qtlocation b/qtlocation index b09caa04c9f..417fa451312 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit b09caa04c9fea9a91ec9adcfffb451f6f16277af +Subproject commit 417fa4513124c5b075b19351783188666444625d diff --git a/qtlottie b/qtlottie index cd21e198b2b..de67d7b8ae9 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit cd21e198b2bfdc4441779f1e3a81b68bf1a2e2fa +Subproject commit de67d7b8ae9643366ebdaa03852e2602436cf010 diff --git a/qtmqtt b/qtmqtt index 5caf4bfc335..d8841177ebe 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit 5caf4bfc335126cd40d69a6a3300e88ae142ca90 +Subproject commit d8841177ebe41359cc7f3a243ed845bf5b5f680d diff --git a/qtmultimedia b/qtmultimedia index c34d1dce85c..d653510bd12 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit c34d1dce85c0f28cf74975d358a37e3d76786b81 +Subproject commit d653510bd12ca1405c1718fef128ee46f6ef1c43 diff --git a/qtnetworkauth b/qtnetworkauth index 75f3e54983e..e964178f35c 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 75f3e54983e638f452878dd5fa009484afcb9cfe +Subproject commit e964178f35c3a418993fc2033eada69323316e8d diff --git a/qtopcua b/qtopcua index dab6d3f3140..fc982b57920 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit dab6d3f3140cfb1267e21c6a8305e884c8607ec0 +Subproject commit fc982b57920ca4e0a74c506af0371d7826435d8d diff --git a/qtpositioning b/qtpositioning index 09b999d9ab3..da7f8c9eca8 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit 09b999d9ab3c881db50e58bac1663ae4b11149b7 +Subproject commit da7f8c9eca867f4864b6bbbb37a1e99649bd1b4d diff --git a/qtquick3d b/qtquick3d index a3c8f39353b..ac0b29032ec 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit a3c8f39353b776fbd6c016f90a4835af4b1ab201 +Subproject commit ac0b29032ecd32eef1bbfe455d72c2361011340c diff --git a/qtquick3dphysics b/qtquick3dphysics index d72b33f5e2c..338b25ea6a0 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit d72b33f5e2ce8d8a9810479952cf72e47cdf15c5 +Subproject commit 338b25ea6a01574f1dcfef06fcb6059c310ec33a diff --git a/qtquickeffectmaker b/qtquickeffectmaker index 26c339d25c3..cf4f1bd9218 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit 26c339d25c3b50c9b03a155b703dbf2a65534779 +Subproject commit cf4f1bd9218fb2c6ef4eb4af5db89ee5e07bed92 diff --git a/qtquicktimeline b/qtquicktimeline index 5f755e4499b..df0abb8db18 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 5f755e4499b48667e9576fd702ca0b7e928100dc +Subproject commit df0abb8db18483df85ee6889ae08b56ba98da74d diff --git a/qtremoteobjects b/qtremoteobjects index 97bcb187636..8d4ab85ae42 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 97bcb187636eaa8e2dbdbb0b791b07e4a1ab9e09 +Subproject commit 8d4ab85ae42d70d30f575e875ce485858cd6fa55 diff --git a/qtscxml b/qtscxml index 32bbd807f4b..7a8200c6308 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 32bbd807f4bc2a3bb24c05a86bd2e9334b5e001d +Subproject commit 7a8200c63082e1c12a786e3e385d40db848be797 diff --git a/qtsensors b/qtsensors index fa734f92281..26b0fdd5061 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit fa734f9228103fd68533ae64397413bf764d3a9d +Subproject commit 26b0fdd5061b41dbcb1fa94a0e849f13a5dcde13 diff --git a/qtserialbus b/qtserialbus index c2ef4e58455..4b520526261 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit c2ef4e584554cc6c029d7caa8e25a02bf7adfa6d +Subproject commit 4b52052626173e281cba884e007b270d730f2302 diff --git a/qtserialport b/qtserialport index bd33368004c..faf643e18cb 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit bd33368004cd294761bed4ab4622fcf346864dd1 +Subproject commit faf643e18cb0f0b32b83c6f094bfea51b34572d0 diff --git a/qtshadertools b/qtshadertools index 3fb86c73373..7b6a9e3ac0c 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 3fb86c733733dc331c17995afa6fbb3f33b00fb2 +Subproject commit 7b6a9e3ac0c36f198a09e7c21a350cc513bfda21 diff --git a/qtspeech b/qtspeech index 61fd1366803..8bbcd112f58 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 61fd1366803dc5dda2dd0dad39233d574fd9f25a +Subproject commit 8bbcd112f58390fb41e765c5f1755a262ebed496 diff --git a/qtsvg b/qtsvg index fa99a2f9117..88926a70579 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit fa99a2f9117c7a721022229ad2587410b7373d83 +Subproject commit 88926a70579ef75be580ff7da54f7abf4a4efcba diff --git a/qttools b/qttools index c96d4890ac5..5f3e3ca5a54 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit c96d4890ac5f9ffb216385ae75e376625656b6c2 +Subproject commit 5f3e3ca5a54aa495af9ea1440b7833ffa0d6b7d5 diff --git a/qttranslations b/qttranslations index 34eb532565f..6247c9e7e24 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 34eb532565f8582338f47edc1d6fafa59b2d7abc +Subproject commit 6247c9e7e249e39fc8bfc0e5c7c6f52cdfd781f8 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 872d0fd2025..b90a91401d2 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 872d0fd2025d925c94589d7a5177e057076c4c08 +Subproject commit b90a91401d2e3b4743f7558e0e30a73f7301e03b diff --git a/qtwayland b/qtwayland index eec52200c53..742bf775457 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit eec52200c53740a56f6515144924077c1682a3ba +Subproject commit 742bf7754577690a68bb2ae5bdf15b000daede6e diff --git a/qtwebchannel b/qtwebchannel index 6eb5f921a32..43556fd13c8 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 6eb5f921a32edd9930bb4c13bf22cf76c23a99df +Subproject commit 43556fd13c89a202f9bdfba5261393f8942531d0 diff --git a/qtwebengine b/qtwebengine index 28e1fadfb1a..c812f6bbeaf 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 28e1fadfb1a735c279eec8a211d86436794f8ba5 +Subproject commit c812f6bbeafa35fdeee1bb1ea66e49d9b1ffb4ef diff --git a/qtwebsockets b/qtwebsockets index dd590d89a5a..47b9dc94b59 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit dd590d89a5a17805773f907c75008a0445befcdf +Subproject commit 47b9dc94b59fb674693c2ceca77162066365716b diff --git a/qtwebview b/qtwebview index 68eaef18b51..78817433e2c 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 68eaef18b514f58dfcf9bf157784c2e30a697243 +Subproject commit 78817433e2c7174e83a39374b3a76cae2f4c91df From 9a6e5f970ba28036eb9e68e78404433a835de238 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 1 Aug 2025 15:27:30 +0000 Subject: [PATCH 152/204] Update submodules on '6.9 in qt/qt5' Change-Id: I7a43f58b1b11cc68da3781ef73b0f33cb48114ad 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 d839af06e0f..032611c2818 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit d839af06e0f0fef829a84e5c4e24dece89757812 +Subproject commit 032611c281830c0a59b779248219d09d1ad82f2a diff --git a/qt5compat b/qt5compat index d0d7dedaea8..b75016e9c38 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit d0d7dedaea89bdc9d2be27e7727dd3f8bbaa7f19 +Subproject commit b75016e9c3838836660334f67be37a5681c51bdd diff --git a/qtactiveqt b/qtactiveqt index caa5d56fca2..3763a7aa8ec 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit caa5d56fca212cdd04b0247e541d3ae8825702b4 +Subproject commit 3763a7aa8ec25876b4a9df8cf25d140e9154c797 diff --git a/qtbase b/qtbase index c4f1c6ebf82..36494230c57 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit c4f1c6ebf8281fe3467fcab722a4242f57ce0790 +Subproject commit 36494230c57ebb838856d1e71b86107858a87b96 diff --git a/qtcharts b/qtcharts index 32960ef5013..411a984e741 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 32960ef50130b080cef9374e4caa32a5c49053f7 +Subproject commit 411a984e7410df8814fce7295358da72f4e4a5ff diff --git a/qtcoap b/qtcoap index 2c224a5e671..8c7423a3600 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit 2c224a5e67185ce4cc5151f54619a3529aeff3c3 +Subproject commit 8c7423a3600f44965407a465f8f5d218875042ca diff --git a/qtconnectivity b/qtconnectivity index a55ec80ce3b..538389aea41 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit a55ec80ce3b5b6f08ba3d82af4b97dcade71dc98 +Subproject commit 538389aea41580bef691cdb9321d4478b3e2e398 diff --git a/qtdatavis3d b/qtdatavis3d index f10e70f545a..9d38d21b819 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit f10e70f545afd67aefa7c180cb68473b79587240 +Subproject commit 9d38d21b8194f6daaab52d3361265ded4bf468e9 diff --git a/qtdeclarative b/qtdeclarative index b6b92b223b4..252691c01e6 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit b6b92b223b4d6996dcd8ddbea257262975decb42 +Subproject commit 252691c01e65fda9a7871275fd1db055c4c79072 diff --git a/qtdoc b/qtdoc index f4b56c54780..6092788f7be 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit f4b56c547802b66aaacbceb5df72e00b522e2883 +Subproject commit 6092788f7bea7c479cf18482f97031cc2bc9ede9 diff --git a/qtgraphs b/qtgraphs index 65a47c35410..8b57ce79a16 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit 65a47c35410fce99606113160da982877afdd7dc +Subproject commit 8b57ce79a16cd2dfc44ae216f754c3ce730b74f6 diff --git a/qtgrpc b/qtgrpc index 6b178fb57d1..fd523015985 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit 6b178fb57d184139046b4a4d5fed57a9cec65e1f +Subproject commit fd523015985d25ee36ddddd093bb1c2df372b4a4 diff --git a/qthttpserver b/qthttpserver index 4d026537e79..ca631a073c4 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit 4d026537e792934559f8dd927cf6f3ff0de973f0 +Subproject commit ca631a073c4dd82fdb4fab428d8fd15ac13dc8d6 diff --git a/qtimageformats b/qtimageformats index e95f15bc7bc..757c1c38d5d 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit e95f15bc7bcbab51cd13b31b6165acea796905fb +Subproject commit 757c1c38d5d681b366273f1f9ab30fc933e35230 diff --git a/qtlanguageserver b/qtlanguageserver index 010d1a78117..f9c7810b979 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit 010d1a78117e049a66b412ac3b13de0057d69485 +Subproject commit f9c7810b97904e115fb2de386d729910007d647d diff --git a/qtlocation b/qtlocation index 417fa451312..d7a25efc6a8 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 417fa4513124c5b075b19351783188666444625d +Subproject commit d7a25efc6a88dbdc3c47e6d132c5a232b865550f diff --git a/qtlottie b/qtlottie index de67d7b8ae9..5fa762cecbf 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit de67d7b8ae9643366ebdaa03852e2602436cf010 +Subproject commit 5fa762cecbf2f897375d058c0c609849725c7b88 diff --git a/qtmqtt b/qtmqtt index d8841177ebe..8798aee928a 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit d8841177ebe41359cc7f3a243ed845bf5b5f680d +Subproject commit 8798aee928a04bdc9170bb653c9d843a3be80d5b diff --git a/qtmultimedia b/qtmultimedia index d653510bd12..809f30eed7b 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit d653510bd12ca1405c1718fef128ee46f6ef1c43 +Subproject commit 809f30eed7b45526fc52ea819b08d7a3252466ea diff --git a/qtnetworkauth b/qtnetworkauth index e964178f35c..2b79446c4e2 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit e964178f35c3a418993fc2033eada69323316e8d +Subproject commit 2b79446c4e276a3c99616eb1f7cb7742fe0288ee diff --git a/qtopcua b/qtopcua index fc982b57920..828b8d1aed1 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit fc982b57920ca4e0a74c506af0371d7826435d8d +Subproject commit 828b8d1aed19699d551c16138a1399398673b5e9 diff --git a/qtpositioning b/qtpositioning index da7f8c9eca8..c8346982ec0 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit da7f8c9eca867f4864b6bbbb37a1e99649bd1b4d +Subproject commit c8346982ec0617bf55171226d42b5875356e6068 diff --git a/qtquick3d b/qtquick3d index ac0b29032ec..ec85c749556 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit ac0b29032ecd32eef1bbfe455d72c2361011340c +Subproject commit ec85c749556970823817b163cbbb5e62e3179a8d diff --git a/qtquick3dphysics b/qtquick3dphysics index 338b25ea6a0..34224825fb0 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit 338b25ea6a01574f1dcfef06fcb6059c310ec33a +Subproject commit 34224825fb05df8d5fa736824a4c480ba1da5ab0 diff --git a/qtquickeffectmaker b/qtquickeffectmaker index cf4f1bd9218..cd7e2ac573e 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit cf4f1bd9218fb2c6ef4eb4af5db89ee5e07bed92 +Subproject commit cd7e2ac573efb28affc42c047704fa1af9e68a16 diff --git a/qtquicktimeline b/qtquicktimeline index df0abb8db18..38216cec7a1 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit df0abb8db18483df85ee6889ae08b56ba98da74d +Subproject commit 38216cec7a18d2b8090bbfaa5ec9b19806a97660 diff --git a/qtremoteobjects b/qtremoteobjects index 8d4ab85ae42..c61fc2ef357 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 8d4ab85ae42d70d30f575e875ce485858cd6fa55 +Subproject commit c61fc2ef357baadf3b87a99b15593a1fde2a99ba diff --git a/qtscxml b/qtscxml index 7a8200c6308..903af5a3ba5 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 7a8200c63082e1c12a786e3e385d40db848be797 +Subproject commit 903af5a3ba5378a15fea3b5a47177ccd50455c17 diff --git a/qtsensors b/qtsensors index 26b0fdd5061..b4a99ec1d88 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 26b0fdd5061b41dbcb1fa94a0e849f13a5dcde13 +Subproject commit b4a99ec1d8832fd05ed8d394dd9db54ceed6d57f diff --git a/qtserialbus b/qtserialbus index 4b520526261..ff23921eee1 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 4b52052626173e281cba884e007b270d730f2302 +Subproject commit ff23921eee1dc9483dfbdc86f87ef1aadc16ac68 diff --git a/qtserialport b/qtserialport index faf643e18cb..29d1ed63a68 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit faf643e18cb0f0b32b83c6f094bfea51b34572d0 +Subproject commit 29d1ed63a682b87bba406618716399a4ee0a7e22 diff --git a/qtshadertools b/qtshadertools index 7b6a9e3ac0c..a94f9912ac9 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 7b6a9e3ac0c36f198a09e7c21a350cc513bfda21 +Subproject commit a94f9912ac9429cdbea30f29dd85ca8ebbaee70c diff --git a/qtspeech b/qtspeech index 8bbcd112f58..1bffab2cbe9 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 8bbcd112f58390fb41e765c5f1755a262ebed496 +Subproject commit 1bffab2cbe96ece4dc98a8c8fb07a514a0d137ef diff --git a/qtsvg b/qtsvg index 88926a70579..f1436130cfa 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 88926a70579ef75be580ff7da54f7abf4a4efcba +Subproject commit f1436130cfad52f1b9867f7c3598b6ccf76ef15e diff --git a/qttools b/qttools index 5f3e3ca5a54..2da44f52928 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 5f3e3ca5a54aa495af9ea1440b7833ffa0d6b7d5 +Subproject commit 2da44f529286c6d4e75e0baf53212767bf8de9db diff --git a/qttranslations b/qttranslations index 6247c9e7e24..f9719f515ee 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 6247c9e7e249e39fc8bfc0e5c7c6f52cdfd781f8 +Subproject commit f9719f515ee302ec05069f68fee5da8f4437d2b6 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index b90a91401d2..1b0566e8ecc 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit b90a91401d2e3b4743f7558e0e30a73f7301e03b +Subproject commit 1b0566e8ecc8ff7d8ba1af085a0222941906212a diff --git a/qtwayland b/qtwayland index 742bf775457..aa50d435b53 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 742bf7754577690a68bb2ae5bdf15b000daede6e +Subproject commit aa50d435b53720fe36995e6d6f04d5983109c9c1 diff --git a/qtwebchannel b/qtwebchannel index 43556fd13c8..a566779507d 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 43556fd13c89a202f9bdfba5261393f8942531d0 +Subproject commit a566779507dd84de87476438531d54e40a4dd8cb diff --git a/qtwebengine b/qtwebengine index c812f6bbeaf..f7eed132964 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit c812f6bbeafa35fdeee1bb1ea66e49d9b1ffb4ef +Subproject commit f7eed1329640f1eb8c22960ee4d910f3f575822f diff --git a/qtwebsockets b/qtwebsockets index 47b9dc94b59..c02a036ddc8 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 47b9dc94b59fb674693c2ceca77162066365716b +Subproject commit c02a036ddc8a96f1a54d0e56efa8b0a18d704b6c diff --git a/qtwebview b/qtwebview index 78817433e2c..30620d30b94 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 78817433e2c7174e83a39374b3a76cae2f4c91df +Subproject commit 30620d30b94662f9050579c247f504828f0e2f3f From 57e0221b58c6f0db350641484f1edf9d145b46f2 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 5 Aug 2025 06:10:13 +0000 Subject: [PATCH 153/204] Update submodules on '6.9 in qt/qt5' Change-Id: Id8a6c8e3539849efb61d93946d05f5c8bc180b54 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 032611c2818..e32ae4fcf6a 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 032611c281830c0a59b779248219d09d1ad82f2a +Subproject commit e32ae4fcf6af5636ba5e0b3fd4a6e553ff4586e6 diff --git a/qt5compat b/qt5compat index b75016e9c38..c0c7ee24042 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit b75016e9c3838836660334f67be37a5681c51bdd +Subproject commit c0c7ee240421e83474cb736f5532cb0026a1f746 diff --git a/qtactiveqt b/qtactiveqt index 3763a7aa8ec..786f47b3bf8 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 3763a7aa8ec25876b4a9df8cf25d140e9154c797 +Subproject commit 786f47b3bf8960d1b8affc2ef31a2d37773fbd46 diff --git a/qtbase b/qtbase index 36494230c57..a538f0a1601 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 36494230c57ebb838856d1e71b86107858a87b96 +Subproject commit a538f0a1601e96f5a6f61cae5547f594fa3d2e55 diff --git a/qtcharts b/qtcharts index 411a984e741..72a276bf17c 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 411a984e7410df8814fce7295358da72f4e4a5ff +Subproject commit 72a276bf17cf93822845807a730dd9cd8ade9083 diff --git a/qtcoap b/qtcoap index 8c7423a3600..81665b69ae4 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit 8c7423a3600f44965407a465f8f5d218875042ca +Subproject commit 81665b69ae42ed71e8cf2c705b444a7f4bd01602 diff --git a/qtconnectivity b/qtconnectivity index 538389aea41..dea30122764 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 538389aea41580bef691cdb9321d4478b3e2e398 +Subproject commit dea301227648192675257ab87914766ff58f153f diff --git a/qtdatavis3d b/qtdatavis3d index 9d38d21b819..e39704fe54e 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 9d38d21b8194f6daaab52d3361265ded4bf468e9 +Subproject commit e39704fe54ec05cb4d85ddaf71de53c3bde0d9d8 diff --git a/qtdeclarative b/qtdeclarative index 252691c01e6..4e6303870ea 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 252691c01e65fda9a7871275fd1db055c4c79072 +Subproject commit 4e6303870eab38450ee3805ff1654ea53e76ad10 diff --git a/qtdoc b/qtdoc index 6092788f7be..9fd6eb7c1ad 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 6092788f7bea7c479cf18482f97031cc2bc9ede9 +Subproject commit 9fd6eb7c1adfefe7e087771aa4eaf85231dfc7d7 diff --git a/qtgraphs b/qtgraphs index 8b57ce79a16..d30f25d43d2 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit 8b57ce79a16cd2dfc44ae216f754c3ce730b74f6 +Subproject commit d30f25d43d22a06004a52ecb53f106e94ebc6f65 diff --git a/qtgrpc b/qtgrpc index fd523015985..e589950c3ab 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit fd523015985d25ee36ddddd093bb1c2df372b4a4 +Subproject commit e589950c3abddea80c3f2a03d50b11d306554f94 diff --git a/qthttpserver b/qthttpserver index ca631a073c4..3a40185c045 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit ca631a073c4dd82fdb4fab428d8fd15ac13dc8d6 +Subproject commit 3a40185c045fc6c7ef5cd089d0318c08cded22b1 diff --git a/qtimageformats b/qtimageformats index 757c1c38d5d..6897af2f4e2 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 757c1c38d5d681b366273f1f9ab30fc933e35230 +Subproject commit 6897af2f4e268eba7cbeaacd003941dcf70e32fa diff --git a/qtlanguageserver b/qtlanguageserver index f9c7810b979..cf04fadffdd 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit f9c7810b97904e115fb2de386d729910007d647d +Subproject commit cf04fadffddade52057eedcb0edb9424457b911e diff --git a/qtlocation b/qtlocation index d7a25efc6a8..a8fea64f0f1 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit d7a25efc6a88dbdc3c47e6d132c5a232b865550f +Subproject commit a8fea64f0f148960efd2b7a2cc6291e631c15e0a diff --git a/qtlottie b/qtlottie index 5fa762cecbf..d6fa00980a7 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 5fa762cecbf2f897375d058c0c609849725c7b88 +Subproject commit d6fa00980a7f553c8eea778e9abfe8d2911cfb4c diff --git a/qtmqtt b/qtmqtt index 8798aee928a..f2b7088422a 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit 8798aee928a04bdc9170bb653c9d843a3be80d5b +Subproject commit f2b7088422a9c6d84a6dd4c4166d35a3b3c69b15 diff --git a/qtmultimedia b/qtmultimedia index 809f30eed7b..d9b88bef166 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 809f30eed7b45526fc52ea819b08d7a3252466ea +Subproject commit d9b88bef1667b228f7256c5db8d00400cdae52cf diff --git a/qtnetworkauth b/qtnetworkauth index 2b79446c4e2..b735dd1926e 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 2b79446c4e276a3c99616eb1f7cb7742fe0288ee +Subproject commit b735dd1926e08f7c889693ee1dc8ee825a7db092 diff --git a/qtopcua b/qtopcua index 828b8d1aed1..007bdbfc66e 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit 828b8d1aed19699d551c16138a1399398673b5e9 +Subproject commit 007bdbfc66eaf9d0b875873b25b34986500188aa diff --git a/qtpositioning b/qtpositioning index c8346982ec0..a3c47f1c00e 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit c8346982ec0617bf55171226d42b5875356e6068 +Subproject commit a3c47f1c00e3f12202babb894acacfb4d446afba diff --git a/qtquick3d b/qtquick3d index ec85c749556..9c3cd6abb98 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit ec85c749556970823817b163cbbb5e62e3179a8d +Subproject commit 9c3cd6abb989436074bbf211bac09d6748443b74 diff --git a/qtquick3dphysics b/qtquick3dphysics index 34224825fb0..8add53b1a5d 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit 34224825fb05df8d5fa736824a4c480ba1da5ab0 +Subproject commit 8add53b1a5d93fdff45f0f30fd080d7793c63dad diff --git a/qtquickeffectmaker b/qtquickeffectmaker index cd7e2ac573e..8d111ae45cf 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit cd7e2ac573efb28affc42c047704fa1af9e68a16 +Subproject commit 8d111ae45cfdfe2a7d56a12e049c88ef9339c3d8 diff --git a/qtquicktimeline b/qtquicktimeline index 38216cec7a1..935853b6797 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 38216cec7a18d2b8090bbfaa5ec9b19806a97660 +Subproject commit 935853b67972046885eacee0166b0df827fa26c0 diff --git a/qtremoteobjects b/qtremoteobjects index c61fc2ef357..f7ad9202c36 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit c61fc2ef357baadf3b87a99b15593a1fde2a99ba +Subproject commit f7ad9202c36c908efb6e311621a3488f4870b806 diff --git a/qtscxml b/qtscxml index 903af5a3ba5..b024d02b7d2 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 903af5a3ba5378a15fea3b5a47177ccd50455c17 +Subproject commit b024d02b7d2f86799f0a3964cbd0f57f625327a5 diff --git a/qtsensors b/qtsensors index b4a99ec1d88..4efd225ac67 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit b4a99ec1d8832fd05ed8d394dd9db54ceed6d57f +Subproject commit 4efd225ac6787c0fdec747fbd50b8b8d057f177b diff --git a/qtserialbus b/qtserialbus index ff23921eee1..ce27632ffb4 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit ff23921eee1dc9483dfbdc86f87ef1aadc16ac68 +Subproject commit ce27632ffb4d87a40c183f117c6605763768ba3d diff --git a/qtserialport b/qtserialport index 29d1ed63a68..c683eb53691 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 29d1ed63a682b87bba406618716399a4ee0a7e22 +Subproject commit c683eb53691fc0e2263c76479e41f81e633359b4 diff --git a/qtshadertools b/qtshadertools index a94f9912ac9..5cb2829a35a 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit a94f9912ac9429cdbea30f29dd85ca8ebbaee70c +Subproject commit 5cb2829a35a9123a7a5f76e30077238dea8e5b36 diff --git a/qtspeech b/qtspeech index 1bffab2cbe9..046d3549aa2 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 1bffab2cbe96ece4dc98a8c8fb07a514a0d137ef +Subproject commit 046d3549aa231ffa16ad5c2d6a67bdddcd491a08 diff --git a/qtsvg b/qtsvg index f1436130cfa..1f0a4f3a4be 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit f1436130cfad52f1b9867f7c3598b6ccf76ef15e +Subproject commit 1f0a4f3a4be67e54c5af278e42089a67cf954f61 diff --git a/qttools b/qttools index 2da44f52928..0fc7b3a7567 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 2da44f529286c6d4e75e0baf53212767bf8de9db +Subproject commit 0fc7b3a7567fa5a0e5ec513a81ee4e9ffed173a3 diff --git a/qttranslations b/qttranslations index f9719f515ee..bef4a492afc 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit f9719f515ee302ec05069f68fee5da8f4437d2b6 +Subproject commit bef4a492afcc9f0b6bb1e6793b995d46f87efd34 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 1b0566e8ecc..a9e6a147775 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 1b0566e8ecc8ff7d8ba1af085a0222941906212a +Subproject commit a9e6a147775265bd3bc38db942b3dd204c496262 diff --git a/qtwayland b/qtwayland index aa50d435b53..ff39a09b46f 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit aa50d435b53720fe36995e6d6f04d5983109c9c1 +Subproject commit ff39a09b46fe978f90ffd7c8447d167495bdaf8b diff --git a/qtwebchannel b/qtwebchannel index a566779507d..fc640623aab 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit a566779507dd84de87476438531d54e40a4dd8cb +Subproject commit fc640623aabef3f9b9d3746e71a0992277448a90 diff --git a/qtwebengine b/qtwebengine index f7eed132964..76faf67d10d 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit f7eed1329640f1eb8c22960ee4d910f3f575822f +Subproject commit 76faf67d10d25e45cc3e07f3cce28a6f67d9957a diff --git a/qtwebsockets b/qtwebsockets index c02a036ddc8..4ed2544f0b6 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit c02a036ddc8a96f1a54d0e56efa8b0a18d704b6c +Subproject commit 4ed2544f0b6cad64f5bad2df52844528f946e8ad diff --git a/qtwebview b/qtwebview index 30620d30b94..d53d5092d3d 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 30620d30b94662f9050579c247f504828f0e2f3f +Subproject commit d53d5092d3da320eb1fe4134d2cf9a2461a815a5 From 20b2b5c720580cba392b3ee1351ecc108e9582a3 Mon Sep 17 00:00:00 2001 From: Elias Toivola Date: Thu, 31 Jul 2025 17:20:10 +0300 Subject: [PATCH 154/204] Android: split nightly targets into their own files This makes configuring nightlies more simple and its results more readable. Pick-to: 6.8 6.5 Task-number: QTQAINFRA-5945 Task-number: QTQAINFRA-7069 Change-Id: I89ca6b65fbdfcd52dd607c008174e446dc6925f4 Reviewed-by: Assam Boudjelthia (cherry picked from commit 737eb7aa6d03d3a2189e05d014b5981f06ccb75d) (cherry picked from commit 8a76f815cc8c456e3c99a6cc71fc0e78cb186e62) Reviewed-by: Qt Cherry-pick Bot --- .../nightly_android_namespace.yaml | 33 +++++++++++ .../nightly_android_ndk1.yaml | 58 +++++++++++++++++++ .../nightly_android_ndk2.yaml | 58 +++++++++++++++++++ 3 files changed, 149 insertions(+) create mode 100644 coin/platform_configs/nightly_android_namespace.yaml create mode 100644 coin/platform_configs/nightly_android_ndk1.yaml create mode 100644 coin/platform_configs/nightly_android_ndk2.yaml diff --git a/coin/platform_configs/nightly_android_namespace.yaml b/coin/platform_configs/nightly_android_namespace.yaml new file mode 100644 index 00000000000..42322185f6d --- /dev/null +++ b/coin/platform_configs/nightly_android_namespace.yaml @@ -0,0 +1,33 @@ +Version: 2 +Include: [ + cmake_platforms.yaml: [ + 'rhel-8.10' + ], + cmake_platforms_target_android.yaml: [ + 'android-15-x86_64-on-linux', + 'android-9-x86-on-linux' + ] +] +Configurations: [] +# Android nightly to check for -qtnamespace errors/issues +Overrides: +- + Id: 'android-15-x86_64-on-linux' + Features: ['Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure'] + Environment variables: [ + 'TARGET_CONFIGURE_ARGS=-qtnamespace TestNamespace -nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -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_LATEST}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', + 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_64_NDK_LATEST}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', + 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}', + 'ANDROID_EMULATOR=emulator_x86_64_api_35' + ] +- + Id: 'android-9-x86-on-linux' + Features: ['Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure'] + Environment variables: [ + 'TARGET_CONFIGURE_ARGS=-qtnamespace TestNamespace -nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -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_LATEST}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', + 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_NDK_LATEST}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', + 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}', + 'ANDROID_EMULATOR=emulator_x86_api_28' + ] diff --git a/coin/platform_configs/nightly_android_ndk1.yaml b/coin/platform_configs/nightly_android_ndk1.yaml new file mode 100644 index 00000000000..4ae4c9fc97a --- /dev/null +++ b/coin/platform_configs/nightly_android_ndk1.yaml @@ -0,0 +1,58 @@ +Version: 2 +Include: [ + cmake_platforms.yaml: [ + 'rhel-8.10', + 'windows-10_22h2-mingw13' + ], + cmake_platforms_target_android.yaml: [ + 'android-15-x86_64-on-linux', + 'android-9-x86-on-linux', + 'android-armv7-on-windows', + 'android-arm64-on-macos' + ], + macos.yaml: [ + 'macos-universal-on-arm64' + ] +] +Configurations: [] +# Android nightly to check for older (but still supported for the branch) NDKs +Overrides: +- + Id: 'android-15-x86_64-on-linux' + Features: ['Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'WarningsAreErrors'] + Environment variables: [ + 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_NIGHTLY1}} -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_NIGHTLY1}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', + 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_64_NDK_NIGHTLY1}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', + 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_NIGHTLY1}}', + 'ANDROID_EMULATOR=emulator_x86_64_api_35' + ] +- + Id: 'android-9-x86-on-linux' + Features: ['Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'WarningsAreErrors'] + Environment variables: [ + 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_NIGHTLY1}} -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_NIGHTLY1}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', + 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_NDK_NIGHTLY1}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', + 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_NIGHTLY1}}', + 'ANDROID_EMULATOR=emulator_x86_api_28' + ] +- + Id: 'android-armv7-on-windows' + Features: ['Sccache', 'WarningsAreErrors', 'DisableTests', 'UseConfigure'] + Environment variables: [ + 'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}', + 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_NIGHTLY1}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis armeabi-v7a -no-feature-pkg-config', + 'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_NIGHTLY1}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', + 'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH={{.Env.Protobuf_ROOT_mingw}} -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARMV7_NDK_NIGHTLY1}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR={{.Env.Protobuf_ROOT_msvc}}/include', + 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_NIGHTLY1}}' + ] +- + Id: 'android-arm64-on-macos' + Features: ['Sccache', 'WarningsAreErrors', 'DisableTests', 'UseConfigure'] + Environment variables: [ + 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_NIGHTLY1}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis arm64-v8a', + 'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_NIGHTLY1}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', + 'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH=/usr/local -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARM64_NDK_NIGHTLY1}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', + 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_NIGHTLY1}}' + ] diff --git a/coin/platform_configs/nightly_android_ndk2.yaml b/coin/platform_configs/nightly_android_ndk2.yaml new file mode 100644 index 00000000000..2441d047e75 --- /dev/null +++ b/coin/platform_configs/nightly_android_ndk2.yaml @@ -0,0 +1,58 @@ +Version: 2 +Include: [ + cmake_platforms.yaml: [ + 'rhel-8.10', + 'windows-10_22h2-mingw13' + ], + cmake_platforms_target_android.yaml: [ + 'android-15-x86_64-on-linux', + 'android-9-x86-on-linux', + 'android-armv7-on-windows', + 'android-arm64-on-macos' + ], + macos.yaml: [ + 'macos-universal-on-arm64' + ] +] +Configurations: [] +# Android nightly to check for older (but still supported for the branch) NDKs +Overrides: +- + Id: 'android-15-x86_64-on-linux' + Features: ['Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'WarningsAreErrors'] + Environment variables: [ + 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_NIGHTLY2}} -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_NIGHTLY2}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', + 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_64_NDK_NIGHTLY2}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', + 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_NIGHTLY2}}', + 'ANDROID_EMULATOR=emulator_x86_64_api_35' + ] +- + Id: 'android-9-x86-on-linux' + Features: ['Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'WarningsAreErrors'] + Environment variables: [ + 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_NIGHTLY2}} -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_NIGHTLY2}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', + 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_NDK_NIGHTLY2}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', + 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_NIGHTLY2}}', + 'ANDROID_EMULATOR=emulator_x86_api_28' + ] +- + Id: 'android-armv7-on-windows' + Features: ['Sccache', 'WarningsAreErrors', 'DisableTests', 'UseConfigure'] + Environment variables: [ + 'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}', + 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_NIGHTLY2}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis armeabi-v7a -no-feature-pkg-config', + 'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_NIGHTLY2}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', + 'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH={{.Env.Protobuf_ROOT_mingw}} -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARMV7_NDK_NIGHTLY2}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR={{.Env.Protobuf_ROOT_msvc}}/include', + 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_NIGHTLY2}}' + ] +- + Id: 'android-arm64-on-macos' + Features: ['Sccache', 'WarningsAreErrors', 'DisableTests', 'UseConfigure'] + Environment variables: [ + 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_NIGHTLY2}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis arm64-v8a', + 'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_NIGHTLY2}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', + 'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH=/usr/local -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARM64_NDK_NIGHTLY2}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', + 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_NIGHTLY2}}' + ] From 0622f99ca9f27e8b1f8273f0de294aeb8dbc7720 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 6 Aug 2025 14:24:40 +0200 Subject: [PATCH 155/204] Provisioning: Add arm64 libclang for Windows 11 24H2 So it can be used during cross-compilation of arm64 packages. To ensure the env variable set does not conflict with the x86_64 version, the env variable is suffixed with "arm64". Change-Id: I117f6c4a8431058b9af22390942539a49c632d6a Reviewed-by: Toni Saario (cherry picked from commit c3f303b50b3906ebc87b31a5433635268f1ad5f1) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 804108b9e3ff411d4e410f43531bb2ca1aff437b) Reviewed-by: Joerg Bornemann --- coin/provisioning/common/windows/libclang.ps1 | 6 +++++- .../qtci-windows-11_23H2-x86_64/08-libclang.ps1 | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/coin/provisioning/common/windows/libclang.ps1 b/coin/provisioning/common/windows/libclang.ps1 index 18f6bdef546..7693ed6eb41 100644 --- a/coin/provisioning/common/windows/libclang.ps1 +++ b/coin/provisioning/common/windows/libclang.ps1 @@ -1,7 +1,8 @@ param( [string]$archVer="32", [string]$toolchain="vs2022", - [bool]$setDefault=$true + [bool]$setDefault=$true, + [bool]$useArchInToolchainSuffix=$false ) . "$PSScriptRoot\helpers.ps1" @@ -71,6 +72,9 @@ if ( $toolchain -eq "llvm-mingw" ) { $toolchainSuffix = "llvm_mingw" } +if ( $useArchInToolchainSuffix ) { + $toolchainSuffix += "_$archVer" +} install $sha1 $baseDestination-$archVer diff --git a/coin/provisioning/qtci-windows-11_23H2-x86_64/08-libclang.ps1 b/coin/provisioning/qtci-windows-11_23H2-x86_64/08-libclang.ps1 index e6c78345381..da1548663e1 100644 --- a/coin/provisioning/qtci-windows-11_23H2-x86_64/08-libclang.ps1 +++ b/coin/provisioning/qtci-windows-11_23H2-x86_64/08-libclang.ps1 @@ -1,4 +1,5 @@ # Do not set the default LLVM_INSTALL_DIR for mingw, leave it with msvc for compat . "$PSScriptRoot\..\common\windows\libclang.ps1" 64 mingw $False . "$PSScriptRoot\..\common\windows\libclang.ps1" 64 llvm-mingw $False +. "$PSScriptRoot\..\common\windows\libclang.ps1" arm64 vs2022 $False $True . "$PSScriptRoot\..\common\windows\libclang.ps1" 64 vs2022 From b39e246b78ac85a9f545ae80321aa13cd5ead9c6 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 5 Aug 2025 17:05:25 +0200 Subject: [PATCH 156/204] CMake: Force build tools when cross-compiling for Windows ARM64 TLDR: We need force cross-build the compilation of WebEngine tools when cross-compiling for Windows ARM64, to ensure that native development on Windows ARM64 hosts can use the WebEngine tools. Long version: We have two packaging configurations for Windows ARM64. 1) we cross-compile 'Windows On Arm' Qt on an x64 Windows host. This configuration includes the WoA WebEngine libraries, but not the tools. 2) we build Windows on Arm Qt on a native arm64 windows host. This currently lacks the WebEngine libraries and tools, because it takes too much time to build them on native arm hosts in the CI. When installing WoA on a Windows host using the Qt online installer, there are three possible scenarios: a) Running the x64 installer on an x64 Windows host, to be able to cross-build projects targeting Windows on Arm. This will install an x64 MSVC host qt, and an arm64 WoA target Qt from case '1' above. The x64 qt includes the WebEngine libraries and tools, and the WoA qt only includes the libraries, but not the tools. For WoA project builds, the build system will use the x64 host tools. This works fine. b) Running the x64 installer on an arm64 Windows host. This is very similar to the 'a' case, except it involves emulation of the x64 host tools. This will install an x64 MSVC host qt, and an arm64 WoA target Qt. The x64 qt includes the WebEngine libraries and tools, and the WoA qt only includes the libraries, but not the tools. For WoA project builds, the build system will use the x64 host tools using /emulation/. This works fine, as long as x64 emulation is available and enabled. c) Running the arm64 installer on an arm64 Windows host. This will install the native arm64 WoA Qt from case '2' above. The arm64 qt includes arm libraries and tools from case '2', but that lacks the WebEngine libraries and tools. So the installer will also install the cross-compiled arm64 WebEngine libraries from case '1', but not the WebEngine tools (e.g. dict conversion tool). To ensure that scenario 'c' also gets WebEngine tools, we need to force build (cross-compile) the tools in scenario '1'. This patch achieves that by passing -DQT_FORCE_BUILD_TOOLS=ON , similar how we do it for yocto builds. Task-number: QTBUG-138859 Change-Id: I8270731a4afef7ab9af8df63326fb838e02968e8 Reviewed-by: Michal Klocek Reviewed-by: Alexey Edelev (cherry picked from commit 9254959ace4594528d9410570f4430e88763024e) Reviewed-by: Joerg Bornemann (cherry picked from commit b04f1bb9fa8aa94628cfbf17009d42325382f3fc) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/cmake_platforms.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 1d81671695c..2af72f56d40 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -171,11 +171,12 @@ Configurations: Environment variables: [ 'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}', 'TARGET_CONFIGURE_ARGS=-debug-and-release -force-debug-info -platform win32-arm64-msvc -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer -no-feature-run-opengl-tests', - 'TARGET_CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ROOT_DIR_x64_arm64}}', + 'TARGET_CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ROOT_DIR_x64_arm64}} -DQT_FORCE_BUILD_TOOLS=ON', 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC_ARM64}} -DQT_DEPLOY_FFMPEG=TRUE', 'OPENSSL_CONF_x64={{.Env.OPENSSL_CONF_x64_arm64}}', 'OPENSSL_INCLUDE_x64={{.Env.OPENSSL_INCLUDE_x64_arm64}}', 'OPENSSL_LIB_x64={{.Env.OPENSSL_LIB_x64_arm64}}', + 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc_arm64}}', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', ] - From 1e533481a35fe26975a918f3839374aa64701860 Mon Sep 17 00:00:00 2001 From: Pavel Dubsky Date: Tue, 22 Jul 2025 21:03:45 +0200 Subject: [PATCH 157/204] Enable zlib in FFmpeg configuration Fixes: QTBUG-103332 Pick-to: 6.8 6.5 Change-Id: I87a760edcd4d8a77966ec5a692cb1f1f4242b647 Reviewed-by: Artem Dyomin (cherry picked from commit f7af78977c65b157588f2b012a09a7b2c6718b34) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 707546820e278b058195c43147e91e33858673d6) --- coin/provisioning/common/windows/install-ffmpeg.ps1 | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/coin/provisioning/common/windows/install-ffmpeg.ps1 b/coin/provisioning/common/windows/install-ffmpeg.ps1 index ee8c2f2fc4c..7c019140ee3 100644 --- a/coin/provisioning/common/windows/install-ffmpeg.ps1 +++ b/coin/provisioning/common/windows/install-ffmpeg.ps1 @@ -2,6 +2,7 @@ # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only . "$PSScriptRoot\helpers.ps1" +. "$PSScriptRoot\zlib-helpers.ps1" # This script will install FFmpeg $msys = "C:\Utils\msys64\usr\bin\bash" @@ -105,6 +106,13 @@ function InstallMsvcFfmpeg { } } + $zlibPath = GetZlibPathByString -TargetArchitecture $arch + $zlibPath = $zlibPath -replace '\\', '/' + + $config += " --enable-zlib" + $config += " --extra-cflags=`"-I$zlibPath`"" + $config += " --extra-ldflags=`"-LIBPATH:$zlibPath`"" + $result = EnterVSDevShell -HostArch $hostArch -Arch $arch if (-Not $result) { return $false From 687dcede3149dd5a4164014b0d4afb73ca146544 Mon Sep 17 00:00:00 2001 From: Lars Sutterud Date: Thu, 7 Aug 2025 19:30:45 +0200 Subject: [PATCH 158/204] Temporarily remove open264 GStremer plugin from openSUSE builds on CI Fix build issue for openSUSE on CI, probably related to the gstreamer-plugin-openh264 plugin being obsolete for the latest gstreamer-plugins-bad package https://forums.opensuse.org/t/gstreamer-plugins-bad-wants-to-obsolete-gstreamer-plugin-openh264/186318 GStreamer tests are disabled on openSUSE anyway atm. Pick-to: 6.8 Change-Id: I6e19e655c8753de879d6bbf82e532d18b25a01cb Reviewed-by: Tim Blechmann Reviewed-by: Artem Dyomin (cherry picked from commit 9c0de61c896b70e41cfdc90cc4b500bd8a663d4d) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit e871bdae27e44bd6e4d522b21c7f42076dc05b0c) --- .../qtci-linux-openSUSE-15.5-x86_64/03-enable-repos.sh | 1 - .../qtci-linux-openSUSE-15.5-x86_64/04-zypperpackages.sh | 2 +- .../qtci-linux-openSUSE-15.6-x86_64/04-zypperpackages.sh | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/03-enable-repos.sh b/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/03-enable-repos.sh index 550a850cbbd..4dd0314f61d 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/03-enable-repos.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/03-enable-repos.sh @@ -8,6 +8,5 @@ sudo sed -i "s#baseurl=.*#baseurl=http://repo-clones.ci.qt.io/repos/opensuse/dis sudo sed -i "s#baseurl=.*#baseurl=http://repo-clones.ci.qt.io/repos/opensuse/distribution/leap/15.5/repo/non-oss/#g" /etc/zypp/repos.d/repo-non-oss.repo sudo sed -i "s#baseurl=.*#baseurl=http://repo-clones.ci.qt.io/repos/opensuse/update/leap/15.5/oss/#g" /etc/zypp/repos.d/repo-update.repo sudo sed -i "s#baseurl=.*#baseurl=http://repo-clones.ci.qt.io/repos/opensuse/update/leap/15.5/non-oss/#g" /etc/zypp/repos.d/repo-update-non-oss.repo -sudo sed -i "s#baseurl=.*#baseurl=http://repo-clones.ci.qt.io/repos/codecs.opensuse.org/openh264/openSUSE_Leap/#g" /etc/zypp/repos.d/repo-openh264.repo sudo zypper lr -u 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 69f3b420d6e..a590b50a42f 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 @@ -56,7 +56,7 @@ sudo zypper -nq install yasm # GStreamer (qtwebkit and qtmultimedia), pulseaudio (qtmultimedia) sudo zypper -nq install gstreamer-devel gstreamer-plugins-base-devel libpulse-devel pipewire-devel \ - gstreamer-1.20-plugin-openh264 gstreamer-plugins-bad-devel + gstreamer-plugins-bad-devel # cups sudo zypper -nq install cups-devel 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 e3c5cf9e0ab..925f27a66e4 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 @@ -52,7 +52,7 @@ sudo zypper -nq install libxml2-devel libxslt-devel sudo zypper -nq install yasm # GStreamer (qtwebkit and qtmultimedia), pulseaudio (qtmultimedia) -sudo zypper -nq install gstreamer-devel gstreamer-plugins-base-devel libpulse-devel pipewire-devel gstreamer-1.20-plugin-openh264 +sudo zypper -nq install gstreamer-devel gstreamer-plugins-base-devel libpulse-devel pipewire-devel # cups sudo zypper -nq install cups-devel From b083ff91ea3942f644cd3f769a1410344c9fb9c9 Mon Sep 17 00:00:00 2001 From: Tim Blechmann Date: Fri, 8 Aug 2025 09:43:09 +0800 Subject: [PATCH 159/204] provisioning: openSUSE-15.6 - fix gstreamer h264 codec installation the gstreamer-1.20-plugin-openh264 package seems to be outdated, as opensuse's openh264 repo seems to have moved to gstreamer-1.24 and renamed the package to gstreamer-plugin-openh264: https://codecs.opensuse.org/openh264/openSUSE_Leap/x86_64/ This partially reverts 69f651b01794c93da20894a7ea5728a332903850. Change-Id: Ie159ec48f83a7b7d10671d2200f7eb4fbcf93db3 Reviewed-by: Lars Sutterud Reviewed-by: Artem Dyomin (cherry picked from commit c52c9ef8b8214c8372715f93a97340c7b2c0c1c2) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 2b1b4fdb37cf6f43f32ba4cb30b4ee1e5b3eb0a2) --- .../qtci-linux-openSUSE-15.5-x86_64/03-enable-repos.sh | 1 + .../qtci-linux-openSUSE-15.5-x86_64/04-zypperpackages.sh | 2 +- .../qtci-linux-openSUSE-15.6-x86_64/03-enable-repos.sh | 1 + .../qtci-linux-openSUSE-15.6-x86_64/04-zypperpackages.sh | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/03-enable-repos.sh b/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/03-enable-repos.sh index 4dd0314f61d..550a850cbbd 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/03-enable-repos.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/03-enable-repos.sh @@ -8,5 +8,6 @@ sudo sed -i "s#baseurl=.*#baseurl=http://repo-clones.ci.qt.io/repos/opensuse/dis sudo sed -i "s#baseurl=.*#baseurl=http://repo-clones.ci.qt.io/repos/opensuse/distribution/leap/15.5/repo/non-oss/#g" /etc/zypp/repos.d/repo-non-oss.repo sudo sed -i "s#baseurl=.*#baseurl=http://repo-clones.ci.qt.io/repos/opensuse/update/leap/15.5/oss/#g" /etc/zypp/repos.d/repo-update.repo sudo sed -i "s#baseurl=.*#baseurl=http://repo-clones.ci.qt.io/repos/opensuse/update/leap/15.5/non-oss/#g" /etc/zypp/repos.d/repo-update-non-oss.repo +sudo sed -i "s#baseurl=.*#baseurl=http://repo-clones.ci.qt.io/repos/codecs.opensuse.org/openh264/openSUSE_Leap/#g" /etc/zypp/repos.d/repo-openh264.repo sudo zypper lr -u 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 a590b50a42f..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 @@ -56,7 +56,7 @@ sudo zypper -nq install yasm # GStreamer (qtwebkit and qtmultimedia), pulseaudio (qtmultimedia) sudo zypper -nq install gstreamer-devel gstreamer-plugins-base-devel libpulse-devel pipewire-devel \ - gstreamer-plugins-bad-devel + gstreamer-1.20-plugin-openh264 gstreamer-plugins-bad-devel # cups sudo zypper -nq install cups-devel diff --git a/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/03-enable-repos.sh b/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/03-enable-repos.sh index 239bfea95cb..cd66199b34b 100644 --- a/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/03-enable-repos.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.6-x86_64/03-enable-repos.sh @@ -8,5 +8,6 @@ sudo sed -i "s#baseurl=.*#baseurl=http://repo-clones.ci.qt.io/repos/opensuse/dis sudo sed -i "s#baseurl=.*#baseurl=http://repo-clones.ci.qt.io/repos/opensuse/distribution/leap/15.6/repo/non-oss/#g" /etc/zypp/repos.d/repo-non-oss.repo sudo sed -i "s#baseurl=.*#baseurl=http://repo-clones.ci.qt.io/repos/opensuse/update/leap/15.6/oss/#g" /etc/zypp/repos.d/repo-update.repo sudo sed -i "s#baseurl=.*#baseurl=http://repo-clones.ci.qt.io/repos/opensuse/update/leap/15.6/non-oss/#g" /etc/zypp/repos.d/repo-update-non-oss.repo +sudo sed -i "s#baseurl=.*#baseurl=http://repo-clones.ci.qt.io/repos/codecs.opensuse.org/openh264/openSUSE_Leap/#g" /etc/zypp/repos.d/repo-openh264.repo sudo zypper lr -u 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 925f27a66e4..dc2c306d905 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 @@ -52,7 +52,7 @@ sudo zypper -nq install libxml2-devel libxslt-devel sudo zypper -nq install yasm # GStreamer (qtwebkit and qtmultimedia), pulseaudio (qtmultimedia) -sudo zypper -nq install gstreamer-devel gstreamer-plugins-base-devel libpulse-devel pipewire-devel +sudo zypper -nq install gstreamer-devel gstreamer-plugins-base-devel libpulse-devel pipewire-devel gstreamer-plugin-openh264 # cups sudo zypper -nq install cups-devel From db5a9432cf7ee2b9887a58a3a4a3ed1ba641f734 Mon Sep 17 00:00:00 2001 From: Tero Heikkinen Date: Wed, 2 Jul 2025 12:14:22 +0300 Subject: [PATCH 160/204] Windows ARM: Enable OpenGL for WoA 11 23h2 OpenCL, OpenGL, and Vulkan Compatibility pack has been installed to WoA 11 23h2 Tier1 images to support OpenGL usage with these modules: - QtBase - QtGui - QtWidgets - QtDeclarative - QtQuick - Qt3D Enabling OpenGL by removing tags: -no-opengl -no-feature-run-opengl-tests Introduce new cross-compile build target for WoA 11 23h2 - windows-11_23H2-msvc2022-arm64-23H2 - Which has OpenGL enabled - Should not be used with WoA 11 22h2 as it doesn't have OpenGL New build will be used only for WoA 11 23h2 tests - windows-11-x86_64-arm64-tests-23H2 (new in 6.9) - Which has OpenGL tests enabled Names for these build and test targets will be renamed later when WoA 11 23h2 replaces WoA 11 22h2 by removing '-23H2' suffix from names. Note: - In 6.9 there is no Win 11 24h2 x64 like in dev and 6.10 - Therefore 6.9 uses Win 11 23h2 x64 for cross-compile target Task-number: QTQAINFRA-6973 Task-number: QTQAINFRA-6109 Task-number: QTBUG-126030 Change-Id: Ifa29d93d996ac4884a86835328170d857bf91f33 Reviewed-by: Jani Heikkinen Reviewed-by: Oliver Wolff Reviewed-by: Artem Dyomin (cherry picked from commit d48682bcdf9d6a959277ff2d2456e2cd6c276c9f) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit db339574e21f71a6d69286be559b1f542f74b267) --- coin/platform_configs/cmake_platforms.yaml | 28 ++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 2af72f56d40..40917561d0b 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -154,8 +154,8 @@ Configurations: Id: 'windows-11_23h2-arm64-msvc2022' Template: 'qtci-windows-11_23H2-aarch64-53' Compiler: 'MSVC2022' - Features: ['DebugAndRelease', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM', 'InsignificantTests', 'DoNotAbortTestingOnFirstFailure'] - 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' + Features: ['Packaging', 'DebugAndRelease', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM', 'InsignificantTests', 'DoNotAbortTestingOnFirstFailure'] + Configure arguments: '-debug-and-release -force-debug-info -headersclean -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_arm64}}\..', 'NON_QTBASE_CMAKE_ARGS= -DFEATURE_clangcpp=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC_ARM64}} -DQT_DEPLOY_FFMPEG=TRUE', @@ -179,6 +179,23 @@ Configurations: 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc_arm64}}', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', ] +- + Id: 'windows-11_23H2-msvc2022-arm64-23H2' + Template: 'qtci-windows-11_23H2-x86_64-54' + Compiler: 'MSVC2022' + Target arch: 'arm64' + Features: ['Sccache', 'Packaging', 'DoNotRunTests', 'TargetBuildOnly', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] + Platform dependency: 'windows-10_22h2-mingw13' + Environment variables: [ + 'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}', + 'TARGET_CONFIGURE_ARGS=-debug-and-release -force-debug-info -platform win32-arm64-msvc -no-sql-db2 -no-sql-ibase -no-sql-mysql -no-sql-oci -no-sql-psql -no-sql-mimer', + 'TARGET_CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ROOT_DIR_x64_arm64}}', + 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC_ARM64}} -DQT_DEPLOY_FFMPEG=TRUE', + 'OPENSSL_CONF_x64={{.Env.OPENSSL_CONF_x64_arm64}}', + 'OPENSSL_INCLUDE_x64={{.Env.OPENSSL_INCLUDE_x64_arm64}}', + 'OPENSSL_LIB_x64={{.Env.OPENSSL_LIB_x64_arm64}}', + 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', + ] - Id: 'windows-11-x86_64-arm64-tests' Template: 'qtci-windows-11_22H2-aarch64-55' @@ -186,6 +203,13 @@ Configurations: Features: ['TestOnly'] Configure arguments: '-no-opengl -cross-compiled' Platform dependency: 'windows-11_23H2-msvc2022-arm64' +- + Id: 'windows-11-x86_64-arm64-tests-23H2' + Template: 'qtci-windows-11_23H2-aarch64-53' + Compiler: 'MSVC2022' + Features: ['TestOnly', 'InsignificantTests', 'DoNotAbortTestingOnFirstFailure'] + Configure arguments: '-cross-compiled' + Platform dependency: 'windows-11_23H2-msvc2022-arm64-23H2' - Id: 'windows-11_23H2-msvc2022-developer-build' Template: 'qtci-windows-11_23H2-x86_64-54' From 73e0584f4c630720e8a34278a3737b52d55cf763 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 21 Aug 2025 03:52:20 +0000 Subject: [PATCH 161/204] Update submodules on '6.9 in qt/qt5' Change-Id: Iacf511f13f87fc19e1447ee9bae5dc211b964232 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 e32ae4fcf6a..237382e9e01 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit e32ae4fcf6af5636ba5e0b3fd4a6e553ff4586e6 +Subproject commit 237382e9e013d7394c5cd18531a8e6503ee1a6f0 diff --git a/qt5compat b/qt5compat index c0c7ee24042..3b3cfd2df94 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit c0c7ee240421e83474cb736f5532cb0026a1f746 +Subproject commit 3b3cfd2df945897b7824f62197675f344b8f9295 diff --git a/qtactiveqt b/qtactiveqt index 786f47b3bf8..fd6875bb5f2 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 786f47b3bf8960d1b8affc2ef31a2d37773fbd46 +Subproject commit fd6875bb5f210b1006f5e852da8930239419a887 diff --git a/qtbase b/qtbase index a538f0a1601..0945156dc26 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit a538f0a1601e96f5a6f61cae5547f594fa3d2e55 +Subproject commit 0945156dc262d6818a4b41e155babbf6ad3e7087 diff --git a/qtcharts b/qtcharts index 72a276bf17c..429a02ccc7c 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 72a276bf17cf93822845807a730dd9cd8ade9083 +Subproject commit 429a02ccc7ce37448b43f793e726453ad60cefe2 diff --git a/qtcoap b/qtcoap index 81665b69ae4..acd8cb7de49 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit 81665b69ae42ed71e8cf2c705b444a7f4bd01602 +Subproject commit acd8cb7de49840d8147b37122ae9552b566bfb2b diff --git a/qtconnectivity b/qtconnectivity index dea30122764..d7cca4132f8 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit dea301227648192675257ab87914766ff58f153f +Subproject commit d7cca4132f86b9ed6e701648b435f673d51aa06c diff --git a/qtdatavis3d b/qtdatavis3d index e39704fe54e..ad1bd945127 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit e39704fe54ec05cb4d85ddaf71de53c3bde0d9d8 +Subproject commit ad1bd945127640a727ed3f8f8c5c1ed481e6739d diff --git a/qtdeclarative b/qtdeclarative index 4e6303870ea..e82425eae1b 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 4e6303870eab38450ee3805ff1654ea53e76ad10 +Subproject commit e82425eae1b366d38b9da12b323dbb18db6f0994 diff --git a/qtdoc b/qtdoc index 9fd6eb7c1ad..ee8b10b8eae 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 9fd6eb7c1adfefe7e087771aa4eaf85231dfc7d7 +Subproject commit ee8b10b8eaef2deffceee870463e9afb21a61b2e diff --git a/qtgraphs b/qtgraphs index d30f25d43d2..1f8b7b1cc5a 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit d30f25d43d22a06004a52ecb53f106e94ebc6f65 +Subproject commit 1f8b7b1cc5a71be135eaae5561075332b2c4592a diff --git a/qtgrpc b/qtgrpc index e589950c3ab..93f3e2f36d5 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit e589950c3abddea80c3f2a03d50b11d306554f94 +Subproject commit 93f3e2f36d58659d98c956495d5593ed749f5d7e diff --git a/qthttpserver b/qthttpserver index 3a40185c045..fa9ceb7dafd 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit 3a40185c045fc6c7ef5cd089d0318c08cded22b1 +Subproject commit fa9ceb7dafda9a37462a2847e405789624477ca6 diff --git a/qtimageformats b/qtimageformats index 6897af2f4e2..8244562032f 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 6897af2f4e268eba7cbeaacd003941dcf70e32fa +Subproject commit 8244562032fb9da5ea3c26cb72a3d6741e580306 diff --git a/qtlanguageserver b/qtlanguageserver index cf04fadffdd..3c39f4289a5 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit cf04fadffddade52057eedcb0edb9424457b911e +Subproject commit 3c39f4289a5524c125a991b8749ba90f76109050 diff --git a/qtlocation b/qtlocation index a8fea64f0f1..f626643f54a 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit a8fea64f0f148960efd2b7a2cc6291e631c15e0a +Subproject commit f626643f54a7d811fa844d888bddb5a5a8a119e9 diff --git a/qtlottie b/qtlottie index d6fa00980a7..a710b595f03 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit d6fa00980a7f553c8eea778e9abfe8d2911cfb4c +Subproject commit a710b595f0372c6f0f205c81f09ccfeb92ade319 diff --git a/qtmqtt b/qtmqtt index f2b7088422a..f922d48175f 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit f2b7088422a9c6d84a6dd4c4166d35a3b3c69b15 +Subproject commit f922d48175fd9d6a478183377b40d4849b92604f diff --git a/qtmultimedia b/qtmultimedia index d9b88bef166..ec99c605a4d 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit d9b88bef1667b228f7256c5db8d00400cdae52cf +Subproject commit ec99c605a4dbe9e01c7b673afec76d69eb564175 diff --git a/qtnetworkauth b/qtnetworkauth index b735dd1926e..73aca8d292e 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit b735dd1926e08f7c889693ee1dc8ee825a7db092 +Subproject commit 73aca8d292e6b75a5100f44d90eb0986054ec8fc diff --git a/qtopcua b/qtopcua index 007bdbfc66e..7d163e6941e 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit 007bdbfc66eaf9d0b875873b25b34986500188aa +Subproject commit 7d163e6941e98f169b92e4100c3d0159f6401c42 diff --git a/qtpositioning b/qtpositioning index a3c47f1c00e..16c6b22af09 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit a3c47f1c00e3f12202babb894acacfb4d446afba +Subproject commit 16c6b22af09fd313c77ac09e12a50b6fab2eccc0 diff --git a/qtquick3d b/qtquick3d index 9c3cd6abb98..b985500c4e4 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 9c3cd6abb989436074bbf211bac09d6748443b74 +Subproject commit b985500c4e4843572c6fd05c723dac52df25a3ca diff --git a/qtquick3dphysics b/qtquick3dphysics index 8add53b1a5d..1266b7cdf2f 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit 8add53b1a5d93fdff45f0f30fd080d7793c63dad +Subproject commit 1266b7cdf2f0f85389ab07d4eaf5828a57d91acf diff --git a/qtquickeffectmaker b/qtquickeffectmaker index 8d111ae45cf..8556b26eb38 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit 8d111ae45cfdfe2a7d56a12e049c88ef9339c3d8 +Subproject commit 8556b26eb3891dfd45f34bff09a8c12cd8efd060 diff --git a/qtquicktimeline b/qtquicktimeline index 935853b6797..85b124f5023 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 935853b67972046885eacee0166b0df827fa26c0 +Subproject commit 85b124f50238e06af494165ede73c874f674020b diff --git a/qtremoteobjects b/qtremoteobjects index f7ad9202c36..3538b1c49ec 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit f7ad9202c36c908efb6e311621a3488f4870b806 +Subproject commit 3538b1c49ec85c6f9f220710eef14436f77712e6 diff --git a/qtscxml b/qtscxml index b024d02b7d2..8a006f6193b 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit b024d02b7d2f86799f0a3964cbd0f57f625327a5 +Subproject commit 8a006f6193b6dd99b3f6017ff25f26035b56ba98 diff --git a/qtsensors b/qtsensors index 4efd225ac67..1a5cedefbd6 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 4efd225ac6787c0fdec747fbd50b8b8d057f177b +Subproject commit 1a5cedefbd62826aea1c08d18f1eda9b12449fc2 diff --git a/qtserialbus b/qtserialbus index ce27632ffb4..ff9a973cfb7 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit ce27632ffb4d87a40c183f117c6605763768ba3d +Subproject commit ff9a973cfb7ae0cbcb502fa6c32ac551e641bef6 diff --git a/qtserialport b/qtserialport index c683eb53691..5492c3d9163 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit c683eb53691fc0e2263c76479e41f81e633359b4 +Subproject commit 5492c3d9163e142115871ef4e4199edd1edb3ec4 diff --git a/qtshadertools b/qtshadertools index 5cb2829a35a..42047252f4c 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 5cb2829a35a9123a7a5f76e30077238dea8e5b36 +Subproject commit 42047252f4cca43ea12477428a354cdc13191bb1 diff --git a/qtspeech b/qtspeech index 046d3549aa2..c90eb46240b 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 046d3549aa231ffa16ad5c2d6a67bdddcd491a08 +Subproject commit c90eb46240b361f1ec0575b8d9a257e7db660164 diff --git a/qtsvg b/qtsvg index 1f0a4f3a4be..39b5dc194ff 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 1f0a4f3a4be67e54c5af278e42089a67cf954f61 +Subproject commit 39b5dc194ff159b55fc42cfd1c12e38a8253fd76 diff --git a/qttools b/qttools index 0fc7b3a7567..dd89ed6c4a6 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 0fc7b3a7567fa5a0e5ec513a81ee4e9ffed173a3 +Subproject commit dd89ed6c4a6879db3c5c9ce164a3d6c7c44a0f32 diff --git a/qttranslations b/qttranslations index bef4a492afc..eb68660a8e6 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit bef4a492afcc9f0b6bb1e6793b995d46f87efd34 +Subproject commit eb68660a8e649a4bebfad827a1c1da27ab85371d diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index a9e6a147775..2982c06562a 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit a9e6a147775265bd3bc38db942b3dd204c496262 +Subproject commit 2982c06562aef55f8ee0a1ba5159e4195474022a diff --git a/qtwayland b/qtwayland index ff39a09b46f..cf267480439 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit ff39a09b46fe978f90ffd7c8447d167495bdaf8b +Subproject commit cf2674804395191d9f2e55d3dae50e16987641c4 diff --git a/qtwebchannel b/qtwebchannel index fc640623aab..f7b83a37fa3 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit fc640623aabef3f9b9d3746e71a0992277448a90 +Subproject commit f7b83a37fa379b5afc603f315a29e7d799e4bd42 diff --git a/qtwebengine b/qtwebengine index 76faf67d10d..0029599c7db 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 76faf67d10d25e45cc3e07f3cce28a6f67d9957a +Subproject commit 0029599c7dbb3d70e447d763c71f6d05ddf50f1e diff --git a/qtwebsockets b/qtwebsockets index 4ed2544f0b6..224b5a07e78 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 4ed2544f0b6cad64f5bad2df52844528f946e8ad +Subproject commit 224b5a07e7804c4d46d85baf9503275de677e370 diff --git a/qtwebview b/qtwebview index d53d5092d3d..21ac1056a15 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit d53d5092d3da320eb1fe4134d2cf9a2461a815a5 +Subproject commit 21ac1056a15424d1bc92cab06ead5e0aa77ca308 From 17014573495ea14e37715be2fd2bac1cb11c1292 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 22 Aug 2025 13:39:25 +0000 Subject: [PATCH 162/204] Update submodules on '6.9 in qt/qt5' Change-Id: Iac24aa0927675d360a978eaf07f3e819563c9239 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 237382e9e01..8fcf38596ce 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 237382e9e013d7394c5cd18531a8e6503ee1a6f0 +Subproject commit 8fcf38596ce9b5e72c59a3f081eb0cbcf0129651 diff --git a/qt5compat b/qt5compat index 3b3cfd2df94..896c2d6ba9e 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 3b3cfd2df945897b7824f62197675f344b8f9295 +Subproject commit 896c2d6ba9eb2cea2a874594527be521e53cb409 diff --git a/qtactiveqt b/qtactiveqt index fd6875bb5f2..fb02728e90d 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit fd6875bb5f210b1006f5e852da8930239419a887 +Subproject commit fb02728e90d633f8046a646b0f7ec92fd645b5ff diff --git a/qtbase b/qtbase index 0945156dc26..3beff274025 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 0945156dc262d6818a4b41e155babbf6ad3e7087 +Subproject commit 3beff274025f5336ab1a71861b43baee660202cd diff --git a/qtcharts b/qtcharts index 429a02ccc7c..c4096e14801 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 429a02ccc7ce37448b43f793e726453ad60cefe2 +Subproject commit c4096e148015db8fee2572ecb18be2b6ea72ac93 diff --git a/qtcoap b/qtcoap index acd8cb7de49..b3b54d8e03d 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit acd8cb7de49840d8147b37122ae9552b566bfb2b +Subproject commit b3b54d8e03d6bd97b98f62c1a02ffeef193db542 diff --git a/qtconnectivity b/qtconnectivity index d7cca4132f8..75d30261780 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit d7cca4132f86b9ed6e701648b435f673d51aa06c +Subproject commit 75d30261780cb79494361a666c764c80eabde60b diff --git a/qtdatavis3d b/qtdatavis3d index ad1bd945127..84cb068c0fa 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit ad1bd945127640a727ed3f8f8c5c1ed481e6739d +Subproject commit 84cb068c0faf70de96cbe8b32301a9625a855f00 diff --git a/qtdeclarative b/qtdeclarative index e82425eae1b..cfb54920746 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit e82425eae1b366d38b9da12b323dbb18db6f0994 +Subproject commit cfb549207463158863de0be5f31de3c50cccfd83 diff --git a/qtdoc b/qtdoc index ee8b10b8eae..ea19548fb27 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit ee8b10b8eaef2deffceee870463e9afb21a61b2e +Subproject commit ea19548fb2724f6334376253238779c3f178ca2d diff --git a/qtgraphs b/qtgraphs index 1f8b7b1cc5a..f950c42b54b 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit 1f8b7b1cc5a71be135eaae5561075332b2c4592a +Subproject commit f950c42b54b30c5fa78dd81668150a44d48ffca9 diff --git a/qtgrpc b/qtgrpc index 93f3e2f36d5..ce77d0f2bbf 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit 93f3e2f36d58659d98c956495d5593ed749f5d7e +Subproject commit ce77d0f2bbf7a2e57d1226504c8f4260343f0a3c diff --git a/qthttpserver b/qthttpserver index fa9ceb7dafd..0dfbbd9b33b 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit fa9ceb7dafda9a37462a2847e405789624477ca6 +Subproject commit 0dfbbd9b33bb2c1117eeb3a0bf716963fc386417 diff --git a/qtimageformats b/qtimageformats index 8244562032f..ca41b1670cd 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 8244562032fb9da5ea3c26cb72a3d6741e580306 +Subproject commit ca41b1670cdec269b23441f7dec9e3f49d84e5fd diff --git a/qtlanguageserver b/qtlanguageserver index 3c39f4289a5..9ea97905c73 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit 3c39f4289a5524c125a991b8749ba90f76109050 +Subproject commit 9ea97905c738e867671987442019d1a2c765961e diff --git a/qtlocation b/qtlocation index f626643f54a..555aeef78b1 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit f626643f54a7d811fa844d888bddb5a5a8a119e9 +Subproject commit 555aeef78b1e8e99b5a03f43ac4b1303199b90cd diff --git a/qtlottie b/qtlottie index a710b595f03..1a82663c62a 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit a710b595f0372c6f0f205c81f09ccfeb92ade319 +Subproject commit 1a82663c62ac33fe69094dd277abb28da03c6f85 diff --git a/qtmqtt b/qtmqtt index f922d48175f..2d89f5687ff 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit f922d48175fd9d6a478183377b40d4849b92604f +Subproject commit 2d89f5687ff898a4d5135a5e307d3a1502e10547 diff --git a/qtmultimedia b/qtmultimedia index ec99c605a4d..0c75d8166d8 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit ec99c605a4dbe9e01c7b673afec76d69eb564175 +Subproject commit 0c75d8166d810b38e0c577b871ab51b36abbc3c5 diff --git a/qtnetworkauth b/qtnetworkauth index 73aca8d292e..4347eb52f89 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 73aca8d292e6b75a5100f44d90eb0986054ec8fc +Subproject commit 4347eb52f89d25c64c24617160064228bd982b2e diff --git a/qtopcua b/qtopcua index 7d163e6941e..ead72b76066 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit 7d163e6941e98f169b92e4100c3d0159f6401c42 +Subproject commit ead72b76066f700bb2dacdb3005ae93266f0267a diff --git a/qtpositioning b/qtpositioning index 16c6b22af09..215d568f547 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit 16c6b22af09fd313c77ac09e12a50b6fab2eccc0 +Subproject commit 215d568f547bf614ca3de47b698155ad43e46712 diff --git a/qtquick3d b/qtquick3d index b985500c4e4..960a94263ae 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit b985500c4e4843572c6fd05c723dac52df25a3ca +Subproject commit 960a94263ae4362066125b611016415a1746fa28 diff --git a/qtquick3dphysics b/qtquick3dphysics index 1266b7cdf2f..c3c977b9c2c 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit 1266b7cdf2f0f85389ab07d4eaf5828a57d91acf +Subproject commit c3c977b9c2c4ad6adfb392d2d9c39ec7744e07e0 diff --git a/qtquickeffectmaker b/qtquickeffectmaker index 8556b26eb38..f8f46d31b5e 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit 8556b26eb3891dfd45f34bff09a8c12cd8efd060 +Subproject commit f8f46d31b5ebe698b9e21370035287cba7cf1467 diff --git a/qtquicktimeline b/qtquicktimeline index 85b124f5023..d0a46c11589 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 85b124f50238e06af494165ede73c874f674020b +Subproject commit d0a46c11589664ab0d5b4a4f902b6fef9458aecd diff --git a/qtremoteobjects b/qtremoteobjects index 3538b1c49ec..68feac427df 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 3538b1c49ec85c6f9f220710eef14436f77712e6 +Subproject commit 68feac427df40b687dafed3a29f465571c8e2c56 diff --git a/qtscxml b/qtscxml index 8a006f6193b..0c519645200 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 8a006f6193b6dd99b3f6017ff25f26035b56ba98 +Subproject commit 0c519645200683f811d4daf9c0d6e0c97e527359 diff --git a/qtsensors b/qtsensors index 1a5cedefbd6..1e5a9498562 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 1a5cedefbd62826aea1c08d18f1eda9b12449fc2 +Subproject commit 1e5a9498562f53a8d9ca3b1ea84e3d7298ad04ef diff --git a/qtserialbus b/qtserialbus index ff9a973cfb7..8bd84238773 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit ff9a973cfb7ae0cbcb502fa6c32ac551e641bef6 +Subproject commit 8bd84238773963de4a23952a14cd9e2704ea3b34 diff --git a/qtserialport b/qtserialport index 5492c3d9163..3fcf3ea9a40 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 5492c3d9163e142115871ef4e4199edd1edb3ec4 +Subproject commit 3fcf3ea9a4066850ed6266601188df799bb0dfdc diff --git a/qtshadertools b/qtshadertools index 42047252f4c..515306bd5d3 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 42047252f4cca43ea12477428a354cdc13191bb1 +Subproject commit 515306bd5d39e014ca218a78326fc2b0b411a426 diff --git a/qtspeech b/qtspeech index c90eb46240b..1b3826d85a0 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit c90eb46240b361f1ec0575b8d9a257e7db660164 +Subproject commit 1b3826d85a0e5d937000b9bac6dcb817f73cc7ad diff --git a/qtsvg b/qtsvg index 39b5dc194ff..da99c2b9d34 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 39b5dc194ff159b55fc42cfd1c12e38a8253fd76 +Subproject commit da99c2b9d34b4f4ae46cf1ea60c03a6ffa659689 diff --git a/qttools b/qttools index dd89ed6c4a6..dd8ee454c40 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit dd89ed6c4a6879db3c5c9ce164a3d6c7c44a0f32 +Subproject commit dd8ee454c408f4896633b3fb1d32eea92da8aa8e diff --git a/qttranslations b/qttranslations index eb68660a8e6..63072696b4d 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit eb68660a8e649a4bebfad827a1c1da27ab85371d +Subproject commit 63072696b4d89b016fca12161c591d20eb3a36a6 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 2982c06562a..af5d77ae22c 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 2982c06562aef55f8ee0a1ba5159e4195474022a +Subproject commit af5d77ae22cd75573d307e38a252c8b59d1aa2d2 diff --git a/qtwayland b/qtwayland index cf267480439..eb179094291 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit cf2674804395191d9f2e55d3dae50e16987641c4 +Subproject commit eb17909429141f0ff675cf0ade973d92ca779913 diff --git a/qtwebchannel b/qtwebchannel index f7b83a37fa3..13790cec1ea 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit f7b83a37fa379b5afc603f315a29e7d799e4bd42 +Subproject commit 13790cec1eafd95a24e9c0f27113f04fd204e2f3 diff --git a/qtwebengine b/qtwebengine index 0029599c7db..7179c08a57b 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 0029599c7dbb3d70e447d763c71f6d05ddf50f1e +Subproject commit 7179c08a57b6d5b2297ccfec09327649b5882c8e diff --git a/qtwebsockets b/qtwebsockets index 224b5a07e78..fca11f017e9 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 224b5a07e7804c4d46d85baf9503275de677e370 +Subproject commit fca11f017e9738ead936c8fcbbac0118bdb7d661 diff --git a/qtwebview b/qtwebview index 21ac1056a15..6a41c6e2759 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 21ac1056a15424d1bc92cab06ead5e0aa77ca308 +Subproject commit 6a41c6e27594d3274e2415028573b90a7726dcb7 From 9df970d03c70940f3cb47145cb4e9d3a518189c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Wed, 20 Aug 2025 08:06:31 +0300 Subject: [PATCH 163/204] COIN: Replace Debian stable with bookworm chroot Stable is debian codename and the script was ran in Ubuntu, so it makes me wonder how did this warm in the first place. Pick-to: 6.8 Change-Id: I6d907ce11d53aa498ea93522539891f38e7c8388 Reviewed-by: Tero Heikkinen (cherry picked from commit 77eb380ac0e2788178cbc9237d639a5a54f63481) Reviewed-by: Alexandru Croitor (cherry picked from commit cbc5c3405baecf501451ee704f0b473bfb3fca1a) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/92-sbuild.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/92-sbuild.sh b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/92-sbuild.sh index b178d71a14a..22616466c05 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/92-sbuild.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/92-sbuild.sh @@ -40,7 +40,7 @@ sudo sbuild-adduser "$LOGNAME" newgrp sbuild # Create chroot -sudo sbuild-createchroot --include=eatmydata,ccache,gnupg,ca-certificates stable /srv/chroot/stable-amd64 +sudo sbuild-createchroot --include=eatmydata,ccache,gnupg,ca-certificates bookworm /srv/chroot/stable-amd64 http://deb.debian.org/debian # For ubuntu 22.04 echo "Create chroot for Ubuntu Jammy" @@ -49,7 +49,7 @@ sudo sbuild-createchroot --include=eatmydata,gnupg,ca-certificates jammy /srv/ch echo "Done creating chroot for Ubuntu Jammy" # Update chroot. -sudo sbuild-update -udcar stable +sudo sbuild-update -udcar bookworm From eb58ed2f90a50d43c916bd9ac8683664b1a8c041 Mon Sep 17 00:00:00 2001 From: Tero Heikkinen Date: Wed, 6 Aug 2025 18:49:19 +0300 Subject: [PATCH 164/204] Linux: Add glibc versions visible in versions.txt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Will also make glibc versions visible in Tools and Versions pages. Task-number: QTQAINFRA-7333 Pick-to: 6.8 6.5 Change-Id: Ic0274822f326e4b23ed423d8da20002bc6d4f20a Reviewed-by: Simo Fält (cherry picked from commit 3ba1fb95bed35acc7f5f8c6db51a4b285a25c347) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 763fb46b70432f37f6a89ee4e0ee042d517283dd) --- .../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 | 3 +++ .../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-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 | 3 +++ .../qtci-linux-openSUSE-15.4-x86_64/04-zypperpackages.sh | 3 +++ .../qtci-linux-openSUSE-15.5-x86_64/04-zypperpackages.sh | 3 +++ .../qtci-linux-openSUSE-15.6-x86_64/04-zypperpackages.sh | 3 +++ 19 files changed, 57 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 b076f2a949f..46c03e35217 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 @@ -183,6 +183,9 @@ 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 +glibcVersion="$(ldd --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)" +echo "glibc = $glibcVersion" >> 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 f852a9df4ee..7f33493bc0b 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 @@ -145,5 +145,8 @@ 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 +glibcVersion="$(ldd --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)" +echo "glibc = $glibcVersion" >> 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 30c045fd4eb..9ba239bfee3 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 @@ -157,5 +157,8 @@ 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 +glibcVersion="$(ldd --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)" +echo "glibc = $glibcVersion" >> 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 2114aa5f9cf..59478dc2df7 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 @@ -167,5 +167,8 @@ 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 +glibcVersion="$(ldd --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)" +echo "glibc = $glibcVersion" >> 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 0b32e2a8942..33c82efeef5 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 @@ -183,6 +183,9 @@ 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 +glibcVersion="$(ldd --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)" +echo "glibc = $glibcVersion" >> 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 2942dd8af54..8a7a6cb74ab 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 @@ -171,5 +171,8 @@ 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 +glibcVersion="$(ldd --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)" +echo "glibc = $glibcVersion" >> 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 45dc3943bdb..beb5a3781b7 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 @@ -204,6 +204,9 @@ 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 +glibcVersion="$(ldd --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)" +echo "glibc = $glibcVersion" >> 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 c22b5891d47..2e3f13a39bc 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 @@ -207,6 +207,9 @@ 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 +glibcVersion="$(ldd --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)" +echo "glibc = $glibcVersion" >> 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 5c492e5f581..29f33982bc0 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 @@ -101,3 +101,6 @@ sudo zypper -nq install openssl-3 gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)" echo "GCC = $gccVersion" >> versions.txt + +glibcVersion="$(ldd --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)" +echo "glibc = $glibcVersion" >> 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 c6d687a8ca1..2a3b61cf2e9 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 @@ -116,5 +116,8 @@ sudo zypper -nq install perl-JSON gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)" echo "GCC = $gccVersion" >> versions.txt +glibcVersion="$(ldd --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)" +echo "glibc = $glibcVersion" >> versions.txt + OpenSSLVersion="$(openssl-3 version |cut -b 9-14)" echo "System's OpenSSL = $OpenSSLVersion" >> ~/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 5614fbcb5fa..bd318fb9d81 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 @@ -119,5 +119,8 @@ sudo zypper -nq install perl-JSON gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)" echo "GCC = $gccVersion" >> versions.txt +glibcVersion="$(ldd --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)" +echo "glibc = $glibcVersion" >> versions.txt + OpenSSLVersion="$(openssl version |cut -b 9-14)" echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt 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 56c4c1a5b0c..8f42f803818 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 @@ -66,6 +66,9 @@ source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)" echo "GCC = $gccVersion" >> versions.txt +glibcVersion="$(ldd --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)" +echo "glibc = $glibcVersion" >> 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 e4dade0d5b3..ce0e520640c 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 @@ -268,5 +268,8 @@ 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 +glibcVersion="$(ldd --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)" +echo "glibc = $glibcVersion" >> 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 d2bc4afb206..e26e9977b51 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 @@ -264,5 +264,8 @@ 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 +glibcVersion="$(ldd --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)" +echo "glibc = $glibcVersion" >> 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 1e997a33180..ff00479baca 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 @@ -275,5 +275,8 @@ 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 +glibcVersion="$(ldd --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)" +echo "glibc = $glibcVersion" >> 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 3d82dade54c..ff9a9b25c15 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 @@ -72,5 +72,8 @@ sudo zypper -nq install java-17-openjdk gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)" echo "GCC = $gccVersion" >> versions.txt +glibcVersion="$(ldd --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)" +echo "glibc = $glibcVersion" >> versions.txt + OpenSSLVersion="$(openssl version |cut -b 9-14)" echo "OpenSSL = $OpenSSLVersion" >> ~/versions.txt 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 eab1d584ae1..c1ca4c45f01 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 @@ -78,5 +78,8 @@ sudo zypper -nq install java-17-openjdk gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)" echo "GCC = $gccVersion" >> versions.txt +glibcVersion="$(ldd --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)" +echo "glibc = $glibcVersion" >> versions.txt + OpenSSLVersion="$(openssl-3 version |cut -b 9-14)" echo "OpenSSL = $OpenSSLVersion" >> ~/versions.txt 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 69f3b420d6e..bdbc923c9b3 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 @@ -94,5 +94,8 @@ sudo zypper -nq install java-17-openjdk gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)" echo "GCC = $gccVersion" >> versions.txt +glibcVersion="$(ldd --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)" +echo "glibc = $glibcVersion" >> versions.txt + OpenSSLVersion="$(openssl-3 version |cut -b 9-14)" echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt 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 dc2c306d905..e0e94253f17 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 @@ -93,5 +93,8 @@ sudo zypper -nq install perl-JSON gccVersion="$(gcc --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)" echo "GCC = $gccVersion" >> versions.txt +glibcVersion="$(ldd --version |grep -Eo '[0-9]+\.[0-9]+(\.[0-9]+)?' |head -n 1)" +echo "glibc = $glibcVersion" >> versions.txt + OpenSSLVersion="$(openssl version |cut -b 9-14)" echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt From 1de64805dde05de316bbc1eb370e744763d8222c Mon Sep 17 00:00:00 2001 From: Tero Heikkinen Date: Thu, 21 Aug 2025 11:18:21 +0300 Subject: [PATCH 165/204] Add missing static targets to Windows on ARM 11 23h2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Targets - windows-11_23h2-arm64-msvc2022-minimal-static-test This doesn't have previous version so it's left out in 6.9 - Windows-MSVC2022-arm64_Static-23H2 Task-number: QTQAINFRA-7273 Task-number: QTQAINFRA-6973 Change-Id: I1e2110973d0ad0645c1f5b62c420655c94235eab Reviewed-by: Samuli Piippo Reviewed-by: Simo Fält (cherry picked from commit acb1eb656a140079a29c068596593b51e267d762) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 91627c3294fb15b987f009e696dd20dd282cec5f) --- .../cmake_platforms_static_release.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/coin/platform_configs/cmake_platforms_static_release.yaml b/coin/platform_configs/cmake_platforms_static_release.yaml index 08d8fe614a3..a8680a48b4a 100644 --- a/coin/platform_configs/cmake_platforms_static_release.yaml +++ b/coin/platform_configs/cmake_platforms_static_release.yaml @@ -24,6 +24,19 @@ Configurations: 'NON_QTBASE_CMAKE_ARGS=-DCMAKE_BUILD_TYPE=Release -DFEATURE_native_grpc=OFF -DFEATURE_clangcpp=OFF -DFEATURE_qdoc=OFF', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', ] +- + Id: 'windows-11_23h2-arm64-msvc2022-minimal-static-test' + Template: 'qtci-windows-11_23H2-aarch64-53' + 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' + Environment variables: [ + 'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_arm64}}\..', + 'NON_QTBASE_CMAKE_ARGS=-DCMAKE_BUILD_TYPE=Release -DFEATURE_native_grpc=OFF -DFEATURE_clangcpp=OFF -DFEATURE_qdoc=OFF', + 'VCPKG_HOST_TRIPLET=arm64-windows-qt', + 'VCPKG_TARGET_TRIPLET=arm64-windows-qt', + 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', + ] - Id: 'rhel-8.10-minimal-static-test' Template: 'qtci-linux-RHEL-8.10-x86_64-51' From d15eb1318a6b5368f78895cb8589eb90d625470f Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Mon, 23 Jun 2025 10:42:19 +0200 Subject: [PATCH 166/204] Revert "platform_configs: remove InsignificantTests for u2404 x11 dev" Ubuntu 24.04 GNOME X11 still has too many flaky issues in our CI, which blocks integrations too much. This reverts commit 365860ce425a24a6452833fd7b8693b486062025. Pick-to: 6.8 Task-number: QTBUG-137909 Change-Id: I058c5d9c5e67bbea4a5ea88a915270ef00110d7a Reviewed-by: Axel Spoerl (cherry picked from commit e9687ee42e3a327e6e15d826f814dd1be45de883) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit feabc0fdcf0ad863e39ff4024755076cdac39616) --- coin/platform_configs/cmake_platforms.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 40917561d0b..a6fad6eba52 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -86,7 +86,7 @@ Configurations: Id: 'ubuntu-24.04-x64-developer-build-x11-tests' Template: 'qtci-linux-Ubuntu-24.04-x86_64-51' Compiler: 'GCC' - Features: ['Sccache', 'TestOnly'] + Features: ['Sccache', 'TestOnly', 'InsignificantTests'] Platform dependency: 'ubuntu-24.04-x64-developer-build' - Id: 'ubuntu-24.04-x64-x11-tests' From 6e6dd72cd304521b509b7c3b430410ef76f6e225 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Fri, 15 Aug 2025 09:05:16 +0300 Subject: [PATCH 167/204] COIN: Fix Debian bookworm chroot Debian stable codename is now trixie. Pick-to: 6.8 Change-Id: I296782cef2a4329e359413cd7515a8dfca271095 Reviewed-by: Jani Heikkinen (cherry picked from commit 2dbbd0853f3de4cfbb1442f065125a56dfceae70) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit d7166acfaebd973e6d83b699ea549d750fbd320b) (cherry picked from commit 4403eaf71c70d7e014c5f292493389b7735b41d7) --- coin/platform_configs/cmake_platforms.yaml | 2 +- .../qtci-linux-Debian-11.6-aarch64/92-sbuild.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index a6fad6eba52..364927675fe 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -329,7 +329,7 @@ Configurations: '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_SBUILD_CHROOT=bookworm-arm64-sbuild', 'COIN_EXTRA_DEBIAN_REPO=deb http://deb.debian.org/debian/ bookworm main', 'COIN_SKIP_DEBIAN_MODULES=qt5 qtqa qtactiveqt qtdoc qtwebengine qtwebview', ] diff --git a/coin/provisioning/qtci-linux-Debian-11.6-aarch64/92-sbuild.sh b/coin/provisioning/qtci-linux-Debian-11.6-aarch64/92-sbuild.sh index 8991bcca15c..f4c9b3d9eba 100755 --- a/coin/provisioning/qtci-linux-Debian-11.6-aarch64/92-sbuild.sh +++ b/coin/provisioning/qtci-linux-Debian-11.6-aarch64/92-sbuild.sh @@ -41,8 +41,8 @@ EOF sudo sbuild-adduser "$LOGNAME" newgrp sbuild -# Create chroot for debian stable -sudo sbuild-createchroot --include=eatmydata,ccache,gnupg,ca-certificates stable /srv/chroot/stable-arm64 +# Create chroot for debian bookworm +sudo sbuild-createchroot --include=eatmydata,ccache,gnupg,ca-certificates bookworm /srv/chroot/stable-arm64 echo "Create chroot for Ubuntu Jammy" # First we need update the deboostrap scripts @@ -60,5 +60,5 @@ sudo sbuild-createchroot --include=gnupg,ca-certificates jammy /srv/chroot/jammy echo "Done creating chroot for Ubuntu Jammy" # Update chroot. -sudo sbuild-update -udcar stable +sudo sbuild-update -udcar bookworm sudo sbuild-update -udcar jammy From d657543377836c8bab854c58de893bac32b62750 Mon Sep 17 00:00:00 2001 From: Tero Heikkinen Date: Tue, 26 Aug 2025 12:07:44 +0300 Subject: [PATCH 168/204] Linux: Fix Debian packagekit failing in provisioning Target jammy-arm64-debian-pkg-packaging fails in waitLoop function, which is also used by Ubuntu platforms. Fix by extending wait loop for lock paths: - /var/lib/dpkg/lock - /var/lib/apt/lists/lock (new) Task-number: QTQAINFRA-7361 Change-Id: If8d5eacaeb72ea6a36496093bc5c248f61997afb Reviewed-by: Alexandru Croitor --- coin/provisioning/common/linux/apt_wait_loop.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/coin/provisioning/common/linux/apt_wait_loop.sh b/coin/provisioning/common/linux/apt_wait_loop.sh index 60d5d5edb38..b7d4da5dfe2 100755 --- a/coin/provisioning/common/linux/apt_wait_loop.sh +++ b/coin/provisioning/common/linux/apt_wait_loop.sh @@ -5,9 +5,13 @@ set -ex function waitLoop { + while sudo fuser /var/lib/dpkg/lock >/dev/null 2>&1; do + echo "Waiting for other software managers to finish... 1/2" + sleep 0.5 + done -while sudo fuser /var/lib/dpkg/lock >/dev/null 2>&1 ; do - echo "Waiting for other software managers to finish..." - sleep 0.5 -done + while sudo fuser /var/lib/apt/lists/lock >/dev/null 2>&1; do + echo "Waiting for other software managers to finish... 2/2" + sleep 0.5 + done } From d176d30f9dbbfcfe359289911f7add3334327a97 Mon Sep 17 00:00:00 2001 From: Axel Spoerl Date: Fri, 29 Aug 2025 12:19:36 +0200 Subject: [PATCH 169/204] Make ubuntu-24.04-x64-x11-tests test insignificant Ubuntu 24.04 installs Wayland by default. The X11 version is known to be problematic, which is why ubuntu-24.04-x64-documentation-x11-tests has been marked InsignificantTests. Extend this to ubuntu-24.04-x64-x11-tests. Task-number: QTBUG-137909 Task-number: QTBUG-136092 Pick-to: 6.8 6.5 Change-Id: I38f4bb5ca59255870dc6dbbb69e9ab339c679ddc Reviewed-by: Ville-Pekka Karhu (cherry picked from commit 75b7834370b659de57e3e128ccec6cd8586fa6bf) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 582a05fab0e4bfdb6807193a9af75f9a73904669) --- coin/platform_configs/cmake_platforms.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 364927675fe..8e647b6da83 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -92,7 +92,7 @@ Configurations: Id: 'ubuntu-24.04-x64-x11-tests' Template: 'qtci-linux-Ubuntu-24.04-x86_64-51' Compiler: 'GCC' - Features: ['Sccache', 'TestOnly'] + Features: ['Sccache', 'TestOnly', 'InsignificantTests'] Platform dependency: 'ubuntu-24.04-x64' - Id: 'opensuse-15.6-developer-build' From d3356b4d2ac0b4155430773591dd6eac94af3dcf Mon Sep 17 00:00:00 2001 From: Jukka Jokiniva Date: Tue, 9 Sep 2025 08:07:31 +0300 Subject: [PATCH 170/204] Update qtremoteobjects and qt3d submodules Change-Id: Ie51a238cc8164707f12323c0ea19bf6f06f0ce4d Reviewed-by: Jani Heikkinen --- qt3d | 2 +- qtremoteobjects | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qt3d b/qt3d index 8fcf38596ce..cb3a834c136 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 8fcf38596ce9b5e72c59a3f081eb0cbcf0129651 +Subproject commit cb3a834c136c631ec8a3cebdb69002201aa7d71a diff --git a/qtremoteobjects b/qtremoteobjects index 68feac427df..1c0d57b91ff 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 68feac427df40b687dafed3a29f465571c8e2c56 +Subproject commit 1c0d57b91ff97b8301faaf173e73448aee362cdd From 866a7e93efe977324265340c09259985be82440a Mon Sep 17 00:00:00 2001 From: Toni Saario Date: Wed, 3 Sep 2025 11:50:08 +0300 Subject: [PATCH 171/204] Cache maven dependencies for californium build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The fetching from 3rd party repos has become very flaky. To avoid mirrors throttling us and other flaky issues cache the dependencies and set -o to enable offline mode. This seems to also speed up the step considerably. Pick-to: 6.8 6.5 Change-Id: I01663e60baa44ab828d8880ab8b346034a50b60e Reviewed-by: Simo Fält (cherry picked from commit a64f150422d52034cb59c53331a92d0283d933d1) Reviewed-by: Qt Cherry-pick Bot --- .../common/shared/testserver/californium/Dockerfile | 5 +++-- .../common/shared/testserver/docker_images.sh | 10 ++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/common/shared/testserver/californium/Dockerfile b/coin/provisioning/common/shared/testserver/californium/Dockerfile index 81d27f9bdef..14ba2e04712 100644 --- a/coin/provisioning/common/shared/testserver/californium/Dockerfile +++ b/coin/provisioning/common/shared/testserver/californium/Dockerfile @@ -4,12 +4,13 @@ RUN apt-get update && apt-get -y install $packages # Get californium-based CoAP test server WORKDIR /root/src -ADD californium-*.tar.gz . +ADD californium-3.8.0.tar.gz . RUN mv californium-* californium WORKDIR /root/src/californium ADD qt_changes.patch ./ RUN patch -p1 < qt_changes.patch -RUN mvn clean install -q -DskipTests +ADD californium-m2deps-3.8.0.tar.gz /root +RUN mvn clean install -o -q -DskipTests WORKDIR / EXPOSE 5683/udp 5684/udp diff --git a/coin/provisioning/common/shared/testserver/docker_images.sh b/coin/provisioning/common/shared/testserver/docker_images.sh index e4782a72396..68d57633d9c 100755 --- a/coin/provisioning/common/shared/testserver/docker_images.sh +++ b/coin/provisioning/common/shared/testserver/docker_images.sh @@ -60,6 +60,16 @@ DownloadURL \ 24f8ca393f26c922739462e4586b8ced1ff75f99bfa795defa34a967b5a4a5a0 \ californium-3.8.0.tar.gz mv californium-3.8.0.tar.gz "$SERVER_PATH/californium/" +# Download cached maven dependencies for californium. +# The dependency archive is built by +# "mvn dependency:go-offline -DskipTests -Dos.detected.classifier=linux-x86_64" +# and archived from /root/.m2 +DownloadURL \ + http://ci-files01-hki.ci.qt.io/input/docker/californium-m2deps-3.8.0.tar.gz \ + http://ci-files01-hki.ci.qt.io/input/docker/californium-m2deps-3.8.0.tar.gz \ + e2fade7dde3cca02bb910eed99a5d8b5cb8ff945240c65bf06ce50411d70d3f2 \ + californium-m2deps-3.8.0.tar.gz +mv californium-m2deps-3.8.0.tar.gz "$SERVER_PATH/californium/" echo 'Building the docker images...' From d29b250e103f30a1339811e373f0357acab23cdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aku=20Pietik=C3=A4inen?= Date: Fri, 15 Aug 2025 15:47:16 +0300 Subject: [PATCH 172/204] Use correct PATH for homebrew based on architecture MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-6903 Change-Id: I1b5f529e8e94a7e609b5be1704ed83f6380f4cc5 Reviewed-by: Ville-Pekka Karhu (cherry picked from commit f73de1b6a8962fdc9eaaf7dcfc006acca5dae5c8) Reviewed-by: Tor Arne Vestbø --- coin/provisioning/common/macos/homebrew.sh | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/common/macos/homebrew.sh b/coin/provisioning/common/macos/homebrew.sh index 8f68209c2ff..ecd32d4de18 100755 --- a/coin/provisioning/common/macos/homebrew.sh +++ b/coin/provisioning/common/macos/homebrew.sh @@ -32,8 +32,6 @@ installPkg() { "/tmp/Homebrew-$VERSION.pkg" sudo installer -pkg "/tmp/Homebrew-$VERSION.pkg" -target / - # Add homebrew to PATH - SetEnvVar "PATH" "/opt/homebrew/bin:\$PATH" echo "Homebrew = $VERSION" >> ~/versions.txt } @@ -65,6 +63,14 @@ else installPkg fi +ARCH_TYPE=$(arch) +# Add homebrew to PATH +if [ "$ARCH_TYPE" == "arm64" ]; then + SetEnvVar "PATH" "/opt/homebrew/bin:\$PATH" +else + SetEnvVar "PATH" "/usr/local/bin:\$PATH" +fi + # Disable non-ascii output for homebrew to make logs more readable SetEnvVar "HOMEBREW_NO_COLOR" "1" SetEnvVar "HOMEBREW_NO_EMOJI" "1" From ea9b62813fefad434bd0bae89df1e5786d729b01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aku=20Pietik=C3=A4inen?= Date: Mon, 18 Aug 2025 13:20:17 +0300 Subject: [PATCH 173/204] Change libiodbc brew to use local tap MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Installing directly from rb file no longer supported by homebrew without HOMEBREW_DEVELOPER set after https://github.com/Homebrew/brew/pull/20414 was merged. Create local tap for install to avoid need for homebrew developer mode. Task-number: QTQAINFRA-7344 Change-Id: Id59af01875b16d1757b1dba36c2ba04bf973c212 Reviewed-by: Simo Fält (cherry picked from commit a9b7487138cfff082fb3b90363b17bcd3692a1b9) Reviewed-by: Ville-Pekka Karhu Reviewed-by: Tor Arne Vestbø --- coin/provisioning/common/macos/libiodbc.sh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/coin/provisioning/common/macos/libiodbc.sh b/coin/provisioning/common/macos/libiodbc.sh index e33ce98ce03..e6891ca1ee3 100755 --- a/coin/provisioning/common/macos/libiodbc.sh +++ b/coin/provisioning/common/macos/libiodbc.sh @@ -9,7 +9,17 @@ set -ex # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -brew install --formula "${BASH_SOURCE%/*}/libiodbc.rb" "$@" +# HOMEBREW_DIR depends on acrhitecture +ARCH_TYPE=$(arch) +if [ "$ARCH_TYPE" == "arm64" ]; then + HOMEBREW_DIR="/opt/homebrew/Library/Taps/local/homebrew-libiodbc/Formula" +else + HOMEBREW_DIR="/usr/local/Homebrew/Library/Taps/local/homebrew-libiodbc/Formula" +fi + +brew tap-new local/libiodbc +cp "${BASH_SOURCE%/*}/libiodbc.rb" "$HOMEBREW_DIR/" +brew install local/libiodbc/libiodbc "$@" read -r -a arr <<< "$(brew list --versions libiodbc)" version=${arr[1]} From c0cadc1d042ee1cae608ee332f38aee2574b1990 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nils=20Petter=20Ska=CC=8Alerud?= Date: Fri, 1 Aug 2025 11:55:41 +0200 Subject: [PATCH 174/204] macOS, FFmpeg: Don't use patchelf 0.18 for Android FFmpeg patching At the time of writing, homebrew ships patchelf version 0.18.0. This version of patchelf has a bug specific to Androd binaries. The macOS 14 arm64 host currently uses this version of patchelf. This causes an issue during runtime linking in Qt Multimedia applications on Android. This patch modifies the macOS 14 arm64 host to use patchelf v0.17.2 that we compile from source. It also adds warnings to the provisioning log should someone try to use v0.18.0 in the future. Fixes: QTBUG-136930 Pick-to: 6.8 Change-Id: Id66b560e6a1d4300a54017e9c3366720dc291944 Reviewed-by: Artem Dyomin (cherry picked from commit 61046109cfa806322a2cfa6b0394c44dd3e0e7d8) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 14dcdd32d71ca98aa591122fd54bd8540dba80f2) --- coin/provisioning/common/shared/fix_ffmpeg_dependencies.sh | 6 ++++++ coin/provisioning/common/unix/install-patchelf.sh | 1 + coin/provisioning/qtci-macos-14-arm/28-patchelf.sh | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/coin/provisioning/common/shared/fix_ffmpeg_dependencies.sh b/coin/provisioning/common/shared/fix_ffmpeg_dependencies.sh index 5e492d2efaf..e7c8d8dd878 100755 --- a/coin/provisioning/common/shared/fix_ffmpeg_dependencies.sh +++ b/coin/provisioning/common/shared/fix_ffmpeg_dependencies.sh @@ -31,6 +31,12 @@ if ! command -v patchelf; then exit 1 fi +# Get patchelf version +patchelf_version=$(patchelf --version 2>/dev/null | awk '{print $2}') +if [[ "$patchelf_version" == "0.18.0" ]]; then + echo "WARNING: patchelf version 0.18.0 is known to have issues with Android." >&2 +fi + ffmpeg_libs=("avcodec" "avdevice" "avfilter" "avformat" "avutil" "swresample" "swscale") stub_prefix="Qt6FFmpegStub-" diff --git a/coin/provisioning/common/unix/install-patchelf.sh b/coin/provisioning/common/unix/install-patchelf.sh index 44ad9b882d5..ce15d239798 100755 --- a/coin/provisioning/common/unix/install-patchelf.sh +++ b/coin/provisioning/common/unix/install-patchelf.sh @@ -5,6 +5,7 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" # version 0.18.0 doesn't work correctly for Android binaries, so we use 0.17.2 +# See patchelf bugreport: https://github.com/NixOS/patchelf/issues/576. patchelf_version="0.17.2" url_cached="https://ci-files01-hki.ci.qt.io/input/android/patchelf/$patchelf_version.tar.gz" diff --git a/coin/provisioning/qtci-macos-14-arm/28-patchelf.sh b/coin/provisioning/qtci-macos-14-arm/28-patchelf.sh index 414ed936a34..a2a91e16bcc 100755 --- a/coin/provisioning/qtci-macos-14-arm/28-patchelf.sh +++ b/coin/provisioning/qtci-macos-14-arm/28-patchelf.sh @@ -4,4 +4,4 @@ set -ex -brew install patchelf +source "${BASH_SOURCE%/*}/../common/unix/install-patchelf.sh" From 2106554dff48b0b14c2601d6aead39bcbfe11856 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Mon, 18 Aug 2025 10:52:45 +0200 Subject: [PATCH 175/204] coin: Force detach Docker volume unmount MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I6c19b374adf3d4cd75a3307474e973af96613378 Reviewed-by: Volker Hilsheimer (cherry picked from commit e8f8c9e845d96aff0058b61f4f9591e22cadde15) Reviewed-by: Ville-Pekka Karhu Reviewed-by: Tor Arne Vestbø --- coin/provisioning/common/macos/docker.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/provisioning/common/macos/docker.sh b/coin/provisioning/common/macos/docker.sh index 7ae9cdd50a9..ad4aebb21c4 100755 --- a/coin/provisioning/common/macos/docker.sh +++ b/coin/provisioning/common/macos/docker.sh @@ -23,7 +23,7 @@ DownloadURL "$urlCache" "$urlOccifical" "$sha" "/tmp/Docker_${chip}.dmg" sudo hdiutil attach "/tmp/Docker_${chip}.dmg" sudo /Volumes/Docker/Docker.app/Contents/MacOS/install --accept-license --user qt -sudo hdiutil detach /Volumes/Docker +sudo hdiutil detach /Volumes/Docker -force # Add registry mirror for docker images mkdir "$HOME/.docker" From 86ce9b7db5d8662a60de484a2de452f3758ed8e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aku=20Pietik=C3=A4inen?= Date: Fri, 11 Jul 2025 11:54:55 +0300 Subject: [PATCH 176/204] Update homebrew after installation Get rid of incompatibility errors between homebrew client and server. Tark-number: QTQAINFRA-6903 Pick-to: 6.8 6.5 Change-Id: If42b721084f770763a378b93b3386733ab48828f Reviewed-by: Ville-Pekka Karhu (cherry picked from commit 1dffbe8157ad5743288ac2a84e71770cb3f9a86e) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 8d22b36de0c0fc7a38fb10b24cf3c4cb7298ece7) --- coin/provisioning/common/macos/homebrew.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/coin/provisioning/common/macos/homebrew.sh b/coin/provisioning/common/macos/homebrew.sh index ecd32d4de18..f412f18a29a 100755 --- a/coin/provisioning/common/macos/homebrew.sh +++ b/coin/provisioning/common/macos/homebrew.sh @@ -75,3 +75,8 @@ fi SetEnvVar "HOMEBREW_NO_COLOR" "1" SetEnvVar "HOMEBREW_NO_EMOJI" "1" SetEnvVar "HOMEBREW_NO_ENV_HINTS" "1" + +# Update homebrew to make sure we are compatible with homebrew servers +source ~/.zshrc +brew update +brew upgrade From 72194809dcb3b710fde4d51b4b2aaf6290cebfc2 Mon Sep 17 00:00:00 2001 From: Ville-Pekka Karhu Date: Tue, 12 Aug 2025 13:07:11 +0300 Subject: [PATCH 177/204] Provisioning: Take repo-clones-apt into use in Ubuntu 24.04 Pick-to: 6.8 Task-number: QTQAINFRA-6297 Change-Id: I7d9b3edc2b2429361e421ce13b5c36f4247693f6 Reviewed-by: Tero Heikkinen (cherry picked from commit 13487118df13dcc191daafbccf84ec8f9e7e6104) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit c25feffb9b9773cf48fc85d709431fb6f08554e5) --- .../qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh | 13 ++++++------- .../qtci-linux-Ubuntu-24.04-x86_64/02-apt.sh | 18 ++++++++---------- 2 files changed, 14 insertions(+), 17 deletions(-) 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 e26e9977b51..a8e206aa342 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 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Copyright (C) 2022 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 required packages with APT @@ -20,15 +20,14 @@ function set_internal_repo { sudo mv /etc/apt/apt.conf.d/50appstream{,.disabled} sudo tee "/etc/apt/sources.list.d/ubuntu.list" > /dev/null <<-EOC - deb [arch=aarch64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ noble main restricted universe multiverse - deb [arch=aarch64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ noble-updates main restricted universe multiverse - deb [arch=aarch64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ noble-backports main restricted universe - deb [arch=aarch64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ noble-security main restricted universe multiverse + deb [trusted=yes] http://repo-clones-apt.ci.qt.io:8080 noble-arm64 main restricted universe multiverse + deb [trusted=yes] http://repo-clones-apt.ci.qt.io:8080 noble-updates-arm64 main restricted universe multiverse + deb [trusted=yes] http://repo-clones-apt.ci.qt.io:8080 noble-backports-arm64 main restricted universe + deb [trusted=yes] http://repo-clones-apt.ci.qt.io:8080 noble-security-arm64 main restricted universe multiverse EOC } -#(ping -c 3 repo-clones.ci.qt.io && set_internal_repo) || echo "Internal package repository not found. Using public repositories." -echo "Internal package repository not loading Translation en package (QTQAINFRA-6297). Using public repositories." +(ping -c 3 repo-clones-apt.ci.qt.io && set_internal_repo) || echo "Internal package repository not found. Using public repositories." # Make sure needed ca-certificates are available sudo apt-get install --reinstall ca-certificates 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 ff00479baca..6a169acdb35 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 @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Copyright (C) 2022 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 required packages with APT @@ -20,18 +20,16 @@ function set_internal_repo { sudo mv /etc/apt/apt.conf.d/50appstream{,.disabled} sudo tee "/etc/apt/sources.list.d/ubuntu.list" > /dev/null <<-EOC - deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ noble main restricted universe multiverse - deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ noble-updates main restricted universe multiverse - deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ noble-backports main restricted universe - deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ noble-security main restricted universe multiverse - deb [arch=i386] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ noble main restricted - deb [arch=i386] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ noble-updates main restricted - deb [arch=i386] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ noble universe + deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 noble-amd64 main restricted universe multiverse + deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 noble-updates-amd64 main restricted universe multiverse + deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 noble-backports-amd64 main restricted universe + deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 noble-security-amd64 main restricted universe multiverse + deb [arch=i386 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 noble-i386 main restricted universe multiverse + deb [arch=i386 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 noble-updates-i386 main restricted universe multiverse EOC } -#(ping -c 3 repo-clones.ci.qt.io && set_internal_repo) || echo "Internal package repository not found. Using public repositories." -echo "Internal package repository not loading Translation en package (QTQAINFRA-6297). Using public repositories." +(ping -c 3 repo-clones-apt.ci.qt.io && set_internal_repo) || echo "Internal package repository not found. Using public repositories." # Make sure needed ca-certificates are available sudo apt-get install --reinstall ca-certificates From 49a3b262d5c30ae3781eceea197138a7bff754e3 Mon Sep 17 00:00:00 2001 From: Tero Heikkinen Date: Thu, 4 Sep 2025 09:54:34 +0300 Subject: [PATCH 178/204] macOS: Fix mdutil unknown indexing state in provisioning Task-number: QTQAINFRA-7377 Pick-to: 6.8 6.5 Change-Id: Idf0dc607a4c6f7299412f6979f9ea6de5ea522cb Reviewed-by: Ville-Pekka Karhu (cherry picked from commit 0b23c3afcda228e4cd6298d1d050a577a63297f1) --- coin/provisioning/common/macos/disable_spotlight.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/coin/provisioning/common/macos/disable_spotlight.sh b/coin/provisioning/common/macos/disable_spotlight.sh index b4907ca0d65..82ca3d7ff21 100755 --- a/coin/provisioning/common/macos/disable_spotlight.sh +++ b/coin/provisioning/common/macos/disable_spotlight.sh @@ -12,6 +12,13 @@ disableSpotlight() { sudo mdutil -E / } +fixUnknownIndexingState() { + echo "Fix unknown indexing state by enabling indexing back one by one" + sudo mdutil -i on / || return 1 + sudo mdutil -i on /System/Volumes/Preboot || return 1 + sudo mdutil -i on /System/Volumes/Data || return 1 +} + # Disabling spotlight tends to be flaky, add some retry for i in $(seq 1 5) do @@ -22,7 +29,8 @@ do echo "Spotlight disabled" break else - echo "Failed to disable spotlight, $i retry..." + echo "Failed to disable spotlight, $i run fix and retry..." + fixUnknownIndexingState sleep 2 fi done From 30024db8932d998bf87e78b502be163ae5073c49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aku=20Pietik=C3=A4inen?= Date: Wed, 3 Sep 2025 14:14:37 +0300 Subject: [PATCH 179/204] Update homebrew to version 4.6.8 and git to latest installer Change-Id: I2c13ce86b3aceae47afab7e1af1489c2d355aad2 Pick-to: 6.8 6.5 Reviewed-by: Tero Heikkinen (cherry picked from commit ae2ae67c6165894f55a994c51e3ffd6779b95813) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 19b819ebf38282e7d6eff7dd06557a67ecb9322f) --- coin/provisioning/common/macos/homebrew.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/coin/provisioning/common/macos/homebrew.sh b/coin/provisioning/common/macos/homebrew.sh index f412f18a29a..4c50e1f607f 100755 --- a/coin/provisioning/common/macos/homebrew.sh +++ b/coin/provisioning/common/macos/homebrew.sh @@ -12,10 +12,10 @@ INSTALLTYPE="$1" VERSION="$2" CHECKSUM="$3" -DEFAULT_PKG_VERSION="4.4.21" -DEFAULT_PKG_VERSION_CHECKSUM="cd83c4123d5db7d07eb3042f1c785ed7f599183c5c542040bc6abfa722583861" -DEFAULT_GIT_VERSION="deb02e27d99fd2cb27ae16760e3a5272b612fded" -DEFAULT_GIT_VERSION_CHECKSUM="a30b9fbf0d5c2cff3eb1d0643cceee30d8ba6ea1bb7bcabf60d3188bd62e6ba6" +DEFAULT_PKG_VERSION="4.6.8" +DEFAULT_PKG_VERSION_CHECKSUM="91157b34fcc58eeaf4149f2f2b3063f2904a3d5e5cc3bf84d3c79627ba26afd9" +DEFAULT_GIT_VERSION="bce07c53def3dbe54aa14a88adfc63eb7ba91f48" +DEFAULT_GIT_VERSION_CHECKSUM="c95d3a95a38f9c2cb122335a2101d49af196a1c5" source "$(dirname "$0")"/../../common/unix/DownloadURL.sh source "$(dirname "$0")"/../../common/unix/SetEnvVar.sh @@ -53,7 +53,7 @@ installGit() { DownloadURL "http://ci-files01-hki.ci.qt.io/input/semisecure/sign/pw" "http://ci-files01-hki.ci.qt.io/input/semisecure/sign/pw" "aae58d00d0a1b179a09f21cfc67f9d16fb95ff36" "/Users/qt/pw" { pw=$(cat "/Users/qt/pw"); } 2> /dev/null sudo chmod 755 /tmp/homebrew_install.sh - { (echo "$pw" | /tmp/homebrew_install.sh); } 2> /dev/null + { (echo "$pw" | CI=1 /tmp/homebrew_install.sh); } 2> /dev/null rm -f "/Users/qt/pw" } From 33eab8b05d0754d94eb27eefa4579ee8cd803e58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Mon, 8 Sep 2025 08:00:02 +0300 Subject: [PATCH 180/204] COIN: Fix Debian with missing debootstrap key Pick-to: 6.8 Change-Id: I61f6a4834b034bb52323416499d71543f290ccf6 Reviewed-by: Jani Heikkinen (cherry picked from commit 4bb846dd6d6e2b89762b709e5d42d3bbd7f431a9) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit a792a399e3d2c955f801ad173c13cd5a501c6c9a) --- coin/provisioning/qtci-linux-Debian-11.6-aarch64/02-apt.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/coin/provisioning/qtci-linux-Debian-11.6-aarch64/02-apt.sh b/coin/provisioning/qtci-linux-Debian-11.6-aarch64/02-apt.sh index bd83f96c0bb..73003785865 100755 --- a/coin/provisioning/qtci-linux-Debian-11.6-aarch64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Debian-11.6-aarch64/02-apt.sh @@ -249,6 +249,8 @@ installPackages+=(zlib1g-dev) installPackages+=(libusb-1.0-0-dev) # password management support for Qt Creator installPackages+=(libsecret-1-dev) +installPackages+=(debian-archive-keyring) + echo "Running update for apt" waitLoop From 3bb6e6311926a0244ec208809a77dfdbd4d283a3 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 4 Jun 2025 09:58:29 +0200 Subject: [PATCH 181/204] platform_configs: add DocsGenerationV2 for Ubuntu 24.04 x64 Prepare for documentation-warnings config. Pick-to: 6.8 Task-number: QTQAINFRA-7146 Change-Id: Ibc08b33b5b61c80b30506bb6de0b466d3c19f915 Reviewed-by: Alexandru Croitor (cherry picked from commit b42d426d8f60c16358769dea7accc6bdb512c669) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit d3a73458b62ecbcbe9fb2c701854d2dfd212bcc6) --- coin/platform_configs/cmake_platforms.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 8e647b6da83..5c92ea87e06 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -74,7 +74,7 @@ Configurations: Id: 'ubuntu-24.04-x64' Template: 'qtci-linux-Ubuntu-24.04-x86_64-50' Compiler: 'GCC' - Features: ['Sccache', 'UseConfigure', 'DoNotRunTests'] + Features: ['Sccache', 'UseConfigure', 'DoNotRunTests', 'GenerateSBOM', 'VerifySBOM', 'DocsGenerationV2'] Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput' Environment variables: [ 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', From 6e7c618502ef7bfd5cb3d0148b1c39fd7f50cea8 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Mon, 23 Jun 2025 10:38:27 +0200 Subject: [PATCH 182/204] Revert "platform_configs: remove two u2204 tests" Ubuntu 24.04 GNOME X11 still has too many flaky issues in our CI, which blocks integrations too much. This reverts commit e2e25e8a66211dea81b4f5b38dde04e8e0560580. Pick-to: 6.8 Task-number: QTBUG-137909 Change-Id: Ifcb56d0172b7bd0e66d1fe6e764ea6643b8e4834 Reviewed-by: Axel Spoerl (cherry picked from commit da4d20137c62ad2ef9087afc66c494766a405f90) Reviewed-by: Tero Heikkinen Reviewed-by: Jukka Jokiniva (cherry picked from commit 3d536d157de098fbf903bc4a458dc335aaa5c2e8) --- coin/platform_configs/cmake_platforms.yaml | 13 +++++++++++++ coin/platform_configs/precheck.yaml | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 5c92ea87e06..9e9f1b9d1bc 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -25,6 +25,19 @@ Configurations: 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DINPUT_headersclean=ON -DQT_DEPLOY_FFMPEG=TRUE' ] +# Test on Ubuntu 22.04 X11 +- + Id: 'ubuntu-22.04-developer-build-x11-tests' + Template: 'qtci-linux-Ubuntu-22.04-x86_64-51' + Compiler: 'GCC' + 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: ['Sccache', 'TestOnly'] + Platform dependency: 'ubuntu-22.04' # Build on Ubuntu 24.04 ARM64 Wayland and test on offscreen and Wayland later - Id: 'ubuntu-24.04-arm64-developer-build' diff --git a/coin/platform_configs/precheck.yaml b/coin/platform_configs/precheck.yaml index ac88661d387..c32948295bc 100644 --- a/coin/platform_configs/precheck.yaml +++ b/coin/platform_configs/precheck.yaml @@ -4,7 +4,7 @@ Include: [ cmake_platforms.yaml: [ "ubuntu-22.04", "ubuntu-22.04-developer-build", - "ubuntu-24.04-x64-developer-build-x11-tests", + "ubuntu-22.04-developer-build-x11-tests", "windows-11_23H2-msvc2022-developer-build", "ios-universal" ], From 9da7cef4c3cb79230e7c807b03741293101aeb88 Mon Sep 17 00:00:00 2001 From: Tero Heikkinen Date: Mon, 25 Aug 2025 14:35:59 +0300 Subject: [PATCH 183/204] Windows ARM: Remove Packaging flag from WoA 11 22h2 target MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Target: windows-11_23H2-msvc2022-arm64 Task-number: QTQAINFRA-6973 Task-number: QTQAINFRA-6109 Change-Id: I82153c08e327a211fd604f803b901370f06e35df Reviewed-by: Simo Fält --- coin/platform_configs/cmake_platforms.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 9e9f1b9d1bc..fe1cd1c9afe 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -179,7 +179,7 @@ Configurations: Template: 'qtci-windows-11_23H2-x86_64-54' Compiler: 'MSVC2022' Target arch: 'arm64' - Features: ['Sccache', 'DoNotRunTests', 'TargetBuildOnly', 'Packaging', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] + Features: ['Sccache', 'DoNotRunTests', 'TargetBuildOnly', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] Platform dependency: 'windows-10_22h2-mingw13' Environment variables: [ 'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}', From 31d1707f3ef3bb245434d3063ec0e72e42b5506e Mon Sep 17 00:00:00 2001 From: Elias Toivola Date: Mon, 14 Apr 2025 12:25:03 +0300 Subject: [PATCH 184/204] Set-EnvironmentVariable helper: apply envvar to current PS session When you use the helper to set an envvar in provisioning, you can not reference the machine scoped variable in a later .ps1 script in the same provisoning run using the direct/static reference '$env:NAME', instead you have to use a more verbose method with e.g. 'Get-Item' cmdlet and/or set the envvar additionally to the process scope yourself. This change makes the helper also add process scope to the envvars, this way envvars set in provisioning can be simply referenced with '$env:NAME' in later provisioning scripts, which is consistent with the way you can use SetEnvVar helper in Unix and directly reference the envvar with just its variable name in later .sh scripts. This change also removes duplicate local scope envvar definitions now that Set-EnvironmentVariable helper does it. Change-Id: I804fa8f8dfce742a84e8b4bc077f466820589f7e (cherry picked from commit 30a92ce1f2c50aae5e37a2c9e6e815d88d378b0a) Reviewed-by: Assam Boudjelthia Reviewed-by: Tero Heikkinen --- coin/provisioning/common/windows/android.ps1 | 1 - coin/provisioning/common/windows/helpers.ps1 | 2 ++ coin/provisioning/common/windows/install-vcpkg.ps1 | 4 ---- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/coin/provisioning/common/windows/android.ps1 b/coin/provisioning/common/windows/android.ps1 index 5b2039d1136..4e9dde67a6d 100644 --- a/coin/provisioning/common/windows/android.ps1 +++ b/coin/provisioning/common/windows/android.ps1 @@ -57,7 +57,6 @@ $ndkFolderDefault = Install $ndkCachedUrlDefault $ndkZip $ndkChecksumDefault $nd Set-EnvironmentVariable "ANDROID_NDK_ROOT_DEFAULT" $ndkFolderDefault # To be used by vcpkg Set-EnvironmentVariable "ANDROID_NDK_HOME" $ndkFolderDefault -$env:ANDROID_NDK_HOME = "$ndkFolderDefault" if ($ndkVersionDefault -eq $ndkVersionLatest) { Write-Host "Android Latest version is the same than Default. NDK installation done." diff --git a/coin/provisioning/common/windows/helpers.ps1 b/coin/provisioning/common/windows/helpers.ps1 index 1fb394fbb2f..982c5ee937b 100644 --- a/coin/provisioning/common/windows/helpers.ps1 +++ b/coin/provisioning/common/windows/helpers.ps1 @@ -189,6 +189,8 @@ function Set-EnvironmentVariable Write-Host "Setting environment variable `"$($Key)`" to `"$($Value)`"" [Environment]::SetEnvironmentVariable($Key, $Value, [EnvironmentVariableTarget]::Machine) + # Make the envvar immediately available to subsequent scripts run in the same session. + [Environment]::SetEnvironmentVariable($Key, $Value, [EnvironmentVariableTarget]::Process) } function Is64BitWinHost diff --git a/coin/provisioning/common/windows/install-vcpkg.ps1 b/coin/provisioning/common/windows/install-vcpkg.ps1 index ee42557ddad..bc847a1200c 100644 --- a/coin/provisioning/common/windows/install-vcpkg.ps1 +++ b/coin/provisioning/common/windows/install-vcpkg.ps1 @@ -55,11 +55,7 @@ if(![System.IO.File]::Exists("$vcpkgRoot\vcpkg.exe")){ # Disable telemetry Set-Content -Value "" -Path "$vcpkgRoot\vcpkg.disable-metrics" -Force -# Setting VCPKG_ROOT using Set-EnvironmentVariable makes the variable only -# available during build time. In order to make it available during the -# provisioning, we need to directly set it via $env:VCPKG_ROOT as well. Set-EnvironmentVariable "VCPKG_ROOT" "$vcpkgRoot" -$env:VCPKG_ROOT = "$vcpkgRoot" # Set a source for vcpkg Binary and Asset Cache # The `coin/provisioning/common/windows/mount-vcpkg-cache-drive.ps1` script is From c20550ac700fa961355f9c29fc0ef66b756e88dc Mon Sep 17 00:00:00 2001 From: Rami Potinkara Date: Wed, 26 Feb 2025 16:41:23 +0200 Subject: [PATCH 185/204] Provisioning: Remove OpenSSL 1 This patch removes OpenSSL 1 related sections. Task-number: QTQAINFRA-7069 Change-Id: If565fb2223b17497553a77fda47fe9dfbdccb32a (cherry picked from commit 09ea302a6279a70c4bc2da23d51576c5019ba3b8) Reviewed-by: Assam Boudjelthia --- coin/provisioning/common/macos/android.sh | 2 +- .../common/unix/openssl_3_for_android.sh | 76 ------------------- .../50-openssl_for_android_linux.sh | 2 +- .../50-openssl_for_android_linux.sh | 2 +- .../50-openssl_for_android_linux.sh | 2 +- 5 files changed, 4 insertions(+), 80 deletions(-) delete mode 100755 coin/provisioning/common/unix/openssl_3_for_android.sh diff --git a/coin/provisioning/common/macos/android.sh b/coin/provisioning/common/macos/android.sh index 57671748a97..23032d16e4a 100755 --- a/coin/provisioning/common/macos/android.sh +++ b/coin/provisioning/common/macos/android.sh @@ -74,5 +74,5 @@ cat << EOT >>~/versions.txt Android SDK tools = $toolsVersion Android SDK Build Tools = $sdkBuildToolsVersion Android SDK API level = $sdkApiLevel -Android NDK = $ndkVersionDefault +Android NDK = $ndkVersion EOT diff --git a/coin/provisioning/common/unix/openssl_3_for_android.sh b/coin/provisioning/common/unix/openssl_3_for_android.sh deleted file mode 100755 index a49da77f15d..00000000000 --- a/coin/provisioning/common/unix/openssl_3_for_android.sh +++ /dev/null @@ -1,76 +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 - -# This script install prebuilt OpenSSL which was built against Android NDK 25. -# OpenSSL build will fail with Android NDK 22, because it's missing platforms and sysroot directories - -set -ex -# shellcheck source=../unix/DownloadURL.sh -source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" -# shellcheck source=../unix/SetEnvVar.sh -source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" - -version="3.0.7" -ndkVersionLatest="r27c" -ndkVersionDefault=$ndkVersionLatest -prebuiltOpensslNdkShaLatest="733cff853b6ee7738e78b90f46b5f028c8490e1e" -prebuiltOpensslNdkShaDefault=$prebuiltOpensslNdkShaLatest - -: <<'EOB' SOURCE BUILD INSTRUCTIONS - Openssl prebuilt was made using Android NDK r27c -# Source built requires GCC and Perl to be in PATH. Rhel "requires yum install perl-IPC-Cmd" -exports_file="/tmp/export.sh" -# source previously made environmental variables. -if uname -a |grep -q "Ubuntu"; then - # shellcheck disable=SC1090 - grep -e "^export" "$HOME/.profile" > $exports_file && source $exports_file - rm -rf "$exports_file" -else - # shellcheck disable=SC1090 - grep -e "^export" "$HOME/.bashrc" > $exports_file && source $exports_file - rm -rf "$exports_file" -fi - -# ANDROID_NDK_ROOT is required during Configure -export ANDROID_NDK_ROOT=/opt/android/android-ndk-r27c - -officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz" -cachedUrl="http://ci-files01-hki.ci.qt.io/input/openssl/openssl-$version.tar.gz" -targetFile="/tmp/openssl-$version.tar.gz" -sha="f20736d6aae36bcbfa9aba0d358c71601833bf27" -opensslHome="${HOME}/openssl/android/openssl-${version}" -DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile" -mkdir -p "${HOME}/openssl/android/" -tar -xzf "$targetFile" -C "${HOME}/openssl/android/" -if uname -a |grep -q "Darwin"; then - TOOLCHAIN=${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/darwin-x86_64/bin -else - TOOLCHAIN=${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/bin -fi -cd "$opensslHome" -PATH=$TOOLCHAIN:$PATH CC=clang ./Configure android-arm -PATH=$TOOLCHAIN:$PATH CC=clang make build_generated -EOB - -function InstallPrebuiltOpenssl() { - - ndkVersion=$1 - sha=$2 - - opensslHome="${HOME}/prebuilt-openssl-${version}-for-android-ndk-${ndkVersion}" - if [[ ! -d ${opensslHome} ]]; then - prebuiltUrl="http://ci-files01-hki.ci.qt.io/input/openssl/prebuilt-openssl-${version}-for-android-ndk-${ndkVersion}.zip" - targetFile="/tmp/prebuilt-openssl-${version}-for-android-ndk-${ndkVersion}.zip" - - DownloadURL "$prebuiltUrl" "$prebuiltUrl" "$sha" "$targetFile" - unzip -o "$targetFile" -d "${HOME}" - sudo rm -f "$targetFile" - fi -} - -InstallPrebuiltOpenssl $ndkVersionDefault $prebuiltOpensslNdkShaDefault -SetEnvVar "OPENSSL_ANDROID_HOME_DEFAULT" "$opensslHome" -InstallPrebuiltOpenssl $ndkVersionLatest $prebuiltOpensslNdkShaLatest -SetEnvVar "OPENSSL_ANDROID_HOME_LATEST" "$opensslHome" - -echo "OpenSSL for Android = $version" >> ~/versions.txt diff --git a/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/50-openssl_for_android_linux.sh b/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/50-openssl_for_android_linux.sh index 36aa6983a34..c3e51d23064 100755 --- a/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/50-openssl_for_android_linux.sh +++ b/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/50-openssl_for_android_linux.sh @@ -4,4 +4,4 @@ set -ex # shellcheck source=../common/unix/openssl_for_android.sh -source "${BASH_SOURCE%/*}/../common/unix/openssl_3_for_android.sh" +source "${BASH_SOURCE%/*}/../common/unix/openssl_for_android.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/50-openssl_for_android_linux.sh b/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/50-openssl_for_android_linux.sh index a71ba0a7b40..8cb78e85613 100755 --- a/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/50-openssl_for_android_linux.sh +++ b/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/50-openssl_for_android_linux.sh @@ -4,4 +4,4 @@ set -ex # shellcheck source=../common/unix/openssl_for_android.sh -source "${BASH_SOURCE%/*}/../common/unix/openssl_3_for_android.sh" +source "${BASH_SOURCE%/*}/../common/unix/openssl_for_android.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/50-openssl_for_android_linux.sh b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/50-openssl_for_android_linux.sh index a71ba0a7b40..8cb78e85613 100644 --- a/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/50-openssl_for_android_linux.sh +++ b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/50-openssl_for_android_linux.sh @@ -4,4 +4,4 @@ set -ex # shellcheck source=../common/unix/openssl_for_android.sh -source "${BASH_SOURCE%/*}/../common/unix/openssl_3_for_android.sh" +source "${BASH_SOURCE%/*}/../common/unix/openssl_for_android.sh" From c4a00bb6b4787b6498787b164dd65b2395a9aa04 Mon Sep 17 00:00:00 2001 From: Elias Toivola Date: Fri, 13 Jun 2025 12:45:33 +0300 Subject: [PATCH 186/204] Android: set new NDK envvars for the new Android targets Set the latest NDK envvars for android-quick-minimal and Android 16. Task-number: QTQAINFRA-7069 Change-Id: Ib533eeb08a31437967485cc35f40e434c2880108 (cherry picked from commit b7ee4249625fc6cd0d43497910d7459586130edd) Reviewed-by: Rami Potinkara Reviewed-by: Assam Boudjelthia --- coin/platform_configs/cmake_platforms_target_android.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/coin/platform_configs/cmake_platforms_target_android.yaml b/coin/platform_configs/cmake_platforms_target_android.yaml index 90d949549b6..93dccdfcf26 100644 --- a/coin/platform_configs/cmake_platforms_target_android.yaml +++ b/coin/platform_configs/cmake_platforms_target_android.yaml @@ -73,9 +73,9 @@ Configurations: Platform dependency: 'rhel-8.10' Features: ['Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM', 'InsignificantTests'] 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}}', + 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -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_LATEST}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', + 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_64_NDK_LATEST}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', + 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}', 'ANDROID_EMULATOR=emulator_x86_64_api_36' ] From ad0eea374d12980fb8f10477d55a4a1203c293af Mon Sep 17 00:00:00 2001 From: Elias Toivola Date: Thu, 27 Mar 2025 11:22:31 +0200 Subject: [PATCH 187/204] Android: set nightly targets for older NDK versions This change makes provisioning also install older NDKs for Android, which will be used in nightly targets. Task-number: QTQAINFRA-7069 Change-Id: Ia8695383e94df282822da9019c33f1004a879bf6 (cherry picked from commit ac22ffaf57a6943b4e8034d2bd9ddd44b5aeee29) Reviewed-by: Assam Boudjelthia Reviewed-by: Rami Potinkara --- .../cmake_platforms_target_android.yaml | 18 ++-- .../linux_android_tests_developer.yaml | 4 +- .../tqtc-android-automotive.yaml | 8 +- .../common/linux/android_linux.sh | 36 +++++--- .../common/unix/install-ffmpeg-android.sh | 12 +-- .../common/unix/openssl_for_android.sh | 50 +++++++---- .../common/windows/android-openssl.ps1 | 90 +++++++++++-------- coin/provisioning/common/windows/android.ps1 | 56 +++++++----- .../common/windows/install-ffmpeg.ps1 | 4 +- 9 files changed, 168 insertions(+), 110 deletions(-) diff --git a/coin/platform_configs/cmake_platforms_target_android.yaml b/coin/platform_configs/cmake_platforms_target_android.yaml index 93dccdfcf26..94122f4c989 100644 --- a/coin/platform_configs/cmake_platforms_target_android.yaml +++ b/coin/platform_configs/cmake_platforms_target_android.yaml @@ -26,10 +26,10 @@ Configurations: Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] Environment variables: [ 'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}', - 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis armeabi-v7a -no-feature-pkg-config', - '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', + 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis armeabi-v7a -no-feature-pkg-config', + 'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', 'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH={{.Env.Protobuf_ROOT_mingw}} -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARMV7}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR={{.Env.Protobuf_ROOT_msvc}}/include', - 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}' + 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}' ] - Id: 'android-9-x86-on-linux' @@ -41,10 +41,10 @@ Configurations: Platform dependency: 'rhel-8.10' 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', + 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -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_LATEST}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', - 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}', + 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}', 'ANDROID_EMULATOR=emulator_x86_api_28' ] - @@ -57,10 +57,10 @@ Configurations: Platform dependency: 'rhel-8.10' 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', + 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -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_LATEST}} -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_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}', 'ANDROID_EMULATOR=emulator_x86_64_api_35' ] - diff --git a/coin/platform_configs/linux_android_tests_developer.yaml b/coin/platform_configs/linux_android_tests_developer.yaml index 3488a44d73b..248b1f7be7c 100644 --- a/coin/platform_configs/linux_android_tests_developer.yaml +++ b/coin/platform_configs/linux_android_tests_developer.yaml @@ -10,8 +10,8 @@ Configurations: Platform dependency: 'rhel-8.10' Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'UseConfigure'] Environment variables: [ - 'TARGET_CONFIGURE_ARGS=-nomake examples -debug -developer-build -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}}', + 'TARGET_CONFIGURE_ARGS=-nomake examples -debug -developer-build -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -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_LATEST}}', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}', 'NON_QTBASE_TARGET_CMAKE_ARGS=', '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 7da90222dd9..05dec9e2c96 100644 --- a/coin/platform_configs/tqtc-android-automotive.yaml +++ b/coin/platform_configs/tqtc-android-automotive.yaml @@ -27,8 +27,8 @@ Configurations: Platform dependency: 'rhel-8.10' Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure'] 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}}', + 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -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_LATEST}}', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}', 'NON_QTBASE_TARGET_CMAKE_ARGS= -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', 'ANDROID_EMULATOR=automotive_emulator_x86_64_api_34' @@ -43,8 +43,8 @@ Configurations: Platform dependency: 'rhel-8.10' Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure'] 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}}', + 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -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_LATEST}}', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}', 'NON_QTBASE_TARGET_CMAKE_ARGS= -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', 'ANDROID_EMULATOR=automotive_emulator_x86_64_api_29' diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index 4cad2b65037..178133d59ac 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Copyright (C) 2022 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 # This script install Android sdk and ndk. @@ -24,14 +24,21 @@ basePath="http://ci-files01-hki.ci.qt.io/input/android" toolsVersion="2.1" toolsFile="commandlinetools-linux-6609375_latest.zip" -ndkVersionLatest="r27c" -ndkVersionDefault=$ndkVersionLatest sdkBuildToolsVersion="35.0.1" sdkApiLevel="android-35" - toolsSha1="9172381ff070ee2a416723c1989770cf4b0d1076" + +ndkVersionLatest="r27c" ndkSha1Latest="090e8083a715fdb1a3e402d0763c388abb03fb4e" -ndkSha1Default=$ndkSha1Latest + +# Non-latest (but still supported by the qt/qt5 branch) NDKs are installed for nightly targets in: +# coin/platform_configs/nightly_android.yaml + +ndkVersionNightly1=$ndkVersionLatest # Same version = skip NDK install for nightly +ndkSha1Nightly1=$ndkSha1Latest + +ndkVersionNightly2=$ndkVersionLatest +ndkSha1Nightly2=$ndkSha1Latest # Android Automotive max SDK level image sdkApiLevelAutomotiveMax="android-34" @@ -69,17 +76,22 @@ function InstallNdk() { androidNdkRoot="${targetFolder}/${zipBase}" } -InstallNdk $ndkVersionDefault $ndkSha1Default -SetEnvVar "ANDROID_NDK_ROOT_DEFAULT" "$androidNdkRoot" +InstallNdk $ndkVersionLatest $ndkSha1Latest +SetEnvVar "ANDROID_NDK_ROOT_LATEST" "$androidNdkRoot" -if [ "$ndkVersionDefault" != "$ndkVersionLatest" ]; then - InstallNdk $ndkVersionLatest $ndkSha1Latest +if [ "$ndkVersionNightly1" != "$ndkVersionLatest" ]; then + InstallNdk $ndkVersionNightly1 $ndkSha1Nightly1 + SetEnvVar "ANDROID_NDK_ROOT_NIGHTLY1" "$androidNdkRoot" +fi + +if [ "$ndkVersionNightly2" != "$ndkVersionLatest" ]; then + InstallNdk $ndkVersionNightly2 $ndkSha1Nightly2 + SetEnvVar "ANDROID_NDK_ROOT_NIGHTLY2" "$androidNdkRoot" fi -SetEnvVar "ANDROID_NDK_ROOT_LATEST" "$androidNdkRoot" # To be used by vcpkg -SetEnvVar "ANDROID_NDK_HOME" "$targetFolder/android-ndk-$ndkVersionDefault" -export ANDROID_NDK_HOME="$targetFolder/android-ndk-$ndkVersionDefault" +SetEnvVar "ANDROID_NDK_HOME" "$targetFolder/android-ndk-$ndkVersionLatest" +export ANDROID_NDK_HOME="$targetFolder/android-ndk-$ndkVersionLatest" echo "Changing ownership of Android files." if uname -a |grep -q "el7"; then diff --git a/coin/provisioning/common/unix/install-ffmpeg-android.sh b/coin/provisioning/common/unix/install-ffmpeg-android.sh index 62ee173fa8c..dca9db56fa3 100755 --- a/coin/provisioning/common/unix/install-ffmpeg-android.sh +++ b/coin/provisioning/common/unix/install-ffmpeg-android.sh @@ -30,7 +30,7 @@ build_ffmpeg_android() { sudo mkdir -p "$target_dir" - local openssl_include="$OPENSSL_ANDROID_HOME_DEFAULT/include" + local openssl_include="$OPENSSL_ANDROID_HOME_LATEST/include" local openssl_libs local libs_prefix local target_cpu @@ -40,19 +40,19 @@ build_ffmpeg_android() { target_toolchain_arch="x86_64-linux-android" target_arch=x86_64 target_cpu=x86-64 - openssl_libs="$OPENSSL_ANDROID_HOME_DEFAULT/x86_64" + openssl_libs="$OPENSSL_ANDROID_HOME_LATEST/x86_64" libs_prefix="_x86_64" elif [ "$target_arch" == "x86" ]; then target_toolchain_arch="i686-linux-android" target_arch=x86 target_cpu=i686 - openssl_libs="$OPENSSL_ANDROID_HOME_DEFAULT/x86" + openssl_libs="$OPENSSL_ANDROID_HOME_LATEST/x86" libs_prefix="_x86" elif [ "$target_arch" == "arm64" ]; then target_toolchain_arch="aarch64-linux-android" target_arch=aarch64 target_cpu=armv8-a - openssl_libs="$OPENSSL_ANDROID_HOME_DEFAULT/arm64-v8a" + openssl_libs="$OPENSSL_ANDROID_HOME_LATEST/arm64-v8a" libs_prefix="_arm64-v8a" fi @@ -61,7 +61,7 @@ build_ffmpeg_android() { local api_version=24 - local ndk_root=$ANDROID_NDK_ROOT_DEFAULT + local ndk_root=$ANDROID_NDK_ROOT_LATEST local ndk_host if uname -a |grep -q "Darwin"; then ndk_host=darwin-x86_64 @@ -124,7 +124,7 @@ fi # If parameter is set, use it as the target output directory. if [ ! -z $target_install_dir_param ]; then - target_dir=$target_install_dir_param + target_dir=$target_install_dir_param fi build_ffmpeg_android "$target_arch" "$target_dir" diff --git a/coin/provisioning/common/unix/openssl_for_android.sh b/coin/provisioning/common/unix/openssl_for_android.sh index c7ea14021ff..ef1bdc2b8b2 100755 --- a/coin/provisioning/common/unix/openssl_for_android.sh +++ b/coin/provisioning/common/unix/openssl_for_android.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Copyright (C) 2023 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 # This script install prebuilt OpenSSL which was built against Android NDK 25. @@ -11,11 +11,17 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -version="3.0.7" +sslVersionForLatest="3.0.7" ndkVersionLatest="r27c" -ndkVersionDefault=$ndkVersionLatest -prebuiltOpensslNdkShaLatest="733cff853b6ee7738e78b90f46b5f028c8490e1e" -prebuiltOpensslNdkShaDefault=$prebuiltOpensslNdkShaLatest +prebuiltOpensslShaLatest="733cff853b6ee7738e78b90f46b5f028c8490e1e" + +ndkVersionNightly1=$ndkVersionLatest +sslVersionForNightly1=$sslVersionForLatest +prebuiltOpensslShaNightly1=$prebuiltOpensslShaLatest + +ndkVersionNightly2=$ndkVersionLatest +sslVersionForNightly2=$sslVersionForLatest +prebuiltOpensslShaNightly2=$prebuiltOpensslShaLatest : <<'EOB' SOURCE BUILD INSTRUCTIONS - Openssl prebuilt was made using Android NDK r27c # Source built requires GCC and Perl to be in PATH. Rhel "requires yum install perl-IPC-Cmd" @@ -31,11 +37,11 @@ else rm -rf "$exports_file" fi -officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz" -cachedUrl="http://ci-files01-hki.ci.qt.io/input/openssl/openssl-$version.tar.gz" -targetFile="/tmp/openssl-$version.tar.gz" +officialUrl="https://www.openssl.org/source/openssl-$sslVersionForLatest.tar.gz" +cachedUrl="http://ci-files01-hki.ci.qt.io/input/openssl/openssl-$sslVersionForLatest.tar.gz" +targetFile="/tmp/openssl-$sslVersionForLatest.tar.gz" sha="f20736d6aae36bcbfa9aba0d358c71601833bf27" -opensslHome="${HOME}/openssl/android/openssl-${version}" +opensslHome="${HOME}/openssl/android/openssl-${sslVersionForLatest}" DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile" mkdir -p "${HOME}/openssl/android/" tar -xzf "$targetFile" -C "${HOME}/openssl/android/" @@ -53,11 +59,12 @@ function InstallPrebuiltOpenssl() { ndkVersion=$1 sha=$2 + sslVersion=$3 - opensslHome="${HOME}/prebuilt-openssl-${version}-for-android-ndk-${ndkVersion}" + opensslHome="${HOME}/prebuilt-openssl-${sslVersion}-for-android-ndk-${ndkVersion}" if [[ ! -d ${opensslHome} ]]; then - prebuiltUrl="http://ci-files01-hki.ci.qt.io/input/openssl/prebuilt-openssl-${version}-for-android-ndk-${ndkVersion}.zip" - targetFile="/tmp/prebuilt-openssl-${version}-for-android-ndk-${ndkVersion}.zip" + prebuiltUrl="http://ci-files01-hki.ci.qt.io/input/openssl/prebuilt-openssl-${sslVersion}-for-android-ndk-${ndkVersion}.zip" + targetFile="/tmp/prebuilt-openssl-${sslVersion}-for-android-ndk-${ndkVersion}.zip" DownloadURL "$prebuiltUrl" "$prebuiltUrl" "$sha" "$targetFile" unzip -o "$targetFile" -d "${HOME}" @@ -65,9 +72,18 @@ function InstallPrebuiltOpenssl() { fi } -InstallPrebuiltOpenssl $ndkVersionDefault $prebuiltOpensslNdkShaDefault -SetEnvVar "OPENSSL_ANDROID_HOME_DEFAULT" "$opensslHome" -InstallPrebuiltOpenssl $ndkVersionLatest $prebuiltOpensslNdkShaLatest -SetEnvVar "OPENSSL_ANDROID_HOME_LATEST" "$opensslHome" +if [ "$ndkVersionNightly1" != "$ndkVersionLatest" ]; then + InstallPrebuiltOpenssl $ndkVersionNightly1 $prebuiltOpensslShaNightly1 $sslVersionForNightly1 + SetEnvVar "OPENSSL_ANDROID_HOME_NIGHTLY1" "$opensslHome" + echo "OpenSSL for Android $ndkVersionNightly1 = $sslVersionForNightly1" >> ~/versions.txt +fi -echo "OpenSSL for Android = $version" >> ~/versions.txt +if [ "$ndkVersionNightly2" != "$ndkVersionLatest" ]; then + InstallPrebuiltOpenssl $ndkVersionNightly2 $prebuiltOpensslShaNightly2 $sslVersionForNightly2 + SetEnvVar "OPENSSL_ANDROID_HOME_NIGHTLY2" "$opensslHome" + echo "OpenSSL for Android $ndkVersionNightly2 = $sslVersionForNightly2" >> ~/versions.txt +fi + +InstallPrebuiltOpenssl $ndkVersionLatest $prebuiltOpensslShaLatest $sslVersionForLatest +SetEnvVar "OPENSSL_ANDROID_HOME_LATEST" "$opensslHome" +echo "OpenSSL for Android $ndkVersionLatest = $sslVersionForLatest" >> ~/versions.txt diff --git a/coin/provisioning/common/windows/android-openssl.ps1 b/coin/provisioning/common/windows/android-openssl.ps1 index 5c431a26536..88811f12536 100644 --- a/coin/provisioning/common/windows/android-openssl.ps1 +++ b/coin/provisioning/common/windows/android-openssl.ps1 @@ -1,4 +1,4 @@ -# Copyright (C) 2023 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 # Requires: 7z, perl and msys @@ -15,26 +15,38 @@ if (Is64BitWinHost) { # Msys need to be installed to target machine # More info and building instructions can be found from http://doc.qt.io/qt-5/opensslsupport.html -$openssl_version = "3.0.7" +$openssl_version_latest = "3.0.7" $ndk_version_latest = "r27c" -$ndk_version_default = "$ndk_version_latest" -$openssl_compressed = Get-DownloadLocation ("openssl-${openssl_version}.tar.gz") -$openssl_sha1 = "f20736d6aae36bcbfa9aba0d358c71601833bf27" -$prebuilt_sha1_ndk_latest = "733cff853b6ee7738e78b90f46b5f028c8490e1e" -$prebuilt_sha1_ndk_default = "$prebuilt_sha1_ndk_latest" -$destination_prefix = "C:\Utils\prebuilt-openssl-${openssl_version}-for-android-ndk" +$prebuilt_ssl_sha1_latest = "733cff853b6ee7738e78b90f46b5f028c8490e1e" +$openssl_sha1_latest = "f20736d6aae36bcbfa9aba0d358c71601833bf27" -function Install($1, $2) { - $ndk_version = $1 - $prebuilt_sha1 = $2 +$openssl_version_nightly1 = $openssl_version_latest +$ndk_version_nightly1 = $ndk_version_latest +$prebuilt_ssl_sha1_nightly1 = $prebuilt_ssl_sha1_latest +$openssl_sha1_nightly1 = $openssl_sha1_latest - # msys unix style paths - $openssl_path = "/c/Utils/openssl-android-master" - $ndk_path = "/c/Utils/Android/android-ndk-${ndk_version}" - $cc_path = "$ndk_path/toolchains/llvm/prebuilt/windows-x86_64/bin" +$openssl_version_nightly2 = $openssl_version_latest +$ndk_version_nightly2 = $ndk_version_latest +$prebuilt_ssl_sha1_nightly2 = $prebuilt_ssl_sha1_latest +$openssl_sha1_nightly2 = $openssl_sha1_latest - $prebuilt_url_openssl = "\\ci-files01-hki.ci.qt.io\provisioning\openssl\prebuilt-openssl-${openssl_version}-for-android-ndk-${ndk_version}.zip" - $prebuilt_zip_openssl = Get-DownloadLocation ("prebuilt-openssl-${openssl_version}-for-android-ndk-${ndk_version}.zip") +function Install($1, $2, $3, $4) { + + $openssl_version = $1 + $ndk_version = $2 + $prebuilt_sha1 = $3 + $openssl_sha1 = $4 + + Write-Host "Installing OpenSSL ${openssl_version} for Android NDK ${ndk_version}" + + $openssl_compressed = Get-DownloadLocation ("openssl-${openssl_version}.tar.gz") + # msys unix style paths + $openssl_path = "/c/Utils/openssl-android-master" + $ndk_path = "/c/Utils/Android/android-ndk-${ndk_version}" + $cc_path = "$ndk_path/toolchains/llvm/prebuilt/windows-x86_64/bin" + + $prebuilt_url_openssl = "\\ci-files01-hki.ci.qt.io\provisioning\openssl\prebuilt-openssl-${openssl_version}-for-android-ndk-${ndk_version}.zip" + $prebuilt_zip_openssl = Get-DownloadLocation ("prebuilt-openssl-${openssl_version}-for-android-ndk-${ndk_version}.zip") if ((Test-Path $prebuilt_url_openssl)) { Write-Host "Install prebuilt OpenSSL for Android" @@ -69,34 +81,36 @@ function Install($1, $2) { } } - # ANDROID_NDK_ROOT needs to be in environment variables before running this script - # Set-EnvironmentVariable "ANDROID_NDK_ROOT" "C:\Utils\Android\android-ndk-r27c" - - $make_install = Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"yes | pacman -S make`"") - CheckExitCode $make_install + $make_install = Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"yes | pacman -S make`"") + CheckExitCode $make_install - $configure = Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_ROOT=$ndk_path PATH=${cc_path}:`$PATH CC=clang $openssl_path/Configure shared android-arm`"") - CheckExitCode $configure + $configure = Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_ROOT=$ndk_path PATH=${cc_path}:`$PATH CC=clang $openssl_path/Configure shared android-arm`"") + CheckExitCode $configure - $make = Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_ROOT=$ndk_path PATH=${cc_path}:`$PATH CC=clang make -f $openssl_path/Makefile build_generated`"") - CheckExitCode $make + $make = Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath "$msys_bash" -ArgumentList ("-lc", "`"pushd $openssl_path; ANDROID_NDK_ROOT=$ndk_path PATH=${cc_path}:`$PATH CC=clang make -f $openssl_path/Makefile build_generated`"") + CheckExitCode $make - Pop-Location - Remove-item C:\Utils\tmp -Recurse -Confirm:$false + Pop-Location + Remove-item C:\Utils\tmp -Recurse -Confirm:$false } + return "C:\Utils\prebuilt-openssl-${openssl_version}-for-android-ndk-${ndk_version}" + } # Install NDK Default version -Install $ndk_version_default $prebuilt_sha1_ndk_default - -if (Test-Path -Path ${destination_prefix}-${ndk_version_latest}) { - Write-Host "OpenSSL for Android Latest version is the same than Default. Installation done." -} else { - # Install NDK Latest version - Install $ndk_version_latest $prebuilt_sha1_ndk_latest +$ndk_ssl_path = Install $openssl_version_latest $ndk_version_latest $prebuilt_ssl_sha1_latest $openssl_sha1_latest +Set-EnvironmentVariable "OPENSSL_ANDROID_HOME_LATEST" "$ndk_ssl_path" +Write-Output "Android OpenSSL $openssl_version_latest for NDK $ndk_version_latest" >> ~/versions.txt + +if ($ndk_version_nightly1 -ne $ndk_version_latest) { + $ndk_ssl_path = Install $openssl_version_nightly1 $ndk_version_nightly1 $prebuilt_ssl_sha1_nightly1 $openssl_sha1_nightly1 + Set-EnvironmentVariable "OPENSSL_ANDROID_HOME_NIGHTLY1" "$ndk_ssl_path" + Write-Output "Android OpenSSL $openssl_version_nightly1 for NDK $ndk_version_nightly1" >> ~/versions.txt } -Set-EnvironmentVariable "OPENSSL_ANDROID_HOME_DEFAULT" "${destination_prefix}-${ndk_version_default}" -Set-EnvironmentVariable "OPENSSL_ANDROID_HOME_LATEST" "${destination_prefix}-${ndk_version_latest}" -Write-Output "Android OpenSSL = $openssl_version" >> ~/versions.txt +if ($ndk_version_nightly2 -ne $ndk_version_latest) { + $ndk_ssl_path = Install $openssl_version_nightly2 $ndk_version_nightly2 $prebuilt_ssl_sha1_nightly2 $openssl_sha1_nightly2 + Set-EnvironmentVariable "OPENSSL_ANDROID_HOME_NIGHTLY2" "$ndk_ssl_path" + Write-Output "Android OpenSSL $openssl_version_nightly2 for NDK $ndk_version_nightly2" >> ~/versions.txt +} diff --git a/coin/provisioning/common/windows/android.ps1 b/coin/provisioning/common/windows/android.ps1 index 4e9dde67a6d..d67b86f17a4 100644 --- a/coin/provisioning/common/windows/android.ps1 +++ b/coin/provisioning/common/windows/android.ps1 @@ -1,4 +1,4 @@ -# Copyright (C) 2022 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 . "$PSScriptRoot\helpers.ps1" @@ -10,15 +10,25 @@ # That's why we need to use Andoid-21 API version in Qt 5.9. # NDK +$ndkZip = "C:\Windows\Temp\android_ndk.zip" + $ndkVersionLatest = "r27c" -$ndkVersionDefault = $ndkVersionLatest $ndkChecksumLatest = "ac5f7762764b1f15341094e148ad4f847d050c38" -$ndkChecksumDefault = $ndkChecksumLatest $ndkCachedUrlLatest = "\\ci-files01-hki.ci.qt.io\provisioning\android\android-ndk-$ndkVersionLatest-windows.zip" $ndkOfficialUrlLatest = "https://dl.google.com/android/repository/android-ndk-$ndkVersionLatest-windows.zip" -$ndkCachedUrlDefault = "\\ci-files01-hki.ci.qt.io\provisioning\android\android-ndk-$ndkVersionDefault-windows.zip" -$ndkOfficialUrlDefault = "https://dl.google.com/android/repository/android-ndk-$ndkVersionDefault-windows.zip" -$ndkZip = "C:\Windows\Temp\android_ndk.zip" + +# Non-latest (but still supported by the qt/qt5 branch) NDKs are installed for nightly targets in: +# coin/platform_configs/nightly_android.yaml + +$ndkVersionNightly1 = $ndkVersionLatest # Same version = skip NDK install for nightly +$ndkChecksumNightly1 = $ndkChecksumLatest +$ndkCachedUrlNightly1 = "\\ci-files01-hki.ci.qt.io\provisioning\android\android-ndk-$ndkVersionNightly1-windows.zip" +$ndkOfficialUrlNightly1 = "https://dl.google.com/android/repository/android-ndk-$ndkVersionNightly1-windows.zip" + +$ndkVersionNightly2 = $ndkVersionLatest +$ndkChecksumNightly2 = $ndkChecksumLatest +$ndkCachedUrlNightly2 = "\\ci-files01-hki.ci.qt.io\provisioning\android\android-ndk-$ndkVersionNightly2-windows.zip" +$ndkOfficialUrlNightly2 = "https://dl.google.com/android/repository/android-ndk-$ndkVersionNightly2-windows.zip" # SDK $toolsVersion = "2.1" @@ -32,6 +42,8 @@ $toolsChecksum = "e2e19c2ff584efa87ef0cfdd1987f92881323208" $cmdFolder = "c:\Utils\Android\cmdline-tools" $sdkZip = "c:\Windows\Temp\$toolsFile" +New-Item -ItemType Directory -Path C:\Utils\Android\ +New-Item -ItemType Directory -Path C:\Windows\Temp\android_extract function Install($1, $2, $3, $4) { $cacheUrl = $1 @@ -50,20 +62,24 @@ function Install($1, $2, $3, $4) { return "C:\Utils\Android\$baseDirectory" } -New-Item -ItemType Directory -Path C:\Utils\Android\ -New-Item -ItemType Directory -Path C:\Windows\Temp\android_extract -Write-Host "Installing Android NDK $ndkVersionDefault" -$ndkFolderDefault = Install $ndkCachedUrlDefault $ndkZip $ndkChecksumDefault $ndkOfficialUrlDefault -Set-EnvironmentVariable "ANDROID_NDK_ROOT_DEFAULT" $ndkFolderDefault +Write-Host "Installing Android NDK $nkdVersionLatest" +$ndkFolderLatest = Install $ndkCachedUrlLatest $ndkZip $ndkChecksumLatest $ndkOfficialUrlLatest +Set-EnvironmentVariable "ANDROID_NDK_ROOT_LATEST" $ndkFolderLatest # To be used by vcpkg -Set-EnvironmentVariable "ANDROID_NDK_HOME" $ndkFolderDefault - -if ($ndkVersionDefault -eq $ndkVersionLatest) { - Write-Host "Android Latest version is the same than Default. NDK installation done." -} else { - Write-Host "Installing Android NDK $nkdVersionLatest" - $ndkFolderLatest = Install $ndkCachedUrlLatest $ndkZip $ndkChecksumLatest $ndkOfficialUrlLatest - Set-EnvironmentVariable "ANDROID_NDK_ROOT_LATEST" $ndkFolderLatest +Set-EnvironmentVariable "ANDROID_NDK_HOME" $ndkFolderLatest + +if ($ndkVersionNightly1 -ne $ndkVersionLatest) { + Write-Host "Installing Android NDK $ndkVersionNightly1" + $ndkFolderNightly = Install $ndkCachedUrlNightly1 $ndkZip $ndkChecksumNightly1 $ndkOfficialUrlNightly1 + Set-EnvironmentVariable "ANDROID_NDK_ROOT_NIGHTLY1" $ndkFolderNightly + Write-Output "Android NDK = $ndkVersionNightly1" >> ~/versions.txt +} + +if ($ndkVersionNightly2 -ne $ndkVersionLatest) { + Write-Host "Installing Android NDK $ndkVersionNightly2" + $ndkFolderNightly = Install $ndkCachedUrlNightly2 $ndkZip $ndkChecksumNightly2 $ndkOfficialUrlNightly2 + Set-EnvironmentVariable "ANDROID_NDK_ROOT_NIGHTLY2" $ndkFolderNightly + Write-Output "Android NDK = $ndkVersionNightly2" >> ~/versions.txt } $toolsFolder = Install $toolsCachedUrl $sdkZip $toolsChecksum $toolsOfficialUrl @@ -102,4 +118,4 @@ cmd /c "dir C:\Utils\android" Write-Output "Android SDK tools= $toolsVersion" >> ~/versions.txt Write-Output "Android SDK Build Tools = $sdkBuildToolsVersion" >> ~/versions.txt Write-Output "Android SDK Api Level = $sdkApiLevel" >> ~/versions.txt -Write-Output "Android NDK = $ndkVersionDefault" >> ~/versions.txt +Write-Output "Android NDK = $ndkVersionLatest" >> ~/versions.txt diff --git a/coin/provisioning/common/windows/install-ffmpeg.ps1 b/coin/provisioning/common/windows/install-ffmpeg.ps1 index 7c019140ee3..716b18f27d6 100644 --- a/coin/provisioning/common/windows/install-ffmpeg.ps1 +++ b/coin/provisioning/common/windows/install-ffmpeg.ps1 @@ -165,7 +165,7 @@ function InstallAndroidArmv7 { $ranlib="${toolchain_bin}/llvm-ranlib.exe" $nm="${toolchain_bin}/llvm-nm.exe" $strip="${toolchain_bin}/llvm-strip.exe" - $openssl_path = [System.Environment]::GetEnvironmentVariable("OPENSSL_ANDROID_HOME_DEFAULT", [System.EnvironmentVariableTarget]::Machine) + $openssl_path = [System.Environment]::GetEnvironmentVariable("OPENSSL_ANDROID_HOME_LATEST", [System.EnvironmentVariableTarget]::Machine) $openssl_path = $openssl_path.Replace("\", "/") New-Item -ItemType SymbolicLink -Path ${openssl_path}/armeabi-v7a/libcrypto.so -Target ${openssl_path}/armeabi-v7a/libcrypto_3.so @@ -175,7 +175,7 @@ function InstallAndroidArmv7 { $config += " --enable-cross-compile --target-os=android --enable-jni --enable-mediacodec --enable-openssl --enable-pthreads --enable-neon --disable-asm --disable-indev=android_camera" $config += " --arch=$target_arch --cpu=${target_cpu} --sysroot=${sysroot} --sysinclude=${sysroot}/usr/include/" $config += " --cc=${cc} --cxx=${cxx} --ar=${ar} --ranlib=${ranlib}" - $config += " --extra-cflags=-I$envOPENSSL_ANDROID_HOME_DEFAULT/include --extra-ldflags=-L$env:OPENSSL_ANDROID_HOME_DEFAULT/armeabi-v7a" + $config += " --extra-cflags=-I$envOPENSSL_ANDROID_HOME_LATEST/include --extra-ldflags=-L$env:OPENSSL_ANDROID_HOME_LATEST/armeabi-v7a" $config += " --extra-cflags=-I${openssl_path}/include --extra-ldflags=-L${openssl_path}/armeabi-v7a" $config += " --strip=$strip" From 47addb5670d6c51f9369437d39f5fe34a8359231 Mon Sep 17 00:00:00 2001 From: Elias Toivola Date: Thu, 4 Sep 2025 13:22:21 +0300 Subject: [PATCH 188/204] Windows: Add a helper to cleanly invoke NMake with zlib Invoke-NMake helper temporarily clears MAKE flags, such as MAKEFLAGS='-j8', to prevent errors from GNU-style flags and to reduce flakiness with NMAKE. The helper is used to build zlib and to prevent: error U1065: invalid option '-' Pick-to: 6.8 6.5 Task-number: QTQAINFRA-7363 Change-Id: Ia80216677eba6fd8f8364741b6999e6155d678ab Reviewed-by: Tero Heikkinen (cherry picked from commit 0f3d0851019f3e48765f629525e8bdcfd9b58c24) --- coin/provisioning/common/windows/helpers.ps1 | 19 +++++++++++++++++++ coin/provisioning/common/windows/zlib.ps1 | 3 +-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/common/windows/helpers.ps1 b/coin/provisioning/common/windows/helpers.ps1 index 982c5ee937b..35583b3b31a 100644 --- a/coin/provisioning/common/windows/helpers.ps1 +++ b/coin/provisioning/common/windows/helpers.ps1 @@ -382,3 +382,22 @@ function Invoke-MtCommand { & $Env:SystemRoot\system32\cmd.exe /c $cmdLine | Write-Output Remove-Item $tempFile } + +function Invoke-NMake { + param([string[]]$NmakeArgs) + # Temporarily remove MAKE flags for NMAKE process + $old = @{ + MAKEFLAGS = (Get-Item Env:MAKEFLAGS -ErrorAction Ignore).Value + MFLAGS = (Get-Item Env:MFLAGS -ErrorAction Ignore).Value + MAKE = (Get-Item Env:MAKE -ErrorAction Ignore).Value + NMAKEFLAGS = (Get-Item Env:NMAKEFLAGS -ErrorAction Ignore).Value + } + foreach ($n in $old.Keys) {Remove-Item "Env:$n" -ErrorAction SilentlyContinue} + try {& nmake @NmakeArgs} + finally { + foreach ($n in $old.Keys) { + if ($old[$n]) {Set-EnvironmentVariable -Key "$n" -Value $old[$n]} + else {Remove-Item "Env:$n" -ErrorAction SilentlyContinue} + } + } +} diff --git a/coin/provisioning/common/windows/zlib.ps1 b/coin/provisioning/common/windows/zlib.ps1 index f725f8f67a0..87c59690e64 100644 --- a/coin/provisioning/common/windows/zlib.ps1 +++ b/coin/provisioning/common/windows/zlib.ps1 @@ -42,8 +42,7 @@ function BuildZlib { ) PrepareBuildEnvironment -HostArchitecture $HostArchitecture -TargetArchitecture $TargetArchitecture - - nmake /f $MAKEFILE + Invoke-NMake -NmakeArgs @('/f', "$MAKEFILE") } function CopySource { From f3c8481d2710c7e85263b50b1ed8adf25989ad4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Mon, 8 Sep 2025 08:53:44 +0300 Subject: [PATCH 189/204] COIN: Fix Debian bookworm pgp key in Ubuntu 22.04 for debootstrap Pick-to: 6.8 Change-Id: Ie06c37987cf21ee0f8f60528af5d70cbf8b5490d Reviewed-by: Jani Heikkinen (cherry picked from commit e6eaa4f3ef46243dede9b714ffd5d3f4db8a182b) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 202622c54108f7436ec7ec260285b81f61547c64) Reviewed-by: Ville-Pekka Karhu --- .../qtci-linux-Ubuntu-22.04-x86_64/92-sbuild.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/92-sbuild.sh b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/92-sbuild.sh index 22616466c05..f8546395b3b 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/92-sbuild.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/92-sbuild.sh @@ -39,8 +39,13 @@ EOF sudo sbuild-adduser "$LOGNAME" newgrp sbuild +# For debian repo we need to update the bookworm release pgp key +mkdir -p /home/qt/.debian_key_ring +wget https://ftp-master.debian.org/keys/archive-key-12.asc -O /home/qt/.debian_key_ring/archive-key-12.asc +gpg --no-default-keyring --keyring=/home/qt/.debian_key_ring/debian_chroot.gpg --import /home/qt/.debian_key_ring/archive-key-12.asc + # Create chroot -sudo sbuild-createchroot --include=eatmydata,ccache,gnupg,ca-certificates bookworm /srv/chroot/stable-amd64 http://deb.debian.org/debian +sudo sbuild-createchroot --include=eatmydata,ccache,gnupg,ca-certificates bookworm /srv/chroot/stable-amd64 http://deb.debian.org/debian --keyring=/home/qt/.debian_key_ring/debian_chroot.gpg # For ubuntu 22.04 echo "Create chroot for Ubuntu Jammy" From 01db49e8526426f902edb57ff8df911441086abf Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Thu, 24 Jul 2025 13:11:31 +0200 Subject: [PATCH 190/204] coin: Add cyclonedx-python-lib to sbom_requirements.txt In preparation for generating a CycloneDX SBOM for Qt framework, install the cyclonedx-python-lib package which will be a required dependency for the SBOM generation process (assuming CycloneDX generation feature is enabled in the build). Pick-to: 6.8 Task-number: QTBUG-129598 Change-Id: Iacaeb22aa568cecd6ffbe2ece30de953e37c5cf2 Reviewed-by: Alexey Edelev (cherry picked from commit 86589a14fc044f1bc22dbf54d0ffa13069df0a25) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 7eb22d00df35ad6ceb5d4d2734441a6755ad4e41) Reviewed-by: Joerg Bornemann --- coin/provisioning/common/shared/sbom_requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/coin/provisioning/common/shared/sbom_requirements.txt b/coin/provisioning/common/shared/sbom_requirements.txt index 8eaf1238c8b..9a7a28da937 100644 --- a/coin/provisioning/common/shared/sbom_requirements.txt +++ b/coin/provisioning/common/shared/sbom_requirements.txt @@ -4,3 +4,4 @@ ntia-conformance-checker sbomaudit sbom2doc reuse +cyclonedx-python-lib==11.0.0 From 1f1e1f3e71e39e02fc65c897cbf6c3d361ac4ce1 Mon Sep 17 00:00:00 2001 From: Elias Toivola Date: Mon, 7 Apr 2025 13:18:46 +0300 Subject: [PATCH 191/204] Android: set macOS nightly targets for older NDK versions This change makes macOS provisioning also install older NDKs for Android (if set), which will be used in nightly targets. Task-number: QTQAINFRA-7069 Change-Id: Ie176c5ea69a1398afa69691ad6f37b7af2f66dfc (cherry picked from commit 03f8208be97540c97bbb623c9dfb9fa5422ca719) Reviewed-by: Assam Boudjelthia Reviewed-by: Rami Potinkara --- .../cmake_platforms_target_android.yaml | 6 +- coin/provisioning/common/macos/android.sh | 25 ++++++-- .../qtci-macos-12-arm/30-android.sh | 64 ++----------------- .../qtci-macos-13-arm/30-android.sh | 64 ++----------------- 4 files changed, 31 insertions(+), 128 deletions(-) diff --git a/coin/platform_configs/cmake_platforms_target_android.yaml b/coin/platform_configs/cmake_platforms_target_android.yaml index 94122f4c989..f8bc0171b8c 100644 --- a/coin/platform_configs/cmake_platforms_target_android.yaml +++ b/coin/platform_configs/cmake_platforms_target_android.yaml @@ -10,10 +10,10 @@ Configurations: Platform dependency: 'macos-universal-on-x86_64' Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'DisableTests', '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 arm64-v8a', - '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', + 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis arm64-v8a', + 'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', 'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH=/usr/local -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARM64}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', - 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}' + 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}' ] - Id: 'android-armv7-on-windows' diff --git a/coin/provisioning/common/macos/android.sh b/coin/provisioning/common/macos/android.sh index 23032d16e4a..eafaee815f8 100755 --- a/coin/provisioning/common/macos/android.sh +++ b/coin/provisioning/common/macos/android.sh @@ -20,8 +20,13 @@ toolsVersion="2.1" # toolsFile dertermines tools version toolsFile="commandlinetools-mac-6609375_latest.zip" +# Non-latest (but still supported by the qt/qt5 branch) NDKs are installed for nightly targets in: +# coin/platform_configs/nightly_android.yaml + ndkVersionLatest="r27c" -ndkVersionDefault="$ndkVersionLatest" +ndkVersionNightly1="$ndkVersionLatest" # If same version as latest = skip NDK install for nightly +ndkVersionNightly2="$ndkVersionLatest" + sdkBuildToolsVersion="35.0.1" # this is compile sdk version sdkApiLevel="android-35" @@ -40,8 +45,18 @@ function InstallNdk() { } -InstallNdk $ndkVersionDefault InstallNdk $ndkVersionLatest +SetEnvVar "ANDROID_NDK_ROOT_LATEST" "$targetFolder/android-ndk-$ndkVersionLatest" + +if [ "$ndkVersionNightly1" != "$ndkVersionLatest" ]; then + InstallNdk $ndkVersionNightly1 + SetEnvVar "ANDROID_NDK_ROOT_NIGHTLY1" "$targetFolder/android-ndk-$ndkVersionNightly1" +fi + +if [ "$ndkVersionNightly2" != "$ndkVersionLatest" ]; then + InstallNdk $ndkVersionNightly2 + SetEnvVar "ANDROID_NDK_ROOT_NIGHTLY2" "$targetFolder/android-ndk-$ndkVersionNightly2" +fi echo "Unzipping Android Tools to '$sdkTargetFolder'" sudo unzip -q "$toolsSourceFile" -d "$sdkTargetFolder" @@ -65,8 +80,6 @@ echo "Checking the contents of Android SDK..." ls -l "$sdkTargetFolder" SetEnvVar "ANDROID_SDK_ROOT" "$sdkTargetFolder" -SetEnvVar "ANDROID_NDK_ROOT_DEFAULT" "$targetFolder/android-ndk-$ndkVersionDefault" -SetEnvVar "ANDROID_NDK_ROOT_LATEST" "$targetFolder/android-ndk-$ndkVersionLatest" SetEnvVar "ANDROID_NDK_HOST" "darwin-x86_64" SetEnvVar "ANDROID_API_VERSION" "$sdkApiLevel" @@ -74,5 +87,7 @@ cat << EOT >>~/versions.txt Android SDK tools = $toolsVersion Android SDK Build Tools = $sdkBuildToolsVersion Android SDK API level = $sdkApiLevel -Android NDK = $ndkVersion +Android NDK latest = $ndkVersionLatest +Android NDK nightly1 = $ndkVersionNightly1 +Android NDK nightly2 = $ndkVersionNightly2 EOT diff --git a/coin/provisioning/qtci-macos-12-arm/30-android.sh b/coin/provisioning/qtci-macos-12-arm/30-android.sh index acd2d4b9e88..f6d17e499be 100755 --- a/coin/provisioning/qtci-macos-12-arm/30-android.sh +++ b/coin/provisioning/qtci-macos-12-arm/30-android.sh @@ -1,64 +1,8 @@ #!/usr/bin/env bash -# Copyright (C) 2020 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 install Android sdk and ndk. - -# It also runs update for SDK API, latest SDK tools, latest platform-tools and build-tools version +#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 set -ex -# shellcheck source=../common/unix/SetEnvVar.sh -source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" - -targetFolder="/opt/android" -sdkTargetFolder="$targetFolder/sdk" - -basePath="/net/ci-files01-hki.ci.qt.io/hdd/www/input/android" - -toolsVersion="2.1" -# toolsFile dertermines tools version -toolsFile="commandlinetools-mac-6609375_latest.zip" - -ndkVersion="r27c" -ndkFile="android-ndk-$ndkVersion-darwin.zip" -sdkBuildToolsVersion="35.0.1" -# this is compile sdk version -sdkApiLevel="android-35" - -toolsSourceFile="$basePath/$toolsFile" -ndkSourceFile="$basePath/$ndkFile" - -echo "Unzipping Android NDK to '$targetFolder'" -sudo unzip -q "$ndkSourceFile" -d "$targetFolder" -echo "Unzipping Android Tools to '$sdkTargetFolder'" -sudo unzip -q "$toolsSourceFile" -d "$sdkTargetFolder" - -echo "Changing ownership of Android files." -sudo chown -R qt:wheel "$targetFolder" - -# Run the following command under `eval` or `sh -c` so that the shell properly splits it -sdkmanager_no_progress_bar_cmd="tr '\r' '\n' | grep -v '^\[[ =]*\]'" - -sudo mkdir "$sdkTargetFolder/cmdline-tools" -sudo mv "$sdkTargetFolder/tools" "$sdkTargetFolder/cmdline-tools" - -echo "Running SDK manager for platforms;$sdkApiLevel, platform-tools and build-tools;$sdkBuildToolsVersion." -(echo "y"; echo "y") | "$sdkTargetFolder/cmdline-tools/tools/bin/sdkmanager" "--sdk_root=$sdkTargetFolder" \ - "platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion" \ - | eval "$sdkmanager_no_progress_bar_cmd" - -echo "Checking the contents of Android SDK..." -ls -l "$sdkTargetFolder" - -SetEnvVar "ANDROID_SDK_ROOT" "$sdkTargetFolder" -SetEnvVar "ANDROID_NDK_ROOT" "$targetFolder/android-ndk-$ndkVersion" -SetEnvVar "ANDROID_NDK_HOST" "darwin-x86_64" -SetEnvVar "ANDROID_API_VERSION" "$sdkApiLevel" - -cat << EOB >> ~/versions.txt -Android SDK tools = $toolsVersion -Android SDK Build Tools = $sdkBuildToolsVersion -Android SDK API level = $sdkApiLevel -Android NDK = $ndkVersion -EOB +# shellcheck source=../common/macos/android.sh +source "${BASH_SOURCE%/*}/../common/macos/android.sh" diff --git a/coin/provisioning/qtci-macos-13-arm/30-android.sh b/coin/provisioning/qtci-macos-13-arm/30-android.sh index acd2d4b9e88..f6d17e499be 100755 --- a/coin/provisioning/qtci-macos-13-arm/30-android.sh +++ b/coin/provisioning/qtci-macos-13-arm/30-android.sh @@ -1,64 +1,8 @@ #!/usr/bin/env bash -# Copyright (C) 2020 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 install Android sdk and ndk. - -# It also runs update for SDK API, latest SDK tools, latest platform-tools and build-tools version +#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 set -ex -# shellcheck source=../common/unix/SetEnvVar.sh -source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" - -targetFolder="/opt/android" -sdkTargetFolder="$targetFolder/sdk" - -basePath="/net/ci-files01-hki.ci.qt.io/hdd/www/input/android" - -toolsVersion="2.1" -# toolsFile dertermines tools version -toolsFile="commandlinetools-mac-6609375_latest.zip" - -ndkVersion="r27c" -ndkFile="android-ndk-$ndkVersion-darwin.zip" -sdkBuildToolsVersion="35.0.1" -# this is compile sdk version -sdkApiLevel="android-35" - -toolsSourceFile="$basePath/$toolsFile" -ndkSourceFile="$basePath/$ndkFile" - -echo "Unzipping Android NDK to '$targetFolder'" -sudo unzip -q "$ndkSourceFile" -d "$targetFolder" -echo "Unzipping Android Tools to '$sdkTargetFolder'" -sudo unzip -q "$toolsSourceFile" -d "$sdkTargetFolder" - -echo "Changing ownership of Android files." -sudo chown -R qt:wheel "$targetFolder" - -# Run the following command under `eval` or `sh -c` so that the shell properly splits it -sdkmanager_no_progress_bar_cmd="tr '\r' '\n' | grep -v '^\[[ =]*\]'" - -sudo mkdir "$sdkTargetFolder/cmdline-tools" -sudo mv "$sdkTargetFolder/tools" "$sdkTargetFolder/cmdline-tools" - -echo "Running SDK manager for platforms;$sdkApiLevel, platform-tools and build-tools;$sdkBuildToolsVersion." -(echo "y"; echo "y") | "$sdkTargetFolder/cmdline-tools/tools/bin/sdkmanager" "--sdk_root=$sdkTargetFolder" \ - "platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion" \ - | eval "$sdkmanager_no_progress_bar_cmd" - -echo "Checking the contents of Android SDK..." -ls -l "$sdkTargetFolder" - -SetEnvVar "ANDROID_SDK_ROOT" "$sdkTargetFolder" -SetEnvVar "ANDROID_NDK_ROOT" "$targetFolder/android-ndk-$ndkVersion" -SetEnvVar "ANDROID_NDK_HOST" "darwin-x86_64" -SetEnvVar "ANDROID_API_VERSION" "$sdkApiLevel" - -cat << EOB >> ~/versions.txt -Android SDK tools = $toolsVersion -Android SDK Build Tools = $sdkBuildToolsVersion -Android SDK API level = $sdkApiLevel -Android NDK = $ndkVersion -EOB +# shellcheck source=../common/macos/android.sh +source "${BASH_SOURCE%/*}/../common/macos/android.sh" From ed43be6eab5218a21a84f31db04aeed721145932 Mon Sep 17 00:00:00 2001 From: Elias Toivola Date: Mon, 7 Apr 2025 16:50:43 +0300 Subject: [PATCH 192/204] Build FFmpeg with each Android NDK version Multiple Android NDKs are installed in provisoning. FFmpeg build uses NDK in its build process for Android, so this change makes provisioning build multiple Android FFmpeg builds, so each Android nightly can use a FFmpeg build where its corresponding NDK version was used. Task-number: QTQAINFRA-7069 Change-Id: Ie4457c87b7b75e0c711a76bd8170e718cbda445d (cherry picked from commit 980cd3659aecc2002bab9d77d5546231b194e28a) Reviewed-by: Rami Potinkara Reviewed-by: Assam Boudjelthia --- .../cmake_platforms_target_android.yaml | 8 ++-- .../common/unix/install-ffmpeg-android.sh | 45 +++++++++++++----- .../common/windows/install-ffmpeg.ps1 | 47 ++++++++++++++----- 3 files changed, 73 insertions(+), 27 deletions(-) diff --git a/coin/platform_configs/cmake_platforms_target_android.yaml b/coin/platform_configs/cmake_platforms_target_android.yaml index f8bc0171b8c..2a7a39551f8 100644 --- a/coin/platform_configs/cmake_platforms_target_android.yaml +++ b/coin/platform_configs/cmake_platforms_target_android.yaml @@ -12,7 +12,7 @@ Configurations: Environment variables: [ 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis arm64-v8a', 'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', - 'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH=/usr/local -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARM64}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', + 'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH=/usr/local -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARM64_NDK_LATEST}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}' ] - @@ -28,7 +28,7 @@ Configurations: 'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}', 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis armeabi-v7a -no-feature-pkg-config', 'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', - 'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH={{.Env.Protobuf_ROOT_mingw}} -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARMV7}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR={{.Env.Protobuf_ROOT_msvc}}/include', + 'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH={{.Env.Protobuf_ROOT_mingw}} -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARMV7_NDK_LATEST}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR={{.Env.Protobuf_ROOT_msvc}}/include', 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}' ] - @@ -43,7 +43,7 @@ Configurations: Environment variables: [ 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -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_LATEST}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', - 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', + 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_NDK_LATEST}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}', 'ANDROID_EMULATOR=emulator_x86_api_28' ] @@ -59,7 +59,7 @@ Configurations: Environment variables: [ 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -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_LATEST}} -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', + 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_64_NDK_LATEST}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}', 'ANDROID_EMULATOR=emulator_x86_64_api_35' ] diff --git a/coin/provisioning/common/unix/install-ffmpeg-android.sh b/coin/provisioning/common/unix/install-ffmpeg-android.sh index dca9db56fa3..a2650b728b1 100755 --- a/coin/provisioning/common/unix/install-ffmpeg-android.sh +++ b/coin/provisioning/common/unix/install-ffmpeg-android.sh @@ -21,16 +21,16 @@ assert_envvar_is_populated_dir() { exit 1 fi } -assert_envvar_is_populated_dir "OPENSSL_ANDROID_HOME_DEFAULT" -assert_envvar_is_populated_dir "ANDROID_NDK_ROOT_DEFAULT" build_ffmpeg_android() { local target_arch=$1 local target_dir=$2 + local ndk_root=$3 + local openssl_android_path=$4 sudo mkdir -p "$target_dir" - local openssl_include="$OPENSSL_ANDROID_HOME_LATEST/include" + local openssl_include="$openssl_android_path/include" local openssl_libs local libs_prefix local target_cpu @@ -40,19 +40,19 @@ build_ffmpeg_android() { target_toolchain_arch="x86_64-linux-android" target_arch=x86_64 target_cpu=x86-64 - openssl_libs="$OPENSSL_ANDROID_HOME_LATEST/x86_64" + openssl_libs="$openssl_android_path/x86_64" libs_prefix="_x86_64" elif [ "$target_arch" == "x86" ]; then target_toolchain_arch="i686-linux-android" target_arch=x86 target_cpu=i686 - openssl_libs="$OPENSSL_ANDROID_HOME_LATEST/x86" + openssl_libs="$openssl_android_path/x86" libs_prefix="_x86" elif [ "$target_arch" == "arm64" ]; then target_toolchain_arch="aarch64-linux-android" target_arch=aarch64 target_cpu=armv8-a - openssl_libs="$OPENSSL_ANDROID_HOME_LATEST/arm64-v8a" + openssl_libs="$openssl_android_path/arm64-v8a" libs_prefix="_arm64-v8a" fi @@ -61,7 +61,6 @@ build_ffmpeg_android() { local api_version=24 - local ndk_root=$ANDROID_NDK_ROOT_LATEST local ndk_host if uname -a |grep -q "Darwin"; then ndk_host=darwin-x86_64 @@ -108,15 +107,21 @@ build_ffmpeg_android() { if [ "$os" == "android-x86" ]; then target_arch=x86 target_dir="/usr/local/android/ffmpeg-x86" - envvar="FFMPEG_DIR_ANDROID_X86" + envvar_latest="FFMPEG_DIR_ANDROID_X86_NDK_LATEST" + envvar_nightly1="FFMPEG_DIR_ANDROID_X86_NDK_NIGHTLY1" + envvar_nightly2="FFMPEG_DIR_ANDROID_X86_NDK_NIGHTLY2" elif [ "$os" == "android-x86_64" ]; then target_arch=x86_64 target_dir="/usr/local/android/ffmpeg-x86_64" - envvar="FFMPEG_DIR_ANDROID_X86_64" + envvar_latest="FFMPEG_DIR_ANDROID_X86_64_NDK_LATEST" + envvar_nightly1="FFMPEG_DIR_ANDROID_X86_64_NDK_NIGHTLY1" + envvar_nightly2="FFMPEG_DIR_ANDROID_X86_64_NDK_NIGHTLY2" elif [ "$os" == "android-arm64" ]; then target_arch=arm64 target_dir="/usr/local/android/ffmpeg-arm64" - envvar="FFMPEG_DIR_ANDROID_ARM64" + envvar_latest="FFMPEG_DIR_ANDROID_ARM64_NDK_LATEST" + envvar_nightly1="FFMPEG_DIR_ANDROID_ARM64_NDK_NIGHTLY1" + envvar_nightly2="FFMPEG_DIR_ANDROID_ARM64_NDK_NIGHTLY2" else >&2 echo "Unhandled android os param: $os" exit 1 @@ -127,5 +132,21 @@ if [ ! -z $target_install_dir_param ]; then target_dir=$target_install_dir_param fi -build_ffmpeg_android "$target_arch" "$target_dir" -set_ffmpeg_dir_env_var "$envvar" "$target_dir" +assert_envvar_is_populated_dir "ANDROID_NDK_ROOT_LATEST" +assert_envvar_is_populated_dir "OPENSSL_ANDROID_HOME_LATEST" +build_ffmpeg_android "$target_arch" "$target_dir" "$ANDROID_NDK_ROOT_LATEST" "$OPENSSL_ANDROID_HOME_LATEST" +set_ffmpeg_dir_env_var "$envvar_latest" "$target_dir" + +if [ "${ANDROID_NDK_ROOT_NIGHTLY1}" ]; then + assert_envvar_is_populated_dir "ANDROID_NDK_ROOT_NIGHTLY1" + assert_envvar_is_populated_dir "OPENSSL_ANDROID_HOME_NIGHTLY1" + build_ffmpeg_android "$target_arch" "$target_dir" "$ANDROID_NDK_ROOT_NIGHTLY1" "$OPENSSL_ANDROID_HOME_NIGHTLY1" + set_ffmpeg_dir_env_var "$envvar_nightly1" "$target_dir" +fi + +if [ "${ANDROID_NDK_ROOT_NIGHTLY2}" ]; then + assert_envvar_is_populated_dir "ANDROID_NDK_ROOT_NIGHTLY2" + assert_envvar_is_populated_dir "OPENSSL_ANDROID_HOME_NIGHTLY2" + build_ffmpeg_android "$target_arch" "$target_dir" "$ANDROID_NDK_ROOT_NIGHTLY2" "$OPENSSL_ANDROID_HOME_NIGHTLY2" + set_ffmpeg_dir_env_var "$envvar_nightly2" "$target_dir" +fi diff --git a/coin/provisioning/common/windows/install-ffmpeg.ps1 b/coin/provisioning/common/windows/install-ffmpeg.ps1 index 716b18f27d6..fa011a549fa 100644 --- a/coin/provisioning/common/windows/install-ffmpeg.ps1 +++ b/coin/provisioning/common/windows/install-ffmpeg.ps1 @@ -38,7 +38,8 @@ function InstallFfmpeg { [string]$additionalPath, [string]$ffmpegDirEnvVar, [string]$toolchain, - [bool]$shared + [bool]$shared, + [string]$ndk_ver # Optional param for installing each ffmpeg build with different Android NDK ) Write-Host "Configure and compile FFmpeg for $buildSystem with configuration: $config" @@ -51,9 +52,16 @@ function InstallFfmpeg { $env:MSYS2_PATH_TYPE = "inherit" $env:MSYSTEM = $msystem + if ($ndk_ver) { + $prefix = "installed-ndk-$ndk_ver" + } else { + $prefix = "installed" + } + $installDir = "C:\$ffmpeg_name\build\$buildSystem\$prefix" + $cmd = "cd /c/$ffmpeg_name" $cmd += " && mkdir -p build/$buildSystem && cd build/$buildSystem" - $cmd += " && ../../configure --prefix=installed $config" + $cmd += " && ../../configure --prefix=$prefix $config" if ($toolchain) { $cmd += " --toolchain=$toolchain" } @@ -73,7 +81,7 @@ function InstallFfmpeg { return $false } - Set-EnvironmentVariable $ffmpegDirEnvVar "C:\$ffmpeg_name\build\$buildSystem\installed" + Set-EnvironmentVariable $ffmpegDirEnvVar $installDir return $true } @@ -146,16 +154,21 @@ function InstallLlvmMingwFfmpeg { } function InstallAndroidArmv7 { + param ( + [string]$ndk_root, + [string]$ffmpeg_dir_android_envvar_name, + [string]$ndk_version, + [string]$android_openssl_path # OpenSSL is built for Android using NDK, NDK versions for OpenSSL+FFmpeg should match + ) $shared=$true $target_toolchain_arch="armv7a-linux-androideabi" $target_arch="armv7-a" $target_cpu="armv7-a" $api_version="24" - $ndkVersionLatest = "r27c" - $ndkFolderLatest = "/c/Utils/Android/android-ndk-$ndkVersionLatest" + $ndk_dir = $ndk_root -replace '\\', '/' -replace '^C:', '/c' - $toolchain="${ndkFolderLatest}/toolchains/llvm/prebuilt/windows-x86_64" + $toolchain="${ndk_dir}/toolchains/llvm/prebuilt/windows-x86_64" $toolchain_bin="${toolchain}/bin" $sysroot="${toolchain}/sysroot" $cxx="${toolchain_bin}/${target_toolchain_arch}${api_version}-clang++" @@ -165,8 +178,7 @@ function InstallAndroidArmv7 { $ranlib="${toolchain_bin}/llvm-ranlib.exe" $nm="${toolchain_bin}/llvm-nm.exe" $strip="${toolchain_bin}/llvm-strip.exe" - $openssl_path = [System.Environment]::GetEnvironmentVariable("OPENSSL_ANDROID_HOME_LATEST", [System.EnvironmentVariableTarget]::Machine) - $openssl_path = $openssl_path.Replace("\", "/") + $openssl_path = $android_openssl_path.Replace("\", "/") New-Item -ItemType SymbolicLink -Path ${openssl_path}/armeabi-v7a/libcrypto.so -Target ${openssl_path}/armeabi-v7a/libcrypto_3.so New-Item -ItemType SymbolicLink -Path ${openssl_path}/armeabi-v7a/libssl.so -Target ${openssl_path}/armeabi-v7a/libssl_3.so @@ -175,12 +187,12 @@ function InstallAndroidArmv7 { $config += " --enable-cross-compile --target-os=android --enable-jni --enable-mediacodec --enable-openssl --enable-pthreads --enable-neon --disable-asm --disable-indev=android_camera" $config += " --arch=$target_arch --cpu=${target_cpu} --sysroot=${sysroot} --sysinclude=${sysroot}/usr/include/" $config += " --cc=${cc} --cxx=${cxx} --ar=${ar} --ranlib=${ranlib}" - $config += " --extra-cflags=-I$envOPENSSL_ANDROID_HOME_LATEST/include --extra-ldflags=-L$env:OPENSSL_ANDROID_HOME_LATEST/armeabi-v7a" + $config += " --extra-cflags=-I${android_openssl_path}/include --extra-ldflags=-L${android_openssl_path}/armeabi-v7a" $config += " --extra-cflags=-I${openssl_path}/include --extra-ldflags=-L${openssl_path}/armeabi-v7a" $config += " --strip=$strip" - $result= InstallFfmpeg -config $config -buildSystem "android-arm" -msystem "ANDROID_CLANG" -ffmpegDirEnvVar "FFMPEG_DIR_ANDROID_ARMV7" -shared $shared + $result= InstallFfmpeg -config $config -buildSystem "android-arm" -msystem "ANDROID_CLANG" -ffmpegDirEnvVar $ffmpeg_dir_android_envvar_name -shared $shared -ndk_ver $ndk_version Remove-Item -Path ${openssl_path}/armeabi-v7a/libcrypto.so Remove-Item -Path ${openssl_path}/armeabi-v7a/libssl.so @@ -217,7 +229,20 @@ function InstallFfmpegsAMD64 { $hostArch = "amd64" $mingwRes = InstallMingwFfmpeg $llvmMingwRes = InstallLlvmMingwFfmpeg - $androidArmV7Res = InstallAndroidArmv7 + if ($env:ANDROID_NDK_ROOT_LATEST) { + Write-Host "Install ffmpeg using latest supported Android NDK" + $androidArmV7Res = InstallAndroidArmv7 -ndk_root $env:ANDROID_NDK_ROOT_LATEST -ffmpeg_dir_android_envvar_name "FFMPEG_DIR_ANDROID_ARMV7_NDK_LATEST" -ndk_version "latest" -android_openssl_path $env:OPENSSL_ANDROID_HOME_LATEST + } else { + throw "Error: env.var ANDROID_NDK_ROOT_LATEST is not set for FFmpeg" + } + if ($env:ANDROID_NDK_ROOT_NIGHTLY1) { + Write-Host "Install ffmpeg using older Android NDK for nightly1" + InstallAndroidArmv7 -ndk_root $env:ANDROID_NDK_ROOT_NIGHTLY1 -ffmpeg_dir_android_envvar_name "FFMPEG_DIR_ANDROID_ARMV7_NDK_NIGHTLY1" -ndk_version "nightly1" -android_openssl_path $env:OPENSSL_ANDROID_HOME_NIGHTLY1 + } + if ($env:ANDROID_NDK_ROOT_NIGHTLY2) { + Write-Host "Install ffmpeg using older Android NDK for nightly2" + InstallAndroidArmv7 -ndk_root $env:ANDROID_NDK_ROOT_NIGHTLY2 -ffmpeg_dir_android_envvar_name "FFMPEG_DIR_ANDROID_ARMV7_NDK_NIGHTLY2" -ndk_version "nightly2" -android_openssl_path $env:OPENSSL_ANDROID_HOME_NIGHTLY2 + } $msvcRes = InstallMsvcFfmpeg -hostArch $hostArch -isArm64 $false $msvcArm64Res = InstallMsvcFfmpeg -hostArch $hostArch -isArm64 $true From 68335185c129716e26328e4eb7eb97b5434e124d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nils=20Petter=20Ska=CC=8Alerud?= Date: Fri, 22 Aug 2025 08:53:41 +0200 Subject: [PATCH 193/204] FFmpeg, Android ARMv7: Use correct build folder when fixing deps This patch amends 133de012af95507ac485845d8de8f58da005df64. The previous patch introduced a regression where the newer build paths were not being passed correctly into 'fix_ffmpeg_dependencies.sh' during FFmpeg Android builds. This patch introduces a common function to resolve the installation directory, which is then used both during compilation and during FFmpeg patching. Additionally, it introduces some basic error-handling when running 'fix_ffmpeg_dependencies.sh' so that we can catch this issue in integration, in the future. Fixes: QTBUG-138615 Change-Id: I195ebd3034a3184bad32e75916a41a20838b2db1 Reviewed-by: Artem Dyomin Reviewed-by: Assam Boudjelthia (cherry picked from commit 7f416abf32448504719ed205e20a6b371fc19c75) --- .../common/windows/install-ffmpeg.ps1 | 68 ++++++++++++++++--- 1 file changed, 60 insertions(+), 8 deletions(-) diff --git a/coin/provisioning/common/windows/install-ffmpeg.ps1 b/coin/provisioning/common/windows/install-ffmpeg.ps1 index fa011a549fa..7f0ee7cbd15 100644 --- a/coin/provisioning/common/windows/install-ffmpeg.ps1 +++ b/coin/provisioning/common/windows/install-ffmpeg.ps1 @@ -30,6 +30,52 @@ function GetFfmpegDefaultConfiguration { return $defaultConfiguration } +# Returns the absolute installation path of FFmpeg for this build +# variant. +function ResolveFFmpegInstallDir { + param( + [Parameter(Mandatory = $true)] + [ValidateNotNullOrEmpty()] + [string]$buildSystem, + + [Parameter(Mandatory = $false)] + [ValidateNotNullOrEmpty()] + [string]$ndkVer + ) + + if ($ndkVer) { + $prefix = "installed-ndk-$ndkVer" + } else { + $prefix = "installed" + } + + return "C:\$ffmpeg_name\build\$buildSystem\$prefix" +} + +# Returns the absolute installation path of FFmpeg for this build +# variant. Returns a path that is compatible with MSYS. +# +# TODO: There is some code duplications here. Make a helper function +# that translates native Windows paths into MSYS compatible paths. +function ResolveFFmpegInstallDirMsys { + param( + [Parameter(Mandatory = $true)] + [ValidateNotNullOrEmpty()] + [string]$buildSystem, + + [Parameter(Mandatory = $false)] + [ValidateNotNullOrEmpty()] + [string]$ndkVer + ) + if ($ndkVer) { + $prefix = "installed-ndk-$ndkVer" + } else { + $prefix = "installed" + } + + return "/c/$ffmpeg_name/build/$buildSystem/$prefix" +} + function InstallFfmpeg { Param ( [string]$config, @@ -53,15 +99,16 @@ function InstallFfmpeg { $env:MSYSTEM = $msystem if ($ndk_ver) { - $prefix = "installed-ndk-$ndk_ver" + $installDir = ResolveFFmpegInstallDir -buildSystem $buildSystem -ndkVer $ndk_ver + $installDirForMsys = ResolveFFmpegInstallDirMsys -buildSystem $buildSystem -ndkVer $ndk_ver } else { - $prefix = "installed" + $installDir = ResolveFFmpegInstallDir -buildSystem $buildSystem + $installDirForMsys = ResolveFFmpegInstallDirMsys -buildSystem $buildSystem } - $installDir = "C:\$ffmpeg_name\build\$buildSystem\$prefix" $cmd = "cd /c/$ffmpeg_name" $cmd += " && mkdir -p build/$buildSystem && cd build/$buildSystem" - $cmd += " && ../../configure --prefix=$prefix $config" + $cmd += " && ../../configure --prefix=$installDirForMsys $config" if ($toolchain) { $cmd += " --toolchain=$toolchain" } @@ -191,8 +238,8 @@ function InstallAndroidArmv7 { $config += " --extra-cflags=-I${openssl_path}/include --extra-ldflags=-L${openssl_path}/armeabi-v7a" $config += " --strip=$strip" - - $result= InstallFfmpeg -config $config -buildSystem "android-arm" -msystem "ANDROID_CLANG" -ffmpegDirEnvVar $ffmpeg_dir_android_envvar_name -shared $shared -ndk_ver $ndk_version + $buildSystem = "android-arm" + $result= InstallFfmpeg -config $config -buildSystem $buildSystem -msystem "ANDROID_CLANG" -ffmpegDirEnvVar $ffmpeg_dir_android_envvar_name -shared $shared -ndk_ver $ndk_version Remove-Item -Path ${openssl_path}/armeabi-v7a/libcrypto.so Remove-Item -Path ${openssl_path}/armeabi-v7a/libssl.so @@ -218,9 +265,14 @@ function InstallAndroidArmv7 { Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath $msys -ArgumentList ("-lc", "`"cd C:/patchelf-0.17.2 && ./bootstrap.sh && ./configure && make install`"") - $command = "${PSScriptRoot}/../shared/fix_ffmpeg_dependencies.sh C:/${ffmpeg_name}/build/android-arm/installed/ _armeabi-v7a no" + $installDirForMsys = ResolveFFmpegInstallDirMsys -buildSystem $buildSystem -ndkVer $ndk_version + $command = "${PSScriptRoot}/../shared/fix_ffmpeg_dependencies.sh ${installDirForMsys} _armeabi-v7a no" $command = $command.Replace("\", "/") - Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath $msys -ArgumentList ("-lc", "`"$command`"") + $patchResult = Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath $msys -ArgumentList ("-lc", "`"$command`"") + if ($patchResult.ExitCode) { + Write-Host "fix_ffmpeg_dependencies.sh did not finish successfully" + return $false + } return $result } From 2cac35a368da727df97b2d2064ec2d3139cd7f01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nils=20Petter=20Ska=CC=8Alerud?= Date: Fri, 20 Jun 2025 10:06:53 +0200 Subject: [PATCH 194/204] Coin, FFmpeg, Android: Fix nightly FFmpeg build folder (Unix) Previous patch 75fea893b1ef528547ac1e00001cd58ecd481ac2 introduced a small bug where multiple nightly builds of FFmpeg were being outputted into the same directory, effectively causing them to overwrite each other. This patch gives the nightly builds their own subfolder for outputted library files. Task-number: QTQAINFRA-7069 Change-Id: I5f7e111708aecedd2817888948b77b8163f0452d Reviewed-by: Artem Dyomin (cherry picked from commit 303b4c13dcf46897d6f30ff45adf65e41294a5f5) Reviewed-by: Jukka Jokiniva (cherry picked from commit 62fed8986775f7dc91f058eee7f72bf3016a1ff5) Reviewed-by: Assam Boudjelthia --- coin/provisioning/common/unix/install-ffmpeg-android.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/common/unix/install-ffmpeg-android.sh b/coin/provisioning/common/unix/install-ffmpeg-android.sh index a2650b728b1..176ac044329 100755 --- a/coin/provisioning/common/unix/install-ffmpeg-android.sh +++ b/coin/provisioning/common/unix/install-ffmpeg-android.sh @@ -141,12 +141,12 @@ if [ "${ANDROID_NDK_ROOT_NIGHTLY1}" ]; then assert_envvar_is_populated_dir "ANDROID_NDK_ROOT_NIGHTLY1" assert_envvar_is_populated_dir "OPENSSL_ANDROID_HOME_NIGHTLY1" build_ffmpeg_android "$target_arch" "$target_dir" "$ANDROID_NDK_ROOT_NIGHTLY1" "$OPENSSL_ANDROID_HOME_NIGHTLY1" - set_ffmpeg_dir_env_var "$envvar_nightly1" "$target_dir" + set_ffmpeg_dir_env_var "$envvar_nightly1" "$target_dir/nightly1" fi if [ "${ANDROID_NDK_ROOT_NIGHTLY2}" ]; then assert_envvar_is_populated_dir "ANDROID_NDK_ROOT_NIGHTLY2" assert_envvar_is_populated_dir "OPENSSL_ANDROID_HOME_NIGHTLY2" build_ffmpeg_android "$target_arch" "$target_dir" "$ANDROID_NDK_ROOT_NIGHTLY2" "$OPENSSL_ANDROID_HOME_NIGHTLY2" - set_ffmpeg_dir_env_var "$envvar_nightly2" "$target_dir" + set_ffmpeg_dir_env_var "$envvar_nightly2" "$target_dir/nightly2" fi From 6c31d6ae11cb23fa71c614aaed6a2fb14928a9cb Mon Sep 17 00:00:00 2001 From: Elias Toivola Date: Wed, 13 Aug 2025 16:34:31 +0300 Subject: [PATCH 195/204] Android FFmpeg: Further fix FFmpeg build directories This fixes "does not exist" errors when trying to build multiple NDKs. This amends 303b4c13dcf46897d6f30ff45adf65e41294a5f5 Task-number: QTQAINFRA-7069 Change-Id: I29f5cd85ffb3cf12a81b5816a5601ea37446042d Reviewed-by: Assam Boudjelthia (cherry picked from commit ffc15eb35f5fee45be2df4279758410c5fbb33a8) --- coin/provisioning/common/unix/install-ffmpeg-android.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/coin/provisioning/common/unix/install-ffmpeg-android.sh b/coin/provisioning/common/unix/install-ffmpeg-android.sh index 176ac044329..ec4c71e8231 100755 --- a/coin/provisioning/common/unix/install-ffmpeg-android.sh +++ b/coin/provisioning/common/unix/install-ffmpeg-android.sh @@ -134,19 +134,19 @@ fi assert_envvar_is_populated_dir "ANDROID_NDK_ROOT_LATEST" assert_envvar_is_populated_dir "OPENSSL_ANDROID_HOME_LATEST" -build_ffmpeg_android "$target_arch" "$target_dir" "$ANDROID_NDK_ROOT_LATEST" "$OPENSSL_ANDROID_HOME_LATEST" -set_ffmpeg_dir_env_var "$envvar_latest" "$target_dir" +build_ffmpeg_android "$target_arch" "$target_dir/latest" "$ANDROID_NDK_ROOT_LATEST" "$OPENSSL_ANDROID_HOME_LATEST" +set_ffmpeg_dir_env_var "$envvar_latest" "$target_dir/latest" if [ "${ANDROID_NDK_ROOT_NIGHTLY1}" ]; then assert_envvar_is_populated_dir "ANDROID_NDK_ROOT_NIGHTLY1" assert_envvar_is_populated_dir "OPENSSL_ANDROID_HOME_NIGHTLY1" - build_ffmpeg_android "$target_arch" "$target_dir" "$ANDROID_NDK_ROOT_NIGHTLY1" "$OPENSSL_ANDROID_HOME_NIGHTLY1" + build_ffmpeg_android "$target_arch" "$target_dir/nightly1" "$ANDROID_NDK_ROOT_NIGHTLY1" "$OPENSSL_ANDROID_HOME_NIGHTLY1" set_ffmpeg_dir_env_var "$envvar_nightly1" "$target_dir/nightly1" fi if [ "${ANDROID_NDK_ROOT_NIGHTLY2}" ]; then assert_envvar_is_populated_dir "ANDROID_NDK_ROOT_NIGHTLY2" assert_envvar_is_populated_dir "OPENSSL_ANDROID_HOME_NIGHTLY2" - build_ffmpeg_android "$target_arch" "$target_dir" "$ANDROID_NDK_ROOT_NIGHTLY2" "$OPENSSL_ANDROID_HOME_NIGHTLY2" + build_ffmpeg_android "$target_arch" "$target_dir/nightly2" "$ANDROID_NDK_ROOT_NIGHTLY2" "$OPENSSL_ANDROID_HOME_NIGHTLY2" set_ffmpeg_dir_env_var "$envvar_nightly2" "$target_dir/nightly2" fi From 10729614963b9e9b2348ca2c1db53aca88d9b322 Mon Sep 17 00:00:00 2001 From: Toni Saario Date: Tue, 17 Dec 2024 21:23:12 +0200 Subject: [PATCH 196/204] Coin: VxWorks x86_64 add -enable-kvm parameter MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This makes the qemu virtualize the target rather than emulating it. Virtualization allows few times better performance in tests. Change-Id: I7a5f7e3e2b04c52034325459ef05bfc0dce5d0b7 Reviewed-by: Simo Fält (cherry picked from commit ecff7e6ddc3984681538acaecd8e2858b4fa3e99) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 8fb747f92e954cb3173612a356d16cad16b24736) --- coin/provisioning/common/linux/vxworks_qemu_launcher.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/coin/provisioning/common/linux/vxworks_qemu_launcher.sh b/coin/provisioning/common/linux/vxworks_qemu_launcher.sh index 2c345150f1b..d6dc4886570 100755 --- a/coin/provisioning/common/linux/vxworks_qemu_launcher.sh +++ b/coin/provisioning/common/linux/vxworks_qemu_launcher.sh @@ -35,6 +35,7 @@ elif [ "$TYPE" = "intel" ]; then -smp 8 \ -m 8G \ -cpu "Skylake-Client" \ + -enable-kvm \ -monitor none \ -nographic \ -serial null \ From 414316f8ee6ced40217cc597db05167a3ac0f7d2 Mon Sep 17 00:00:00 2001 From: Rami Potinkara Date: Tue, 2 Sep 2025 12:34:22 +0300 Subject: [PATCH 197/204] Android: Fix Android 16 emulator CI start problems This patch updates the fully booted check for Android. Old logic used init.svc.bootanim property and it's status "stopped", but since Android 16 forward the status is kept empty "" if "-no-boot-anim" emulator startup parameter is used. The new logic simplifies old and relies only to two values: sys.boot_completed and dev.bootcomplete. These work similary from Android 9 to 16. Task-number: QTQAINFRA-7399 Task-number: QTQAINFRA-7298 Pick-to: 6.8 Change-Id: I62efb0b05cd9792f92040dcb98a37f4bf14022e6 Reviewed-by: Dimitrios Apostolou Reviewed-by: Assam Boudjelthia Reviewed-by: Elias Toivola (cherry picked from commit 0eb085f93ddef133aeee2dbcc5cb9b241774300c) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 9f42f331947e911cc6a0da33b11c3ed849b050b8) --- .../common/linux/android_emulator_launcher.sh | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/coin/provisioning/common/linux/android_emulator_launcher.sh b/coin/provisioning/common/linux/android_emulator_launcher.sh index 351a04f9f62..bd89fe1a3bc 100755 --- a/coin/provisioning/common/linux/android_emulator_launcher.sh +++ b/coin/provisioning/common/linux/android_emulator_launcher.sh @@ -25,13 +25,12 @@ function check_for_android_device } # WARNING: On the very first boot of the emulator it happens that the device -# "finishes" booting and getprop shows bootanim=stopped and -# boot_completed=1. But sometimes not all packages have been installed (`pm -# list packages` shows only 16 packages installed), and after around half a -# minute the boot animation starts spinning (bootanim=running) again despite -# boot_completed=1 all the time. After some minutes the boot animation stops -# again and the list of packages contains 80 packages. Only then the device is -# fully booted, and only then is dev.bootcomplete=1. +# "finishes" booting and getprop shows boot_completed=1. But sometimes not all +# packages have been installed (`pm list packages` shows only 16 packages +# installed), and after around half a minute the boot animation starts spinning +# again despite boot_completed=1 all the time. After some minutes the boot +# animation stops again and the list of packages contains 80 packages. +# Only then the device is fully booted, and only then is dev.bootcomplete=1. # # To reproduce the emulator booting as the first time, you have to delete the # cached images found inside $HOME/.android/avd/{avd_name}.avd/ especially the @@ -39,11 +38,10 @@ function check_for_android_device function check_if_fully_booted { # The "getprop" command separates lines with \r\n so we trim them - bootanim=$( timeout 1 "$ADB_EXEC" shell getprop init.svc.bootanim | tr -d '\r\n') boot_completed=$(timeout 1 "$ADB_EXEC" shell getprop sys.boot_completed | tr -d '\r\n') bootcomplete=$( timeout 1 "$ADB_EXEC" shell getprop dev.bootcomplete | tr -d '\r\n') - echo "bootanim=$bootanim boot_completed=$boot_completed bootcomplete=$bootcomplete" - [ "$bootanim" = stopped ] && [ "$boot_completed" = 1 ] && [ "$bootcomplete" = 1 ] + echo "boot_completed=$boot_completed bootcomplete=$bootcomplete" + [ "$boot_completed" = 1 ] && [ "$bootcomplete" = 1 ] } for counter in $(seq ${EMULATOR_MAX_RETRIES}) From 30e3a3d28904bb4ba8ddd451411b38e8df6b44ab Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Thu, 18 Sep 2025 07:27:30 +0100 Subject: [PATCH 198/204] Adjust submodule branches Change-Id: Ic10a68b821f23cc0d0c886ac77e07cd9619273b7 --- .gitmodules | 86 ++++++++++++++++++++++++++--------------------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/.gitmodules b/.gitmodules index 621a5cd7592..b1aca607402 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,40 +1,40 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 6.9 + branch = 6.9.3 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = 6.9 + branch = 6.9.3 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtimageformats qtshadertools qtsvg qtlanguageserver path = qtdeclarative url = ../qtdeclarative.git - branch = 6.9 + branch = 6.9.3 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = 6.9 + branch = 6.9.3 status = addon [submodule "qtmultimedia"] depends = qtbase qtshadertools recommends = qtdeclarative qtquick3d path = qtmultimedia url = ../qtmultimedia.git - branch = 6.9 + branch = 6.9.3 status = addon [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt path = qttools url = ../qttools.git - branch = 6.9 + branch = 6.9.3 status = essential [submodule "qtxmlpatterns"] depends = qtbase @@ -47,7 +47,7 @@ depends = qttools path = qttranslations url = ../qttranslations.git - branch = 6.9 + branch = 6.9.3 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.3 status = essential priority = 40 [submodule "qtrepotools"] @@ -68,7 +68,7 @@ depends = qtbase path = qtqa url = ../qtqa.git - branch = 6.9 + branch = 6.9.3 status = essential priority = 50 [submodule "qtlocation"] @@ -76,21 +76,21 @@ recommends = qtdeclarative path = qtlocation url = ../qtlocation.git - branch = 6.9 + branch = 6.9.3 status = preview [submodule "qtpositioning"] depends = qtbase recommends = qtdeclarative qtserialport path = qtpositioning url = ../qtpositioning.git - branch = 6.9 + branch = 6.9.3 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = 6.9 + branch = 6.9.3 status = addon [submodule "qtsystems"] depends = qtbase @@ -117,61 +117,61 @@ recommends = qtdeclarative path = qtconnectivity url = ../qtconnectivity.git - branch = 6.9 + branch = 6.9.3 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = 6.9 + branch = 6.9.3 status = addon [submodule "qt3d"] depends = qtbase recommends = qtdeclarative qtshadertools qtmultimedia path = qt3d url = ../qt3d.git - branch = 6.9 + branch = 6.9.3 status = deprecated [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = 6.9 + branch = 6.9.3 status = addon [submodule "qtserialbus"] depends = qtbase recommends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 6.9 + branch = 6.9.3 status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = 6.9 + branch = 6.9.3 status = addon [submodule "qtwebsockets"] depends = qtbase recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = 6.9 + branch = 6.9.3 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = 6.9 + branch = 6.9.3 status = addon [submodule "qtwebengine"] depends = qtdeclarative recommends = qtwebchannel qttools qtpositioning path = qtwebengine url = ../qtwebengine.git - branch = 6.9 + branch = 6.9.3 status = addon priority = 10 [submodule "qtcanvas3d"] @@ -185,28 +185,28 @@ recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = 6.9 + branch = 6.9.3 status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = 6.9 + branch = 6.9.3 status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = 6.9 + branch = 6.9.3 status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = 6.9 + branch = 6.9.3 status = addon [submodule "qtgamepad"] depends = qtbase @@ -219,27 +219,27 @@ depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml.git - branch = 6.9 + branch = 6.9.3 status = addon [submodule "qtspeech"] depends = qtbase qtmultimedia recommends = qtdeclarative path = qtspeech url = ../qtspeech.git - branch = 6.9 + branch = 6.9.3 status = addon [submodule "qtnetworkauth"] depends = qtbase path = qtnetworkauth url = ../qtnetworkauth.git - branch = 6.9 + branch = 6.9.3 status = addon [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative path = qtremoteobjects url = ../qtremoteobjects.git - branch = 6.9 + branch = 6.9.3 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.3 status = addon [submodule "qtquicktimeline"] depends = qtbase qtdeclarative path = qtquicktimeline url = ../qtquicktimeline - branch = 6.9 + branch = 6.9.3 status = addon [submodule "qtquick3d"] depends = qtbase qtdeclarative qtshadertools recommends = qtquicktimeline path = qtquick3d url = ../qtquick3d.git - branch = 6.9 + branch = 6.9.3 status = addon [submodule "qtshadertools"] depends = qtbase path = qtshadertools url = ../qtshadertools.git - branch = 6.9 + branch = 6.9.3 status = addon [submodule "qt5compat"] depends = qtbase qtdeclarative path = qt5compat url = ../qt5compat.git - branch = 6.9 + branch = 6.9.3 status = deprecated [submodule "qtcoap"] depends = qtbase path = qtcoap url = ../qtcoap.git - branch = 6.9 + branch = 6.9.3 status = addon [submodule "qtmqtt"] depends = qtbase qtdeclarative recommends = qtwebsockets path = qtmqtt url = ../qtmqtt.git - branch = 6.9 + branch = 6.9.3 status = addon [submodule "qtopcua"] depends = qtbase qtdeclarative path = qtopcua url = ../qtopcua.git - branch = 6.9 + branch = 6.9.3 status = addon [submodule "qtlanguageserver"] depends = qtbase path = qtlanguageserver url = ../qtlanguageserver.git - branch = 6.9 + branch = 6.9.3 status = preview [submodule "qthttpserver"] depends = qtbase recommends = qtwebsockets path = qthttpserver url = ../qthttpserver.git - branch = 6.9 + branch = 6.9.3 status = addon [submodule "qtquick3dphysics"] depends = qtbase qtdeclarative qtquick3d qtshadertools path = qtquick3dphysics url = ../qtquick3dphysics.git - branch = 6.9 + branch = 6.9.3 status = addon [submodule "qtgrpc"] depends = qtbase recommends = qtdeclarative path = qtgrpc url = ../qtgrpc.git - branch = 6.9 + branch = 6.9.3 status = addon [submodule "qtquickeffectmaker"] depends = qtbase qtdeclarative qtshadertools recommends = qtquick3d path = qtquickeffectmaker url = ../qtquickeffectmaker.git - branch = 6.9 + branch = 6.9.3 status = addon [submodule "qtgraphs"] depends = qtbase qtdeclarative qtquick3d path = qtgraphs url = ../qtgraphs.git - branch = 6.9 + branch = 6.9.3 status = addon From 4fff7e1ae6d5cb98c1c90cd0b2cb8caeeb52272c Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 19 Sep 2025 02:06:28 +0000 Subject: [PATCH 199/204] Update submodules on '6.9.3 in qt/qt5' Change-Id: I8574951392f18d4f2faa18f23fdd1c77853beed7 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 cb3a834c136..053b0806ffe 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit cb3a834c136c631ec8a3cebdb69002201aa7d71a +Subproject commit 053b0806ffe829a79de5c87caa42150691037f7a diff --git a/qt5compat b/qt5compat index 896c2d6ba9e..74d2558a43a 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 896c2d6ba9eb2cea2a874594527be521e53cb409 +Subproject commit 74d2558a43af09ec430d0b07932a83baad0f22c9 diff --git a/qtactiveqt b/qtactiveqt index fb02728e90d..a9495826a70 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit fb02728e90d633f8046a646b0f7ec92fd645b5ff +Subproject commit a9495826a7025ce187da1fab4a794b61383385c1 diff --git a/qtbase b/qtbase index 3beff274025..2d995054170 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 3beff274025f5336ab1a71861b43baee660202cd +Subproject commit 2d99505417049b83de592e74e0336f25544f17bd diff --git a/qtcharts b/qtcharts index c4096e14801..69e71ab2dc9 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit c4096e148015db8fee2572ecb18be2b6ea72ac93 +Subproject commit 69e71ab2dc90afd222a731a95cdb79add8271178 diff --git a/qtcoap b/qtcoap index b3b54d8e03d..618be09c57b 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit b3b54d8e03d6bd97b98f62c1a02ffeef193db542 +Subproject commit 618be09c57b4d225b43212fc0ce423de3f2607f9 diff --git a/qtconnectivity b/qtconnectivity index 75d30261780..b1071999293 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 75d30261780cb79494361a666c764c80eabde60b +Subproject commit b10719992930919b1d4e6629162fcd7f7395cfae diff --git a/qtdatavis3d b/qtdatavis3d index 84cb068c0fa..8bd9b7089c3 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 84cb068c0faf70de96cbe8b32301a9625a855f00 +Subproject commit 8bd9b7089c351ca1f7c9b981d728cce65defdd2c diff --git a/qtdeclarative b/qtdeclarative index cfb54920746..9ca2b8f324e 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit cfb549207463158863de0be5f31de3c50cccfd83 +Subproject commit 9ca2b8f324e4ba544eb72660da6778450e677c0f diff --git a/qtdoc b/qtdoc index ea19548fb27..36b9394d40a 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit ea19548fb2724f6334376253238779c3f178ca2d +Subproject commit 36b9394d40a31424aa77653e4dc5e6644fa9a3e4 diff --git a/qtgraphs b/qtgraphs index f950c42b54b..04a7f8d56e8 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit f950c42b54b30c5fa78dd81668150a44d48ffca9 +Subproject commit 04a7f8d56e8a89ff37798b46218341c7580d24fc diff --git a/qtgrpc b/qtgrpc index ce77d0f2bbf..3a1ee327cc1 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit ce77d0f2bbf7a2e57d1226504c8f4260343f0a3c +Subproject commit 3a1ee327cc1182fb4900a1b0038d327032810890 diff --git a/qthttpserver b/qthttpserver index 0dfbbd9b33b..03391e97ef7 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit 0dfbbd9b33bb2c1117eeb3a0bf716963fc386417 +Subproject commit 03391e97ef75b18707158eb3ffb14c29bd575e6b diff --git a/qtimageformats b/qtimageformats index ca41b1670cd..7a160431490 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit ca41b1670cdec269b23441f7dec9e3f49d84e5fd +Subproject commit 7a160431490cfbb97736c9ded2472ac18ab98d9f diff --git a/qtlanguageserver b/qtlanguageserver index 9ea97905c73..c1a7d82f9e0 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit 9ea97905c738e867671987442019d1a2c765961e +Subproject commit c1a7d82f9e0fd18cd89076e0b77b253b7fd7b1bb diff --git a/qtlocation b/qtlocation index 555aeef78b1..b043583ce33 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 555aeef78b1e8e99b5a03f43ac4b1303199b90cd +Subproject commit b043583ce333c0f04d50bc1b1baf51b5075b0382 diff --git a/qtlottie b/qtlottie index 1a82663c62a..e988616a5ee 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 1a82663c62ac33fe69094dd277abb28da03c6f85 +Subproject commit e988616a5eeabe77bc56e0fc6d8c2279ac1996e7 diff --git a/qtmqtt b/qtmqtt index 2d89f5687ff..d8124e4b266 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit 2d89f5687ff898a4d5135a5e307d3a1502e10547 +Subproject commit d8124e4b266545257ed72c4318633ef1af9ff11c diff --git a/qtmultimedia b/qtmultimedia index 0c75d8166d8..ba0eb34595e 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 0c75d8166d810b38e0c577b871ab51b36abbc3c5 +Subproject commit ba0eb34595e3992751d9b380fa3812f0ac5247d8 diff --git a/qtnetworkauth b/qtnetworkauth index 4347eb52f89..05226b621d5 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 4347eb52f89d25c64c24617160064228bd982b2e +Subproject commit 05226b621d57738722b0694a498c6903e6c3f61e diff --git a/qtopcua b/qtopcua index ead72b76066..94c544c6fba 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit ead72b76066f700bb2dacdb3005ae93266f0267a +Subproject commit 94c544c6fba3385e182418a22212274ec7c843d4 diff --git a/qtpositioning b/qtpositioning index 215d568f547..4d68d6983d4 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit 215d568f547bf614ca3de47b698155ad43e46712 +Subproject commit 4d68d6983d47947294f67ab1e8c6ecb4bc771c0d diff --git a/qtquick3d b/qtquick3d index 960a94263ae..ba89e043011 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 960a94263ae4362066125b611016415a1746fa28 +Subproject commit ba89e0430118fea5ab2f9b3b5578a86735699b1d diff --git a/qtquick3dphysics b/qtquick3dphysics index c3c977b9c2c..7330a90aab1 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit c3c977b9c2c4ad6adfb392d2d9c39ec7744e07e0 +Subproject commit 7330a90aab123cd90635dfd380169d69c84159a9 diff --git a/qtquickeffectmaker b/qtquickeffectmaker index f8f46d31b5e..fc4eaa27e77 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit f8f46d31b5ebe698b9e21370035287cba7cf1467 +Subproject commit fc4eaa27e77c9484721a9c545cbcc15037695d84 diff --git a/qtquicktimeline b/qtquicktimeline index d0a46c11589..a1a3e71b5cf 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit d0a46c11589664ab0d5b4a4f902b6fef9458aecd +Subproject commit a1a3e71b5cfd4519a96e86dd874ca2bd75a0cd03 diff --git a/qtremoteobjects b/qtremoteobjects index 1c0d57b91ff..0a2f740fb8b 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 1c0d57b91ff97b8301faaf173e73448aee362cdd +Subproject commit 0a2f740fb8baf4ea36cdc7c2f766ffe423fb9493 diff --git a/qtrepotools b/qtrepotools index 07e83fe9511..e09e2ff8248 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 07e83fe951143178260eee045010700da6351416 +Subproject commit e09e2ff8248272d070408556ddac05365d648649 diff --git a/qtscxml b/qtscxml index 0c519645200..61545a406e5 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 0c519645200683f811d4daf9c0d6e0c97e527359 +Subproject commit 61545a406e55213fd906852f7be6c69009d3a8f7 diff --git a/qtsensors b/qtsensors index 1e5a9498562..3258671ea25 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 1e5a9498562f53a8d9ca3b1ea84e3d7298ad04ef +Subproject commit 3258671ea253f1066c47f6b02d60c99c5265215f diff --git a/qtserialbus b/qtserialbus index 8bd84238773..ba836201b83 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 8bd84238773963de4a23952a14cd9e2704ea3b34 +Subproject commit ba836201b8322b1298af9f77be8a1ad6be9b338e diff --git a/qtserialport b/qtserialport index 3fcf3ea9a40..01bb40b5f84 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 3fcf3ea9a4066850ed6266601188df799bb0dfdc +Subproject commit 01bb40b5f8459f8d4e0ef505ece91373058ee81b diff --git a/qtshadertools b/qtshadertools index 515306bd5d3..97f971b72ea 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 515306bd5d39e014ca218a78326fc2b0b411a426 +Subproject commit 97f971b72ea9191a934f1b51b600558a888c8335 diff --git a/qtspeech b/qtspeech index 1b3826d85a0..e7277fdce18 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 1b3826d85a0e5d937000b9bac6dcb817f73cc7ad +Subproject commit e7277fdce18e8c81d292e8a95846e6607ec506c3 diff --git a/qtsvg b/qtsvg index da99c2b9d34..a0055efb818 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit da99c2b9d34b4f4ae46cf1ea60c03a6ffa659689 +Subproject commit a0055efb818ce1136215ef4dac9ce71dc2432ae7 diff --git a/qttools b/qttools index dd8ee454c40..575d77af18e 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit dd8ee454c408f4896633b3fb1d32eea92da8aa8e +Subproject commit 575d77af18ea41484cfe681ec8505e05a8a9a68b diff --git a/qttranslations b/qttranslations index 63072696b4d..c0d79fc64cb 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 63072696b4d89b016fca12161c591d20eb3a36a6 +Subproject commit c0d79fc64cb690472df83ac9fa58291d76edfa0f diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index af5d77ae22c..9448d75ada9 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit af5d77ae22cd75573d307e38a252c8b59d1aa2d2 +Subproject commit 9448d75ada95274f8d2f8e826935334b9b062119 diff --git a/qtwayland b/qtwayland index eb179094291..e308237b5b4 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit eb17909429141f0ff675cf0ade973d92ca779913 +Subproject commit e308237b5b4b0d46b0ddb6f487a44ff93b12d03f diff --git a/qtwebchannel b/qtwebchannel index 13790cec1ea..6ce632d9693 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 13790cec1eafd95a24e9c0f27113f04fd204e2f3 +Subproject commit 6ce632d969380d167d709552742a98c247259324 diff --git a/qtwebengine b/qtwebengine index 7179c08a57b..022d38c096f 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 7179c08a57b6d5b2297ccfec09327649b5882c8e +Subproject commit 022d38c096f8c836026546e632f89d15cfb9ac3a diff --git a/qtwebsockets b/qtwebsockets index fca11f017e9..519e303ae79 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit fca11f017e9738ead936c8fcbbac0118bdb7d661 +Subproject commit 519e303ae7908b0f7f155121ac88b5a9397eb772 diff --git a/qtwebview b/qtwebview index 6a41c6e2759..99136953985 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 6a41c6e27594d3274e2415028573b90a7726dcb7 +Subproject commit 99136953985ab26163744181ef26ed68ce5bcba9 From ea024b6dce3d9f91f7f7d626bd65b7886d7044d9 Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Sun, 21 Sep 2025 10:57:22 +0300 Subject: [PATCH 200/204] Update qtqa manually Change-Id: If020172ab02a5f04f21e331c28b2ded70a82cc8d Reviewed-by: Axel Spoerl --- qtqa | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtqa b/qtqa index 706189e14c1..f5e997580dc 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 706189e14c1ca11ee8368500efe7f92b6e8eb368 +Subproject commit f5e997580dc532cb3479f55f2c601baff8b6eee0 From 8a03877a9eecbb314c9c39907b434cc3b9064d21 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 23 Sep 2025 03:15:07 +0000 Subject: [PATCH 201/204] Update submodules on '6.9.3 in qt/qt5' Change-Id: Ic9fd6697e483ead293ca07bcffd98ace03208877 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 053b0806ffe..bdcba610c69 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 053b0806ffe829a79de5c87caa42150691037f7a +Subproject commit bdcba610c69e689029564ff2ab31689a64ccb2d1 diff --git a/qt5compat b/qt5compat index 74d2558a43a..fd354a8b771 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 74d2558a43af09ec430d0b07932a83baad0f22c9 +Subproject commit fd354a8b7716992a4108e836927497714ba5850c diff --git a/qtactiveqt b/qtactiveqt index a9495826a70..f65758cf131 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit a9495826a7025ce187da1fab4a794b61383385c1 +Subproject commit f65758cf1311488e395b2185bbe8a091492f35e8 diff --git a/qtbase b/qtbase index 2d995054170..03068512b20 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 2d99505417049b83de592e74e0336f25544f17bd +Subproject commit 03068512b20b0e0dfcbfa7195e8199c766d260f5 diff --git a/qtcharts b/qtcharts index 69e71ab2dc9..514948002e3 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 69e71ab2dc90afd222a731a95cdb79add8271178 +Subproject commit 514948002e3c0a570a5a9ae18c413717d62858cb diff --git a/qtcoap b/qtcoap index 618be09c57b..00060fcf069 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit 618be09c57b4d225b43212fc0ce423de3f2607f9 +Subproject commit 00060fcf069eb1739b4b480d9fe00ab0585b90f8 diff --git a/qtconnectivity b/qtconnectivity index b1071999293..5614cf085f1 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit b10719992930919b1d4e6629162fcd7f7395cfae +Subproject commit 5614cf085f1cf8a8cf1823d86a7660d7140ef835 diff --git a/qtdatavis3d b/qtdatavis3d index 8bd9b7089c3..b0be4c1cd2a 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 8bd9b7089c351ca1f7c9b981d728cce65defdd2c +Subproject commit b0be4c1cd2acb25a8ba2dc77b8fbe0324b0660c4 diff --git a/qtdeclarative b/qtdeclarative index 9ca2b8f324e..bdc32801ee7 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 9ca2b8f324e4ba544eb72660da6778450e677c0f +Subproject commit bdc32801ee702ab01e7e999e1becc8ce0ac5cb1d diff --git a/qtdoc b/qtdoc index 36b9394d40a..e87f23b9da7 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 36b9394d40a31424aa77653e4dc5e6644fa9a3e4 +Subproject commit e87f23b9da776bc05e355801148f3b72834cdcf0 diff --git a/qtgraphs b/qtgraphs index 04a7f8d56e8..d3757b8fa80 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit 04a7f8d56e8a89ff37798b46218341c7580d24fc +Subproject commit d3757b8fa80fa897773989c3da0f5fadc5b2733f diff --git a/qtgrpc b/qtgrpc index 3a1ee327cc1..6a17d96d05b 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit 3a1ee327cc1182fb4900a1b0038d327032810890 +Subproject commit 6a17d96d05b894aca0f2060630f666e0e46ca7f7 diff --git a/qthttpserver b/qthttpserver index 03391e97ef7..b831d54b467 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit 03391e97ef75b18707158eb3ffb14c29bd575e6b +Subproject commit b831d54b467e9a68bd3a6a8a553f1effe20a4a29 diff --git a/qtimageformats b/qtimageformats index 7a160431490..54fd4e931ec 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 7a160431490cfbb97736c9ded2472ac18ab98d9f +Subproject commit 54fd4e931ec0c45c393c3e3067a9cffc72c1166c diff --git a/qtlanguageserver b/qtlanguageserver index c1a7d82f9e0..f6ab2e409a6 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit c1a7d82f9e0fd18cd89076e0b77b253b7fd7b1bb +Subproject commit f6ab2e409a654ea48ba651d9d09a8e9f2350fd86 diff --git a/qtlocation b/qtlocation index b043583ce33..b80d2ef57aa 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit b043583ce333c0f04d50bc1b1baf51b5075b0382 +Subproject commit b80d2ef57aa5291f563df683cb3011e28eb6d32b diff --git a/qtlottie b/qtlottie index e988616a5ee..a4ba42fb475 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit e988616a5eeabe77bc56e0fc6d8c2279ac1996e7 +Subproject commit a4ba42fb475bdcae36aaa5a80e301e74c49dd52c diff --git a/qtmqtt b/qtmqtt index d8124e4b266..ee94ac017d3 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit d8124e4b266545257ed72c4318633ef1af9ff11c +Subproject commit ee94ac017d34da61cbb909231739ea5da7879c4a diff --git a/qtmultimedia b/qtmultimedia index ba0eb34595e..d50afd6fbed 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit ba0eb34595e3992751d9b380fa3812f0ac5247d8 +Subproject commit d50afd6fbedbdb86d4fc9eb4088a8848f519b94a diff --git a/qtnetworkauth b/qtnetworkauth index 05226b621d5..e8cf40326f3 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 05226b621d57738722b0694a498c6903e6c3f61e +Subproject commit e8cf40326f3d3a70fec18a372140dbd7f5bea594 diff --git a/qtopcua b/qtopcua index 94c544c6fba..649604cfb87 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit 94c544c6fba3385e182418a22212274ec7c843d4 +Subproject commit 649604cfb874bcd699175fa133b24e522c7da485 diff --git a/qtpositioning b/qtpositioning index 4d68d6983d4..091d69d53e2 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit 4d68d6983d47947294f67ab1e8c6ecb4bc771c0d +Subproject commit 091d69d53e248a65b3f947fe617d8ac78e6d19ab diff --git a/qtquick3d b/qtquick3d index ba89e043011..71b4ede692d 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit ba89e0430118fea5ab2f9b3b5578a86735699b1d +Subproject commit 71b4ede692dd676288a96762e953c7302cac4cc8 diff --git a/qtquick3dphysics b/qtquick3dphysics index 7330a90aab1..93a2c320cae 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit 7330a90aab123cd90635dfd380169d69c84159a9 +Subproject commit 93a2c320cae3a2dcd34ece448ed4e7866bd567d0 diff --git a/qtquickeffectmaker b/qtquickeffectmaker index fc4eaa27e77..63024c849df 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit fc4eaa27e77c9484721a9c545cbcc15037695d84 +Subproject commit 63024c849dfdaa7efe5241e1b7d8e5bc7dfbaa44 diff --git a/qtquicktimeline b/qtquicktimeline index a1a3e71b5cf..8650840263b 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit a1a3e71b5cfd4519a96e86dd874ca2bd75a0cd03 +Subproject commit 8650840263be73658ea9669336be3b7c8bbbeb9d diff --git a/qtremoteobjects b/qtremoteobjects index 0a2f740fb8b..79cbe743dcc 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 0a2f740fb8baf4ea36cdc7c2f766ffe423fb9493 +Subproject commit 79cbe743dcc51a3f4d6a9ad1b7e24f0b8c826798 diff --git a/qtscxml b/qtscxml index 61545a406e5..ba3c25d4221 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 61545a406e55213fd906852f7be6c69009d3a8f7 +Subproject commit ba3c25d4221f482dcf9ebf69c74a7d712926ce69 diff --git a/qtsensors b/qtsensors index 3258671ea25..f264d9c5825 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 3258671ea253f1066c47f6b02d60c99c5265215f +Subproject commit f264d9c5825c22a4ce0729dc5430d08c49c5ea94 diff --git a/qtserialbus b/qtserialbus index ba836201b83..b9ce9e8940c 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit ba836201b8322b1298af9f77be8a1ad6be9b338e +Subproject commit b9ce9e8940c9b759735f5ba037dd094409b23245 diff --git a/qtserialport b/qtserialport index 01bb40b5f84..74149f019b8 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 01bb40b5f8459f8d4e0ef505ece91373058ee81b +Subproject commit 74149f019b8028892dac2b065a8fdea12d1e5b8e diff --git a/qtshadertools b/qtshadertools index 97f971b72ea..121db33f4d5 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 97f971b72ea9191a934f1b51b600558a888c8335 +Subproject commit 121db33f4d504470809f50f75588d1558e703643 diff --git a/qtspeech b/qtspeech index e7277fdce18..35e1fc57388 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit e7277fdce18e8c81d292e8a95846e6607ec506c3 +Subproject commit 35e1fc57388fa735e8669de1e76ca37d0c5c4633 diff --git a/qtsvg b/qtsvg index a0055efb818..2d66f15ae26 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit a0055efb818ce1136215ef4dac9ce71dc2432ae7 +Subproject commit 2d66f15ae268f18ac0d8ee70378b494904e28ad2 diff --git a/qttools b/qttools index 575d77af18e..a5a10d7123b 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 575d77af18ea41484cfe681ec8505e05a8a9a68b +Subproject commit a5a10d7123bb82fbb9ffc52c1606e09a61b91395 diff --git a/qttranslations b/qttranslations index c0d79fc64cb..bebb825d7a2 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit c0d79fc64cb690472df83ac9fa58291d76edfa0f +Subproject commit bebb825d7a211d079ba17d688e19c862316deaf6 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 9448d75ada9..c2c277ad49d 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 9448d75ada95274f8d2f8e826935334b9b062119 +Subproject commit c2c277ad49d5d780f0532536ec2dddc06372d4e5 diff --git a/qtwayland b/qtwayland index e308237b5b4..11129318a0a 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit e308237b5b4b0d46b0ddb6f487a44ff93b12d03f +Subproject commit 11129318a0ad2618c694e60d0ade01fd07368395 diff --git a/qtwebchannel b/qtwebchannel index 6ce632d9693..86dbe68395b 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 6ce632d969380d167d709552742a98c247259324 +Subproject commit 86dbe68395b0b58a04f7b43622cf88b7960064a9 diff --git a/qtwebengine b/qtwebengine index 022d38c096f..a1e10fd8d6f 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 022d38c096f8c836026546e632f89d15cfb9ac3a +Subproject commit a1e10fd8d6f6ad42f694c4bc9862ed0e0e4b813e diff --git a/qtwebsockets b/qtwebsockets index 519e303ae79..62a6296518f 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 519e303ae7908b0f7f155121ac88b5a9397eb772 +Subproject commit 62a6296518f64a081cde05445771dd305d1815dd diff --git a/qtwebview b/qtwebview index 99136953985..1570902f378 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 99136953985ab26163744181ef26ed68ce5bcba9 +Subproject commit 1570902f3782057c6c65d72142b7758ae8447d4a From a40bffacef271258a76b61e6452357087737b972 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 25 Sep 2025 17:01:42 +0000 Subject: [PATCH 202/204] Update submodules on '6.9.3 in qt/qt5' Change-Id: I5c555ea10b0111bc6cc393e2d48a30017af9a25e 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 bdcba610c69..4f975511dc2 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit bdcba610c69e689029564ff2ab31689a64ccb2d1 +Subproject commit 4f975511dc2b09ae6cd1b4489eafe1ce05dae48a diff --git a/qt5compat b/qt5compat index fd354a8b771..17b8b1fa09a 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit fd354a8b7716992a4108e836927497714ba5850c +Subproject commit 17b8b1fa09abc3f3c1fa8b2895d11bdb90c70d2e diff --git a/qtactiveqt b/qtactiveqt index f65758cf131..ff555f9ede6 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit f65758cf1311488e395b2185bbe8a091492f35e8 +Subproject commit ff555f9ede67ad31312ec6f9c759ebdc97ef21d8 diff --git a/qtbase b/qtbase index 03068512b20..be09b211db7 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 03068512b20b0e0dfcbfa7195e8199c766d260f5 +Subproject commit be09b211db70e1b0155d05c18668ad76e7e3df51 diff --git a/qtcharts b/qtcharts index 514948002e3..d01ef2860dc 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 514948002e3c0a570a5a9ae18c413717d62858cb +Subproject commit d01ef2860dcec8b1dd1f6a88adb410eddaf13fa6 diff --git a/qtcoap b/qtcoap index 00060fcf069..2122afda522 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit 00060fcf069eb1739b4b480d9fe00ab0585b90f8 +Subproject commit 2122afda522ab7fcf61d385639c28e7ea8c084b1 diff --git a/qtconnectivity b/qtconnectivity index 5614cf085f1..cdddcde3049 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 5614cf085f1cf8a8cf1823d86a7660d7140ef835 +Subproject commit cdddcde30493478ec7c4665ca7851ed1606d1452 diff --git a/qtdatavis3d b/qtdatavis3d index b0be4c1cd2a..ceefcc27f7e 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit b0be4c1cd2acb25a8ba2dc77b8fbe0324b0660c4 +Subproject commit ceefcc27f7e27217a8f5c52a1785966a0e7b15fd diff --git a/qtdeclarative b/qtdeclarative index bdc32801ee7..c1640ba7605 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit bdc32801ee702ab01e7e999e1becc8ce0ac5cb1d +Subproject commit c1640ba76059882e1d2bc978b6904a19333be4a9 diff --git a/qtdoc b/qtdoc index e87f23b9da7..89e58cf8a40 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit e87f23b9da776bc05e355801148f3b72834cdcf0 +Subproject commit 89e58cf8a409a17780bd4cf412fe019541688a8f diff --git a/qtgraphs b/qtgraphs index d3757b8fa80..8350480f6c0 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit d3757b8fa80fa897773989c3da0f5fadc5b2733f +Subproject commit 8350480f6c0635a3e02fffee6f7d86c67d9e1ca1 diff --git a/qtgrpc b/qtgrpc index 6a17d96d05b..bcb440d1af9 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit 6a17d96d05b894aca0f2060630f666e0e46ca7f7 +Subproject commit bcb440d1af92d4a51882716f88b85445f7c7b421 diff --git a/qthttpserver b/qthttpserver index b831d54b467..29d45a55b96 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit b831d54b467e9a68bd3a6a8a553f1effe20a4a29 +Subproject commit 29d45a55b96ee66d3016d99f4a991849b2e22f2d diff --git a/qtimageformats b/qtimageformats index 54fd4e931ec..7484973d606 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 54fd4e931ec0c45c393c3e3067a9cffc72c1166c +Subproject commit 7484973d606d212ae9b770b6a3be0dbce11f32e0 diff --git a/qtlanguageserver b/qtlanguageserver index f6ab2e409a6..ffedfaeb298 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit f6ab2e409a654ea48ba651d9d09a8e9f2350fd86 +Subproject commit ffedfaeb298f8c3b982f02843d380bb28227382e diff --git a/qtlocation b/qtlocation index b80d2ef57aa..8cf2e051cc5 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit b80d2ef57aa5291f563df683cb3011e28eb6d32b +Subproject commit 8cf2e051cc552026e82663ead65b66ece5a30eda diff --git a/qtlottie b/qtlottie index a4ba42fb475..833fef1bfc2 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit a4ba42fb475bdcae36aaa5a80e301e74c49dd52c +Subproject commit 833fef1bfc28b3e293381a12113322951a712eba diff --git a/qtmqtt b/qtmqtt index ee94ac017d3..d10680d7268 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit ee94ac017d34da61cbb909231739ea5da7879c4a +Subproject commit d10680d72685d999927b090ca81de2802d89407f diff --git a/qtmultimedia b/qtmultimedia index d50afd6fbed..0bbd3bc533a 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit d50afd6fbedbdb86d4fc9eb4088a8848f519b94a +Subproject commit 0bbd3bc533aae9079e94d9c903a509239514aea7 diff --git a/qtnetworkauth b/qtnetworkauth index e8cf40326f3..b0ab508489e 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit e8cf40326f3d3a70fec18a372140dbd7f5bea594 +Subproject commit b0ab508489ed0dc92916792cac3c20b6b44ab73b diff --git a/qtopcua b/qtopcua index 649604cfb87..dc9fbd4f160 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit 649604cfb874bcd699175fa133b24e522c7da485 +Subproject commit dc9fbd4f16065d8ad78dbdca4d6675fc4db896e9 diff --git a/qtpositioning b/qtpositioning index 091d69d53e2..e1cfddb24f9 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit 091d69d53e248a65b3f947fe617d8ac78e6d19ab +Subproject commit e1cfddb24f97f65527478005aa2e26bb21688c10 diff --git a/qtquick3d b/qtquick3d index 71b4ede692d..ce612371bca 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 71b4ede692dd676288a96762e953c7302cac4cc8 +Subproject commit ce612371bca2f01e55a2a4a20d652a86dc47e01c diff --git a/qtquick3dphysics b/qtquick3dphysics index 93a2c320cae..e86756999b7 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit 93a2c320cae3a2dcd34ece448ed4e7866bd567d0 +Subproject commit e86756999b796ce2581a00db200fa73c5bcbba46 diff --git a/qtquickeffectmaker b/qtquickeffectmaker index 63024c849df..afe842c700e 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit 63024c849dfdaa7efe5241e1b7d8e5bc7dfbaa44 +Subproject commit afe842c700eca76a1a30f2e8e5c122ef28877db9 diff --git a/qtquicktimeline b/qtquicktimeline index 8650840263b..a5690fce739 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 8650840263be73658ea9669336be3b7c8bbbeb9d +Subproject commit a5690fce73901711ad21e92d5b7b59591c4da42e diff --git a/qtremoteobjects b/qtremoteobjects index 79cbe743dcc..ba20e19946a 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 79cbe743dcc51a3f4d6a9ad1b7e24f0b8c826798 +Subproject commit ba20e19946a0b615527671ac05696407b601efaf diff --git a/qtscxml b/qtscxml index ba3c25d4221..660bc9c26f3 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit ba3c25d4221f482dcf9ebf69c74a7d712926ce69 +Subproject commit 660bc9c26f3489c5056d25fa92881e72d7c0081e diff --git a/qtsensors b/qtsensors index f264d9c5825..939714166fd 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit f264d9c5825c22a4ce0729dc5430d08c49c5ea94 +Subproject commit 939714166fd55c7acb25be8049f39b4e6fd747c5 diff --git a/qtserialbus b/qtserialbus index b9ce9e8940c..a200e4f970a 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit b9ce9e8940c9b759735f5ba037dd094409b23245 +Subproject commit a200e4f970a488da8b96e6cb7c788aabbf805608 diff --git a/qtserialport b/qtserialport index 74149f019b8..1ed03ae86db 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 74149f019b8028892dac2b065a8fdea12d1e5b8e +Subproject commit 1ed03ae86db4c7319f7aaedd5374da1278bdd040 diff --git a/qtshadertools b/qtshadertools index 121db33f4d5..d02f2a00435 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 121db33f4d504470809f50f75588d1558e703643 +Subproject commit d02f2a004353044596123e2eaa877af2245587d4 diff --git a/qtspeech b/qtspeech index 35e1fc57388..0b9c53d026a 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 35e1fc57388fa735e8669de1e76ca37d0c5c4633 +Subproject commit 0b9c53d026a67286c42c9c646d3eee6626237d58 diff --git a/qtsvg b/qtsvg index 2d66f15ae26..84a5bad7715 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 2d66f15ae268f18ac0d8ee70378b494904e28ad2 +Subproject commit 84a5bad7715ac1a05043014a0f81f636117290da diff --git a/qttools b/qttools index a5a10d7123b..89031fa5405 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit a5a10d7123bb82fbb9ffc52c1606e09a61b91395 +Subproject commit 89031fa54058af5e4d92ee08d31642ca338e9c0c diff --git a/qttranslations b/qttranslations index bebb825d7a2..59bf5e665fd 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit bebb825d7a211d079ba17d688e19c862316deaf6 +Subproject commit 59bf5e665fd9629e06564fdd9ceed5c3197c7eca diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index c2c277ad49d..651f41ff184 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit c2c277ad49d5d780f0532536ec2dddc06372d4e5 +Subproject commit 651f41ff18440e1c80252f0a7db3502f0ee90c3b diff --git a/qtwayland b/qtwayland index 11129318a0a..d6b7b0714c5 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 11129318a0ad2618c694e60d0ade01fd07368395 +Subproject commit d6b7b0714c546ae5920b1681d29cdabf06caa106 diff --git a/qtwebchannel b/qtwebchannel index 86dbe68395b..c40e05665b2 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 86dbe68395b0b58a04f7b43622cf88b7960064a9 +Subproject commit c40e05665b255ff1a8a5e552eae6ce2c99cbefe6 diff --git a/qtwebengine b/qtwebengine index a1e10fd8d6f..402e976a92b 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit a1e10fd8d6f6ad42f694c4bc9862ed0e0e4b813e +Subproject commit 402e976a92b49eef88ec5868c0d3423b45504a3d diff --git a/qtwebsockets b/qtwebsockets index 62a6296518f..5071d82808f 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 62a6296518f64a081cde05445771dd305d1815dd +Subproject commit 5071d82808f292c08de30d1e6e54cf83ffb218ba diff --git a/qtwebview b/qtwebview index 1570902f378..a008988b4e8 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 1570902f3782057c6c65d72142b7758ae8447d4a +Subproject commit a008988b4e8be26d0a739a9deb876430df2ee237 From 2f1a38ff777014b613ce7d40685daa82735b36b5 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 25 Sep 2025 18:57:06 +0000 Subject: [PATCH 203/204] Update submodules on '6.9.3 in qt/qt5' Change-Id: Ic413f5cfc0b496c02b43142470a8f11086076e02 Reviewed-by: Qt Submodule Update Bot --- qtvirtualkeyboard | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 651f41ff184..2fda9f58f8b 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 651f41ff18440e1c80252f0a7db3502f0ee90c3b +Subproject commit 2fda9f58f8b29ac7d03017e4a235bd7e9921b7f3 From 28229ddfafcc0ea39526536b1998f3ef02459436 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 26 Sep 2025 06:34:16 +0000 Subject: [PATCH 204/204] Update submodules on '6.9.3 in qt/qt5' Change-Id: Ic971bc83512e637423fbb1a545c6d391faf57242 Reviewed-by: Qt Submodule Update Bot --- qtdoc | 2 +- qtwebengine | 2 +- qtwebview | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtdoc b/qtdoc index 89e58cf8a40..1e089e32daa 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 89e58cf8a409a17780bd4cf412fe019541688a8f +Subproject commit 1e089e32daadf09d7395444a2e327a28c72ea139 diff --git a/qtwebengine b/qtwebengine index 402e976a92b..f1f376f8826 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 402e976a92b49eef88ec5868c0d3423b45504a3d +Subproject commit f1f376f88263616b6b8a6cac3de8aebb10c76977 diff --git a/qtwebview b/qtwebview index a008988b4e8..04c2faf2537 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit a008988b4e8be26d0a739a9deb876430df2ee237 +Subproject commit 04c2faf2537f6bb8c652cba769af0b09f5a4612b