From 5a6b72fa1b6cfb51c0c7d1a73f29a2eea5b6b312 Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Mon, 3 Jun 2024 05:53:49 +0100 Subject: [PATCH 001/288] Adjust submodule branches Change-Id: I88b5554e3b2eb31ddfc88dd59f2711c9c6739700 --- .gitmodules | 84 ++++++++++++++++++++++++++--------------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/.gitmodules b/.gitmodules index cfd27ee179e..ea058468792 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,40 +1,40 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = dev + branch = 6.8 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = dev + branch = 6.8 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtimageformats qtshadertools qtsvg qtlanguageserver path = qtdeclarative url = ../qtdeclarative.git - branch = dev + branch = 6.8 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = dev + branch = 6.8 status = addon [submodule "qtmultimedia"] depends = qtbase qtshadertools recommends = qtdeclarative qtquick3d path = qtmultimedia url = ../qtmultimedia.git - branch = dev + branch = 6.8 status = addon [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt path = qttools url = ../qttools.git - branch = dev + branch = 6.8 status = essential [submodule "qtxmlpatterns"] depends = qtbase @@ -47,7 +47,7 @@ depends = qttools path = qttranslations url = ../qttranslations.git - branch = dev + branch = 6.8 status = essential priority = 30 [submodule "qtdoc"] @@ -55,7 +55,7 @@ recommends = qtmultimedia qtshadertools qtwebengine path = qtdoc url = ../qtdoc.git - branch = dev + branch = 6.8 status = essential priority = 40 [submodule "qtrepotools"] @@ -76,21 +76,21 @@ recommends = qtdeclarative path = qtlocation url = ../qtlocation.git - branch = dev + branch = 6.8 status = preview [submodule "qtpositioning"] depends = qtbase recommends = qtdeclarative qtserialport path = qtpositioning url = ../qtpositioning.git - branch = dev + branch = 6.8 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = dev + branch = 6.8 status = addon [submodule "qtsystems"] depends = qtbase @@ -117,61 +117,61 @@ recommends = qtdeclarative path = qtconnectivity url = ../qtconnectivity.git - branch = dev + branch = 6.8 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = dev + branch = 6.8 status = addon [submodule "qt3d"] depends = qtbase recommends = qtdeclarative qtshadertools qtmultimedia path = qt3d url = ../qt3d.git - branch = dev + branch = 6.8 status = deprecated [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = dev + branch = 6.8 status = addon [submodule "qtserialbus"] depends = qtbase recommends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = dev + branch = 6.8 status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = dev + branch = 6.8 status = addon [submodule "qtwebsockets"] depends = qtbase recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = dev + branch = 6.8 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = dev + branch = 6.8 status = addon [submodule "qtwebengine"] depends = qtdeclarative recommends = qtwebchannel qttools qtpositioning path = qtwebengine url = ../qtwebengine.git - branch = dev + branch = 6.8 status = addon priority = 10 [submodule "qtcanvas3d"] @@ -185,28 +185,28 @@ recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = dev + branch = 6.8 status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = dev + branch = 6.8 status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = dev + branch = 6.8 status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = dev + branch = 6.8 status = addon [submodule "qtgamepad"] depends = qtbase @@ -219,27 +219,27 @@ depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml.git - branch = dev + branch = 6.8 status = addon [submodule "qtspeech"] depends = qtbase qtmultimedia recommends = qtdeclarative path = qtspeech url = ../qtspeech.git - branch = dev + branch = 6.8 status = addon [submodule "qtnetworkauth"] depends = qtbase path = qtnetworkauth url = ../qtnetworkauth.git - branch = dev + branch = 6.8 status = addon [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative path = qtremoteobjects url = ../qtremoteobjects.git - branch = dev + branch = 6.8 status = addon [submodule "qtwebglplugin"] depends = qtbase qtwebsockets @@ -252,87 +252,87 @@ depends = qtbase qtdeclarative path = qtlottie url = ../qtlottie.git - branch = dev + branch = 6.8 status = addon [submodule "qtquicktimeline"] depends = qtbase qtdeclarative path = qtquicktimeline url = ../qtquicktimeline - branch = dev + branch = 6.8 status = addon [submodule "qtquick3d"] depends = qtbase qtdeclarative qtshadertools recommends = qtquicktimeline path = qtquick3d url = ../qtquick3d.git - branch = dev + branch = 6.8 status = addon [submodule "qtshadertools"] depends = qtbase path = qtshadertools url = ../qtshadertools.git - branch = dev + branch = 6.8 status = addon [submodule "qt5compat"] depends = qtbase qtdeclarative path = qt5compat url = ../qt5compat.git - branch = dev + branch = 6.8 status = deprecated [submodule "qtcoap"] depends = qtbase path = qtcoap url = ../qtcoap.git - branch = dev + branch = 6.8 status = addon [submodule "qtmqtt"] depends = qtbase qtdeclarative path = qtmqtt url = ../qtmqtt.git - branch = dev + branch = 6.8 status = addon [submodule "qtopcua"] depends = qtbase qtdeclarative path = qtopcua url = ../qtopcua.git - branch = dev + branch = 6.8 status = addon [submodule "qtlanguageserver"] depends = qtbase path = qtlanguageserver url = ../qtlanguageserver.git - branch = dev + branch = 6.8 status = preview [submodule "qthttpserver"] depends = qtbase recommends = qtwebsockets path = qthttpserver url = ../qthttpserver.git - branch = dev + branch = 6.8 status = preview [submodule "qtquick3dphysics"] depends = qtbase qtdeclarative qtquick3d qtshadertools path = qtquick3dphysics url = ../qtquick3dphysics.git - branch = dev + branch = 6.8 status = addon [submodule "qtgrpc"] depends = qtbase recommends = qtdeclarative path = qtgrpc url = ../qtgrpc.git - branch = dev + branch = 6.8 status = preview [submodule "qtquickeffectmaker"] depends = qtbase qtdeclarative qtshadertools recommends = qtquick3d path = qtquickeffectmaker url = ../qtquickeffectmaker.git - branch = dev + branch = 6.8 status = addon [submodule "qtgraphs"] depends = qtbase qtdeclarative qtquick3d path = qtgraphs url = ../qtgraphs.git - branch = dev + branch = 6.8 status = preview From 419c5bfc2f57e06545fee4bab457a109c1e274c4 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 3 Jun 2024 19:54:02 +0000 Subject: [PATCH 002/288] Update submodules on '6.8 in qt/qt5' Change-Id: Ic907a9edaf977c9e94aa201b5ff7d07e73d485dc 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 7436bbf6c57..0cc9ac26c81 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 7436bbf6c57f288dea560a5eb90d8ab5b722834a +Subproject commit 0cc9ac26c81277a4cc49015bcd66f1e0b420cd2d diff --git a/qt5compat b/qt5compat index 29a070f6273..c4d884d36c1 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 29a070f62732e14ffbdcad316f571a75e2c9b4ea +Subproject commit c4d884d36c105974a7cf171a2c1943a94521bcf8 diff --git a/qtactiveqt b/qtactiveqt index a2e0cba59db..bfdb43460d5 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit a2e0cba59db7d7d879ed0dca5cc854e3f4bf56ad +Subproject commit bfdb43460d5b1f654c65dfd9631ff287651b6cb7 diff --git a/qtbase b/qtbase index 244964d06a3..d2fbcc4cfe0 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 244964d06a3ffcfea922f79c726ba9182149e2c7 +Subproject commit d2fbcc4cfe0717c8bf48608c05223959ac979d4f diff --git a/qtcharts b/qtcharts index 5d1e1c71de4..3f22bbfd574 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 5d1e1c71de4f44b6765b2dc08624933a9e8be536 +Subproject commit 3f22bbfd5740ac2da11daecc78751bf4bc1189ea diff --git a/qtcoap b/qtcoap index c110a072cf6..2cf29e2cb75 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit c110a072cf63fc1f6a54b2333696e60b18ca8ae2 +Subproject commit 2cf29e2cb75f4005ede678c0a2cd9af6d7ba40de diff --git a/qtconnectivity b/qtconnectivity index 3676fe7bede..292ae3737a5 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 3676fe7bede8cae706d58db15ceb38ef80d0e2c4 +Subproject commit 292ae3737a5c03988b781ce0c1cfc0e89c288213 diff --git a/qtdatavis3d b/qtdatavis3d index 97bf0819686..c2ad44b0be3 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 97bf08196865d742ce1e032ec50b6b10e44cb1a7 +Subproject commit c2ad44b0be34ef9d811763f594a7bc5c2a74e6be diff --git a/qtdeclarative b/qtdeclarative index 4ad3d0c6096..b241e3f8bc9 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 4ad3d0c6096e6caefec74681eed86c2fa92149fd +Subproject commit b241e3f8bc951dfbac152bbf58532170ed910756 diff --git a/qtdoc b/qtdoc index b395157ee6e..49906e294b8 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit b395157ee6e932ccb3bd05e64e9e4a5fffe779bd +Subproject commit 49906e294b85f237628ff6cf776c742eea3c168f diff --git a/qtgraphs b/qtgraphs index 0569f02599f..657e1c519ce 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit 0569f02599f25d705898de0c673140765b999884 +Subproject commit 657e1c519ce2559ce3d816b6cb6d45d8cc794f76 diff --git a/qtgrpc b/qtgrpc index 4e619fc2fcd..ae625bf3673 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit 4e619fc2fcd6dc4d7d0928e9a2db034c8b68223f +Subproject commit ae625bf36731e9e17d68857297248a5c755a3ec0 diff --git a/qthttpserver b/qthttpserver index 9472e2b3de6..8a88423038f 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit 9472e2b3de6427648d4af82ac4c5f9138531131d +Subproject commit 8a88423038fb2428d220812ca5b89c26527d2730 diff --git a/qtimageformats b/qtimageformats index 14970083d07..c9afb8b48a8 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 14970083d0702de4f2ec162a07c8d97717c392f7 +Subproject commit c9afb8b48a89429a5c3bd6b2027022cf61dd91f3 diff --git a/qtlanguageserver b/qtlanguageserver index 70898fe27b8..42701262ce7 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit 70898fe27b8c28e41d38b46b68049d278ef3162f +Subproject commit 42701262ce7e7ea16b02cc8bded3b0253d8b0bdd diff --git a/qtlocation b/qtlocation index c9f12395bac..c6b7ba82a10 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit c9f12395bac82d0f0f2aa45caec765d1ed3bb5f0 +Subproject commit c6b7ba82a10c9a880c1e31dfe8a24b8b2bc967f9 diff --git a/qtlottie b/qtlottie index 2d6ec04ddd0..b6285ff3758 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 2d6ec04ddd0567c901239a54fe7f909ba8b8aaa6 +Subproject commit b6285ff3758ee94742203a116f5bded13ac57e29 diff --git a/qtmqtt b/qtmqtt index 22cc223fa0e..b858480e180 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit 22cc223fa0e3bf2b6def5ae01c3744fb475efc5d +Subproject commit b858480e18053338918e05d8ca7605bebbf11e8f diff --git a/qtmultimedia b/qtmultimedia index c8ba076f80d..86ac6648fef 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit c8ba076f80d1c100d237343a19887db51e091117 +Subproject commit 86ac6648fefd41bd53c8123b57baf5252f8a5fb0 diff --git a/qtnetworkauth b/qtnetworkauth index b0e66587434..e6766c0762f 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit b0e6658743494e097257a3c1b619abd116aaed9b +Subproject commit e6766c0762f39f7d39a5abc9b6162cdc35f009d7 diff --git a/qtopcua b/qtopcua index f5d9e4116be..e4dd7706ab5 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit f5d9e4116be209b22ba812744178fe7a068e817f +Subproject commit e4dd7706ab51ad3fddcdc6518453525985bed3a4 diff --git a/qtpositioning b/qtpositioning index 413ede61f32..edda8a2bba1 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit 413ede61f32da23c446654a98f285ce06ef035c8 +Subproject commit edda8a2bba1e447ba08f977f8156d45f19cb0b72 diff --git a/qtquick3d b/qtquick3d index cf8859dcdc2..98ad66b63d4 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit cf8859dcdc2aede907dc36a138a527719dca016a +Subproject commit 98ad66b63d41edff0437522e0011882066426503 diff --git a/qtquick3dphysics b/qtquick3dphysics index 4cce79cd159..9196f1d24b1 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit 4cce79cd1594770dfcb280aabcb91ff360da38dc +Subproject commit 9196f1d24b1195ea5eee807362f772a0bd8b0ad8 diff --git a/qtquickeffectmaker b/qtquickeffectmaker index 1173eb435a6..e6a08fad27d 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit 1173eb435a6033453f2e49fca0c9d81c77ee6293 +Subproject commit e6a08fad27d3f76f40972e471a3d6b707297a5f9 diff --git a/qtquicktimeline b/qtquicktimeline index dae240097b0..6f22c9a7bad 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit dae240097b0dc1749e038565f56406efd646855a +Subproject commit 6f22c9a7badbca857ae27ba0f39950377447e7b6 diff --git a/qtremoteobjects b/qtremoteobjects index dcacf5c7aa5..d91dfda5799 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit dcacf5c7aa5b9ada58d256e206a8792294ce5462 +Subproject commit d91dfda579914b5e2bb7382c7f1d39c4f1483f92 diff --git a/qtscxml b/qtscxml index a5c6c03fb27..89a68cc0431 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit a5c6c03fb27e00ce8155ab774808b585ccb70bb1 +Subproject commit 89a68cc043173e4cd9be77e299fab594d9ecd65c diff --git a/qtsensors b/qtsensors index 03368c437ae..bdcbf9ce6b7 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 03368c437aebb46968635cbd5ea1f754e69297b0 +Subproject commit bdcbf9ce6b70cf224e7b12543f2dceaaa313bd1c diff --git a/qtserialbus b/qtserialbus index d2ef492af98..f7a16eb320b 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit d2ef492af98c8cc25951e4d049742ea44cfa19ff +Subproject commit f7a16eb320be328a55b84511edf4c8e2f0665517 diff --git a/qtserialport b/qtserialport index fbf728e5890..b08eee48b57 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit fbf728e58909a3952f3ba5d283db1ada7f463883 +Subproject commit b08eee48b57568851b62a2ee841d8793ee94c061 diff --git a/qtshadertools b/qtshadertools index 50f1193245c..3c0dd53c9ff 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 50f1193245c47cadef4e74ee6d261c038d9796dc +Subproject commit 3c0dd53c9ffe505c959f68bc22b942bad6918b7e diff --git a/qtspeech b/qtspeech index 4d7355d6da3..cecad4e76c9 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 4d7355d6da376d84b377034d514b259a9a650645 +Subproject commit cecad4e76c9311f0c8a8c593e1e23d053ea390ad diff --git a/qtsvg b/qtsvg index 7c255093fa4..bb55a70811b 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 7c255093fa41d9885767a276e5a344c8780b9502 +Subproject commit bb55a70811bdfeb9b0ed26cb6bdcc1433e564e1e diff --git a/qttools b/qttools index 49438275bdf..f7d623d562d 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 49438275bdf6b08ba46e2ea2d89753f1f9c63d76 +Subproject commit f7d623d562d55b75eef0a43e1045a5da8d7609fc diff --git a/qttranslations b/qttranslations index 937ab6d3d95..aa68bceb107 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 937ab6d3d95aec88f80d72432f7cf07fc582e635 +Subproject commit aa68bceb107a219e167b628eeded380f3f261272 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index fe318ca5ead..e0b48f55f91 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit fe318ca5eada301d8bc19d2eebc23679607c970f +Subproject commit e0b48f55f91b783dd0b7a235abc1340a5f660153 diff --git a/qtwayland b/qtwayland index d72cd58a3f1..01f0e348fee 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit d72cd58a3f1e97a4e9be78d16536821c969c3569 +Subproject commit 01f0e348feef1fd5553979b433ae760cce6f4384 diff --git a/qtwebchannel b/qtwebchannel index 9f1ca1c6bdd..779185f6fa8 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 9f1ca1c6bdde6adedeb215e487ebdb05a17ad2d0 +Subproject commit 779185f6fa8e33bc183332c7e89b908904dea591 diff --git a/qtwebengine b/qtwebengine index ebf9ad043da..c4acd649a82 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit ebf9ad043daa53c310ea2d5ee9987afbc615e4cd +Subproject commit c4acd649a825a0e3332143a90bba744ecc900db2 diff --git a/qtwebsockets b/qtwebsockets index 9ee34de492e..6293b3967bd 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 9ee34de492ef99c518b5db34877cdc5ae652a883 +Subproject commit 6293b3967bd45f6bdaece29a405780a0c958876d diff --git a/qtwebview b/qtwebview index 3c5af32f153..ec1f4231367 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 3c5af32f1534f60ab2fc028fd02bb7c71b464046 +Subproject commit ec1f42313679443d61ff78bd0d996061e80476a2 From 22c80a88893895bf0f7e7d7deb2c27f2ff483b75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20=C3=85lund?= Date: Tue, 11 Jun 2024 11:58:51 +0200 Subject: [PATCH 003/288] Only install necessary Mimer SQL components MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When installing Mimer SQL only install the parts that we need for the build. Avoid the Mimer SQL Server, DbVisuzlier, Java, documentation, and replication support. Change-Id: I4cc3fb6f77469a2a566d35483034fe1eea9d6ffd Reviewed-by: Simo Fält (cherry picked from commit 37be28e63e0c221247ad50e38b4ab93edad0cdb4) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/common/windows/mimersql.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/provisioning/common/windows/mimersql.ps1 b/coin/provisioning/common/windows/mimersql.ps1 index b5e041d0df4..d7535c81639 100644 --- a/coin/provisioning/common/windows/mimersql.ps1 +++ b/coin/provisioning/common/windows/mimersql.ps1 @@ -16,7 +16,7 @@ $mimer_dir="c:\MimerSQL" Download $url_official $url_cache $mimersqlPackage Verify-Checksum $mimersqlPackage $sha1 -Run-Executable "$mimersqlPackage" "/install InstallFolder=$mimer_dir /passive" +Run-Executable "$mimersqlPackage" "/install InstallFolder=$mimer_dir /passive ExcludeDbVisualizer=1 ExcludeJava=1 ExcludeServer=1 ExcludeDocumentation=1 ExcludeReplication=1" Set-EnvironmentVariable "MIMERSQL_DEV_ROOT" "$mimer_dir\dev" From 629657da094e6ee9d2750daad93f71a4633a0080 Mon Sep 17 00:00:00 2001 From: Pavel Dubsky Date: Fri, 7 Jun 2024 13:10:11 +0200 Subject: [PATCH 004/288] Replace global configuration of FFmpeg provisioning with parameter MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit FFmpeg provisioning script for Windows loads common configuration options from a file and stores them in a global variable which is modified per toolset (LLVM, MinGW, MSVC, Android). This results in possible side effects when an installation for a certain toolset is appending to the current state of the configuration. Better approach would be to replace global variable usage with additional parameter to InstallFfmpeg function and make each specific installation pass complete set of configuration options that it requires. Fixes: QTBUG-125953 Pick-to: 6.7 6.5 Change-Id: I2484c8f65485d56efc5e02502fd31839ea14f164 Reviewed-by: Jøger Hansegård Reviewed-by: Artem Dyomin (cherry picked from commit ca73305d1927eb3a6ace4c5978e862a778840e56) Reviewed-by: Qt Cherry-pick Bot --- .../common/windows/install-ffmpeg.ps1 | 40 ++++++++++++------- 1 file changed, 26 insertions(+), 14 deletions(-) diff --git a/coin/provisioning/common/windows/install-ffmpeg.ps1 b/coin/provisioning/common/windows/install-ffmpeg.ps1 index f8ad9f152f1..483400fe7a4 100644 --- a/coin/provisioning/common/windows/install-ffmpeg.ps1 +++ b/coin/provisioning/common/windows/install-ffmpeg.ps1 @@ -22,11 +22,16 @@ Verify-Checksum $download_location $sha1 Extract-7Zip $download_location $unzip_location Remove $download_location -$config = Get-Content "$PSScriptRoot\..\shared\ffmpeg_config_options.txt" -Write-Host "FFmpeg configuration $config" +function GetFfmpegDefaultConfiguration { + $defaultConfiguration = Get-Content "$PSScriptRoot\..\shared\ffmpeg_config_options.txt" + Write-Host "FFmpeg default configuration: $defaultConfiguration" + + return $defaultConfiguration +} function InstallFfmpeg { Param ( + [string]$config, [string]$buildSystem, [string]$msystem, [string]$additionalPath, @@ -35,19 +40,25 @@ function InstallFfmpeg { [bool]$shared ) - Write-Host "Configure and compile ffmpeg for $buildSystem" + Write-Host "Configure and compile FFmpeg for $buildSystem with configuration: $config" $oldPath = $env:PATH - if ($additionalPath) { $env:PATH = "$additionalPath;$env:PATH" } + if ($additionalPath) { + $env:PATH = "$additionalPath;$env:PATH" + } $env:MSYS2_PATH_TYPE = "inherit" $env:MSYSTEM = $msystem $cmd = "cd /c/$ffmpeg_name" $cmd += " && mkdir -p build/$buildSystem && cd build/$buildSystem" $cmd += " && ../../configure --prefix=installed $config" - if ($toolchain) { $cmd += " --toolchain=$toolchain" } - if ($shared) { $cmd += " --enable-shared --disable-static" } + if ($toolchain) { + $cmd += " --toolchain=$toolchain" + } + if ($shared) { + $cmd += " --enable-shared --disable-static" + } $cmd += " && make install -j" Write-Host "MSYS cmd:" @@ -57,7 +68,7 @@ function InstallFfmpeg { $env:PATH = $oldPath if ($buildResult.ExitCode) { - Write-Host "Failed to build ffmpeg for $buildSystem" + Write-Host "Failed to build FFmpeg for $buildSystem" return $false } @@ -66,8 +77,9 @@ function InstallFfmpeg { } function InstallMingwFfmpeg { + $config = GetFfmpegDefaultConfiguration $mingwPath = [System.Environment]::GetEnvironmentVariable("MINGW_PATH", [System.EnvironmentVariableTarget]::Machine) - return InstallFfmpeg -buildSystem "mingw" -msystem "MINGW" -additionalPath "$mingwPath\bin" -ffmpegDirEnvVar "FFMPEG_DIR_MINGW" -shared $true + return InstallFfmpeg -config $config -buildSystem "mingw" -msystem "MINGW" -additionalPath "$mingwPath\bin" -ffmpegDirEnvVar "FFMPEG_DIR_MINGW" -shared $true } @@ -80,7 +92,7 @@ function InstallMsvcFfmpeg { $buildSystem = "msvc" $ffmpegDirEnvVar = "FFMPEG_DIR_MSVC" - $config = Get-Content "$PSScriptRoot\..\shared\ffmpeg_config_options.txt" + $config = GetFfmpegDefaultConfiguration if ($isArm64) { $arch = "arm64" @@ -94,7 +106,7 @@ function InstallMsvcFfmpeg { return $false } - $result = InstallFfmpeg -buildSystem $buildSystem -msystem "MSYS" -toolchain "msvc" -ffmpegDirEnvVar $ffmpegDirEnvVar -shared $true + $result = InstallFfmpeg -config $config -buildSystem $buildSystem -msystem "MSYS" -toolchain "msvc" -ffmpegDirEnvVar $ffmpegDirEnvVar -shared $true if ($result) { # As ffmpeg build system creates lib*.a file we have to rename them to *.lib files to be recognized by WIN32 @@ -117,11 +129,11 @@ function InstallMsvcFfmpeg { function InstallLlvmMingwFfmpeg { - return InstallFfmpeg -buildSystem "llvm-mingw" -msystem "CLANG64" -ffmpegDirEnvVar "FFMPEG_DIR_LLVM_MINGW" -additionalPath "C:\llvm-mingw\bin" -shared $true + $config = GetFfmpegDefaultConfiguration + return InstallFfmpeg -config $config -buildSystem "llvm-mingw" -msystem "CLANG64" -ffmpegDirEnvVar "FFMPEG_DIR_LLVM_MINGW" -additionalPath "C:\llvm-mingw\bin" -shared $true } function InstallAndroidArmv7 { - $target_toolchain_arch="armv7a-linux-androideabi" $target_arch="armv7-a" $target_cpu="armv7-a" @@ -143,14 +155,14 @@ function InstallAndroidArmv7 { $openssl_path = [System.Environment]::GetEnvironmentVariable("OPENSSL_ANDROID_HOME_DEFAULT", [System.EnvironmentVariableTarget]::Machine) $openssl_path = $openssl_path.Replace("\", "/") - $config = Get-Content "$PSScriptRoot\..\shared\ffmpeg_config_options.txt" + $config = GetFfmpegDefaultConfiguration $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${openssl_path}/include --extra-ldflags=-L${openssl_path}/armeabi-v7a" - return InstallFfmpeg -buildSystem "android-arm" -msystem "ANDROID_CLANG" -ffmpegDirEnvVar "FFMPEG_DIR_ANDROID_ARMV7" + return InstallFfmpeg -config $config -buildSystem "android-arm" -msystem "ANDROID_CLANG" -ffmpegDirEnvVar "FFMPEG_DIR_ANDROID_ARMV7" } $mingwRes = InstallMingwFfmpeg From 1a61ed35d39b8e7dd24c07c94adce2a15c87144c Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 16 Jun 2024 07:51:37 +0000 Subject: [PATCH 005/288] Update submodules on '6.8 in qt/qt5' Change-Id: I2649e768019fc55e2bd1160afe506792e984ede1 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 0cc9ac26c81..0d783504fa7 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 0cc9ac26c81277a4cc49015bcd66f1e0b420cd2d +Subproject commit 0d783504fa766e7028f3e503356edaf8d6b0e6b0 diff --git a/qt5compat b/qt5compat index c4d884d36c1..1805c36d908 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit c4d884d36c105974a7cf171a2c1943a94521bcf8 +Subproject commit 1805c36d908046a7c59b89d6ba274eca647ec624 diff --git a/qtactiveqt b/qtactiveqt index bfdb43460d5..de177d4c154 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit bfdb43460d5b1f654c65dfd9631ff287651b6cb7 +Subproject commit de177d4c1549d2694a98ba28140a21ed94791ffa diff --git a/qtbase b/qtbase index d2fbcc4cfe0..ff5b557dfc7 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit d2fbcc4cfe0717c8bf48608c05223959ac979d4f +Subproject commit ff5b557dfc71711e622d89b67a0973ac82553120 diff --git a/qtcharts b/qtcharts index 3f22bbfd574..cd2db87d0d4 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 3f22bbfd5740ac2da11daecc78751bf4bc1189ea +Subproject commit cd2db87d0d45869d7142e92bf26cc755db06be4c diff --git a/qtcoap b/qtcoap index 2cf29e2cb75..4b8f58a1b9c 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit 2cf29e2cb75f4005ede678c0a2cd9af6d7ba40de +Subproject commit 4b8f58a1b9cefa263e729783bcfe15e554ec5c73 diff --git a/qtconnectivity b/qtconnectivity index 292ae3737a5..82fd48738ee 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 292ae3737a5c03988b781ce0c1cfc0e89c288213 +Subproject commit 82fd48738ee9a16ebff90bb5e59b71d523422fcd diff --git a/qtdatavis3d b/qtdatavis3d index c2ad44b0be3..d92f6d7c3ad 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit c2ad44b0be34ef9d811763f594a7bc5c2a74e6be +Subproject commit d92f6d7c3ad98827e859e3241dc487fd61919318 diff --git a/qtdeclarative b/qtdeclarative index b241e3f8bc9..d021fd7cb13 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit b241e3f8bc951dfbac152bbf58532170ed910756 +Subproject commit d021fd7cb13491ad30e52fd6ebbdb655860bf045 diff --git a/qtdoc b/qtdoc index 49906e294b8..9f3ef8c9918 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 49906e294b85f237628ff6cf776c742eea3c168f +Subproject commit 9f3ef8c9918157f68bd8ad38f189e4eabf7f5b99 diff --git a/qtgraphs b/qtgraphs index 657e1c519ce..2fa0a4c3a28 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit 657e1c519ce2559ce3d816b6cb6d45d8cc794f76 +Subproject commit 2fa0a4c3a285525850799668ecfd882c25c44453 diff --git a/qtgrpc b/qtgrpc index ae625bf3673..516f47b2625 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit ae625bf36731e9e17d68857297248a5c755a3ec0 +Subproject commit 516f47b2625e035c4e065573666e4fd6ab7bbe14 diff --git a/qthttpserver b/qthttpserver index 8a88423038f..50bee1ffeb7 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit 8a88423038fb2428d220812ca5b89c26527d2730 +Subproject commit 50bee1ffeb712c7664b2e799b1a6b2175104e7e6 diff --git a/qtimageformats b/qtimageformats index c9afb8b48a8..f7ab488b788 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit c9afb8b48a89429a5c3bd6b2027022cf61dd91f3 +Subproject commit f7ab488b78804d06178ce15326585290638dad4c diff --git a/qtlanguageserver b/qtlanguageserver index 42701262ce7..8ff611c21c4 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit 42701262ce7e7ea16b02cc8bded3b0253d8b0bdd +Subproject commit 8ff611c21c4c2fcef3245283895ca1a19ec5d303 diff --git a/qtlocation b/qtlocation index c6b7ba82a10..d3532313795 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit c6b7ba82a10c9a880c1e31dfe8a24b8b2bc967f9 +Subproject commit d3532313795a5fe41a9f5622c8e4f0ff87330c92 diff --git a/qtlottie b/qtlottie index b6285ff3758..7121c867c66 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit b6285ff3758ee94742203a116f5bded13ac57e29 +Subproject commit 7121c867c66613712dbe4554805b634f17d24469 diff --git a/qtmqtt b/qtmqtt index b858480e180..a07748987a7 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit b858480e18053338918e05d8ca7605bebbf11e8f +Subproject commit a07748987a72d5a0009bc2a039e57f9793606da2 diff --git a/qtmultimedia b/qtmultimedia index 86ac6648fef..ffd0f670ad4 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 86ac6648fefd41bd53c8123b57baf5252f8a5fb0 +Subproject commit ffd0f670ad4732a1502f2f453b5931586d793aa6 diff --git a/qtnetworkauth b/qtnetworkauth index e6766c0762f..489694f3d1c 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit e6766c0762f39f7d39a5abc9b6162cdc35f009d7 +Subproject commit 489694f3d1c967b621659077fea701cee9d930d6 diff --git a/qtopcua b/qtopcua index e4dd7706ab5..1d64b3a164c 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit e4dd7706ab51ad3fddcdc6518453525985bed3a4 +Subproject commit 1d64b3a164c73865147ddc5f6ce1a3059f26c19e diff --git a/qtpositioning b/qtpositioning index edda8a2bba1..49731b3ba22 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit edda8a2bba1e447ba08f977f8156d45f19cb0b72 +Subproject commit 49731b3ba22a38ab3a433fdb83f087896fb8d315 diff --git a/qtquick3d b/qtquick3d index 98ad66b63d4..19e7e033eb1 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 98ad66b63d41edff0437522e0011882066426503 +Subproject commit 19e7e033eb12ae26fabb80c6065b5b3e7843c772 diff --git a/qtquick3dphysics b/qtquick3dphysics index 9196f1d24b1..cee2053697c 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit 9196f1d24b1195ea5eee807362f772a0bd8b0ad8 +Subproject commit cee2053697c4c549eac6bd323f1a5becdf556abf diff --git a/qtquickeffectmaker b/qtquickeffectmaker index e6a08fad27d..d2a125953c7 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit e6a08fad27d3f76f40972e471a3d6b707297a5f9 +Subproject commit d2a125953c7a5d55a03b8f7a4bffb160febe8d1c diff --git a/qtquicktimeline b/qtquicktimeline index 6f22c9a7bad..b49a99a9191 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 6f22c9a7badbca857ae27ba0f39950377447e7b6 +Subproject commit b49a99a9191d97084e304f982bd6ffd49b7ed31b diff --git a/qtremoteobjects b/qtremoteobjects index d91dfda5799..85bf2901026 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit d91dfda579914b5e2bb7382c7f1d39c4f1483f92 +Subproject commit 85bf29010269def185df035cbd323e830d54977e diff --git a/qtscxml b/qtscxml index 89a68cc0431..eaa266b1e8b 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 89a68cc043173e4cd9be77e299fab594d9ecd65c +Subproject commit eaa266b1e8b1327af33c2e709567279ff9732d6c diff --git a/qtsensors b/qtsensors index bdcbf9ce6b7..ffe4ec842f7 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit bdcbf9ce6b70cf224e7b12543f2dceaaa313bd1c +Subproject commit ffe4ec842f7f55f4c46b027093cfe1de7bd11f8b diff --git a/qtserialbus b/qtserialbus index f7a16eb320b..33f7132b848 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit f7a16eb320be328a55b84511edf4c8e2f0665517 +Subproject commit 33f7132b848926a82c83074477067f157b0e487f diff --git a/qtserialport b/qtserialport index b08eee48b57..67f75d0ea7c 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit b08eee48b57568851b62a2ee841d8793ee94c061 +Subproject commit 67f75d0ea7ce22e4fc3df9788bf6abe3ec347d3b diff --git a/qtshadertools b/qtshadertools index 3c0dd53c9ff..a4feba199c9 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 3c0dd53c9ffe505c959f68bc22b942bad6918b7e +Subproject commit a4feba199c96de203303598dd73b17021d5ffed8 diff --git a/qtspeech b/qtspeech index cecad4e76c9..fa723130940 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit cecad4e76c9311f0c8a8c593e1e23d053ea390ad +Subproject commit fa7231309408497efe2f17f2a43cbb2e8e7d799c diff --git a/qtsvg b/qtsvg index bb55a70811b..68ac46df88a 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit bb55a70811bdfeb9b0ed26cb6bdcc1433e564e1e +Subproject commit 68ac46df88ad1e47fec7c36fdeca5ba0b5d79365 diff --git a/qttools b/qttools index f7d623d562d..407ff594b7b 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit f7d623d562d55b75eef0a43e1045a5da8d7609fc +Subproject commit 407ff594b7b4be74731f3e3a5b265b8f073d517a diff --git a/qttranslations b/qttranslations index aa68bceb107..1e3f12cc30c 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit aa68bceb107a219e167b628eeded380f3f261272 +Subproject commit 1e3f12cc30c6641f510b0db2e751a6a3a5f592db diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index e0b48f55f91..8b71af04114 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit e0b48f55f91b783dd0b7a235abc1340a5f660153 +Subproject commit 8b71af041146bea562e6f713d8870e930e7800fc diff --git a/qtwayland b/qtwayland index 01f0e348fee..36adbdb7d4c 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 01f0e348feef1fd5553979b433ae760cce6f4384 +Subproject commit 36adbdb7d4c81432e75bdc6d34a13a165d69a7d0 diff --git a/qtwebchannel b/qtwebchannel index 779185f6fa8..e432e4c05cc 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 779185f6fa8e33bc183332c7e89b908904dea591 +Subproject commit e432e4c05cc94d1e35b74b832c71109340b75a3d diff --git a/qtwebengine b/qtwebengine index c4acd649a82..3439cacdbf7 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit c4acd649a825a0e3332143a90bba744ecc900db2 +Subproject commit 3439cacdbf76cbd52fd5328aef126ba51914f5a7 diff --git a/qtwebsockets b/qtwebsockets index 6293b3967bd..9301eb8234e 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 6293b3967bd45f6bdaece29a405780a0c958876d +Subproject commit 9301eb8234ef1f0c4e98eddb99c864659f9ded5c diff --git a/qtwebview b/qtwebview index ec1f4231367..cd68b2e6863 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit ec1f42313679443d61ff78bd0d996061e80476a2 +Subproject commit cd68b2e6863aa4e9d6a4c6e9cf21be99ebd936fd From aa75e9fc091f6bbbbe808aaeb43658efd24e8901 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Tue, 11 Jun 2024 12:11:01 +0200 Subject: [PATCH 006/288] Make offscreen plugin the default one for ubuntu-24.04-arm64 This follows 37ce15a3b09bdc542a3ba5404d52da659137dc52 . It's needed when we test offscreen on Wayland(with XWayland). Task-number: QTBUG-125446 Change-Id: I20d9afec8800b51aa7cbc82bc336bed76bba4a49 Reviewed-by: Alexey Edelev Reviewed-by: Alexandru Croitor Reviewed-by: Liang Qi (cherry picked from commit 9fb04e1e716d04b04900ff68c47c5a5dbdf5253c) 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 9d254d3e7e4..28376136ba4 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -44,7 +44,7 @@ Configurations: Template: 'qtci-linux-Ubuntu-24.04-aarch64-50' Compiler: 'GCC' Features: ['UseConfigure', 'DoNotRunTests'] - 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' + 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 -qpa offscreen\;xcb' Environment variables: [ 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DINPUT_headersclean=ON' From 6119c40c8ef297349a3bc11e165720f78f32df11 Mon Sep 17 00:00:00 2001 From: Dominik Holland Date: Fri, 24 May 2024 11:37:27 +0200 Subject: [PATCH 007/288] Provisioning: Fix bwrap with apparmor on Ubuntu 24.04 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ubuntu 23.10 introduced new apparmor features and those prevent bwrap to work correctly until a apparmor configuration file is installed. Change-Id: Ie02bd98adb9e55c930c399e5e209c0c612907233 Reviewed-by: Robert Griebl Reviewed-by: Toni Saario Reviewed-by: Tero Heikkinen (cherry picked from commit f7a8184c175114e67555c8bdd859e9d52c208ab3) Reviewed-by: Qt Cherry-pick Bot Reviewed-by: Aku Pietikäinen --- .../common/linux/fix-bwrap-apparmor.sh | 21 +++++++++++++++++++ .../03-fix-bwrap-apparmor.sh | 6 ++++++ 2 files changed, 27 insertions(+) create mode 100644 coin/provisioning/common/linux/fix-bwrap-apparmor.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/03-fix-bwrap-apparmor.sh diff --git a/coin/provisioning/common/linux/fix-bwrap-apparmor.sh b/coin/provisioning/common/linux/fix-bwrap-apparmor.sh new file mode 100644 index 00000000000..4c8b68f993d --- /dev/null +++ b/coin/provisioning/common/linux/fix-bwrap-apparmor.sh @@ -0,0 +1,21 @@ +#!/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 + +# See https://ubuntu.com/blog/ubuntu-23-10-restricted-unprivileged-user-namespaces +# and https://bugs.launchpad.net/ubuntu/+source/apparmor/+bug/2046844/comments/89 +sudo bash -c 'cat > /etc/apparmor.d/bwrap' << EOF +# This profile allows everything and only exists to give the +# application a name instead of having the label "unconfined" + +abi , +include + +profile bwrap /usr/bin/bwrap flags=(unconfined) { + userns, + + # Site-specific additions and overrides. See local/README for details. + include if exists +} +EOF + diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/03-fix-bwrap-apparmor.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/03-fix-bwrap-apparmor.sh new file mode 100644 index 00000000000..e155338ab4d --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/03-fix-bwrap-apparmor.sh @@ -0,0 +1,6 @@ +#!/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=../common/linux/fix-bwrap-apparmor.sh +source "${BASH_SOURCE%/*}/../common/linux/fix-bwrap-apparmor.sh" From b4861bc8d15e49c8578386b7fd610dee0901e0bf Mon Sep 17 00:00:00 2001 From: Olli Vuolteenaho Date: Thu, 16 May 2024 10:18:52 +0300 Subject: [PATCH 008/288] Update QtAA maximum supported SDK level Like regular Android we test QtAA in CI with the maximum and minimum supported SDK levels - currently 10 and 13. This commit bumps the maximum level to 14 starting from QtAA 6.8. Task-number: QAA-2410 Change-Id: I8ef645b2c7bb1ee2b1fd20980bad0f593d308df8 Reviewed-by: Assam Boudjelthia (cherry picked from commit eb75583856ca67089785a32b22a6043f2cfb2798) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/tqtc-android-automotive.yaml | 4 ++-- coin/provisioning/common/linux/android_linux.sh | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/coin/platform_configs/tqtc-android-automotive.yaml b/coin/platform_configs/tqtc-android-automotive.yaml index 0f45f16109b..06b3c8c0f2f 100644 --- a/coin/platform_configs/tqtc-android-automotive.yaml +++ b/coin/platform_configs/tqtc-android-automotive.yaml @@ -18,7 +18,7 @@ Include: [ ] Configurations: - - Id: "automotive-android-13-x86_64-on-linux" + Id: "automotive-android-14-x86_64-on-linux" Template: 'qtci-linux-RHEL-8.8-x86_64-50' Target os: 'Android_ANY' Target arch: 'x86_64' @@ -31,7 +31,7 @@ Configurations: 'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}}', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}', 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', - 'ANDROID_EMULATOR=automotive_emulator_x86_64_api_33' + 'ANDROID_EMULATOR=automotive_emulator_x86_64_api_34' ] - Id: "automotive-android-10-x86_64-on-linux" diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index 98961077edf..8d3c0d865f6 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -39,9 +39,9 @@ android14SystemZipSha="ede80c6901e8fad1895c97a86542b8e072bb1ee5" android14SystemPath="$basePath/$android14SystemZipName" # Android Automotive max SDK level image -sdkApiLevelAutomotiveMax="android-33" +sdkApiLevelAutomotiveMax="android-34" androidAutomotiveMaxUrl="$basePath/${sdkApiLevelAutomotiveMax}_automotive.tar.gz" -androidAutomotiveMaxSha="b020a938ec46af2510047284406e9bed608cad03" +androidAutomotiveMaxSha="2cc5dae4fd0bdefb188a3b84019d0d1e65501519" # Android Automotive min SDK level image sdkApiLevelAutomotiveMin="android-29" androidAutomotiveMinUrl="$basePath/${sdkApiLevelAutomotiveMin}_automotive.tar.gz" @@ -168,7 +168,7 @@ echo "Install maximum supported SDK level image for Android Automotive $sdkApiLe DownloadURL "$androidAutomotiveMaxUrl" "$androidAutomotiveMaxUrl" "$androidAutomotiveMaxSha" \ "/tmp/${sdkApiLevelAutomotiveMax}_automotive.tar.gz" sudo tar -xzf "/tmp/${sdkApiLevelAutomotiveMax}_automotive.tar.gz" -C "$sdkTargetFolder/system-images" -echo "no" | ./avdmanager create avd -n automotive_emulator_x86_64_api_33 -c 2048M -f \ +echo "no" | ./avdmanager create avd -n automotive_emulator_x86_64_api_34 -c 2048M -f \ -k "system-images;${sdkApiLevelAutomotiveMax};android-automotive;x86_64" echo "Install minimum supported SDK level image for Android Automotive $sdkApiLevelAutomotiveMin" From 3f18574eff16d228331604a996fb1c37c0f3a8cf Mon Sep 17 00:00:00 2001 From: Dominik Holland Date: Fri, 24 May 2024 10:06:38 +0200 Subject: [PATCH 009/288] Provisioning: Install dependency-walker on windows arm64 There is no arm64 version of it, let's just use the x86_64 binary for now and use the emulation. Change-Id: Ife46fe432ce9594d7e6adab8159318a5322e1cef Reviewed-by: Toni Saario (cherry picked from commit bcec02dc0f05216f357c1745d93e64913309ef7b) Reviewed-by: Qt Cherry-pick Bot --- .../windows/install-dependencywalker.ps1 | 30 ++++++++++++++----- .../09-install-dependencywalker.ps1 | 1 + 2 files changed, 24 insertions(+), 7 deletions(-) create mode 100644 coin/provisioning/qtci-windows-11_22H2-aarch64/09-install-dependencywalker.ps1 diff --git a/coin/provisioning/common/windows/install-dependencywalker.ps1 b/coin/provisioning/common/windows/install-dependencywalker.ps1 index abaa4d79a06..3d541f4fe81 100644 --- a/coin/provisioning/common/windows/install-dependencywalker.ps1 +++ b/coin/provisioning/common/windows/install-dependencywalker.ps1 @@ -6,12 +6,28 @@ # This script will install Dependency Walker 2.2.6000 $version = "2.2.6000" -if (Is64BitWinHost) { - $arch = "_x64" - $sha1 = "4831D2A8376D64110FF9CD18799FE6C69509D3EA" -} else { - $arch = "_x86" - $sha1 = "bfec714057e8449b0246051be99ba46a7760bab9" +$cpu_arch = Get-CpuArchitecture +switch ($cpu_arch) { + x64 { + $arch = "_x64" + $sha1 = "4831D2A8376D64110FF9CD18799FE6C69509D3EA" + $nuitka_arch = "x86_64" + } + arm64 { + # There is no ARM64 version of Dependency Walker + # just use the x64 version + $arch = "_x64" + $sha1 = "4831D2A8376D64110FF9CD18799FE6C69509D3EA" + $nuitka_arch = "arm64" + } + x86 { + $arch = "_x86" + $sha1 = "bfec714057e8449b0246051be99ba46a7760bab9" + $nuitka_arch = "x86" + } + default { + throw "Unknown architecture $cpu_arch" + } } $url_cache = "\\ci-files01-hki.ci.qt.io\provisioning\windows\depends22" + $arch + ".zip" $url_official = "http://www.dependencywalker.com/depends22" + $arch + ".zip" @@ -28,7 +44,7 @@ Extract-7Zip $dependsPackage $TARGETDIR # Copy the content also into the cache location of nuitka # This makes it usable without the need to download it again -Copy-Item -Path $TARGETDIR -Destination "$env:LOCALAPPDATA\Nuitka\Nuitka\Cache\downloads\depends\x86_64" -Recurse +Copy-Item -Path $TARGETDIR -Destination "$env:LOCALAPPDATA\Nuitka\Nuitka\Cache\downloads\depends\$nuitka_arch" -Recurse Write-Host "Cleaning $dependsPackage.." Remove "$dependsPackage" diff --git a/coin/provisioning/qtci-windows-11_22H2-aarch64/09-install-dependencywalker.ps1 b/coin/provisioning/qtci-windows-11_22H2-aarch64/09-install-dependencywalker.ps1 new file mode 100644 index 00000000000..331de489564 --- /dev/null +++ b/coin/provisioning/qtci-windows-11_22H2-aarch64/09-install-dependencywalker.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-dependencywalker.ps1" From 22ce6068c5e59470050a528bce0af585f4d4c3f8 Mon Sep 17 00:00:00 2001 From: Dominik Holland Date: Tue, 18 Jun 2024 16:03:36 +0200 Subject: [PATCH 010/288] Provisioning: Fix bwrap with apparmor on Ubuntu 24.04 Part 2 Also make sure apparmor parses the new rule after installing it. Change-Id: I25d2e753594fa86be2151e8a8da73b15b31b1584 Reviewed-by: Robert Griebl (cherry picked from commit 5f8279db597f804dfa8c7cc39cc11574d2536986) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/common/linux/fix-bwrap-apparmor.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/coin/provisioning/common/linux/fix-bwrap-apparmor.sh b/coin/provisioning/common/linux/fix-bwrap-apparmor.sh index 4c8b68f993d..33e05b13048 100644 --- a/coin/provisioning/common/linux/fix-bwrap-apparmor.sh +++ b/coin/provisioning/common/linux/fix-bwrap-apparmor.sh @@ -19,3 +19,4 @@ profile bwrap /usr/bin/bwrap flags=(unconfined) { } EOF +sudo apparmor_parser -r /etc/apparmor.d/bwrap From 2f4bed0ee6f7466360a2f5659c96084afa6030e7 Mon Sep 17 00:00:00 2001 From: Dominik Holland Date: Fri, 24 May 2024 09:55:35 +0200 Subject: [PATCH 011/288] Provisioning: Downgrade python to 3.11.9 on windows aarch64 Python 3.12.3 is causing issues with Nuitka Change-Id: I0b497671bb328c129e6a7b2a7a83a563a234f9ec Reviewed-by: Toni Saario (cherry picked from commit 6548b7e168754392e383eb1c40b577005b7656ac) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/qtci-windows-11_22H2-aarch64/08-python3.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/qtci-windows-11_22H2-aarch64/08-python3.ps1 b/coin/provisioning/qtci-windows-11_22H2-aarch64/08-python3.ps1 index 5ca364917b8..74cb6997fff 100644 --- a/coin/provisioning/qtci-windows-11_22H2-aarch64/08-python3.ps1 +++ b/coin/provisioning/qtci-windows-11_22H2-aarch64/08-python3.ps1 @@ -5,5 +5,5 @@ # - version # - Optional true/false if set as default with PYTHON3/PIP3_PATH variables, default false -# Downloading https://www.python.org/ftp/python/3.12.3/python-3.12.3-arm64.exe -. "$PSScriptRoot\..\common\windows\python3.ps1" 64 "a7fe973fd406c0db2b982d83e9feb30f8fde704f" "C:\Python312_64" "3.12.3" $true +# 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 From f042009b4d82e046de510125bb894aed56dafc6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marianne=20Yrj=C3=A4n=C3=A4?= Date: Mon, 20 May 2024 11:38:38 +0300 Subject: [PATCH 012/288] QNX: Fix typos in QNX toolchain file Fix CMAKE_SYSTEM_PROCESSOR definition for armv7le. This is needed when using Windows host to cross-compile Qt binaries for QNX. Fixes: QTBUG-125450 Pick-to: 6.7 6.5 Change-Id: I19df2ef9d4cc988f5acf4f09fa46b7014fac80d2 Reviewed-by: Toni Saario (cherry picked from commit 9e560e22a46ea218758b35cbb8c15235d1cd4afd) Reviewed-by: Qt Cherry-pick Bot --- .../shared/cmake_toolchain_files/qnx-toolchain-armv7le.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 90bd97310be..062bb794fcc 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 @@ -1,5 +1,5 @@ set(CMAKE_SYSTEM_NAME QNX) -set(CMALE_SYSTEM_PROCESSOR armv7le) +set(CMAKE_SYSTEM_PROCESSOR armle-v7) if (NOT DEFINED CMAKE_FIND_ROOT_PATH_MODE_PROGRAM) set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) From 2cb772c046f0d1516cbda4a5d7cffb02fffa411c Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 5 Jun 2024 12:57:33 +0200 Subject: [PATCH 013/288] Provisioning: install pipewire dev packages on Linux Task-number: QTBUG-121452 Change-Id: I5e9087b09f64750135ebea9030073cd1a20c5f46 Reviewed-by: Artem Dyomin (cherry picked from commit fcdce53b89bea996ef4db25508d41978bd53ed7c) Reviewed-by: Liang Qi --- coin/provisioning/qtci-linux-Debian-11.6-aarch64/02-apt.sh | 2 ++ .../qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh | 2 ++ .../qtci-linux-RHEL-9.2-x86_64/04-install-packages.sh | 2 ++ coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh | 2 ++ coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh | 2 ++ .../qtci-linux-openSUSE-15.5-x86_64/04-zypperpackages.sh | 2 +- 6 files changed, 11 insertions(+), 1 deletion(-) 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 b7919fe1997..e7f3694fcc7 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 @@ -81,6 +81,8 @@ installPackages+=(libgstreamer-plugins-bad1.0-dev) installPackages+=(libgstreamer-gl1.0-0) installPackages+=(gir1.2-gst-plugins-base-1.0) installPackages+=(gir1.2-gst-plugins-bad-1.0) +installPackages+=(libpipewire-0.3-dev) +installPackages+=(libspa-0.2-dev) ## Support for cross-building to x86 (needed by WebEngine boot2qt builds) #installPackages+=(g++-multilib) 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 d1d600dae57..4a6eae08be4 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 @@ -57,6 +57,8 @@ installPackages+=(dbus-devel) installPackages+=(gstreamer1-plugins-bad-free) installPackages+=(gstreamer1-devel) installPackages+=(gstreamer1-plugins-base-devel) +# pipewire for QtMultimedia +installPackages+=(pipewire-devel) # for QtMultimedia, ffmpeg installPackages+=(yasm) installPackages+=(libva-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 279d66a5c3a..cd0c09324e2 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 @@ -62,6 +62,8 @@ installPackages+=(dbus-devel) installPackages+=(gstreamer1-plugins-bad-free) installPackages+=(gstreamer1-devel) installPackages+=(gstreamer1-plugins-base-devel) +# pipewire for QtMultimedia +installPackages+=(pipewire-devel) # yasm for QtMultimedia installPackages+=(yasm) # gtk3 style for QtGui/QStyle 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 9a9a5ef268f..fab805719a4 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 @@ -100,6 +100,8 @@ installPackages+=(libgstreamer-plugins-bad1.0-dev) installPackages+=(libgstreamer-gl1.0-0) installPackages+=(gir1.2-gst-plugins-base-1.0) installPackages+=(gir1.2-gst-plugins-bad-1.0) +installPackages+=(libpipewire-0.3-dev) +installPackages+=(libspa-0.2-dev) installPackages+=(yasm) installPackages+=(libva-dev) # for QtMultimedia streaming tests 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 6c4b86a4227..52666b9dc7f 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 @@ -98,6 +98,8 @@ installPackages+=(libgstreamer-plugins-bad1.0-dev) installPackages+=(libgstreamer-gl1.0-0) installPackages+=(gir1.2-gst-plugins-base-1.0) installPackages+=(gir1.2-gst-plugins-bad-1.0) +installPackages+=(libpipewire-0.3-dev) +installPackages+=(libspa-0.2-dev) installPackages+=(yasm) installPackages+=(libva-dev) # for QtMultimedia streaming tests 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 afea0ff88bc..0cad2372f39 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 @@ -49,7 +49,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 +sudo zypper -nq install gstreamer-devel gstreamer-plugins-base-devel libpulse-devel pipewire-devel # cups sudo zypper -nq install cups-devel From d4046310f81ea3e88bf0d434385115da18135529 Mon Sep 17 00:00:00 2001 From: Pavel Dubsky Date: Wed, 24 Apr 2024 17:55:08 +0200 Subject: [PATCH 014/288] Update FFmpeg version to n7.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: QTBUG-124482 Pick-to: 6.7 6.5 Change-Id: I69727981344d935151f19148960c711b65cb2307 Reviewed-by: Artem Dyomin Reviewed-by: Jøger Hansegård (cherry picked from commit eb8bbfe971accc1e1fbdf0f59bec9308c56e13e1) 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 05d0b681b22..3d60c5c1129 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="n6.1.1" +version="n7.0" url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz" -sha1="59e0c3c4cc48e9c60073495f8c045329bb21f446" +sha1="042260ec5013eb29c89c13443a0f42cbe6fbceaa" 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 e2a401a5ac8..d8238294b44 100755 --- a/coin/provisioning/common/unix/install-ffmpeg-ios.sh +++ b/coin/provisioning/common/unix/install-ffmpeg-ios.sh @@ -10,8 +10,8 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -version="n6.1.1" -sha1="59e0c3c4cc48e9c60073495f8c045329bb21f446" +version="n7.0" +sha1="042260ec5013eb29c89c13443a0f42cbe6fbceaa" url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz" 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 94d032ed3ab..45b33b72b95 100755 --- a/coin/provisioning/common/unix/install-ffmpeg.sh +++ b/coin/provisioning/common/unix/install-ffmpeg.sh @@ -11,9 +11,9 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -version="n6.1.1" +version="n7.0" url_public="https://github.com/FFmpeg/FFmpeg/archive/$version.tar.gz" -sha1="59e0c3c4cc48e9c60073495f8c045329bb21f446" +sha1="042260ec5013eb29c89c13443a0f42cbe6fbceaa" 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 483400fe7a4..480faaa431b 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 = "n6.1.1" +$version = "n7.0" $ffmpeg_name = "ffmpeg-" + $version; -$sha1 = "7AECCED8A0366BE407329B4E176167534233DA12" +$sha1 = "CC948A547113469E284CA085B9A236F1ECC50843" $url_cached = "https://ci-files01-hki.ci.qt.io/input/ffmpeg/" + $version + ".zip" $url_public = "https://github.com/FFmpeg/FFmpeg/archive/refs/tags/" +$version + ".zip" From 6eed0ab93a28b1fe7a9086d1626b9b79cf4bc133 Mon Sep 17 00:00:00 2001 From: Tim Blechmann Date: Tue, 21 May 2024 21:36:54 +0800 Subject: [PATCH 015/288] provisioning: install gstreamer plugins MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This allows us to run unit tests that require real-world codecs on debian/ubuntu Pick-to: 6.7 6.5 Change-Id: I99a73506610ea430948692f8a88045394e747750 Reviewed-by: Simo Fält (cherry picked from commit 02af86d2aad63b17391bb8dfa33d5a9f3b44d415) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/qtci-linux-Debian-11.6-aarch64/02-apt.sh | 6 ++++++ coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh | 6 ++++++ coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh | 6 ++++++ coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh | 6 ++++++ coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh | 6 ++++++ 5 files changed, 30 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 e7f3694fcc7..e2f6af9590f 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 @@ -78,6 +78,12 @@ installPackages+=(libasound2-dev) installPackages+=(libgstreamer1.0-dev) installPackages+=(libgstreamer-plugins-base1.0-dev) installPackages+=(libgstreamer-plugins-bad1.0-dev) +installPackages+=(gstreamer1.0-libav) +installPackages+=(gstreamer1.0-plugins-base) +installPackages+=(gstreamer1.0-plugins-good) +installPackages+=(gstreamer1.0-plugins-bad) +installPackages+=(gstreamer1.0-plugins-rtp) +installPackages+=(gstreamer1.0-plugins-ugly) installPackages+=(libgstreamer-gl1.0-0) installPackages+=(gir1.2-gst-plugins-base-1.0) installPackages+=(gir1.2-gst-plugins-bad-1.0) diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh index 5fed66908f8..df016116d4e 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh @@ -80,6 +80,12 @@ installPackages+=(libgstreamer1.0-dev) installPackages+=(libgstreamer-plugins-base1.0-dev) installPackages+=(libgstreamer-plugins-good1.0-dev) installPackages+=(libgstreamer-plugins-bad1.0-dev) +installPackages+=(gstreamer1.0-libav) +installPackages+=(gstreamer1.0-plugins-base) +installPackages+=(gstreamer1.0-plugins-good) +installPackages+=(gstreamer1.0-plugins-bad) +installPackages+=(gstreamer1.0-plugins-rtp) +installPackages+=(gstreamer1.0-plugins-ugly) installPackages+=(yasm) installPackages+=(libva-dev) # for QtMultimedia streaming tests diff --git a/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh index 72d32e8f559..aac229a2d0a 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh @@ -96,6 +96,12 @@ installPackages+=(libgstreamer1.0-dev) installPackages+=(libgstreamer-plugins-base1.0-dev) installPackages+=(libgstreamer-plugins-good1.0-dev) installPackages+=(libgstreamer-plugins-bad1.0-dev) +installPackages+=(gstreamer1.0-libav) +installPackages+=(gstreamer1.0-plugins-base) +installPackages+=(gstreamer1.0-plugins-good) +installPackages+=(gstreamer1.0-plugins-bad) +installPackages+=(gstreamer1.0-plugins-rtp) +installPackages+=(gstreamer1.0-plugins-ugly) installPackages+=(libgstreamer-gl1.0-0) installPackages+=(gir1.2-gst-plugins-base-1.0) installPackages+=(gir1.2-gst-plugins-bad-1.0) 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 fab805719a4..ca8c90a44ec 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 @@ -98,6 +98,12 @@ installPackages+=(libgstreamer-plugins-base1.0-dev) installPackages+=(libgstreamer-plugins-good1.0-dev) installPackages+=(libgstreamer-plugins-bad1.0-dev) installPackages+=(libgstreamer-gl1.0-0) +installPackages+=(gstreamer1.0-libav) +installPackages+=(gstreamer1.0-plugins-base) +installPackages+=(gstreamer1.0-plugins-good) +installPackages+=(gstreamer1.0-plugins-bad) +installPackages+=(gstreamer1.0-plugins-rtp) +installPackages+=(gstreamer1.0-plugins-ugly) installPackages+=(gir1.2-gst-plugins-base-1.0) installPackages+=(gir1.2-gst-plugins-bad-1.0) installPackages+=(libpipewire-0.3-dev) 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 52666b9dc7f..d8220dd1623 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 @@ -95,6 +95,12 @@ installPackages+=(libgstreamer1.0-dev) installPackages+=(libgstreamer-plugins-base1.0-dev) installPackages+=(libgstreamer-plugins-good1.0-dev) installPackages+=(libgstreamer-plugins-bad1.0-dev) +installPackages+=(gstreamer1.0-libav) +installPackages+=(gstreamer1.0-plugins-base) +installPackages+=(gstreamer1.0-plugins-good) +installPackages+=(gstreamer1.0-plugins-bad) +installPackages+=(gstreamer1.0-plugins-rtp) +installPackages+=(gstreamer1.0-plugins-ugly) installPackages+=(libgstreamer-gl1.0-0) installPackages+=(gir1.2-gst-plugins-base-1.0) installPackages+=(gir1.2-gst-plugins-bad-1.0) From ac2a19ab7e9cb2828a6831880e7fe2ae9e5c16d4 Mon Sep 17 00:00:00 2001 From: Volker Hilsheimer Date: Sun, 16 Jun 2024 10:45:10 +0200 Subject: [PATCH 016/288] Build shared FFmpeg on Linux and set dependencies to stubs Task-number: QTBUG-120990 Change-Id: I8fccf8ef58cf6334e71287450ee30cc2256516d9 Reviewed-by: Volker Hilsheimer (cherry picked from commit 83adc86c532f826565729cd963996222033e840c) --- .../address_sanitizer_platforms.yaml | 2 +- coin/platform_configs/cmake_platforms.yaml | 6 ++-- .../common/linux/fix_ffmpeg_dependencies.sh | 33 +++++++++++++++++++ .../common/unix/install-ffmpeg.sh | 24 +++++++++++++- .../90-install-ffmpeg.sh | 2 +- .../90-install-ffmpeg.sh | 2 +- .../qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh | 2 ++ .../qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh | 2 ++ .../qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh | 2 ++ 9 files changed, 68 insertions(+), 7 deletions(-) create mode 100755 coin/provisioning/common/linux/fix_ffmpeg_dependencies.sh diff --git a/coin/platform_configs/address_sanitizer_platforms.yaml b/coin/platform_configs/address_sanitizer_platforms.yaml index 0db6392b1f6..8878d43938f 100644 --- a/coin/platform_configs/address_sanitizer_platforms.yaml +++ b/coin/platform_configs/address_sanitizer_platforms.yaml @@ -8,5 +8,5 @@ Configurations: 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}}' + 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE' ] diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 28376136ba4..8f5de9cd08c 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -14,7 +14,7 @@ Configurations: Compiler: 'GCC' Features: ['Sccache', 'Documentation', 'UseConfigure', 'DoNotRunTests'] Configure arguments: '-make examples -developer-build -c++std c++20 -linker gold -qtlibinfix TestInfix -qtnamespace TestNamespace' - Environment variables: ['NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'] + Environment variables: ['NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE'] - Id: 'ubuntu-22.04' Template: 'qtci-linux-Ubuntu-22.04-x86_64-51' @@ -23,7 +23,7 @@ Configurations: 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', - 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DINPUT_headersclean=ON' + 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DINPUT_headersclean=ON -DQT_DEPLOY_FFMPEG=TRUE' ] # Test on Ubuntu 22.04 X11 - @@ -65,7 +65,7 @@ Configurations: 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}}' + 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE' ] - Id: 'sles-15_sp5-static' diff --git a/coin/provisioning/common/linux/fix_ffmpeg_dependencies.sh b/coin/provisioning/common/linux/fix_ffmpeg_dependencies.sh new file mode 100755 index 00000000000..627e6a777b3 --- /dev/null +++ b/coin/provisioning/common/linux/fix_ffmpeg_dependencies.sh @@ -0,0 +1,33 @@ +#!/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 -x + +lib_dir="$1/lib" + +ffmpeg_libs=("avcodec" "avdevice" "avfilter" "avformat" "avutil" "swresample" "swscale") + +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" + + if [ ! -f "$lib_path" ]; then + echo "FFmpeg lib $lib_path hasn't been found" + exit 1 + fi + + if [ ! -f "$pkg_config_file_path" ]; then + echo "FFmpeg pc file $pkg_config_file_path hasn't been found" + exit 1 + fi + + while read -r line; do + if [[ $line =~ .*\[(lib((ssl|crypto|va|va-x11|va-drm)\.so(\.[0-9]+)*))\].* ]]; then + patchelf --replace-needed "${BASH_REMATCH[1]}" "libQt6FFmpegStub-${BASH_REMATCH[2]}" $lib_path + fi + done <<< "$(readelf -d $lib_path | grep '(NEEDED)' )" + + sed -i -E "/^Libs.private:/s/ -l(va|va-x11|va-drm|ssl|crypto)/ -lQt6FFmpegStub-\\1/g;" $pkg_config_file_path + patchelf --set-rpath '$ORIGIN' $lib_path +done diff --git a/coin/provisioning/common/unix/install-ffmpeg.sh b/coin/provisioning/common/unix/install-ffmpeg.sh index 45b33b72b95..dbc0ee02c83 100755 --- a/coin/provisioning/common/unix/install-ffmpeg.sh +++ b/coin/provisioning/common/unix/install-ffmpeg.sh @@ -71,11 +71,31 @@ build_ffmpeg() { } if [ "$os" == "linux" ]; then + # TODO: install patchelf on RHEL and remove the force "static" + if [ -f "/etc/redhat-release" ]; then + build_type="static" + else + build_type="$2" + fi + install_ff_nvcodec_headers ffmpeg_config_options+=" --enable-openssl" + + if [ "$build_type" != "static" ]; then + ffmpeg_config_options+=" --enable-shared --disable-static" + fi + build_ffmpeg - sudo mv "$ffmpeg_source_dir/build/installed/usr/local/$ffmpeg_name" "/usr/local" + + output_dir="$ffmpeg_source_dir/build/installed/usr/local/$ffmpeg_name" + + if [ "$build_type" != "static" ]; then + fix_dependencies="${BASH_SOURCE%/*}/../linux/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 @@ -111,3 +131,5 @@ elif [ "$os" == "macos" ] || [ "$os" == "macos-universal" ]; then SetEnvVar "FFMPEG_DIR" "/usr/local/$ffmpeg_name" fi + + 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 61da9b7b3a4..27ff04dc6cf 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" +source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux" "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 2a0d7258e0f..cd65475bc72 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" +source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux" "static" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh index df016116d4e..e0bec3e54f9 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh @@ -168,6 +168,8 @@ installPackages+=(ruby) installPackages+=(libxslt1-dev) installPackages+=(libxml2-dev) installPackages+=(libhyphen-dev) +# Fix dependencies in shared ffmpeg libs +installPackages+=(patchelf) echo "Running update for apt" waitLoop diff --git a/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh index aac229a2d0a..fad3dd41a1d 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh @@ -217,6 +217,8 @@ sudo dpkg --add-architecture i386 installPackages+=(nfs-kernel-server) installPackages+=(net-tools) installPackages+=(bridge-utils) +# Fix dependencies in shared ffmpeg libs +installPackages+=(patchelf) echo "Running update for apt" waitLoop 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 ca8c90a44ec..c43d4027c40 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 @@ -235,6 +235,8 @@ installPackages+=(uml-utilities) # used for reading vcpkg packages version, from vcpkg.json installPackages+=(jq) +installPackages+=(patchelf) + echo "Running update for apt" waitLoop sudo apt-get update From d34850071d084f39539fc1de2f4b098ca118ff85 Mon Sep 17 00:00:00 2001 From: Artem Dyomin Date: Fri, 19 Apr 2024 15:19:28 +0200 Subject: [PATCH 017/288] Install patchelf on RHEL Patchelf is needed for fixing FFmpeg dependencies, the previous CR reveals details. Patchelf is not available in the standard package manager on RHEL, let's install it from sources. Change-Id: I724ffed9c48b9811e10de89519d8271e2f82260d Reviewed-by: Volker Hilsheimer (cherry picked from commit 49b0435e7ed6e53e5eaf0612beb91c91eb4db71a) --- coin/platform_configs/cmake_platforms.yaml | 4 +-- .../common/linux/install-patchelf.sh | 26 +++++++++++++++++++ .../common/unix/install-ffmpeg.sh | 7 +---- .../05-install-patchelf.sh | 5 ++++ .../05-install-patchelf.sh | 5 ++++ .../05-install-patchelf.sh | 5 ++++ .../05-install-patchelf.sh | 5 ++++ .../90-install-ffmpeg.sh | 3 ++- .../05-install-patchelf.sh | 5 ++++ .../05-install-patchelf.sh | 5 ++++ 10 files changed, 61 insertions(+), 9 deletions(-) create mode 100755 coin/provisioning/common/linux/install-patchelf.sh create mode 100755 coin/provisioning/qtci-linux-RHEL-8.2-x86_64/05-install-patchelf.sh create mode 100755 coin/provisioning/qtci-linux-RHEL-8.4-x86_64/05-install-patchelf.sh create mode 100755 coin/provisioning/qtci-linux-RHEL-8.6-x86_64/05-install-patchelf.sh create mode 100755 coin/provisioning/qtci-linux-RHEL-8.8-x86_64/05-install-patchelf.sh create mode 100755 coin/provisioning/qtci-linux-RHEL-9.0-x86_64/05-install-patchelf.sh create mode 100755 coin/provisioning/qtci-linux-RHEL-9.2-x86_64/05-install-patchelf.sh diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 8f5de9cd08c..bc2130bf851 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -197,7 +197,7 @@ Configurations: 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}}', - 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DFEATURE_native_grpc=OFF -DINPUT_headersclean=ON' + 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_native_grpc=OFF -DINPUT_headersclean=ON' ] - Id: 'rhel-9.2' @@ -207,7 +207,7 @@ Configurations: 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', - 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DINPUT_headersclean=ON' + 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON' ] # Build on Debian-11.6 and split test on Wayland and offscreen later - diff --git a/coin/provisioning/common/linux/install-patchelf.sh b/coin/provisioning/common/linux/install-patchelf.sh new file mode 100755 index 00000000000..6600795ca83 --- /dev/null +++ b/coin/provisioning/common/linux/install-patchelf.sh @@ -0,0 +1,26 @@ +#!/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 + + +source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" +patchelf_version="0.18.0" + +url_cached="http://ci-files01-hki.ci.qt.io/input/patchelf/$patchelf_version.tar.gz" +url_public="https://github.com/NixOS/patchelf/archive/refs/tags/$patchelf_version.tar.gz" +sha1="7eb974172de73b7b452ee376237ad78601603c45" + +target_source_dir="$HOME/patchelf-$patchelf_version" + +if [ ! -d "$target_source_dir" ]; then + InstallFromCompressedFileFromURL "$url_cached" "$url_public" "$sha1" "$HOME" "" +fi + +pushd "$target_source_dir" + +./bootstrap.sh +./configure +make +sudo make install + +popd diff --git a/coin/provisioning/common/unix/install-ffmpeg.sh b/coin/provisioning/common/unix/install-ffmpeg.sh index dbc0ee02c83..cda63786e24 100755 --- a/coin/provisioning/common/unix/install-ffmpeg.sh +++ b/coin/provisioning/common/unix/install-ffmpeg.sh @@ -71,12 +71,7 @@ build_ffmpeg() { } if [ "$os" == "linux" ]; then - # TODO: install patchelf on RHEL and remove the force "static" - if [ -f "/etc/redhat-release" ]; then - build_type="static" - else - build_type="$2" - fi + build_type="$2" install_ff_nvcodec_headers diff --git a/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/05-install-patchelf.sh b/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/05-install-patchelf.sh new file mode 100755 index 00000000000..14813160591 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/05-install-patchelf.sh @@ -0,0 +1,5 @@ +#!/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 + +source "${BASH_SOURCE%/*}/../common/linux/install-patchelf.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/05-install-patchelf.sh b/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/05-install-patchelf.sh new file mode 100755 index 00000000000..14813160591 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/05-install-patchelf.sh @@ -0,0 +1,5 @@ +#!/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 + +source "${BASH_SOURCE%/*}/../common/linux/install-patchelf.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/05-install-patchelf.sh b/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/05-install-patchelf.sh new file mode 100755 index 00000000000..14813160591 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/05-install-patchelf.sh @@ -0,0 +1,5 @@ +#!/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 + +source "${BASH_SOURCE%/*}/../common/linux/install-patchelf.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/05-install-patchelf.sh b/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/05-install-patchelf.sh new file mode 100755 index 00000000000..14813160591 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/05-install-patchelf.sh @@ -0,0 +1,5 @@ +#!/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 + +source "${BASH_SOURCE%/*}/../common/linux/install-patchelf.sh" 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 06e28f34c7b..18d46d7ec08 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,6 +2,7 @@ #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" +# TODO: investigate why the FFmpeg plugin can't find shared FFmpeg on rhel-8.8 +source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux" "static" 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/05-install-patchelf.sh b/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/05-install-patchelf.sh new file mode 100755 index 00000000000..14813160591 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/05-install-patchelf.sh @@ -0,0 +1,5 @@ +#!/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 + +source "${BASH_SOURCE%/*}/../common/linux/install-patchelf.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/05-install-patchelf.sh b/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/05-install-patchelf.sh new file mode 100755 index 00000000000..14813160591 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/05-install-patchelf.sh @@ -0,0 +1,5 @@ +#!/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 + +source "${BASH_SOURCE%/*}/../common/linux/install-patchelf.sh" From 01c0814cc508f713689067b3c1ebaa5d33dbf73c Mon Sep 17 00:00:00 2001 From: Bartlomiej Moskal Date: Tue, 28 May 2024 11:26:11 +0200 Subject: [PATCH 018/288] Coin: Extend script for fixing FFmpeg dependencies to stubs The fix_ffmpeg_dependency.sh script should also take into account libraries with a _3 suffix in their names. This suffix will not be used in the stub name. Additionally, Android libraries have a suffix specifying the architecture (e.g. _x86_64 or _arm64-v8a). Add an additional parameter to the script with stub_sufix. Task-number: QTBUG-122010 Change-Id: Ia844b7b1f73c2d5264384ef26b41a292ea70d749 Reviewed-by: Artem Dyomin (cherry picked from commit 5cef9d32c5cad1b6e044161ffede7148dda1528c) Reviewed-by: Qt Cherry-pick Bot --- .../common/linux/fix_ffmpeg_dependencies.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/common/linux/fix_ffmpeg_dependencies.sh b/coin/provisioning/common/linux/fix_ffmpeg_dependencies.sh index 627e6a777b3..7440fc4c54e 100755 --- a/coin/provisioning/common/linux/fix_ffmpeg_dependencies.sh +++ b/coin/provisioning/common/linux/fix_ffmpeg_dependencies.sh @@ -5,6 +5,7 @@ set -x lib_dir="$1/lib" +additional_suffix="${2:-}" ffmpeg_libs=("avcodec" "avdevice" "avfilter" "avformat" "avutil" "swresample" "swscale") @@ -23,8 +24,15 @@ for lib_name in "${ffmpeg_libs[@]}"; do fi while read -r line; do - if [[ $line =~ .*\[(lib((ssl|crypto|va|va-x11|va-drm)\.so(\.[0-9]+)*))\].* ]]; then - patchelf --replace-needed "${BASH_REMATCH[1]}" "libQt6FFmpegStub-${BASH_REMATCH[2]}" $lib_path + 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="${stub_name/_3/}" # Remove "_3" from stub_name + 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 fi done <<< "$(readelf -d $lib_path | grep '(NEEDED)' )" From f010bb13a961b2fe42477726ca63dc44676efd2c Mon Sep 17 00:00:00 2001 From: Bartlomiej Moskal Date: Tue, 28 May 2024 12:04:21 +0200 Subject: [PATCH 019/288] Coin: Extend script for fixing FFmpeg dependencies to stubs Add an additional parameter to disable the rpath setting. The rpath update somehow interferes with the ffmpeg libraries fails with: "java.lang.UnsatisfiedLinkError: dlopen failed: empty/none DT_HASH/DT_GNU_HASH" Task-number: QTBUG-122010 Change-Id: Idfe4addacee68edfb0f7ccaac1a19860c539c0e0 Reviewed-by: Artem Dyomin (cherry picked from commit 4f3b057d018e423f3998ceebc7a737032f9d9afc) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/common/linux/fix_ffmpeg_dependencies.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/coin/provisioning/common/linux/fix_ffmpeg_dependencies.sh b/coin/provisioning/common/linux/fix_ffmpeg_dependencies.sh index 7440fc4c54e..fc6301cf34a 100755 --- a/coin/provisioning/common/linux/fix_ffmpeg_dependencies.sh +++ b/coin/provisioning/common/linux/fix_ffmpeg_dependencies.sh @@ -6,6 +6,7 @@ set -x lib_dir="$1/lib" additional_suffix="${2:-}" +set_rpath="${3:-yes}" ffmpeg_libs=("avcodec" "avdevice" "avfilter" "avformat" "avutil" "swresample" "swscale") @@ -37,5 +38,7 @@ for lib_name in "${ffmpeg_libs[@]}"; do done <<< "$(readelf -d $lib_path | grep '(NEEDED)' )" sed -i -E "/^Libs.private:/s/ -l(va|va-x11|va-drm|ssl|crypto)/ -lQt6FFmpegStub-\\1/g;" $pkg_config_file_path - patchelf --set-rpath '$ORIGIN' $lib_path + if [[ "$set_rpath" == "yes" ]]; then + patchelf --set-rpath '$ORIGIN' $lib_path + fi done From b790f9314e99f3c7918bb5f736fc7f41ce29296f Mon Sep 17 00:00:00 2001 From: Bartlomiej Moskal Date: Tue, 28 May 2024 12:15:14 +0200 Subject: [PATCH 020/288] Coin: Dynamically linked FFmpeg for Android (on Linux host) Prepare install-ffmpeg-android.sh script for turning on dynamically linked FFmpeg Task-number: QTBUG-122010 Change-Id: Id186e546b1b3c9bbb5a84492766411f806f51b4e Reviewed-by: Artem Dyomin (cherry picked from commit 9e0d693caa89b2fd5b3c7ca248a1173cfbbb431d) Reviewed-by: Qt Cherry-pick Bot --- .../cmake_platforms_target_android.yaml | 8 +++---- .../common/unix/install-ffmpeg-android.sh | 22 ++++++++++++++++++- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/coin/platform_configs/cmake_platforms_target_android.yaml b/coin/platform_configs/cmake_platforms_target_android.yaml index b3c940c2e5d..12f0a335bc0 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_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', - 'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH=/usr/local -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARM64}} -DFEATURE_native_grpc=OFF -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}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}' ] - @@ -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_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', - 'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH={{.Env.Protobuf_ROOT_mingw}} -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARMV7}} -DFEATURE_native_grpc=OFF -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}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR={{.Env.Protobuf_ROOT_msvc}}/include', 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}' ] - @@ -43,7 +43,7 @@ Configurations: 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', - 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86}} -DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', + 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}', '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_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}}', + 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_64}} -DQT_DEPLOY_FFMPEG=TRUE', 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}', 'ANDROID_EMULATOR=emulator_x86_64_api_34' ] diff --git a/coin/provisioning/common/unix/install-ffmpeg-android.sh b/coin/provisioning/common/unix/install-ffmpeg-android.sh index 3d60c5c1129..8a35d1edd3b 100755 --- a/coin/provisioning/common/unix/install-ffmpeg-android.sh +++ b/coin/provisioning/common/unix/install-ffmpeg-android.sh @@ -2,7 +2,7 @@ # 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 -# This script will build and install FFmpeg static libs +# This script will build and install FFmpeg shared libs set -ex os="$1" @@ -30,28 +30,36 @@ build_ffmpeg_android() { target_arch=$1 target_dir=$2 + shared="${3:-no}" 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 -s "${openssl_libs}/libcrypto_3.so" "${openssl_libs}/libcrypto.so" + ln -s "${openssl_libs}/libssl_3.so" "${openssl_libs}/libssl.so" + api_version=24 ndk_root=$ANDROID_NDK_ROOT_DEFAULT @@ -71,6 +79,9 @@ build_ffmpeg_android() { ffmpeg_config_options=$(cat "${BASH_SOURCE%/*}/../shared/ffmpeg_config_options.txt") 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}" @@ -83,6 +94,15 @@ build_ffmpeg_android() { sudo "$ffmpeg_source_dir/configure" $ffmpeg_config_options --prefix="$target_dir" sudo make install -j4 + + rm -f "${openssl_libs}/libcrypto.so" + rm -f "${openssl_libs}/libssl.so" + + if [[ "$shared" == "yes" ]]; then + fix_dependencies="${BASH_SOURCE%/*}/../linux/fix_ffmpeg_dependencies.sh" + sudo "${fix_dependencies}" "${target_dir}" "${libs_prefix}" "no" + fi + popd } From d35d6de21252f8b060ea354c4bb1fba294767f16 Mon Sep 17 00:00:00 2001 From: Bartlomiej Moskal Date: Tue, 28 May 2024 19:52:00 +0200 Subject: [PATCH 021/288] Coin: Move fix_ffmpeg_dependencies.sh to shared directory Move fix_ffmpeg_dependencies.sh script from "linux" to "shared" directory. The script will be used on macOS but also on Windows (using MSYS2) Task-number: QTBUG-122010 Change-Id: If63d5e3ba7562b230cce26c7bfba728a2ae0a382 Reviewed-by: Artem Dyomin (cherry picked from commit b6c681279853bdb79e5dcb3232928f3d6b365837) Reviewed-by: Qt Cherry-pick Bot --- .../common/{linux => shared}/fix_ffmpeg_dependencies.sh | 0 coin/provisioning/common/unix/install-ffmpeg-android.sh | 2 +- coin/provisioning/common/unix/install-ffmpeg.sh | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) rename coin/provisioning/common/{linux => shared}/fix_ffmpeg_dependencies.sh (100%) diff --git a/coin/provisioning/common/linux/fix_ffmpeg_dependencies.sh b/coin/provisioning/common/shared/fix_ffmpeg_dependencies.sh similarity index 100% rename from coin/provisioning/common/linux/fix_ffmpeg_dependencies.sh rename to coin/provisioning/common/shared/fix_ffmpeg_dependencies.sh diff --git a/coin/provisioning/common/unix/install-ffmpeg-android.sh b/coin/provisioning/common/unix/install-ffmpeg-android.sh index 8a35d1edd3b..43308b07678 100755 --- a/coin/provisioning/common/unix/install-ffmpeg-android.sh +++ b/coin/provisioning/common/unix/install-ffmpeg-android.sh @@ -99,7 +99,7 @@ build_ffmpeg_android() { rm -f "${openssl_libs}/libssl.so" if [[ "$shared" == "yes" ]]; then - fix_dependencies="${BASH_SOURCE%/*}/../linux/fix_ffmpeg_dependencies.sh" + fix_dependencies="${BASH_SOURCE%/*}/../shared/fix_ffmpeg_dependencies.sh" sudo "${fix_dependencies}" "${target_dir}" "${libs_prefix}" "no" fi diff --git a/coin/provisioning/common/unix/install-ffmpeg.sh b/coin/provisioning/common/unix/install-ffmpeg.sh index cda63786e24..67255e3cb4f 100755 --- a/coin/provisioning/common/unix/install-ffmpeg.sh +++ b/coin/provisioning/common/unix/install-ffmpeg.sh @@ -86,7 +86,7 @@ if [ "$os" == "linux" ]; then output_dir="$ffmpeg_source_dir/build/installed/usr/local/$ffmpeg_name" if [ "$build_type" != "static" ]; then - fix_dependencies="${BASH_SOURCE%/*}/../linux/fix_ffmpeg_dependencies.sh" + fix_dependencies="${BASH_SOURCE%/*}/../shared/fix_ffmpeg_dependencies.sh" "$fix_dependencies" "$output_dir" fi From f63272740c0b1fdc75f4bb277ce7a5ce6f9374ff Mon Sep 17 00:00:00 2001 From: Bartlomiej Moskal Date: Tue, 28 May 2024 18:00:05 +0200 Subject: [PATCH 022/288] Coin: Dynamically linked FFmpeg for Android (on Windows host) Prepare install-ffmpeg.ps1 script for turning on dynamically linked FFmpeg on Windows. Script on Windows will use MSYS2 and run same bash script as Linux host. To make it possible first need to install binutils (for readelf) and patchelf. As patchelf is not available by pacman, it is compiled and installed from sources. Task-number: QTBUG-122010 Change-Id: Ide1e7da82f73b1663a3c5d7657c53057281ebe94 Reviewed-by: Artem Dyomin (cherry picked from commit 7c96a8225af78b45afdf10711d27a81f47a56583) Reviewed-by: Qt Cherry-pick Bot --- .../common/windows/install-ffmpeg.ps1 | 38 ++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/coin/provisioning/common/windows/install-ffmpeg.ps1 b/coin/provisioning/common/windows/install-ffmpeg.ps1 index 480faaa431b..0c014575f0d 100644 --- a/coin/provisioning/common/windows/install-ffmpeg.ps1 +++ b/coin/provisioning/common/windows/install-ffmpeg.ps1 @@ -134,6 +134,7 @@ function InstallLlvmMingwFfmpeg { } function InstallAndroidArmv7 { + $shared=$false $target_toolchain_arch="armv7a-linux-androideabi" $target_arch="armv7-a" $target_cpu="armv7-a" @@ -155,14 +156,49 @@ function InstallAndroidArmv7 { $openssl_path = [System.Environment]::GetEnvironmentVariable("OPENSSL_ANDROID_HOME_DEFAULT", [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 + New-Item -ItemType SymbolicLink -Path ${openssl_path}/armeabi-v7a/libssl.so -Target ${openssl_path}/armeabi-v7a/libssl_3.so + $config = GetFfmpegDefaultConfiguration $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${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 + + Remove-Item -Path ${openssl_path}/armeabi-v7a/libcrypto.so + Remove-Item -Path ${openssl_path}/armeabi-v7a/libssl.so + + if (-not $shared) { + return $result + } - return InstallFfmpeg -config $config -buildSystem "android-arm" -msystem "ANDROID_CLANG" -ffmpegDirEnvVar "FFMPEG_DIR_ANDROID_ARMV7" + # For Shared ffmpeg we need to change dependencies to stubs + Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath $msys -ArgumentList ("-lc", "`"pacman -Sy --noconfirm binutils`"") + Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath $msys -ArgumentList ("-lc", "`"pacman -Sy --noconfirm autoconf`"") + Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath $msys -ArgumentList ("-lc", "`"pacman -Sy --noconfirm automake`"") + Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath $msys -ArgumentList ("-lc", "`"pacman -Sy --noconfirm libtool`"") + + $patchelf_sha1 = "7EB974172DE73B7B452EE376237AD78601603C45" + $patchelf_sources = "https://ci-files01-hki.intra.qt.io/input/android/patchelf/0.18.0.tar.gz" + $patchelf_download_location = "C:\Windows\Temp\0.18.0.tar.gz" + + Invoke-WebRequest -UseBasicParsing $patchelf_sources -OutFile $patchelf_download_location + Verify-Checksum $patchelf_download_location $patchelf_sha1 + Extract-tar_gz $patchelf_download_location $unzip_location + Remove $patchelf_download_location + + Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath $msys -ArgumentList ("-lc", "`"cd C:/patchelf-0.18.0 && ./bootstrap.sh && ./configure && make install`"") + + $command = "${PSScriptRoot}/../shared/fix_ffmpeg_dependencies.sh C:/${ffmpeg_name}/build/android-arm/installed/ _armeabi-v7a no" + $command = $command.Replace("\", "/") + Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath $msys -ArgumentList ("-lc", "`"$command`"") + + return $result } $mingwRes = InstallMingwFfmpeg From c9009d7c7a8b77572cf32f7541e4e00d3caee8f4 Mon Sep 17 00:00:00 2001 From: Bartlomiej Moskal Date: Wed, 29 May 2024 11:15:10 +0200 Subject: [PATCH 023/288] Coin: Dynamically linked FFmpeg for Android (on macOS host) Prepare for turning on dynamically linked FFmpeg on macOS: - install binutils (for readelf) on macOS; - readelf need to be used with absolute path on macOS. Prepare workaround solution for this system in fix_ffmpeg_dependencies.sh script; - install patchelf on macOS; - ensuring compatibility of sed call on Linux and macOS; Task-number: QTBUG-122010 Change-Id: I810566786de4363b4383f29467c6ca4395f9f668 Reviewed-by: Artem Dyomin (cherry picked from commit b5e6c9e59beb4d457f138729b6ade6c9ca24ca32) Reviewed-by: Qt Cherry-pick Bot --- .../common/shared/fix_ffmpeg_dependencies.sh | 8 +++++++- coin/provisioning/qtci-macos-12-x86_64/27-binutils.sh | 10 ++++++++++ coin/provisioning/qtci-macos-12-x86_64/28-patchelf.sh | 8 ++++++++ coin/provisioning/qtci-macos-13-x86_64/27-binutils.sh | 10 ++++++++++ coin/provisioning/qtci-macos-13-x86_64/28-patchelf.sh | 8 ++++++++ 5 files changed, 43 insertions(+), 1 deletion(-) create mode 100755 coin/provisioning/qtci-macos-12-x86_64/27-binutils.sh create mode 100755 coin/provisioning/qtci-macos-12-x86_64/28-patchelf.sh create mode 100755 coin/provisioning/qtci-macos-13-x86_64/27-binutils.sh create mode 100755 coin/provisioning/qtci-macos-13-x86_64/28-patchelf.sh diff --git a/coin/provisioning/common/shared/fix_ffmpeg_dependencies.sh b/coin/provisioning/common/shared/fix_ffmpeg_dependencies.sh index fc6301cf34a..54d566a1f01 100755 --- a/coin/provisioning/common/shared/fix_ffmpeg_dependencies.sh +++ b/coin/provisioning/common/shared/fix_ffmpeg_dependencies.sh @@ -8,6 +8,12 @@ lib_dir="$1/lib" additional_suffix="${2:-}" set_rpath="${3:-yes}" +if uname -a |grep -q "Darwin"; then + readelf() { + /usr/local/opt/binutils/bin/readelf "$@" + } +fi + ffmpeg_libs=("avcodec" "avdevice" "avfilter" "avformat" "avutil" "swresample" "swscale") for lib_name in "${ffmpeg_libs[@]}"; do @@ -37,7 +43,7 @@ for lib_name in "${ffmpeg_libs[@]}"; do fi done <<< "$(readelf -d $lib_path | grep '(NEEDED)' )" - sed -i -E "/^Libs.private:/s/ -l(va|va-x11|va-drm|ssl|crypto)/ -lQt6FFmpegStub-\\1/g;" $pkg_config_file_path + 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 if [[ "$set_rpath" == "yes" ]]; then patchelf --set-rpath '$ORIGIN' $lib_path fi diff --git a/coin/provisioning/qtci-macos-12-x86_64/27-binutils.sh b/coin/provisioning/qtci-macos-12-x86_64/27-binutils.sh new file mode 100755 index 00000000000..04d3c5bf26a --- /dev/null +++ b/coin/provisioning/qtci-macos-12-x86_64/27-binutils.sh @@ -0,0 +1,10 @@ +#!/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 + +# binutlis 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-12-x86_64/28-patchelf.sh b/coin/provisioning/qtci-macos-12-x86_64/28-patchelf.sh new file mode 100755 index 00000000000..0710f48303b --- /dev/null +++ b/coin/provisioning/qtci-macos-12-x86_64/28-patchelf.sh @@ -0,0 +1,8 @@ +#!/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 + +brew install patchelf + diff --git a/coin/provisioning/qtci-macos-13-x86_64/27-binutils.sh b/coin/provisioning/qtci-macos-13-x86_64/27-binutils.sh new file mode 100755 index 00000000000..04d3c5bf26a --- /dev/null +++ b/coin/provisioning/qtci-macos-13-x86_64/27-binutils.sh @@ -0,0 +1,10 @@ +#!/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 + +# binutlis 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-13-x86_64/28-patchelf.sh b/coin/provisioning/qtci-macos-13-x86_64/28-patchelf.sh new file mode 100755 index 00000000000..0710f48303b --- /dev/null +++ b/coin/provisioning/qtci-macos-13-x86_64/28-patchelf.sh @@ -0,0 +1,8 @@ +#!/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 + +brew install patchelf + From 13a07d01d573ca0c5dcd9fa3f9aa830927a85636 Mon Sep 17 00:00:00 2001 From: Bartlomiej Moskal Date: Wed, 29 May 2024 11:02:12 +0200 Subject: [PATCH 024/288] Coin: Turn on Dynamically linked FFmpeg for Android Turn on dynamically linked ffmpeg on Android on all hosts (Linux, Windows and macOS). Task-number: QTBUG-122010 Change-Id: Ib3739173bee209ce73e77b75d7b345208da002e4 Reviewed-by: Artem Dyomin (cherry picked from commit a675a87446c02867603075768259de25bbe48246) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/common/unix/install-ffmpeg-android.sh | 2 +- coin/provisioning/common/windows/install-ffmpeg.ps1 | 2 +- 2 files 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 43308b07678..fc0084dab95 100755 --- a/coin/provisioning/common/unix/install-ffmpeg-android.sh +++ b/coin/provisioning/common/unix/install-ffmpeg-android.sh @@ -123,4 +123,4 @@ elif [ "$os" == "android-arm64" ]; then SetEnvVar "FFMPEG_DIR_ANDROID_ARM64" "$target_dir" fi -build_ffmpeg_android "$target_arch" "$target_dir" +build_ffmpeg_android "$target_arch" "$target_dir" "yes" diff --git a/coin/provisioning/common/windows/install-ffmpeg.ps1 b/coin/provisioning/common/windows/install-ffmpeg.ps1 index 0c014575f0d..487e4552057 100644 --- a/coin/provisioning/common/windows/install-ffmpeg.ps1 +++ b/coin/provisioning/common/windows/install-ffmpeg.ps1 @@ -134,7 +134,7 @@ function InstallLlvmMingwFfmpeg { } function InstallAndroidArmv7 { - $shared=$false + $shared=$true $target_toolchain_arch="armv7a-linux-androideabi" $target_arch="armv7-a" $target_cpu="armv7-a" From feb1c21223b776dbf3022759d60ee96cde17c79a Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Thu, 30 May 2024 08:13:13 +0200 Subject: [PATCH 025/288] COIN/QtCreator: Remove Windows 32bit configuration It fails to provision, and we don't need it anymore Pick-to: 6.7 Change-Id: Ifa5446613d00cbc6fbe90fe93718387d86f67eac Reviewed-by: Cristian Adam Reviewed-by: David Schulz (cherry picked from commit e873c1e269a3f77377087034c33f056169a1b336) Reviewed-by: Qt Cherry-pick Bot Reviewed-by: Eike Ziller --- coin/platform_configs/qt-creator.yaml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/coin/platform_configs/qt-creator.yaml b/coin/platform_configs/qt-creator.yaml index 8b7cc6d9cbe..e3357129b43 100644 --- a/coin/platform_configs/qt-creator.yaml +++ b/coin/platform_configs/qt-creator.yaml @@ -15,13 +15,6 @@ Configurations: Configure arguments: '' Environment variables: [] Environment script: ['%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64'] -- - Template: 'qtci-windows-10-x86-4' - Compiler: 'MSVC2019' - Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests'] - Configure arguments: '' - Environment variables: [] - Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'x86'] - Template: 'qtci-linux-RHEL-8.8-x86_64-50' Compiler: 'GCC' From f956053d4ca719edc1ea1f176137716b44a9cd9c Mon Sep 17 00:00:00 2001 From: Pavel Dubsky Date: Tue, 28 May 2024 14:47:31 +0200 Subject: [PATCH 026/288] Add GetVsInstallationPath and GetVsProperty helper functions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Introduce GetVsProperty helper function that allows to retrieve Visual Studio installation property by providing required component (optional). It also offers the ability to choose which version of Visual Studio to use (the oldest or the newest). Also add GetVsInstallationPath helper function which is a handy shortcut to retrieve installation path property. Pick-to: 6.7 6.5 Change-Id: I90afca74db9a6f87b622c7fafec2243e085e89e0 Reviewed-by: Jøger Hansegård (cherry picked from commit 71b10bfe4839d9a7df69c7e4dfef6e987ddc2f77) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/common/windows/helpers.ps1 | 53 +++++++++++++++++--- 1 file changed, 45 insertions(+), 8 deletions(-) diff --git a/coin/provisioning/common/windows/helpers.ps1 b/coin/provisioning/common/windows/helpers.ps1 index 9fbf27aaca2..ad01c499489 100644 --- a/coin/provisioning/common/windows/helpers.ps1 +++ b/coin/provisioning/common/windows/helpers.ps1 @@ -297,13 +297,52 @@ function DeleteSchedulerTask { SCHTASKS /DELETE /TN "Microsoft\Windows\$Task" /F } -function GetVSPath { +function GetVsProperty { Param ( - [string]$VSWhere = "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe", - [string]$Component = "Microsoft.VisualStudio.Component.VC.Tools.x86.x64" + [string]$Component = 'Microsoft.VisualStudio.Component.VC.CoreIde', + [string]$Property, + [switch]$Latest ) - return (& $VSWhere -nologo -latest -products * -requires $Component -property installationPath) + $vsWhereProcessInfo = New-Object System.Diagnostics.ProcessStartInfo + $vsWhereProcessInfo.FileName = "${Env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" + $vsWhereProcessInfo.RedirectStandardError = $true + $vsWhereProcessInfo.RedirectStandardOutput = $true + $vsWhereProcessInfo.UseShellExecute = $false + + # -sort: sorts the instances from newest version and last installed to oldest + $vsWhereProcessInfo.Arguments = " -nologo -sort -products * -requires $Component -property $Property" + if ($Latest) { + # -latest: return only the newest version and last installed + $vsWhereProcessInfo.Arguments += ' -latest' + } + + $vsWhereProcess = New-Object System.Diagnostics.Process + $vsWhereProcess.StartInfo = $vsWhereProcessInfo + + $vsWhereProcess.Start() | Out-Null + $vsWhereProcess.WaitForExit() + + $standardOutput = $vsWhereProcess.StandardOutput.ReadToEnd() + if ([string]::IsNullOrEmpty($standardOutput)) { + throw "vswhere could not find property '$Property'" + } + + $exitCode = $vsWhereProcess.ExitCode + if ($exitCode -ne 0) { + $standardError = $vsWhereProcess.StandardError.ReadToEnd() + throw "vswhere failed with exit code $exitCode ($standardError)" + } + + return $standardOutput.Split([Environment]::NewLine, [StringSplitOptions]::RemoveEmptyEntries) | Select-Object -Last 1 +} + +function GetVsInstallationPath { + Param ( + [switch]$Latest + ) + + return GetVsProperty -Property 'installationPath' @PSBoundParameters } function EnterVSDevShell { @@ -312,13 +351,11 @@ function EnterVSDevShell { [string]$Arch = "amd64" ) - $vsWere = "C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe" - $vcComponent = "Microsoft.VisualStudio.Component.VC.CoreIde" # We pick the oldest build tools we can find and use that to be compatible with it and any newer version: # If MSVC has an ABI break this will stop working, and yet another build must be added. - $VSPath = (& $vsWere -nologo -products * -requires $vcComponent -sort -format value -property installationPath | Select-Object -Last 1) + $VSPath = GetVsInstallationPath - Write-Host "Enter VisualStudio developer shell (-host_arch=$HostArch -arch=$Arch)" + 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" From 9e6a8a0f9d337f1d020bfd35e42ee782c2e23b3f Mon Sep 17 00:00:00 2001 From: Tero Heikkinen Date: Tue, 21 May 2024 12:26:37 +0300 Subject: [PATCH 027/288] Windows ARM: Disable OpenGL as not supported on WoA MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-6109 Task-number: QTBUG-126030 Fixes: QTBUG-125438 Fixes: QTBUG-125439 Fixes: QTBUG-125444 Fixes: QTBUG-125445 Pick-to: 6.7 Change-Id: I05297b056bf1f39e6a77198a2244eedd05c1f963 Reviewed-by: Tony Sarajärvi (cherry picked from commit 049190024909d192dacd9098c557aec7d8264ab1) 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 bc2130bf851..278ab88e1b4 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -130,7 +130,7 @@ Configurations: Template: 'qtci-windows-11_22H2-aarch64-51' Compiler: 'MSVC2022' Features: ['Packaging', 'DebugAndRelease', 'UseConfigure', 'InsignificantTests'] - Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib -c++std c++20 -no-sql-psql' + Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib -c++std c++20 -no-sql-psql -no-opengl' Environment variables: [ 'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_arm64}}\..', 'NON_QTBASE_CMAKE_ARGS=-DFEATURE_native_grpc=OFF -DFEATURE_clangcpp=OFF -DFEATURE_qdoc=OFF', From 9d0caddfc528965e0c7e336f85d7ae91670d27a1 Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Tue, 4 Jun 2024 12:50:03 +0300 Subject: [PATCH 028/288] Drop unnecessary, duplicate builds from dev and '6.8' - We don't need msvc2019 builds; msvc2022 is used from Qt 6.8.0 -> - Drop windows-10_22h2-msvc2019-developer-build and windows-11_23H2-msvc2022-developer-build will be added in separate change - We have windows-11_23H2-llvm so windows-10_22h2-llvm ins't needed - We have windows-11_23H2-mingw13-developer-build so windows-10_22h2-mingw13-developer-build isn't needed Change-Id: Id6c9637a70b7e3f5023c9397619621a27a83dc59 Reviewed-by: Liang Qi (cherry picked from commit b4bcf1e6ca00b2eb7558777ecabf822673178021) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/cmake_platforms.yaml | 103 --------------------- 1 file changed, 103 deletions(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 278ab88e1b4..a643620b089 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -77,30 +77,6 @@ Configurations: 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}' ] -- - Id: 'windows-10_22h2-msvc2019' - Template: 'qtci-windows-10_22H2-x86_64-51' - Compiler: 'MSVC2019' - Features: ['Sccache', "DebugAndRelease", 'UseConfigure'] - 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}}\..', - 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}', - 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_native_grpc=OFF -DINPUT_headersclean=ON', - 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', - ] -- - Id: 'windows-11_23H2-msvc2019' - Template: 'qtci-windows-11_23H2-x86_64-52' - Compiler: 'MSVC2019' - Features: ['Sccache', "DebugAndRelease", 'UseConfigure'] - 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}}\..', - 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_native_grpc=OFF -DINPUT_headersclean=ON', - 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}', - 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', - ] - Id: 'windows-10_22h2-msvc2022' Template: 'qtci-windows-10_22H2-x86_64-51' @@ -136,59 +112,6 @@ Configurations: 'NON_QTBASE_CMAKE_ARGS=-DFEATURE_native_grpc=OFF -DFEATURE_clangcpp=OFF -DFEATURE_qdoc=OFF', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', ] -- - Id: 'windows-10_22h2-msvc2019-developer-build' - Template: 'qtci-windows-10_22H2-x86_64-51' - Compiler: 'MSVC2019' - Features: ['Sccache', "DebugAndRelease", 'WarningsAreErrors', 'UseConfigure'] - Configure arguments: '-debug-and-release -make examples -developer-build -force-debug-info -qt-zlib' - 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}}', - 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE', - 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', - 'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}', - ] -- - Id: 'windows-10_22h2-msvc2019-arm64' - Template: 'qtci-windows-10_22H2-x86_64-51' - Compiler: 'MSVC2019' - Target arch: 'arm64' - Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'UseConfigure'] - Platform dependency: 'windows-10_22h2-msvc2019-developer-build' - Environment variables: [ - 'TARGET_CONFIGURE_ARGS=-debug-and-release -force-debug-info -platform win32-arm64-msvc', - '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_23H2-msvc2019-developer-build' - Template: 'qtci-windows-11_23H2-x86_64-52' - Compiler: 'MSVC2019' - Features: ['Sccache', "DebugAndRelease", 'WarningsAreErrors', 'UseConfigure'] - Configure arguments: '-debug-and-release -make examples -developer-build -force-debug-info -qt-zlib' - 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}}', - 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE', - 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', - 'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}', - ] -- - Id: 'windows-11_23H2-msvc2019-arm64' - Template: 'qtci-windows-11_23H2-x86_64-52' - Compiler: 'MSVC2019' - Target arch: 'arm64' - Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'UseConfigure'] - Platform dependency: 'windows-11_23H2-msvc2019-developer-build' - Environment variables: [ - 'TARGET_CONFIGURE_ARGS=-debug-and-release -force-debug-info -platform win32-arm64-msvc', - 'TARGET_CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON', - 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC_ARM64}} -DQT_DEPLOY_FFMPEG=TRUE', - 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', - ] - Id: 'rhel-8.8' Template: 'qtci-linux-RHEL-8.8-x86_64-50' @@ -256,19 +179,6 @@ Configurations: 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_mingw}}', ] -- - Id: 'windows-10_22h2-llvm' - Template: 'qtci-windows-10_22H2-x86_64-51' - Compiler: 'Clang' - Features: ['Sccache', 'UseConfigure'] - Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples' - Environment variables: [ - 'Path=C:\llvm-mingw\bin;{{.Env.Path}}', - 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c -DMySQL_ROOT={{.Env.ENV_MySQL_ROOT}} -DMySQL_LIBRARY_DIR={{.Env.ENV_MySQL_LIBRARY_DIR}}', - 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_LLVM_MINGW}} -DQT_DEPLOY_FFMPEG=TRUE -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c', - 'LLVM_INSTALL_DIR=C:\llvm-mingw', - 'Protobuf_ROOT={{.Env.Protobuf_ROOT_llvm_mingw}}', - ] - Id: 'windows-11_23H2-llvm' Template: 'qtci-windows-11_23H2-x86_64-52' @@ -282,19 +192,6 @@ Configurations: 'LLVM_INSTALL_DIR=C:\llvm-mingw', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_llvm_mingw}}', ] -- - Id: 'windows-10_22h2-mingw13-developer-build' - Template: 'qtci-windows-10_22H2-x86_64-51' - Compiler: 'Mingw' - Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure'] - Configure arguments: '-developer-build -release -force-debug-info -separate-debug-info -make examples' - Environment variables: [ - 'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}', - 'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c -DMySQL_ROOT={{.Env.ENV_MySQL_ROOT}} -DMySQL_LIBRARY_DIR={{.Env.ENV_MySQL_LIBRARY_DIR}}', - 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}} -DQT_DEPLOY_FFMPEG=TRUE -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c -DFEATURE_native_grpc=OFF', - 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}', - 'Protobuf_ROOT={{.Env.Protobuf_ROOT_mingw}}', - ] - Id: 'windows-11_23H2-mingw13-developer-build' Template: 'qtci-windows-11_23H2-x86_64-52' From 7cc4b3400664ef495ae4c59bf0a9afffc3ce3d15 Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Mon, 27 May 2024 11:47:26 +0200 Subject: [PATCH 029/288] Remove the -c++std c++17 from nightly ubuntu The flag does nothing for ages and the standard is enforced by default. Task-number: QTBUG-125015 Change-Id: I901c0bf58d91cb795d63c4769fb054eee5c5788a Reviewed-by: Joerg Bornemann (cherry picked from commit 9e4c4c5aaba225425568bd3429bca099f03caabc) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/nightly_ubuntu_20.04_c++17.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/nightly_ubuntu_20.04_c++17.yaml b/coin/platform_configs/nightly_ubuntu_20.04_c++17.yaml index 6bbe3739da3..b9d8864e045 100644 --- a/coin/platform_configs/nightly_ubuntu_20.04_c++17.yaml +++ b/coin/platform_configs/nightly_ubuntu_20.04_c++17.yaml @@ -6,7 +6,7 @@ Configurations: Template: 'qtci-linux-Ubuntu-20.04-x86_64-50' Compiler: 'GCC' Features: ['Sccache', 'UseConfigure'] - Configure arguments: '-nomake examples -release -c++std c++17 -force-debug-info -separate-debug-info -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput' + 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', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DFEATURE_clangcpp=OFF -DINPUT_headersclean=ON' From b45c69436f6b29f2069c6738c21434f9c22380c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johanna=20=C3=84ij=C3=A4l=C3=A4?= Date: Mon, 27 May 2024 08:20:36 +0300 Subject: [PATCH 030/288] Provisioning: update java on Ubuntu22.04 x64 to 17 RTA uses Ubuntu22.04 x64 in Android (linux) tests so java version needs to be updated to 17 as it is on RHEL8.8 where the Android binaries are compiled in CI. Change-Id: I1b0f0adfbedea58d3875b700d723db77163ab737 Reviewed-by: Assam Boudjelthia Reviewed-by: Jukka Jokiniva (cherry picked from commit 98b8e35ff507164298b23bfe67a124268c1691d2) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 c43d4027c40..c1902a8377b 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 @@ -142,8 +142,8 @@ installPackages+=(libicu-dev) installPackages+=(zlib1g-dev) installPackages+=(zlib1g) installPackages+=(openjdk-8-jdk) -#Java 11 for Android -installPackages+=(openjdk-11-jdk) +#Java 17 for Android, needed by RTA +installPackages+=(openjdk-17-jdk) installPackages+=(libgtk-3-dev) installPackages+=(ninja-build) installPackages+=(libssl-dev) From 194f4b8d838d5f49f48a3c10130f93a8feeba560 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johanna=20=C3=84ij=C3=A4l=C3=A4?= Date: Tue, 11 Jun 2024 13:40:10 +0300 Subject: [PATCH 031/288] Provisioning: add QNX710 to Windows11 x86_64 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Needed by RTA. Change-Id: I74bac144d66cc005179e06f983d4baa808618a40 Reviewed-by: Matti Paaso Reviewed-by: Tero Heikkinen Reviewed-by: Simo Fält (cherry picked from commit 2764cdef920236ffb987c675f1d59b2cc77f4bfb) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/qtci-windows-11_23H2-x86_64/40-qnx710.ps1 | 1 + 1 file changed, 1 insertion(+) create mode 100644 coin/provisioning/qtci-windows-11_23H2-x86_64/40-qnx710.ps1 diff --git a/coin/provisioning/qtci-windows-11_23H2-x86_64/40-qnx710.ps1 b/coin/provisioning/qtci-windows-11_23H2-x86_64/40-qnx710.ps1 new file mode 100644 index 00000000000..826cc5b2f73 --- /dev/null +++ b/coin/provisioning/qtci-windows-11_23H2-x86_64/40-qnx710.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\qnx710.ps1" From 33eb11474733dd2ed3834e819bcccccaeb8dc582 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Fri, 24 May 2024 12:24:21 +0300 Subject: [PATCH 032/288] COIN:Android: update sha and versions for Gradle caching Update AGP, minSDK and androidx.core versions and qtbase sha. This is needed after Gradle, AGP and minimum Android version bumps done in: * f22e9795d9a32fc4e9f4d6f2a70c2f831028342b (Gradle and AGP) * 841bbbe8ec5eb9c822af4359278f73ae9a6599bb (Android 9 bump) Change-Id: I88d598ab1041847a995c37fc665467a2e9d12ab5 Reviewed-by: Jukka Jokiniva (cherry picked from commit 2e9af73a583955a3a78ef1017a2d9380cc0ba6f2) Reviewed-by: Qt Cherry-pick Bot --- .../common/linux/android/gradle_project/app/build.gradle | 3 ++- .../linux/android/gradle_project/gradle/libs.versions.toml | 4 +++- coin/provisioning/common/linux/android_linux.sh | 2 +- 3 files changed, 6 insertions(+), 3 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 745c08f8eaa..7f6b66acc9a 100644 --- a/coin/provisioning/common/linux/android/gradle_project/app/build.gradle +++ b/coin/provisioning/common/linux/android/gradle_project/app/build.gradle @@ -8,7 +8,7 @@ android { defaultConfig { applicationId "com.example.gradle_project" - minSdk 23 + minSdk 28 targetSdk 34 versionCode 1 versionName "1.0" @@ -21,6 +21,7 @@ android { } dependencies { + implementation libs.core implementation libs.appcompat implementation libs.material } 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 65bc49af902..85d2f8de821 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,10 +1,12 @@ [versions] -agp = "7.4.1" +agp = "8.4.0" +core = "1.13.1" appcompat = "1.6.1" material = "1.11.0" constraintlayout = "2.1.4" [libraries] +core = { group = 'androidx.core', name = "core", version.ref = "core" } appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" } material = { group = "com.google.android.material", name = "material", version.ref = "material" } constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "constraintlayout" } diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index 8d3c0d865f6..7dc6da3d576 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -193,7 +193,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="0d91cc866f2799d56911bcdadabebb137eafcea8" +commit_sha="f22e9795d9a32fc4e9f4d6f2a70c2f831028342b" 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 9657e3970ec44e235b99bd35830aa39e1e105cef Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Mon, 27 May 2024 15:19:25 +0300 Subject: [PATCH 033/288] COIN: rename android multi abi test target to more appropriate name The current name starts with "rhel_8.8" which can be confused with a target on RHEL tests. The new name follows the other Android test targets and make it clear that it's a multi-abi test target. Change-Id: Ie90978ffe949603b75e9a57ef13e26aaa7e033ba Reviewed-by: Alexey Edelev (cherry picked from commit d611cd1985484edf71541f3238c8873fdd5fa7a3) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/linux_android_tests_multi_abi.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/linux_android_tests_multi_abi.yaml b/coin/platform_configs/linux_android_tests_multi_abi.yaml index 95966de6dcb..3477bce542d 100644 --- a/coin/platform_configs/linux_android_tests_multi_abi.yaml +++ b/coin/platform_configs/linux_android_tests_multi_abi.yaml @@ -1,7 +1,7 @@ Version: 2 Configurations: - - Id: 'rhel_8.8_android_multi' + Id: 'android-9-multi-abi' Template: 'qtci-linux-RHEL-8.8-x86_64-50' Target os: 'Android_ANY' Target arch: 'multi' From 657c38f3b5de07ff4f1f23c79a9ce013608de47d Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Tue, 23 Apr 2024 12:12:28 +0300 Subject: [PATCH 034/288] Coin: write multiple lines from bash script with different syntax The current way of using "cat < (cherry picked from commit 695d249f21d60257412fc151264145c49c7a4a18) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/common/linux/android_linux.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index 7dc6da3d576..7fb7bf08c7e 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -125,7 +125,7 @@ SetEnvVar "ANDROID_NDK_HOST" "linux-x86_64" SetEnvVar "ANDROID_API_VERSION" "$sdkApiLevel" # shellcheck disable=SC2129 -cat <>~/versions.txt +cat >>~/versions.txt < Date: Wed, 12 Jun 2024 15:36:19 +0200 Subject: [PATCH 035/288] coin: Update linux SLES Python to 3.12.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I217feaee4071ff06f6fd16a2f3b2111d87ce1862 Reviewed-by: Aku Pietikäinen Reviewed-by: Toni Saario Reviewed-by: Tero Heikkinen (cherry picked from commit 6ab08cfdc49461ade466117fdd173e83c93346bf) Reviewed-by: Qt Cherry-pick Bot --- .../qtci-linux-SLES-15_SP4-x86_64/08-pythondev.sh | 4 ++-- .../qtci-linux-SLES-15_SP5-x86_64/08-pythondev.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/coin/provisioning/qtci-linux-SLES-15_SP4-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-SLES-15_SP4-x86_64/08-pythondev.sh index 74a348475d1..bbe03989473 100755 --- a/coin/provisioning/qtci-linux-SLES-15_SP4-x86_64/08-pythondev.sh +++ b/coin/provisioning/qtci-linux-SLES-15_SP4-x86_64/08-pythondev.sh @@ -18,9 +18,9 @@ source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" # https://raw.githubusercontent.com/linux-on-ibm-z/scripts/master/Python3/build_python3.sh export PACKAGE_NAME="python" python2Version="2.7.18" -python3Version="3.8.16" +python3Version="3.12.3" python2Sha="678d4cf483a1c92efd347ee8e1e79326dc82810b" -python3Sha="d85dbb3774132473d8081dcb158f34a10ccad7a90b96c7e50ea4bb61f5ce4562" +python3Sha="56bfef1fdfc1221ce6720e43a661e3eb41785dd914ce99698d8c7896af4bdaa1" function InstallPython { diff --git a/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/08-pythondev.sh index 79e172eed8a..476c5dc3fc3 100644 --- a/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/08-pythondev.sh +++ b/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/08-pythondev.sh @@ -18,9 +18,9 @@ source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" # https://raw.githubusercontent.com/linux-on-ibm-z/scripts/master/Python3/build_python3.sh export PACKAGE_NAME="python" python2Version="2.7.18" -python3Version="3.8.16" +python3Version="3.12.3" python2Sha="678d4cf483a1c92efd347ee8e1e79326dc82810b" -python3Sha="d85dbb3774132473d8081dcb158f34a10ccad7a90b96c7e50ea4bb61f5ce4562" +python3Sha="56bfef1fdfc1221ce6720e43a661e3eb41785dd914ce99698d8c7896af4bdaa1" function InstallPython { From fc1e3c70847ca5fd811f171dc556c1f60f9f7efb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aku=20Pietik=C3=A4inen?= Date: Tue, 18 Jun 2024 13:50:29 +0300 Subject: [PATCH 036/288] Provisioning: update Java 17 to Ubuntu20.04 x64 Change-Id: I9eec100e11c00c1d984151b09bc1e4dc29f402c1 Reviewed-by: Toni Saario (cherry picked from commit f63db53d98cb003c9b525598c01cc9449bf753c7) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh index fad3dd41a1d..5dfd36f71d2 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh @@ -138,8 +138,8 @@ installPackages+=(libicu-dev) installPackages+=(zlib1g-dev) installPackages+=(zlib1g) installPackages+=(openjdk-8-jdk) -#Java 11 for Android -installPackages+=(openjdk-11-jdk) +#Java 17 for Android +installPackages+=(openjdk-17-jdk) installPackages+=(libgtk-3-dev) installPackages+=(ninja-build) installPackages+=(libssl-dev) From 3b330e86fb79cd66c0b601eaac79eda679a34d8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Fri, 31 May 2024 14:09:45 +0200 Subject: [PATCH 037/288] coin: Pre-check on macOS 14, not macOS 12 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I8aee5caa9cbe89e8f46d73d6c1938ab0e7aae3f8 Reviewed-by: Alexandru Croitor Reviewed-by: Toni Saario (cherry picked from commit 770546eb9cd72be72e17e0b64934d9f983cb8fad) Reviewed-by: Aku Pietikäinen Reviewed-by: Tor Arne Vestbø 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 68d8f9b7d82..e7846ebb734 100644 --- a/coin/platform_configs/precheck.yaml +++ b/coin/platform_configs/precheck.yaml @@ -9,7 +9,7 @@ Include: [ "ios-universal" ], macos.yaml: [ - "macos-12-x86_64-tests", + "macos-14-x86_64-tests", ], cmake_platforms_target_android.yaml: [ "android-arm64-on-macos" From b12fd026dc3b315de9b20691543445619f03e9f9 Mon Sep 17 00:00:00 2001 From: Zoltan Gera Date: Wed, 22 May 2024 11:40:53 +0300 Subject: [PATCH 038/288] Include python venv installation also in Ubuntu 24.04 provisioning The venv package is part of all other Ubuntu and Debian configurations but was left out from the 24.04 one. Change-Id: I1daf2e78ca755cdeef0e6c6e17820badce65bbc3 Reviewed-by: Toni Saario (cherry picked from commit 105074d730c6366571584db6b9b0d618919440ac) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh | 1 + 1 file changed, 1 insertion(+) 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 d8220dd1623..517ca79829a 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 @@ -119,6 +119,7 @@ installPackages+=(g++-multilib-powerpc-linux-gnu) # python3 development package installPackages+=(python3-dev) installPackages+=(python3-pip) +installPackages+=(python3-venv) installPackages+=(virtualenv) installPackages+=(python3-wheel) installPackages+=(python-is-python3) From 0ee71c9edc5362aa51e0e17a6da9595087c611c3 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 27 Jun 2024 15:17:03 +0000 Subject: [PATCH 039/288] Update submodules on '6.8 in qt/qt5' Change-Id: Ic5eb55e3d8c2c9e315a31204852fbb417b87997b 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 0d783504fa7..d28f925af99 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 0d783504fa766e7028f3e503356edaf8d6b0e6b0 +Subproject commit d28f925af99d0e2a5a3b28f1fef4ef42a216476c diff --git a/qt5compat b/qt5compat index 1805c36d908..5e43ef86e50 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 1805c36d908046a7c59b89d6ba274eca647ec624 +Subproject commit 5e43ef86e504d85dade89568e0bbfcbc17dbfd02 diff --git a/qtactiveqt b/qtactiveqt index de177d4c154..fdaaa56fa78 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit de177d4c1549d2694a98ba28140a21ed94791ffa +Subproject commit fdaaa56fa782bea4e179ecf15f311ee9071f60e5 diff --git a/qtbase b/qtbase index ff5b557dfc7..1d4654493f3 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit ff5b557dfc71711e622d89b67a0973ac82553120 +Subproject commit 1d4654493f38dd9bcaff9a34aad11fd13c6b8893 diff --git a/qtcharts b/qtcharts index cd2db87d0d4..95a4f88fd6e 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit cd2db87d0d45869d7142e92bf26cc755db06be4c +Subproject commit 95a4f88fd6eded2a1e4ee58947d6c06ec2af03a4 diff --git a/qtcoap b/qtcoap index 4b8f58a1b9c..153ff1e9ea3 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit 4b8f58a1b9cefa263e729783bcfe15e554ec5c73 +Subproject commit 153ff1e9ea337376c08440377d655f04c26614b7 diff --git a/qtconnectivity b/qtconnectivity index 82fd48738ee..848c1108f9d 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 82fd48738ee9a16ebff90bb5e59b71d523422fcd +Subproject commit 848c1108f9dc444dbb35f5be2d0d059b0d2a4a95 diff --git a/qtdatavis3d b/qtdatavis3d index d92f6d7c3ad..de0bfdd8874 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit d92f6d7c3ad98827e859e3241dc487fd61919318 +Subproject commit de0bfdd887420cc8d73a61a78230af9dab1b21ca diff --git a/qtdeclarative b/qtdeclarative index d021fd7cb13..8206b9b4b15 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit d021fd7cb13491ad30e52fd6ebbdb655860bf045 +Subproject commit 8206b9b4b159c9a0244ff4f92d4c3bb8fad13c1c diff --git a/qtdoc b/qtdoc index 9f3ef8c9918..64724264104 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 9f3ef8c9918157f68bd8ad38f189e4eabf7f5b99 +Subproject commit 64724264104247f8a71e38708872b9abe9cc3267 diff --git a/qtgraphs b/qtgraphs index 2fa0a4c3a28..67a630118e8 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit 2fa0a4c3a285525850799668ecfd882c25c44453 +Subproject commit 67a630118e8e28f094a98b477ce861fa40b8592b diff --git a/qtgrpc b/qtgrpc index 516f47b2625..2a4a3cc32ed 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit 516f47b2625e035c4e065573666e4fd6ab7bbe14 +Subproject commit 2a4a3cc32eddf65848edeeff3b19a80a3099a07a diff --git a/qthttpserver b/qthttpserver index 50bee1ffeb7..c625ff02c87 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit 50bee1ffeb712c7664b2e799b1a6b2175104e7e6 +Subproject commit c625ff02c87b1a10dc362a77da1c1d48ff1db70a diff --git a/qtimageformats b/qtimageformats index f7ab488b788..4de45bfe7e2 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit f7ab488b78804d06178ce15326585290638dad4c +Subproject commit 4de45bfe7e23477c82627058a44812b0a574e3c1 diff --git a/qtlanguageserver b/qtlanguageserver index 8ff611c21c4..7255560550d 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit 8ff611c21c4c2fcef3245283895ca1a19ec5d303 +Subproject commit 7255560550db16145ad182c1f3f086f8a1b60e2d diff --git a/qtlocation b/qtlocation index d3532313795..d9223b82078 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit d3532313795a5fe41a9f5622c8e4f0ff87330c92 +Subproject commit d9223b820780f567f5c53f7a3c7e03be15288171 diff --git a/qtlottie b/qtlottie index 7121c867c66..9455c19ef89 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 7121c867c66613712dbe4554805b634f17d24469 +Subproject commit 9455c19ef8915e06a8db45efac16189e6a013771 diff --git a/qtmqtt b/qtmqtt index a07748987a7..f7746dad1de 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit a07748987a72d5a0009bc2a039e57f9793606da2 +Subproject commit f7746dad1de75194652be7ad10de48b1d6d35f4b diff --git a/qtmultimedia b/qtmultimedia index ffd0f670ad4..6b3f4e935b0 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit ffd0f670ad4732a1502f2f453b5931586d793aa6 +Subproject commit 6b3f4e935b0cb908401b8235fdfb26d0bc7b1c92 diff --git a/qtnetworkauth b/qtnetworkauth index 489694f3d1c..b18fba5da94 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 489694f3d1c967b621659077fea701cee9d930d6 +Subproject commit b18fba5da94677a6e2f1f25aa87998200336f83f diff --git a/qtopcua b/qtopcua index 1d64b3a164c..2ba5881f1e2 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit 1d64b3a164c73865147ddc5f6ce1a3059f26c19e +Subproject commit 2ba5881f1e2de4abaf23c0139cd50173c68f366a diff --git a/qtpositioning b/qtpositioning index 49731b3ba22..5a12dc643d4 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit 49731b3ba22a38ab3a433fdb83f087896fb8d315 +Subproject commit 5a12dc643d425e96d19f6a543f7c6c51a01aa857 diff --git a/qtquick3d b/qtquick3d index 19e7e033eb1..e46704d25da 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 19e7e033eb12ae26fabb80c6065b5b3e7843c772 +Subproject commit e46704d25daec379912e6d5b0f6e20cce28ec0e2 diff --git a/qtquick3dphysics b/qtquick3dphysics index cee2053697c..22ca81a680e 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit cee2053697c4c549eac6bd323f1a5becdf556abf +Subproject commit 22ca81a680e2562e3a65bc61aa0c3f9500867f2c diff --git a/qtquickeffectmaker b/qtquickeffectmaker index d2a125953c7..b22b12406db 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit d2a125953c7a5d55a03b8f7a4bffb160febe8d1c +Subproject commit b22b12406dbae9de2260923c38f7fafe37660411 diff --git a/qtquicktimeline b/qtquicktimeline index b49a99a9191..20ee8c79db8 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit b49a99a9191d97084e304f982bd6ffd49b7ed31b +Subproject commit 20ee8c79db81f965f5d18fa264e7fe182618d417 diff --git a/qtremoteobjects b/qtremoteobjects index 85bf2901026..181801a3499 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 85bf29010269def185df035cbd323e830d54977e +Subproject commit 181801a3499f9d2129401fb1144b7b59a7b702a1 diff --git a/qtrepotools b/qtrepotools index 141876182b9..e2839f90926 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 141876182b9431a7f847f877188bd5e1c0407dea +Subproject commit e2839f90926befcb013f92f291dcf2f8dc327b54 diff --git a/qtscxml b/qtscxml index eaa266b1e8b..df7b7d4a5e9 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit eaa266b1e8b1327af33c2e709567279ff9732d6c +Subproject commit df7b7d4a5e9035a1bcc1ffd4495c8c2f54360405 diff --git a/qtsensors b/qtsensors index ffe4ec842f7..c5ca23d3d9d 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit ffe4ec842f7f55f4c46b027093cfe1de7bd11f8b +Subproject commit c5ca23d3d9d44109d80004bb83ee9b56a633d81f diff --git a/qtserialbus b/qtserialbus index 33f7132b848..96c9b160177 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 33f7132b848926a82c83074477067f157b0e487f +Subproject commit 96c9b160177a6e79ff512cffded462ee633ecc1a diff --git a/qtserialport b/qtserialport index 67f75d0ea7c..2db5aa6bc6c 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 67f75d0ea7ce22e4fc3df9788bf6abe3ec347d3b +Subproject commit 2db5aa6bc6c6d823108a5eef7d1efd5ffc077215 diff --git a/qtshadertools b/qtshadertools index a4feba199c9..fbb76ed94fc 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit a4feba199c96de203303598dd73b17021d5ffed8 +Subproject commit fbb76ed94fcd42cd1eabeb725538d518a10e79d9 diff --git a/qtspeech b/qtspeech index fa723130940..8534fd97c9c 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit fa7231309408497efe2f17f2a43cbb2e8e7d799c +Subproject commit 8534fd97c9c48840892a60af8753546090d0c98a diff --git a/qtsvg b/qtsvg index 68ac46df88a..0a87561dcfb 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 68ac46df88ad1e47fec7c36fdeca5ba0b5d79365 +Subproject commit 0a87561dcfb1a944b424c9b2b18d9a4d0379407f diff --git a/qttools b/qttools index 407ff594b7b..df2a2fc4c6b 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 407ff594b7b4be74731f3e3a5b265b8f073d517a +Subproject commit df2a2fc4c6b32ad6203a6c90222dd9051c2f1ba5 diff --git a/qttranslations b/qttranslations index 1e3f12cc30c..70c571ccc42 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 1e3f12cc30c6641f510b0db2e751a6a3a5f592db +Subproject commit 70c571ccc428502106b46c27e33cb868633910dc diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 8b71af04114..593856fe1b0 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 8b71af041146bea562e6f713d8870e930e7800fc +Subproject commit 593856fe1b054200a70f0a1cdf607e7ae89b9e13 diff --git a/qtwayland b/qtwayland index 36adbdb7d4c..d5bcd0bb242 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 36adbdb7d4c81432e75bdc6d34a13a165d69a7d0 +Subproject commit d5bcd0bb2426562020ccf52caa454e92ddad2a17 diff --git a/qtwebchannel b/qtwebchannel index e432e4c05cc..4579fb731a4 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit e432e4c05cc94d1e35b74b832c71109340b75a3d +Subproject commit 4579fb731a4954633e4398477896bbf6968c34bc diff --git a/qtwebengine b/qtwebengine index 3439cacdbf7..2d053c4fd0a 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 3439cacdbf76cbd52fd5328aef126ba51914f5a7 +Subproject commit 2d053c4fd0a58500090434c4c6ffa818035d6ec0 diff --git a/qtwebsockets b/qtwebsockets index 9301eb8234e..f7a768763bb 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 9301eb8234ef1f0c4e98eddb99c864659f9ded5c +Subproject commit f7a768763bb50cf61a03e3fcdac3430b3c3e6d60 diff --git a/qtwebview b/qtwebview index cd68b2e6863..e9b81473191 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit cd68b2e6863aa4e9d6a4c6e9cf21be99ebd936fd +Subproject commit e9b81473191c1c050880e6ae69b0d379dfa48c44 From d8f8c02ae40797b0cb3e5f95501c53e1c2b67a37 Mon Sep 17 00:00:00 2001 From: Elias Toivola Date: Tue, 18 Jun 2024 11:18:03 +0300 Subject: [PATCH 040/288] Provisioning: Update MQTT broker MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There's a certificate issue in Paho MQTT which should be fixed in the latest paho.mqtt.testing branch. Pick-to: 6.7 6.5 6.2 Task-number: QTBUG-126364 Change-Id: I1550122939ea8e6172dba005752978fcf3232fcb Reviewed-by: Jukka Jokiniva Reviewed-by: Maurice Kalinowski (cherry picked from commit ea425ca764fa178d87f4a607a518cd34f8470700) Reviewed-by: Aku Pietikäinen --- coin/provisioning/common/unix/mqtt_broker.sh | 4 ++-- coin/provisioning/common/windows/mqtt_broker.ps1 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/coin/provisioning/common/unix/mqtt_broker.sh b/coin/provisioning/common/unix/mqtt_broker.sh index d3cce755ec6..47b3944a37e 100755 --- a/coin/provisioning/common/unix/mqtt_broker.sh +++ b/coin/provisioning/common/unix/mqtt_broker.sh @@ -8,10 +8,10 @@ source "${BASH_SOURCE%/*}/InstallFromCompressedFileFromURL.sh" source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -CommitSHA="2873885d7e840b4e06483f36f170c609eb30527d" +CommitSHA="9d7bb80bb8b9d9cfc0b52f8cb4c1916401281103" PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/mqtt_broker/paho.mqtt.testing-$CommitSHA.zip" AltUrl="https://github.com/eclipse/paho.mqtt.testing/archive/$CommitSHA.zip" -SHA1="1fcc4e61b12f11a1421cc8c3f379276d732e62b7" +SHA1="c31cfd5de9329dcd25e28b306f94dccf632cc318" targetFolder="/opt/paho_broker" appPrefix="paho.mqtt.testing-$CommitSHA" diff --git a/coin/provisioning/common/windows/mqtt_broker.ps1 b/coin/provisioning/common/windows/mqtt_broker.ps1 index 4161ddeab4d..d59ada3f7cd 100644 --- a/coin/provisioning/common/windows/mqtt_broker.ps1 +++ b/coin/provisioning/common/windows/mqtt_broker.ps1 @@ -5,8 +5,8 @@ Write-Host "MQTT: Downloading Paho test broker..." $zip = Get-DownloadLocation "pahotest.zip" -$commitSHA = "20bad2475c27a6e1d24a56d90a9fceb40963261e" -$sha1 = "a0ac88715c2aebb9573a113dc13925a90da19233" +$commitSHA = "9d7bb80bb8b9d9cfc0b52f8cb4c1916401281103" +$sha1 = "c31cfd5de9329dcd25e28b306f94dccf632cc318" $internalUrl = "http://ci-files01-hki.ci.qt.io/input/mqtt_broker/paho.mqtt.testing-$commitSHA.zip" $externalUrl = "https://github.com/eclipse/paho.mqtt.testing/archive/$commitSHA.zip" From 9d69572e74c0e4d07d475b1842d99cd93b33978b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Tue, 18 Jun 2024 10:08:32 +0300 Subject: [PATCH 041/288] Provisioning: Add retry for disabling Spotlight indexing Task-number: QTQAINFRA-5996 Change-Id: I6c85816f7b490fbb2423cbf7d0efe862056bc001 Reviewed-by: Toni Saario (cherry picked from commit f9bb6b202ac1087891e0e3469c8094f4567f1bc4) Reviewed-by: Qt Cherry-pick Bot --- .../common/macos/disable_spotlight.sh | 33 +++++++++++++++---- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/coin/provisioning/common/macos/disable_spotlight.sh b/coin/provisioning/common/macos/disable_spotlight.sh index a404d3e738d..b4907ca0d65 100755 --- a/coin/provisioning/common/macos/disable_spotlight.sh +++ b/coin/provisioning/common/macos/disable_spotlight.sh @@ -2,10 +2,29 @@ # 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 -# Disable spotlight and and stop indexing -sudo mdutil -a -i off -sudo mdutil -a -i off / -# Disable spotlight indexing /Volumes -sudo mdutil -i off /Volumes -# Erase spotlight index -sudo mdutil -E / +disableSpotlight() { + # Disable spotlight and and stop indexing + sudo mdutil -a -i off + sudo mdutil -a -i off / + # Disable spotlight indexing /Volumes + sudo mdutil -i off /Volumes + # Erase spotlight index + sudo mdutil -E / +} + +# Disabling spotlight tends to be flaky, add some retry +for i in $(seq 1 5) +do + disableSpotlight + res=$? + if [[ $res -eq 0 ]] + then + echo "Spotlight disabled" + break + else + echo "Failed to disable spotlight, $i retry..." + sleep 2 + fi +done + +exit $res From 398a8aa1510de823463948cabdadbc9a70740ba3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Thu, 6 Jun 2024 16:02:18 +0200 Subject: [PATCH 042/288] coin: Set TCC permissions for macOS 12 and 13 ARM VMs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTBUG-126119 Task-number: QTBUG-125389 Change-Id: I9433765308aad17c073b887c4efbcc5c6e4dd623 Reviewed-by: Jøger Hansegård Reviewed-by: Aku Pietikäinen Reviewed-by: Artem Dyomin Reviewed-by: Volker Hilsheimer Reviewed-by: Pavel Dubsky (cherry picked from commit 76d2f6f9476ac6ecfc61deaf4b65f6fd8a89f641) Reviewed-by: Qt Cherry-pick Bot --- .../qtci-macos-12-arm/01-set_tcc_permissions.sh | 6 ++++++ .../qtci-macos-13-arm/01-set_tcc_permissions.sh | 6 ++++++ 2 files changed, 12 insertions(+) create mode 100755 coin/provisioning/qtci-macos-12-arm/01-set_tcc_permissions.sh create mode 100755 coin/provisioning/qtci-macos-13-arm/01-set_tcc_permissions.sh diff --git a/coin/provisioning/qtci-macos-12-arm/01-set_tcc_permissions.sh b/coin/provisioning/qtci-macos-12-arm/01-set_tcc_permissions.sh new file mode 100755 index 00000000000..da38f582c40 --- /dev/null +++ b/coin/provisioning/qtci-macos-12-arm/01-set_tcc_permissions.sh @@ -0,0 +1,6 @@ +#!/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/macos/set_tcc_permissions.sh" diff --git a/coin/provisioning/qtci-macos-13-arm/01-set_tcc_permissions.sh b/coin/provisioning/qtci-macos-13-arm/01-set_tcc_permissions.sh new file mode 100755 index 00000000000..da38f582c40 --- /dev/null +++ b/coin/provisioning/qtci-macos-13-arm/01-set_tcc_permissions.sh @@ -0,0 +1,6 @@ +#!/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/macos/set_tcc_permissions.sh" From 92ce5a7b99933f3629c3d2830730b10fef6c2971 Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Mon, 27 May 2024 18:11:11 +0200 Subject: [PATCH 043/288] Fix the support of the '-verbose' argument in configure script Init repository logic eats the '-verbose' argument as the one that is handled by internal init repository logic. The argument is also a valid argument for configure script. Introduce the 'COMMON' argument for of the qt_ir_commandline_option macro. The argument indicates that the option is applicable for both configure and init-repository scripts. This is implemented only for boolean arguments. The '-verbose' argument adopted the new feature. Pick-to: 6.7 Change-Id: I5cb76502c8ecccccf3546fd7f7f111fe25700d0a Reviewed-by: Alexandru Croitor (cherry picked from commit 780c780763ad9cda04334947cc0c27c5676aa51f) Reviewed-by: Qt Cherry-pick Bot --- cmake/QtIRCommandLineHelpers.cmake | 20 +++++++++++++++++++- cmake/QtIROptionsHelpers.cmake | 2 +- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/cmake/QtIRCommandLineHelpers.cmake b/cmake/QtIRCommandLineHelpers.cmake index 65c5d6aabb6..dbd67332ddd 100644 --- a/cmake/QtIRCommandLineHelpers.cmake +++ b/cmake/QtIRCommandLineHelpers.cmake @@ -59,7 +59,7 @@ endfunction() # Helper macro to parse the arguments for the command line options. macro(qt_ir_commandline_option_parse_arguments) - set(options UNSUPPORTED) + set(options UNSUPPORTED COMMON) set(oneValueArgs TYPE NAME SHORT_NAME ALIAS VALUE DEFAULT_VALUE) set(multiValueArgs VALUES MAPPING) cmake_parse_arguments(arg "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) @@ -81,6 +81,7 @@ endmacro() # same value when retrieved. # DEFAULT_VALUE - the default value to be set for the option when it's not specified # on the command line +# COMMON - the argument is common for init-repository and configure scripts # # NOTE: Make sure to update the SHORT_NAME code path when adding new options. function(qt_ir_commandline_option_helper name) @@ -97,6 +98,14 @@ function(qt_ir_commandline_option_helper name) set(commandline_known_options "${commandline_known_options};${name}" PARENT_SCOPE) + if(arg_COMMON) + set(commandline_option_${name}_common "true" PARENT_SCOPE) + if(NOT "${arg_TYPE}" STREQUAL "boolean") + message(FATAL_ERROR "${name} is '${arg_TYPE}', but COMMON arguments can be" + " 'boolean' only.") + endif() + endif() + set(commandline_option_${name}_type "${arg_TYPE}" PARENT_SCOPE) if(NOT "${arg_VALUE}" STREQUAL "") @@ -140,6 +149,11 @@ macro(qt_ir_commandline_option name) set(unsupported "${arg_UNSUPPORTED}") endif() + set(common "") + if(arg_COMMON) + set(common "COMMON") + endif() + qt_ir_commandline_option_helper("${arg_SHORT_NAME}" TYPE "${arg_TYPE}" ALIAS "${name}" @@ -148,6 +162,7 @@ macro(qt_ir_commandline_option name) MAPPING ${arg_MAPPING} DEFAULT_VALUE ${arg_DEFAULT_VALUE} ${unsupported} + ${common} ) endif() endmacro() @@ -323,6 +338,9 @@ function(qt_ir_process_args_from_optfile optfile_path) qt_ir_append_unknown_args("${arg}") continue() endif() + elseif(commandline_option_${opt}_common AND arg_IGNORE_UNKNOWN_ARGS) + message(DEBUG "Common command line option '${arg}'. Collecting.") + qt_ir_append_unknown_args("${arg}") endif() if(NOT COMMAND "qt_ir_commandline_${type}") diff --git a/cmake/QtIROptionsHelpers.cmake b/cmake/QtIROptionsHelpers.cmake index d87c7463a84..496ec42bdf7 100644 --- a/cmake/QtIROptionsHelpers.cmake +++ b/cmake/QtIROptionsHelpers.cmake @@ -29,7 +29,7 @@ macro(qt_ir_set_known_command_line_options) qt_ir_commandline_option(quiet SHORT_NAME q TYPE boolean) qt_ir_commandline_option(resolve-deps TYPE boolean DEFAULT_VALUE yes) qt_ir_commandline_option(update TYPE boolean DEFAULT_VALUE yes) - qt_ir_commandline_option(verbose TYPE boolean) + qt_ir_commandline_option(verbose TYPE boolean COMMON) # These are used when init-repository is called from configure. qt_ir_commandline_option(from-configure TYPE boolean) From a56512b45bc9a7240158d5154549b5fef1446f1a Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Mon, 27 May 2024 18:40:19 +0200 Subject: [PATCH 044/288] Fix the UNSUPPORTED argument handling in qt_ir_commandline_option Set the argument name but not it's value in SHORT_NAME condition. It works currently since the argument is visible from upper scope. Pick-to: 6.7 Change-Id: Ie470a256f4735aeac5f50f0e6e5d17e2bb274ba2 Reviewed-by: Alexandru Croitor (cherry picked from commit f83837ec29e54d2fbdcba26753124c7f98cdd7cc) Reviewed-by: Qt Cherry-pick Bot --- cmake/QtIRCommandLineHelpers.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/QtIRCommandLineHelpers.cmake b/cmake/QtIRCommandLineHelpers.cmake index dbd67332ddd..d3569dd7f6e 100644 --- a/cmake/QtIRCommandLineHelpers.cmake +++ b/cmake/QtIRCommandLineHelpers.cmake @@ -146,7 +146,7 @@ macro(qt_ir_commandline_option name) AND "${commandline_option_${arg_SHORT_NAME}_type}" STREQUAL "") set(unsupported "") if(arg_UNSUPPORTED) - set(unsupported "${arg_UNSUPPORTED}") + set(unsupported "UNSUPPORTED") endif() set(common "") From 91c649c20e0833e068e18ee321e10893884b0dc3 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Fri, 21 Jun 2024 14:44:25 +0200 Subject: [PATCH 045/288] COIN: Fix sccache installation on ARM Macs Install the ARM sccache binary to fix /usr/local/sccache/sccache: Bad CPU type in executable Pick-to: 6.7 Change-Id: I033a7c8cf88d0d1ad35a4406a5d2a878da8d17a7 Reviewed-by: Toni Saario (cherry picked from commit c872c35cc6d973d31491c0817676a595802eb201) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/common/macos/sccache.sh | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/common/macos/sccache.sh b/coin/provisioning/common/macos/sccache.sh index 85c4aee294b..7896edb6601 100755 --- a/coin/provisioning/common/macos/sccache.sh +++ b/coin/provisioning/common/macos/sccache.sh @@ -6,7 +6,12 @@ set -ex source "${BASH_SOURCE%/*}/../unix/sccache.sh" -targetArch=x86_64-apple-darwin targetVersion=0.2.14 -sha1=764bc1664c0ff616d9980a6d127175d0a2041781 +if [[ `arch` == arm* ]]; then + targetArch=aarch64-apple-darwin + sha1=ad10cd4b8889fa08e193a4165ac664876a27c0dc +else + targetArch=x86_64-apple-darwin + sha1=764bc1664c0ff616d9980a6d127175d0a2041781 +fi installSccache "$targetArch" "$targetVersion" "$sha1" From c98282cb03d236a3820d0c1ce374cbc4dbcebd9d Mon Sep 17 00:00:00 2001 From: Timur Pocheptsov Date: Tue, 26 Mar 2024 13:36:40 +0100 Subject: [PATCH 046/288] Update provisioning script to build FFmpeg as dynamic libs Previously, iOS (where we mostly using static linking) was also using FFmpeg built as static libs, now switch to dynamic libraries, as it was already done for macOS. Requires changes in cmake file in qtmultimedia in order to configure with -DQT_DEPLOY_FFMPEG=TRUE. Fixes: QTBUG-120991 Change-Id: I0b014f24db3127697b76c6d1774437faae64a7c8 Reviewed-by: Timur Pocheptsov --- coin/platform_configs/cmake_platforms.yaml | 2 +- .../common/unix/install-ffmpeg-ios.sh | 36 +++++++++++++++++-- 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index a643620b089..da3a304d229 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -164,7 +164,7 @@ Configurations: Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests', 'UseConfigure', 'WarningsAreErrors'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-debug-and-release -nomake examples -platform macx-ios-clang', - 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include -DFFMPEG_DIR={{.Env.FFMPEG_DIR_IOS}}' + 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include -DFFMPEG_DIR={{.Env.FFMPEG_DIR_IOS}} -DQT_DEPLOY_FFMPEG=TRUE', ] - Id: 'windows-10_22h2-mingw13' diff --git a/coin/provisioning/common/unix/install-ffmpeg-ios.sh b/coin/provisioning/common/unix/install-ffmpeg-ios.sh index d8238294b44..49889c78979 100755 --- a/coin/provisioning/common/unix/install-ffmpeg-ios.sh +++ b/coin/provisioning/common/unix/install-ffmpeg-ios.sh @@ -61,6 +61,9 @@ build_ffmpeg_ios() { --extra-cflags="$minos" \ --extra-cxxflags="$minos" \ --enable-cross-compile \ + --enable-shared \ + --disable-static \ + --install-name-dir='@rpath/Frameworks' \ --enable-swscale \ --enable-pthreads \ --disable-audiotoolbox @@ -69,8 +72,37 @@ 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 + echo "LS done." +} + build_ffmpeg_ios "x86_64" build_ffmpeg_ios "arm64" -sudo "${BASH_SOURCE%/*}/../macos/makeuniversal.sh" "$ffmpeg_source_dir/build_ios/x86_64/installed" "$ffmpeg_source_dir/build_ios/arm64/installed" -SetEnvVar "FFMPEG_DIR_IOS" $prefix +install_ffmpeg "$ffmpeg_source_dir/build_ios/x86_64/installed" "$ffmpeg_source_dir/build_ios/arm64/installed" +SetEnvVar "FFMPEG_DIR_IOS" $prefix From 90c88a451f13de8c5b1beddd0d231f008470d1a1 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Thu, 16 May 2024 12:30:43 +0200 Subject: [PATCH 047/288] coin: Add python packages to allow validating Qt generated SBOM files Add a sbom_requirements.txt file and install it using the various platform specific pip installations. Partially restores b87b44168cc5ab3b11b03c1015022d69763745a9 but without the wheel cache. Task-number: QTBUG-122899 Change-Id: I8002898866acbc226ffebb59dcf5b3a58237ea34 Reviewed-by: Toni Saario (cherry picked from commit 1f2fb6312c1a8c92ab6700faa785e046aca2ecf9) --- coin/provisioning/common/macos/python3.sh | 1 + coin/provisioning/common/shared/sbom_requirements.txt | 5 +++++ coin/provisioning/common/windows/python3.ps1 | 6 ++++++ coin/provisioning/qtci-linux-Debian-11.6-aarch64/02-apt.sh | 2 ++ .../qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh | 2 ++ .../qtci-linux-RHEL-9.2-x86_64/04-install-packages.sh | 2 ++ .../qtci-linux-SLES-15_SP5-x86_64/08-pythondev.sh | 1 + coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh | 1 + coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh | 3 +++ .../qtci-linux-openSUSE-15.5-x86_64/08-pythondev.sh | 1 + coin/provisioning/qtci-macos-12-arm/25-python.sh | 1 + coin/provisioning/qtci-macos-13-arm/25-python.sh | 1 + coin/provisioning/qtci-macos-14-arm/25-python.sh | 1 + 13 files changed, 27 insertions(+) create mode 100644 coin/provisioning/common/shared/sbom_requirements.txt diff --git a/coin/provisioning/common/macos/python3.sh b/coin/provisioning/common/macos/python3.sh index 925a4925f14..cbc9d58188b 100755 --- a/coin/provisioning/common/macos/python3.sh +++ b/coin/provisioning/common/macos/python3.sh @@ -26,6 +26,7 @@ echo "Configure pip" /Library/Frameworks/Python.framework/Versions/3.9/bin/pip config --user set global.extra-index-url https://pypi.org/simple/ /Library/Frameworks/Python.framework/Versions/3.9/bin/pip3 install virtualenv wheel html5lib +/Library/Frameworks/Python.framework/Versions/3.9/bin/pip3 install -r ${BASH_SOURCE%/*}/../shared/sbom_requirements.txt SetEnvVar "PYTHON3_PATH" "/Library/Frameworks/Python.framework/Versions/3.9/bin" SetEnvVar "PIP3_PATH" "/Library/Frameworks/Python.framework/Versions/3.9/bin" diff --git a/coin/provisioning/common/shared/sbom_requirements.txt b/coin/provisioning/common/shared/sbom_requirements.txt new file mode 100644 index 00000000000..0c72d654beb --- /dev/null +++ b/coin/provisioning/common/shared/sbom_requirements.txt @@ -0,0 +1,5 @@ +# Python packages used to validate and audit Qt SBOM informaiton +spdx-tools>=0.8.0 +ntia-conformance-checker +sbomaudit +sbom2doc diff --git a/coin/provisioning/common/windows/python3.ps1 b/coin/provisioning/common/windows/python3.ps1 index 46f75d7c54c..13637c6cb0d 100644 --- a/coin/provisioning/common/windows/python3.ps1 +++ b/coin/provisioning/common/windows/python3.ps1 @@ -78,6 +78,12 @@ Run-Executable "$install_path\python.exe" "-m pip config --user set global.index Run-Executable "$install_path\python.exe" "-m pip config --user set global.extra-index-url https://pypi.org/simple/" Run-Executable "$install_path\Scripts\pip3.exe" "$pip_args install virtualenv wheel html5lib" +# Check if python version is higher than 3.8. +# ntia-conformance-checker requires at least 3.8 +if ([version]::Parse($version) -gt [version]::Parse("3.8")) { + Run-Executable "$install_path\Scripts\pip3.exe" "$pip_args install -r $PSScriptRoot\..\shared\sbom_requirements.txt" +} + # Install PyPDF2 for QSR documentation Run-Executable "$install_path\Scripts\pip3.exe" "$pip_args install PyPDF2" 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 e2f6af9590f..2809cf18915 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 @@ -258,6 +258,8 @@ sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install cmake apt-cacher-ng -t # Disable keyring password prompt keyring --disable +pip install --user -r "${BASH_SOURCE%/*}/../common/shared/sbom_requirements.txt" + # SetEnvVar "PATH" "/usr/lib/nodejs-mozilla/bin:\$PATH" #OpenSSLVersion="$(openssl version |cut -b 9-14)" 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 4a6eae08be4..8b7b619f574 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 @@ -166,9 +166,11 @@ sudo pip config --user set global.extra-index-url https://pypi.org/simple/ sudo pip3 install virtualenv wheel # Just make sure we have virtualenv to run with python3.8 -m virtualenv sudo python3.11 -m pip install virtualenv wheel +sudo python3.11 -m pip install -r "${BASH_SOURCE%/*}/../common/shared/sbom_requirements.txt" 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 OpenSSLVersion="$(openssl3 version |cut -b 9-14)" echo "System's 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 cd0c09324e2..f125b5f4075 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 @@ -178,8 +178,10 @@ sudo pip config --user set global.extra-index-url https://pypi.org/simple/ sudo pip3 install virtualenv wheel # Just make sure we have virtualenv to run with python3.8 -m virtualenv sudo python -m pip install virtualenv wheel +sudo python -m pip install -r "${BASH_SOURCE%/*}/../common/shared/sbom_requirements.txt" sudo /usr/bin/pip3 install wheel +sudo /usr/bin/pip3 install -r "${BASH_SOURCE%/*}/../common/shared/sbom_requirements.txt" # Make FindPython3.cmake to find python3 sudo ln -s /usr/bin/python3 /usr/local/bin/python3 diff --git a/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/08-pythondev.sh index 476c5dc3fc3..79d0f1b2a18 100644 --- a/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/08-pythondev.sh +++ b/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/08-pythondev.sh @@ -71,6 +71,7 @@ python3 --version | grep -F "$python3Version" pip3 install --user wheel pip3 install --user virtualenv +pip3 install --user -r "${BASH_SOURCE%/*}/../common/shared/sbom_requirements.txt" # shellcheck source=../common/unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" 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 c1902a8377b..f3e22dc6611 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 @@ -247,6 +247,7 @@ sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y -o DPkg::Lock::Timeout=300 ins # Configure pip pip config --user set global.index https://ci-files01-hki.ci.qt.io/input/python_module_cache pip config --user set global.extra-index-url https://pypi.org/simple/ +pip install --user -r "${BASH_SOURCE%/*}/../common/shared/sbom_requirements.txt" source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" # SetEnvVar "PATH" "/usr/lib/nodejs-mozilla/bin:\$PATH" 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 517ca79829a..0f939663fc3 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 @@ -237,6 +237,9 @@ sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y -o DPkg::Lock::Timeout=300 ins # Configure pip pip config --user set global.index https://ci-files01-hki.ci.qt.io/input/python_module_cache pip config --user set global.extra-index-url https://pypi.org/simple/ +# Ubuntu 24.04 comes with a newer pip that disallows installing into the system site-packages, +# so we explicitly ask it to allow it. +pip install --user -r "${BASH_SOURCE%/*}/../common/shared/sbom_requirements.txt" --break-system-packages source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" # SetEnvVar "PATH" "/usr/lib/nodejs-mozilla/bin:\$PATH" diff --git a/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/08-pythondev.sh index 82101c9ba91..7f7d867ae47 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/08-pythondev.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/08-pythondev.sh @@ -14,5 +14,6 @@ sudo zypper -nq install python-devel python-xml # install python3 sudo zypper -nq install python311-base python311-devel python311-pip python311-virtualenv python311-wheel python3.11 -m pip install selenium netifaces scache webdriver-manager +python3.11 -m pip install -r "${BASH_SOURCE%/*}/../common/shared/sbom_requirements.txt" SetEnvVar "PYTHON3_EXECUTABLE" "/usr/bin/python3.11" diff --git a/coin/provisioning/qtci-macos-12-arm/25-python.sh b/coin/provisioning/qtci-macos-12-arm/25-python.sh index 9bfb6384b8b..0e05f593a7e 100755 --- a/coin/provisioning/qtci-macos-12-arm/25-python.sh +++ b/coin/provisioning/qtci-macos-12-arm/25-python.sh @@ -11,6 +11,7 @@ source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" pyenv install 3.9.7 /Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user install virtualenv wheel html5lib +/Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user -r ${BASH_SOURCE%/*}/../common/shared/sbom_requirements.txt SetEnvVar "PYTHON3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/" SetEnvVar "PIP3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/" diff --git a/coin/provisioning/qtci-macos-13-arm/25-python.sh b/coin/provisioning/qtci-macos-13-arm/25-python.sh index 9bfb6384b8b..0e05f593a7e 100755 --- a/coin/provisioning/qtci-macos-13-arm/25-python.sh +++ b/coin/provisioning/qtci-macos-13-arm/25-python.sh @@ -11,6 +11,7 @@ source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" pyenv install 3.9.7 /Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user install virtualenv wheel html5lib +/Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user -r ${BASH_SOURCE%/*}/../common/shared/sbom_requirements.txt SetEnvVar "PYTHON3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/" SetEnvVar "PIP3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/" diff --git a/coin/provisioning/qtci-macos-14-arm/25-python.sh b/coin/provisioning/qtci-macos-14-arm/25-python.sh index 5a0df739559..761fcf01732 100755 --- a/coin/provisioning/qtci-macos-14-arm/25-python.sh +++ b/coin/provisioning/qtci-macos-14-arm/25-python.sh @@ -11,6 +11,7 @@ source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" pyenv install 3.9.7 /Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user install virtualenv wheel html5lib +/Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user -r ${BASH_SOURCE%/*}/../common/shared/sbom_requirements.txt SetEnvVar "PYTHON3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/" SetEnvVar "PIP3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/" From af77e84b885ceb9583df80cb33aebd8349883a9e Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Tue, 11 Jun 2024 10:31:11 +0200 Subject: [PATCH 048/288] provisioning: install locales-all package for Ubuntu 24.04 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit tst_qfloat16format needs that. Fixes: QTQAINFRA-6390 Change-Id: I53aefba241de614f3a9e141158e67006718a030a Reviewed-by: Simo Fält Reviewed-by: Tero Heikkinen Reviewed-by: Ivan Solovev (cherry picked from commit fa72ab35f95dcdec95620a8d23ac915ee8ca24f1) Reviewed-by: Liang Qi --- coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh | 2 ++ 1 file changed, 2 insertions(+) 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 0f939663fc3..0ca3bb52436 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 @@ -111,6 +111,8 @@ installPackages+=(libva-dev) # for QtMultimedia streaming tests installPackages+=(vlc-bin) installPackages+=(vlc-plugin-base) +# for tst_qfloat16format, see also QTQAINFRA-6390 +installPackages+=(locales-all) # Support for cross-building to x86 (needed by WebEngine boot2qt builds) #installPackages+=(g++-multilib) From dcff43ca54d9c3286e19a5daea339455f902b0eb Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 29 May 2024 10:37:22 +0200 Subject: [PATCH 049/288] Ubuntu 24.04 arm64: build on wayland and test offscreen and wayland MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This amends 9eae3144040cafb3173ef922f96b7d3dc5526633 . Change-Id: Id44f1b0945ad0ef1a95a61152cad6799e7506383 Reviewed-by: Simo Fält Reviewed-by: Tero Heikkinen Reviewed-by: Liang Qi (cherry picked from commit bd4c8c26ba80c78b32aac20dcca828a378073bb0) --- coin/platform_configs/cmake_platforms.yaml | 10 +++++++--- .../nightly_ubuntu_24_04_arm64_documentation.yaml | 10 +++++++--- coin/platform_configs/qtwayland.yaml | 7 +++++++ 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index da3a304d229..00359bd4328 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -38,7 +38,7 @@ Configurations: Compiler: 'GCC' Features: ['Sccache', 'TestOnly'] Platform dependency: 'ubuntu-22.04' -# Build on Ubuntu 24.04 ARM64 and test on both X11 and Wayland later +# Build on Ubuntu 24.04 ARM64 Wayland and test on offscreen and Wayland later - Id: 'ubuntu-24.04-arm64' Template: 'qtci-linux-Ubuntu-24.04-aarch64-50' @@ -49,12 +49,16 @@ Configurations: 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DINPUT_headersclean=ON' ] -# Test on Ubuntu 24.04 ARM64 X11 +# Test on Ubuntu 24.04 ARM64 offscreen - - Id: 'ubuntu-24.04-arm64-x11-tests' + Id: 'ubuntu-24.04-arm64-offscreen-tests' Template: 'qtci-linux-Ubuntu-24.04-aarch64-50' Compiler: 'GCC' Features: ['TestOnly', 'InsignificantTests'] + Environment variables: [ + 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', + 'QT_QPA_PLATFORM=offscreen' + ] Platform dependency: 'ubuntu-24.04-arm64' - Id: 'opensuse-15.5-developer-build' diff --git a/coin/platform_configs/nightly_ubuntu_24_04_arm64_documentation.yaml b/coin/platform_configs/nightly_ubuntu_24_04_arm64_documentation.yaml index da7a8c17596..001133413ba 100644 --- a/coin/platform_configs/nightly_ubuntu_24_04_arm64_documentation.yaml +++ b/coin/platform_configs/nightly_ubuntu_24_04_arm64_documentation.yaml @@ -1,7 +1,7 @@ Version: 2 Configurations: # cmake_platforms.yaml -# Build on Ubuntu 24.04 ARM64 and test on both X11 and Wayland later +# Build on Ubuntu 24.04 ARM64 Wayland and test on both offscreen and Wayland later - Id: 'ubuntu-24.04-arm64-documentation' Template: 'qtci-linux-Ubuntu-24.04-aarch64-50' @@ -9,10 +9,14 @@ Configurations: Features: ['Documentation', 'UseConfigure', 'DoNotRunTests'] Configure arguments: '-make examples -developer-build -c++std c++20 -linker gold -qtlibinfix TestInfix -qtnamespace TestNamespace' Environment variables: ['NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'] -# Test on Ubuntu 24.04 ARM64 X11 +# Test on Ubuntu 24.04 ARM64 offscreen - - Id: 'ubuntu-24.04-arm64-documentation-x11-tests' + Id: 'ubuntu-24.04-arm64-documentation-offscreen-tests' Template: 'qtci-linux-Ubuntu-24.04-aarch64-50' Compiler: 'GCC' Features: ['TestDocs', 'TestOnly', 'InsignificantTests'] + Environment variables: [ + 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', + 'QT_QPA_PLATFORM=offscreen' + ] Platform dependency: 'ubuntu-24.04-arm64-documentation' diff --git a/coin/platform_configs/qtwayland.yaml b/coin/platform_configs/qtwayland.yaml index 52d13a7d161..a9296102fe0 100644 --- a/coin/platform_configs/qtwayland.yaml +++ b/coin/platform_configs/qtwayland.yaml @@ -17,6 +17,13 @@ Configurations: Compiler: 'GCC' Features: ['Sccache', 'TestOnly', 'RunDependencyTests', 'InsignificantTests'] Platform dependency: 'ubuntu-22.04' +# Test on Ubuntu 24.04 ARM64 Wayland +- + Id: 'ubuntu-24.04-arm64-wayland-tests' + Template: 'qtci-linux-Ubuntu-24.04-aarch64-50' + Compiler: 'GCC' + Features: ['TestOnly', 'RunDependencyTests', 'InsignificantTests'] + Platform dependency: 'ubuntu-24.04-arm64' # Test on Debian-11.6 Wayland - Id: 'debian-11.6-arm64-wayland-tests' From a864e58616842d77999a9d9400139656bff8dc95 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 12 Jun 2024 11:28:24 +0200 Subject: [PATCH 050/288] platform_configs: disable glx on offscreen integrations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It's broken in the VMs in our CI. This follows 94a4f06fb88ec6c7fa5e31dfd28af4e9b3cdbdd8 in qtbase. Fixes: QTBUG-126250 Task-number: QTBUG-125446 Change-Id: I34f5384282aa78015ba6520887f51391d9332780 Reviewed-by: Liang Qi Reviewed-by: Simo Fält Reviewed-by: Tero Heikkinen (cherry picked from commit e19eeba9de040b0b15f3fa45eff6e782b12a0e25) --- coin/platform_configs/cmake_platforms.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 00359bd4328..12cc4e7bbd1 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -57,6 +57,7 @@ Configurations: Features: ['TestOnly', 'InsignificantTests'] Environment variables: [ 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', + 'QT_QPA_OFFSCREEN_NO_GLX=1', 'QT_QPA_PLATFORM=offscreen' ] Platform dependency: 'ubuntu-24.04-arm64' @@ -154,6 +155,7 @@ Configurations: Features: ['Sccache', 'InsignificantTests', 'TestOnly'] Environment variables: [ 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', + 'QT_QPA_OFFSCREEN_NO_GLX=1', 'QT_QPA_PLATFORM=offscreen' ] Platform dependency: 'debian-11.6-arm64' From 3cc1081d4a4f30712632048a3b3e3ce5c4d2cf0b Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 28 Jun 2024 23:59:09 +0000 Subject: [PATCH 051/288] Update submodules on '6.8 in qt/qt5' Change-Id: I821198b9e8a21afb8483180ac57a14c551625428 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 d28f925af99..84e207e4b13 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit d28f925af99d0e2a5a3b28f1fef4ef42a216476c +Subproject commit 84e207e4b1306772ace88f016623c6b0811d1c33 diff --git a/qt5compat b/qt5compat index 5e43ef86e50..50927137ba1 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 5e43ef86e504d85dade89568e0bbfcbc17dbfd02 +Subproject commit 50927137ba178026c33060d6c2c56c58bef2f27d diff --git a/qtactiveqt b/qtactiveqt index fdaaa56fa78..084dea09008 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit fdaaa56fa782bea4e179ecf15f311ee9071f60e5 +Subproject commit 084dea0900880d751566ffbfeec92267421d1e68 diff --git a/qtbase b/qtbase index 1d4654493f3..cfc50c7026d 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 1d4654493f38dd9bcaff9a34aad11fd13c6b8893 +Subproject commit cfc50c7026d6eb5b54cc5490cca26d82d7ede52b diff --git a/qtcharts b/qtcharts index 95a4f88fd6e..9fc7959d9e4 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 95a4f88fd6eded2a1e4ee58947d6c06ec2af03a4 +Subproject commit 9fc7959d9e40608d912367310d605229ef4c5e24 diff --git a/qtcoap b/qtcoap index 153ff1e9ea3..c1b55ae2293 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit 153ff1e9ea337376c08440377d655f04c26614b7 +Subproject commit c1b55ae22935756ca36af2d324659c798e099ca8 diff --git a/qtconnectivity b/qtconnectivity index 848c1108f9d..e0b5acc0e9c 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 848c1108f9dc444dbb35f5be2d0d059b0d2a4a95 +Subproject commit e0b5acc0e9cde4f44c24d0729b8b6e41c709dc7a diff --git a/qtdatavis3d b/qtdatavis3d index de0bfdd8874..d6cddc68a58 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit de0bfdd887420cc8d73a61a78230af9dab1b21ca +Subproject commit d6cddc68a5806b8346375afabec546f41c23fd6c diff --git a/qtdeclarative b/qtdeclarative index 8206b9b4b15..f67b8f68a95 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 8206b9b4b159c9a0244ff4f92d4c3bb8fad13c1c +Subproject commit f67b8f68a951fdd5fd21ce95cf0be0668397d3f8 diff --git a/qtdoc b/qtdoc index 64724264104..dcdf42221c2 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 64724264104247f8a71e38708872b9abe9cc3267 +Subproject commit dcdf42221c2bbeea34ba724663b91936907cf439 diff --git a/qtgraphs b/qtgraphs index 67a630118e8..d72fab2ed93 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit 67a630118e8e28f094a98b477ce861fa40b8592b +Subproject commit d72fab2ed9311e6540faadffbe385269046de26b diff --git a/qtgrpc b/qtgrpc index 2a4a3cc32ed..31cb479cd2e 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit 2a4a3cc32eddf65848edeeff3b19a80a3099a07a +Subproject commit 31cb479cd2ec071606fdd34a629384841f2cad50 diff --git a/qthttpserver b/qthttpserver index c625ff02c87..ade6bdfbecc 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit c625ff02c87b1a10dc362a77da1c1d48ff1db70a +Subproject commit ade6bdfbecc7b2ee89ee55a626cabce329578c14 diff --git a/qtimageformats b/qtimageformats index 4de45bfe7e2..4261d9e8d5b 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 4de45bfe7e23477c82627058a44812b0a574e3c1 +Subproject commit 4261d9e8d5b41d1c0348bffbf1564fb92d128320 diff --git a/qtlanguageserver b/qtlanguageserver index 7255560550d..64b3eca236b 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit 7255560550db16145ad182c1f3f086f8a1b60e2d +Subproject commit 64b3eca236b55ff184c498328c1a561dd367e24b diff --git a/qtlocation b/qtlocation index d9223b82078..4e354446329 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit d9223b820780f567f5c53f7a3c7e03be15288171 +Subproject commit 4e3544463294ad51ba08b2ae09bdc89553f7d0af diff --git a/qtlottie b/qtlottie index 9455c19ef89..7dd02b5fa80 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 9455c19ef8915e06a8db45efac16189e6a013771 +Subproject commit 7dd02b5fa806f8c314a4f64dc67a385557feef17 diff --git a/qtmqtt b/qtmqtt index f7746dad1de..4cdaa4ad2ea 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit f7746dad1de75194652be7ad10de48b1d6d35f4b +Subproject commit 4cdaa4ad2ea8409523861abebaa910089d840c64 diff --git a/qtmultimedia b/qtmultimedia index 6b3f4e935b0..c97e56858b0 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 6b3f4e935b0cb908401b8235fdfb26d0bc7b1c92 +Subproject commit c97e56858b0c869261bbdff495f08a6a6bed9f5a diff --git a/qtnetworkauth b/qtnetworkauth index b18fba5da94..fab6938f1be 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit b18fba5da94677a6e2f1f25aa87998200336f83f +Subproject commit fab6938f1beb1464295ad3a459521a89a52d4ce7 diff --git a/qtopcua b/qtopcua index 2ba5881f1e2..d6f175083b4 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit 2ba5881f1e2de4abaf23c0139cd50173c68f366a +Subproject commit d6f175083b495b5d6f858a5df8dc6a4bd7e29f7a diff --git a/qtpositioning b/qtpositioning index 5a12dc643d4..a94950c0e9d 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit 5a12dc643d425e96d19f6a543f7c6c51a01aa857 +Subproject commit a94950c0e9df7cd8bdeeff38e8826b6ee522eee8 diff --git a/qtquick3d b/qtquick3d index e46704d25da..ac680db4465 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit e46704d25daec379912e6d5b0f6e20cce28ec0e2 +Subproject commit ac680db44653f1af8784b5fbfb0943d3addbdc06 diff --git a/qtquick3dphysics b/qtquick3dphysics index 22ca81a680e..0a325afd374 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit 22ca81a680e2562e3a65bc61aa0c3f9500867f2c +Subproject commit 0a325afd374d7a74f2a940effcae527c02893129 diff --git a/qtquickeffectmaker b/qtquickeffectmaker index b22b12406db..c3be50fa55b 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit b22b12406dbae9de2260923c38f7fafe37660411 +Subproject commit c3be50fa55bbe840d73d355b7e96f9b954713e19 diff --git a/qtquicktimeline b/qtquicktimeline index 20ee8c79db8..27f382fd57a 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 20ee8c79db81f965f5d18fa264e7fe182618d417 +Subproject commit 27f382fd57aa1ee4c93b56fe75f5a52d87fa4dd9 diff --git a/qtremoteobjects b/qtremoteobjects index 181801a3499..dbec979a6cc 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 181801a3499f9d2129401fb1144b7b59a7b702a1 +Subproject commit dbec979a6cc373d43c347f8e6a5e9c6045fa4112 diff --git a/qtscxml b/qtscxml index df7b7d4a5e9..b80ac57ea86 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit df7b7d4a5e9035a1bcc1ffd4495c8c2f54360405 +Subproject commit b80ac57ea864db1d91be961123ce995d7fe227d8 diff --git a/qtsensors b/qtsensors index c5ca23d3d9d..a48de370195 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit c5ca23d3d9d44109d80004bb83ee9b56a633d81f +Subproject commit a48de370195d45a60ace851d729c7f7001ad3699 diff --git a/qtserialbus b/qtserialbus index 96c9b160177..ed0d0cb8f91 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 96c9b160177a6e79ff512cffded462ee633ecc1a +Subproject commit ed0d0cb8f919c5cf2af155b9d571b626a915e031 diff --git a/qtserialport b/qtserialport index 2db5aa6bc6c..93ba0e29167 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 2db5aa6bc6c6d823108a5eef7d1efd5ffc077215 +Subproject commit 93ba0e29167210c658f7545db5e151980416e959 diff --git a/qtshadertools b/qtshadertools index fbb76ed94fc..667a6ac9c71 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit fbb76ed94fcd42cd1eabeb725538d518a10e79d9 +Subproject commit 667a6ac9c71d846f3ec7ceb77dd4f09d40a82757 diff --git a/qtspeech b/qtspeech index 8534fd97c9c..9bfc9676d29 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 8534fd97c9c48840892a60af8753546090d0c98a +Subproject commit 9bfc9676d29d14968e658da070f2c864160b3d94 diff --git a/qtsvg b/qtsvg index 0a87561dcfb..75866f06b9c 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 0a87561dcfb1a944b424c9b2b18d9a4d0379407f +Subproject commit 75866f06b9cd0a42669060ee333021985d5ebb8a diff --git a/qttools b/qttools index df2a2fc4c6b..71e84ea0444 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit df2a2fc4c6b32ad6203a6c90222dd9051c2f1ba5 +Subproject commit 71e84ea044451757f6590df211c18372661717c0 diff --git a/qttranslations b/qttranslations index 70c571ccc42..842fe52ce6c 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 70c571ccc428502106b46c27e33cb868633910dc +Subproject commit 842fe52ce6c4e0081c729dc4227ab5fdbd310a05 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 593856fe1b0..e8fa98e871b 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 593856fe1b054200a70f0a1cdf607e7ae89b9e13 +Subproject commit e8fa98e871ba313dc4e1eee929357f7ad0a548c2 diff --git a/qtwayland b/qtwayland index d5bcd0bb242..54c2554e279 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit d5bcd0bb2426562020ccf52caa454e92ddad2a17 +Subproject commit 54c2554e27959df82d60a95b87e0856cb4d559e4 diff --git a/qtwebchannel b/qtwebchannel index 4579fb731a4..57aa7f5ae97 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 4579fb731a4954633e4398477896bbf6968c34bc +Subproject commit 57aa7f5ae976f7bb4efebce011fcd0f8153bb158 diff --git a/qtwebengine b/qtwebengine index 2d053c4fd0a..0b9a2c616ec 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 2d053c4fd0a58500090434c4c6ffa818035d6ec0 +Subproject commit 0b9a2c616ec824557f6bfb4c432750fd4dcd4af7 diff --git a/qtwebsockets b/qtwebsockets index f7a768763bb..6319f941c3d 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit f7a768763bb50cf61a03e3fcdac3430b3c3e6d60 +Subproject commit 6319f941c3ddaef2c7820c482a7abdd6bcfad9cc diff --git a/qtwebview b/qtwebview index e9b81473191..24c11e348ce 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit e9b81473191c1c050880e6ae69b0d379dfa48c44 +Subproject commit 24c11e348cebd2ea0ad9de68b2df7f6690caeb4d From 2cc1596d9fbc37d6012d5c5bc389aeef28bc8ce9 Mon Sep 17 00:00:00 2001 From: Toni Saario Date: Thu, 13 Jun 2024 09:06:19 +0300 Subject: [PATCH 052/288] Enable test building for VxWorks with qtbase This enables blocking test building. Pick-to: 6.7 Change-Id: I184bd16a1c6a0ec45bfd9ee9b96c478dd2cf7c33 Reviewed-by: Toni Saario (cherry picked from commit 71d8f797ba0bffe1987d943cf272cf43384d2292) Reviewed-by: Qt Cherry-pick Bot --- .../cmake_platforms_qemu_vxworks_buildtest.yaml | 15 +++++++++++++++ coin/platform_configs/qtbase.yaml | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 coin/platform_configs/cmake_platforms_qemu_vxworks_buildtest.yaml diff --git a/coin/platform_configs/cmake_platforms_qemu_vxworks_buildtest.yaml b/coin/platform_configs/cmake_platforms_qemu_vxworks_buildtest.yaml new file mode 100644 index 00000000000..9fe750207f7 --- /dev/null +++ b/coin/platform_configs/cmake_platforms_qemu_vxworks_buildtest.yaml @@ -0,0 +1,15 @@ +Version: 2 +Configurations: +- + Id: 'vxworks-imx6-buildtest' + Template: 'qtci-linux-Ubuntu-22.04-x86_64-51' + Target os: 'VxWorks' + Target arch: 'ARMv7' + Compiler: 'Clang' + Target compiler: 'Clang' + Platform dependency: 'ubuntu-22.04' + Features: ['VMSize8', 'UseConfigure', 'DoNotRunTests', 'DoNotUploadTests'] + Environment variables: [ + 'TARGET_CONFIGURE_ARGS=-release -developer-build -force-debug-info -qpa eglfs -nomake examples', + 'TARGET_CMAKE_ARGS=-DBUILD_SHARED_LIBS=OFF -DWARNINGS_ARE_ERRORS=OFF -DCMAKE_TOOLCHAIN_FILE="{{.Env.WIND_CC_SYSROOT}}/mk/rtp.toolchain.cmake" -DFEATURE_vulkan=OFF -DQT_QMAKE_TARGET_MKSPEC=vxworks-clang -DQT_HOST_PATH=/home/qt/work/install -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_STAGING_PREFIX:PATH=/home/qt/work/install/target' + ] diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml index 0b847e1ebcd..f9acdea8d71 100644 --- a/coin/platform_configs/qtbase.yaml +++ b/coin/platform_configs/qtbase.yaml @@ -7,7 +7,7 @@ Include: [ address_sanitizer_platforms.yaml, linux_android_tests_multi_abi.yaml, wasm_qtbase_tests.yaml, - cmake_platforms_qemu_vxworks.yaml, + cmake_platforms_qemu_vxworks_buildtest.yaml, qtlite.yaml, qtbase-new-compiler-testing.yaml ] From 88e06e1265c5f0d9b956011adb62287f304c0f76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Mon, 3 Jun 2024 12:12:28 +0200 Subject: [PATCH 053/288] coin: Replace bare metal macOS ARM configurations with Tart VMs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Idf84ead53ea27eedfa571ee5d7a44b7a496229bb Reviewed-by: Aku Pietikäinen Reviewed-by: Jukka Jokiniva (cherry picked from commit c1485ecb2cebec7d5a709b24ad9bff01233f36ef) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/macos.yaml | 34 ++------------------------------ 1 file changed, 2 insertions(+), 32 deletions(-) diff --git a/coin/platform_configs/macos.yaml b/coin/platform_configs/macos.yaml index 76052c542b3..d715b338cbe 100644 --- a/coin/platform_configs/macos.yaml +++ b/coin/platform_configs/macos.yaml @@ -60,27 +60,15 @@ Configurations: - Id: 'macos-12-arm64-tests' - Template: 'qtci-macos-12-arm64' - Compiler: 'Clang' - Features: ['TestOnly', 'Packaging'] - Platform dependency: 'macos-universal-on-x86_64' - - - Id: 'macos-12-arm64-tart-tests' Template: 'qtci-macos-12-arm-102' Compiler: 'Clang' - Features: ['TestOnly'] - Platform dependency: 'macos-universal-on-x86_64' - - - Id: 'macos-13-arm64-tests' - Template: 'qtci-macos-13-arm64' - Compiler: 'Clang' Features: ['TestOnly', 'Packaging'] Platform dependency: 'macos-universal-on-x86_64' - - Id: 'macos-13-arm64-tart-tests' + Id: 'macos-13-arm64-tests' Template: 'qtci-macos-13-arm-107' Compiler: 'Clang' - Features: ['TestOnly'] + Features: ['TestOnly', 'Packaging'] Platform dependency: 'macos-universal-on-x86_64' - Id: 'macos-14-arm64-tests' @@ -93,12 +81,6 @@ Configurations: - Id: 'macos-12-arm-on-arm64-tests' - Template: 'qtci-macos-12-arm64' - Compiler: 'Clang' - Features: ['TestOnly'] - Platform dependency: 'macos-universal-on-arm64' - - - Id: 'macos-12-arm-on-arm64-tart-tests' Template: 'qtci-macos-12-arm-102' Compiler: 'Clang' Features: ['TestOnly'] @@ -154,24 +136,12 @@ Configurations: # Test on all supported macOS versions (deployment targets) - Id: 'macos-12-arm64-developer-build-tests' - Template: 'qtci-macos-12-arm64' - Compiler: 'Clang' - Features: ['TestOnly'] - Platform dependency: 'macos-14-arm64-developer-build' - - - Id: 'macos-12-arm64-tart-developer-build-tests' Template: 'qtci-macos-12-arm-102' Compiler: 'Clang' Features: ['TestOnly'] Platform dependency: 'macos-14-arm64-developer-build' - Id: 'macos-13-arm64-developer-build-tests' - Template: 'qtci-macos-13-arm64' - Compiler: 'Clang' - Features: ['TestOnly'] - Platform dependency: 'macos-14-arm64-developer-build' - - - Id: 'macos-13-arm64-tart-developer-build-tests' Template: 'qtci-macos-13-arm-107' Compiler: 'Clang' Features: ['TestOnly'] From 71802eb0ed8ca092e45cdfc6b39c654a81020079 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 3 Jul 2024 10:41:11 +0000 Subject: [PATCH 054/288] Update submodules on '6.8 in qt/qt5' Change-Id: I32025e7fac0b6ab134a14cf42c6924afdd153cc9 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 84e207e4b13..6df39e5d0d9 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 84e207e4b1306772ace88f016623c6b0811d1c33 +Subproject commit 6df39e5d0d9350f366d589111a2b92a1254985c6 diff --git a/qt5compat b/qt5compat index 50927137ba1..c469be98c7d 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 50927137ba178026c33060d6c2c56c58bef2f27d +Subproject commit c469be98c7df0a9259404157938f5c10246d1b61 diff --git a/qtactiveqt b/qtactiveqt index 084dea09008..8fc270d2016 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 084dea0900880d751566ffbfeec92267421d1e68 +Subproject commit 8fc270d20161bde24f09f8f09e410aac976513b7 diff --git a/qtbase b/qtbase index cfc50c7026d..2bc06478050 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit cfc50c7026d6eb5b54cc5490cca26d82d7ede52b +Subproject commit 2bc064780508919a0b1f4610dbccfa66831703fd diff --git a/qtcharts b/qtcharts index 9fc7959d9e4..ab36672e145 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 9fc7959d9e40608d912367310d605229ef4c5e24 +Subproject commit ab36672e145528658298be8a3be088a9254e0a51 diff --git a/qtcoap b/qtcoap index c1b55ae2293..2a17635cab0 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit c1b55ae22935756ca36af2d324659c798e099ca8 +Subproject commit 2a17635cab0bfeff684c93efa477bf2f7c903d4e diff --git a/qtconnectivity b/qtconnectivity index e0b5acc0e9c..b83ae49a8e6 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit e0b5acc0e9cde4f44c24d0729b8b6e41c709dc7a +Subproject commit b83ae49a8e6105322aa370c770f5051c282c3ea4 diff --git a/qtdatavis3d b/qtdatavis3d index d6cddc68a58..2ebb2413334 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit d6cddc68a5806b8346375afabec546f41c23fd6c +Subproject commit 2ebb241333457939c27bd986814bd5623c073aa8 diff --git a/qtdeclarative b/qtdeclarative index f67b8f68a95..df193621ede 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit f67b8f68a951fdd5fd21ce95cf0be0668397d3f8 +Subproject commit df193621ede18ee1166281435750fc1980b3bc1f diff --git a/qtdoc b/qtdoc index dcdf42221c2..e083d254537 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit dcdf42221c2bbeea34ba724663b91936907cf439 +Subproject commit e083d254537095128f1063726586db03e2042219 diff --git a/qtgraphs b/qtgraphs index d72fab2ed93..5967af8eaa7 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit d72fab2ed9311e6540faadffbe385269046de26b +Subproject commit 5967af8eaa7e246aa17626dce91214f3498fdcbe diff --git a/qtgrpc b/qtgrpc index 31cb479cd2e..bb4864b9241 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit 31cb479cd2ec071606fdd34a629384841f2cad50 +Subproject commit bb4864b9241ef464b9ae5aab644980f3926c61e5 diff --git a/qthttpserver b/qthttpserver index ade6bdfbecc..6884d5ceca6 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit ade6bdfbecc7b2ee89ee55a626cabce329578c14 +Subproject commit 6884d5ceca6dd0a5bce3576b6f8f144891c9c3a1 diff --git a/qtimageformats b/qtimageformats index 4261d9e8d5b..9635c58b734 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 4261d9e8d5b41d1c0348bffbf1564fb92d128320 +Subproject commit 9635c58b7346c8725b78c41042d64d149cb5a805 diff --git a/qtlanguageserver b/qtlanguageserver index 64b3eca236b..5c2d1208101 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit 64b3eca236b55ff184c498328c1a561dd367e24b +Subproject commit 5c2d120810189e1851a0d81fef299802ecabfee7 diff --git a/qtlocation b/qtlocation index 4e354446329..23837fa629e 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 4e3544463294ad51ba08b2ae09bdc89553f7d0af +Subproject commit 23837fa629ed5183511c3bf17109779ec59288ec diff --git a/qtlottie b/qtlottie index 7dd02b5fa80..cb5f0e76adc 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 7dd02b5fa806f8c314a4f64dc67a385557feef17 +Subproject commit cb5f0e76adc783308dc2278dc4e8a71bbeb38385 diff --git a/qtmqtt b/qtmqtt index 4cdaa4ad2ea..84b614fa552 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit 4cdaa4ad2ea8409523861abebaa910089d840c64 +Subproject commit 84b614fa5522099160b17f99828648df5e6d45d7 diff --git a/qtmultimedia b/qtmultimedia index c97e56858b0..82a3213ca46 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit c97e56858b0c869261bbdff495f08a6a6bed9f5a +Subproject commit 82a3213ca467ffd2c42fd6344982a89d63c93257 diff --git a/qtnetworkauth b/qtnetworkauth index fab6938f1be..7f1c1cb371c 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit fab6938f1beb1464295ad3a459521a89a52d4ce7 +Subproject commit 7f1c1cb371c53d61aa4b82a6c642bb9059444646 diff --git a/qtopcua b/qtopcua index d6f175083b4..f0382dad20a 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit d6f175083b495b5d6f858a5df8dc6a4bd7e29f7a +Subproject commit f0382dad20ab400429d26c80c73818ebeaf3438c diff --git a/qtpositioning b/qtpositioning index a94950c0e9d..31a8040367a 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit a94950c0e9df7cd8bdeeff38e8826b6ee522eee8 +Subproject commit 31a8040367a3d79f1970799d283acb1be8e4f23b diff --git a/qtquick3d b/qtquick3d index ac680db4465..eaec35c367e 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit ac680db44653f1af8784b5fbfb0943d3addbdc06 +Subproject commit eaec35c367e72c74e6090ac7d5ee5ba014fae562 diff --git a/qtquick3dphysics b/qtquick3dphysics index 0a325afd374..1b8291fbeec 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit 0a325afd374d7a74f2a940effcae527c02893129 +Subproject commit 1b8291fbeec1e59465ed831bbb82bfbba28786a1 diff --git a/qtquickeffectmaker b/qtquickeffectmaker index c3be50fa55b..93604fff51e 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit c3be50fa55bbe840d73d355b7e96f9b954713e19 +Subproject commit 93604fff51efceeac1ca340cd9e03a80b9cad4cd diff --git a/qtquicktimeline b/qtquicktimeline index 27f382fd57a..2d127184699 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 27f382fd57aa1ee4c93b56fe75f5a52d87fa4dd9 +Subproject commit 2d12718469917f601b3bf3eb38942ac2fae66d26 diff --git a/qtremoteobjects b/qtremoteobjects index dbec979a6cc..3d4d2020177 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit dbec979a6cc373d43c347f8e6a5e9c6045fa4112 +Subproject commit 3d4d2020177a67453e8f14c953f83684001b9c45 diff --git a/qtscxml b/qtscxml index b80ac57ea86..eb61a0e8ead 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit b80ac57ea864db1d91be961123ce995d7fe227d8 +Subproject commit eb61a0e8ead3abb67226e5045e0ce5c597e1f20e diff --git a/qtsensors b/qtsensors index a48de370195..151f818c9a2 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit a48de370195d45a60ace851d729c7f7001ad3699 +Subproject commit 151f818c9a265f92b4530b35dd18be4965dee480 diff --git a/qtserialbus b/qtserialbus index ed0d0cb8f91..457424d1c49 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit ed0d0cb8f919c5cf2af155b9d571b626a915e031 +Subproject commit 457424d1c49f67b8b4df3fc4825b45e3aa831341 diff --git a/qtserialport b/qtserialport index 93ba0e29167..d81a9da6574 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 93ba0e29167210c658f7545db5e151980416e959 +Subproject commit d81a9da6574151b542c3891d229fb60e00b43634 diff --git a/qtshadertools b/qtshadertools index 667a6ac9c71..6503d3223f8 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 667a6ac9c71d846f3ec7ceb77dd4f09d40a82757 +Subproject commit 6503d3223f82e94f32cd67e536be6ed7a979d520 diff --git a/qtspeech b/qtspeech index 9bfc9676d29..2c53c9550b1 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 9bfc9676d29d14968e658da070f2c864160b3d94 +Subproject commit 2c53c9550b1073e77a5ad163985619cb07c69592 diff --git a/qtsvg b/qtsvg index 75866f06b9c..0cb481944d4 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 75866f06b9cd0a42669060ee333021985d5ebb8a +Subproject commit 0cb481944d4ce4a5e2350452ce1a50fd4f5bcd33 diff --git a/qttools b/qttools index 71e84ea0444..a5a69456bf8 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 71e84ea044451757f6590df211c18372661717c0 +Subproject commit a5a69456bf87773b671aca85373085a948408ff9 diff --git a/qttranslations b/qttranslations index 842fe52ce6c..fc2068dae56 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 842fe52ce6c4e0081c729dc4227ab5fdbd310a05 +Subproject commit fc2068dae56afd302835e5ffb77b6214fbf80c47 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index e8fa98e871b..66ee0cc3574 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit e8fa98e871ba313dc4e1eee929357f7ad0a548c2 +Subproject commit 66ee0cc3574eecc2e80241be39d976596355bed6 diff --git a/qtwayland b/qtwayland index 54c2554e279..750e11e5e57 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 54c2554e27959df82d60a95b87e0856cb4d559e4 +Subproject commit 750e11e5e577be0230efc0e19db3097b6ad4e0e6 diff --git a/qtwebchannel b/qtwebchannel index 57aa7f5ae97..abad90db61a 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 57aa7f5ae976f7bb4efebce011fcd0f8153bb158 +Subproject commit abad90db61a76dc0e1faaa2034837a8612bcdd83 diff --git a/qtwebengine b/qtwebengine index 0b9a2c616ec..f27fa91cf0f 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 0b9a2c616ec824557f6bfb4c432750fd4dcd4af7 +Subproject commit f27fa91cf0fd102de148edec9ac54ea2b0fb69cf diff --git a/qtwebsockets b/qtwebsockets index 6319f941c3d..b2f3da3985b 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 6319f941c3ddaef2c7820c482a7abdd6bcfad9cc +Subproject commit b2f3da3985b38eb70d3e45b8509ee75e6a7418b2 diff --git a/qtwebview b/qtwebview index 24c11e348ce..27b64319c61 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 24c11e348cebd2ea0ad9de68b2df7f6690caeb4d +Subproject commit 27b64319c615785b8ba9f52ff8fdd266d900e307 From 36cf1fd484a85d34386ba262c27bf47b84859100 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Fri, 21 Jun 2024 14:07:07 +0200 Subject: [PATCH 055/288] Qt Creator: Switch to ARM macOS 14 Used for packaging now, too. Pick-to: 6.7 Change-Id: I8b9edbff7abcc02a43011e078ec55ff195477dfa Reviewed-by: David Schulz (cherry picked from commit 6120442e7c34c7936d24cd12f135bb98b7042937) 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 e3357129b43..4e9f7c0ce3d 100644 --- a/coin/platform_configs/qt-creator.yaml +++ b/coin/platform_configs/qt-creator.yaml @@ -22,7 +22,7 @@ Configurations: Configure arguments: '' Environment variables: [] - - Template: 'qtci-macos-12-x86_64-106' + Template: 'qtci-macos-14-arm-106' Compiler: 'Clang' Features: ['Packaging', 'Sccache', 'DebugAndRelease'] Configure arguments: '' From 88c5532d08a80042205cbee132d862df988af447 Mon Sep 17 00:00:00 2001 From: Jukka Jokiniva Date: Wed, 26 Jun 2024 16:44:53 +0300 Subject: [PATCH 056/288] Change msvc packaging targets back to c++17 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Packaging targets were accidentally moved to c++20. Amends bf633f08b7765140e54548eac722a46906141a40 Amends b4bcf1e6ca00b2eb7558777ecabf822673178021 Fixes: QTQAINFRA-6424 Change-Id: Iad6f8202329b471733cc1bc8ddf22feb3ffadfb4 Reviewed-by: Oliver Wolff Reviewed-by: Simo Fält (cherry picked from commit b9fdfb3fb3443f2ed1e7ba214d285c04c6903b46) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/cmake_platforms.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 12cc4e7bbd1..c0fac95b5df 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -99,7 +99,7 @@ Configurations: Template: 'qtci-windows-11_23H2-x86_64-52' Compiler: 'MSVC2022' Features: ['Sccache', "DebugAndRelease", 'UseConfigure', 'Packaging'] - Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib -c++std c++20' + 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}}\..', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_native_grpc=OFF -DFEATURE_clangcpp=OFF -DINPUT_headersclean=ON', @@ -111,7 +111,7 @@ Configurations: Template: 'qtci-windows-11_22H2-aarch64-51' Compiler: 'MSVC2022' Features: ['Packaging', 'DebugAndRelease', 'UseConfigure', 'InsignificantTests'] - Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib -c++std c++20 -no-sql-psql -no-opengl' + Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib -no-sql-psql -no-opengl' Environment variables: [ 'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_arm64}}\..', 'NON_QTBASE_CMAKE_ARGS=-DFEATURE_native_grpc=OFF -DFEATURE_clangcpp=OFF -DFEATURE_qdoc=OFF', From be5eb71399c13883bebcef5e82c4d403a480a7da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Wierci=C5=84ski?= Date: Fri, 14 Jun 2024 14:32:28 +0200 Subject: [PATCH 057/288] wasm: Update Emscripten to 3.1.56 Update Emscripten to 3.1.56 for Qt 6.8 release. Change-Id: Ic5054aa7b00fba1f155824a710b9562d2a8a2f95 Reviewed-by: Toni Saario (cherry picked from commit e4f7db137931a07e387823cc7779347072739dec) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/common/unix/emsdk.sh | 6 +++--- coin/provisioning/common/windows/emsdk.ps1 | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/coin/provisioning/common/unix/emsdk.sh b/coin/provisioning/common/unix/emsdk.sh index 580f966faa9..b85105b5594 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.50" +version="3.1.56" versionNode="v16.20.0" tarBallVersion="${version//./_}" if uname -a |grep -q Darwin; then tarBallPackage="emsdk_macos_${tarBallVersion}.tar.gz" - sha="c12169ec8d22fc7a9ef1ba98027435bdf3b72729" + sha="24c49db971da4fd7c68f6b71984c3d7775fdfb84" else tarBallPackage="emsdk_linux_${tarBallVersion}.tar.gz" - sha="5d81a8f1ddcb8d74c70ba5608efd4266c857944a" + sha="410c93bb2ab3b244190c2cb5f0ff1ce5d6ac4eb5" fi cacheUrl="https://ci-files01-hki.ci.qt.io/input/emsdk/$%7BtarBallPackage%7D" target="/tmp/${tarBallPackage}" diff --git a/coin/provisioning/common/windows/emsdk.ps1 b/coin/provisioning/common/windows/emsdk.ps1 index e1b92fd3b43..b0870e8d04e 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.50" +$version = "3.1.56" $zipVersion = $version -replace '\.', "_" $temp = "$env:tmp" $cacheUrl = "https://ci-files01-hki.ci.qt.io/input/emsdk/emsdk_windows_$%7BzipVersion%7D.zip" -$sha = "40dc636688166ecdb476da40d02c491ee5032f7b" +$sha = "ab376d218f1a66302c36770977948f74f0576a42" # Make sure python is in the path Prepend-Path "C:\Python27" From 95c6513432bbb69e1e1c209a72d656617852850f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Tue, 25 Jun 2024 14:17:10 +0200 Subject: [PATCH 058/288] coin: Give coin agent permission to access Bluetooth MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The Qt Connectivity tests rely on this. Change-Id: I7218485e583ebe2c8d381a0104012a86350e6eac Reviewed-by: Timur Pocheptsov Reviewed-by: Volker Hilsheimer Reviewed-by: Aku Pietikäinen (cherry picked from commit 3ad98d0b271d7b9431cc35ebe20961dafabc84ee) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/common/macos/set_tcc_permissions.sh | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/coin/provisioning/common/macos/set_tcc_permissions.sh b/coin/provisioning/common/macos/set_tcc_permissions.sh index d9fb222bd97..274b01ff2a7 100755 --- a/coin/provisioning/common/macos/set_tcc_permissions.sh +++ b/coin/provisioning/common/macos/set_tcc_permissions.sh @@ -9,8 +9,16 @@ if touch "$TCC_DATABASE"; then REQ_STR=$(codesign -d -r- "$BOOTSTRAP_AGENT" 2>&1 | awk -F ' => ' '/designated/{print $2}') REQ_HEX=$(echo "$REQ_STR" | csreq -r- -b >(xxd -p | tr -d '\n')) + SERVICES=() + + # Qt Multimedia tests need microphone access + SERVICES+=('kTCCServiceMicrophone') + + # Qt Connectivity tests need Bluetooth access + SERVICES+=('kTCCServiceBluetoothAlways') + # shellcheck disable=SC2043 - for service in kTCCServiceMicrophone; do + for service in "${SERVICES[@]}"; do sqlite3 -echo "$TCC_DATABASE" < Date: Wed, 26 Jun 2024 00:21:07 +0200 Subject: [PATCH 059/288] Use single installation archive for FFmpeg provisioning on all platforms MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: QTBUG-125955 Change-Id: Ibfa97e3d765eb3c4ff5613004bc881e49ddf10e9 Reviewed-by: Jøger Hansegård (cherry picked from commit 49c03849e33581fb9a9edf47a23606abbf78a9d4) Reviewed-by: Qt Cherry-pick Bot --- .../provisioning/common/unix/install-ffmpeg-ios.sh | 2 +- coin/provisioning/common/unix/install-ffmpeg.sh | 2 +- .../provisioning/common/windows/install-ffmpeg.ps1 | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/coin/provisioning/common/unix/install-ffmpeg-ios.sh b/coin/provisioning/common/unix/install-ffmpeg-ios.sh index 49889c78979..d9637055b7f 100755 --- a/coin/provisioning/common/unix/install-ffmpeg-ios.sh +++ b/coin/provisioning/common/unix/install-ffmpeg-ios.sh @@ -11,8 +11,8 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" version="n7.0" -sha1="042260ec5013eb29c89c13443a0f42cbe6fbceaa" url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz" +sha1="042260ec5013eb29c89c13443a0f42cbe6fbceaa" 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 67255e3cb4f..30163b7312c 100755 --- a/coin/provisioning/common/unix/install-ffmpeg.sh +++ b/coin/provisioning/common/unix/install-ffmpeg.sh @@ -12,7 +12,7 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" version="n7.0" -url_public="https://github.com/FFmpeg/FFmpeg/archive/$version.tar.gz" +url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz" sha1="042260ec5013eb29c89c13443a0f42cbe6fbceaa" 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 487e4552057..e77417ebc14 100644 --- a/coin/provisioning/common/windows/install-ffmpeg.ps1 +++ b/coin/provisioning/common/windows/install-ffmpeg.ps1 @@ -6,20 +6,20 @@ # This script will install FFmpeg $msys = "C:\Utils\msys64\usr\bin\bash" -$version = "n7.0" -$ffmpeg_name = "ffmpeg-" + $version; -$sha1 = "CC948A547113469E284CA085B9A236F1ECC50843" +$version="n7.0" +$url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz" +$sha1="042260ec5013eb29c89c13443a0f42cbe6fbceaa" +$url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz" +$ffmpeg_name="FFmpeg-$version" -$url_cached = "https://ci-files01-hki.ci.qt.io/input/ffmpeg/" + $version + ".zip" -$url_public = "https://github.com/FFmpeg/FFmpeg/archive/refs/tags/" +$version + ".zip" -$download_location = "C:\Windows\Temp\" + $ffmpeg_name + ".zip" +$download_location = "C:\Windows\Temp\$ffmpeg_name.tar.gz" $unzip_location = "C:\" Write-Host "Fetching FFmpeg $version..." Download $url_public $url_cached $download_location Verify-Checksum $download_location $sha1 -Extract-7Zip $download_location $unzip_location +Extract-tar_gz $download_location $unzip_location Remove $download_location function GetFfmpegDefaultConfiguration { From bcaf172368de96330ba81b5acc34efe37f0b4894 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Mon, 8 Jul 2024 07:51:49 +0300 Subject: [PATCH 060/288] Provisioning: Install mqtt broker also for arm linux configs Task-number: QTBUG-126974 Change-Id: Ifcd61385057fcc6cef8943b3e0477d905d01b198 Reviewed-by: Maurice Kalinowski (cherry picked from commit 00527a5de1565a581f921ae4e7191479c97835b9) Reviewed-by: Qt Cherry-pick Bot --- .../qtci-linux-Debian-11.6-aarch64/22-mqtt_broker.sh | 8 ++++++++ .../qtci-linux-Ubuntu-24.04-aarch64/22-mqtt_broker.sh | 8 ++++++++ 2 files changed, 16 insertions(+) create mode 100644 coin/provisioning/qtci-linux-Debian-11.6-aarch64/22-mqtt_broker.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/22-mqtt_broker.sh diff --git a/coin/provisioning/qtci-linux-Debian-11.6-aarch64/22-mqtt_broker.sh b/coin/provisioning/qtci-linux-Debian-11.6-aarch64/22-mqtt_broker.sh new file mode 100644 index 00000000000..b0791cb18f8 --- /dev/null +++ b/coin/provisioning/qtci-linux-Debian-11.6-aarch64/22-mqtt_broker.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash +# Copyright (C) 2018 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/mqtt_broker.sh +source "${BASH_SOURCE%/*}/../common/unix/mqtt_broker.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/22-mqtt_broker.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/22-mqtt_broker.sh new file mode 100644 index 00000000000..b0791cb18f8 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/22-mqtt_broker.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash +# Copyright (C) 2018 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/mqtt_broker.sh +source "${BASH_SOURCE%/*}/../common/unix/mqtt_broker.sh" From 1b97371ea0e59990e30bf960ec25d347e2d4cc2f Mon Sep 17 00:00:00 2001 From: Luca Di Sera Date: Sat, 18 Nov 2023 12:07:11 +0100 Subject: [PATCH 061/288] Update QDoc libclang to 17.0.6 The version variable that is used to define the packages to download was updated to reflect the new version. A new case was added for the new "Debian11" on "arm64" package which was not a provisioned package on older version but is now provided. As "Debian11" was not currenly loading "libclang.sh", a new script that performs this process was added to "coin/provisioning/qtci-linux-Debian-11.6-aarch64". The newly sourced "libclang.sh" includes "coin/provisiong/common/unix/common.sourced.sh", which sets up certain common variables such as the used architecture and the platform id. When "common.sourced.sh" sets "PROVISION_ARCH", that contains the current platform architecture, it fails if the platform architecture is not supported. For "Debian11" on "arm64", the architecture, as reported by "uname -m" is "aarch64", which is equivalent to "arm64". "aarch64" was not handled by the script, so that a platform with that architecture would result in a fail when sourcing "common.sourced.sh". To avoid the failure, the case that sets "PROVISIONING_ARCH" to "arm64" will not trigger when the reported architecture is "aarch64". The specialized RedHat case was update to work specifically for version 9, to use the new specifically built package for Rhel9.2. The default case, previously using an "ubuntu20.04" package, was modified to use a "Rhel8.8" package. A package for "Ubuntu20.04" is not currently provided anymore as the platform was removed from CI and the new "22.04" package is not compatible with all the platforms that would use it. In particular, the new packages are built on a too new glibc, which will then fail to link, due to undefined symbols in the produced Clang libraries, when used on older-glibc platforms such as "OpenSuse15" and "Rhel8.8". The "Rhel8.8" package was specifically used as the platform for the default package as it ships the older glibc, "2.28", of the supported platforms, which should ensure that it works on the older-version platforms. The "sha1" variables for cached downloads was updated to reflect the new packages. For provisioning on windows, the version variable and the sha1 variables were updated to reflect the new version and the new packages, respectively. Pick-to: 6.7 Task-number: QTBUG-111580 Task-number: QTBUG-121548 Change-Id: Ie7c1a8d8fe9114912d53a87f70ebfa00341a9d8a Reviewed-by: Paul Wicking Reviewed-by: Cristian Adam (cherry picked from commit 9975595a5e74e2abc38e4d721d5cd2740e814cf2) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/cmake_platforms.yaml | 2 +- coin/provisioning/common/unix/libclang.sh | 38 +++++++++---------- coin/provisioning/common/windows/libclang.ps1 | 18 +++++++-- .../08-libclang.ps1 | 1 + .../08-libclang.ps1 | 1 + 5 files changed, 37 insertions(+), 23 deletions(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index c0fac95b5df..cef8ebe6778 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -195,7 +195,7 @@ Configurations: 'Path=C:\llvm-mingw\bin;{{.Env.Path}}', 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_LLVM_MINGW}} -DQT_DEPLOY_FFMPEG=TRUE -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c', - 'LLVM_INSTALL_DIR=C:\llvm-mingw', + 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_llvm_mingw}}', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_llvm_mingw}}', ] - diff --git a/coin/provisioning/common/unix/libclang.sh b/coin/provisioning/common/unix/libclang.sh index 5f75d7e4f6e..5d0b423087c 100755 --- a/coin/provisioning/common/unix/libclang.sh +++ b/coin/provisioning/common/unix/libclang.sh @@ -20,33 +20,33 @@ PROVISIONING_DIR="$(dirname "$0")/../../" # shellcheck source=./common.sourced.sh source "$PROVISIONING_DIR"/common/unix/common.sourced.sh -libclang_version="15.0.0" +libclang_version="17.0.6" if uname -a |grep -q Darwin; then version=$libclang_version url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_$%7Bversion%7D-based-mac.7z" url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-release_$%7Bversion%7D-based-mac.7z" - sha1="6d916a17459c81551dde47580ae3f071e93338a5" -elif test -f /etc/redhat-release && grep "Red Hat" /etc/redhat-release | grep -v "8" ; then + sha1="e8ecc2fb0d7d7a0f60a50379f16fbf3eef679d78" +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_$%7Bversion%7D-based-linux-Rhel8.4-gcc10.0-x86_64.7z" - url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-release_$%7Bversion%7D-based-linux-Rhel8.4-gcc10.0-x86_64.7z" - sha1="6ca035bb522022d34d61759e0460845832933b5c" -elif [ "$PROVISIONING_OS_ID" = ubuntu ]; then - version=$libclang_version - url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_$%7Bversion%7D-based-linux-Ubuntu22.04-gcc11.2-x86_64.7z" - url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-release_$%7Bversion%7D-based-linux-Ubuntu22.04-gcc11.2-x86_64.7z" - sha1="dd170ec762a7ec8ac84b4b5cac3a422514e5b030" -elif [ "$PROVISIONING_OS_ID" = debian ]; then - version=17.0.1 - url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_$%7Bversion%7D-based-linux-Debian11.6-gcc10.0-arm64.7z" - url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-release_$%7Bversion%7D-based-linux-Debian11.6-gcc10.0-arm64.7z" - sha1="43f0210121b889107e3dab631e8104e661a3866b" + url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_$%7Bversion%7D-based-linux-Rhel9.2-gcc10.0-x86_64.7z" + url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-release_$%7Bversion%7D-based-linux-Rhel9.2-gcc10.0-x86_64.7z" + sha1="102374379af906bd26085fcd18047cac4d0fb7bf" +elif test "$PROVISIONING_OS_ID" == "ubuntu" ; then + version=$libclang_version + url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_$%7Bversion%7D-based-linux-Ubuntu22.04-gcc11.2-x86_64.7z" + url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-release_$%7Bversion%7D-based-linux-Ubuntu22.04-gcc11.2-x86_64.7z" + sha1="4a793c9da9a02bd23c163c74dbc5565164a00c3f" +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_$%7Bversion%7D-based-linux-Debian11.6-gcc10.0-arm64.7z" + url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-release_$%7Bversion%7D-based-linux-Debian11.6-gcc10.0-arm64.7z" + sha1="b5ff982738dbb6efe1a34ed26ff47fca2b1b3b93" else version=$libclang_version - url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_$%7Bversion%7D-based-linux-Ubuntu20.04-gcc9.3-x86_64.7z" - url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-release_$%7Bversion%7D-based-linux-Ubuntu20.04-gcc9.3-x86_64.7z" - sha1="bd6615012b8bdb2720a45ede56e05f6db7191843" + url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_$%7Bversion%7D-based-linux-Rhel8.8-gcc10.0-x86_64.7z" + url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-release_$%7Bversion%7D-based-linux-Rhel8.8-gcc10.0-x86_64.7z" + sha1="2a58cc71ad90eb6234c56ef7b141f32361b4312a" fi zip="/tmp/libclang.7z" diff --git a/coin/provisioning/common/windows/libclang.ps1 b/coin/provisioning/common/windows/libclang.ps1 index 57f420572ba..8e5c68450c4 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="15.0.0" +$libclang_version="17.0.6" Write-Output "libClang = $libclang_version" >> ~/versions.txt # PySide versions following 5.6 use a C++ parser based on Clang (http://clang.org/). @@ -38,7 +38,7 @@ $toolchainSuffix = "" if ( $toolchain -eq "vs2019" ) { if ( $archVer -eq 64 ) { - $sha1 = "e7c2d27f0e99d63e49225cb1be18c76a1e2a124b" + $sha1 = "7e3e474081d2e1d5d95c9743532de01b8e59b9aa" } else { $sha1 = "" @@ -48,7 +48,7 @@ if ( $toolchain -eq "vs2019" ) { if ( $toolchain -eq "mingw" ) { if ( $archVer -eq 64 ) { - $sha1 = "6c9300051533d5648ffe3e8ae1eb00decae8e6bf" + $sha1 = "b9e65f617cd8d6e8fb8ae734383f03f6a7b202ed" } else { $sha1 = "" @@ -56,6 +56,18 @@ if ( $toolchain -eq "mingw" ) { $toolchainSuffix = "mingw" } +if ( $toolchain -eq "llvm-mingw" ) { + if ( $archVer -eq 64 ) { + $sha1 = "1844f107d067b69deabf375fc024848c1c8b015d" + } + else { + $sha1 = "" + } + # Due to COIN-1137 forced to use a '_' instead of '-' + $toolchainSuffix = "llvm_mingw" +} + + install $sha1 $baseDestination-$archVer if ( $setDefault ) { 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 7681f01a44e..88247275d9b 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,3 +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 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 7681f01a44e..88247275d9b 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,3 +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 From 128b526cea28232e269160e909f0343e23643e8e Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 13 Jul 2024 04:01:59 +0000 Subject: [PATCH 062/288] Update submodules on '6.8 in qt/qt5' Change-Id: I0b04c7cf3af631ef7d6924137d8c0c14b7e91067 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 6df39e5d0d9..005d6be5219 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 6df39e5d0d9350f366d589111a2b92a1254985c6 +Subproject commit 005d6be5219a37ecb48dd5bd7a126b3e7b2d9476 diff --git a/qt5compat b/qt5compat index c469be98c7d..c327afb57bc 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit c469be98c7df0a9259404157938f5c10246d1b61 +Subproject commit c327afb57bc04e75fab31c74f2dfc93992bce03d diff --git a/qtactiveqt b/qtactiveqt index 8fc270d2016..10f4e08f5fd 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 8fc270d20161bde24f09f8f09e410aac976513b7 +Subproject commit 10f4e08f5fd7a1e476c53ad769d6f43e07756b5d diff --git a/qtbase b/qtbase index 2bc06478050..f727474ee66 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 2bc064780508919a0b1f4610dbccfa66831703fd +Subproject commit f727474ee66f5b927cde382098041a6a771ac087 diff --git a/qtcharts b/qtcharts index ab36672e145..32041cbeb4c 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit ab36672e145528658298be8a3be088a9254e0a51 +Subproject commit 32041cbeb4cedc5f80f06868054d39a6478585d7 diff --git a/qtcoap b/qtcoap index 2a17635cab0..2609432f052 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit 2a17635cab0bfeff684c93efa477bf2f7c903d4e +Subproject commit 2609432f0525ff2a3e9d515617af0b047b9a3dad diff --git a/qtconnectivity b/qtconnectivity index b83ae49a8e6..9a2955fc047 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit b83ae49a8e6105322aa370c770f5051c282c3ea4 +Subproject commit 9a2955fc0478cfe647c580b49b4e69417d01ff32 diff --git a/qtdatavis3d b/qtdatavis3d index 2ebb2413334..d1ec5564a7e 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 2ebb241333457939c27bd986814bd5623c073aa8 +Subproject commit d1ec5564a7ef15d72387652d154ebe58e85219b7 diff --git a/qtdeclarative b/qtdeclarative index df193621ede..6b21cd12e3d 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit df193621ede18ee1166281435750fc1980b3bc1f +Subproject commit 6b21cd12e3d20af2c374e5fbe4a8e3021a7addd3 diff --git a/qtdoc b/qtdoc index e083d254537..96e2f587419 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit e083d254537095128f1063726586db03e2042219 +Subproject commit 96e2f5874193fea1655a0d9fba3f49a781e79db8 diff --git a/qtgraphs b/qtgraphs index 5967af8eaa7..24a8e66184c 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit 5967af8eaa7e246aa17626dce91214f3498fdcbe +Subproject commit 24a8e66184ce3a1d770aca32b482f13c8ccd4f63 diff --git a/qtgrpc b/qtgrpc index bb4864b9241..734dae1294e 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit bb4864b9241ef464b9ae5aab644980f3926c61e5 +Subproject commit 734dae1294e40da53a1d983d4ffa9346b5662691 diff --git a/qthttpserver b/qthttpserver index 6884d5ceca6..a4b1086d93e 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit 6884d5ceca6dd0a5bce3576b6f8f144891c9c3a1 +Subproject commit a4b1086d93e9142f74efa71a95ce1a1d3e114703 diff --git a/qtimageformats b/qtimageformats index 9635c58b734..a129b71f0d5 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 9635c58b7346c8725b78c41042d64d149cb5a805 +Subproject commit a129b71f0d57c5366acaf81e5b604480faa3c340 diff --git a/qtlanguageserver b/qtlanguageserver index 5c2d1208101..c009e0b6c32 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit 5c2d120810189e1851a0d81fef299802ecabfee7 +Subproject commit c009e0b6c32879563b283910d57b33f92905822a diff --git a/qtlocation b/qtlocation index 23837fa629e..a0c48726116 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 23837fa629ed5183511c3bf17109779ec59288ec +Subproject commit a0c4872611665c036a2a90c9baa25427b516fb00 diff --git a/qtlottie b/qtlottie index cb5f0e76adc..a5cde8c4812 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit cb5f0e76adc783308dc2278dc4e8a71bbeb38385 +Subproject commit a5cde8c481200ff62b58da1228253c1797fdb969 diff --git a/qtmqtt b/qtmqtt index 84b614fa552..e422f2b7a34 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit 84b614fa5522099160b17f99828648df5e6d45d7 +Subproject commit e422f2b7a343bc534e0009f464475e3a4f5ef085 diff --git a/qtmultimedia b/qtmultimedia index 82a3213ca46..b1b54bcaab1 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 82a3213ca467ffd2c42fd6344982a89d63c93257 +Subproject commit b1b54bcaab1693e554db09550673569c8846fc5a diff --git a/qtnetworkauth b/qtnetworkauth index 7f1c1cb371c..8c0fdd172f8 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 7f1c1cb371c53d61aa4b82a6c642bb9059444646 +Subproject commit 8c0fdd172f8e3d065bf56695b533eff1fa823e6f diff --git a/qtopcua b/qtopcua index f0382dad20a..655ccb59682 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit f0382dad20ab400429d26c80c73818ebeaf3438c +Subproject commit 655ccb59682adc9756b174ecf8184a9787918dfe diff --git a/qtpositioning b/qtpositioning index 31a8040367a..fde5b24156d 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit 31a8040367a3d79f1970799d283acb1be8e4f23b +Subproject commit fde5b24156d54a646e5f19fca7a0ac3e01f9b175 diff --git a/qtquick3d b/qtquick3d index eaec35c367e..45f7fc2f807 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit eaec35c367e72c74e6090ac7d5ee5ba014fae562 +Subproject commit 45f7fc2f80757c6804d43cafe05e7e51d9e7bbc7 diff --git a/qtquick3dphysics b/qtquick3dphysics index 1b8291fbeec..e2a962d502e 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit 1b8291fbeec1e59465ed831bbb82bfbba28786a1 +Subproject commit e2a962d502ec1ba57f224ce89380bf88cc6bcbd8 diff --git a/qtquickeffectmaker b/qtquickeffectmaker index 93604fff51e..3666ed6a7e3 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit 93604fff51efceeac1ca340cd9e03a80b9cad4cd +Subproject commit 3666ed6a7e379cf90cdf464d7d811110be5bd68c diff --git a/qtquicktimeline b/qtquicktimeline index 2d127184699..7080105c38d 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 2d12718469917f601b3bf3eb38942ac2fae66d26 +Subproject commit 7080105c38d450331bd1f69384c958f9fa4429fb diff --git a/qtremoteobjects b/qtremoteobjects index 3d4d2020177..229830e80a4 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 3d4d2020177a67453e8f14c953f83684001b9c45 +Subproject commit 229830e80a4448a1a72a794d072550e6401aeaf6 diff --git a/qtrepotools b/qtrepotools index e2839f90926..a2324d1e746 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit e2839f90926befcb013f92f291dcf2f8dc327b54 +Subproject commit a2324d1e7463ccbb1234f944684297d565c2ef68 diff --git a/qtscxml b/qtscxml index eb61a0e8ead..994639a737f 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit eb61a0e8ead3abb67226e5045e0ce5c597e1f20e +Subproject commit 994639a737f6f56dbc6b6e34d34ff6fe3349c4d5 diff --git a/qtsensors b/qtsensors index 151f818c9a2..21f3b10a156 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 151f818c9a265f92b4530b35dd18be4965dee480 +Subproject commit 21f3b10a156604972b7c08872eeff2d29ac5eebc diff --git a/qtserialbus b/qtserialbus index 457424d1c49..4346e7f6084 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 457424d1c49f67b8b4df3fc4825b45e3aa831341 +Subproject commit 4346e7f60845b26aee51e856bb81f97e39572de7 diff --git a/qtserialport b/qtserialport index d81a9da6574..84f0542093a 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit d81a9da6574151b542c3891d229fb60e00b43634 +Subproject commit 84f0542093a3cbd9223295ea656def0d5611b6dd diff --git a/qtshadertools b/qtshadertools index 6503d3223f8..1c4393a0f90 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 6503d3223f82e94f32cd67e536be6ed7a979d520 +Subproject commit 1c4393a0f90fe631508bed6042b2c17c7f0ed4e7 diff --git a/qtspeech b/qtspeech index 2c53c9550b1..59cff8c3594 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 2c53c9550b1073e77a5ad163985619cb07c69592 +Subproject commit 59cff8c3594a12a20c21824fc7c427e2ece058bf diff --git a/qtsvg b/qtsvg index 0cb481944d4..d3a5814393b 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 0cb481944d4ce4a5e2350452ce1a50fd4f5bcd33 +Subproject commit d3a5814393bc61c011bf4b6a7ac1595a1c5dc910 diff --git a/qttools b/qttools index a5a69456bf8..0cabf7a4f3b 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit a5a69456bf87773b671aca85373085a948408ff9 +Subproject commit 0cabf7a4f3b7d9ee300d22613a7545a63a522d06 diff --git a/qttranslations b/qttranslations index fc2068dae56..ba581f0451a 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit fc2068dae56afd302835e5ffb77b6214fbf80c47 +Subproject commit ba581f0451a46dce0a2e192934d61461261fd4f3 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 66ee0cc3574..afdea5ea79c 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 66ee0cc3574eecc2e80241be39d976596355bed6 +Subproject commit afdea5ea79cc98f0d80fb3b1bd5186f2cf2f8e75 diff --git a/qtwayland b/qtwayland index 750e11e5e57..81a91ca60ef 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 750e11e5e577be0230efc0e19db3097b6ad4e0e6 +Subproject commit 81a91ca60ef452ab9decef2a646c5cc1e39a5b8d diff --git a/qtwebchannel b/qtwebchannel index abad90db61a..bc034a51e65 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit abad90db61a76dc0e1faaa2034837a8612bcdd83 +Subproject commit bc034a51e65392d03458b6068a3a121a3a60a3d2 diff --git a/qtwebengine b/qtwebengine index f27fa91cf0f..d698419f73f 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit f27fa91cf0fd102de148edec9ac54ea2b0fb69cf +Subproject commit d698419f73f8f125f806b95cb3fb9c203122565d diff --git a/qtwebsockets b/qtwebsockets index b2f3da3985b..3dade2774f9 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit b2f3da3985b38eb70d3e45b8509ee75e6a7418b2 +Subproject commit 3dade2774f9fc4aca0b8cf22c5c567253f3148b2 diff --git a/qtwebview b/qtwebview index 27b64319c61..d242089d63f 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 27b64319c615785b8ba9f52ff8fdd266d900e307 +Subproject commit d242089d63fd098e9a784d6ce879fcc675dc9196 From 367cacbb01522a3960116c0c99590106a3de6a9b Mon Sep 17 00:00:00 2001 From: Dominik Holland Date: Mon, 15 Jul 2024 10:17:03 +0200 Subject: [PATCH 063/288] Provisioning: Apply the bwrap fix also to Ubuntu 24.04_x86 Change-Id: I8a5e93e7ed04ed9b090209696e649835a88604a5 Reviewed-by: Robert Griebl (cherry picked from commit e6a7a49d2f6f2aecf3ace268eb3f5e5bd996e339) Reviewed-by: Qt Cherry-pick Bot --- .../qtci-linux-Ubuntu-24.04-x86_64/03-fix-bwrap-apparmor.sh | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/03-fix-bwrap-apparmor.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/03-fix-bwrap-apparmor.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/03-fix-bwrap-apparmor.sh new file mode 100644 index 00000000000..e155338ab4d --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/03-fix-bwrap-apparmor.sh @@ -0,0 +1,6 @@ +#!/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=../common/linux/fix-bwrap-apparmor.sh +source "${BASH_SOURCE%/*}/../common/linux/fix-bwrap-apparmor.sh" From ffe464c889f4bb6f3a51af1807d71f7da1a346a7 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 16 Jul 2024 12:17:12 +0000 Subject: [PATCH 064/288] Update submodules on '6.8 in qt/qt5' Change-Id: I8bc76743e19a71fca96c15e3984ead1f30c1ec0c 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 005d6be5219..9c45a1fb282 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 005d6be5219a37ecb48dd5bd7a126b3e7b2d9476 +Subproject commit 9c45a1fb282908ec293c6c9410b502fa18769f24 diff --git a/qt5compat b/qt5compat index c327afb57bc..65f470a24ff 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit c327afb57bc04e75fab31c74f2dfc93992bce03d +Subproject commit 65f470a24ffdbf0791e21755d757fc89c02f2a28 diff --git a/qtactiveqt b/qtactiveqt index 10f4e08f5fd..ec6e262650f 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 10f4e08f5fd7a1e476c53ad769d6f43e07756b5d +Subproject commit ec6e262650fa43ef2ebfae0220b00aecfda96ccc diff --git a/qtbase b/qtbase index f727474ee66..91078076533 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit f727474ee66f5b927cde382098041a6a771ac087 +Subproject commit 910780765332173bad18c1ca659dd53dc3b12ceb diff --git a/qtcharts b/qtcharts index 32041cbeb4c..98bfc5a1060 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 32041cbeb4cedc5f80f06868054d39a6478585d7 +Subproject commit 98bfc5a1060cf7b86c12f99bf70b8458b421bfde diff --git a/qtcoap b/qtcoap index 2609432f052..3c9321c2a38 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit 2609432f0525ff2a3e9d515617af0b047b9a3dad +Subproject commit 3c9321c2a38eaf198591932804453aed5d223f6a diff --git a/qtconnectivity b/qtconnectivity index 9a2955fc047..fef85e1e98c 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 9a2955fc0478cfe647c580b49b4e69417d01ff32 +Subproject commit fef85e1e98cf9b4dbcd586bc271e4bce1ab34347 diff --git a/qtdatavis3d b/qtdatavis3d index d1ec5564a7e..918b280b40b 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit d1ec5564a7ef15d72387652d154ebe58e85219b7 +Subproject commit 918b280b40b96a0f4e56d6a80127e99c27f09ce8 diff --git a/qtdeclarative b/qtdeclarative index 6b21cd12e3d..321c8a88eb5 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 6b21cd12e3d20af2c374e5fbe4a8e3021a7addd3 +Subproject commit 321c8a88eb575749cca8d5116b2a131c7932f74d diff --git a/qtdoc b/qtdoc index 96e2f587419..665f45e1db8 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 96e2f5874193fea1655a0d9fba3f49a781e79db8 +Subproject commit 665f45e1db82e8e1f43cc5e8eec0c8d2e04b47d8 diff --git a/qtgraphs b/qtgraphs index 24a8e66184c..f360f3f8466 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit 24a8e66184ce3a1d770aca32b482f13c8ccd4f63 +Subproject commit f360f3f8466c2780cec2d320609a439840cff618 diff --git a/qtgrpc b/qtgrpc index 734dae1294e..0e09cbeafac 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit 734dae1294e40da53a1d983d4ffa9346b5662691 +Subproject commit 0e09cbeafac6e95f7e2e6aafe8f2f0e1ebacd9a9 diff --git a/qthttpserver b/qthttpserver index a4b1086d93e..82021d498c8 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit a4b1086d93e9142f74efa71a95ce1a1d3e114703 +Subproject commit 82021d498c8e63fc227da7fd75782c24809a1d23 diff --git a/qtimageformats b/qtimageformats index a129b71f0d5..81e55053c08 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit a129b71f0d57c5366acaf81e5b604480faa3c340 +Subproject commit 81e55053c081814c934ad39aafbbb3016210268d diff --git a/qtlanguageserver b/qtlanguageserver index c009e0b6c32..65c9508140e 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit c009e0b6c32879563b283910d57b33f92905822a +Subproject commit 65c9508140ebe277c20aa8d96b8454fc94ee84dc diff --git a/qtlocation b/qtlocation index a0c48726116..24796edd9c4 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit a0c4872611665c036a2a90c9baa25427b516fb00 +Subproject commit 24796edd9c4aa494c12edc016ea9a73a7686dbba diff --git a/qtlottie b/qtlottie index a5cde8c4812..b7be912b9f6 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit a5cde8c481200ff62b58da1228253c1797fdb969 +Subproject commit b7be912b9f6b88571345ed3299f112c74a9dead6 diff --git a/qtmqtt b/qtmqtt index e422f2b7a34..f1adbef977e 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit e422f2b7a343bc534e0009f464475e3a4f5ef085 +Subproject commit f1adbef977e38a54c987d67058c90a89ff59e81f diff --git a/qtmultimedia b/qtmultimedia index b1b54bcaab1..4e103ab8949 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit b1b54bcaab1693e554db09550673569c8846fc5a +Subproject commit 4e103ab89499acd03f467d766067c58c00a82b0f diff --git a/qtnetworkauth b/qtnetworkauth index 8c0fdd172f8..0461d508262 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 8c0fdd172f8e3d065bf56695b533eff1fa823e6f +Subproject commit 0461d5082627ce0089fd1ddbd6bd763b96813ae8 diff --git a/qtopcua b/qtopcua index 655ccb59682..7055eee1d76 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit 655ccb59682adc9756b174ecf8184a9787918dfe +Subproject commit 7055eee1d76edb57eb2c45eef0ee738fa7394f95 diff --git a/qtpositioning b/qtpositioning index fde5b24156d..ea75bd6c9a1 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit fde5b24156d54a646e5f19fca7a0ac3e01f9b175 +Subproject commit ea75bd6c9a1df3f91c718e7a6a20f582405bd913 diff --git a/qtquick3d b/qtquick3d index 45f7fc2f807..4a7974e633c 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 45f7fc2f80757c6804d43cafe05e7e51d9e7bbc7 +Subproject commit 4a7974e633c22df186dc4ee6b2804539cf7ac885 diff --git a/qtquick3dphysics b/qtquick3dphysics index e2a962d502e..13c7694c092 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit e2a962d502ec1ba57f224ce89380bf88cc6bcbd8 +Subproject commit 13c7694c0927f16649d72a2a01e8b0339b2f5ce2 diff --git a/qtquickeffectmaker b/qtquickeffectmaker index 3666ed6a7e3..8cd85afaf7b 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit 3666ed6a7e379cf90cdf464d7d811110be5bd68c +Subproject commit 8cd85afaf7b0f733d2869defa561651e3a49c156 diff --git a/qtquicktimeline b/qtquicktimeline index 7080105c38d..341c2feb358 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 7080105c38d450331bd1f69384c958f9fa4429fb +Subproject commit 341c2feb3589a10c89c5da294f9be7e59acce460 diff --git a/qtremoteobjects b/qtremoteobjects index 229830e80a4..3f7676ba1b3 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 229830e80a4448a1a72a794d072550e6401aeaf6 +Subproject commit 3f7676ba1b363ab62304b68a254719ba1591ca8f diff --git a/qtscxml b/qtscxml index 994639a737f..28b0ad6a252 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 994639a737f6f56dbc6b6e34d34ff6fe3349c4d5 +Subproject commit 28b0ad6a252439f3a38657f64c7eb9cbeb47be76 diff --git a/qtsensors b/qtsensors index 21f3b10a156..6fc6f059cb3 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 21f3b10a156604972b7c08872eeff2d29ac5eebc +Subproject commit 6fc6f059cb3f8535810145aa158afc3911769163 diff --git a/qtserialbus b/qtserialbus index 4346e7f6084..60888180338 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 4346e7f60845b26aee51e856bb81f97e39572de7 +Subproject commit 60888180338b0d9b6cd5999b694f8e9b5c51bfd5 diff --git a/qtserialport b/qtserialport index 84f0542093a..7553f7cf8d7 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 84f0542093a3cbd9223295ea656def0d5611b6dd +Subproject commit 7553f7cf8d76ca4a2f32675437e510e15f746574 diff --git a/qtshadertools b/qtshadertools index 1c4393a0f90..d8858aa464f 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 1c4393a0f90fe631508bed6042b2c17c7f0ed4e7 +Subproject commit d8858aa464f9c4d2a6c4c3f548a6911956eb34a9 diff --git a/qtspeech b/qtspeech index 59cff8c3594..26e61a13560 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 59cff8c3594a12a20c21824fc7c427e2ece058bf +Subproject commit 26e61a13560b7499d7506e0b06302b7433c322f0 diff --git a/qtsvg b/qtsvg index d3a5814393b..6345ded9048 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit d3a5814393bc61c011bf4b6a7ac1595a1c5dc910 +Subproject commit 6345ded90484f70a3a75cf38a7cee3a225687e20 diff --git a/qttools b/qttools index 0cabf7a4f3b..eedf2f68c59 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 0cabf7a4f3b7d9ee300d22613a7545a63a522d06 +Subproject commit eedf2f68c5918074443b556183ab4068d7255d01 diff --git a/qttranslations b/qttranslations index ba581f0451a..0553c40b380 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit ba581f0451a46dce0a2e192934d61461261fd4f3 +Subproject commit 0553c40b3803ca268c59ee4e92d4398bd4a7bdfe diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index afdea5ea79c..3418578ee2e 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit afdea5ea79cc98f0d80fb3b1bd5186f2cf2f8e75 +Subproject commit 3418578ee2eca8db5d18c224083af735540791f1 diff --git a/qtwayland b/qtwayland index 81a91ca60ef..5eef4fb3b0d 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 81a91ca60ef452ab9decef2a646c5cc1e39a5b8d +Subproject commit 5eef4fb3b0d31b9df6d48887b905c81f58396c32 diff --git a/qtwebchannel b/qtwebchannel index bc034a51e65..40451b71142 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit bc034a51e65392d03458b6068a3a121a3a60a3d2 +Subproject commit 40451b711429d04347cdd010b904699303d311a4 diff --git a/qtwebengine b/qtwebengine index d698419f73f..3036e77a156 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit d698419f73f8f125f806b95cb3fb9c203122565d +Subproject commit 3036e77a156c6770716e95b196e0afcf00275cca diff --git a/qtwebsockets b/qtwebsockets index 3dade2774f9..81fe97dc276 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 3dade2774f9fc4aca0b8cf22c5c567253f3148b2 +Subproject commit 81fe97dc2765066fc0165f3359f3fc8334d04002 diff --git a/qtwebview b/qtwebview index d242089d63f..62943f46e6a 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit d242089d63fd098e9a784d6ce879fcc675dc9196 +Subproject commit 62943f46e6ac3f5ef88eb09151e86832bc8b172f From 9d37579b5d56fb602f207e9ecd323698853ffca4 Mon Sep 17 00:00:00 2001 From: Jari Helaakoski Date: Mon, 27 May 2024 13:20:19 +0300 Subject: [PATCH 065/288] Enable unit test build for QtLite configuration Task-number: QTBUG-122999 Change-Id: I7be6b2cd28a3e8f319f10c33d39245ccd528a552 Reviewed-by: Heikki Halmet Reviewed-by: Alex Bu Reviewed-by: Tero Heikkinen (cherry picked from commit 055cfcd501f427b0253bfe123e4ef3f5a6b816c9) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/qtlite.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/coin/platform_configs/qtlite.yaml b/coin/platform_configs/qtlite.yaml index b339c0e6c40..9724ac601c1 100644 --- a/coin/platform_configs/qtlite.yaml +++ b/coin/platform_configs/qtlite.yaml @@ -4,7 +4,7 @@ Configurations: Id: 'debian-11.6-static-qtlite-arm64' Template: 'qtci-linux-Debian-11.6-aarch64-50' Compiler: 'GCC' - Features: ['UseConfigure', 'DisableTests'] + Features: ['UseConfigure', 'DoNotRunTests', 'MinimalStaticTests'] Configure arguments: > -nomake examples -release @@ -147,7 +147,6 @@ Configurations: -no-feature-systemtrayicon -no-feature-tabletevent -no-feature-tablewidget - -no-feature-testlib -no-feature-textbrowser -no-feature-texthtmlparser -no-feature-textmarkdownreader From 279225024221485a4883cec69d3f4dd9a86534db Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Thu, 18 Jul 2024 11:53:45 +0200 Subject: [PATCH 066/288] Update qtqa sha1 to latest qtqa/dev/HEAD to fix an SBOM issue Bring in a435bfcc674707855e6f6e3ad315fc6747c944d5 from qtqa to ensure SBOM generation can be enabled in 6.8 branch. Change-Id: I35245844f74ba6ffb2a1852ef040a785254f360f Reviewed-by: Daniel Smith --- qtqa | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtqa b/qtqa index b77c911a9c6..4bfb694a7ff 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit b77c911a9c68d9c2956130e8c108dad8052573ee +Subproject commit 4bfb694a7ff5229c63d0bdcea13b296792af3f88 From a0669026274ad50101472757e82a88046f32f56b Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 21 May 2024 13:27:44 +0200 Subject: [PATCH 067/288] coin: Mark platforms that should generate an SBOM Task-number: QTBUG-122899 Change-Id: I3722c048ec4be894a09d3b023d6af95d4dfedc6f Reviewed-by: Joerg Bornemann (cherry picked from commit 3017e86d5459b9d158c3151fc358630142731ac8) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/cmake_platforms.yaml | 20 +++++++++---------- .../cmake_platforms_qemu.yaml | 2 +- .../cmake_platforms_qemu_qnx710.yaml | 6 +++--- .../cmake_platforms_target_android.yaml | 8 ++++---- .../cmake_platforms_wasm.yaml | 4 ++-- coin/platform_configs/macos.yaml | 2 +- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index cef8ebe6778..ed008b5c45e 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -19,7 +19,7 @@ Configurations: Id: 'ubuntu-22.04' Template: 'qtci-linux-Ubuntu-22.04-x86_64-51' Compiler: 'GCC' - Features: ['Sccache', 'UseConfigure', 'DoNotRunTests'] + Features: ['Sccache', 'UseConfigure', 'DoNotRunTests', 'GenerateSBOM'] 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', @@ -76,7 +76,7 @@ Configurations: Id: 'sles-15_sp5-static' Template: 'qtci-linux-SLES-15_SP5-x86_64-50' Compiler: 'GCC' - Features: ['Sccache', 'DisableTests', 'UseConfigure'] + Features: ['Sccache', 'DisableTests', 'UseConfigure', 'GenerateSBOM'] Configure arguments: '-nomake examples -static -no-sql-mysql' Environment variables: [ 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}', @@ -86,7 +86,7 @@ Configurations: Id: 'windows-10_22h2-msvc2022' Template: 'qtci-windows-10_22H2-x86_64-51' Compiler: 'MSVC2022' - Features: ['Sccache', "DebugAndRelease", 'UseConfigure'] + Features: ['Sccache', "DebugAndRelease", 'UseConfigure', 'GenerateSBOM'] 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}}', @@ -98,7 +98,7 @@ Configurations: Id: 'windows-11_23H2-msvc2022' Template: 'qtci-windows-11_23H2-x86_64-52' Compiler: 'MSVC2022' - Features: ['Sccache', "DebugAndRelease", 'UseConfigure', 'Packaging'] + Features: ['Sccache', "DebugAndRelease", 'UseConfigure', 'Packaging', 'GenerateSBOM'] 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}}\..', @@ -110,7 +110,7 @@ Configurations: Id: 'windows-11_22h2-arm64-msvc2022' Template: 'qtci-windows-11_22H2-aarch64-51' Compiler: 'MSVC2022' - Features: ['Packaging', 'DebugAndRelease', 'UseConfigure', 'InsignificantTests'] + Features: ['Packaging', 'DebugAndRelease', 'UseConfigure', 'InsignificantTests', 'GenerateSBOM'] Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib -no-sql-psql -no-opengl' Environment variables: [ 'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_arm64}}\..', @@ -121,7 +121,7 @@ Configurations: Id: 'rhel-8.8' Template: 'qtci-linux-RHEL-8.8-x86_64-50' Compiler: 'GCC' - Features: ['Packaging', 'Sccache', 'UseConfigure', 'InstallQt5Dependencies'] + Features: ['Packaging', 'Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'GenerateSBOM'] 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}}', @@ -131,7 +131,7 @@ Configurations: Id: 'rhel-9.2' Template: 'qtci-linux-RHEL-9.2-x86_64-51' Compiler: 'GCC' - Features: ['Sccache', 'UseConfigure', 'InstallQt5Dependencies'] + Features: ['Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'GenerateSBOM'] 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', @@ -167,7 +167,7 @@ Configurations: Compiler: 'Clang' Target compiler: 'Clang' Platform dependency: 'macos-universal-on-x86_64' - Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests', 'UseConfigure', 'WarningsAreErrors'] + Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests', 'UseConfigure', 'WarningsAreErrors', 'GenerateSBOM'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-debug-and-release -nomake examples -platform macx-ios-clang', 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include -DFFMPEG_DIR={{.Env.FFMPEG_DIR_IOS}} -DQT_DEPLOY_FFMPEG=TRUE', @@ -176,7 +176,7 @@ Configurations: Id: 'windows-10_22h2-mingw13' Template: 'qtci-windows-10_22H2-x86_64-51' Compiler: 'Mingw' - Features: ['Packaging', 'Sccache', 'UseConfigure'] + Features: ['Packaging', 'Sccache', 'UseConfigure', 'GenerateSBOM'] Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples' Environment variables: [ 'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}', @@ -189,7 +189,7 @@ Configurations: Id: 'windows-11_23H2-llvm' Template: 'qtci-windows-11_23H2-x86_64-52' Compiler: 'Clang' - Features: ['Packaging','Sccache', 'UseConfigure'] + Features: ['Packaging','Sccache', 'UseConfigure', 'GenerateSBOM'] Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples' Environment variables: [ 'Path=C:\llvm-mingw\bin;{{.Env.Path}}', diff --git a/coin/platform_configs/cmake_platforms_qemu.yaml b/coin/platform_configs/cmake_platforms_qemu.yaml index 891a19df980..229025fcf84 100644 --- a/coin/platform_configs/cmake_platforms_qemu.yaml +++ b/coin/platform_configs/cmake_platforms_qemu.yaml @@ -41,7 +41,7 @@ Configurations: Target arch: 'mips64' Compiler: 'GCC' Platform dependency: 'ubuntu-22.04' - Features: ['Sccache', 'DisableTests', 'UseConfigure'] + Features: ['Sccache', 'DisableTests', 'UseConfigure', 'GenerateSBOM'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-warnings-are-errors -nomake examples -qt-harfbuzz -device linux-generic-g++ -device-option "CROSS_COMPILE={{.Env.QEMUMIPS64_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=boot2qt" -no-feature-forkfd_pidfd', 'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUMIPS64_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 21b9b30dd93..99de2f65107 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: ['Packaging', 'VMSize8', 'UseConfigure'] + Features: ['Packaging', 'VMSize8', 'UseConfigure', 'GenerateSBOM'] 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', @@ -24,7 +24,7 @@ Configurations: Compiler: 'GCC' Target compiler: 'QCC' Platform dependency: 'ubuntu-22.04' - Features: ['Packaging', 'DisableTests', 'UseConfigure'] + Features: ['Packaging', 'DisableTests', 'UseConfigure', 'GenerateSBOM'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples', 'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-aarch64le.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', @@ -38,7 +38,7 @@ Configurations: Compiler: 'GCC' Target compiler: 'QCC' Platform dependency: 'ubuntu-22.04' - Features: ['Packaging', 'DisableTests', 'UseConfigure'] + Features: ['Packaging', 'DisableTests', 'UseConfigure', 'GenerateSBOM'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples', 'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-armv7le.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', diff --git a/coin/platform_configs/cmake_platforms_target_android.yaml b/coin/platform_configs/cmake_platforms_target_android.yaml index 12f0a335bc0..15ba8fe9480 100644 --- a/coin/platform_configs/cmake_platforms_target_android.yaml +++ b/coin/platform_configs/cmake_platforms_target_android.yaml @@ -8,7 +8,7 @@ Configurations: Compiler: 'Clang' Target compiler: 'Clang' Platform dependency: 'macos-universal-on-x86_64' - Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'DisableTests', 'UseConfigure'] + Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'DisableTests', 'UseConfigure', 'GenerateSBOM'] 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', @@ -23,7 +23,7 @@ Configurations: Compiler: 'Mingw' Target compiler: 'Clang' Platform dependency: 'windows-10_22h2-mingw13' - Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'DisableTests', 'UseConfigure'] + Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'DisableTests', 'UseConfigure', 'GenerateSBOM'] 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', @@ -39,7 +39,7 @@ Configurations: Compiler: 'GCC' Target compiler: 'Clang' Platform dependency: 'rhel-8.8' - Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure'] + Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM'] 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.8' - Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure'] + Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM'] 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/cmake_platforms_wasm.yaml b/coin/platform_configs/cmake_platforms_wasm.yaml index 34b261413b4..fb46da2c160 100644 --- a/coin/platform_configs/cmake_platforms_wasm.yaml +++ b/coin/platform_configs/cmake_platforms_wasm.yaml @@ -19,7 +19,7 @@ Configurations: Compiler: 'Mingw' Target compiler: 'Clang' Platform dependency: 'windows-10_22h2-mingw13' - Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure'] + Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure', 'GenerateSBOM'] 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.5-developer-build' - Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure'] + Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure', 'GenerateSBOM'] Environment variables: [ 'EM_CONFIG={{.Env.EMSDK}}/.emscripten', 'TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples -feature-thread', diff --git a/coin/platform_configs/macos.yaml b/coin/platform_configs/macos.yaml index d715b338cbe..926e027f681 100644 --- a/coin/platform_configs/macos.yaml +++ b/coin/platform_configs/macos.yaml @@ -12,7 +12,7 @@ Configurations: Template: 'qtci-macos-14-x86_64-105' Compiler: 'Clang' Target arch: 'x86_64-arm64' - Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure'] + Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure', 'GenerateSBOM'] 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}}', From 3624ced5cf6ac628ff60d1a77e1821b512f30e6f Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 12 Jun 2024 12:39:17 +0200 Subject: [PATCH 068/288] coin: Mark platforms that should verify the generated SBOM Task-number: QTBUG-122899 Change-Id: Ia4854f3af188e971b555cc1bd7bd6463fbbf7273 Reviewed-by: Joerg Bornemann (cherry picked from commit 562b56c8d78c4e31410966fad25a1d10f481a75f) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/cmake_platforms.yaml | 20 +++++++++---------- .../cmake_platforms_qemu.yaml | 2 +- .../cmake_platforms_qemu_qnx710.yaml | 6 +++--- .../cmake_platforms_target_android.yaml | 8 ++++---- .../cmake_platforms_wasm.yaml | 4 ++-- coin/platform_configs/macos.yaml | 2 +- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index ed008b5c45e..210ce2cdd98 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -19,7 +19,7 @@ Configurations: Id: 'ubuntu-22.04' Template: 'qtci-linux-Ubuntu-22.04-x86_64-51' Compiler: 'GCC' - Features: ['Sccache', 'UseConfigure', 'DoNotRunTests', 'GenerateSBOM'] + Features: ['Sccache', 'UseConfigure', 'DoNotRunTests', 'GenerateSBOM', 'VerifySBOM'] 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', @@ -76,7 +76,7 @@ Configurations: Id: 'sles-15_sp5-static' Template: 'qtci-linux-SLES-15_SP5-x86_64-50' Compiler: 'GCC' - Features: ['Sccache', 'DisableTests', 'UseConfigure', 'GenerateSBOM'] + Features: ['Sccache', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] Configure arguments: '-nomake examples -static -no-sql-mysql' Environment variables: [ 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}', @@ -86,7 +86,7 @@ Configurations: Id: 'windows-10_22h2-msvc2022' Template: 'qtci-windows-10_22H2-x86_64-51' Compiler: 'MSVC2022' - Features: ['Sccache', "DebugAndRelease", 'UseConfigure', 'GenerateSBOM'] + 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}}', @@ -98,7 +98,7 @@ Configurations: Id: 'windows-11_23H2-msvc2022' Template: 'qtci-windows-11_23H2-x86_64-52' Compiler: 'MSVC2022' - Features: ['Sccache', "DebugAndRelease", 'UseConfigure', 'Packaging', 'GenerateSBOM'] + 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}}\..', @@ -110,7 +110,7 @@ Configurations: Id: 'windows-11_22h2-arm64-msvc2022' Template: 'qtci-windows-11_22H2-aarch64-51' Compiler: 'MSVC2022' - Features: ['Packaging', 'DebugAndRelease', 'UseConfigure', 'InsignificantTests', 'GenerateSBOM'] + Features: ['Packaging', 'DebugAndRelease', 'UseConfigure', 'InsignificantTests', 'GenerateSBOM', 'VerifySBOM'] Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib -no-sql-psql -no-opengl' Environment variables: [ 'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_arm64}}\..', @@ -121,7 +121,7 @@ Configurations: Id: 'rhel-8.8' Template: 'qtci-linux-RHEL-8.8-x86_64-50' Compiler: 'GCC' - Features: ['Packaging', 'Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'GenerateSBOM'] + 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}}', @@ -131,7 +131,7 @@ Configurations: Id: 'rhel-9.2' Template: 'qtci-linux-RHEL-9.2-x86_64-51' Compiler: 'GCC' - Features: ['Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'GenerateSBOM'] + 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', @@ -167,7 +167,7 @@ Configurations: Compiler: 'Clang' Target compiler: 'Clang' Platform dependency: 'macos-universal-on-x86_64' - Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests', 'UseConfigure', 'WarningsAreErrors', 'GenerateSBOM'] + Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests', 'UseConfigure', 'WarningsAreErrors', 'GenerateSBOM', 'VerifySBOM'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-debug-and-release -nomake examples -platform macx-ios-clang', 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include -DFFMPEG_DIR={{.Env.FFMPEG_DIR_IOS}} -DQT_DEPLOY_FFMPEG=TRUE', @@ -176,7 +176,7 @@ Configurations: Id: 'windows-10_22h2-mingw13' Template: 'qtci-windows-10_22H2-x86_64-51' Compiler: 'Mingw' - Features: ['Packaging', 'Sccache', 'UseConfigure', 'GenerateSBOM'] + 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}}', @@ -189,7 +189,7 @@ Configurations: Id: 'windows-11_23H2-llvm' Template: 'qtci-windows-11_23H2-x86_64-52' Compiler: 'Clang' - Features: ['Packaging','Sccache', 'UseConfigure', 'GenerateSBOM'] + 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}}', diff --git a/coin/platform_configs/cmake_platforms_qemu.yaml b/coin/platform_configs/cmake_platforms_qemu.yaml index 229025fcf84..d876f6092ba 100644 --- a/coin/platform_configs/cmake_platforms_qemu.yaml +++ b/coin/platform_configs/cmake_platforms_qemu.yaml @@ -41,7 +41,7 @@ Configurations: Target arch: 'mips64' Compiler: 'GCC' Platform dependency: 'ubuntu-22.04' - Features: ['Sccache', 'DisableTests', 'UseConfigure', 'GenerateSBOM'] + Features: ['Sccache', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-warnings-are-errors -nomake examples -qt-harfbuzz -device linux-generic-g++ -device-option "CROSS_COMPILE={{.Env.QEMUMIPS64_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=boot2qt" -no-feature-forkfd_pidfd', 'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUMIPS64_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 99de2f65107..2d71dbdc1df 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: ['Packaging', 'VMSize8', 'UseConfigure', 'GenerateSBOM'] + 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', @@ -24,7 +24,7 @@ Configurations: Compiler: 'GCC' Target compiler: 'QCC' Platform dependency: 'ubuntu-22.04' - Features: ['Packaging', 'DisableTests', 'UseConfigure', 'GenerateSBOM'] + Features: ['Packaging', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples', 'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-aarch64le.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', @@ -38,7 +38,7 @@ Configurations: Compiler: 'GCC' Target compiler: 'QCC' Platform dependency: 'ubuntu-22.04' - Features: ['Packaging', 'DisableTests', 'UseConfigure', 'GenerateSBOM'] + Features: ['Packaging', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples', 'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-armv7le.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', diff --git a/coin/platform_configs/cmake_platforms_target_android.yaml b/coin/platform_configs/cmake_platforms_target_android.yaml index 15ba8fe9480..3412bc2617c 100644 --- a/coin/platform_configs/cmake_platforms_target_android.yaml +++ b/coin/platform_configs/cmake_platforms_target_android.yaml @@ -8,7 +8,7 @@ Configurations: Compiler: 'Clang' Target compiler: 'Clang' Platform dependency: 'macos-universal-on-x86_64' - Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'DisableTests', 'UseConfigure', 'GenerateSBOM'] + 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', @@ -23,7 +23,7 @@ Configurations: Compiler: 'Mingw' Target compiler: 'Clang' Platform dependency: 'windows-10_22h2-mingw13' - Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'DisableTests', 'UseConfigure', 'GenerateSBOM'] + 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', @@ -39,7 +39,7 @@ Configurations: Compiler: 'GCC' Target compiler: 'Clang' Platform dependency: 'rhel-8.8' - Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM'] + 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.8' - Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM'] + 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/cmake_platforms_wasm.yaml b/coin/platform_configs/cmake_platforms_wasm.yaml index fb46da2c160..4359a1d15d3 100644 --- a/coin/platform_configs/cmake_platforms_wasm.yaml +++ b/coin/platform_configs/cmake_platforms_wasm.yaml @@ -19,7 +19,7 @@ Configurations: Compiler: 'Mingw' Target compiler: 'Clang' Platform dependency: 'windows-10_22h2-mingw13' - Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure', 'GenerateSBOM'] + Features: ['Packaging', 'Sccache', '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.5-developer-build' - Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure', 'GenerateSBOM'] + 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', diff --git a/coin/platform_configs/macos.yaml b/coin/platform_configs/macos.yaml index 926e027f681..2344a79755e 100644 --- a/coin/platform_configs/macos.yaml +++ b/coin/platform_configs/macos.yaml @@ -12,7 +12,7 @@ Configurations: Template: 'qtci-macos-14-x86_64-105' Compiler: 'Clang' Target arch: 'x86_64-arm64' - Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure', 'GenerateSBOM'] + 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}}', From 504304234d51f67968adf6966c751fcba732e166 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 19 Jul 2024 12:33:54 +0000 Subject: [PATCH 069/288] Update submodules on '6.8 in qt/qt5' Change-Id: I98f9be4f0bdca153856980080882534a76e9db74 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 9c45a1fb282..c2d5ba98a53 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 9c45a1fb282908ec293c6c9410b502fa18769f24 +Subproject commit c2d5ba98a5341ed44cd87f209b9ba8905d7fe8cc diff --git a/qt5compat b/qt5compat index 65f470a24ff..8ef4f1cc3cb 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 65f470a24ffdbf0791e21755d757fc89c02f2a28 +Subproject commit 8ef4f1cc3cb963476de53e9b31d6b1e159695da7 diff --git a/qtactiveqt b/qtactiveqt index ec6e262650f..bbdfbfe6bbb 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit ec6e262650fa43ef2ebfae0220b00aecfda96ccc +Subproject commit bbdfbfe6bbbd0674aa1182f6d34e8eeddf664949 diff --git a/qtbase b/qtbase index 91078076533..93e39f7b79a 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 910780765332173bad18c1ca659dd53dc3b12ceb +Subproject commit 93e39f7b79a71233d356108142aa446f29a60c76 diff --git a/qtcharts b/qtcharts index 98bfc5a1060..a0993a248b5 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 98bfc5a1060cf7b86c12f99bf70b8458b421bfde +Subproject commit a0993a248b5e1aa52554d344c6f5f302a067aa09 diff --git a/qtcoap b/qtcoap index 3c9321c2a38..40f873d29ac 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit 3c9321c2a38eaf198591932804453aed5d223f6a +Subproject commit 40f873d29ac5aea62282ebcec7a0729362645d40 diff --git a/qtconnectivity b/qtconnectivity index fef85e1e98c..01d0aed739e 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit fef85e1e98cf9b4dbcd586bc271e4bce1ab34347 +Subproject commit 01d0aed739e2185761d91e35f4e94a800b96e3de diff --git a/qtdatavis3d b/qtdatavis3d index 918b280b40b..bbf1cc36602 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 918b280b40b96a0f4e56d6a80127e99c27f09ce8 +Subproject commit bbf1cc36602e63045211d028bb73bbf1fbb8949a diff --git a/qtdeclarative b/qtdeclarative index 321c8a88eb5..49909e8b8a4 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 321c8a88eb575749cca8d5116b2a131c7932f74d +Subproject commit 49909e8b8a4fcbeb7c8e57c052ce2b4574e621d5 diff --git a/qtdoc b/qtdoc index 665f45e1db8..c7ee328fc4b 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 665f45e1db82e8e1f43cc5e8eec0c8d2e04b47d8 +Subproject commit c7ee328fc4b5128580bbd1541228ca226ca3f855 diff --git a/qtgraphs b/qtgraphs index f360f3f8466..c419df9d03d 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit f360f3f8466c2780cec2d320609a439840cff618 +Subproject commit c419df9d03d8bf2247480021faecf180244f4297 diff --git a/qtgrpc b/qtgrpc index 0e09cbeafac..d03f0d1f2b1 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit 0e09cbeafac6e95f7e2e6aafe8f2f0e1ebacd9a9 +Subproject commit d03f0d1f2b10119af6819df270d32480b030ee78 diff --git a/qthttpserver b/qthttpserver index 82021d498c8..95a60a2b37c 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit 82021d498c8e63fc227da7fd75782c24809a1d23 +Subproject commit 95a60a2b37c2db58d24dce205c827cb9ad59bae7 diff --git a/qtimageformats b/qtimageformats index 81e55053c08..950c6accb52 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 81e55053c081814c934ad39aafbbb3016210268d +Subproject commit 950c6accb52ae74b2e3c506b0349a3a468a8d3b2 diff --git a/qtlanguageserver b/qtlanguageserver index 65c9508140e..e6683b63ee6 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit 65c9508140ebe277c20aa8d96b8454fc94ee84dc +Subproject commit e6683b63ee616c8937970d8aa49e53f633793b63 diff --git a/qtlocation b/qtlocation index 24796edd9c4..226173fb8b7 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 24796edd9c4aa494c12edc016ea9a73a7686dbba +Subproject commit 226173fb8b7818d4db93cc36d5828665dec6322a diff --git a/qtlottie b/qtlottie index b7be912b9f6..5c4e65a94df 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit b7be912b9f6b88571345ed3299f112c74a9dead6 +Subproject commit 5c4e65a94df02249c58adc67e54d2193f0a0cd5d diff --git a/qtmqtt b/qtmqtt index f1adbef977e..8dcfe218fd1 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit f1adbef977e38a54c987d67058c90a89ff59e81f +Subproject commit 8dcfe218fd148e540ece640c43bf02a39699e406 diff --git a/qtmultimedia b/qtmultimedia index 4e103ab8949..70edab458fd 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 4e103ab89499acd03f467d766067c58c00a82b0f +Subproject commit 70edab458fd0ed8e587dd495747a6bf0d3c142d8 diff --git a/qtnetworkauth b/qtnetworkauth index 0461d508262..54f583340bc 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 0461d5082627ce0089fd1ddbd6bd763b96813ae8 +Subproject commit 54f583340bc5a67638ed7e6b414f816a9080dc7a diff --git a/qtopcua b/qtopcua index 7055eee1d76..1e5305fede1 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit 7055eee1d76edb57eb2c45eef0ee738fa7394f95 +Subproject commit 1e5305fede1d18d82e512f148aafb18eb9db2ee0 diff --git a/qtpositioning b/qtpositioning index ea75bd6c9a1..ae72e98b7ec 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit ea75bd6c9a1df3f91c718e7a6a20f582405bd913 +Subproject commit ae72e98b7ec0a16ab16b169eeda04ab245dfc65c diff --git a/qtquick3d b/qtquick3d index 4a7974e633c..a2847129db3 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 4a7974e633c22df186dc4ee6b2804539cf7ac885 +Subproject commit a2847129db31c738634f2e63de8829f7f24c25c9 diff --git a/qtquick3dphysics b/qtquick3dphysics index 13c7694c092..c1b8ce8cdbb 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit 13c7694c0927f16649d72a2a01e8b0339b2f5ce2 +Subproject commit c1b8ce8cdbb267696d14679f5d31cc8062696ed6 diff --git a/qtquickeffectmaker b/qtquickeffectmaker index 8cd85afaf7b..7b99ee7b8d9 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit 8cd85afaf7b0f733d2869defa561651e3a49c156 +Subproject commit 7b99ee7b8d98b6677c9de6f8a0cf7026b8179e8e diff --git a/qtquicktimeline b/qtquicktimeline index 341c2feb358..87080168eed 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 341c2feb3589a10c89c5da294f9be7e59acce460 +Subproject commit 87080168eed41de5cd467bb3ac7554843743e707 diff --git a/qtremoteobjects b/qtremoteobjects index 3f7676ba1b3..32084286690 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 3f7676ba1b363ab62304b68a254719ba1591ca8f +Subproject commit 32084286690cf95f48686df0166aedb74f6504d8 diff --git a/qtscxml b/qtscxml index 28b0ad6a252..16a7bee972d 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 28b0ad6a252439f3a38657f64c7eb9cbeb47be76 +Subproject commit 16a7bee972d48f2b920af4e40d26a730b8166399 diff --git a/qtsensors b/qtsensors index 6fc6f059cb3..67c7b6fbc0b 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 6fc6f059cb3f8535810145aa158afc3911769163 +Subproject commit 67c7b6fbc0bc14d9ccb7bb790b72dfcd60a589f4 diff --git a/qtserialbus b/qtserialbus index 60888180338..86d5a3c632e 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 60888180338b0d9b6cd5999b694f8e9b5c51bfd5 +Subproject commit 86d5a3c632ea31609cfe6c427cf57891fe33638a diff --git a/qtserialport b/qtserialport index 7553f7cf8d7..922bdfb0246 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 7553f7cf8d76ca4a2f32675437e510e15f746574 +Subproject commit 922bdfb02468ad95165ef634bf1962f9cca4ede4 diff --git a/qtshadertools b/qtshadertools index d8858aa464f..6af7de087a1 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit d8858aa464f9c4d2a6c4c3f548a6911956eb34a9 +Subproject commit 6af7de087a17c550410727fbc00c63ce176fdd86 diff --git a/qtspeech b/qtspeech index 26e61a13560..80e28b3ca3a 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 26e61a13560b7499d7506e0b06302b7433c322f0 +Subproject commit 80e28b3ca3abf5c954a4769a7845ac42607f391f diff --git a/qtsvg b/qtsvg index 6345ded9048..01e19ecfd2c 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 6345ded90484f70a3a75cf38a7cee3a225687e20 +Subproject commit 01e19ecfd2cecd7098ef9743c94334da303e00fe diff --git a/qttools b/qttools index eedf2f68c59..3f5bef070a8 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit eedf2f68c5918074443b556183ab4068d7255d01 +Subproject commit 3f5bef070a824e2afa6269ac2803f54790de2948 diff --git a/qttranslations b/qttranslations index 0553c40b380..b1692ec4a23 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 0553c40b3803ca268c59ee4e92d4398bd4a7bdfe +Subproject commit b1692ec4a23d69513ab8987dd652f663d11c7947 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 3418578ee2e..cc7b22110f2 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 3418578ee2eca8db5d18c224083af735540791f1 +Subproject commit cc7b22110f2455027a6ca0d99105321f2e57d50e diff --git a/qtwayland b/qtwayland index 5eef4fb3b0d..e9d301564ba 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 5eef4fb3b0d31b9df6d48887b905c81f58396c32 +Subproject commit e9d301564ba39c0956c890a0626df7a1a9e5701c diff --git a/qtwebchannel b/qtwebchannel index 40451b71142..47d44416816 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 40451b711429d04347cdd010b904699303d311a4 +Subproject commit 47d44416816aacaeae2c4d33d15fabe42b830160 diff --git a/qtwebengine b/qtwebengine index 3036e77a156..a56bd1740e5 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 3036e77a156c6770716e95b196e0afcf00275cca +Subproject commit a56bd1740e5ba837b46cd8328e63acd1179216ba diff --git a/qtwebsockets b/qtwebsockets index 81fe97dc276..4897dda0972 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 81fe97dc2765066fc0165f3359f3fc8334d04002 +Subproject commit 4897dda0972c37c9ffe43652ee14963e7fa60b6a diff --git a/qtwebview b/qtwebview index 62943f46e6a..7372e70e675 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 62943f46e6ac3f5ef88eb09151e86832bc8b172f +Subproject commit 7372e70e675a3abfc6ae7a41132b33b44a5353b3 From 471fa2306ce00cf53832e03bcf8ee70d7bef8ce2 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 17 Jul 2024 16:57:41 +0200 Subject: [PATCH 070/288] coin: Fix pip3 installation on macOS arm The pip3 install calls contained the word 'install' twice. Starting with newer pip versions, this seems to fail with: /Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user install virtualenv wheel html5lib ERROR: Could not find a version that satisfies the requirement install (from versions: none) ERROR: No matching distribution found for install Make sure install only appears once. Change-Id: I1bfc784d4e3d6a1c34d112e72e2739678d2f07ae Reviewed-by: Ville-Pekka Karhu (cherry picked from commit 866b4cedaf4f4cc76a6ec415120327b4da5f46d1) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/qtci-macos-11-arm/25-python3.sh | 2 +- coin/provisioning/qtci-macos-12-arm/25-python.sh | 2 +- coin/provisioning/qtci-macos-13-arm/25-python.sh | 2 +- coin/provisioning/qtci-macos-14-arm/25-python.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/coin/provisioning/qtci-macos-11-arm/25-python3.sh b/coin/provisioning/qtci-macos-11-arm/25-python3.sh index 5a0df739559..bbf8cad196a 100755 --- a/coin/provisioning/qtci-macos-11-arm/25-python3.sh +++ b/coin/provisioning/qtci-macos-11-arm/25-python3.sh @@ -10,7 +10,7 @@ source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" pyenv install 3.9.7 -/Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user install virtualenv wheel html5lib +/Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user virtualenv wheel html5lib SetEnvVar "PYTHON3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/" SetEnvVar "PIP3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/" diff --git a/coin/provisioning/qtci-macos-12-arm/25-python.sh b/coin/provisioning/qtci-macos-12-arm/25-python.sh index 0e05f593a7e..11a157cf7be 100755 --- a/coin/provisioning/qtci-macos-12-arm/25-python.sh +++ b/coin/provisioning/qtci-macos-12-arm/25-python.sh @@ -10,7 +10,7 @@ source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" pyenv install 3.9.7 -/Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user install virtualenv wheel html5lib +/Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user virtualenv wheel html5lib /Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user -r ${BASH_SOURCE%/*}/../common/shared/sbom_requirements.txt SetEnvVar "PYTHON3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/" diff --git a/coin/provisioning/qtci-macos-13-arm/25-python.sh b/coin/provisioning/qtci-macos-13-arm/25-python.sh index 0e05f593a7e..11a157cf7be 100755 --- a/coin/provisioning/qtci-macos-13-arm/25-python.sh +++ b/coin/provisioning/qtci-macos-13-arm/25-python.sh @@ -10,7 +10,7 @@ source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" pyenv install 3.9.7 -/Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user install virtualenv wheel html5lib +/Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user virtualenv wheel html5lib /Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user -r ${BASH_SOURCE%/*}/../common/shared/sbom_requirements.txt SetEnvVar "PYTHON3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/" diff --git a/coin/provisioning/qtci-macos-14-arm/25-python.sh b/coin/provisioning/qtci-macos-14-arm/25-python.sh index 761fcf01732..36bbc0e14ab 100755 --- a/coin/provisioning/qtci-macos-14-arm/25-python.sh +++ b/coin/provisioning/qtci-macos-14-arm/25-python.sh @@ -10,7 +10,7 @@ source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" pyenv install 3.9.7 -/Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user install virtualenv wheel html5lib +/Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user virtualenv wheel html5lib /Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user -r ${BASH_SOURCE%/*}/../common/shared/sbom_requirements.txt SetEnvVar "PYTHON3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/" From 8771cbab9cc9b1c27d7574c4f52d765e6477172a Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 17 Jul 2024 12:57:44 +0200 Subject: [PATCH 071/288] coin: Add reuse python package to allow generating a source SBOM Task-number: QTBUG-122899 Task-number: QTBUG-125211 Change-Id: Iaf22d5b2ce3c5d5b0d1b22e595da9cc28d0c2719 Reviewed-by: Alexey Edelev Reviewed-by: Joerg Bornemann (cherry picked from commit b3c7f0743658ba60be2a3c587ada7f6c7a3ce214) Reviewed-by: Qt Cherry-pick Bot --- 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 0c72d654beb..8eaf1238c8b 100644 --- a/coin/provisioning/common/shared/sbom_requirements.txt +++ b/coin/provisioning/common/shared/sbom_requirements.txt @@ -3,3 +3,4 @@ spdx-tools>=0.8.0 ntia-conformance-checker sbomaudit sbom2doc +reuse From df8c39ba7bead525eda6bd781ffe1342b596d9c5 Mon Sep 17 00:00:00 2001 From: Jukka Jokiniva Date: Mon, 10 Jun 2024 09:31:21 +0300 Subject: [PATCH 072/288] Change precheck windows target to windows-11_23H2-msvc2022 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Configuration windows-10_22H2-msvc2019-developer-build has been removed from CI. Fixes: QTQAINFRA-6386 Change-Id: If2e5a2727101feb787d5e8bc3be7898156978c53 Reviewed-by: Toni Saario (cherry picked from commit a41d562205ed7ec65bca50ac8ee44693c7b5e95e) Reviewed-by: Fabian Kosmale Reviewed-by: Simo Fält --- 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 e7846ebb734..bf81338a582 100644 --- a/coin/platform_configs/precheck.yaml +++ b/coin/platform_configs/precheck.yaml @@ -5,7 +5,7 @@ Include: [ "ubuntu-22.04", "ubuntu-22.04-documentation", "ubuntu-22.04-documentation-x11-tests", - "windows-10_22h2-msvc2019-developer-build", + "windows-11_23H2-msvc2022", "ios-universal" ], macos.yaml: [ From 39a7a1a66354121eea0174c11ce62935e523c9cc Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Thu, 18 Jul 2024 16:19:29 +0200 Subject: [PATCH 073/288] Enable building QtProtobufWellknownTypes module on Packaging platforms Add the missing QT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR for qnx and Android 14 platforms. Fixes: QTBUG-127272 Change-Id: I60caa0141aa2d8566311d30677891201b12c4ed6 Reviewed-by: Dennis Oberst (cherry picked from commit 8d190a38ce73ba33aca3e15fcdf6e93741e3260a) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/cmake_platforms_qemu_qnx710.yaml | 6 +++--- coin/platform_configs/cmake_platforms_target_android.yaml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml b/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml index 2d71dbdc1df..11367022cc8 100644 --- a/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml +++ b/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml @@ -14,7 +14,7 @@ Configurations: 'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-x8664.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', 'QT_CMAKE_DIR=/opt/cmake-3.27.7/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=-DFEATURE_native_grpc=OFF', + 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', ] - Id: 'qnx-710-arm64-on-linux' @@ -28,7 +28,7 @@ Configurations: Environment variables: [ 'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples', 'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-aarch64le.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', - 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF', + 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', ] - Id: 'qnx-710-armv7-on-linux' @@ -42,5 +42,5 @@ Configurations: Environment variables: [ 'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples', 'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-armv7le.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', - 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF', + 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', ] diff --git a/coin/platform_configs/cmake_platforms_target_android.yaml b/coin/platform_configs/cmake_platforms_target_android.yaml index 3412bc2617c..c575ba3fe33 100644 --- a/coin/platform_configs/cmake_platforms_target_android.yaml +++ b/coin/platform_configs/cmake_platforms_target_android.yaml @@ -59,7 +59,7 @@ Configurations: 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', + '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' ] From 319f1f79456333fc0bba6bb87224d0c6cb3957c5 Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Thu, 18 Jul 2024 16:25:18 +0200 Subject: [PATCH 074/288] Remove -DFEATURE_native_grpc=OFF The flag was removed from qtgrpc repo and has no effect now. Clean it up from all platform configs. Change-Id: I59e200c6bcd63e03cc7c7477d502e456af8c9b01 Reviewed-by: Alexandru Croitor (cherry picked from commit b3fda4d0fe38d0a6f7d337da7f29e7c8017ce25f) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/cmake_platforms.yaml | 14 +++++++------- .../cmake_platforms_qemu_qnx710.yaml | 6 +++--- .../cmake_platforms_target_android.yaml | 6 +++--- coin/platform_configs/cmake_platforms_wasm.yaml | 4 ++-- .../linux_android_tests_developer.yaml | 2 +- coin/platform_configs/macos.yaml | 2 +- coin/platform_configs/tqtc-android-automotive.yaml | 4 ++-- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 210ce2cdd98..03332cdfbf6 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -90,7 +90,7 @@ Configurations: 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}}', - 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_native_grpc=OFF -DFEATURE_clangcpp=OFF -DINPUT_headersclean=ON', + 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_clangcpp=OFF -DINPUT_headersclean=ON', 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', ] @@ -102,7 +102,7 @@ Configurations: 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}}\..', - 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_native_grpc=OFF -DFEATURE_clangcpp=OFF -DINPUT_headersclean=ON', + 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_clangcpp=OFF -DINPUT_headersclean=ON', 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', ] @@ -114,7 +114,7 @@ Configurations: Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib -no-sql-psql -no-opengl' Environment variables: [ 'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_arm64}}\..', - 'NON_QTBASE_CMAKE_ARGS=-DFEATURE_native_grpc=OFF -DFEATURE_clangcpp=OFF -DFEATURE_qdoc=OFF', + 'NON_QTBASE_CMAKE_ARGS= -DFEATURE_clangcpp=OFF -DFEATURE_qdoc=OFF', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', ] - @@ -125,7 +125,7 @@ Configurations: 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}}', - 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_native_grpc=OFF -DINPUT_headersclean=ON' + 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON' ] - Id: 'rhel-9.2' @@ -170,7 +170,7 @@ Configurations: Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests', 'UseConfigure', 'WarningsAreErrors', 'GenerateSBOM', 'VerifySBOM'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-debug-and-release -nomake examples -platform macx-ios-clang', - 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include -DFFMPEG_DIR={{.Env.FFMPEG_DIR_IOS}} -DQT_DEPLOY_FFMPEG=TRUE', + 'NON_QTBASE_TARGET_CMAKE_ARGS= -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include -DFFMPEG_DIR={{.Env.FFMPEG_DIR_IOS}} -DQT_DEPLOY_FFMPEG=TRUE', ] - Id: 'windows-10_22h2-mingw13' @@ -181,7 +181,7 @@ Configurations: Environment variables: [ 'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}', 'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c', - 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_native_grpc=OFF -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c', + 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}} -DQT_DEPLOY_FFMPEG=TRUE -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c', 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_mingw}}', ] @@ -207,7 +207,7 @@ Configurations: Environment variables: [ 'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}', 'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c -DMySQL_ROOT={{.Env.ENV_MySQL_ROOT}} -DMySQL_LIBRARY_DIR={{.Env.ENV_MySQL_LIBRARY_DIR}}', - 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}} -DQT_DEPLOY_FFMPEG=TRUE -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c -DFEATURE_native_grpc=OFF', + 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}} -DQT_DEPLOY_FFMPEG=TRUE -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c', 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_mingw}}', ] diff --git a/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml b/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml index 11367022cc8..eba1efa9d2f 100644 --- a/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml +++ b/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml @@ -14,7 +14,7 @@ Configurations: 'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-x8664.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', 'QT_CMAKE_DIR=/opt/cmake-3.27.7/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=-DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', + 'NON_QTBASE_TARGET_CMAKE_ARGS= -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', ] - Id: 'qnx-710-arm64-on-linux' @@ -28,7 +28,7 @@ Configurations: Environment variables: [ 'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples', 'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-aarch64le.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', - 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', + 'NON_QTBASE_TARGET_CMAKE_ARGS= -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', ] - Id: 'qnx-710-armv7-on-linux' @@ -42,5 +42,5 @@ Configurations: Environment variables: [ 'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples', 'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-armv7le.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', - 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', + 'NON_QTBASE_TARGET_CMAKE_ARGS= -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', ] diff --git a/coin/platform_configs/cmake_platforms_target_android.yaml b/coin/platform_configs/cmake_platforms_target_android.yaml index c575ba3fe33..dc3776a527f 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_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', - 'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH=/usr/local -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARM64}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_native_grpc=OFF -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}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}' ] - @@ -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_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', - '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 -DFEATURE_native_grpc=OFF -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}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR={{.Env.Protobuf_ROOT_msvc}}/include', 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}' ] - @@ -43,7 +43,7 @@ Configurations: 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', - 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', + '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_EMULATOR=emulator_x86_api_28' ] diff --git a/coin/platform_configs/cmake_platforms_wasm.yaml b/coin/platform_configs/cmake_platforms_wasm.yaml index 4359a1d15d3..a655193d29b 100644 --- a/coin/platform_configs/cmake_platforms_wasm.yaml +++ b/coin/platform_configs/cmake_platforms_wasm.yaml @@ -25,7 +25,7 @@ Configurations: 'EM_CONFIG={{.Env.EMSDK}}/.emscripten', 'TARGET_CONFIGURE_ARGS=-release -platform wasm-emscripten -nomake examples', 'TARGET_CMAKE_ARGS=-DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', - 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_pkg_config=OFF -DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH={{.Env.Protobuf_ROOT_mingw}} -DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR={{.Env.Protobuf_ROOT_mingw}}/include', + 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_pkg_config=OFF -DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH={{.Env.Protobuf_ROOT_mingw}} -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR={{.Env.Protobuf_ROOT_mingw}}/include', ] - Id: 'webassembly-linux-thread' @@ -37,6 +37,6 @@ Configurations: 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 -DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', + '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' ] diff --git a/coin/platform_configs/linux_android_tests_developer.yaml b/coin/platform_configs/linux_android_tests_developer.yaml index 431151500b9..c792158f6e8 100644 --- a/coin/platform_configs/linux_android_tests_developer.yaml +++ b/coin/platform_configs/linux_android_tests_developer.yaml @@ -13,5 +13,5 @@ Configurations: '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}}', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}', - 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF', + 'NON_QTBASE_TARGET_CMAKE_ARGS=', 'ANDROID_EMULATOR=emulator_x86_api_28'] diff --git a/coin/platform_configs/macos.yaml b/coin/platform_configs/macos.yaml index 2344a79755e..bfaccb86d1f 100644 --- a/coin/platform_configs/macos.yaml +++ b/coin/platform_configs/macos.yaml @@ -16,7 +16,7 @@ Configurations: 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}}', - 'NON_QTBASE_CMAKE_ARGS=-DFEATURE_gds=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_native_grpc=OFF -DINPUT_headersclean=ON', + 'NON_QTBASE_CMAKE_ARGS=-DFEATURE_gds=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON', 'Protobuf_ROOT=/usr/local/lib/cmake/protobuf' ] diff --git a/coin/platform_configs/tqtc-android-automotive.yaml b/coin/platform_configs/tqtc-android-automotive.yaml index 06b3c8c0f2f..68f22659a69 100644 --- a/coin/platform_configs/tqtc-android-automotive.yaml +++ b/coin/platform_configs/tqtc-android-automotive.yaml @@ -30,7 +30,7 @@ Configurations: '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}}', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}', - 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', + 'NON_QTBASE_TARGET_CMAKE_ARGS= -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', 'ANDROID_EMULATOR=automotive_emulator_x86_64_api_34' ] - @@ -46,6 +46,6 @@ Configurations: '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}}', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}', - 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', + 'NON_QTBASE_TARGET_CMAKE_ARGS= -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', 'ANDROID_EMULATOR=automotive_emulator_x86_64_api_29' ] From 3303e2fe466e9332d0f20e8e2903f4ee4a754e0a Mon Sep 17 00:00:00 2001 From: Tero Heikkinen Date: Fri, 7 Jun 2024 10:51:18 +0300 Subject: [PATCH 075/288] Provisioning: Update Java on Windows x64 to 17 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Java 17 for Android, needed by RTA Task-number: QTQAINFRA-6385 Change-Id: I1200fc5fc4dfdac1faea6b262277aae525efc835 Reviewed-by: Simo Fält (cherry picked from commit 84bf41ba5bfb5be43a0b70ee920e369e94881ca1) Reviewed-by: Qt Cherry-pick Bot --- .../common/windows/install-jdk.ps1 | 49 +++++++++---------- 1 file changed, 22 insertions(+), 27 deletions(-) diff --git a/coin/provisioning/common/windows/install-jdk.ps1 b/coin/provisioning/common/windows/install-jdk.ps1 index dc19551d16d..ddd0cb265ae 100644 --- a/coin/provisioning/common/windows/install-jdk.ps1 +++ b/coin/provisioning/common/windows/install-jdk.ps1 @@ -4,37 +4,32 @@ . "$PSScriptRoot\helpers.ps1" # This script will install Java SE - -if (Is64BitWinHost) { - $version = "11.0.12" - $arch = "x64" - $sha1 = "135ffd1c350509729551876232a5354070732e92" - $installdir = "C:\Program Files\Java\jdk-$version" - $url_cache = "\\ci-files01-hki.ci.qt.io\provisioning\windows\jdk-" + $version + "-windows-" + $arch + ".exe" -} else { - $version = "11.0.11.9" - $arch = "x86-32" - $sha1 = "a861e994208ee85bf83a76105f6858feeb6fbb33" - $installdir = "C:\Program Files\AdoptOpenJDK\jdk-$version-hotspot" - $url_cache = "\\ci-files01-hki.ci.qt.io\provisioning\windows\OpenJDK11U-jdk_x86-32_windows_hotspot_11.0.11_9.msi" -} - -# NOTE! Official URL is behind login portal. It can't be used whit this script instead it need to be fetched to $url_cache first -# java 11: https://www.oracle.com/java/technologies/downloads/#java11-windows -# java 8: $official_url = "http://download.oracle.com/otn-pub/java/jdk/8u144-b01/090f390dda5b47b9b721c7dfaa008135/jdk-" + $version + "-windows-" + $arch + ".exe" -if (Is64BitWinHost) { - $javaPackage = "C:\Windows\Temp\jdk-$version.exe" -} else { - $javaPackage = "C:\Windows\Temp\jdk-$version.msi" +# https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html +$version = "17.0.10" +$version_major = "17" + +$cpu_arch = Get-CpuArchitecture +switch ($cpu_arch) { + x64 { + $arch = "x64" + $sha1 = "d573091930076c3ffa9f74273cb41cb5c75c5400" + $installdir = "C:\Program Files\Java\jdk-$version_major" + $url_official = "https://download.oracle.com/java/17/archive/jdk-$%7Bversion%7D_windows-$%7Barch%7D_bin.exe" + $url_cache = "\\ci-files01-hki.ci.qt.io\provisioning\windows\jdk-$version-windows-$arch.exe" + $javaPackage = "C:\Windows\Temp\jdk-$version.exe" + Break + } + default { + throw "Unknown architecture $cpu_arch" + } } -Write-Host "Fetching Java SE $version..." +Write-Host "Fetching Java SE $version" $ProgressPreference = 'SilentlyContinue' -Write-Host "...from local cache" -Download $url_cache $url_cache $javaPackage +Download $url_official $url_cache $javaPackage Verify-Checksum $javaPackage $sha1 -if (Is64BitWinHost) { +if ($javaPackage.EndsWith(".exe")) { Run-Executable "$javaPackage" "/s SPONSORS=0" } else { Run-Executable "msiexec" "/quiet /i $javaPackage" @@ -45,6 +40,6 @@ Write-Host "Remove Java update from startup" reg delete "HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Run" /v SunJavaUpdateSched /f Set-EnvironmentVariable "JAVA_HOME" "$installdir" -Add-Path "$installdir\bin" +Prepend-Path "$installdir\bin" Write-Output "Java SE = $version $arch" >> ~\versions.txt From 6e3c55a33d2095b5820e5325caf0f93a108a0b1a Mon Sep 17 00:00:00 2001 From: Elias Toivola Date: Tue, 2 Jul 2024 17:54:11 +0300 Subject: [PATCH 076/288] Provisioning: Add Java 17 to Windows on ARM MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There are no WoA versions of JDK builds available from Oracle but Microsoft maintains a WoA compatible OpenJDK build. This change also removes the registry edit to disable Java auto-update as the auto-update function in Java no longer exists. Task-number: QTQAINFRA-6109 Task-number: QTQAINFRA-6385 Change-Id: I672ef4ac7cbca3d62ecd6a646fd769aff1cad4c5 Reviewed-by: Simo Fält (cherry picked from commit b3f5b4fd6473e5727c4a34fa31a80e483d6a75c1) Reviewed-by: Qt Cherry-pick Bot --- .../common/windows/install-jdk.ps1 | 18 +++++++++++++----- .../08-install-jdk.ps1 | 1 + 2 files changed, 14 insertions(+), 5 deletions(-) create mode 100644 coin/provisioning/qtci-windows-11_22H2-aarch64/08-install-jdk.ps1 diff --git a/coin/provisioning/common/windows/install-jdk.ps1 b/coin/provisioning/common/windows/install-jdk.ps1 index ddd0cb265ae..43f8e35d171 100644 --- a/coin/provisioning/common/windows/install-jdk.ps1 +++ b/coin/provisioning/common/windows/install-jdk.ps1 @@ -5,15 +5,26 @@ # This script will install Java SE # https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html -$version = "17.0.10" $version_major = "17" +$installdir = "C:\Program Files\Java\jdk-$version_major" $cpu_arch = Get-CpuArchitecture switch ($cpu_arch) { + arm64 { + $version = "17.0.11" + $arch = "aarch64" + $sha1 = "1c5984a185778ad91498b746e677d84e153d5918" + # Using Microsoft build version of OpenJDK from: https://learn.microsoft.com/en-us/java/openjdk/download + # as there are no available Windows ARM64 versions of JDK from Oracle + $url_official = "https://aka.ms/download-jdk/microsoft-jdk-$%7Bversion%7D-windows-$%7Barch%7D.msi" + $url_cache = "\\ci-files01-hki.ci.qt.io\provisioning\windows\microsoft-jdk-${version}-windows-${arch}.msi" + $javaPackage = "C:\Windows\Temp\jdk-$version.msi" + Break + } x64 { + $version = "17.0.10" $arch = "x64" $sha1 = "d573091930076c3ffa9f74273cb41cb5c75c5400" - $installdir = "C:\Program Files\Java\jdk-$version_major" $url_official = "https://download.oracle.com/java/17/archive/jdk-$%7Bversion%7D_windows-$%7Barch%7D_bin.exe" $url_cache = "\\ci-files01-hki.ci.qt.io\provisioning\windows\jdk-$version-windows-$arch.exe" $javaPackage = "C:\Windows\Temp\jdk-$version.exe" @@ -36,9 +47,6 @@ if ($javaPackage.EndsWith(".exe")) { } Remove "$javaPackage" -Write-Host "Remove Java update from startup" -reg delete "HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Run" /v SunJavaUpdateSched /f - Set-EnvironmentVariable "JAVA_HOME" "$installdir" Prepend-Path "$installdir\bin" diff --git a/coin/provisioning/qtci-windows-11_22H2-aarch64/08-install-jdk.ps1 b/coin/provisioning/qtci-windows-11_22H2-aarch64/08-install-jdk.ps1 new file mode 100644 index 00000000000..15065b55c71 --- /dev/null +++ b/coin/provisioning/qtci-windows-11_22H2-aarch64/08-install-jdk.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-jdk.ps1" From 5615fb5fc2f36f7581a2508a74e9256a90ba4f5f Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 25 Jul 2024 15:00:19 +0000 Subject: [PATCH 077/288] Update submodules on '6.8 in qt/qt5' Change-Id: Ib9255ddee3c279c7a83c5d86c9c2f212fe007f88 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 c2d5ba98a53..0843c4eee95 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit c2d5ba98a5341ed44cd87f209b9ba8905d7fe8cc +Subproject commit 0843c4eee9529beebcaed03a8b63af1e5a73b566 diff --git a/qt5compat b/qt5compat index 8ef4f1cc3cb..8ad54cf7cca 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 8ef4f1cc3cb963476de53e9b31d6b1e159695da7 +Subproject commit 8ad54cf7ccaab5e78cf2d9bf0c3112926cb70db3 diff --git a/qtactiveqt b/qtactiveqt index bbdfbfe6bbb..c84baa593ee 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit bbdfbfe6bbbd0674aa1182f6d34e8eeddf664949 +Subproject commit c84baa593ee87540f20d347de083f63d158c3aa0 diff --git a/qtbase b/qtbase index 93e39f7b79a..00a1bdfbe1c 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 93e39f7b79a71233d356108142aa446f29a60c76 +Subproject commit 00a1bdfbe1c44e3365c155f65a7707bda8f50bb8 diff --git a/qtcharts b/qtcharts index a0993a248b5..4ec9e6f1e2f 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit a0993a248b5e1aa52554d344c6f5f302a067aa09 +Subproject commit 4ec9e6f1e2fdad7fafbb5b0f84823da517513cd6 diff --git a/qtcoap b/qtcoap index 40f873d29ac..a90fec34e72 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit 40f873d29ac5aea62282ebcec7a0729362645d40 +Subproject commit a90fec34e7271c18ada45acb85fa0d0759d1934c diff --git a/qtconnectivity b/qtconnectivity index 01d0aed739e..1c99efd42be 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 01d0aed739e2185761d91e35f4e94a800b96e3de +Subproject commit 1c99efd42befa46899f6e5fc47fb0a0857b20954 diff --git a/qtdatavis3d b/qtdatavis3d index bbf1cc36602..4a86519b7ca 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit bbf1cc36602e63045211d028bb73bbf1fbb8949a +Subproject commit 4a86519b7ca6abcc37d1440d0c6862b2a20a67d1 diff --git a/qtdeclarative b/qtdeclarative index 49909e8b8a4..97a77aa5343 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 49909e8b8a4fcbeb7c8e57c052ce2b4574e621d5 +Subproject commit 97a77aa53435bae6e8b3de6c0c1af0631f6e9e8a diff --git a/qtdoc b/qtdoc index c7ee328fc4b..56c2d725457 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit c7ee328fc4b5128580bbd1541228ca226ca3f855 +Subproject commit 56c2d725457dfccc38d6c477a54e269046b224fe diff --git a/qtgraphs b/qtgraphs index c419df9d03d..799a753e0b2 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit c419df9d03d8bf2247480021faecf180244f4297 +Subproject commit 799a753e0b271cd65a70f0fd85245df9aa663ba5 diff --git a/qtgrpc b/qtgrpc index d03f0d1f2b1..d934a281b2a 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit d03f0d1f2b10119af6819df270d32480b030ee78 +Subproject commit d934a281b2a4222fb53f866dbcbcabd326aab580 diff --git a/qthttpserver b/qthttpserver index 95a60a2b37c..75fcd7e4fa5 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit 95a60a2b37c2db58d24dce205c827cb9ad59bae7 +Subproject commit 75fcd7e4fa5e15aa2fda0a0d28758ace7ff03c7e diff --git a/qtimageformats b/qtimageformats index 950c6accb52..62daa132cf3 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 950c6accb52ae74b2e3c506b0349a3a468a8d3b2 +Subproject commit 62daa132cf33bbfcb0cf3fbfcbea4635feafd216 diff --git a/qtlanguageserver b/qtlanguageserver index e6683b63ee6..2971f12bce0 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit e6683b63ee616c8937970d8aa49e53f633793b63 +Subproject commit 2971f12bce0bc972ed2636ceb041e2851ea53490 diff --git a/qtlocation b/qtlocation index 226173fb8b7..0caaf5e6094 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 226173fb8b7818d4db93cc36d5828665dec6322a +Subproject commit 0caaf5e60949403bbe05497da7392e2c9033580c diff --git a/qtlottie b/qtlottie index 5c4e65a94df..0e287b58552 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 5c4e65a94df02249c58adc67e54d2193f0a0cd5d +Subproject commit 0e287b5855287777e5c6d37bbb04a0c97d75f212 diff --git a/qtmqtt b/qtmqtt index 8dcfe218fd1..09586f84d0b 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit 8dcfe218fd148e540ece640c43bf02a39699e406 +Subproject commit 09586f84d0b497d9a8d1c22c7751cfa99a5b25fb diff --git a/qtmultimedia b/qtmultimedia index 70edab458fd..50986335501 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 70edab458fd0ed8e587dd495747a6bf0d3c142d8 +Subproject commit 5098633550101112709530e17722e882d2aa0bba diff --git a/qtnetworkauth b/qtnetworkauth index 54f583340bc..0cc7517868e 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 54f583340bc5a67638ed7e6b414f816a9080dc7a +Subproject commit 0cc7517868eca7c2ad1eeaa1b113f181e731b954 diff --git a/qtopcua b/qtopcua index 1e5305fede1..ca66a95fca9 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit 1e5305fede1d18d82e512f148aafb18eb9db2ee0 +Subproject commit ca66a95fca977b1f2f5b217c26b815d8cf34c631 diff --git a/qtpositioning b/qtpositioning index ae72e98b7ec..498f49315d2 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit ae72e98b7ec0a16ab16b169eeda04ab245dfc65c +Subproject commit 498f49315d2a82881141df179c3456e3cf7bf24e diff --git a/qtquick3d b/qtquick3d index a2847129db3..cf1db52ecdf 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit a2847129db31c738634f2e63de8829f7f24c25c9 +Subproject commit cf1db52ecdf39b79144425bca829eb66343e8768 diff --git a/qtquick3dphysics b/qtquick3dphysics index c1b8ce8cdbb..873646b58d7 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit c1b8ce8cdbb267696d14679f5d31cc8062696ed6 +Subproject commit 873646b58d774a6a3f14288d0db3b2e0ba9873dc diff --git a/qtquickeffectmaker b/qtquickeffectmaker index 7b99ee7b8d9..6409f874346 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit 7b99ee7b8d98b6677c9de6f8a0cf7026b8179e8e +Subproject commit 6409f874346e03f8ed958b735293dc70ea5eb8e9 diff --git a/qtquicktimeline b/qtquicktimeline index 87080168eed..6b8dbf69095 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 87080168eed41de5cd467bb3ac7554843743e707 +Subproject commit 6b8dbf690956bf6d83c0d814f6bb06bd85ce45ac diff --git a/qtremoteobjects b/qtremoteobjects index 32084286690..2b4cc0a743f 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 32084286690cf95f48686df0166aedb74f6504d8 +Subproject commit 2b4cc0a743f0f7cc1f7ae06ade2d072ed8ee9c76 diff --git a/qtscxml b/qtscxml index 16a7bee972d..d72afb19f4d 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 16a7bee972d48f2b920af4e40d26a730b8166399 +Subproject commit d72afb19f4dcd2d0d495bf3a97da93e1a4a4c26c diff --git a/qtsensors b/qtsensors index 67c7b6fbc0b..d041822d4da 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 67c7b6fbc0bc14d9ccb7bb790b72dfcd60a589f4 +Subproject commit d041822d4da9db6a78ba068acd43983596ddb21a diff --git a/qtserialbus b/qtserialbus index 86d5a3c632e..35dc9bc115d 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 86d5a3c632ea31609cfe6c427cf57891fe33638a +Subproject commit 35dc9bc115da5176650a475bc637bc166c34e792 diff --git a/qtserialport b/qtserialport index 922bdfb0246..80ccebd6ba8 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 922bdfb02468ad95165ef634bf1962f9cca4ede4 +Subproject commit 80ccebd6ba893983577026ddf74c9c7d00f1faaa diff --git a/qtshadertools b/qtshadertools index 6af7de087a1..26b8fd5d266 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 6af7de087a17c550410727fbc00c63ce176fdd86 +Subproject commit 26b8fd5d266686b58710cc33c55639a755ebd925 diff --git a/qtspeech b/qtspeech index 80e28b3ca3a..2dfa7f9de40 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 80e28b3ca3abf5c954a4769a7845ac42607f391f +Subproject commit 2dfa7f9de40e08c28b0cc414c6b41527bf1ec246 diff --git a/qtsvg b/qtsvg index 01e19ecfd2c..a54bb5d1fac 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 01e19ecfd2cecd7098ef9743c94334da303e00fe +Subproject commit a54bb5d1fac4f0935ad47282d99d4720e3467ce8 diff --git a/qttools b/qttools index 3f5bef070a8..d5c328f71af 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 3f5bef070a824e2afa6269ac2803f54790de2948 +Subproject commit d5c328f71aff66f88133715abeffeb66bee6127b diff --git a/qttranslations b/qttranslations index b1692ec4a23..29b3501eddc 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit b1692ec4a23d69513ab8987dd652f663d11c7947 +Subproject commit 29b3501eddcf76c0c6423890f023f916907d5179 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index cc7b22110f2..8582e708e49 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit cc7b22110f2455027a6ca0d99105321f2e57d50e +Subproject commit 8582e708e494d8ae3a81b5cc6da70ff4260d1dbb diff --git a/qtwayland b/qtwayland index e9d301564ba..351c805d165 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit e9d301564ba39c0956c890a0626df7a1a9e5701c +Subproject commit 351c805d1654abb7c962d1ff058c2860b7ab1e05 diff --git a/qtwebchannel b/qtwebchannel index 47d44416816..4e9162619e8 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 47d44416816aacaeae2c4d33d15fabe42b830160 +Subproject commit 4e9162619e853c40693a0cd16d0a500a92da278f diff --git a/qtwebengine b/qtwebengine index a56bd1740e5..2ec2daad251 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit a56bd1740e5ba837b46cd8328e63acd1179216ba +Subproject commit 2ec2daad25156072bbee401420771c0fdb063e81 diff --git a/qtwebsockets b/qtwebsockets index 4897dda0972..abbee11a54d 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 4897dda0972c37c9ffe43652ee14963e7fa60b6a +Subproject commit abbee11a54d224cc3e3a5cead25455c95ab909c2 diff --git a/qtwebview b/qtwebview index 7372e70e675..0114cb8a9a6 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 7372e70e675a3abfc6ae7a41132b33b44a5353b3 +Subproject commit 0114cb8a9a6b933d9071c24c3605c2df55ef5533 From 44a2c39aa72bcc689c227e29bca1bedbfbda930e Mon Sep 17 00:00:00 2001 From: Daniel Smith Date: Wed, 19 Jun 2024 10:50:59 +0000 Subject: [PATCH 078/288] Update commit template for Reopens footer Task-number: QTQAINFRA-6248 Pick-to: 6.7 6.5 6.2 5.15 Change-Id: Ie1b888a339eb62adc05e73a2307d4d23429c9aff Reviewed-by: Edward Welbourne Reviewed-by: Oswald Buddenhagen (cherry picked from commit 6a343fd3198b88ab9e8b7f45d7b3244821b5281f) Reviewed-by: Qt Cherry-pick Bot --- .commit-template | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.commit-template b/.commit-template index 81c72bb7853..3a3091028c1 100644 --- a/.commit-template +++ b/.commit-template @@ -10,10 +10,13 @@ # ==[ Footers: Uncomment and edit where applicable ]===================| # # One task per entry. Add a space after the colon. -# Use Fixes to automatically close an issue, and Task-number to -# reference it without further action. -# You do not need both for the same issue. +# Use Fixes to automatically close an issue, Reopens to automatically +# reopen an issue, and Task-number to reference it without further +# action. +# You do not need to include Task-Number where Fixes or Reopens is +# specified for the same issue. #Fixes: +#Reopens: #Task-number: #Coverity-Id: # From 21a8e07fb3d51b2d56610462aacedbe5ccef7829 Mon Sep 17 00:00:00 2001 From: Pavel Dubsky Date: Tue, 9 Jul 2024 23:13:37 +0200 Subject: [PATCH 079/288] Update FFmpeg version to n7.0.1 Fixes: QTBUG-126687 Pick-to: 6.7 6.5 Change-Id: I327a33a65aaa0285a93fa228f47d6914623f8d3d Reviewed-by: Dimitrios Apostolou (cherry picked from commit a68d7302cd67377fb167c78e605d1abda2be7bc1) 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 fc0084dab95..cc81c962daa 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" +version="n7.0.1" url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz" -sha1="042260ec5013eb29c89c13443a0f42cbe6fbceaa" +sha1="6bfb65c18516e95249942f34ef664c94c0768722" 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 d9637055b7f..0ad2ae7f3ba 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" +version="n7.0.1" url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz" -sha1="042260ec5013eb29c89c13443a0f42cbe6fbceaa" +sha1="6bfb65c18516e95249942f34ef664c94c0768722" 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 30163b7312c..253f679c091 100755 --- a/coin/provisioning/common/unix/install-ffmpeg.sh +++ b/coin/provisioning/common/unix/install-ffmpeg.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" +version="n7.0.1" url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz" -sha1="042260ec5013eb29c89c13443a0f42cbe6fbceaa" +sha1="6bfb65c18516e95249942f34ef664c94c0768722" 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 e77417ebc14..4f057fc9f98 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" +$version="n7.0.1" $url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz" -$sha1="042260ec5013eb29c89c13443a0f42cbe6fbceaa" +$sha1="6bfb65c18516e95249942f34ef664c94c0768722" $url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz" $ffmpeg_name="FFmpeg-$version" From 72e5affa2150c74f2afb1571c3a98d1f9a839056 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Tue, 16 Jul 2024 14:24:57 +0300 Subject: [PATCH 080/288] CI: Use Ubuntu 22.04 with WebOS configs Change-Id: I2d4a2f024140d79a2a893b02fe903a3e3ee8d37f Reviewed-by: Toni Saario (cherry picked from commit 9b0a15268e96e31edd599a8badd2e418c5fc88f1) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/webos.yaml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/coin/platform_configs/webos.yaml b/coin/platform_configs/webos.yaml index e0f285fe1b6..46952bae3df 100644 --- a/coin/platform_configs/webos.yaml +++ b/coin/platform_configs/webos.yaml @@ -2,52 +2,52 @@ Version: 2 Module only: true Configurations: - Id: 'webos-emulator-build' - Template: 'qtci-linux-Ubuntu-20.04-x86_64-52' + Template: 'qtci-linux-Ubuntu-22.04-x86_64-52' Compiler: 'GCC' Features: ['DoNotRunTests'] Environment variables: ['BUILD_EMULATOR=enabled'] - Id: 'webos-emulator-qtbase-tests' - Template: 'qtci-linux-Ubuntu-20.04-x86_64-52' + Template: 'qtci-linux-Ubuntu-22.04-x86_64-52' Compiler: 'GCC' Features: ['TestOnly'] Environment variables: ['MODULE=qtbase'] Platform dependency: 'webos-emulator-build' - Id: 'webos-emulator-qtdeclarative-tests' - Template: 'qtci-linux-Ubuntu-20.04-x86_64-52' + Template: 'qtci-linux-Ubuntu-22.04-x86_64-52' Compiler: 'GCC' Features: ['TestOnly'] Environment variables: ['MODULE=qtdeclarative'] Platform dependency: 'webos-emulator-build' - Id: 'webos-emulator-qtwayland-tests' - Template: 'qtci-linux-Ubuntu-20.04-x86_64-52' + Template: 'qtci-linux-Ubuntu-22.04-x86_64-52' Compiler: 'GCC' Features: ['TestOnly'] Environment variables: ['MODULE=qtwayland'] Platform dependency: 'webos-emulator-build' - Id: 'webos-emulator-qtshadertools-tests' - Template: 'qtci-linux-Ubuntu-20.04-x86_64-52' + Template: 'qtci-linux-Ubuntu-22.04-x86_64-52' Compiler: 'GCC' Features: ['TestOnly'] Environment variables: ['MODULE=qtshadertools'] Platform dependency: 'webos-emulator-build' - Id: 'webos-emulator-qtgraphicaleffects-tests' - Template: 'qtci-linux-Ubuntu-20.04-x86_64-52' + Template: 'qtci-linux-Ubuntu-22.04-x86_64-52' Compiler: 'GCC' Features: ['TestOnly'] Environment variables: ['MODULE=qtgraphicaleffects'] Platform dependency: 'webos-emulator-build' - Id: 'webos-raspberry-build' - Template: 'qtci-linux-Ubuntu-20.04-x86_64-52' + Template: 'qtci-linux-Ubuntu-22.04-x86_64-52' Compiler: 'GCC' Features: ['DoNotRunTests'] Environment variables: ['BUILD_RASPBERRY=enabled'] - Id: 'webos-ndk-installer-build' - Template: 'qtci-linux-Ubuntu-20.04-x86_64-52' + Template: 'qtci-linux-Ubuntu-22.04-x86_64-52' Compiler: 'GCC' Features: ['DoNotRunTests'] Environment variables: ['BUILD_NDK_INSTALLER=enabled'] - Id: 'webos-ndk-install' - Template: 'qtci-linux-Ubuntu-20.04-x86_64-52' + Template: 'qtci-linux-Ubuntu-22.04-x86_64-52' Compiler: 'GCC' Features: ['TestOnly'] Platform dependency: ['webos-raspberry-build', 'webos-ndk-installer-build'] From 83500b62c445368812d53fdcd8b481fbe47a0c57 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 31 Jul 2024 20:21:50 +0000 Subject: [PATCH 081/288] Update submodules on '6.8 in qt/qt5' Change-Id: I931a73d915bd314f742742b72ceb070f377c5910 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 0843c4eee95..659f3be95f0 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 0843c4eee9529beebcaed03a8b63af1e5a73b566 +Subproject commit 659f3be95f0d36514455ab72c661664f1395ee33 diff --git a/qt5compat b/qt5compat index 8ad54cf7cca..496aefef81f 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 8ad54cf7ccaab5e78cf2d9bf0c3112926cb70db3 +Subproject commit 496aefef81f97e052c25c4046bca637120484c52 diff --git a/qtactiveqt b/qtactiveqt index c84baa593ee..1d53ac79adf 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit c84baa593ee87540f20d347de083f63d158c3aa0 +Subproject commit 1d53ac79adf01a7621d0697d79af19a9f79f51f7 diff --git a/qtbase b/qtbase index 00a1bdfbe1c..f209e81d0f9 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 00a1bdfbe1c44e3365c155f65a7707bda8f50bb8 +Subproject commit f209e81d0f9db935fab9056c1baaf78d015c13f1 diff --git a/qtcharts b/qtcharts index 4ec9e6f1e2f..4d85f335b9c 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 4ec9e6f1e2fdad7fafbb5b0f84823da517513cd6 +Subproject commit 4d85f335b9cc38ca39b1c50589723da31314efe3 diff --git a/qtcoap b/qtcoap index a90fec34e72..3cebf5dc884 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit a90fec34e7271c18ada45acb85fa0d0759d1934c +Subproject commit 3cebf5dc8841b865317f5ea83f4840d58212f52b diff --git a/qtconnectivity b/qtconnectivity index 1c99efd42be..286ee7db3ce 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 1c99efd42befa46899f6e5fc47fb0a0857b20954 +Subproject commit 286ee7db3ce73839b9555aec6fcf49876402db97 diff --git a/qtdatavis3d b/qtdatavis3d index 4a86519b7ca..ca802641a89 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 4a86519b7ca6abcc37d1440d0c6862b2a20a67d1 +Subproject commit ca802641a890220ca68e8d4e6b7d75ef6df84338 diff --git a/qtdeclarative b/qtdeclarative index 97a77aa5343..523cca30bb6 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 97a77aa53435bae6e8b3de6c0c1af0631f6e9e8a +Subproject commit 523cca30bb6e0aaa1e3f7ebd26328613b893c174 diff --git a/qtdoc b/qtdoc index 56c2d725457..fa33ca0685a 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 56c2d725457dfccc38d6c477a54e269046b224fe +Subproject commit fa33ca0685a40428afb71df2a8fc2305202a9af9 diff --git a/qtgraphs b/qtgraphs index 799a753e0b2..ed7e9c18588 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit 799a753e0b271cd65a70f0fd85245df9aa663ba5 +Subproject commit ed7e9c1858875b729a56eec3f2e21fd452b8a547 diff --git a/qtgrpc b/qtgrpc index d934a281b2a..c6fb61e7980 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit d934a281b2a4222fb53f866dbcbcabd326aab580 +Subproject commit c6fb61e79808cef42fc08d8f5bf12c55a17bd9fa diff --git a/qthttpserver b/qthttpserver index 75fcd7e4fa5..ef4388246c9 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit 75fcd7e4fa5e15aa2fda0a0d28758ace7ff03c7e +Subproject commit ef4388246c9c085dec2cbdee5d3d96983e101331 diff --git a/qtimageformats b/qtimageformats index 62daa132cf3..72e8ec15626 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 62daa132cf33bbfcb0cf3fbfcbea4635feafd216 +Subproject commit 72e8ec15626b77115466ed0fbba13134dddc97bf diff --git a/qtlanguageserver b/qtlanguageserver index 2971f12bce0..6385cd85f1f 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit 2971f12bce0bc972ed2636ceb041e2851ea53490 +Subproject commit 6385cd85f1fd5290c2d3a8a8f046c2b7910503ea diff --git a/qtlocation b/qtlocation index 0caaf5e6094..a186cd4ccde 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 0caaf5e60949403bbe05497da7392e2c9033580c +Subproject commit a186cd4ccdefa29a81070928b02c51581286bd0e diff --git a/qtlottie b/qtlottie index 0e287b58552..01cf1e1972a 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 0e287b5855287777e5c6d37bbb04a0c97d75f212 +Subproject commit 01cf1e1972a0c5f162c7c09df3d8e1f5c5e58fd0 diff --git a/qtmqtt b/qtmqtt index 09586f84d0b..c20bd22f1be 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit 09586f84d0b497d9a8d1c22c7751cfa99a5b25fb +Subproject commit c20bd22f1beb06e47c2bb501c583df5a2569f4ce diff --git a/qtmultimedia b/qtmultimedia index 50986335501..c7db5d23698 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 5098633550101112709530e17722e882d2aa0bba +Subproject commit c7db5d236985f0c0cfeb02fa5e5f176f8d895d25 diff --git a/qtnetworkauth b/qtnetworkauth index 0cc7517868e..31bd0bc0747 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 0cc7517868eca7c2ad1eeaa1b113f181e731b954 +Subproject commit 31bd0bc07477dc94943a8f8b8241b353d240de9f diff --git a/qtopcua b/qtopcua index ca66a95fca9..501e3bea1b7 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit ca66a95fca977b1f2f5b217c26b815d8cf34c631 +Subproject commit 501e3bea1b77177daea2cb48f1f39684be80fb9f diff --git a/qtpositioning b/qtpositioning index 498f49315d2..62b231fd708 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit 498f49315d2a82881141df179c3456e3cf7bf24e +Subproject commit 62b231fd7081a4211d5aff7908c0b83f1dcc79fd diff --git a/qtquick3d b/qtquick3d index cf1db52ecdf..16491de5ab3 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit cf1db52ecdf39b79144425bca829eb66343e8768 +Subproject commit 16491de5ab3219fc69e98eabf05609affd7c849a diff --git a/qtquick3dphysics b/qtquick3dphysics index 873646b58d7..b8db942863e 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit 873646b58d774a6a3f14288d0db3b2e0ba9873dc +Subproject commit b8db942863e61f3be65cdd21fa9f85eefc9cae23 diff --git a/qtquickeffectmaker b/qtquickeffectmaker index 6409f874346..fbca449f5b9 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit 6409f874346e03f8ed958b735293dc70ea5eb8e9 +Subproject commit fbca449f5b945563031d22b987f92dfb094f12f0 diff --git a/qtquicktimeline b/qtquicktimeline index 6b8dbf69095..4aa62da5c72 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 6b8dbf690956bf6d83c0d814f6bb06bd85ce45ac +Subproject commit 4aa62da5c7231c225b054ca9938b784c5682f1e5 diff --git a/qtremoteobjects b/qtremoteobjects index 2b4cc0a743f..3d6dc6c1ba8 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 2b4cc0a743f0f7cc1f7ae06ade2d072ed8ee9c76 +Subproject commit 3d6dc6c1ba826819f89f99dd9d153ea7ae57002a diff --git a/qtrepotools b/qtrepotools index a2324d1e746..322d801c921 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit a2324d1e7463ccbb1234f944684297d565c2ef68 +Subproject commit 322d801c921ced813cf6431ae71b15a03ccf5ab5 diff --git a/qtscxml b/qtscxml index d72afb19f4d..c7554689007 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit d72afb19f4dcd2d0d495bf3a97da93e1a4a4c26c +Subproject commit c75546890075e03f78d1701728b0e20f262c65af diff --git a/qtsensors b/qtsensors index d041822d4da..5a400575e43 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit d041822d4da9db6a78ba068acd43983596ddb21a +Subproject commit 5a400575e4363078b8a622f4cfff227802d862c5 diff --git a/qtserialbus b/qtserialbus index 35dc9bc115d..adf1507171e 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 35dc9bc115da5176650a475bc637bc166c34e792 +Subproject commit adf1507171e91ea42711ed1d6e2f7ea2072e0da7 diff --git a/qtserialport b/qtserialport index 80ccebd6ba8..520cd19d505 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 80ccebd6ba893983577026ddf74c9c7d00f1faaa +Subproject commit 520cd19d50522f175b4ce19ae0c8f5c1daa35b4b diff --git a/qtshadertools b/qtshadertools index 26b8fd5d266..5607e912938 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 26b8fd5d266686b58710cc33c55639a755ebd925 +Subproject commit 5607e912938852014af1db621ee3a9eaaf4d61a0 diff --git a/qtspeech b/qtspeech index 2dfa7f9de40..d438dc7867f 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 2dfa7f9de40e08c28b0cc414c6b41527bf1ec246 +Subproject commit d438dc7867f33b5018714bb8d138bea6fd3b1628 diff --git a/qtsvg b/qtsvg index a54bb5d1fac..2f1b4ad7b38 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit a54bb5d1fac4f0935ad47282d99d4720e3467ce8 +Subproject commit 2f1b4ad7b3825823edfc76b2f018d7a2df7d3edf diff --git a/qttools b/qttools index d5c328f71af..912881b3dac 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit d5c328f71aff66f88133715abeffeb66bee6127b +Subproject commit 912881b3dac1b2ec0b9444f64836fc1a3d703805 diff --git a/qttranslations b/qttranslations index 29b3501eddc..2df2e0b98ef 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 29b3501eddcf76c0c6423890f023f916907d5179 +Subproject commit 2df2e0b98efa5d9c41ed229cb61a09599ad4360d diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 8582e708e49..36b78fc637b 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 8582e708e494d8ae3a81b5cc6da70ff4260d1dbb +Subproject commit 36b78fc637b6659315d2735b55ce8e0488c7cdac diff --git a/qtwayland b/qtwayland index 351c805d165..dd2980f4ca1 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 351c805d1654abb7c962d1ff058c2860b7ab1e05 +Subproject commit dd2980f4ca19efe885a40367340401f22e8a2a38 diff --git a/qtwebchannel b/qtwebchannel index 4e9162619e8..0e8015fcce7 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 4e9162619e853c40693a0cd16d0a500a92da278f +Subproject commit 0e8015fcce752ed01c80ee6a546108caec0dd663 diff --git a/qtwebengine b/qtwebengine index 2ec2daad251..26e2dcfd6d4 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 2ec2daad25156072bbee401420771c0fdb063e81 +Subproject commit 26e2dcfd6d4bdfcd1e8e2ff71db135cb1b588051 diff --git a/qtwebsockets b/qtwebsockets index abbee11a54d..70d6054e6ca 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit abbee11a54d224cc3e3a5cead25455c95ab909c2 +Subproject commit 70d6054e6ca2df059e438357f511e5c714fb7556 diff --git a/qtwebview b/qtwebview index 0114cb8a9a6..6a88d72c25b 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 0114cb8a9a6b933d9071c24c3605c2df55ef5533 +Subproject commit 6a88d72c25ba1acfcec57bf45a0003bc459a6fe2 From 09aa68b3de81c51b961587232393a7b5ab5a5f0b Mon Sep 17 00:00:00 2001 From: Tero Heikkinen Date: Fri, 2 Aug 2024 15:51:41 +0300 Subject: [PATCH 082/288] Python: Unset proxy for python pip cert issues Task-number: QTQAINFRA-6473 Pick-to: 6.7 Change-Id: I43cfd0cba3fcdcd7acdf1d75ee2347dac8b77175 Reviewed-by: Dimitrios Apostolou (cherry picked from commit 31774f91036555926984db8865e658c856ea5ad1) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/common/windows/set-proxy.ps1 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/coin/provisioning/common/windows/set-proxy.ps1 b/coin/provisioning/common/windows/set-proxy.ps1 index f2a89e43bec..46bb7216a1a 100644 --- a/coin/provisioning/common/windows/set-proxy.ps1 +++ b/coin/provisioning/common/windows/set-proxy.ps1 @@ -5,6 +5,9 @@ $n = Get-Content "$PSScriptRoot\..\shared\http_proxy.txt" $n = $n.Split('=') New-Variable -Name $n[0] -Value $n[1] +Write-Host "Temporarily not setting proxy" # QTQAINFRA-6473 +$proxy = "" + if ([string]::IsNullOrEmpty($proxy)) { Write-Host "No proxy is defined." } else { From f68d6a976c9c9b4ab7de9c85ec93cc6a5bb0c8c9 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 6 Aug 2024 03:39:51 +0000 Subject: [PATCH 083/288] Update submodules on '6.8 in qt/qt5' Change-Id: I8417191ea92caf11fac8283c12009b76d1f72eaa 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 659f3be95f0..9d5d3b259b4 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 659f3be95f0d36514455ab72c661664f1395ee33 +Subproject commit 9d5d3b259b4b5df944136872120c6d85904238cf diff --git a/qt5compat b/qt5compat index 496aefef81f..2003f586794 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 496aefef81f97e052c25c4046bca637120484c52 +Subproject commit 2003f586794c057c0928b56c1a81dd155c06650a diff --git a/qtactiveqt b/qtactiveqt index 1d53ac79adf..c7938c346a2 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 1d53ac79adf01a7621d0697d79af19a9f79f51f7 +Subproject commit c7938c346a20719482f52c315e9de1bd18ad688e diff --git a/qtbase b/qtbase index f209e81d0f9..f2601a27b0b 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit f209e81d0f9db935fab9056c1baaf78d015c13f1 +Subproject commit f2601a27b0b85e7eed930101a82636f41a0df5aa diff --git a/qtcharts b/qtcharts index 4d85f335b9c..e64e8f6d9fd 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 4d85f335b9cc38ca39b1c50589723da31314efe3 +Subproject commit e64e8f6d9fde7255521aebe593faa86883ca5677 diff --git a/qtcoap b/qtcoap index 3cebf5dc884..49cbcc57fbf 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit 3cebf5dc8841b865317f5ea83f4840d58212f52b +Subproject commit 49cbcc57fbf7350223c23a295291adcdc5b9cb51 diff --git a/qtconnectivity b/qtconnectivity index 286ee7db3ce..448a094efb9 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 286ee7db3ce73839b9555aec6fcf49876402db97 +Subproject commit 448a094efb9ac9e23cce0fef994534d263e3458b diff --git a/qtdatavis3d b/qtdatavis3d index ca802641a89..6986bc54f88 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit ca802641a890220ca68e8d4e6b7d75ef6df84338 +Subproject commit 6986bc54f88be0e7bc5ee566e6b81107c762b57f diff --git a/qtdeclarative b/qtdeclarative index 523cca30bb6..ec89e7c3986 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 523cca30bb6e0aaa1e3f7ebd26328613b893c174 +Subproject commit ec89e7c3986fdfbb91acbb1cbe5594a8a1b5da73 diff --git a/qtdoc b/qtdoc index fa33ca0685a..1b594b2c5ea 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit fa33ca0685a40428afb71df2a8fc2305202a9af9 +Subproject commit 1b594b2c5ea1eeb9a7c4c9799b63117498b9a3be diff --git a/qtgraphs b/qtgraphs index ed7e9c18588..d296cac848e 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit ed7e9c1858875b729a56eec3f2e21fd452b8a547 +Subproject commit d296cac848eae24a881478f63324d82412e0a67e diff --git a/qtgrpc b/qtgrpc index c6fb61e7980..1be6e998d24 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit c6fb61e79808cef42fc08d8f5bf12c55a17bd9fa +Subproject commit 1be6e998d24eb8069cb258692015ad26ebf3effa diff --git a/qthttpserver b/qthttpserver index ef4388246c9..9c80deca53e 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit ef4388246c9c085dec2cbdee5d3d96983e101331 +Subproject commit 9c80deca53e49fa786870405b1b03d4483df010f diff --git a/qtimageformats b/qtimageformats index 72e8ec15626..b90902a8a85 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 72e8ec15626b77115466ed0fbba13134dddc97bf +Subproject commit b90902a8a8508185b93f0f6cd85f2b4800514640 diff --git a/qtlanguageserver b/qtlanguageserver index 6385cd85f1f..0c5ca60543e 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit 6385cd85f1fd5290c2d3a8a8f046c2b7910503ea +Subproject commit 0c5ca60543e7f52fa7cbc4c52e10dcb2294dd113 diff --git a/qtlocation b/qtlocation index a186cd4ccde..08d07728d0c 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit a186cd4ccdefa29a81070928b02c51581286bd0e +Subproject commit 08d07728d0c39efbc64f28cc997714874367b86a diff --git a/qtlottie b/qtlottie index 01cf1e1972a..59a33ccee95 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 01cf1e1972a0c5f162c7c09df3d8e1f5c5e58fd0 +Subproject commit 59a33ccee95faed8882a255a6e472a171e875b7e diff --git a/qtmqtt b/qtmqtt index c20bd22f1be..b34e3b13420 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit c20bd22f1beb06e47c2bb501c583df5a2569f4ce +Subproject commit b34e3b13420e5afe94660ff0534651c9094cd1f6 diff --git a/qtmultimedia b/qtmultimedia index c7db5d23698..549aa030251 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit c7db5d236985f0c0cfeb02fa5e5f176f8d895d25 +Subproject commit 549aa0302515ae31711507b889834815bbefcd1e diff --git a/qtnetworkauth b/qtnetworkauth index 31bd0bc0747..a397868f0cf 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 31bd0bc07477dc94943a8f8b8241b353d240de9f +Subproject commit a397868f0cff426fbaef39a18556b04014e2df87 diff --git a/qtopcua b/qtopcua index 501e3bea1b7..ff04b7a7072 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit 501e3bea1b77177daea2cb48f1f39684be80fb9f +Subproject commit ff04b7a7072ca4272eb296730ad3bede2f9a106e diff --git a/qtpositioning b/qtpositioning index 62b231fd708..5d8f1f6d222 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit 62b231fd7081a4211d5aff7908c0b83f1dcc79fd +Subproject commit 5d8f1f6d222dd467cd892953dfa4695776666c5b diff --git a/qtquick3d b/qtquick3d index 16491de5ab3..e6968157909 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 16491de5ab3219fc69e98eabf05609affd7c849a +Subproject commit e696815790983134d97487de035aa32bc4bf51d1 diff --git a/qtquick3dphysics b/qtquick3dphysics index b8db942863e..ade78112123 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit b8db942863e61f3be65cdd21fa9f85eefc9cae23 +Subproject commit ade7811212395d57156e0d11a10fd7a5c6bee883 diff --git a/qtquickeffectmaker b/qtquickeffectmaker index fbca449f5b9..dba82e07a12 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit fbca449f5b945563031d22b987f92dfb094f12f0 +Subproject commit dba82e07a12a4d138db21d549b3ec5b462ff0e37 diff --git a/qtquicktimeline b/qtquicktimeline index 4aa62da5c72..a0bfbcc8b3e 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 4aa62da5c7231c225b054ca9938b784c5682f1e5 +Subproject commit a0bfbcc8b3eeafbb30894ff512153ed9bb92cd15 diff --git a/qtremoteobjects b/qtremoteobjects index 3d6dc6c1ba8..828835d285d 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 3d6dc6c1ba826819f89f99dd9d153ea7ae57002a +Subproject commit 828835d285dd063e8b859f325df3ae26a63fd7b9 diff --git a/qtscxml b/qtscxml index c7554689007..992f05ec13c 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit c75546890075e03f78d1701728b0e20f262c65af +Subproject commit 992f05ec13c7948e829662174570bc18b3a6fff2 diff --git a/qtsensors b/qtsensors index 5a400575e43..a78c8270fb5 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 5a400575e4363078b8a622f4cfff227802d862c5 +Subproject commit a78c8270fb5ee3feeb1257b00e3e457f676d9c39 diff --git a/qtserialbus b/qtserialbus index adf1507171e..574bb40a96c 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit adf1507171e91ea42711ed1d6e2f7ea2072e0da7 +Subproject commit 574bb40a96c2a803992840e91955a3965aa2f566 diff --git a/qtserialport b/qtserialport index 520cd19d505..07a62eed11a 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 520cd19d50522f175b4ce19ae0c8f5c1daa35b4b +Subproject commit 07a62eed11af101ca545bf9e9ec02cac094500e2 diff --git a/qtshadertools b/qtshadertools index 5607e912938..6ce153407df 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 5607e912938852014af1db621ee3a9eaaf4d61a0 +Subproject commit 6ce153407df387734a8517ca1481cf9b88f953d7 diff --git a/qtspeech b/qtspeech index d438dc7867f..6b368a12454 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit d438dc7867f33b5018714bb8d138bea6fd3b1628 +Subproject commit 6b368a1245403b25cf1a9c27a04a0f55624dcc77 diff --git a/qtsvg b/qtsvg index 2f1b4ad7b38..ff1a60abb6a 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 2f1b4ad7b3825823edfc76b2f018d7a2df7d3edf +Subproject commit ff1a60abb6a21135705bf794ec1839779c1b23e8 diff --git a/qttools b/qttools index 912881b3dac..020b796b547 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 912881b3dac1b2ec0b9444f64836fc1a3d703805 +Subproject commit 020b796b547328360023bc871453eaa01990e180 diff --git a/qttranslations b/qttranslations index 2df2e0b98ef..c5b64151510 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 2df2e0b98efa5d9c41ed229cb61a09599ad4360d +Subproject commit c5b64151510704800d4c8008427cb4b48db8b25a diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 36b78fc637b..6397edbc140 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 36b78fc637b6659315d2735b55ce8e0488c7cdac +Subproject commit 6397edbc140abdf3f073e8319887bb1d480b4598 diff --git a/qtwayland b/qtwayland index dd2980f4ca1..5f6ffe63868 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit dd2980f4ca19efe885a40367340401f22e8a2a38 +Subproject commit 5f6ffe63868e38c8d4dbb039f55509c3f1c9363a diff --git a/qtwebchannel b/qtwebchannel index 0e8015fcce7..eb217a03daa 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 0e8015fcce752ed01c80ee6a546108caec0dd663 +Subproject commit eb217a03daa2b8fd18325d92e45a9b454d5dea62 diff --git a/qtwebengine b/qtwebengine index 26e2dcfd6d4..7fbbcbb33b6 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 26e2dcfd6d4bdfcd1e8e2ff71db135cb1b588051 +Subproject commit 7fbbcbb33b641393068c05afcce94d6d55c5397d diff --git a/qtwebsockets b/qtwebsockets index 70d6054e6ca..c4d8cc41f06 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 70d6054e6ca2df059e438357f511e5c714fb7556 +Subproject commit c4d8cc41f06b90a3723c5ba12c1382e8c02c7274 diff --git a/qtwebview b/qtwebview index 6a88d72c25b..b139af3bf62 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 6a88d72c25ba1acfcec57bf45a0003bc459a6fe2 +Subproject commit b139af3bf6283cfba9a12dc73d7441727b8bc43a From a11202a0b6c1a7caf387089d2414bb47a3ff1108 Mon Sep 17 00:00:00 2001 From: Bartlomiej Moskal Date: Wed, 24 Jul 2024 14:19:05 +0200 Subject: [PATCH 084/288] coin: Move install-patchelf script to unix directory MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This patch prepare install-patchelf.sh script for use on MacOs Task-number: QTBUG-126861 Change-Id: Id16462a2819da748ecd0b04f1df57968e9d90c37 Reviewed-by: Jøger Hansegård (cherry picked from commit 62b60c4caa3b04bcf1219f4f0dbd2b8d672efc8f) --- coin/provisioning/common/{linux => unix}/install-patchelf.sh | 0 .../qtci-linux-RHEL-8.2-x86_64/05-install-patchelf.sh | 2 +- .../qtci-linux-RHEL-8.4-x86_64/05-install-patchelf.sh | 2 +- .../qtci-linux-RHEL-8.6-x86_64/05-install-patchelf.sh | 2 +- .../qtci-linux-RHEL-8.8-x86_64/05-install-patchelf.sh | 2 +- .../qtci-linux-RHEL-9.0-x86_64/05-install-patchelf.sh | 2 +- .../qtci-linux-RHEL-9.2-x86_64/05-install-patchelf.sh | 2 +- 7 files changed, 6 insertions(+), 6 deletions(-) rename coin/provisioning/common/{linux => unix}/install-patchelf.sh (100%) diff --git a/coin/provisioning/common/linux/install-patchelf.sh b/coin/provisioning/common/unix/install-patchelf.sh similarity index 100% rename from coin/provisioning/common/linux/install-patchelf.sh rename to coin/provisioning/common/unix/install-patchelf.sh diff --git a/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/05-install-patchelf.sh b/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/05-install-patchelf.sh index 14813160591..495e3d4ace5 100755 --- a/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/05-install-patchelf.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.2-x86_64/05-install-patchelf.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/linux/install-patchelf.sh" +source "${BASH_SOURCE%/*}/../common/unix/install-patchelf.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/05-install-patchelf.sh b/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/05-install-patchelf.sh index 14813160591..495e3d4ace5 100755 --- a/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/05-install-patchelf.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.4-x86_64/05-install-patchelf.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/linux/install-patchelf.sh" +source "${BASH_SOURCE%/*}/../common/unix/install-patchelf.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/05-install-patchelf.sh b/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/05-install-patchelf.sh index 14813160591..495e3d4ace5 100755 --- a/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/05-install-patchelf.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/05-install-patchelf.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/linux/install-patchelf.sh" +source "${BASH_SOURCE%/*}/../common/unix/install-patchelf.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/05-install-patchelf.sh b/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/05-install-patchelf.sh index 14813160591..495e3d4ace5 100755 --- a/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/05-install-patchelf.sh +++ b/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/05-install-patchelf.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/linux/install-patchelf.sh" +source "${BASH_SOURCE%/*}/../common/unix/install-patchelf.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/05-install-patchelf.sh b/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/05-install-patchelf.sh index 14813160591..495e3d4ace5 100755 --- a/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/05-install-patchelf.sh +++ b/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/05-install-patchelf.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/linux/install-patchelf.sh" +source "${BASH_SOURCE%/*}/../common/unix/install-patchelf.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/05-install-patchelf.sh b/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/05-install-patchelf.sh index 14813160591..495e3d4ace5 100755 --- a/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/05-install-patchelf.sh +++ b/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/05-install-patchelf.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/linux/install-patchelf.sh" +source "${BASH_SOURCE%/*}/../common/unix/install-patchelf.sh" From 74cdd355d69f523096d2228651244820e4307513 Mon Sep 17 00:00:00 2001 From: Bartlomiej Moskal Date: Wed, 24 Jul 2024 14:27:38 +0200 Subject: [PATCH 085/288] coin: Downgrade patchelf version on CI MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Downgrade patchelf version from 0.18.0 to 0.17.2 on MacOs, Linux and Windows. It looks like there is a problem with 0.18.0 version, when modyfing the Android libs. It causes an unresolved dependencies error when loading a changed library. Fixes: QTBUG-126861 Change-Id: I5a95daae0a78aadede009535b2813483afcbc99d Reviewed-by: Jøger Hansegård (cherry picked from commit 64aee78df824cebd69903f70c21514b44d8cadd3) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/common/unix/install-patchelf.sh | 6 +++--- coin/provisioning/common/windows/install-ffmpeg.ps1 | 8 ++++---- coin/provisioning/qtci-macos-12-x86_64/28-patchelf.sh | 2 +- coin/provisioning/qtci-macos-13-x86_64/28-patchelf.sh | 3 +-- coin/provisioning/qtci-macos-14-x86_64/28-patchelf.sh | 7 +++++++ 5 files changed, 16 insertions(+), 10 deletions(-) create mode 100755 coin/provisioning/qtci-macos-14-x86_64/28-patchelf.sh diff --git a/coin/provisioning/common/unix/install-patchelf.sh b/coin/provisioning/common/unix/install-patchelf.sh index 6600795ca83..8e10e351265 100755 --- a/coin/provisioning/common/unix/install-patchelf.sh +++ b/coin/provisioning/common/unix/install-patchelf.sh @@ -4,11 +4,11 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" -patchelf_version="0.18.0" +patchelf_version="0.17.2" -url_cached="http://ci-files01-hki.ci.qt.io/input/patchelf/$patchelf_version.tar.gz" +url_cached="https://ci-files01-hki.intra.qt.io/input/android/patchelf/$patchelf_version.tar.gz" url_public="https://github.com/NixOS/patchelf/archive/refs/tags/$patchelf_version.tar.gz" -sha1="7eb974172de73b7b452ee376237ad78601603c45" +sha1="ddd46a2e2a16a308245c008721d877455b23bba8" target_source_dir="$HOME/patchelf-$patchelf_version" diff --git a/coin/provisioning/common/windows/install-ffmpeg.ps1 b/coin/provisioning/common/windows/install-ffmpeg.ps1 index 4f057fc9f98..f93b9412384 100644 --- a/coin/provisioning/common/windows/install-ffmpeg.ps1 +++ b/coin/provisioning/common/windows/install-ffmpeg.ps1 @@ -183,16 +183,16 @@ function InstallAndroidArmv7 { Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath $msys -ArgumentList ("-lc", "`"pacman -Sy --noconfirm automake`"") Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath $msys -ArgumentList ("-lc", "`"pacman -Sy --noconfirm libtool`"") - $patchelf_sha1 = "7EB974172DE73B7B452EE376237AD78601603C45" - $patchelf_sources = "https://ci-files01-hki.intra.qt.io/input/android/patchelf/0.18.0.tar.gz" - $patchelf_download_location = "C:\Windows\Temp\0.18.0.tar.gz" + $patchelf_sha1 = "DDD46A2E2A16A308245C008721D877455B23BBA8" + $patchelf_sources = "https://ci-files01-hki.intra.qt.io/input/android/patchelf/0.17.2.tar.gz" + $patchelf_download_location = "C:\Windows\Temp\0.17.2.tar.gz" Invoke-WebRequest -UseBasicParsing $patchelf_sources -OutFile $patchelf_download_location Verify-Checksum $patchelf_download_location $patchelf_sha1 Extract-tar_gz $patchelf_download_location $unzip_location Remove $patchelf_download_location - Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath $msys -ArgumentList ("-lc", "`"cd C:/patchelf-0.18.0 && ./bootstrap.sh && ./configure && make install`"") + 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" $command = $command.Replace("\", "/") diff --git a/coin/provisioning/qtci-macos-12-x86_64/28-patchelf.sh b/coin/provisioning/qtci-macos-12-x86_64/28-patchelf.sh index 0710f48303b..17a1b0c6f12 100755 --- a/coin/provisioning/qtci-macos-12-x86_64/28-patchelf.sh +++ b/coin/provisioning/qtci-macos-12-x86_64/28-patchelf.sh @@ -4,5 +4,5 @@ set -ex -brew install patchelf +source "${BASH_SOURCE%/*}/../common/unix/install-patchelf.sh" diff --git a/coin/provisioning/qtci-macos-13-x86_64/28-patchelf.sh b/coin/provisioning/qtci-macos-13-x86_64/28-patchelf.sh index 0710f48303b..f60a7cdcbf0 100755 --- a/coin/provisioning/qtci-macos-13-x86_64/28-patchelf.sh +++ b/coin/provisioning/qtci-macos-13-x86_64/28-patchelf.sh @@ -4,5 +4,4 @@ set -ex -brew install patchelf - +source "${BASH_SOURCE%/*}/../common/unix/install-patchelf.sh" diff --git a/coin/provisioning/qtci-macos-14-x86_64/28-patchelf.sh b/coin/provisioning/qtci-macos-14-x86_64/28-patchelf.sh new file mode 100755 index 00000000000..f60a7cdcbf0 --- /dev/null +++ b/coin/provisioning/qtci-macos-14-x86_64/28-patchelf.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/unix/install-patchelf.sh" From 0fecad52b8db3917fd50306931ae31a035eba2d8 Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Fri, 9 Aug 2024 08:15:45 +0300 Subject: [PATCH 086/288] Add 'Packaging' -flag for ubuntu 22.04 Task-number: QTBUG-124630 Change-Id: Ie5f5a5b904c91df8c96bf8a00448e465863ee906 Reviewed-by: Jukka Jokiniva --- 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 03332cdfbf6..3e3c943d317 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -43,7 +43,7 @@ Configurations: Id: 'ubuntu-24.04-arm64' Template: 'qtci-linux-Ubuntu-24.04-aarch64-50' Compiler: 'GCC' - Features: ['UseConfigure', 'DoNotRunTests'] + Features: ['Packaging', 'UseConfigure', 'DoNotRunTests'] 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 -qpa offscreen\;xcb' Environment variables: [ 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', From 3f4790463cc56c1eecb9b38762362b0dbd57ff38 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 9 Aug 2024 21:35:14 +0000 Subject: [PATCH 087/288] Update submodules on '6.8 in qt/qt5' Change-Id: Ibc71f98d1ca5ad73da7dff2b3c2ed79aac7ff94e 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 9d5d3b259b4..330d9d1b070 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 9d5d3b259b4b5df944136872120c6d85904238cf +Subproject commit 330d9d1b070ed8c0fce37a79f67d6bdac11153a5 diff --git a/qt5compat b/qt5compat index 2003f586794..83e0193e51e 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 2003f586794c057c0928b56c1a81dd155c06650a +Subproject commit 83e0193e51ecfe65f8ec6582dbc75fe69bddb11c diff --git a/qtactiveqt b/qtactiveqt index c7938c346a2..2a303517236 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit c7938c346a20719482f52c315e9de1bd18ad688e +Subproject commit 2a303517236f903a12e6678e4ba45f8632768edc diff --git a/qtbase b/qtbase index f2601a27b0b..9ff399fd09d 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit f2601a27b0b85e7eed930101a82636f41a0df5aa +Subproject commit 9ff399fd09d027a2c207a2d5a56d29c6f7f3fa99 diff --git a/qtcharts b/qtcharts index e64e8f6d9fd..2cb612633ae 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit e64e8f6d9fde7255521aebe593faa86883ca5677 +Subproject commit 2cb612633aed90c27645722775d22bf3d2df3f95 diff --git a/qtcoap b/qtcoap index 49cbcc57fbf..21300149dd7 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit 49cbcc57fbf7350223c23a295291adcdc5b9cb51 +Subproject commit 21300149dd726ad1cc51f87fb33d369af1aedbf8 diff --git a/qtconnectivity b/qtconnectivity index 448a094efb9..2d4ac78fa5e 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 448a094efb9ac9e23cce0fef994534d263e3458b +Subproject commit 2d4ac78fa5eb43459caf7a9e59a5d790cf03a809 diff --git a/qtdatavis3d b/qtdatavis3d index 6986bc54f88..3b0bce522e8 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 6986bc54f88be0e7bc5ee566e6b81107c762b57f +Subproject commit 3b0bce522e8e14151cde3bba214f0d5ee5478d60 diff --git a/qtdeclarative b/qtdeclarative index ec89e7c3986..10d00aca5e9 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit ec89e7c3986fdfbb91acbb1cbe5594a8a1b5da73 +Subproject commit 10d00aca5e9da3973bca4b8d083ea11d5b0f1775 diff --git a/qtdoc b/qtdoc index 1b594b2c5ea..b65156ed9d6 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 1b594b2c5ea1eeb9a7c4c9799b63117498b9a3be +Subproject commit b65156ed9d6fcd838f0959a3fb2ad1139c30bd99 diff --git a/qtgraphs b/qtgraphs index d296cac848e..1297f559755 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit d296cac848eae24a881478f63324d82412e0a67e +Subproject commit 1297f55975565c6e4309c30b92cc047dd818cab9 diff --git a/qtgrpc b/qtgrpc index 1be6e998d24..d447d7ba906 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit 1be6e998d24eb8069cb258692015ad26ebf3effa +Subproject commit d447d7ba9061aa1dd1f55680f603b61b15de43bc diff --git a/qthttpserver b/qthttpserver index 9c80deca53e..a3008ba7bdd 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit 9c80deca53e49fa786870405b1b03d4483df010f +Subproject commit a3008ba7bdd321ac2052fe15ce56147c80b27d13 diff --git a/qtimageformats b/qtimageformats index b90902a8a85..9c02c0edfbc 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit b90902a8a8508185b93f0f6cd85f2b4800514640 +Subproject commit 9c02c0edfbc4a978ec7623ad963ed4d73f81afba diff --git a/qtlanguageserver b/qtlanguageserver index 0c5ca60543e..93a91c5cb07 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit 0c5ca60543e7f52fa7cbc4c52e10dcb2294dd113 +Subproject commit 93a91c5cb070cca31268f97c824fe75a516a634c diff --git a/qtlocation b/qtlocation index 08d07728d0c..a7d4bd39e73 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 08d07728d0c39efbc64f28cc997714874367b86a +Subproject commit a7d4bd39e736c226d85692ae504bd69d857cb2bb diff --git a/qtlottie b/qtlottie index 59a33ccee95..131eefe5ca5 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 59a33ccee95faed8882a255a6e472a171e875b7e +Subproject commit 131eefe5ca5995711411042f56cf182f9dbca771 diff --git a/qtmqtt b/qtmqtt index b34e3b13420..024cb86bae0 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit b34e3b13420e5afe94660ff0534651c9094cd1f6 +Subproject commit 024cb86bae0e0c780295d879ec6beb2fcd1eb670 diff --git a/qtmultimedia b/qtmultimedia index 549aa030251..6e62f7b240d 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 549aa0302515ae31711507b889834815bbefcd1e +Subproject commit 6e62f7b240d8791063deaefddcb5f221133f4b69 diff --git a/qtnetworkauth b/qtnetworkauth index a397868f0cf..519af708db9 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit a397868f0cff426fbaef39a18556b04014e2df87 +Subproject commit 519af708db93203337f65ead5a3ba6dd228babe9 diff --git a/qtopcua b/qtopcua index ff04b7a7072..039b8b3ddc8 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit ff04b7a7072ca4272eb296730ad3bede2f9a106e +Subproject commit 039b8b3ddc8a9d4bc816dbab49fa6bf70f85a34c diff --git a/qtpositioning b/qtpositioning index 5d8f1f6d222..9891aed7411 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit 5d8f1f6d222dd467cd892953dfa4695776666c5b +Subproject commit 9891aed7411ddb70a3f07d92fca43e59149dc1d4 diff --git a/qtquick3d b/qtquick3d index e6968157909..5de607cddab 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit e696815790983134d97487de035aa32bc4bf51d1 +Subproject commit 5de607cddabc150e238ec8b174a16a29357989b4 diff --git a/qtquick3dphysics b/qtquick3dphysics index ade78112123..80e53362e53 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit ade7811212395d57156e0d11a10fd7a5c6bee883 +Subproject commit 80e53362e5397524e84786d9b59a7f7e1c0b0fe3 diff --git a/qtquickeffectmaker b/qtquickeffectmaker index dba82e07a12..7907bf223a3 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit dba82e07a12a4d138db21d549b3ec5b462ff0e37 +Subproject commit 7907bf223a3796c103209278e8d31f0538d519fe diff --git a/qtquicktimeline b/qtquicktimeline index a0bfbcc8b3e..eefb1e633fd 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit a0bfbcc8b3eeafbb30894ff512153ed9bb92cd15 +Subproject commit eefb1e633fdd8431aa2a0cb4d3f43e24aa5552c9 diff --git a/qtremoteobjects b/qtremoteobjects index 828835d285d..3d791adda57 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 828835d285dd063e8b859f325df3ae26a63fd7b9 +Subproject commit 3d791adda5770d43a663e12fb0cfd2b58d40b58d diff --git a/qtscxml b/qtscxml index 992f05ec13c..109b9bd4097 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 992f05ec13c7948e829662174570bc18b3a6fff2 +Subproject commit 109b9bd4097b214089fa3e8a5568f6bec44a533b diff --git a/qtsensors b/qtsensors index a78c8270fb5..b2aecf67894 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit a78c8270fb5ee3feeb1257b00e3e457f676d9c39 +Subproject commit b2aecf6789445e934de4b71e1319a920213b785a diff --git a/qtserialbus b/qtserialbus index 574bb40a96c..be821aee83a 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 574bb40a96c2a803992840e91955a3965aa2f566 +Subproject commit be821aee83ab77cc794a97be660bfd87c468fd83 diff --git a/qtserialport b/qtserialport index 07a62eed11a..76eadefd546 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 07a62eed11af101ca545bf9e9ec02cac094500e2 +Subproject commit 76eadefd54602453bfd89ff27ea1be48741aeb56 diff --git a/qtshadertools b/qtshadertools index 6ce153407df..38951e1be69 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 6ce153407df387734a8517ca1481cf9b88f953d7 +Subproject commit 38951e1be69446ceb9239dbf5e255adb032fde76 diff --git a/qtspeech b/qtspeech index 6b368a12454..10fe6f5b23a 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 6b368a1245403b25cf1a9c27a04a0f55624dcc77 +Subproject commit 10fe6f5b23aa49128388212cf32ac80d093326c4 diff --git a/qtsvg b/qtsvg index ff1a60abb6a..a4802b87ab2 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit ff1a60abb6a21135705bf794ec1839779c1b23e8 +Subproject commit a4802b87ab2be63d9837366f0cc632fa7b09203c diff --git a/qttools b/qttools index 020b796b547..b7ca1c60480 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 020b796b547328360023bc871453eaa01990e180 +Subproject commit b7ca1c6048043a3e0de84729067db18f78b5f92f diff --git a/qttranslations b/qttranslations index c5b64151510..f0ce2a9b0a5 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit c5b64151510704800d4c8008427cb4b48db8b25a +Subproject commit f0ce2a9b0a5391701beacfa4e779a89b52a862f3 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 6397edbc140..63fce805bc9 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 6397edbc140abdf3f073e8319887bb1d480b4598 +Subproject commit 63fce805bc9c2d485ef8452b8ffb9f19cda306c1 diff --git a/qtwayland b/qtwayland index 5f6ffe63868..86c7b7e6921 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 5f6ffe63868e38c8d4dbb039f55509c3f1c9363a +Subproject commit 86c7b7e6921ee5666c9f6a3df95d3a0175830647 diff --git a/qtwebchannel b/qtwebchannel index eb217a03daa..56ad85728e9 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit eb217a03daa2b8fd18325d92e45a9b454d5dea62 +Subproject commit 56ad85728e9396cfd917e59011d6e1d72fc25392 diff --git a/qtwebengine b/qtwebengine index 7fbbcbb33b6..ef42464fb2e 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 7fbbcbb33b641393068c05afcce94d6d55c5397d +Subproject commit ef42464fb2ed4d37beced79edee2f9568e399b05 diff --git a/qtwebsockets b/qtwebsockets index c4d8cc41f06..ba6568ab52e 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit c4d8cc41f06b90a3723c5ba12c1382e8c02c7274 +Subproject commit ba6568ab52e6b1250450ad6bfd162f7ace4c1cb6 diff --git a/qtwebview b/qtwebview index b139af3bf62..74f69d86382 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit b139af3bf6283cfba9a12dc73d7441727b8bc43a +Subproject commit 74f69d86382c1f5c094b83d1ea22bdf0a2bf1662 From c3a5651bd0d4f0adc474079d741a5092f841c2eb Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 31 Jul 2024 19:02:28 +0200 Subject: [PATCH 088/288] coin: Explicitly provision the libzstd-dev package It used to be installed as a dependency of some other package, but stopped doing lately, which causes qtbase to build without zstd support. This change explicitly installs the libzstd-dev package to prevent this from happening again. Pick-to: 6.7 Fixes: QTBUG-124787 Fixes: QTBUG-127644 Change-Id: I72793ed96ef39ec07244079c51efe17ae1f9af66 Reviewed-by: Alexey Edelev (cherry picked from commit 8ad05756ed0b1a760d2aefc15b8596d10e5bd577) Reviewed-by: Alexey Edelev --- coin/provisioning/qtci-linux-Debian-11.6-aarch64/02-apt.sh | 1 + .../qtci-linux-RHEL-8.2-x86_64/04-install-packages.sh | 1 + .../qtci-linux-RHEL-8.4-x86_64/04-install-packages.sh | 1 + .../qtci-linux-RHEL-8.6-x86_64/04-install-packages.sh | 1 + .../qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh | 1 + .../qtci-linux-RHEL-9.0-x86_64/04-install-packages.sh | 1 + .../qtci-linux-RHEL-9.2-x86_64/04-install-packages.sh | 1 + coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh | 1 + coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh | 1 + coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh | 1 + 10 files changed, 10 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 2809cf18915..68019f79467 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 @@ -171,6 +171,7 @@ installPackages+=(ssh) installPackages+=(diffstat) installPackages+=(binfmt-support) installPackages+=(zstd) +installPackages+=(libzstd-dev) # Vulkan is needed for examples installPackages+=(libvulkan-dev) # Needed for qtdltlogging 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 fda995ca31f..4abf653f53a 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 @@ -27,6 +27,7 @@ installPackages+=(ninja-build) installPackages+=(pcre2-devel) installPackages+=(double-conversion-devel) installPackages+=(zstd) +installPackages+=(libzstd-devel) # EGL support installPackages+=(mesa-libEGL-devel) installPackages+=(mesa-libGL-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 da03076aebb..7057c9f8a92 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 @@ -28,6 +28,7 @@ installPackages+=(ninja-build) installPackages+=(pcre2-devel) installPackages+=(double-conversion-devel) installPackages+=(zstd) +installPackages+=(libzstd-devel) # EGL support installPackages+=(mesa-libEGL-devel) installPackages+=(mesa-libGL-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 9a81bd12965..de8b2017fa6 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 @@ -29,6 +29,7 @@ installPackages+=(ninja-build) installPackages+=(pcre2-devel) installPackages+=(double-conversion-devel) installPackages+=(zstd) +installPackages+=(libzstd-devel) # update kernel installPackages+=(kernel) installPackages+=(kernel-tools) 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 8b7b619f574..7a186b236a4 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 @@ -29,6 +29,7 @@ installPackages+=(ninja-build) installPackages+=(pcre2-devel) installPackages+=(double-conversion-devel) installPackages+=(zstd) +installPackages+=(libzstd-devel) # update kernel installPackages+=(kernel) installPackages+=(kernel-tools) 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 79c3476ab9e..fff4ba3bd7a 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 @@ -29,6 +29,7 @@ installPackages+=(ninja-build) installPackages+=(pcre2-devel) installPackages+=(double-conversion-devel) installPackages+=(zstd) +installPackages+=(libzstd-devel) # EGL support # mesa-libEGL-devel need to use older version than 22.1.5-2.el9 which cause Xorg to crash installPackages+=(mesa-libEGL-devel-21.3.4-2.el9) 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 f125b5f4075..4908e91d63f 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 @@ -29,6 +29,7 @@ installPackages+=(ninja-build) installPackages+=(pcre2-devel) installPackages+=(double-conversion-devel) installPackages+=(zstd) +installPackages+=(libzstd-devel) # EGL support # mesa-libEGL-devel need to use older version than 22.1.5-2.el9 which cause Xorg to crash #installPackages+=(mesa-libEGL-devel-21.3.4-2.el9) diff --git a/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh index 5dfd36f71d2..817a976c8de 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-20.04-x86_64/02-apt.sh @@ -199,6 +199,7 @@ installPackages+=(ssh) installPackages+=(diffstat) installPackages+=(binfmt-support) installPackages+=(zstd) +installPackages+=(libzstd-dev) # Vulkan is needed for examples installPackages+=(libvulkan-dev) # Needed for qtdltlogging 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 f3e22dc6611..d5c899e5fed 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 @@ -205,6 +205,7 @@ installPackages+=(ssh) installPackages+=(diffstat) installPackages+=(binfmt-support) installPackages+=(zstd) +installPackages+=(libzstd-dev) installPackages+=(lz4) # Vulkan is needed for examples installPackages+=(libvulkan-dev) 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 0ca3bb52436..9262259af69 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 @@ -207,6 +207,7 @@ installPackages+=(ssh) installPackages+=(diffstat) installPackages+=(binfmt-support) installPackages+=(zstd) +installPackages+=(libzstd-dev) installPackages+=(lz4) # Vulkan is needed for examples installPackages+=(libvulkan-dev) From f5430bded0377e9caea9ac8914be3485ae021363 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 15 Aug 2024 02:21:21 +0000 Subject: [PATCH 089/288] Update submodules on '6.8 in qt/qt5' Change-Id: I93429b55467475d163d95a1073051ba98c676a30 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 330d9d1b070..c47c14ff8a1 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 330d9d1b070ed8c0fce37a79f67d6bdac11153a5 +Subproject commit c47c14ff8a10d3bc62e000dd2129cc60c1994f15 diff --git a/qt5compat b/qt5compat index 83e0193e51e..c93e8d63197 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 83e0193e51ecfe65f8ec6582dbc75fe69bddb11c +Subproject commit c93e8d6319796cac60d70967340eb5bae6914ad5 diff --git a/qtactiveqt b/qtactiveqt index 2a303517236..df90919d5b4 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 2a303517236f903a12e6678e4ba45f8632768edc +Subproject commit df90919d5b416c2712c98388b5efca8b5d3d0bc8 diff --git a/qtbase b/qtbase index 9ff399fd09d..a053dc51d55 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 9ff399fd09d027a2c207a2d5a56d29c6f7f3fa99 +Subproject commit a053dc51d550a15225b1e47152fd61d4844cadf7 diff --git a/qtcharts b/qtcharts index 2cb612633ae..cf64dd7496b 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 2cb612633aed90c27645722775d22bf3d2df3f95 +Subproject commit cf64dd7496ba08d9cdc1c10bdcfc293815f41a6c diff --git a/qtcoap b/qtcoap index 21300149dd7..8439ccfc046 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit 21300149dd726ad1cc51f87fb33d369af1aedbf8 +Subproject commit 8439ccfc0469c4011b85daa1d3155be4dfb2f548 diff --git a/qtconnectivity b/qtconnectivity index 2d4ac78fa5e..cd24f834819 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 2d4ac78fa5eb43459caf7a9e59a5d790cf03a809 +Subproject commit cd24f8348191d266b390a3ca4f36a358f8740372 diff --git a/qtdatavis3d b/qtdatavis3d index 3b0bce522e8..e7aa01e8049 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 3b0bce522e8e14151cde3bba214f0d5ee5478d60 +Subproject commit e7aa01e804920931c9aa0d4fcf82ffb8f03018eb diff --git a/qtdeclarative b/qtdeclarative index 10d00aca5e9..2f25a48950a 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 10d00aca5e9da3973bca4b8d083ea11d5b0f1775 +Subproject commit 2f25a48950aa879049029abe5a0450e2d4441d08 diff --git a/qtdoc b/qtdoc index b65156ed9d6..9fe33eca0d4 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit b65156ed9d6fcd838f0959a3fb2ad1139c30bd99 +Subproject commit 9fe33eca0d418b479026f251203df7ea4d54ae8b diff --git a/qtgraphs b/qtgraphs index 1297f559755..5395b2db908 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit 1297f55975565c6e4309c30b92cc047dd818cab9 +Subproject commit 5395b2db9080eaaa62222a71b4f06ba42b282713 diff --git a/qtgrpc b/qtgrpc index d447d7ba906..95af98b0b40 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit d447d7ba9061aa1dd1f55680f603b61b15de43bc +Subproject commit 95af98b0b4083f6a57bb7953a4071e3d08921935 diff --git a/qthttpserver b/qthttpserver index a3008ba7bdd..3ea68986611 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit a3008ba7bdd321ac2052fe15ce56147c80b27d13 +Subproject commit 3ea6898661116bac4f5097948b30063edc74f8b5 diff --git a/qtimageformats b/qtimageformats index 9c02c0edfbc..8abdbeaa043 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 9c02c0edfbc4a978ec7623ad963ed4d73f81afba +Subproject commit 8abdbeaa04329a905e8f288b6b0da49baa5ad64d diff --git a/qtlanguageserver b/qtlanguageserver index 93a91c5cb07..445d1c44b9f 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit 93a91c5cb070cca31268f97c824fe75a516a634c +Subproject commit 445d1c44b9f451356004af6992c72991092a6342 diff --git a/qtlocation b/qtlocation index a7d4bd39e73..0de6d9a7ab9 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit a7d4bd39e736c226d85692ae504bd69d857cb2bb +Subproject commit 0de6d9a7ab9e96c7274b26aee64884ae2ac2fb71 diff --git a/qtlottie b/qtlottie index 131eefe5ca5..0a1bce333dd 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 131eefe5ca5995711411042f56cf182f9dbca771 +Subproject commit 0a1bce333dd2b28c9f243c518f2df9a014dc19db diff --git a/qtmqtt b/qtmqtt index 024cb86bae0..8bf54f26dee 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit 024cb86bae0e0c780295d879ec6beb2fcd1eb670 +Subproject commit 8bf54f26dee5030721eb9c4d515ba7c7392526f3 diff --git a/qtmultimedia b/qtmultimedia index 6e62f7b240d..369ee4031b5 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 6e62f7b240d8791063deaefddcb5f221133f4b69 +Subproject commit 369ee4031b58394060babfcc0de34bd0a2d6953e diff --git a/qtnetworkauth b/qtnetworkauth index 519af708db9..e0f309992f8 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 519af708db93203337f65ead5a3ba6dd228babe9 +Subproject commit e0f309992f859731fc0662abdd754999dc823944 diff --git a/qtopcua b/qtopcua index 039b8b3ddc8..b433152f685 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit 039b8b3ddc8a9d4bc816dbab49fa6bf70f85a34c +Subproject commit b433152f685a54f53149300190280d9d79585dae diff --git a/qtpositioning b/qtpositioning index 9891aed7411..3b2af976505 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit 9891aed7411ddb70a3f07d92fca43e59149dc1d4 +Subproject commit 3b2af9765053f1d07cb9af4736462ca406be27e7 diff --git a/qtquick3d b/qtquick3d index 5de607cddab..55bddb83c32 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 5de607cddabc150e238ec8b174a16a29357989b4 +Subproject commit 55bddb83c321d0724d3293074aacbe3a23bb7b63 diff --git a/qtquick3dphysics b/qtquick3dphysics index 80e53362e53..b3fb8ccfd35 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit 80e53362e5397524e84786d9b59a7f7e1c0b0fe3 +Subproject commit b3fb8ccfd35a61b86c00c69b7a49fdabfc5c262d diff --git a/qtquickeffectmaker b/qtquickeffectmaker index 7907bf223a3..9317947e888 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit 7907bf223a3796c103209278e8d31f0538d519fe +Subproject commit 9317947e88851f59a48235c08fbb6dabf8b30004 diff --git a/qtquicktimeline b/qtquicktimeline index eefb1e633fd..d6167324f61 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit eefb1e633fdd8431aa2a0cb4d3f43e24aa5552c9 +Subproject commit d6167324f6136d24221a30c2e50930b6e929091d diff --git a/qtremoteobjects b/qtremoteobjects index 3d791adda57..fca55d26738 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 3d791adda5770d43a663e12fb0cfd2b58d40b58d +Subproject commit fca55d2673825a79ad6269ab38ec2e623f80dd43 diff --git a/qtscxml b/qtscxml index 109b9bd4097..5d965342b78 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 109b9bd4097b214089fa3e8a5568f6bec44a533b +Subproject commit 5d965342b787ec3d80217fc33483aad1e52a671b diff --git a/qtsensors b/qtsensors index b2aecf67894..2b957de2c7a 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit b2aecf6789445e934de4b71e1319a920213b785a +Subproject commit 2b957de2c7ab1df675bbf22c1cb870fa20572476 diff --git a/qtserialbus b/qtserialbus index be821aee83a..c23bd7290d5 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit be821aee83ab77cc794a97be660bfd87c468fd83 +Subproject commit c23bd7290d596df4d582cee599a1e3a6fb4e8b92 diff --git a/qtserialport b/qtserialport index 76eadefd546..6fd0a7c1649 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 76eadefd54602453bfd89ff27ea1be48741aeb56 +Subproject commit 6fd0a7c16492675017ba17a1fee6d3dc3ecd151b diff --git a/qtshadertools b/qtshadertools index 38951e1be69..0d050c6c565 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 38951e1be69446ceb9239dbf5e255adb032fde76 +Subproject commit 0d050c6c56537697a557502770efb9157d457a1c diff --git a/qtspeech b/qtspeech index 10fe6f5b23a..2daed57ce56 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 10fe6f5b23aa49128388212cf32ac80d093326c4 +Subproject commit 2daed57ce56cda21984c21a748a0c32e22bd2822 diff --git a/qtsvg b/qtsvg index a4802b87ab2..6538a142f8a 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit a4802b87ab2be63d9837366f0cc632fa7b09203c +Subproject commit 6538a142f8a31fdef2bca91e13835c26deb592be diff --git a/qttools b/qttools index b7ca1c60480..b86f1195605 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit b7ca1c6048043a3e0de84729067db18f78b5f92f +Subproject commit b86f119560588634519a6c49846a6109d88ba20d diff --git a/qttranslations b/qttranslations index f0ce2a9b0a5..bd0d81568b5 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit f0ce2a9b0a5391701beacfa4e779a89b52a862f3 +Subproject commit bd0d81568b5bc269a8032db9793c49ad4a14b036 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 63fce805bc9..d8fff699290 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 63fce805bc9c2d485ef8452b8ffb9f19cda306c1 +Subproject commit d8fff6992903031b7d17f7facc1317e42f889866 diff --git a/qtwayland b/qtwayland index 86c7b7e6921..aeda2f03d1b 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 86c7b7e6921ee5666c9f6a3df95d3a0175830647 +Subproject commit aeda2f03d1b631bb87ba830a345f71198d5428fd diff --git a/qtwebchannel b/qtwebchannel index 56ad85728e9..6fe7d5b306d 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 56ad85728e9396cfd917e59011d6e1d72fc25392 +Subproject commit 6fe7d5b306da9588f17c1a436f717ada7a3ce6c2 diff --git a/qtwebengine b/qtwebengine index ef42464fb2e..adf1e4736f3 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit ef42464fb2ed4d37beced79edee2f9568e399b05 +Subproject commit adf1e4736f3c4f2490c108abeaaa546213cd3878 diff --git a/qtwebsockets b/qtwebsockets index ba6568ab52e..38cb1de0c99 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit ba6568ab52e6b1250450ad6bfd162f7ace4c1cb6 +Subproject commit 38cb1de0c99e545f3f5aef4c79e5eff1eb4c88c8 diff --git a/qtwebview b/qtwebview index 74f69d86382..e2b1614c5aa 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 74f69d86382c1f5c094b83d1ea22bdf0a2bf1662 +Subproject commit e2b1614c5aa84314be9a63f428218b00ba7d6693 From aa419b10fb36b6cbfffa02039a963b0f5d1b8581 Mon Sep 17 00:00:00 2001 From: Tim Blechmann Date: Mon, 12 Aug 2024 11:31:25 +0800 Subject: [PATCH 090/288] Provisioning: install dummy sound device on ubuntu VMs Pick-to: 6.7 6.5 Change-Id: I71a518576c1ef0677855561edbd2dc5560727c35 Reviewed-by: Axel Spoerl (cherry picked from commit 0020fd1b3ed105d6818f391f354fff71a05beb03) Reviewed-by: Qt Cherry-pick Bot --- .../common/linux/install-dummy-alsa-device.sh | 67 +++++++++++++++++++ .../91-install-dummy-sound.sh | 8 +++ .../91-install-dummy-sound.sh | 8 +++ .../91-install-dummy-sound.sh | 8 +++ .../91-install-dummy-sound.sh | 8 +++ .../91-install-dummy-sound.sh | 58 +--------------- 6 files changed, 102 insertions(+), 55 deletions(-) create mode 100644 coin/provisioning/common/linux/install-dummy-alsa-device.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-22.04-aarch64/91-install-dummy-sound.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/91-install-dummy-sound.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/91-install-dummy-sound.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/91-install-dummy-sound.sh diff --git a/coin/provisioning/common/linux/install-dummy-alsa-device.sh b/coin/provisioning/common/linux/install-dummy-alsa-device.sh new file mode 100644 index 00000000000..b131021a8f9 --- /dev/null +++ b/coin/provisioning/common/linux/install-dummy-alsa-device.sh @@ -0,0 +1,67 @@ +#!/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 + +systemd_folder=/etc/systemd/system +systemd_file=dummysound.service +script_folder=/home/qt/bin +script_file=dummy_sound.sh + +# Ensure that script folder exists +if [ ! -d ${script_folder} ]; then + sudo mkdir ${script_folder} + sudo chmod 750 ${script_folder} +fi + + +# Create script to install dummy sound driver, +# in case no other sound driver is installed. +sudo tee "${script_folder}/${script_file}" <<"EOF" +# Check for existing sound driver +if lsmod | grep -q -i snd-dummy +then + echo "(**) Dummy sound driver already loaded. Nothing to do."; + exit 0; +fi + +# load dummy sound module +sudo modprobe snd-dummy + +# Check result +if lsmod | grep -q snd_dummy +then + echo "(**) Dummy sound driver loaded."; +else + echo "(EE) Failed to load dummy sound driver."; + exit 1; +fi +EOF + +# set permissions +sudo chmod 750 "${script_folder}/${script_file}" + +# Create service file +sudo tee "${systemd_folder}/${systemd_file}" <<"EOF" +# /etc/systemd/system/dummysound.service +# + +[Unit] +Description=Install dummy sound driver + +[Service] +Type=oneshot +ExecStart=/bin/sh -c "/home/qt/bin/dummy_sound.sh" + +[Install] +WantedBy=multi-user.target +EOF + +# Start servive and output result, just for logging +sudo systemctl start dummysound.service +# status commented out, returns 3 on VM. +# sudo systemctl status dummysound.service + +# enable service +sudo systemctl enable dummysound.service diff --git a/coin/provisioning/qtci-linux-Ubuntu-22.04-aarch64/91-install-dummy-sound.sh b/coin/provisioning/qtci-linux-Ubuntu-22.04-aarch64/91-install-dummy-sound.sh new file mode 100755 index 00000000000..5d280b36129 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-22.04-aarch64/91-install-dummy-sound.sh @@ -0,0 +1,8 @@ +#!/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/install-dummy-alsa-device.sh +source "${BASH_SOURCE%/*}/../common/linux/install-dummy-alsa-device.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/91-install-dummy-sound.sh b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/91-install-dummy-sound.sh new file mode 100755 index 00000000000..5d280b36129 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/91-install-dummy-sound.sh @@ -0,0 +1,8 @@ +#!/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/install-dummy-alsa-device.sh +source "${BASH_SOURCE%/*}/../common/linux/install-dummy-alsa-device.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/91-install-dummy-sound.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/91-install-dummy-sound.sh new file mode 100755 index 00000000000..5d280b36129 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/91-install-dummy-sound.sh @@ -0,0 +1,8 @@ +#!/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/install-dummy-alsa-device.sh +source "${BASH_SOURCE%/*}/../common/linux/install-dummy-alsa-device.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/91-install-dummy-sound.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/91-install-dummy-sound.sh new file mode 100755 index 00000000000..5d280b36129 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/91-install-dummy-sound.sh @@ -0,0 +1,8 @@ +#!/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/install-dummy-alsa-device.sh +source "${BASH_SOURCE%/*}/../common/linux/install-dummy-alsa-device.sh" diff --git a/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/91-install-dummy-sound.sh b/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/91-install-dummy-sound.sh index 345c5efac06..5d280b36129 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/91-install-dummy-sound.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/91-install-dummy-sound.sh @@ -1,60 +1,8 @@ #!/usr/bin/env bash -# Copyright (C) 2023 The Qt Company Ltd. +# 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 -systemd_folder=/etc/systemd/system -systemd_file=dummysound.service -script_folder=/home/qt/bin -script_file=dummy_sound.sh - -# Create script to install dummy sound driver, -# in case no other sound driver is installed. -sudo tee "${script_folder}/${script_file}" <<"EOF" -# Check for existing sound driver -if lsmod | grep -q -i snd -then - echo "(**) Sound driver already loaded. Nothing to do."; - exit 0; -fi - -# load dummy sound module -sudo modprobe snd-dummy - -# Check result -if lsmod | grep -q snd_dummy -then - echo "(**) Dummy sound driver loaded."; -else - echo "(EE) Failed to load dummy sound driver."; - exit 1; -fi -EOF - -# set permissions -sudo chmod 750 "${script_folder}/${script_file}" - -# Create service file -sudo tee "${systemd_folder}/${systemd_file}" <<"EOF" -# /etc/systemd/system/dummysound.service -# - -[Unit] -Description=Install dummy sound driver - -[Service] -Type=oneshot -ExecStart=/bin/sh -c "/home/qt/bin/dummy_sound.sh" - -[Install] -WantedBy=multi-user.target -EOF - -# Start servive and output result, just for logging -sudo systemctl start dummysound.service -# status commented out, returns 3 on VM. -# sudo systemctl status dummysound.service - -# enable service -sudo systemctl enable dummysound.service +# shellcheck source=../common/linux/install-dummy-alsa-device.sh +source "${BASH_SOURCE%/*}/../common/linux/install-dummy-alsa-device.sh" From 2007bdb63498ca840055b2c49d91c33c2521f781 Mon Sep 17 00:00:00 2001 From: Pavel Dubsky Date: Thu, 8 Aug 2024 18:43:04 +0200 Subject: [PATCH 091/288] Update FFmpeg version to n7.0.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTBUG-127868 Pick-to: 6.7 6.5 Change-Id: I95f8f021cd23fdb35eb171d4609bf204878e105d Reviewed-by: Jøger Hansegård (cherry picked from commit f2535cdcef4db10f1e10785ac53d3cfae570873c) 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 cc81c962daa..fdd803365c2 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.1" +version="n7.0.2" url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz" -sha1="6bfb65c18516e95249942f34ef664c94c0768722" +sha1="e017c72dd84a9bac1519eaa33c203b82dd850bc0" 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 0ad2ae7f3ba..21e4d7d8013 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.1" +version="n7.0.2" url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz" -sha1="6bfb65c18516e95249942f34ef664c94c0768722" +sha1="e017c72dd84a9bac1519eaa33c203b82dd850bc0" 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 253f679c091..44198bfcfca 100755 --- a/coin/provisioning/common/unix/install-ffmpeg.sh +++ b/coin/provisioning/common/unix/install-ffmpeg.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.1" +version="n7.0.2" url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz" -sha1="6bfb65c18516e95249942f34ef664c94c0768722" +sha1="e017c72dd84a9bac1519eaa33c203b82dd850bc0" 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 f93b9412384..64b514559a5 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.1" +$version="n7.0.2" $url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz" -$sha1="6bfb65c18516e95249942f34ef664c94c0768722" +$sha1="e017c72dd84a9bac1519eaa33c203b82dd850bc0" $url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz" $ffmpeg_name="FFmpeg-$version" From 55bef8cb0cf43cb07f1a85ad379f847357d6dea3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Tue, 6 Aug 2024 13:50:21 +0200 Subject: [PATCH 092/288] Provisioning: Remove mac certificates and signing tools Those will be provided by Coin. Follow-up to 4e09a6db79d90db7b2aff1d4448305ec145d3766 for macOS ARM. Pick-to: 6.5 6.2 Change-Id: Iffe433b606e6fb28580b8d2a265ee82f4bda7eb8 Reviewed-by: Toni Saario (cherry picked from commit 73c8e4d38757e07ff507cd62d9e6eafe25539bbb) Reviewed-by: Qt Cherry-pick Bot --- .../qtci-macos-11-arm/55-signtools.sh | 107 ------------------ .../qtci-macos-12-arm/55-signtools.sh | 107 ------------------ .../qtci-macos-13-arm/55-signtools.sh | 107 ------------------ .../qtci-macos-14-arm/55-signtools.sh | 107 ------------------ 4 files changed, 428 deletions(-) delete mode 100755 coin/provisioning/qtci-macos-11-arm/55-signtools.sh delete mode 100755 coin/provisioning/qtci-macos-12-arm/55-signtools.sh delete mode 100755 coin/provisioning/qtci-macos-13-arm/55-signtools.sh delete mode 100755 coin/provisioning/qtci-macos-14-arm/55-signtools.sh diff --git a/coin/provisioning/qtci-macos-11-arm/55-signtools.sh b/coin/provisioning/qtci-macos-11-arm/55-signtools.sh deleted file mode 100755 index ff5a977a7a1..00000000000 --- a/coin/provisioning/qtci-macos-11-arm/55-signtools.sh +++ /dev/null @@ -1,107 +0,0 @@ -#!/usr/bin/env sh -# 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 - -# Install tools for singing packages -# This script assume that OS is vanilla. Target machine dosen't have any signing certificates installed. - -set -ex - -cache="http://ci-files01-hki.ci.qt.io/input" -cacheSigningTools="$cache/mac/sign_tools" -targetFolder="/Users/qt" -keychains="$targetFolder/Library/Keychains" - -Install() { - - url=$1 - targetFile=$2 - expectedSha1=$3 - - echo "Fetching $targetFile from $url..." - curl --retry 5 --retry-delay 10 --retry-max-time 60 "$url" -o "$targetFile" - shasum "$targetFile" |grep "$expectedSha1" - -} - -# qt-license -sha1QtLicense="9d59241d16f68d914f1c7aa1dc23e05faa169e8d" -Install "$cache/semisecure/.qt-license" "$targetFolder/.qt-license" $sha1QtLicense - -# Login keychain -sha1LoginKeychainPassword="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36" -Install "$cacheSigningTools/login_keychain_password.txt" "$targetFolder/login_keychain_password.txt" "$sha1LoginKeychainPassword" -{ loginKeychainPassword=$(cat "$targetFolder/login_keychain_password.txt"); } 2> /dev/null -loginKeychain=$keychains/login.keychain - -echo "Setting login.keychain as default keychain.." -security default-keychain -s $loginKeychain* -echo "Unlocking Login keychain with password.." -{ security unlock-keychain -p "$loginKeychainPassword" $loginKeychain*; } 2> /dev/null - -echo "remove the "Lock after X minutes of inactivity" from login.keychain" -security set-keychain-settings $loginKeychain - -# Apple Worldwide Developer Relations Certification Authority -> https://developer.apple.com/certificationauthority/AppleWWDRCA.cer -sha1AppleWWDRCA="ff6797793a3cd798dc5b2abef56f73edc9f83a64" -Install "$cacheSigningTools/AppleWWDRCA.cer" "$targetFolder/AppleWWDRCA.cer" $sha1AppleWWDRCA -sudo security add-certificates -k $loginKeychain* "$targetFolder/AppleWWDRCA.cer" - -# Developer ID Certification Authority -> https://www.apple.com/certificateauthority/DeveloperIDCA.cer -sha1DeveloperIDCA="3b166c3b7dc4b751c9fe2afab9135641e388e186" -Install "$cacheSigningTools/DeveloperIDCA.cer" "$targetFolder/DeveloperIDCA.cer" $sha1DeveloperIDCA -sudo security add-certificates -k $loginKeychain* "$targetFolder/DeveloperIDCA.cer" - -# Create script to unlock keychain 'security unlock-keychain -p 'password' Developer_ID_TheQtCompany.keychain' -sha1UnLockKeychain="4398870e3f558ad28c80566b5f70e24dc29ea724" -unlockKeychain=$targetFolder/unlock-keychain.sh -{ Install "$cacheSigningTools/unlock-keychain.sh" "$unlockKeychain" $sha1UnLockKeychain; } 2> /dev/null -sudo chmod 755 "$unlockKeychain" - -# Codesigning requirements file. The bundle identifier in the requirements file should match the identifier of the application that is signed. -shaCsreq="2c3f00b1845a0f475673fd6934ba25ea51d1f910" -csreq=$targetFolder/csreq_qt_company.txt -Install "$cacheSigningTools/csreq_qt_company.txt" "$csreq" $shaCsreq -chmod 755 "$csreq" - -# iOS signing tools -devIDKeychain="Developer_ID_TheQtCompany.keychain-db" -shaDevIdKeychain="972cca1879cdaeeb6042f9879756c748a8d1eddc" -Install "$cacheSigningTools/$devIDKeychain" "$keychains/$devIDKeychain" $shaDevIdKeychain -echo "Opening $devIDKeychain.." -open "$keychains/$devIDKeychain" - -sha1DeveloperIDTheQtCompanyKeychainPassword="d758e067736bbda7a91ffaec66cd38afdaf68ea6" -Install "$cacheSigningTools/Developer_ID_TheQtCompany_keychain_password.txt" "$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt" "$sha1DeveloperIDTheQtCompanyKeychainPassword" -{ DeveloperIDTheQtCompanyKeychainPassword=$(cat "$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt"); } 2> /dev/null - -echo "Unlocking $devIDKeychain with password.." -{ security unlock-keychain -p "$DeveloperIDTheQtCompanyKeychainPassword" $keychains/Developer_ID_TheQtCompany.keychain; } 2> /dev/null -security set-keychain-settings $keychains/Developer_ID_TheQtCompany.keychain - -sha1Ios="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36" -{ Install "$cacheSigningTools/ios_password.txt" "$targetFolder/ios_password.txt" $sha1Ios; } 2> /dev/null -{ iosPassword=$(cat "$targetFolder/ios_password.txt"); } 2> /dev/null - -iPhoneDeveloper="iPhoneDeveloperCiTeam2020.p12" -shaIPhoneDeveloper="73136e44fed850f398e85908e4a73f20a6bdd8a2" -Install "$cacheSigningTools/latest_ios_cert_2020/$iPhoneDeveloper" "$targetFolder/$iPhoneDeveloper" $shaIPhoneDeveloper -echo "Importing $iPhoneDeveloper.." -{ security import $targetFolder/$iPhoneDeveloper -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign; } 2> /dev/null - -iPhoneDistribution="iPhoneDistributionCiTeam2020.p12" -shaIPhoneDistribution="36215c3cbc6bfee48e86aafbd53c56282fe36d8d" -Install "$cacheSigningTools/latest_ios_cert_2020/$iPhoneDistribution" "$targetFolder/$iPhoneDistribution" $shaIPhoneDistribution -echo "Importing $iPhoneDistribution.." -{ security import "$targetFolder/$iPhoneDistribution" -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign; } 2> /dev/null - -# Mobileprovision -echo "Creating directory $targetFolder/Library/MobileDevice/Provisioning Profiles.." -mkdir "$targetFolder/Library/MobileDevice" -mkdir "$targetFolder/Library/MobileDevice/Provisioning Profiles" -shaMobileprovision="ec9697276253ca7bf4401912236f0e6fde4214da" -Install "$cacheSigningTools/latest_ios_cert_2020/iOS_Dev_2020_citeam.mobileprovision" "$targetFolder/Library/MobileDevice/Provisioning Profiles/iOS_Dev_2020_citeam.mobileprovision" $shaMobileprovision - -# Removing password files -rm -fr "$targetFolder/login_keychain_password.txt" - diff --git a/coin/provisioning/qtci-macos-12-arm/55-signtools.sh b/coin/provisioning/qtci-macos-12-arm/55-signtools.sh deleted file mode 100755 index ff5a977a7a1..00000000000 --- a/coin/provisioning/qtci-macos-12-arm/55-signtools.sh +++ /dev/null @@ -1,107 +0,0 @@ -#!/usr/bin/env sh -# 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 - -# Install tools for singing packages -# This script assume that OS is vanilla. Target machine dosen't have any signing certificates installed. - -set -ex - -cache="http://ci-files01-hki.ci.qt.io/input" -cacheSigningTools="$cache/mac/sign_tools" -targetFolder="/Users/qt" -keychains="$targetFolder/Library/Keychains" - -Install() { - - url=$1 - targetFile=$2 - expectedSha1=$3 - - echo "Fetching $targetFile from $url..." - curl --retry 5 --retry-delay 10 --retry-max-time 60 "$url" -o "$targetFile" - shasum "$targetFile" |grep "$expectedSha1" - -} - -# qt-license -sha1QtLicense="9d59241d16f68d914f1c7aa1dc23e05faa169e8d" -Install "$cache/semisecure/.qt-license" "$targetFolder/.qt-license" $sha1QtLicense - -# Login keychain -sha1LoginKeychainPassword="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36" -Install "$cacheSigningTools/login_keychain_password.txt" "$targetFolder/login_keychain_password.txt" "$sha1LoginKeychainPassword" -{ loginKeychainPassword=$(cat "$targetFolder/login_keychain_password.txt"); } 2> /dev/null -loginKeychain=$keychains/login.keychain - -echo "Setting login.keychain as default keychain.." -security default-keychain -s $loginKeychain* -echo "Unlocking Login keychain with password.." -{ security unlock-keychain -p "$loginKeychainPassword" $loginKeychain*; } 2> /dev/null - -echo "remove the "Lock after X minutes of inactivity" from login.keychain" -security set-keychain-settings $loginKeychain - -# Apple Worldwide Developer Relations Certification Authority -> https://developer.apple.com/certificationauthority/AppleWWDRCA.cer -sha1AppleWWDRCA="ff6797793a3cd798dc5b2abef56f73edc9f83a64" -Install "$cacheSigningTools/AppleWWDRCA.cer" "$targetFolder/AppleWWDRCA.cer" $sha1AppleWWDRCA -sudo security add-certificates -k $loginKeychain* "$targetFolder/AppleWWDRCA.cer" - -# Developer ID Certification Authority -> https://www.apple.com/certificateauthority/DeveloperIDCA.cer -sha1DeveloperIDCA="3b166c3b7dc4b751c9fe2afab9135641e388e186" -Install "$cacheSigningTools/DeveloperIDCA.cer" "$targetFolder/DeveloperIDCA.cer" $sha1DeveloperIDCA -sudo security add-certificates -k $loginKeychain* "$targetFolder/DeveloperIDCA.cer" - -# Create script to unlock keychain 'security unlock-keychain -p 'password' Developer_ID_TheQtCompany.keychain' -sha1UnLockKeychain="4398870e3f558ad28c80566b5f70e24dc29ea724" -unlockKeychain=$targetFolder/unlock-keychain.sh -{ Install "$cacheSigningTools/unlock-keychain.sh" "$unlockKeychain" $sha1UnLockKeychain; } 2> /dev/null -sudo chmod 755 "$unlockKeychain" - -# Codesigning requirements file. The bundle identifier in the requirements file should match the identifier of the application that is signed. -shaCsreq="2c3f00b1845a0f475673fd6934ba25ea51d1f910" -csreq=$targetFolder/csreq_qt_company.txt -Install "$cacheSigningTools/csreq_qt_company.txt" "$csreq" $shaCsreq -chmod 755 "$csreq" - -# iOS signing tools -devIDKeychain="Developer_ID_TheQtCompany.keychain-db" -shaDevIdKeychain="972cca1879cdaeeb6042f9879756c748a8d1eddc" -Install "$cacheSigningTools/$devIDKeychain" "$keychains/$devIDKeychain" $shaDevIdKeychain -echo "Opening $devIDKeychain.." -open "$keychains/$devIDKeychain" - -sha1DeveloperIDTheQtCompanyKeychainPassword="d758e067736bbda7a91ffaec66cd38afdaf68ea6" -Install "$cacheSigningTools/Developer_ID_TheQtCompany_keychain_password.txt" "$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt" "$sha1DeveloperIDTheQtCompanyKeychainPassword" -{ DeveloperIDTheQtCompanyKeychainPassword=$(cat "$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt"); } 2> /dev/null - -echo "Unlocking $devIDKeychain with password.." -{ security unlock-keychain -p "$DeveloperIDTheQtCompanyKeychainPassword" $keychains/Developer_ID_TheQtCompany.keychain; } 2> /dev/null -security set-keychain-settings $keychains/Developer_ID_TheQtCompany.keychain - -sha1Ios="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36" -{ Install "$cacheSigningTools/ios_password.txt" "$targetFolder/ios_password.txt" $sha1Ios; } 2> /dev/null -{ iosPassword=$(cat "$targetFolder/ios_password.txt"); } 2> /dev/null - -iPhoneDeveloper="iPhoneDeveloperCiTeam2020.p12" -shaIPhoneDeveloper="73136e44fed850f398e85908e4a73f20a6bdd8a2" -Install "$cacheSigningTools/latest_ios_cert_2020/$iPhoneDeveloper" "$targetFolder/$iPhoneDeveloper" $shaIPhoneDeveloper -echo "Importing $iPhoneDeveloper.." -{ security import $targetFolder/$iPhoneDeveloper -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign; } 2> /dev/null - -iPhoneDistribution="iPhoneDistributionCiTeam2020.p12" -shaIPhoneDistribution="36215c3cbc6bfee48e86aafbd53c56282fe36d8d" -Install "$cacheSigningTools/latest_ios_cert_2020/$iPhoneDistribution" "$targetFolder/$iPhoneDistribution" $shaIPhoneDistribution -echo "Importing $iPhoneDistribution.." -{ security import "$targetFolder/$iPhoneDistribution" -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign; } 2> /dev/null - -# Mobileprovision -echo "Creating directory $targetFolder/Library/MobileDevice/Provisioning Profiles.." -mkdir "$targetFolder/Library/MobileDevice" -mkdir "$targetFolder/Library/MobileDevice/Provisioning Profiles" -shaMobileprovision="ec9697276253ca7bf4401912236f0e6fde4214da" -Install "$cacheSigningTools/latest_ios_cert_2020/iOS_Dev_2020_citeam.mobileprovision" "$targetFolder/Library/MobileDevice/Provisioning Profiles/iOS_Dev_2020_citeam.mobileprovision" $shaMobileprovision - -# Removing password files -rm -fr "$targetFolder/login_keychain_password.txt" - diff --git a/coin/provisioning/qtci-macos-13-arm/55-signtools.sh b/coin/provisioning/qtci-macos-13-arm/55-signtools.sh deleted file mode 100755 index ff5a977a7a1..00000000000 --- a/coin/provisioning/qtci-macos-13-arm/55-signtools.sh +++ /dev/null @@ -1,107 +0,0 @@ -#!/usr/bin/env sh -# 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 - -# Install tools for singing packages -# This script assume that OS is vanilla. Target machine dosen't have any signing certificates installed. - -set -ex - -cache="http://ci-files01-hki.ci.qt.io/input" -cacheSigningTools="$cache/mac/sign_tools" -targetFolder="/Users/qt" -keychains="$targetFolder/Library/Keychains" - -Install() { - - url=$1 - targetFile=$2 - expectedSha1=$3 - - echo "Fetching $targetFile from $url..." - curl --retry 5 --retry-delay 10 --retry-max-time 60 "$url" -o "$targetFile" - shasum "$targetFile" |grep "$expectedSha1" - -} - -# qt-license -sha1QtLicense="9d59241d16f68d914f1c7aa1dc23e05faa169e8d" -Install "$cache/semisecure/.qt-license" "$targetFolder/.qt-license" $sha1QtLicense - -# Login keychain -sha1LoginKeychainPassword="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36" -Install "$cacheSigningTools/login_keychain_password.txt" "$targetFolder/login_keychain_password.txt" "$sha1LoginKeychainPassword" -{ loginKeychainPassword=$(cat "$targetFolder/login_keychain_password.txt"); } 2> /dev/null -loginKeychain=$keychains/login.keychain - -echo "Setting login.keychain as default keychain.." -security default-keychain -s $loginKeychain* -echo "Unlocking Login keychain with password.." -{ security unlock-keychain -p "$loginKeychainPassword" $loginKeychain*; } 2> /dev/null - -echo "remove the "Lock after X minutes of inactivity" from login.keychain" -security set-keychain-settings $loginKeychain - -# Apple Worldwide Developer Relations Certification Authority -> https://developer.apple.com/certificationauthority/AppleWWDRCA.cer -sha1AppleWWDRCA="ff6797793a3cd798dc5b2abef56f73edc9f83a64" -Install "$cacheSigningTools/AppleWWDRCA.cer" "$targetFolder/AppleWWDRCA.cer" $sha1AppleWWDRCA -sudo security add-certificates -k $loginKeychain* "$targetFolder/AppleWWDRCA.cer" - -# Developer ID Certification Authority -> https://www.apple.com/certificateauthority/DeveloperIDCA.cer -sha1DeveloperIDCA="3b166c3b7dc4b751c9fe2afab9135641e388e186" -Install "$cacheSigningTools/DeveloperIDCA.cer" "$targetFolder/DeveloperIDCA.cer" $sha1DeveloperIDCA -sudo security add-certificates -k $loginKeychain* "$targetFolder/DeveloperIDCA.cer" - -# Create script to unlock keychain 'security unlock-keychain -p 'password' Developer_ID_TheQtCompany.keychain' -sha1UnLockKeychain="4398870e3f558ad28c80566b5f70e24dc29ea724" -unlockKeychain=$targetFolder/unlock-keychain.sh -{ Install "$cacheSigningTools/unlock-keychain.sh" "$unlockKeychain" $sha1UnLockKeychain; } 2> /dev/null -sudo chmod 755 "$unlockKeychain" - -# Codesigning requirements file. The bundle identifier in the requirements file should match the identifier of the application that is signed. -shaCsreq="2c3f00b1845a0f475673fd6934ba25ea51d1f910" -csreq=$targetFolder/csreq_qt_company.txt -Install "$cacheSigningTools/csreq_qt_company.txt" "$csreq" $shaCsreq -chmod 755 "$csreq" - -# iOS signing tools -devIDKeychain="Developer_ID_TheQtCompany.keychain-db" -shaDevIdKeychain="972cca1879cdaeeb6042f9879756c748a8d1eddc" -Install "$cacheSigningTools/$devIDKeychain" "$keychains/$devIDKeychain" $shaDevIdKeychain -echo "Opening $devIDKeychain.." -open "$keychains/$devIDKeychain" - -sha1DeveloperIDTheQtCompanyKeychainPassword="d758e067736bbda7a91ffaec66cd38afdaf68ea6" -Install "$cacheSigningTools/Developer_ID_TheQtCompany_keychain_password.txt" "$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt" "$sha1DeveloperIDTheQtCompanyKeychainPassword" -{ DeveloperIDTheQtCompanyKeychainPassword=$(cat "$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt"); } 2> /dev/null - -echo "Unlocking $devIDKeychain with password.." -{ security unlock-keychain -p "$DeveloperIDTheQtCompanyKeychainPassword" $keychains/Developer_ID_TheQtCompany.keychain; } 2> /dev/null -security set-keychain-settings $keychains/Developer_ID_TheQtCompany.keychain - -sha1Ios="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36" -{ Install "$cacheSigningTools/ios_password.txt" "$targetFolder/ios_password.txt" $sha1Ios; } 2> /dev/null -{ iosPassword=$(cat "$targetFolder/ios_password.txt"); } 2> /dev/null - -iPhoneDeveloper="iPhoneDeveloperCiTeam2020.p12" -shaIPhoneDeveloper="73136e44fed850f398e85908e4a73f20a6bdd8a2" -Install "$cacheSigningTools/latest_ios_cert_2020/$iPhoneDeveloper" "$targetFolder/$iPhoneDeveloper" $shaIPhoneDeveloper -echo "Importing $iPhoneDeveloper.." -{ security import $targetFolder/$iPhoneDeveloper -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign; } 2> /dev/null - -iPhoneDistribution="iPhoneDistributionCiTeam2020.p12" -shaIPhoneDistribution="36215c3cbc6bfee48e86aafbd53c56282fe36d8d" -Install "$cacheSigningTools/latest_ios_cert_2020/$iPhoneDistribution" "$targetFolder/$iPhoneDistribution" $shaIPhoneDistribution -echo "Importing $iPhoneDistribution.." -{ security import "$targetFolder/$iPhoneDistribution" -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign; } 2> /dev/null - -# Mobileprovision -echo "Creating directory $targetFolder/Library/MobileDevice/Provisioning Profiles.." -mkdir "$targetFolder/Library/MobileDevice" -mkdir "$targetFolder/Library/MobileDevice/Provisioning Profiles" -shaMobileprovision="ec9697276253ca7bf4401912236f0e6fde4214da" -Install "$cacheSigningTools/latest_ios_cert_2020/iOS_Dev_2020_citeam.mobileprovision" "$targetFolder/Library/MobileDevice/Provisioning Profiles/iOS_Dev_2020_citeam.mobileprovision" $shaMobileprovision - -# Removing password files -rm -fr "$targetFolder/login_keychain_password.txt" - diff --git a/coin/provisioning/qtci-macos-14-arm/55-signtools.sh b/coin/provisioning/qtci-macos-14-arm/55-signtools.sh deleted file mode 100755 index ff5a977a7a1..00000000000 --- a/coin/provisioning/qtci-macos-14-arm/55-signtools.sh +++ /dev/null @@ -1,107 +0,0 @@ -#!/usr/bin/env sh -# 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 - -# Install tools for singing packages -# This script assume that OS is vanilla. Target machine dosen't have any signing certificates installed. - -set -ex - -cache="http://ci-files01-hki.ci.qt.io/input" -cacheSigningTools="$cache/mac/sign_tools" -targetFolder="/Users/qt" -keychains="$targetFolder/Library/Keychains" - -Install() { - - url=$1 - targetFile=$2 - expectedSha1=$3 - - echo "Fetching $targetFile from $url..." - curl --retry 5 --retry-delay 10 --retry-max-time 60 "$url" -o "$targetFile" - shasum "$targetFile" |grep "$expectedSha1" - -} - -# qt-license -sha1QtLicense="9d59241d16f68d914f1c7aa1dc23e05faa169e8d" -Install "$cache/semisecure/.qt-license" "$targetFolder/.qt-license" $sha1QtLicense - -# Login keychain -sha1LoginKeychainPassword="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36" -Install "$cacheSigningTools/login_keychain_password.txt" "$targetFolder/login_keychain_password.txt" "$sha1LoginKeychainPassword" -{ loginKeychainPassword=$(cat "$targetFolder/login_keychain_password.txt"); } 2> /dev/null -loginKeychain=$keychains/login.keychain - -echo "Setting login.keychain as default keychain.." -security default-keychain -s $loginKeychain* -echo "Unlocking Login keychain with password.." -{ security unlock-keychain -p "$loginKeychainPassword" $loginKeychain*; } 2> /dev/null - -echo "remove the "Lock after X minutes of inactivity" from login.keychain" -security set-keychain-settings $loginKeychain - -# Apple Worldwide Developer Relations Certification Authority -> https://developer.apple.com/certificationauthority/AppleWWDRCA.cer -sha1AppleWWDRCA="ff6797793a3cd798dc5b2abef56f73edc9f83a64" -Install "$cacheSigningTools/AppleWWDRCA.cer" "$targetFolder/AppleWWDRCA.cer" $sha1AppleWWDRCA -sudo security add-certificates -k $loginKeychain* "$targetFolder/AppleWWDRCA.cer" - -# Developer ID Certification Authority -> https://www.apple.com/certificateauthority/DeveloperIDCA.cer -sha1DeveloperIDCA="3b166c3b7dc4b751c9fe2afab9135641e388e186" -Install "$cacheSigningTools/DeveloperIDCA.cer" "$targetFolder/DeveloperIDCA.cer" $sha1DeveloperIDCA -sudo security add-certificates -k $loginKeychain* "$targetFolder/DeveloperIDCA.cer" - -# Create script to unlock keychain 'security unlock-keychain -p 'password' Developer_ID_TheQtCompany.keychain' -sha1UnLockKeychain="4398870e3f558ad28c80566b5f70e24dc29ea724" -unlockKeychain=$targetFolder/unlock-keychain.sh -{ Install "$cacheSigningTools/unlock-keychain.sh" "$unlockKeychain" $sha1UnLockKeychain; } 2> /dev/null -sudo chmod 755 "$unlockKeychain" - -# Codesigning requirements file. The bundle identifier in the requirements file should match the identifier of the application that is signed. -shaCsreq="2c3f00b1845a0f475673fd6934ba25ea51d1f910" -csreq=$targetFolder/csreq_qt_company.txt -Install "$cacheSigningTools/csreq_qt_company.txt" "$csreq" $shaCsreq -chmod 755 "$csreq" - -# iOS signing tools -devIDKeychain="Developer_ID_TheQtCompany.keychain-db" -shaDevIdKeychain="972cca1879cdaeeb6042f9879756c748a8d1eddc" -Install "$cacheSigningTools/$devIDKeychain" "$keychains/$devIDKeychain" $shaDevIdKeychain -echo "Opening $devIDKeychain.." -open "$keychains/$devIDKeychain" - -sha1DeveloperIDTheQtCompanyKeychainPassword="d758e067736bbda7a91ffaec66cd38afdaf68ea6" -Install "$cacheSigningTools/Developer_ID_TheQtCompany_keychain_password.txt" "$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt" "$sha1DeveloperIDTheQtCompanyKeychainPassword" -{ DeveloperIDTheQtCompanyKeychainPassword=$(cat "$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt"); } 2> /dev/null - -echo "Unlocking $devIDKeychain with password.." -{ security unlock-keychain -p "$DeveloperIDTheQtCompanyKeychainPassword" $keychains/Developer_ID_TheQtCompany.keychain; } 2> /dev/null -security set-keychain-settings $keychains/Developer_ID_TheQtCompany.keychain - -sha1Ios="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36" -{ Install "$cacheSigningTools/ios_password.txt" "$targetFolder/ios_password.txt" $sha1Ios; } 2> /dev/null -{ iosPassword=$(cat "$targetFolder/ios_password.txt"); } 2> /dev/null - -iPhoneDeveloper="iPhoneDeveloperCiTeam2020.p12" -shaIPhoneDeveloper="73136e44fed850f398e85908e4a73f20a6bdd8a2" -Install "$cacheSigningTools/latest_ios_cert_2020/$iPhoneDeveloper" "$targetFolder/$iPhoneDeveloper" $shaIPhoneDeveloper -echo "Importing $iPhoneDeveloper.." -{ security import $targetFolder/$iPhoneDeveloper -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign; } 2> /dev/null - -iPhoneDistribution="iPhoneDistributionCiTeam2020.p12" -shaIPhoneDistribution="36215c3cbc6bfee48e86aafbd53c56282fe36d8d" -Install "$cacheSigningTools/latest_ios_cert_2020/$iPhoneDistribution" "$targetFolder/$iPhoneDistribution" $shaIPhoneDistribution -echo "Importing $iPhoneDistribution.." -{ security import "$targetFolder/$iPhoneDistribution" -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign; } 2> /dev/null - -# Mobileprovision -echo "Creating directory $targetFolder/Library/MobileDevice/Provisioning Profiles.." -mkdir "$targetFolder/Library/MobileDevice" -mkdir "$targetFolder/Library/MobileDevice/Provisioning Profiles" -shaMobileprovision="ec9697276253ca7bf4401912236f0e6fde4214da" -Install "$cacheSigningTools/latest_ios_cert_2020/iOS_Dev_2020_citeam.mobileprovision" "$targetFolder/Library/MobileDevice/Provisioning Profiles/iOS_Dev_2020_citeam.mobileprovision" $shaMobileprovision - -# Removing password files -rm -fr "$targetFolder/login_keychain_password.txt" - From 368369beb142264bf2bae3980cf8c11db69af032 Mon Sep 17 00:00:00 2001 From: Elias Toivola Date: Wed, 20 Mar 2024 16:22:10 +0200 Subject: [PATCH 093/288] Windows-10_22h2-x86_64: Disable MS services that we do not use qtci-windows-10_22H2-x86_64-51 was copied as -52 In this new tier-1 image, the following services were disabled: - backgroundDownload.exe (part of MSVC) - Microsoft Edge update/installer and Onedrive Also missing certification GlobalSign Root CA - R3 was added. Pick-to: 6.7 6.5 6.2 Task-number: QTQAINFRA-6207 Task-number: QTQAINFRA-6490 Task-number: QTQAINFRA-6473 Change-Id: Ifd51d25a6c8d43b008ca65af22ebbd592cf57b85 Reviewed-by: Tero Heikkinen Reviewed-by: Heikki Halmet (cherry picked from commit d58045688b09b07057e61e909d912c668550f0de) --- coin/platform_configs/cmake_platforms.yaml | 4 ++-- coin/platform_configs/cmake_platforms_static_tests.yaml | 2 +- coin/platform_configs/cmake_platforms_target_android.yaml | 2 +- coin/platform_configs/cmake_platforms_wasm.yaml | 2 +- coin/platform_configs/flashing-wizard.yaml | 4 ++-- coin/platform_configs/nightly_qnx710_host_windows.yaml | 2 +- coin/platform_configs/qmake2cmake.yaml | 2 +- coin/platform_configs/qt-creator.yaml | 4 ++-- coin/platform_configs/qtsaferenderer.yaml | 2 +- coin/platform_configs/qtwebkit.yaml | 2 +- .../qtci-windows-10_22H2-x86_64/README_MANUAL_INSTALLATIONS | 6 ++++++ 11 files changed, 19 insertions(+), 13 deletions(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 3e3c943d317..c098cfe263a 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -84,7 +84,7 @@ Configurations: ] - Id: 'windows-10_22h2-msvc2022' - Template: 'qtci-windows-10_22H2-x86_64-51' + Template: 'qtci-windows-10_22H2-x86_64-52' Compiler: 'MSVC2022' Features: ['Sccache', "DebugAndRelease", 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib' @@ -174,7 +174,7 @@ Configurations: ] - Id: 'windows-10_22h2-mingw13' - Template: 'qtci-windows-10_22H2-x86_64-51' + Template: 'qtci-windows-10_22H2-x86_64-52' Compiler: 'Mingw' Features: ['Packaging', 'Sccache', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples' diff --git a/coin/platform_configs/cmake_platforms_static_tests.yaml b/coin/platform_configs/cmake_platforms_static_tests.yaml index e6a98abb999..cd4811af6e6 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: 'windows-10_22h2-minimal-static' - Template: 'qtci-windows-10_22H2-x86_64-51' + Template: 'qtci-windows-10_22H2-x86_64-52' Compiler: 'MSVC2019' Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure'] Configure arguments: '-release -force-debug-info -static -nomake examples -qt-zlib' diff --git a/coin/platform_configs/cmake_platforms_target_android.yaml b/coin/platform_configs/cmake_platforms_target_android.yaml index dc3776a527f..be7c33c558a 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-51' + Template: 'qtci-windows-10_22H2-x86_64-52' 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 a655193d29b..846afb3b9d0 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-51' + Template: 'qtci-windows-10_22H2-x86_64-52' Target os: 'WebAssembly' Compiler: 'Mingw' Target compiler: 'Clang' diff --git a/coin/platform_configs/flashing-wizard.yaml b/coin/platform_configs/flashing-wizard.yaml index 18d281faca9..d14647d1ae7 100644 --- a/coin/platform_configs/flashing-wizard.yaml +++ b/coin/platform_configs/flashing-wizard.yaml @@ -7,7 +7,7 @@ Configurations: Features: ['Packaging', 'UseLegacyInstructions'] Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -static -no-icu' - - Template: 'qtci-windows-10_22H2-x86_64-51' + Template: 'qtci-windows-10_22H2-x86_64-52' Compiler: 'MSVC2019' Features: ['Packaging', 'UseLegacyInstructions'] Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -static -no-icu' @@ -18,7 +18,7 @@ Configurations: Features: ['Packaging', 'UseLegacyInstructions'] Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -static -no-icu' - - Template: 'qtci-windows-10_22H2-x86_64-51' + Template: 'qtci-windows-10_22H2-x86_64-52' Compiler: 'MSVC2019' Target arch: 'x86' Features: ['Packaging', 'UseLegacyInstructions'] diff --git a/coin/platform_configs/nightly_qnx710_host_windows.yaml b/coin/platform_configs/nightly_qnx710_host_windows.yaml index e3fcb96982e..a4e1bed2022 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-51' + Template: 'qtci-windows-10_22H2-x86_64-52' Target os: 'QNX_710' Target arch: 'arm64' Compiler: 'MSVC2019' diff --git a/coin/platform_configs/qmake2cmake.yaml b/coin/platform_configs/qmake2cmake.yaml index 73bdaff6724..ac1190633a5 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-51' + Template: 'qtci-windows-10_22H2-x86_64-52' Compiler: 'MSVC2019' Features: ['DisableTests'] - diff --git a/coin/platform_configs/qt-creator.yaml b/coin/platform_configs/qt-creator.yaml index 4e9f7c0ce3d..bbf45168b45 100644 --- a/coin/platform_configs/qt-creator.yaml +++ b/coin/platform_configs/qt-creator.yaml @@ -2,14 +2,14 @@ Version: 2 Module only: True Configurations: - - Template: 'qtci-windows-10_22H2-x86_64-51' + Template: 'qtci-windows-10_22H2-x86_64-52' Compiler: 'MSVC2019' Features: ['Packaging', 'Sccache', 'DebugAndRelease'] Configure arguments: '' Environment variables: [] Environment script: ['%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64'] - - Template: 'qtci-windows-10_22H2-x86_64-51' + Template: 'qtci-windows-10_22H2-x86_64-52' Compiler: 'MSVC2019' Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests'] Configure arguments: '' diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index ec0d6832f5c..744148f7567 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -47,7 +47,7 @@ Configurations: ] - Id: 'Windows-MSVC2019_Static' - Template: 'qtci-windows-10_22H2-x86_64-51' + Template: 'qtci-windows-10_22H2-x86_64-52' Compiler: 'MSVC2019' 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 -plugin-sql-sqlite -plugin-sql-odbc' diff --git a/coin/platform_configs/qtwebkit.yaml b/coin/platform_configs/qtwebkit.yaml index 979101939ef..7230a74973e 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-51' + Template: 'qtci-windows-10_22H2-x86_64-52' 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/README_MANUAL_INSTALLATIONS b/coin/pre-provisioning/qtci-windows-10_22H2-x86_64/README_MANUAL_INSTALLATIONS index 65241c24fe2..67a74c6ad9a 100644 --- a/coin/pre-provisioning/qtci-windows-10_22H2-x86_64/README_MANUAL_INSTALLATIONS +++ b/coin/pre-provisioning/qtci-windows-10_22H2-x86_64/README_MANUAL_INSTALLATIONS @@ -74,11 +74,17 @@ Reboot * Sysmain disabled: - 'C:\ProgramData\Microsoft\Windows\Start Menu\Programs\Administrative Tools\Services' - 'SysMain' - stop & disable # Don't disable Windows Update before running '01-enable-dotnet-framework.ps1'. Script requires Windows update to be enabled! +* Install msvc2019 and msvc2022 (follow the msvc2019.txt and msvc2022.txt files) + - After installation: Open Task Scheduler: Task Scheduler Library > Microsoft > VisualStudio > Updates > right-click: BackgroundDownload > disable * Windows update: - Settings - Windows Update - run available updates (Windows update2022-09 Cumulative Update for Windows 11 Version 22H2 for x64-based Systems (KB5017321)) - After reboot disable windows updates: - 'C:\ProgramData\Microsoft\Windows\Start Menu\Programs\Administrative Tools\Services' - 'Windows updates' - stop & disable * Turn windows features on or off -> Check the "SMB 1.0/CIFS File Sharing Support" +* Disable Edge update/installer + - Open services.msc: search 'Microsoft Edge Update Service (edgeupdate)' > stop and disable +* Disable Onedrive + - Open Task Manager: startup tab > Microsoft OneDrive > Disabled * (Restart Windows) * Google Chrome installed for RTA * Virus & threat protection settings: From aa22a35f0541de52dfcac81fa337c0a53c084c48 Mon Sep 17 00:00:00 2001 From: Tero Heikkinen Date: Thu, 15 Aug 2024 10:15:53 +0300 Subject: [PATCH 094/288] Windows: Enable proxy with fix to cert issue with Py 3.10+ Packaging reported issue that python installation without proxy didn't work - therefore enabling proxy back was needed but with a fix to handle Py 3.10+ changes Py 3.10+ pip 24.2 has moved to use system certifications by default which caused issue when proxy is used and if host didn't have one specific certification GlobalSign Root CA - R3 for pypi.org. Also noticed that sometimes Windows x64 images seemed to have this missing certification, but after installing it to Windows ARM (which was clearly missing it) - logs showed they didn't have it - and direct check to both Win x64 Tier1 images showed that they didn't have that cert. Not sure what steps in provisioning or proxy usage could have affected to that, but missing certification is now added directly to all of these new three Windows Tier 1 images: - qtci-windows-10_22H2-x86_64-52 (via QTQAINFRA-6207) - qtci-windows-11_23H2-x86_64-53 - qtci-windows-11_22H2-aarch64-53 Therefore --use-deprecated=legacy-certs flag is not needed when system has correct certification available as Py 3.10+ has moved to use them by default. Long-term improvements could still be added in future, in two ways: 1) Internal package cache (QTQAINFRA-6485 QTQAINFRA-5531), or 2) To update system certificates with Py 3.10+ But those will need more time to decide and implement. Therefore this improved quick fix to get proxy back with Py 3.10+ was needed now and it removes previous quick fix to unset proxy. Task-number: QTQAINFRA-6490 Task-number: QTQAINFRA-6473 Pick-to: 6.7 6.5 6.2 Change-Id: I0805a70cf1163012094505162d28640e9ea8e6bb Reviewed-by: Tero Heikkinen Reviewed-by: Heikki Halmet (cherry picked from commit 61c5bb072f03380441834b78c99e4bf5b7475c24) --- coin/platform_configs/cmake_platforms.yaml | 8 ++++---- coin/provisioning/common/windows/set-proxy.ps1 | 3 --- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index c098cfe263a..87f38e4e858 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -96,7 +96,7 @@ Configurations: ] - Id: 'windows-11_23H2-msvc2022' - Template: 'qtci-windows-11_23H2-x86_64-52' + Template: 'qtci-windows-11_23H2-x86_64-53' Compiler: 'MSVC2022' Features: ['Sccache', "DebugAndRelease", 'UseConfigure', 'Packaging', 'GenerateSBOM', 'VerifySBOM'] Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib' @@ -108,7 +108,7 @@ Configurations: ] - Id: 'windows-11_22h2-arm64-msvc2022' - Template: 'qtci-windows-11_22H2-aarch64-51' + Template: 'qtci-windows-11_22H2-aarch64-53' Compiler: 'MSVC2022' Features: ['Packaging', 'DebugAndRelease', 'UseConfigure', 'InsignificantTests', 'GenerateSBOM', 'VerifySBOM'] Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib -no-sql-psql -no-opengl' @@ -187,7 +187,7 @@ Configurations: ] - Id: 'windows-11_23H2-llvm' - Template: 'qtci-windows-11_23H2-x86_64-52' + Template: 'qtci-windows-11_23H2-x86_64-53' Compiler: 'Clang' Features: ['Packaging','Sccache', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] Configure arguments: '-release -force-debug-info -separate-debug-info -nomake examples' @@ -200,7 +200,7 @@ Configurations: ] - Id: 'windows-11_23H2-mingw13-developer-build' - Template: 'qtci-windows-11_23H2-x86_64-52' + Template: 'qtci-windows-11_23H2-x86_64-53' Compiler: 'Mingw' Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure'] Configure arguments: '-developer-build -release -force-debug-info -separate-debug-info -make examples' diff --git a/coin/provisioning/common/windows/set-proxy.ps1 b/coin/provisioning/common/windows/set-proxy.ps1 index 46bb7216a1a..f2a89e43bec 100644 --- a/coin/provisioning/common/windows/set-proxy.ps1 +++ b/coin/provisioning/common/windows/set-proxy.ps1 @@ -5,9 +5,6 @@ $n = Get-Content "$PSScriptRoot\..\shared\http_proxy.txt" $n = $n.Split('=') New-Variable -Name $n[0] -Value $n[1] -Write-Host "Temporarily not setting proxy" # QTQAINFRA-6473 -$proxy = "" - if ([string]::IsNullOrEmpty($proxy)) { Write-Host "No proxy is defined." } else { From e609ade2a4c0755e1719056ad12af37745755c09 Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Tue, 28 May 2024 14:00:15 +0300 Subject: [PATCH 095/288] Remove preview status from qtgraphs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Qt Graphs will be officially supported from Qt 6.8.0 -> Task-number: QTBUG-125143 Change-Id: I3dd57696188ef03b1ea67d15fce407fc48d333ec Reviewed-by: Tomi Korpipää (cherry picked from commit a6529838ce5bdd4b83cb2e2ea4d008dad6e9bb38) Reviewed-by: Antti Kokko --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index ea058468792..671db254a84 100644 --- a/.gitmodules +++ b/.gitmodules @@ -335,4 +335,4 @@ path = qtgraphs url = ../qtgraphs.git branch = 6.8 - status = preview + status = addon From cac4a7636657e84eb102d304b38420be3fb203ef Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Tue, 28 May 2024 14:29:08 +0300 Subject: [PATCH 096/288] Remove preview status from qtgrpc It will be officially supported from Qt 6.8.0 -> Task-number: QTBUG-125156 Change-Id: Idd5d2851dfa9d4c04643b3385ee8b4da86226772 Reviewed-by: Antti Kokko (cherry picked from commit 5f0b5bfdcb34c1f9a687b2eecdd785f0931f50f1) Reviewed-by: Alexey Edelev --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 671db254a84..9ff1afbbbac 100644 --- a/.gitmodules +++ b/.gitmodules @@ -322,7 +322,7 @@ path = qtgrpc url = ../qtgrpc.git branch = 6.8 - status = preview + status = addon [submodule "qtquickeffectmaker"] depends = qtbase qtdeclarative qtshadertools recommends = qtquick3d From 9e76e174ef264f8456a8507e741d1e58c84e9791 Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Tue, 28 May 2024 14:26:28 +0300 Subject: [PATCH 097/288] Remove preview status from qthttpserver Qt HTTP Server will be officially supported from Qt 6.8.0 -> Task-number: QTBUG-125155 Change-Id: I3286b2b0bdfcb675774d67909d485e88d100c09d Reviewed-by: Antti Kokko (cherry picked from commit 9a59f1d50fa943f0c4ab94a01f5523773051dbbe) --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 9ff1afbbbac..071b8bbdf7c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -309,7 +309,7 @@ path = qthttpserver url = ../qthttpserver.git branch = 6.8 - status = preview + status = addon [submodule "qtquick3dphysics"] depends = qtbase qtdeclarative qtquick3d qtshadertools path = qtquick3dphysics From 7af09a0f3dfcd4d7c70c6bce339a9bfc7bcf4389 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 20 Aug 2024 14:26:27 +0000 Subject: [PATCH 098/288] Update submodules on '6.8 in qt/qt5' Change-Id: I322753bb57f9aa8120a6c5e66ed147e75ad23ca0 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 c47c14ff8a1..ca916bdaa87 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit c47c14ff8a10d3bc62e000dd2129cc60c1994f15 +Subproject commit ca916bdaa87bf0dc09eacbe59df9b66ed1c74aee diff --git a/qt5compat b/qt5compat index c93e8d63197..07ad62a5e77 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit c93e8d6319796cac60d70967340eb5bae6914ad5 +Subproject commit 07ad62a5e7719c57c23b6bf54ad4b3b8169c7d60 diff --git a/qtactiveqt b/qtactiveqt index df90919d5b4..312280a6500 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit df90919d5b416c2712c98388b5efca8b5d3d0bc8 +Subproject commit 312280a650008f9701dd70fa8db6fde41bb5264a diff --git a/qtbase b/qtbase index a053dc51d55..a75b432c8a9 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit a053dc51d550a15225b1e47152fd61d4844cadf7 +Subproject commit a75b432c8a9d56066071fe7883f5a3e292e94059 diff --git a/qtcharts b/qtcharts index cf64dd7496b..f890030873e 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit cf64dd7496ba08d9cdc1c10bdcfc293815f41a6c +Subproject commit f890030873ef1ed1903f41015f46ef828abf1895 diff --git a/qtcoap b/qtcoap index 8439ccfc046..262634e4d91 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit 8439ccfc0469c4011b85daa1d3155be4dfb2f548 +Subproject commit 262634e4d91f5ccbef333e2d1760afed5a78c8f8 diff --git a/qtconnectivity b/qtconnectivity index cd24f834819..32f9d0ea8f8 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit cd24f8348191d266b390a3ca4f36a358f8740372 +Subproject commit 32f9d0ea8f88eb116d435932bfef41e77c5a09bd diff --git a/qtdatavis3d b/qtdatavis3d index e7aa01e8049..d7a0a00d368 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit e7aa01e804920931c9aa0d4fcf82ffb8f03018eb +Subproject commit d7a0a00d368446c25d973347efb0cbf4a4b5c2a0 diff --git a/qtdeclarative b/qtdeclarative index 2f25a48950a..b3a85515542 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 2f25a48950aa879049029abe5a0450e2d4441d08 +Subproject commit b3a855155422b6183148ad0a8b0a861cb0d84e1b diff --git a/qtdoc b/qtdoc index 9fe33eca0d4..3b421f9e5d3 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 9fe33eca0d418b479026f251203df7ea4d54ae8b +Subproject commit 3b421f9e5d386b95c1fb905f81f9e453c1c60e83 diff --git a/qtgraphs b/qtgraphs index 5395b2db908..6a1d8ed59a3 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit 5395b2db9080eaaa62222a71b4f06ba42b282713 +Subproject commit 6a1d8ed59a3634e195aea1d77fec949c401cfbc2 diff --git a/qtgrpc b/qtgrpc index 95af98b0b40..5c681d54e82 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit 95af98b0b4083f6a57bb7953a4071e3d08921935 +Subproject commit 5c681d54e8235e111c38a387881c64a609d421bb diff --git a/qthttpserver b/qthttpserver index 3ea68986611..4c039b8de7b 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit 3ea6898661116bac4f5097948b30063edc74f8b5 +Subproject commit 4c039b8de7b232e97651c4374baba1cbdefa7e54 diff --git a/qtimageformats b/qtimageformats index 8abdbeaa043..1e6bf9a6aad 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 8abdbeaa04329a905e8f288b6b0da49baa5ad64d +Subproject commit 1e6bf9a6aad48104cbe96ca52bed7236be30e406 diff --git a/qtlanguageserver b/qtlanguageserver index 445d1c44b9f..14f335f749a 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit 445d1c44b9f451356004af6992c72991092a6342 +Subproject commit 14f335f749ab86078cb606f060f12c0d6fb115e6 diff --git a/qtlocation b/qtlocation index 0de6d9a7ab9..48b71b31dcf 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 0de6d9a7ab9e96c7274b26aee64884ae2ac2fb71 +Subproject commit 48b71b31dcf65f00f6aa0f1fe3d1ce02943b312e diff --git a/qtlottie b/qtlottie index 0a1bce333dd..845bb72649f 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 0a1bce333dd2b28c9f243c518f2df9a014dc19db +Subproject commit 845bb72649fbd71ed073c1c63957b487e820f9fa diff --git a/qtmqtt b/qtmqtt index 8bf54f26dee..c05a2d9cf30 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit 8bf54f26dee5030721eb9c4d515ba7c7392526f3 +Subproject commit c05a2d9cf3026961e9694f606550c8feb7ea340d diff --git a/qtmultimedia b/qtmultimedia index 369ee4031b5..3b40d52688e 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 369ee4031b58394060babfcc0de34bd0a2d6953e +Subproject commit 3b40d52688e28a9d0ebd60b04d5475730d2c575e diff --git a/qtnetworkauth b/qtnetworkauth index e0f309992f8..206f7c8227e 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit e0f309992f859731fc0662abdd754999dc823944 +Subproject commit 206f7c8227ef26b6a77cd2fff964c9d98253634b diff --git a/qtopcua b/qtopcua index b433152f685..1b783b428b2 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit b433152f685a54f53149300190280d9d79585dae +Subproject commit 1b783b428b22913b14b53e498d6da35eb6021cf3 diff --git a/qtpositioning b/qtpositioning index 3b2af976505..e926e1d7a86 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit 3b2af9765053f1d07cb9af4736462ca406be27e7 +Subproject commit e926e1d7a86a65b3dd6132c43e6866d3eceb6114 diff --git a/qtquick3d b/qtquick3d index 55bddb83c32..39f81a6bce8 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 55bddb83c321d0724d3293074aacbe3a23bb7b63 +Subproject commit 39f81a6bce890cb2a251536d778239a5db2613dd diff --git a/qtquick3dphysics b/qtquick3dphysics index b3fb8ccfd35..e16c7a68610 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit b3fb8ccfd35a61b86c00c69b7a49fdabfc5c262d +Subproject commit e16c7a686109d5e46ab7320d326caa5e18cd38be diff --git a/qtquickeffectmaker b/qtquickeffectmaker index 9317947e888..432465dddd0 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit 9317947e88851f59a48235c08fbb6dabf8b30004 +Subproject commit 432465dddd0d847b2e0c15c7b2482934bae92017 diff --git a/qtquicktimeline b/qtquicktimeline index d6167324f61..7b76866ff4c 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit d6167324f6136d24221a30c2e50930b6e929091d +Subproject commit 7b76866ff4cb00b408040eba6e2643376187be83 diff --git a/qtremoteobjects b/qtremoteobjects index fca55d26738..06b9d65f303 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit fca55d2673825a79ad6269ab38ec2e623f80dd43 +Subproject commit 06b9d65f303dbc9f257a59ba41c1e884150cc005 diff --git a/qtrepotools b/qtrepotools index 322d801c921..5bede66a74e 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 322d801c921ced813cf6431ae71b15a03ccf5ab5 +Subproject commit 5bede66a74ebb2cc0bf3edb3b5725214c97dfdd8 diff --git a/qtscxml b/qtscxml index 5d965342b78..eb59b3eabc7 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 5d965342b787ec3d80217fc33483aad1e52a671b +Subproject commit eb59b3eabc780f724807f3b290c6070599f7dfc6 diff --git a/qtsensors b/qtsensors index 2b957de2c7a..39a14856a94 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 2b957de2c7ab1df675bbf22c1cb870fa20572476 +Subproject commit 39a14856a94825bbeee429dc23c2f7304ca9a5b6 diff --git a/qtserialbus b/qtserialbus index c23bd7290d5..cf0cf0e6b61 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit c23bd7290d596df4d582cee599a1e3a6fb4e8b92 +Subproject commit cf0cf0e6b61db1375bf73684589478789a1a948e diff --git a/qtserialport b/qtserialport index 6fd0a7c1649..b1675c30bad 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 6fd0a7c16492675017ba17a1fee6d3dc3ecd151b +Subproject commit b1675c30badd3ebb389c12a485df5671617c85ae diff --git a/qtshadertools b/qtshadertools index 0d050c6c565..7358a435d8c 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 0d050c6c56537697a557502770efb9157d457a1c +Subproject commit 7358a435d8c576bdbe0fc16b98938751a4856c39 diff --git a/qtspeech b/qtspeech index 2daed57ce56..9731ba0403e 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 2daed57ce56cda21984c21a748a0c32e22bd2822 +Subproject commit 9731ba0403ec0752d9217a50248e1b12fee88b6b diff --git a/qtsvg b/qtsvg index 6538a142f8a..213b42455a3 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 6538a142f8a31fdef2bca91e13835c26deb592be +Subproject commit 213b42455a39f2f65dac5d8a919526ace05d7d0e diff --git a/qttools b/qttools index b86f1195605..751d170ff4b 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit b86f119560588634519a6c49846a6109d88ba20d +Subproject commit 751d170ff4b4b56f251875b8e0ffd1fc4e96f7e7 diff --git a/qttranslations b/qttranslations index bd0d81568b5..63c9911daf3 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit bd0d81568b5bc269a8032db9793c49ad4a14b036 +Subproject commit 63c9911daf349448feaf96bf09215247598a89b2 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index d8fff699290..5b8a85c871d 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit d8fff6992903031b7d17f7facc1317e42f889866 +Subproject commit 5b8a85c871d3a2eb50246df22397cff907194b9b diff --git a/qtwayland b/qtwayland index aeda2f03d1b..d350c345728 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit aeda2f03d1b631bb87ba830a345f71198d5428fd +Subproject commit d350c345728ed75e31fcfac7b7b8b6732a5fecd3 diff --git a/qtwebchannel b/qtwebchannel index 6fe7d5b306d..21ba04c7bd7 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 6fe7d5b306da9588f17c1a436f717ada7a3ce6c2 +Subproject commit 21ba04c7bd7880e23482eec9b464e48609e589b5 diff --git a/qtwebengine b/qtwebengine index adf1e4736f3..d230f880f6c 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit adf1e4736f3c4f2490c108abeaaa546213cd3878 +Subproject commit d230f880f6c736776c4f1354aa06d20700161156 diff --git a/qtwebsockets b/qtwebsockets index 38cb1de0c99..27e32751d61 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 38cb1de0c99e545f3f5aef4c79e5eff1eb4c88c8 +Subproject commit 27e32751d61d598419553e43a42840ebac908aab diff --git a/qtwebview b/qtwebview index e2b1614c5aa..89d4baa90cd 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit e2b1614c5aa84314be9a63f428218b00ba7d6693 +Subproject commit 89d4baa90cdc735ce8b654b18b576b74ff11ea2c From 3964060835bc5ba5519d25177bdf219c3ec3f577 Mon Sep 17 00:00:00 2001 From: Paul Wicking Date: Fri, 5 Jul 2024 11:28:11 +0200 Subject: [PATCH 099/288] Update libclang for QDoc to 18.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 libclang package for download and cache sites. * Add provisioning package locations for Ubuntu 24.04 ARM64. * Update SHA1 for provisioning packages on all platforms. Fixes: QTBUG-126412 Task-number: QTQAINFRA-6112 Change-Id: Id30841efb29d78c9d2d54ffa6af9993b12734c0b Reviewed-by: Topi Reiniö (cherry picked from commit ee8e66fd2aeef4818e853a77cd53d88d837c8154) --- coin/provisioning/common/unix/libclang.sh | 25 +++++++++++-------- coin/provisioning/common/windows/libclang.ps1 | 9 ++++--- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/coin/provisioning/common/unix/libclang.sh b/coin/provisioning/common/unix/libclang.sh index 5d0b423087c..b720fcf7c3c 100755 --- a/coin/provisioning/common/unix/libclang.sh +++ b/coin/provisioning/common/unix/libclang.sh @@ -20,33 +20,38 @@ PROVISIONING_DIR="$(dirname "$0")/../../" # shellcheck source=./common.sourced.sh source "$PROVISIONING_DIR"/common/unix/common.sourced.sh -libclang_version="17.0.6" +libclang_version="18.1.7" if uname -a |grep -q Darwin; then version=$libclang_version url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_$%7Bversion%7D-based-mac.7z" url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-release_$%7Bversion%7D-based-mac.7z" - sha1="e8ecc2fb0d7d7a0f60a50379f16fbf3eef679d78" + sha1="9ea511576645ef4abee6d4c27550406e929334d5" 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_$%7Bversion%7D-based-linux-Rhel9.2-gcc10.0-x86_64.7z" url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-release_$%7Bversion%7D-based-linux-Rhel9.2-gcc10.0-x86_64.7z" - sha1="102374379af906bd26085fcd18047cac4d0fb7bf" -elif test "$PROVISIONING_OS_ID" == "ubuntu" ; then - version=$libclang_version - url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_$%7Bversion%7D-based-linux-Ubuntu22.04-gcc11.2-x86_64.7z" - url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-release_$%7Bversion%7D-based-linux-Ubuntu22.04-gcc11.2-x86_64.7z" - sha1="4a793c9da9a02bd23c163c74dbc5565164a00c3f" + sha1="32c29d8df726b035e0a97e767c5c3e392aa331e1" 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_$%7Bversion%7D-based-linux-Debian11.6-gcc10.0-arm64.7z" url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-release_$%7Bversion%7D-based-linux-Debian11.6-gcc10.0-arm64.7z" - sha1="b5ff982738dbb6efe1a34ed26ff47fca2b1b3b93" + sha1="8d876f60c2fe9c55e18fbac0be2acb70bd20d5d1" +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_$%7Bversion%7D-based-linux-Ubuntu24.04-gcc11.2-arm64.7z" + url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-release_$%7Bversion%7D-based-linux-Ubuntu24.04-gcc11.2-arm64.7z" + sha1="5a7bda4fbd2c52ae66557034591d977ba617482c" +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_$%7Bversion%7D-based-linux-Ubuntu22.04-gcc11.2-x86_64.7z" + url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-release_$%7Bversion%7D-based-linux-Ubuntu22.04-gcc11.2-x86_64.7z" + sha1="b9f8735a148342174d7d763b5475175cd0827441" else version=$libclang_version url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_$%7Bversion%7D-based-linux-Rhel8.8-gcc10.0-x86_64.7z" url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-release_$%7Bversion%7D-based-linux-Rhel8.8-gcc10.0-x86_64.7z" - sha1="2a58cc71ad90eb6234c56ef7b141f32361b4312a" + sha1="a51c5562c9b071250e7971390d55ef21924271ca" fi zip="/tmp/libclang.7z" diff --git a/coin/provisioning/common/windows/libclang.ps1 b/coin/provisioning/common/windows/libclang.ps1 index 8e5c68450c4..103d7cdd952 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="17.0.6" +$libclang_version="18.1.7" Write-Output "libClang = $libclang_version" >> ~/versions.txt # PySide versions following 5.6 use a C++ parser based on Clang (http://clang.org/). @@ -38,7 +38,7 @@ $toolchainSuffix = "" if ( $toolchain -eq "vs2019" ) { if ( $archVer -eq 64 ) { - $sha1 = "7e3e474081d2e1d5d95c9743532de01b8e59b9aa" + $sha1 = "8e0862386caef7e4537599ef980eeb6ebee8767f" } else { $sha1 = "" @@ -48,7 +48,7 @@ if ( $toolchain -eq "vs2019" ) { if ( $toolchain -eq "mingw" ) { if ( $archVer -eq 64 ) { - $sha1 = "b9e65f617cd8d6e8fb8ae734383f03f6a7b202ed" + $sha1 = "a23cbb0822cf2eb8d1cecf26e8614ef37a7611e3" } else { $sha1 = "" @@ -56,9 +56,10 @@ if ( $toolchain -eq "mingw" ) { $toolchainSuffix = "mingw" } + if ( $toolchain -eq "llvm-mingw" ) { if ( $archVer -eq 64 ) { - $sha1 = "1844f107d067b69deabf375fc024848c1c8b015d" + $sha1 = "9c34f99eb575b42c2befe27829c08e6d3f01ae58" } else { $sha1 = "" From 47b58a4f6b79e7f409bf4d4903e9148027d5c2c3 Mon Sep 17 00:00:00 2001 From: Paul Wicking Date: Tue, 18 Jun 2024 19:34:49 +0200 Subject: [PATCH 100/288] coin: Provision new QDoc and qtattributionsscanner binaries MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update QDoc and qtattributionsscanner to the latest versions from qttools/dev. The QDoc binary is built against libClang v18.1.7. It supports new commands introduced in Qt 6.7 and 6.8. It also ignores duplicate warnings that QDoc issues for certain attribution files in CI only, which have been known to block qt5.git integrations previously. Fixes: QTBUG-126407 Change-Id: I69aad04bbe73e1fdf1d6cb4ff797616a23abcdaf Reviewed-by: Topi Reiniö (cherry picked from commit 957b74a7fa5ea28fbaba42c6eb9f04a5124bfc71) Reviewed-by: Qt Cherry-pick Bot --- .../85-qdoc_qtattributionsscanner.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/85-qdoc_qtattributionsscanner.sh b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/85-qdoc_qtattributionsscanner.sh index fd2a3afddd0..d9b69da9515 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/85-qdoc_qtattributionsscanner.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/85-qdoc_qtattributionsscanner.sh @@ -11,8 +11,8 @@ set -e "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" # shellcheck source=../common/unix/DownloadURL.sh source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" -version="68bdc5764da2d4e442181b408751b6572f36fa74" -sha1="dac76e8f6cb69990661e7d814bea6f32fea29bf4" +version="57a554131c468f45f36d7501d777fcc7bba597b0" +sha1="add45e09655314db4295a2d459ef2b13e1b6268f" url="https://download.qt.io/development_releases/prebuilt/qdoc/qt/qdoc-qtattributionsscanner_$%7Bversion///%7D-based-linux-Ubuntu22.04-gcc11.4-x86_64.7z" url_cached="http://ci-files01-hki.ci.qt.io/input/qdoc/qt/qdoc-qtattributionsscanner_$%7Bversion///%7D-based-linux-Ubuntu22.04-gcc11.4-x86_64.7z" From df249cc06f9537068dc476146f23e3fe9606f9f8 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 24 Aug 2024 22:52:04 +0000 Subject: [PATCH 101/288] Update submodules on '6.8 in qt/qt5' Change-Id: Ia10a2ad1ebc809200c24f729033e63e07c16d59c 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 ca916bdaa87..3834a2db78d 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit ca916bdaa87bf0dc09eacbe59df9b66ed1c74aee +Subproject commit 3834a2db78d23ac87fb0fd5913ab394663d489e6 diff --git a/qt5compat b/qt5compat index 07ad62a5e77..484e61a7fba 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 07ad62a5e7719c57c23b6bf54ad4b3b8169c7d60 +Subproject commit 484e61a7fba1131f2229d01b672b5be69c74962d diff --git a/qtactiveqt b/qtactiveqt index 312280a6500..a9b2014d880 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 312280a650008f9701dd70fa8db6fde41bb5264a +Subproject commit a9b2014d880d5265faefb4412db9a5dea6a8b855 diff --git a/qtbase b/qtbase index a75b432c8a9..134f23d9216 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit a75b432c8a9d56066071fe7883f5a3e292e94059 +Subproject commit 134f23d9216dd76667a21e36f5417a64729532fa diff --git a/qtcharts b/qtcharts index f890030873e..7411157e035 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit f890030873ef1ed1903f41015f46ef828abf1895 +Subproject commit 7411157e03559405a51029034a62182291193138 diff --git a/qtcoap b/qtcoap index 262634e4d91..7fc06a73f78 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit 262634e4d91f5ccbef333e2d1760afed5a78c8f8 +Subproject commit 7fc06a73f789ad8cbb8b25c3bdc8a60f46648a31 diff --git a/qtconnectivity b/qtconnectivity index 32f9d0ea8f8..95e12197190 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 32f9d0ea8f88eb116d435932bfef41e77c5a09bd +Subproject commit 95e121971900bd8f3a2614fb8dbffcacb93a28ba diff --git a/qtdatavis3d b/qtdatavis3d index d7a0a00d368..16d41487b00 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit d7a0a00d368446c25d973347efb0cbf4a4b5c2a0 +Subproject commit 16d41487b00407ca9308722e375ebfc1e12fd8f1 diff --git a/qtdeclarative b/qtdeclarative index b3a85515542..752bce98f90 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit b3a855155422b6183148ad0a8b0a861cb0d84e1b +Subproject commit 752bce98f903052d7b9bd30610c326592784576f diff --git a/qtdoc b/qtdoc index 3b421f9e5d3..9ab0415ffc0 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 3b421f9e5d386b95c1fb905f81f9e453c1c60e83 +Subproject commit 9ab0415ffc06c0a445996ce2eb4eac0c71bf4e51 diff --git a/qtgraphs b/qtgraphs index 6a1d8ed59a3..f17ed87b1bc 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit 6a1d8ed59a3634e195aea1d77fec949c401cfbc2 +Subproject commit f17ed87b1bc50398bcc77b23acca4e4f1836a542 diff --git a/qtgrpc b/qtgrpc index 5c681d54e82..fdfb5c6b6c6 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit 5c681d54e8235e111c38a387881c64a609d421bb +Subproject commit fdfb5c6b6c63955a4529b4b7ee1ea484f627d16e diff --git a/qthttpserver b/qthttpserver index 4c039b8de7b..55e73c68e68 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit 4c039b8de7b232e97651c4374baba1cbdefa7e54 +Subproject commit 55e73c68e68e080ea2fbda773472c651a7ec0e5e diff --git a/qtimageformats b/qtimageformats index 1e6bf9a6aad..54da6cc4bdd 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 1e6bf9a6aad48104cbe96ca52bed7236be30e406 +Subproject commit 54da6cc4bdd148bfa7debf58970a02426646b3ec diff --git a/qtlanguageserver b/qtlanguageserver index 14f335f749a..f6e6055885d 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit 14f335f749ab86078cb606f060f12c0d6fb115e6 +Subproject commit f6e6055885d2dbe08b610b4c3e1d4a74f650258a diff --git a/qtlocation b/qtlocation index 48b71b31dcf..9ed4c361c99 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 48b71b31dcf65f00f6aa0f1fe3d1ce02943b312e +Subproject commit 9ed4c361c994257b8b808ee7a74be79688226c83 diff --git a/qtlottie b/qtlottie index 845bb72649f..2e522140de4 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 845bb72649fbd71ed073c1c63957b487e820f9fa +Subproject commit 2e522140de447bbdc7e977c6f8955e350d8ec267 diff --git a/qtmqtt b/qtmqtt index c05a2d9cf30..1506e33561a 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit c05a2d9cf3026961e9694f606550c8feb7ea340d +Subproject commit 1506e33561a11222ce74c041d50b17be7b4e374e diff --git a/qtmultimedia b/qtmultimedia index 3b40d52688e..0c857f9c3bc 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 3b40d52688e28a9d0ebd60b04d5475730d2c575e +Subproject commit 0c857f9c3bc419cac5c314aa17297d09bbcbc0f4 diff --git a/qtnetworkauth b/qtnetworkauth index 206f7c8227e..245618ec60c 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 206f7c8227ef26b6a77cd2fff964c9d98253634b +Subproject commit 245618ec60c01b0dedb61be0aa17424aac683a05 diff --git a/qtopcua b/qtopcua index 1b783b428b2..1dfa3fddc32 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit 1b783b428b22913b14b53e498d6da35eb6021cf3 +Subproject commit 1dfa3fddc32771643d549a65b22b24c1dc01563c diff --git a/qtpositioning b/qtpositioning index e926e1d7a86..4b0791714b4 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit e926e1d7a86a65b3dd6132c43e6866d3eceb6114 +Subproject commit 4b0791714b45c68e9afff61c4bef661ece88235d diff --git a/qtquick3d b/qtquick3d index 39f81a6bce8..d67e8a74d52 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 39f81a6bce890cb2a251536d778239a5db2613dd +Subproject commit d67e8a74d524a5fbfe06463a1a741f58c9f0a3c7 diff --git a/qtquick3dphysics b/qtquick3dphysics index e16c7a68610..eb84d107431 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit e16c7a686109d5e46ab7320d326caa5e18cd38be +Subproject commit eb84d10743175e2ee83626702ace5973cdc2e3aa diff --git a/qtquickeffectmaker b/qtquickeffectmaker index 432465dddd0..23a91caec7f 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit 432465dddd0d847b2e0c15c7b2482934bae92017 +Subproject commit 23a91caec7f034e397fbe3174fe978873c13b6aa diff --git a/qtquicktimeline b/qtquicktimeline index 7b76866ff4c..0b54cb3a434 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 7b76866ff4cb00b408040eba6e2643376187be83 +Subproject commit 0b54cb3a4343a2764ba4d34784416c7f726c881d diff --git a/qtremoteobjects b/qtremoteobjects index 06b9d65f303..ac2cd4e0add 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 06b9d65f303dbc9f257a59ba41c1e884150cc005 +Subproject commit ac2cd4e0addf56dd60177448e2f3a5c769927a05 diff --git a/qtscxml b/qtscxml index eb59b3eabc7..424285d399f 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit eb59b3eabc780f724807f3b290c6070599f7dfc6 +Subproject commit 424285d399f57182b6ffb0724ded826ec6dd164a diff --git a/qtsensors b/qtsensors index 39a14856a94..7c08221b147 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 39a14856a94825bbeee429dc23c2f7304ca9a5b6 +Subproject commit 7c08221b1478f4b37d367cd1958534d8bd4e653c diff --git a/qtserialbus b/qtserialbus index cf0cf0e6b61..6a33f5d7a07 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit cf0cf0e6b61db1375bf73684589478789a1a948e +Subproject commit 6a33f5d7a07dcb3c6c162b0e75bb21237887ed19 diff --git a/qtserialport b/qtserialport index b1675c30bad..3fb4d46c3a3 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit b1675c30badd3ebb389c12a485df5671617c85ae +Subproject commit 3fb4d46c3a395454c60a56d0fd065de61e694e4a diff --git a/qtshadertools b/qtshadertools index 7358a435d8c..dc2953c38dc 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 7358a435d8c576bdbe0fc16b98938751a4856c39 +Subproject commit dc2953c38dc845453650537899f6f55d5d34daff diff --git a/qtspeech b/qtspeech index 9731ba0403e..08ea08e5b65 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 9731ba0403ec0752d9217a50248e1b12fee88b6b +Subproject commit 08ea08e5b651aa7e9274087f57b6234cb55c6c25 diff --git a/qtsvg b/qtsvg index 213b42455a3..9ee370b5362 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 213b42455a39f2f65dac5d8a919526ace05d7d0e +Subproject commit 9ee370b53627c813f661029c942252eb23204f4f diff --git a/qttools b/qttools index 751d170ff4b..10dbff6001d 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 751d170ff4b4b56f251875b8e0ffd1fc4e96f7e7 +Subproject commit 10dbff6001deea0339f38c5f84edf332c65c665a diff --git a/qttranslations b/qttranslations index 63c9911daf3..f13e324ab95 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 63c9911daf349448feaf96bf09215247598a89b2 +Subproject commit f13e324ab9575898d649ab66adccdedc3524b4e2 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 5b8a85c871d..a7a34aba456 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 5b8a85c871d3a2eb50246df22397cff907194b9b +Subproject commit a7a34aba456c9c768b822c2290d955e52c9ffc68 diff --git a/qtwayland b/qtwayland index d350c345728..770aa19ad33 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit d350c345728ed75e31fcfac7b7b8b6732a5fecd3 +Subproject commit 770aa19ad3370417ef4147ca20227c187ebefddf diff --git a/qtwebchannel b/qtwebchannel index 21ba04c7bd7..67d7422d981 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 21ba04c7bd7880e23482eec9b464e48609e589b5 +Subproject commit 67d7422d9814f7a9b58ca095ad83791210f85d60 diff --git a/qtwebengine b/qtwebengine index d230f880f6c..7107fee8627 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit d230f880f6c736776c4f1354aa06d20700161156 +Subproject commit 7107fee8627dd7743f511bc887ad752524711b4a diff --git a/qtwebsockets b/qtwebsockets index 27e32751d61..2257057b2e1 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 27e32751d61d598419553e43a42840ebac908aab +Subproject commit 2257057b2e1ae396d69e7f9f1b203a3748176379 diff --git a/qtwebview b/qtwebview index 89d4baa90cd..53bca20bc09 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 89d4baa90cdc735ce8b654b18b576b74ff11ea2c +Subproject commit 53bca20bc090a7beae70112412ae296606491c63 From 6011e6a29bf6d8d407bdd1a38f6522a46e403e18 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 29 May 2024 14:40:39 +0200 Subject: [PATCH 102/288] Ubuntu 24.04 arm64: Add documentation targets as non-blocking in CI MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit build on wayland and test offscreen and wayland Task-number: QTQAINFRA-6112 Task-number: QTQAINFRA-6308 Change-Id: I31a57794d455316fc98f1d84d3d275fa6e934b8e Reviewed-by: Topi Reiniö (cherry picked from commit b0dc1225cbc4b4040694f042163f7e144dbb4276) Reviewed-by: Paul Wicking --- coin/platform_configs/cmake_platforms.yaml | 17 ++++++++++++++ ...htly_ubuntu_24_04_arm64_documentation.yaml | 22 ------------------- coin/platform_configs/qtwayland.yaml | 6 +++++ .../04-libclang.sh | 6 +++++ 4 files changed, 29 insertions(+), 22 deletions(-) delete mode 100644 coin/platform_configs/nightly_ubuntu_24_04_arm64_documentation.yaml create mode 100755 coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/04-libclang.sh diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 87f38e4e858..5f11d615fc6 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -39,6 +39,13 @@ Configurations: 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-documentation' + Template: 'qtci-linux-Ubuntu-24.04-aarch64-50' + Compiler: 'GCC' + Features: ['Documentation', 'UseConfigure', 'DoNotRunTests'] + Configure arguments: '-make examples -developer-build -c++std c++20 -linker gold -qtlibinfix TestInfix -qtnamespace TestNamespace' + Environment variables: ['NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'] - Id: 'ubuntu-24.04-arm64' Template: 'qtci-linux-Ubuntu-24.04-aarch64-50' @@ -50,6 +57,16 @@ Configurations: 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DINPUT_headersclean=ON' ] # Test on Ubuntu 24.04 ARM64 offscreen +- + Id: 'ubuntu-24.04-arm64-documentation-offscreen-tests' + Template: 'qtci-linux-Ubuntu-24.04-aarch64-50' + Compiler: 'GCC' + Features: ['TestOnly', 'InsignificantTests'] + Environment variables: [ + 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', + 'QT_QPA_PLATFORM=offscreen' + ] + Platform dependency: 'ubuntu-24.04-arm64-documentation' - Id: 'ubuntu-24.04-arm64-offscreen-tests' Template: 'qtci-linux-Ubuntu-24.04-aarch64-50' diff --git a/coin/platform_configs/nightly_ubuntu_24_04_arm64_documentation.yaml b/coin/platform_configs/nightly_ubuntu_24_04_arm64_documentation.yaml deleted file mode 100644 index 001133413ba..00000000000 --- a/coin/platform_configs/nightly_ubuntu_24_04_arm64_documentation.yaml +++ /dev/null @@ -1,22 +0,0 @@ -Version: 2 -Configurations: -# cmake_platforms.yaml -# Build on Ubuntu 24.04 ARM64 Wayland and test on both offscreen and Wayland later -- - Id: 'ubuntu-24.04-arm64-documentation' - Template: 'qtci-linux-Ubuntu-24.04-aarch64-50' - Compiler: 'GCC' - Features: ['Documentation', 'UseConfigure', 'DoNotRunTests'] - Configure arguments: '-make examples -developer-build -c++std c++20 -linker gold -qtlibinfix TestInfix -qtnamespace TestNamespace' - Environment variables: ['NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'] -# Test on Ubuntu 24.04 ARM64 offscreen -- - Id: 'ubuntu-24.04-arm64-documentation-offscreen-tests' - Template: 'qtci-linux-Ubuntu-24.04-aarch64-50' - Compiler: 'GCC' - Features: ['TestDocs', 'TestOnly', 'InsignificantTests'] - Environment variables: [ - 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', - 'QT_QPA_PLATFORM=offscreen' - ] - Platform dependency: 'ubuntu-24.04-arm64-documentation' diff --git a/coin/platform_configs/qtwayland.yaml b/coin/platform_configs/qtwayland.yaml index a9296102fe0..d20fa417954 100644 --- a/coin/platform_configs/qtwayland.yaml +++ b/coin/platform_configs/qtwayland.yaml @@ -18,6 +18,12 @@ Configurations: Features: ['Sccache', 'TestOnly', 'RunDependencyTests', 'InsignificantTests'] Platform dependency: 'ubuntu-22.04' # Test on Ubuntu 24.04 ARM64 Wayland +- + Id: 'ubuntu-24.04-arm64-documentation-wayland-tests' + Template: 'qtci-linux-Ubuntu-24.04-aarch64-50' + Compiler: 'GCC' + Features: ['TestOnly', 'RunDependencyTests', 'InsignificantTests'] + Platform dependency: 'ubuntu-24.04-arm64-documentation' - Id: 'ubuntu-24.04-arm64-wayland-tests' Template: 'qtci-linux-Ubuntu-24.04-aarch64-50' diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/04-libclang.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/04-libclang.sh new file mode 100755 index 00000000000..fac8d4e77f9 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/04-libclang.sh @@ -0,0 +1,6 @@ +#!/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/libclang.sh" From 418b0e5b47b4a60f6cd8358149d4acf38b21c7ac Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 26 Aug 2024 19:59:51 +0000 Subject: [PATCH 103/288] Update submodules on '6.8 in qt/qt5' Change-Id: I283f4ed18d691510f1dc35221971235d53e7486b 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 3834a2db78d..0cdd4027ae8 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 3834a2db78d23ac87fb0fd5913ab394663d489e6 +Subproject commit 0cdd4027ae88521e70e632f979e835484ebde7a3 diff --git a/qt5compat b/qt5compat index 484e61a7fba..49c169f552b 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 484e61a7fba1131f2229d01b672b5be69c74962d +Subproject commit 49c169f552bceb46f54398a56e5bba188d809d93 diff --git a/qtactiveqt b/qtactiveqt index a9b2014d880..3bf0c808dc6 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit a9b2014d880d5265faefb4412db9a5dea6a8b855 +Subproject commit 3bf0c808dc62c9429d49c2e6106ec6995d676c77 diff --git a/qtbase b/qtbase index 134f23d9216..e43f4a71421 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 134f23d9216dd76667a21e36f5417a64729532fa +Subproject commit e43f4a71421955cb292d431d200a173e44bd1c53 diff --git a/qtcharts b/qtcharts index 7411157e035..607889db1fd 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 7411157e03559405a51029034a62182291193138 +Subproject commit 607889db1fdcf7397308ce4add591e72826f47fe diff --git a/qtcoap b/qtcoap index 7fc06a73f78..b9d7247c883 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit 7fc06a73f789ad8cbb8b25c3bdc8a60f46648a31 +Subproject commit b9d7247c883c4ff562829a8bc32213df3b2f13e9 diff --git a/qtconnectivity b/qtconnectivity index 95e12197190..8366b003135 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 95e121971900bd8f3a2614fb8dbffcacb93a28ba +Subproject commit 8366b0031355978457e6b5c9c2926bc668394b31 diff --git a/qtdatavis3d b/qtdatavis3d index 16d41487b00..efa5478b91a 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 16d41487b00407ca9308722e375ebfc1e12fd8f1 +Subproject commit efa5478b91a4859b5020516237ec520fc8b02696 diff --git a/qtdeclarative b/qtdeclarative index 752bce98f90..d5171b14251 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 752bce98f903052d7b9bd30610c326592784576f +Subproject commit d5171b14251cf4abd7d8ad16288690af53248856 diff --git a/qtdoc b/qtdoc index 9ab0415ffc0..b7cbace2ee1 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 9ab0415ffc06c0a445996ce2eb4eac0c71bf4e51 +Subproject commit b7cbace2ee117de90b6c44663fd50c81fcca916b diff --git a/qtgraphs b/qtgraphs index f17ed87b1bc..5a96189ea87 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit f17ed87b1bc50398bcc77b23acca4e4f1836a542 +Subproject commit 5a96189ea87b4c7c0e1fedc301a412e58962f8a7 diff --git a/qtgrpc b/qtgrpc index fdfb5c6b6c6..9d8461e747f 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit fdfb5c6b6c63955a4529b4b7ee1ea484f627d16e +Subproject commit 9d8461e747f70b5ae555da38bfe64e40b603f444 diff --git a/qthttpserver b/qthttpserver index 55e73c68e68..a8585a49929 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit 55e73c68e68e080ea2fbda773472c651a7ec0e5e +Subproject commit a8585a49929bcfc835c5ed39867bc7b837112ab8 diff --git a/qtimageformats b/qtimageformats index 54da6cc4bdd..c0dd2ec8b78 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 54da6cc4bdd148bfa7debf58970a02426646b3ec +Subproject commit c0dd2ec8b78b7091495bb1deb1108c7406cfee47 diff --git a/qtlanguageserver b/qtlanguageserver index f6e6055885d..cdb96abfc0e 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit f6e6055885d2dbe08b610b4c3e1d4a74f650258a +Subproject commit cdb96abfc0e76c4ac60abb301d7ff00ca9d845b5 diff --git a/qtlocation b/qtlocation index 9ed4c361c99..a8694f468de 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 9ed4c361c994257b8b808ee7a74be79688226c83 +Subproject commit a8694f468ded03b81b6a10814045c6784cd373f2 diff --git a/qtlottie b/qtlottie index 2e522140de4..266c91152ed 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 2e522140de447bbdc7e977c6f8955e350d8ec267 +Subproject commit 266c91152ed7da1aa3e8f727fe2ce4fecd0680f4 diff --git a/qtmqtt b/qtmqtt index 1506e33561a..8876bd7725f 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit 1506e33561a11222ce74c041d50b17be7b4e374e +Subproject commit 8876bd7725fad058f64a7288e32ec69902f758fb diff --git a/qtmultimedia b/qtmultimedia index 0c857f9c3bc..75467fefb62 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 0c857f9c3bc419cac5c314aa17297d09bbcbc0f4 +Subproject commit 75467fefb6204ec1678b20c47c5d69d2bf8b6c5d diff --git a/qtnetworkauth b/qtnetworkauth index 245618ec60c..b22c9421ec0 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 245618ec60c01b0dedb61be0aa17424aac683a05 +Subproject commit b22c9421ec0d3152f5bf813327a8756ef8d78d0d diff --git a/qtopcua b/qtopcua index 1dfa3fddc32..9375fe37872 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit 1dfa3fddc32771643d549a65b22b24c1dc01563c +Subproject commit 9375fe37872cb92ab068b95539f87ee23777f062 diff --git a/qtpositioning b/qtpositioning index 4b0791714b4..9e17051c777 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit 4b0791714b45c68e9afff61c4bef661ece88235d +Subproject commit 9e17051c777b460aa92632664d42eeb82158fbba diff --git a/qtquick3d b/qtquick3d index d67e8a74d52..9ab8e02c402 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit d67e8a74d524a5fbfe06463a1a741f58c9f0a3c7 +Subproject commit 9ab8e02c402f827d9abe8039fc8825964814aa90 diff --git a/qtquick3dphysics b/qtquick3dphysics index eb84d107431..8abbcb1f5c3 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit eb84d10743175e2ee83626702ace5973cdc2e3aa +Subproject commit 8abbcb1f5c3f2fe29b6e402b893c04b4e4c2e871 diff --git a/qtquickeffectmaker b/qtquickeffectmaker index 23a91caec7f..a7d563776e0 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit 23a91caec7f034e397fbe3174fe978873c13b6aa +Subproject commit a7d563776e0dc6a5b6abe1999e0f60b7c436931e diff --git a/qtquicktimeline b/qtquicktimeline index 0b54cb3a434..61ebc26d215 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 0b54cb3a4343a2764ba4d34784416c7f726c881d +Subproject commit 61ebc26d21574a339ec2b16865efb7860113c5d2 diff --git a/qtremoteobjects b/qtremoteobjects index ac2cd4e0add..e97c664bf1e 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit ac2cd4e0addf56dd60177448e2f3a5c769927a05 +Subproject commit e97c664bf1ecf76fdfef9dea5873ca1339c25972 diff --git a/qtscxml b/qtscxml index 424285d399f..53d4da19692 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 424285d399f57182b6ffb0724ded826ec6dd164a +Subproject commit 53d4da19692e93104beaf0892ce0e3b93e3c03e7 diff --git a/qtsensors b/qtsensors index 7c08221b147..7710523ef44 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 7c08221b1478f4b37d367cd1958534d8bd4e653c +Subproject commit 7710523ef449a57bf46a9417579bd5af3c4ed5f4 diff --git a/qtserialbus b/qtserialbus index 6a33f5d7a07..2f885012691 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 6a33f5d7a07dcb3c6c162b0e75bb21237887ed19 +Subproject commit 2f885012691012511e584218f180bfbf2ba1c11b diff --git a/qtserialport b/qtserialport index 3fb4d46c3a3..87ef797dde9 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 3fb4d46c3a395454c60a56d0fd065de61e694e4a +Subproject commit 87ef797dde9532a98833c34707acb93352317b54 diff --git a/qtshadertools b/qtshadertools index dc2953c38dc..0fe8f4f390b 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit dc2953c38dc845453650537899f6f55d5d34daff +Subproject commit 0fe8f4f390b50044b2e3d7752f1df86fb2563149 diff --git a/qtspeech b/qtspeech index 08ea08e5b65..31b66f094d3 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 08ea08e5b651aa7e9274087f57b6234cb55c6c25 +Subproject commit 31b66f094d3d89e7898953be11bd194a8354c235 diff --git a/qtsvg b/qtsvg index 9ee370b5362..aa0ee15df91 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 9ee370b53627c813f661029c942252eb23204f4f +Subproject commit aa0ee15df9169e2e0211dd2435fc698cf4afa317 diff --git a/qttools b/qttools index 10dbff6001d..5034a500830 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 10dbff6001deea0339f38c5f84edf332c65c665a +Subproject commit 5034a5008302f830f0966162665a1249f288d2bb diff --git a/qttranslations b/qttranslations index f13e324ab95..bf0f7a27515 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit f13e324ab9575898d649ab66adccdedc3524b4e2 +Subproject commit bf0f7a27515c711bd75919dcb0824c0161008526 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index a7a34aba456..79355603a33 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit a7a34aba456c9c768b822c2290d955e52c9ffc68 +Subproject commit 79355603a3366bea4a6ec408b73ae028a153da08 diff --git a/qtwayland b/qtwayland index 770aa19ad33..9251ddeca76 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 770aa19ad3370417ef4147ca20227c187ebefddf +Subproject commit 9251ddeca76ba0949b3d76220cf7b005e551f3dd diff --git a/qtwebchannel b/qtwebchannel index 67d7422d981..c6dafd8d522 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 67d7422d9814f7a9b58ca095ad83791210f85d60 +Subproject commit c6dafd8d5220d797c64b229a7378817369d0bc5b diff --git a/qtwebengine b/qtwebengine index 7107fee8627..6d62d33316b 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 7107fee8627dd7743f511bc887ad752524711b4a +Subproject commit 6d62d33316bbf92b3bfd5cec75f7c2a04e06a23c diff --git a/qtwebsockets b/qtwebsockets index 2257057b2e1..b4cb234e77b 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 2257057b2e1ae396d69e7f9f1b203a3748176379 +Subproject commit b4cb234e77be4ef91817b57f1752c4cc82d01118 diff --git a/qtwebview b/qtwebview index 53bca20bc09..8fb1a383476 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 53bca20bc090a7beae70112412ae296606491c63 +Subproject commit 8fb1a383476b6e120d467f02ae961f65c3746634 From 456bb49e7d4450f6693435a98dd83e74436c54df Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Tue, 16 Apr 2024 14:41:16 +0200 Subject: [PATCH 104/288] Make offscreen plugin the default one for debian-11.6-arm64 Fixes: QTBUG-124449 Change-Id: Icfc3a11bcbcafef28e186f3b4e481309bb58c191 Reviewed-by: Alexandru Croitor (cherry picked from commit 37ce15a3b09bdc542a3ba5404d52da659137dc52) Reviewed-by: Paul Wicking --- 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 5f11d615fc6..0a51707ecbc 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -160,7 +160,7 @@ Configurations: Template: 'qtci-linux-Debian-11.6-aarch64-50' Compiler: 'GCC' Features: ['Packaging', 'UseConfigure', 'InstallQt5Dependencies', 'DoNotRunTests'] - Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-doubleconversion -qt-harfbuzz -no-libudev -bundled-xcb-xinput' + Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-doubleconversion -qt-harfbuzz -no-libudev -bundled-xcb-xinput -qpa offscreen\;xcb' Environment variables: [ 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}', ] From 79134ebf0e74da6b8298dee56bcc59429d65a03d Mon Sep 17 00:00:00 2001 From: Tero Heikkinen Date: Fri, 26 Apr 2024 13:05:46 +0300 Subject: [PATCH 105/288] Provisioning: Add Ubuntu 24.04 x64 as non-blocking in CI Adding all builds Wayland which is the default display server for Ubuntu. Testing each module in X11, and testing Wayland client plugin for each module in Qt Wayland integration. [CI Platforms] TestDocs was removed, see also QTQAINFRA-6068. Task-number: QTQAINFRA-6322 Task-number: QTQAINFRA-6098 Task-number: QTQAINFRA-6203 Change-Id: I8db0d861940bdd558384f1cc24243c6a84e133e2 Reviewed-by: Liang Qi (cherry picked from commit 5a79cf916821e0382dbdec3c544af1d280bbd618) Reviewed-by: Paul Wicking --- coin/platform_configs/cmake_platforms.yaml | 31 +++ coin/platform_configs/default.yaml | 5 + coin/platform_configs/qtwayland.yaml | 13 + .../README_MANUAL_INSTALLATIONS | 60 +++++ .../provisioning/common/unix/install-conan.sh | 3 +- .../01-disable-updates.sh | 9 + .../01-disable_net_lso.sh | 6 + .../01-install_telegraf.sh | 3 + .../01-set-ulimit.sh | 8 + .../01-systemsetup.sh | 43 +++ .../qtci-linux-Ubuntu-24.04-x86_64/02-apt.sh | 254 ++++++++++++++++++ .../02-disable-notifications.sh | 6 + .../02-disable-ntp.sh | 6 + .../02-remove-apport.sh | 6 + .../02-remove-update_notifier.sh | 6 + .../03-install-nodejs.sh | 6 + .../03-mount-vcpkg-cache-drive.sh | 8 + .../qtci-linux-Ubuntu-24.04-x86_64/03-qemu.sh | 19 ++ .../04-libclang-v100-dyn.sh | 6 + .../04-libclang.sh | 6 + .../04-yocto.sh | 125 +++++++++ .../08-integrity.sh | 8 + .../20-sccache.sh | 3 + .../22-mqtt_broker.sh | 8 + .../qtci-linux-Ubuntu-24.04-x86_64/30-fbx.sh | 8 + .../30-install-conan.sh | 8 + .../30-install_icu.sh | 48 ++++ .../35-install-breakpad.sh | 8 + .../40-android_linux.sh | 8 + .../40-install-cmake.sh | 7 + .../41-install-vcpkg.sh | 6 + .../42-install-vcpkg-ports.sh | 6 + .../45-install-cpdb.sh | 13 + .../50-openssl_for_android_linux.sh | 8 + .../60-install_protobuf.sh | 9 + .../61-install_grpc.sh | 9 + .../70-install_QemuGA.sh | 10 + .../70-qnx710.sh | 13 + .../70-vxworks.sh | 8 + .../80-docker.sh | 59 ++++ .../81-fix_mdns_docker_resolution.sh | 15 ++ .../85-qdoc_qtattributionsscanner.sh | 33 +++ .../90-bootstrap-autostart.sh | 3 + .../90-install-ffmpeg.sh | 3 + .../90-mimer.sh | 8 + .../90-squish.sh | 6 + .../91-squish-coco.sh | 6 + .../92-sbuild.sh | 57 ++++ .../93-axivion-bauhaus-suite.sh | 6 + .../93-download-files-for-sbuild.sh | 17 ++ .../qtci-linux-Ubuntu-24.04-x86_64/93-lcov.sh | 9 + .../99-cleanup.sh | 7 + .../99-enable_test_stacktraces.sh | 8 + .../99-version.sh | 6 + 54 files changed, 1059 insertions(+), 1 deletion(-) create mode 100644 coin/pre-provisioning/qtci-linux-Ubuntu-24.04-x86_64/README_MANUAL_INSTALLATIONS create mode 100644 coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/01-disable-updates.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/01-disable_net_lso.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/01-install_telegraf.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/01-set-ulimit.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/01-systemsetup.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/02-apt.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/02-disable-notifications.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/02-disable-ntp.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/02-remove-apport.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/02-remove-update_notifier.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/03-install-nodejs.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/03-mount-vcpkg-cache-drive.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/03-qemu.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/04-libclang-v100-dyn.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/04-libclang.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/04-yocto.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/08-integrity.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/20-sccache.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/22-mqtt_broker.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/30-fbx.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/30-install-conan.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/30-install_icu.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/35-install-breakpad.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/40-android_linux.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/40-install-cmake.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/41-install-vcpkg.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/42-install-vcpkg-ports.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/45-install-cpdb.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/50-openssl_for_android_linux.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/60-install_protobuf.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/61-install_grpc.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/70-install_QemuGA.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/70-qnx710.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/70-vxworks.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/80-docker.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/81-fix_mdns_docker_resolution.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/85-qdoc_qtattributionsscanner.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/90-bootstrap-autostart.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/90-install-ffmpeg.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/90-mimer.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/90-squish.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/91-squish-coco.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/92-sbuild.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/93-axivion-bauhaus-suite.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/93-download-files-for-sbuild.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/93-lcov.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/99-cleanup.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/99-enable_test_stacktraces.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/99-version.sh diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 0a51707ecbc..efb22f14a94 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -78,6 +78,37 @@ Configurations: 'QT_QPA_PLATFORM=offscreen' ] Platform dependency: 'ubuntu-24.04-arm64' +# Build on Ubuntu 24.04 x64 Wayland and test on both X11 and Wayland (Wayland=default) +- + Id: 'ubuntu-24.04-x64-documentation' + Template: 'qtci-linux-Ubuntu-24.04-x86_64-50' + Compiler: 'GCC' + Features: ['Sccache', 'Documentation', 'UseConfigure', 'DoNotRunTests'] + Configure arguments: '-make examples -developer-build -c++std c++20 -linker gold -qtlibinfix TestInfix -qtnamespace TestNamespace' + Environment variables: ['NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'] +- + Id: 'ubuntu-24.04-x64' + Template: 'qtci-linux-Ubuntu-24.04-x86_64-50' + Compiler: 'GCC' + Features: ['Sccache', 'UseConfigure', 'DoNotRunTests'] + 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', + 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DINPUT_headersclean=ON' + ] +# Test on Ubuntu 24.04 x64 X11 +- + Id: 'ubuntu-24.04-x64-documentation-x11-tests' + Template: 'qtci-linux-Ubuntu-24.04-x86_64-51' + Compiler: 'GCC' + Features: ['Sccache', 'TestOnly', 'InsignificantTests'] + Platform dependency: 'ubuntu-24.04-x64-documentation' +- + Id: 'ubuntu-24.04-x64-x11-tests' + Template: 'qtci-linux-Ubuntu-24.04-x86_64-51' + Compiler: 'GCC' + Features: ['Sccache', 'TestOnly', 'InsignificantTests'] + Platform dependency: 'ubuntu-24.04-x64' - Id: 'opensuse-15.5-developer-build' Template: 'qtci-linux-openSUSE-15.5-x86_64-52' diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index dff4c79e490..082f9702ed6 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -5,3 +5,8 @@ Configurations: Template: 'qtci-linux-Ubuntu-22.04-x86_64-51' Compiler: 'GCC' Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions'] +- + Id: 'ubuntu-24.04-x64-license-check' + Template: 'qtci-linux-Ubuntu-24.04-x86_64-50' + Compiler: 'GCC' + Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions'] diff --git a/coin/platform_configs/qtwayland.yaml b/coin/platform_configs/qtwayland.yaml index d20fa417954..d2781a34044 100644 --- a/coin/platform_configs/qtwayland.yaml +++ b/coin/platform_configs/qtwayland.yaml @@ -30,6 +30,19 @@ Configurations: Compiler: 'GCC' Features: ['TestOnly', 'RunDependencyTests', 'InsignificantTests'] Platform dependency: 'ubuntu-24.04-arm64' +# Test on Ubuntu 24.04 x64 Wayland +- + Id: 'ubuntu-24.04-x64-documentation-wayland-tests' + Template: 'qtci-linux-Ubuntu-24.04-x86_64-50' + Compiler: 'GCC' + Features: ['TestOnly', 'RunDependencyTests', 'InsignificantTests'] + Platform dependency: 'ubuntu-24.04-x64-documentation' +- + 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' # Test on Debian-11.6 Wayland - Id: 'debian-11.6-arm64-wayland-tests' diff --git a/coin/pre-provisioning/qtci-linux-Ubuntu-24.04-x86_64/README_MANUAL_INSTALLATIONS b/coin/pre-provisioning/qtci-linux-Ubuntu-24.04-x86_64/README_MANUAL_INSTALLATIONS new file mode 100644 index 00000000000..036b5041878 --- /dev/null +++ b/coin/pre-provisioning/qtci-linux-Ubuntu-24.04-x86_64/README_MANUAL_INSTALLATIONS @@ -0,0 +1,60 @@ +### Ubuntu 24.04 ### +Hard Disk: 1TB + +Language: English (United States) +Time & Date: Etc/Coordinated Universal Time +Software Selection: Desktop image, minimal install + +Language: English (US) +Typing: English (US) +Privacy: Location Services: OFF +Connect Your Online Accounts: Skip + + +# Configure Settings + Notifications: + * Notification Popups: OFF + * Lock Screen Notifications: OFF + Privacy: + * Screen Lock: OFF + * File History & Rubbish Bin: + * File History: Off + * Diagnostics: + * Send error reports to Canonical: Never + Power: + * Blank screen: Never + * Automatic suspend: Off + Appearance: + * Auto-hide the dock: Off + Devices: + * Displays: Resolution 1280 x 800 + Details: + * Time Zone: UTC + * run "sudo timedatectl set-timezone UTC" + * Users: Automatic login on + + Software & Updates: + * Updates: + * Subscribed to: Security updates only + * Automatically check for updates: Never + * Notify me of a new Ubuntu version: Never + +# Add user to sudoers +Add 'qt ALL=NOPASSWD: ALL' to /etc/sudoers.d/qt + +Add 'GRUB_GFXMODE=1280x800' to /etc/default/grub +run 'sudo grub-mkconfig' + +# Install ssh server +run 'sudo apt install openssh-server' + +# Disable firewall +run 'sudo ufw disable' + +# Fetch and run coin-setup (in Opennebula) +Download http://coin/coin/binary/linux_amd64/coin-setup +run 'chmod +x ./coin-setup' to make it executable +run './coin-setup' + +Reboot + diff --git a/coin/provisioning/common/unix/install-conan.sh b/coin/provisioning/common/unix/install-conan.sh index 8fc83090674..e48a5bdd8d0 100755 --- a/coin/provisioning/common/unix/install-conan.sh +++ b/coin/provisioning/common/unix/install-conan.sh @@ -9,9 +9,10 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" # Note! Python3 is required for Conan installation os="$1" +params="$2" # Install Conan to Python user install directory (typically ~./local/) -pip3 install conan --user +pip3 install conan --user $params SetEnvVar "CONAN_REVISIONS_ENABLED" "1" SetEnvVar "CONAN_V2_MODE" "1" diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/01-disable-updates.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/01-disable-updates.sh new file mode 100644 index 00000000000..4c9adc5fb4f --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/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 + +# Disalbe 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-24.04-x86_64/01-disable_net_lso.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/01-disable_net_lso.sh new file mode 100644 index 00000000000..81e7d13797e --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/01-disable_net_lso.sh @@ -0,0 +1,6 @@ +#!/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 + +echo "ethtool -K \${DEVICE_IFACE} tso off" | sudo tee -a /etc/NetworkManager/dispatcher.d/pre-up.d/net_tso_off +sudo chmod +x /etc/NetworkManager/dispatcher.d/pre-up.d/net_tso_off diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/01-install_telegraf.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/01-install_telegraf.sh new file mode 100644 index 00000000000..729f90035bc --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/01-install_telegraf.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/unix/telegraf_install.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/01-set-ulimit.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/01-set-ulimit.sh new file mode 100644 index 00000000000..e951e82ac2a --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/01-set-ulimit.sh @@ -0,0 +1,8 @@ +#!/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 + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/linux/set_ulimit.sh" 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 new file mode 100644 index 00000000000..98744822c72 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/01-systemsetup.sh @@ -0,0 +1,43 @@ +#!/usr/bin/env bash +# 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 modifies system settings for automated use + +set -ex + +# shellcheck source=../common/unix/check_and_set_proxy.sh +source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" + +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 "Set grub timeout to 0" +sudo sed -i 's|GRUB_TIMEOUT=10|GRUB_TIMEOUT=0|g' /etc/default/grub +sudo update-grub + +# https://bugs.launchpad.net/ubuntu/+source/systemd/+bug/1624320 +# Checking if Ubuntu 20.04 works without this +#echo "Setting up workaround for Ubuntu systemd resolve bug" +#sudo rm -f /etc/resolv.conf +#sudo ln -s /run/systemd/resolve/resolv.conf /etc/resolv.conf + +# remove hostname to get unique based on IP address +sudo rm /etc/hostname + +echo "Set Network Test Server address to $NTS_IP in /etc/hosts" +echo "$NTS_IP qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts + +echo 'LC_ALL=en_US.UTF8' | sudo tee /etc/default/locale + +if [ "$http_proxy" != "" ]; then + echo "Acquire::http::Proxy \"$proxy\";" | sudo tee -a /etc/apt/apt.conf +fi + +# This script diverts qtlogging.ini file so we don't get debugging related auto-test failures. +sudo dpkg-divert --divert /etc/xdg/QtProject/qtlogging.ini.foo --rename /etc/xdg/QtProject/qtlogging.ini 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 new file mode 100644 index 00000000000..704a6097a6f --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/02-apt.sh @@ -0,0 +1,254 @@ +#!/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 + +# Install required packages with APT + +# shellcheck source=../common/linux/apt_wait_loop.sh +source "${BASH_SOURCE%/*}/../common/linux/apt_wait_loop.sh" + +echo "Disabling auto update" +sudo sed -i 's/APT::Periodic::Update-Package-Lists "1";/APT::Periodic::Update-Package-Lists "0";/' /etc/apt/apt.conf.d/10periodic +for service in apt-daily.timer apt-daily-upgrade.timer apt-daily.service apt-daily-upgrade.service; do + sudo systemctl stop $service + sudo systemctl disable $service +done + +function set_internal_repo { + + # Stop fetching the dep-11 metadata, since our mirrors do not handle them well + 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 +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." + +# Make sure needed ca-certificates are available +sudo apt-get install --reinstall ca-certificates + +# Git is not needed by builds themselves, but is nice to have +# immediately as one starts debugging +installPackages+=(git) +# 7zip is a needed decompressing tool +installPackages+=(p7zip-full) +# To be able to mount yocto-cache during builds +installPackages+=(nfs-common) +# libssl-dev provides headers for OpenSSL +installPackages+=(libssl-dev) +# Needed libraries for X11 support accordingly to https://wiki.qt.io/Building_Qt_5_from_Git +installPackages+=("^libxcb.*") +installPackages+=(libxkbcommon-dev) +installPackages+=(libxkbcommon-x11-dev) +installPackages+=(libx11-xcb-dev) +installPackages+=(libglu1-mesa-dev) +installPackages+=(libxrender-dev) +installPackages+=(libxi-dev) +# Enable linking to system dbus +installPackages+=(libdbus-1-dev) +# Needed libraries for WebEngine +installPackages+=(udev) +installPackages+=(libudev-dev) +installPackages+=(libdrm-dev) +installPackages+=(libegl1-mesa-dev) +installPackages+=(libfontconfig1-dev) +installPackages+=(libgbm-dev) +installPackages+=(liblcms2-dev) +installPackages+=(libpci-dev) +installPackages+=(libre2-dev) +installPackages+=(libsnappy-dev) +installPackages+=(libva-dev) +installPackages+=(libvpx-dev) +installPackages+=(libxkbfile-dev) +installPackages+=(libxshmfence-dev) +installPackages+=(libxss-dev) +# installPackages+=(nodejs) too old +installPackages+=(python3-html5lib) + +# Common event loop handling +installPackages+=(libglib2.0-dev) +# MySQL support +installPackages+=(libmysqlclient-dev) +# PostgreSQL support +installPackages+=(libpq-dev) +# SQLite support +installPackages+=(libsqlite3-dev) +# ODBC support +installPackages+=(unixodbc-dev) +# Support for FreeType font engine +installPackages+=(libfreetype6-dev) +# Enable the usage of system jpeg libraries +installPackages+=(libjpeg-dev) +# Enable support for printer driver +installPackages+=(libcups2-dev) +# Enable support for printer test +installPackages+=(cups-pdf) +# Install libraries needed for QtMultimedia to be able to support all plugins +installPackages+=(libasound2-dev) +installPackages+=(libgstreamer1.0-dev) +installPackages+=(libgstreamer-plugins-base1.0-dev) +installPackages+=(libgstreamer-plugins-good1.0-dev) +installPackages+=(libgstreamer-plugins-bad1.0-dev) +installPackages+=(libgstreamer-gl1.0-0) +installPackages+=(gir1.2-gst-plugins-base-1.0) +installPackages+=(gir1.2-gst-plugins-bad-1.0) +installPackages+=(yasm) +installPackages+=(libva-dev) +# for QtMultimedia streaming tests +installPackages+=(vlc-bin) +installPackages+=(vlc-plugin-base) + +# Support for cross-building to x86 (needed by WebEngine boot2qt builds) +installPackages+=(g++-multilib) +# python3 development package +installPackages+=(python3-dev) +installPackages+=(python3-pip) +installPackages+=(python3-venv) +installPackages+=(virtualenv) +installPackages+=(python3-wheel) +installPackages+=(python-is-python3) +# TODO: Ubuntu 24.04 Removal - not available +# python2 development package +#installPackages+=(python2-dev) + +# Automates interactive applications (Needed by RTA to automate configure testing) +installPackages+=(expect) +installPackages+=(mesa-common-dev) + +# TODO: Ubuntu 24.04 Replacement +#installPackages+=(libgl1-mesa-glx) +installPackages+=(libglx-mesa0) + +installPackages+=(libgl1-mesa-dev) +installPackages+=(libegl1-mesa-dev) +installPackages+=(libegl1) +installPackages+=(libegl-mesa0) +installPackages+=(libegl-dev) +installPackages+=(libglvnd-dev) +installPackages+=(libgles2-mesa-dev) +installPackages+=(curl) +installPackages+=(libcurl4-openssl-dev) +installPackages+=(libicu-dev) +installPackages+=(zlib1g-dev) +installPackages+=(zlib1g) +installPackages+=(openjdk-8-jdk) +#Java 11 for Android +installPackages+=(openjdk-11-jdk) +installPackages+=(libgtk-3-dev) +installPackages+=(ninja-build) +installPackages+=(libssl-dev) +installPackages+=(libxcursor-dev) +installPackages+=(libxcomposite-dev) +installPackages+=(libxdamage-dev) +installPackages+=(libxrandr-dev) +installPackages+=(libfontconfig1-dev) +installPackages+=(libsrtp2-dev) +installPackages+=(libwebp-dev) +installPackages+=(libjsoncpp-dev) +installPackages+=(libopus-dev) +installPackages+=(libminizip-dev) +installPackages+=(libavutil-dev) +installPackages+=(libavformat-dev) +installPackages+=(libavcodec-dev) +installPackages+=(libevent-dev) +installPackages+=(bison) +installPackages+=(flex) +installPackages+=(gperf) +installPackages+=(libasound2-dev) +installPackages+=(libpulse-dev) +installPackages+=(libxtst-dev) +installPackages+=(libnspr4-dev) +installPackages+=(libnss3-dev) +installPackages+=(libnss3) +installPackages+=(libopenal-dev) +installPackages+=(libbluetooth-dev) +#VirtualBox for RTA +installPackages+=(virtualbox) +installPackages+=(dkms) +# Needed for qtspeech +installPackages+=(libspeechd-dev) +#Pypdf for PDF reading in RTA tests +installPackages+=(python3-pypdf2) +# Needed for b2qt +installPackages+=(git-lfs) +installPackages+=(chrpath) +installPackages+=(gawk) +installPackages+=(texinfo) +# Needed for Poppler test in QtWebEngine +installPackages+=(libpoppler-cpp-dev) +# Needed for QtCore +installPackages+=(libdouble-conversion-dev) +installPackages+=(libpcre2-dev) +# Needed for testlib selftests +installPackages+=(valgrind) +# Needed for qtgampepad +installPackages+=(libsdl2-2.0) +installPackages+=(libsdl2-dev) +# Needed for qtwebkit +installPackages+=(ruby) +installPackages+=(libxslt1-dev) +installPackages+=(libxml2-dev) +installPackages+=(libhyphen-dev) +# For remote access +installPackages+=(ssh) +# For bitbake +installPackages+=(diffstat) +installPackages+=(binfmt-support) +installPackages+=(zstd) +installPackages+=(lz4) +# Vulkan is needed for examples +installPackages+=(libvulkan-dev) +# Needed for qtdltlogging +installPackages+=(libdlt-dev) +# For integrity +installPackages+=(libc6:i386) +# TODO: Ubuntu 24.04 Removal - not available +#installPackages+=(libncurses5:i386) + +installPackages+=(libstdc++6:i386) +installPackages+=(libx11-6:i386) +installPackages+=(lib32z1) +installPackages+=(linux-libc-dev:i386) +installPackages+=(libxcursor1:i386) +installPackages+=(libc6-dev-i386) +sudo dpkg --add-architecture i386 +# For QNX +installPackages+=(nfs-kernel-server) +installPackages+=(net-tools) +installPackages+=(bridge-utils) +# For Debian packaging +installPackages+=(sbuild) +installPackages+=(ubuntu-dev-tools) +# cifs-utils, for mounting smb drive +installPackages+=(keyutils) +installPackages+=(cifs-utils) +# VxWorks QEMU network setup (tunctl) +installPackages+=(uml-utilities) +# used for reading vcpkg packages version, from vcpkg.json +installPackages+=(jq) + +echo "Running update for apt" +waitLoop +sudo apt-get update +echo "Installing packages" +waitLoop +sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y -o DPkg::Lock::Timeout=300 install "${installPackages[@]}" + +# Configure pip +pip config --user set global.index https://ci-files01-hki.ci.qt.io/input/python_module_cache +pip config --user set global.extra-index-url https://pypi.org/simple/ + +source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" +# SetEnvVar "PATH" "/usr/lib/nodejs-mozilla/bin:\$PATH" + +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-disable-notifications.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/02-disable-notifications.sh new file mode 100644 index 00000000000..1b9ed6c91dc --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/02-disable-notifications.sh @@ -0,0 +1,6 @@ +#!/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 + +# shellcheck source=../common/linux/disable-notifications.sh +source "${BASH_SOURCE%/*}/../common/linux/disable-notifications.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/02-disable-ntp.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/02-disable-ntp.sh new file mode 100644 index 00000000000..1995aa144c1 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/02-disable-ntp.sh @@ -0,0 +1,6 @@ +#!/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 + +# shellcheck source=../common/linux/disable-ntp_linux.sh +source "${BASH_SOURCE%/*}/../common/linux/disable-ntp_linux.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/02-remove-apport.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/02-remove-apport.sh new file mode 100644 index 00000000000..879f3ffb402 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/02-remove-apport.sh @@ -0,0 +1,6 @@ +#!/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 + +# shellcheck source=../common/linux/remove-apport.sh +source "${BASH_SOURCE%/*}/../common/linux/remove-apport.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/02-remove-update_notifier.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/02-remove-update_notifier.sh new file mode 100644 index 00000000000..f4a5119fda2 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/02-remove-update_notifier.sh @@ -0,0 +1,6 @@ +#!/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 + +# shellcheck source=../common/linux/remove-update_notifier.sh +source "${BASH_SOURCE%/*}/../common/linux/remove-update_notifier.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/03-install-nodejs.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/03-install-nodejs.sh new file mode 100644 index 00000000000..07121a361d7 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/03-install-nodejs.sh @@ -0,0 +1,6 @@ +#!/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 + +# shellcheck source=../common/linux/install-nodejs.sh +source "${BASH_SOURCE%/*}/../common/linux/install-nodejs.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/03-mount-vcpkg-cache-drive.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/03-mount-vcpkg-cache-drive.sh new file mode 100644 index 00000000000..ed49b3a5418 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/03-mount-vcpkg-cache-drive.sh @@ -0,0 +1,8 @@ +#!/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 + +# shellcheck source=../common/linux/mount-vcpkg-cache-drive.sh +source "${BASH_SOURCE%/*}/../common/linux/mount-vcpkg-cache-drive.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/03-qemu.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/03-qemu.sh new file mode 100644 index 00000000000..5ed06f29120 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/03-qemu.sh @@ -0,0 +1,19 @@ +#!/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 + +set -ex + +# shellcheck source=../common/unix/SetEnvVar.sh +source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" + +# First test using QFont fails if fonts-noto-cjk is installed. This happens because +# running fontcache for that font takes > 5 mins when run on QEMU. Running fc-cache +# doesn't help since host version creates cache for a wrong architecture and running +# armv7 fc-cache segfaults on QEMU. +sudo DEBIAN_FRONTEND=noninteractive apt-get -y remove fonts-noto-cjk + +# Disable QtWayland window decorations, as they cause flakiness when used inside qemu (QTBUG-66173) +qemu_env="QT_WAYLAND_DISABLE_WINDOWDECORATION=1" + +SetEnvVar "QEMU_SET_ENV" "\"${qemu_env}\"" diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/04-libclang-v100-dyn.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/04-libclang-v100-dyn.sh new file mode 100644 index 00000000000..85c261ee879 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/04-libclang-v100-dyn.sh @@ -0,0 +1,6 @@ +#!/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/libclang-v100-dyn.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/04-libclang.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/04-libclang.sh new file mode 100644 index 00000000000..fac8d4e77f9 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/04-libclang.sh @@ -0,0 +1,6 @@ +#!/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/libclang.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/04-yocto.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/04-yocto.sh new file mode 100644 index 00000000000..26430c71dfc --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/04-yocto.sh @@ -0,0 +1,125 @@ +#!/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 + +# This script installs the Yocto toolchain + +set -ex + +# shellcheck source=../common/unix/DownloadURL.sh +source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" +# shellcheck source=../common/unix/SetEnvVar.sh +source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" + +primaryBaseUrlPath="http://ci-files01-hki.ci.qt.io/input/boot2qt/gatesgarth" +altBaseUrlPath="http://download.qt.io/development_releases/prebuilt/boot2qt/gatesgarth" + +echo "Installing Yocto toolchain for 32-bit b2qt ARMV7..." + +versionARM="3.2" +package="b2qt-x86_64-meta-toolchain-b2qt-ci-sdk-qemuarm-a9d5156a.sh" +PrimaryUrl="$primaryBaseUrlPath/$package" +AltUrl="$altBaseUrlPath/$package" +SHA1="f9f7d51656067a1cc9d7ab92ddcddb219886ab22" +yoctoInstaller="/tmp/yocto-toolchain-ARMv7.sh" +yoctoLocationARMv7="/opt/b2qt/$versionARM" +sysrootARMv7="armv7vet2hf-neon-poky-linux-gnueabi" +crosscompileARMv7="sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi-" +envSetupARMv7="environment-setup-$sysrootARMv7" +toolchainFileARMv7="sysroots/x86_64-pokysdk-linux/usr/share/cmake/OEToolchainConfig.cmake" + +DownloadURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$yoctoInstaller" +chmod +x "$yoctoInstaller" + +/bin/bash "$yoctoInstaller" -y -d "$yoctoLocationARMv7" +rm -rf "$yoctoInstaller" + +echo "Installing Yocto toolchain for 64-bit b2qt ARM64..." + +versionARM64="3.2" +package="b2qt-x86_64-meta-toolchain-b2qt-ci-sdk-qemuarm64-a9d5156a.sh" +PrimaryUrl="$primaryBaseUrlPath/$package" +AltUrl="$altBaseUrlPath/$package" +SHA1="f490cbcc4e0d5a87f4e07607a71013aeeabce94a" +yoctoInstaller="/tmp/yocto-toolchain-ARM64.sh" +yoctoLocationARM64="/opt/b2qt/$versionARM64" +sysrootARM64="cortexa57-poky-linux" +crosscompileARM64="sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux-" +envSetupARM64="environment-setup-$sysrootARM64" +toolchainFileARM64="sysroots/x86_64-pokysdk-linux/usr/share/cmake/OEToolchainConfig.cmake" + +DownloadURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$yoctoInstaller" +chmod +x "$yoctoInstaller" + +/bin/bash "$yoctoInstaller" -y -d "$yoctoLocationARM64" +rm -rf "$yoctoInstaller" + +echo "Installing Yocto toolchain for 64-bit b2qt MIPS64..." + +versionMIPS64="3.2" +package="b2qt-x86_64-meta-toolchain-b2qt-ci-sdk-qemumips64-a9d5156a.sh" +PrimaryUrl="$primaryBaseUrlPath/$package" +AltUrl="$altBaseUrlPath/$package" +SHA1="5d3a8bb4384de273937286d275d1dab36f969951" +yoctoInstaller="/tmp/yocto-toolchain-mips64.sh" +yoctoLocationMIPS64="/opt/b2qt/$versionMIPS64" +sysrootMIPS64="mips64r2-poky-linux" +crosscompileMIPS64="sysroots/x86_64-pokysdk-linux/usr/bin/mips64-poky-linux/mips64-poky-linux-" +envSetupMIPS64="environment-setup-$sysrootMIPS64" +toolchainFileMIPS64="sysroots/x86_64-pokysdk-linux/usr/share/cmake/OEToolchainConfig.cmake" + +DownloadURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$yoctoInstaller" +chmod +x "$yoctoInstaller" + +/bin/bash "$yoctoInstaller" -y -d "$yoctoLocationMIPS64" +rm -rf "$yoctoInstaller" + + + +if [ -e "$yoctoLocationARMv7/sysroots/$sysrootARMv7" ] && [ -e "$yoctoLocationARMv7/${crosscompileARMv7}g++" ] && \ + [ -e "$yoctoLocationARMv7/$envSetupARMv7" ] && [ -e "$yoctoLocationARMv7/$toolchainFileARMv7" ] && \ + [ -e "$yoctoLocationARM64/sysroots/$sysrootARM64" ] && [ -e "$yoctoLocationARM64/${crosscompileARM64}g++" ] && \ + [ -e "$yoctoLocationARM64/$envSetupARM64" ] && [ -e "$yoctoLocationARM64/$toolchainFileARM64" ] && \ + [ -e "$yoctoLocationMIPS64/sysroots/$sysrootMIPS64" ] && [ -e "$yoctoLocationMIPS64/${crosscompileMIPS64}g++" ] && \ + [ -e "$yoctoLocationMIPS64/$envSetupMIPS64" ] && [ -e "$yoctoLocationMIPS64/$toolchainFileMIPS64" ]; then + SetEnvVar "QEMUARMV7_TOOLCHAIN_SYSROOT" "$yoctoLocationARMv7/sysroots/$sysrootARMv7" + SetEnvVar "QEMUARMV7_TOOLCHAIN_CROSS_COMPILE" "$yoctoLocationARMv7/$crosscompileARMv7" + SetEnvVar "QEMUARMV7_TOOLCHAIN_ENVSETUP" "$yoctoLocationARMv7/$envSetupARMv7" + SetEnvVar "QEMUARMV7_TOOLCHAIN_FILE" "$yoctoLocationARMv7/$toolchainFileARMv7" + SetEnvVar "QEMUARM64_TOOLCHAIN_SYSROOT" "$yoctoLocationARM64/sysroots/$sysrootARM64" + SetEnvVar "QEMUARM64_TOOLCHAIN_CROSS_COMPILE" "$yoctoLocationARM64/$crosscompileARM64" + SetEnvVar "QEMUARM64_TOOLCHAIN_ENVSETUP" "$yoctoLocationARM64/$envSetupARM64" + SetEnvVar "QEMUARM64_TOOLCHAIN_FILE" "$yoctoLocationARM64/$toolchainFileARM64" + SetEnvVar "QEMUMIPS64_TOOLCHAIN_SYSROOT" "$yoctoLocationMIPS64/sysroots/$sysrootMIPS64" + SetEnvVar "QEMUMIPS64_TOOLCHAIN_CROSS_COMPILE" "$yoctoLocationMIPS64/$crosscompileMIPS64" + SetEnvVar "QEMUMIPS64_TOOLCHAIN_ENVSETUP" "$yoctoLocationMIPS64/$envSetupMIPS64" + SetEnvVar "QEMUMIPS64_TOOLCHAIN_FILE" "$yoctoLocationMIPS64/$toolchainFileMIPS64" +else + echo "Error! Couldn't find installation paths for Yocto toolchain. Aborting provisioning." 1>&2 + exit 1 +fi + +cat << EOB >> ~/versions.txt +Yocto ARMv7 toolchain = $versionARM +Yocto ARM64 toolchain = $versionARM64 +Yocto MIPS64 toolchain = $versionMIPS64 +EOB + +# List qt user in qemu toolchain sysroots +sudo sh -c "grep ^qt /etc/passwd >> $yoctoLocationARMv7/sysroots/$sysrootARMv7/etc/passwd" +sudo sh -c "grep ^qt /etc/group >> $yoctoLocationARMv7/sysroots/$sysrootARMv7/etc/group" +sudo sh -c "grep ^qt /etc/passwd >> $yoctoLocationARM64/sysroots/$sysrootARM64/etc/passwd" +sudo sh -c "grep ^qt /etc/group >> $yoctoLocationARM64/sysroots/$sysrootARM64/etc/group" + +# Fix mdns to support both docker and network tests +# See also https://bugreports.qt.io/browse/QTBUG-106013 +sudo sh -c "sed -i '/^hosts:/s/.*/hosts: files myhostname mdns_minimal [NOTFOUND=return] dns mdns4/' $yoctoLocationARMv7/sysroots/$sysrootARMv7/etc/nsswitch.conf" +sudo sh -c "sed -i '/^hosts:/s/.*/hosts: files myhostname mdns_minimal [NOTFOUND=return] dns mdns4/' $yoctoLocationARM64/sysroots/$sysrootARM64/etc/nsswitch.conf" + +# Install qemu binfmt for 32bit and 64bit arm architectures +sudo update-binfmts --package qemu-arm --install arm $yoctoLocationARMv7/sysroots/x86_64-pokysdk-linux/usr/bin/qemu-arm \ +--magic "\x7f\x45\x4c\x46\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00" \ +--mask "\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff" +sudo update-binfmts --package qemu-aarch64 --install aarch64 $yoctoLocationARM64/sysroots/x86_64-pokysdk-linux/usr/bin/qemu-aarch64 \ +--magic "\x7f\x45\x4c\x46\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xb7\x00" \ +--mask "\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff" diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/08-integrity.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/08-integrity.sh new file mode 100644 index 00000000000..0e8dbb392a3 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/08-integrity.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash +# 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 + +set -ex + +# shellcheck source=../common/linux/integrity.sh +source "${BASH_SOURCE%/*}/../common/linux/integrity.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/20-sccache.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/20-sccache.sh new file mode 100644 index 00000000000..b371d947924 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/20-sccache.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +source "${BASH_SOURCE%/*}/../common/linux/sccache.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/22-mqtt_broker.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/22-mqtt_broker.sh new file mode 100644 index 00000000000..b0791cb18f8 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/22-mqtt_broker.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash +# Copyright (C) 2018 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/mqtt_broker.sh +source "${BASH_SOURCE%/*}/../common/unix/mqtt_broker.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/30-fbx.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/30-fbx.sh new file mode 100644 index 00000000000..16a9bda85d9 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/30-fbx.sh @@ -0,0 +1,8 @@ +#!/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 + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/linux/fbx_linux.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/30-install-conan.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/30-install-conan.sh new file mode 100644 index 00000000000..d24cb24282f --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/30-install-conan.sh @@ -0,0 +1,8 @@ +#!/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 + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/unix/install-conan.sh" "linux" "--break-system-packages" diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/30-install_icu.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/30-install_icu.sh new file mode 100644 index 00000000000..260dc55a938 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/30-install_icu.sh @@ -0,0 +1,48 @@ +#!/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 + +# shellcheck source=../common/unix/DownloadURL.sh +source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" + +set -ex + +# This script will install ICU + +icuVersion="73.2" +icuLocationLib="/opt/icu/lib64" +icuLocationInclude="/opt/icu/include" +sha1="5699987afcceb0390e52fb860bb3b4ab8b39cabe" +baseBinaryPackageURL="http://ci-files01-hki.ci.qt.io/input/icu/$icuVersion/icu-linux-g++-Ubuntu22.04-x64.7z" +baseBinaryPackageExternalURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Ubuntu22.04-x64.7z" + +sha1Dev="6b9da2fa5fd88db88e9957ee5e3cf9dbcd08fe6b" +develPackageURL="http://ci-files01-hki.ci.qt.io/input/icu/$icuVersion/icu-linux-g++-Ubuntu22.04-x64-devel.7z" +develPackageExternalURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Ubuntu22.04-x64-devel.7z" + +echo "Installing custom ICU $icuVersion $sha1 packages on CentOS to $icuLocationLib" + +targetFile=$(mktemp) +sudo mkdir -p "$icuLocationLib" +sudo mkdir -p "$icuLocationInclude" +DownloadURL "$baseBinaryPackageURL" "$baseBinaryPackageExternalURL" "$sha1" "$targetFile" +sudo 7z x -y -o$icuLocationLib "$targetFile" +sudo rm "$targetFile" + +echo "Installing custom ICU devel packages on CentOS" + +tempDir=$(mktemp -d) + +targetFile=$(mktemp) +DownloadURL "$develPackageURL" "$develPackageExternalURL" "$sha1Dev" "$targetFile" +7z x -y -o"$tempDir" "$targetFile" + +sudo cp -a "$tempDir"/lib/* "$icuLocationLib" +sudo cp -a "$tempDir"/* /opt/icu/ + +sudo rm "$targetFile" +sudo rm -fr "$tempDir" + +sudo /sbin/ldconfig + +echo "ICU = $icuVersion" >> ~/versions.txt diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/35-install-breakpad.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/35-install-breakpad.sh new file mode 100644 index 00000000000..8a9dde56be4 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/35-install-breakpad.sh @@ -0,0 +1,8 @@ +#!/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 + +# shellcheck source=../common/unix/install-breakpad.sh +source "${BASH_SOURCE%/*}/../common/unix/install-breakpad.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/40-android_linux.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/40-android_linux.sh new file mode 100644 index 00000000000..2526bc6d3ee --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/40-android_linux.sh @@ -0,0 +1,8 @@ +#!/bin/bash +# 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 + +set -ex + +# shellcheck source=../common/linux/android_linux.sh +source "${BASH_SOURCE%/*}/../common/linux/android_linux.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/40-install-cmake.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/40-install-cmake.sh new file mode 100644 index 00000000000..a418e4c5452 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/40-install-cmake.sh @@ -0,0 +1,7 @@ +#!/bin/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/linux/cmake_linux.sh" + diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/41-install-vcpkg.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/41-install-vcpkg.sh new file mode 100644 index 00000000000..aa88364d005 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/41-install-vcpkg.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +set -ex + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/linux/install-vcpkg.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/42-install-vcpkg-ports.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/42-install-vcpkg-ports.sh new file mode 100644 index 00000000000..71a46f9a4e6 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/42-install-vcpkg-ports.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +set -ex + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/linux/install-vcpkg-ports.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/45-install-cpdb.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/45-install-cpdb.sh new file mode 100644 index 00000000000..40497ee0a89 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/45-install-cpdb.sh @@ -0,0 +1,13 @@ +#!/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 cpdb from sources. +# Requires GCC and Perl to be in PATH. +set -ex + +# Install the dependencies +sudo apt install -y make autoconf autopoint libglib2.0-dev libdbus-1-dev libtool + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/linux/install-cpdb.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/50-openssl_for_android_linux.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/50-openssl_for_android_linux.sh new file mode 100644 index 00000000000..fd1151d97e5 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/50-openssl_for_android_linux.sh @@ -0,0 +1,8 @@ +#!/bin/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 + +set -ex + +# shellcheck source=../common/unix/openssl_for_android.sh +source "${BASH_SOURCE%/*}/../common/unix/openssl_for_android.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/60-install_protobuf.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/60-install_protobuf.sh new file mode 100644 index 00000000000..3e2b8921878 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/60-install_protobuf.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash +# Copyright (C) 2018 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/install_protobuf.sh +source "${BASH_SOURCE%/*}/../common/unix/install_protobuf.sh" + diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/61-install_grpc.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/61-install_grpc.sh new file mode 100644 index 00000000000..ecd6a51f230 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/61-install_grpc.sh @@ -0,0 +1,9 @@ +#!/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 + +set -ex + +# shellcheck source=../common/unix/install_grpc.sh +source "${BASH_SOURCE%/*}/../common/unix/install_grpc.sh" + diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/70-install_QemuGA.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/70-install_QemuGA.sh new file mode 100644 index 00000000000..9a80fc0b8cc --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/70-install_QemuGA.sh @@ -0,0 +1,10 @@ +#!/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 installs QEMU Guest Agent + +set -ex + +sudo apt -y install qemu-guest-agent +sudo systemctl start qemu-guest-agent diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/70-qnx710.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/70-qnx710.sh new file mode 100644 index 00000000000..08eeb57bb60 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/70-qnx710.sh @@ -0,0 +1,13 @@ +#!/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 + +set -ex + +# shellcheck source=../common/linux/qnx_710.sh +source "${BASH_SOURCE%/*}/../common/linux/qnx_710.sh" + +# setup NFS +sudo bash -c "echo '/home/qt/work ${qemuNetwork}/24(rw,sync,root_squash,no_subtree_check,anonuid=1000,anongid=1000)' >> /etc/exports" +sudo exportfs -a +sudo systemctl restart nfs-kernel-server diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/70-vxworks.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/70-vxworks.sh new file mode 100644 index 00000000000..3bb48d11cb0 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/70-vxworks.sh @@ -0,0 +1,8 @@ +#!/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 + +set -ex + +# shellcheck source=../common/linux/vx_works.sh +source "${BASH_SOURCE%/*}/../common/linux/vx_works.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/80-docker.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/80-docker.sh new file mode 100644 index 00000000000..049e61f61d3 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/80-docker.sh @@ -0,0 +1,59 @@ +#!/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 -e + +PROVISIONING_DIR="$(dirname "$0")/../" +# shellcheck source=../common/unix/common.sourced.sh +source "$PROVISIONING_DIR"/common/unix/common.sourced.sh +# shellcheck source=../common/unix/DownloadURL.sh +source "$PROVISIONING_DIR"/common/unix/DownloadURL.sh + +localRepo=http://ci-files01-hki.ci.qt.io/input/docker +# upstreamRepo=https://download.docker.com/linux/ubuntu/dists/bionic/pool/stable/amd64 +#upstreamRepo=https://download.docker.com/linux/ubuntu/dists/jammy/pool/stable/amd64 +upstreamRepo=https://download.docker.com/linux/ubuntu/dists/noble/pool/stable/amd64 +echo ' + 57c62933ad2dc07a3a79efd5b464ea84fa80c773 containerd.io_1.6.31-1_amd64.deb + cbcd536345e052b9221a0240caa451e1b687a05e docker-ce_26.1.0-1~ubuntu.24.04~noble_amd64.deb + 6f0989763692b88b748444174e70b6069c781533 docker-ce-cli_26.1.0-1~ubuntu.24.04~noble_amd64.deb +' \ + | xargs -n2 | while read -r sha f +do + DownloadURL "$localRepo/$f" "$upstreamRepo/$f" "$sha" +done + +sudo apt-get -y install ./containerd.io_*.deb ./docker-ce_*.deb ./docker-ce-cli_*.deb +rm -f ./containerd.io_*.deb ./docker-ce_*.deb ./docker-ce-cli_*.deb + +sudo usermod -a -G docker "$USER" +sudo docker --version + +# Download and install the docker-compose extension from https://github.com/docker/compose/releases +f=docker-compose-$(uname -s)-$(uname -m) +DownloadURL \ + "$localRepo/$f-1.24.1" \ + "https://github.com/docker/compose/releases/download/1.24.1/$f" \ + cfb3439956216b1248308141f7193776fcf4b9c9b49cbbe2fb07885678e2bb8a +sudo install -m 755 ./docker-compose* /usr/local/bin/docker-compose +sudo docker-compose --version +rm ./docker-compose* + +# Install Avahi to discover Docker containers in the test network +sudo apt-get install avahi-daemon -y + +# Add registry mirror for docker images +sudo tee -a /etc/docker/daemon.json <<"EOF" +{ + "registry-mirrors": ["http://repo-clones.ci.qt.io:5000/"] +} +EOF + +echo "Restart Docker" +sudo systemctl daemon-reload +sudo systemctl restart docker + +# Start testserver provisioning +sudo "$(readlink -f "$(dirname "${BASH_SOURCE[0]}")")/../common/shared/testserver/docker_testserver.sh" + diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/81-fix_mdns_docker_resolution.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/81-fix_mdns_docker_resolution.sh new file mode 100644 index 00000000000..30fe71ca198 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/81-fix_mdns_docker_resolution.sh @@ -0,0 +1,15 @@ +#!/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 + +# The new version of libnss-mdns resolver library automatically rejects all +# hostnames with more than two labels (i.e. subdomains deep), for example +# vsftpd.test-net.qt.local is automatically rejected. The changes here fix +# this, see also https://github.com/lathiat/nss-mdns#etcmdnsallow + +cat < /dev/null; then + sudo 7zr x "$zip" "-o$destination/" +else + sudo 7z x "$zip" "-o$destination/" +fi +sudo chown -R qt:users "$destination" +rm -rf "$zip" + +echo -e "qdoc = $version\nqtattributionsscanner = $version" >> ~/versions.txt diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/90-bootstrap-autostart.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/90-bootstrap-autostart.sh new file mode 100644 index 00000000000..1ff4385064d --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/90-bootstrap-autostart.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +source "${BASH_SOURCE%/*}/../common/linux/bootstrap-autostart.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 new file mode 100644 index 00000000000..61da9b7b3a4 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/90-install-ffmpeg.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux" diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/90-mimer.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/90-mimer.sh new file mode 100644 index 00000000000..f06ca1c84f3 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/90-mimer.sh @@ -0,0 +1,8 @@ +#!/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 + +set -ex + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/linux/mimersql.sh" "openssl-3" "deb" diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/90-squish.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/90-squish.sh new file mode 100644 index 00000000000..f803ccc1fa1 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/90-squish.sh @@ -0,0 +1,6 @@ +#!/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" + diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/91-squish-coco.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/91-squish-coco.sh new file mode 100644 index 00000000000..e42a53730fd --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/91-squish-coco.sh @@ -0,0 +1,6 @@ +#!/bin/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 + +# shellcheck source=../common/linux/squish-coco.sh +source "${BASH_SOURCE%/*}/../common/linux/squish-coco.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/92-sbuild.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/92-sbuild.sh new file mode 100644 index 00000000000..d538d7837b7 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/92-sbuild.sh @@ -0,0 +1,57 @@ +#!/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 + +# Setups sbuild environment + +tee ~/.sbuildrc << EOF +############################################################################## +# PACKAGE BUILD RELATED (additionally produce _source.changes) +############################################################################## +# -d +\$distribution = 'stable'; +# -A +\$build_arch_all = 1; +# -s +\$build_source = 1; +# -v +\$verbose = 1; +# parallel build +\$ENV{'DEB_BUILD_OPTIONS'} = 'parallel=8'; +############################################################################## +# POST-BUILD RELATED (turn off functionality by setting variables to 0) +############################################################################## +\$run_lintian = 1; +\$lintian_opts = ['-i', '-I']; +\$run_piuparts = 0; +\$piuparts_opts = ['--schroot', 'stable-amd64-sbuild', '--no-eatmydata']; +\$run_autopkgtest = 0; +\$autopkgtest_root_args = ''; +\$autopkgtest_opts = [ '--', 'schroot', '%r-%a-sbuild' ]; + +############################################################################## +# PERL MAGIC +############################################################################## +1; +EOF + +# Add user group +sudo sbuild-adduser "$LOGNAME" +newgrp sbuild + +# Create chroot +sudo sbuild-createchroot --include=eatmydata,ccache,gnupg,ca-certificates stable /srv/chroot/stable-amd64 + +# For ubuntu 24.04 +echo "Create chroot for Ubuntu Noble" +## ccache can't be found with Jammy (TODO: but now we have Noble - this should be tested) +sudo sbuild-createchroot --include=eatmydata,gnupg,ca-certificates noble /srv/chroot/noble-amd64 http://archive.ubuntu.com/ubuntu/ +echo "Done creating chroot for Ubuntu Noble" + +# Update chroot. +sudo sbuild-update -udcar stable + + + + + diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/93-axivion-bauhaus-suite.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/93-axivion-bauhaus-suite.sh new file mode 100644 index 00000000000..8cecbbc3788 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/93-axivion-bauhaus-suite.sh @@ -0,0 +1,6 @@ +#!/bin/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 + +# shellcheck source=../common/linux/axivion-bauhaus-suite.sh +source "${BASH_SOURCE%/*}/../common/linux/axivion-bauhaus-suite.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/93-download-files-for-sbuild.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/93-download-files-for-sbuild.sh new file mode 100644 index 00000000000..f2192a4fd4c --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/93-download-files-for-sbuild.sh @@ -0,0 +1,17 @@ +#!/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 + +# Get required deb files for sbuild to build qt debian packages for Ubuntu jammy +mkdir -p /home/qt/debian_packages +cd /home/qt/debian_packages || exit +# Backported cmake 3.24 +wget https://ci-files01-hki.intra.qt.io/input/debian/cmake/amd64-jammy/cmake-3.24-deb.tar.gz +tar xzf cmake-3.24-deb.tar.gz +rm -rf cmake-3.24-deb.tar.gz +# TODO: Adapt this from jammy to noble Ubuntu 24.04: +# get rest of ready made Ubuntu jammy arm debian packages +# so that sbuild can find those + +#wget http://ci-files01-hki.ci.qt.io/input/debian/icu/amd64-jammy/libicu-56.1-qt_56.1-1_amd64.deb +#wget http://ci-files01-hki.ci.qt.io/input/debian/icu/amd64-jammy/libicu-56.1-qt-dev_56.1-1_amd64.deb diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/93-lcov.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/93-lcov.sh new file mode 100644 index 00000000000..de4a74d555f --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/93-lcov.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 + +# Install lcov 2.0 from 24.04/noble numbat + +echo "Installing lcov" +wget https://ci-files01-hki.ci.qt.io/input/lcov/lcov_2.0-4ubuntu1_all.deb +sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y -o DPkg::Lock::Timeout=300 install -f ./lcov_2.0-4ubuntu1_all.deb diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/99-cleanup.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/99-cleanup.sh new file mode 100644 index 00000000000..4d6e16ea2bf --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/99-cleanup.sh @@ -0,0 +1,7 @@ +#!/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 + +set -ex + +"$(dirname "$0")"/../common/linux/cleanup_cache.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/99-enable_test_stacktraces.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/99-enable_test_stacktraces.sh new file mode 100644 index 00000000000..600b7850b25 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/99-enable_test_stacktraces.sh @@ -0,0 +1,8 @@ +#!/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 + +BASEDIR=$(dirname "$0") +"$BASEDIR"/../common/linux/enable_test_stacktraces.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/99-version.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/99-version.sh new file mode 100644 index 00000000000..31821f6b957 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/99-version.sh @@ -0,0 +1,6 @@ +#!/bin/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/linux/ubuntu-version.sh" From a604af6991c4c16e3f5d00a46ecb7436adfba4ed Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Thu, 1 Aug 2024 10:08:02 +0200 Subject: [PATCH 106/288] Make offscreen plugin the default one for ubuntu-24.04-arm64-documentation This follows 37ce15a3b09bdc542a3ba5404d52da659137dc52. Change-Id: I8ad866b409d84730edaac1785db9ce599be2844c Reviewed-by: Alexey Edelev (cherry picked from commit 9592341d1a53745f29808eb7c6c1c5b5b2c8f4e7) Reviewed-by: Paul Wicking --- 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 efb22f14a94..5e017f557c4 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -44,7 +44,7 @@ Configurations: Template: 'qtci-linux-Ubuntu-24.04-aarch64-50' Compiler: 'GCC' Features: ['Documentation', 'UseConfigure', 'DoNotRunTests'] - Configure arguments: '-make examples -developer-build -c++std c++20 -linker gold -qtlibinfix TestInfix -qtnamespace TestNamespace' + Configure arguments: '-make examples -developer-build -c++std c++20 -linker gold -qtlibinfix TestInfix -qtnamespace TestNamespace -qpa offscreen\;xcb' Environment variables: ['NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'] - Id: 'ubuntu-24.04-arm64' From 8af8e9081bba4df5b44013f167dc462aaaa81ce2 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 2 Aug 2024 12:08:01 +0200 Subject: [PATCH 107/288] platform_configs: disable glx on offscreen integrations - 2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It's broken in the VMs in our CI. This follows 94a4f06fb88ec6c7fa5e31dfd28af4e9b3cdbdd8 in qtbase. Fixes: QTBUG-126250 Task-number: QTBUG-125446 Change-Id: Id61f3d51cea33a8648aa99941c0dc77b9da5c498 Reviewed-by: Tero Heikkinen Reviewed-by: Simo Fält (cherry picked from commit 397ef196b714e48e4d1ba380f4357655a6ccba24) Reviewed-by: Paul Wicking --- coin/platform_configs/cmake_platforms.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 5e017f557c4..fc9ba797f45 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -64,6 +64,7 @@ Configurations: Features: ['TestOnly', 'InsignificantTests'] Environment variables: [ 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', + 'QT_QPA_OFFSCREEN_NO_GLX=1', 'QT_QPA_PLATFORM=offscreen' ] Platform dependency: 'ubuntu-24.04-arm64-documentation' From 3cc306b68aaab818047ac4a6acabf9561316c556 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Mon, 12 Aug 2024 16:40:24 +0200 Subject: [PATCH 108/288] Disable docker for network auto tests on Ubuntu 24.04 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit both x64 and arm64. Don't have enough resource to make sure docker setup works fine for new platform now. Task-number: QTBUG-126410 Change-Id: I58de4836af9d7589c1a1db5371c410099e671793 Reviewed-by: Tero Heikkinen Reviewed-by: Tony Sarajärvi (cherry picked from commit adc927b02be41da8596466e9e61bfc4a781f6844) Reviewed-by: Paul Wicking --- coin/platform_configs/cmake_platforms.yaml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index fc9ba797f45..b615214fc38 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -45,7 +45,10 @@ Configurations: Compiler: 'GCC' Features: ['Documentation', 'UseConfigure', 'DoNotRunTests'] Configure arguments: '-make examples -developer-build -c++std c++20 -linker gold -qtlibinfix TestInfix -qtnamespace TestNamespace -qpa offscreen\;xcb' - Environment variables: ['NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'] + Environment variables: [ + 'COMMON_TEST_CMAKE_ARGS=-DQT_SKIP_DOCKER_COMPOSE=ON', + 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}' + ] - Id: 'ubuntu-24.04-arm64' Template: 'qtci-linux-Ubuntu-24.04-aarch64-50' @@ -54,6 +57,7 @@ Configurations: 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 -qpa offscreen\;xcb' Environment variables: [ 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', + 'COMMON_TEST_CMAKE_ARGS=-DQT_SKIP_DOCKER_COMPOSE=ON', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DINPUT_headersclean=ON' ] # Test on Ubuntu 24.04 ARM64 offscreen @@ -86,7 +90,10 @@ Configurations: Compiler: 'GCC' Features: ['Sccache', 'Documentation', 'UseConfigure', 'DoNotRunTests'] Configure arguments: '-make examples -developer-build -c++std c++20 -linker gold -qtlibinfix TestInfix -qtnamespace TestNamespace' - Environment variables: ['NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'] + Environment variables: [ + 'COMMON_TEST_CMAKE_ARGS=-DQT_SKIP_DOCKER_COMPOSE=ON', + 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE' + ] - Id: 'ubuntu-24.04-x64' Template: 'qtci-linux-Ubuntu-24.04-x86_64-50' @@ -95,7 +102,8 @@ Configurations: 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', - 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DINPUT_headersclean=ON' + 'COMMON_TEST_CMAKE_ARGS=-DQT_SKIP_DOCKER_COMPOSE=ON', + 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON' ] # Test on Ubuntu 24.04 x64 X11 - From addf3a0794df433c44c7ae95b77dd9bd4890789c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johanna=20=C3=84ij=C3=A4l=C3=A4?= Date: Fri, 7 Jun 2024 12:36:36 +0300 Subject: [PATCH 109/288] Provisioning: update Java 17 to Ubuntu24.04 x64 Needed by RTA Android tests. Change-Id: Iec5a63f3c81f9758e1910f81508ea775ba30c388 Reviewed-by: Jukka Jokiniva (cherry picked from commit 30443436c46eb91bd0c330088e3832ffb07c6771) Reviewed-by: Paul Wicking --- coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/02-apt.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 704a6097a6f..cf108d72e4d 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 @@ -141,8 +141,8 @@ installPackages+=(libicu-dev) installPackages+=(zlib1g-dev) installPackages+=(zlib1g) installPackages+=(openjdk-8-jdk) -#Java 11 for Android -installPackages+=(openjdk-11-jdk) +#Java 17 for Android, needed by RTA +installPackages+=(openjdk-17-jdk) installPackages+=(libgtk-3-dev) installPackages+=(ninja-build) installPackages+=(libssl-dev) From 8910e907055e6191abda02b301d3c288ad9580dd Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Thu, 22 Aug 2024 22:15:04 +0200 Subject: [PATCH 110/288] Install patchelf in Ubuntu 24.04 x64 This amends ac2a19ab7e9cb2828a6831880e7fe2ae9e5c16d4 . Change-Id: I5124eb5f5860bab7e76689ea84ffb5d284b6eef8 Reviewed-by: Liang Qi --- coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/02-apt.sh | 2 ++ 1 file changed, 2 insertions(+) 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 cf108d72e4d..75b27462a0e 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 @@ -236,6 +236,8 @@ installPackages+=(uml-utilities) # used for reading vcpkg packages version, from vcpkg.json installPackages+=(jq) +installPackages+=(patchelf) + echo "Running update for apt" waitLoop sudo apt-get update From 1e38bd21bdcfd3db2eb5ce595d7856e6d591babe Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Mon, 5 Aug 2024 08:40:02 +0200 Subject: [PATCH 111/288] platform_configs: drop the offscreen documentation build We still have one offscreen build(non-dev). Change-Id: Ib0a4314387bc4388e75cb6dc65c220e167980805 Reviewed-by: Jukka Jokiniva (cherry picked from commit a9b9ebd2de29184f9b121b31c61395f67176e5ea) Reviewed-by: Paul Wicking --- coin/platform_configs/cmake_platforms.yaml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index b615214fc38..b92976382c3 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -61,17 +61,6 @@ Configurations: 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DINPUT_headersclean=ON' ] # Test on Ubuntu 24.04 ARM64 offscreen -- - Id: 'ubuntu-24.04-arm64-documentation-offscreen-tests' - Template: 'qtci-linux-Ubuntu-24.04-aarch64-50' - Compiler: 'GCC' - Features: ['TestOnly', 'InsignificantTests'] - Environment variables: [ - 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', - 'QT_QPA_OFFSCREEN_NO_GLX=1', - 'QT_QPA_PLATFORM=offscreen' - ] - Platform dependency: 'ubuntu-24.04-arm64-documentation' - Id: 'ubuntu-24.04-arm64-offscreen-tests' Template: 'qtci-linux-Ubuntu-24.04-aarch64-50' From 52322049bee9966f0d0d552437c5a12fa1a5a320 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 14 Jun 2024 09:32:48 +0200 Subject: [PATCH 112/288] coin: force qtbase tests for offscreen on linux arm64 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-6112 Task-number: QTBUG-125446 Change-Id: Id88e0b7717fdbd86fc001809073c491aaa669d61 Reviewed-by: Tero Heikkinen Reviewed-by: Simo Fält Reviewed-by: Liang Qi (cherry picked from commit 18be2625a0e22ab5bb3080fa138a01e952f01f27) Reviewed-by: Qt Cherry-pick Bot --- .../qtbase-linux-arm64-offscreen.yaml | 26 +++++++++++++++++++ coin/platform_configs/qtbase.yaml | 1 + 2 files changed, 27 insertions(+) create mode 100644 coin/platform_configs/qtbase-linux-arm64-offscreen.yaml diff --git a/coin/platform_configs/qtbase-linux-arm64-offscreen.yaml b/coin/platform_configs/qtbase-linux-arm64-offscreen.yaml new file mode 100644 index 00000000000..6b19d35ce4d --- /dev/null +++ b/coin/platform_configs/qtbase-linux-arm64-offscreen.yaml @@ -0,0 +1,26 @@ +Version: 2 +Configurations: +# Test on Ubuntu 24.04 ARM64 offscreen +- + Id: 'ubuntu-24.04-arm64-offscreen-qtbase-tests' + Template: 'qtci-linux-Ubuntu-24.04-aarch64-50' + Compiler: 'GCC' + Features: ['TestOnly'] + Environment variables: [ + 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', + 'QT_QPA_OFFSCREEN_NO_GLX=1', + 'QT_QPA_PLATFORM=offscreen' + ] + Platform dependency: 'ubuntu-24.04-arm64' +# Test on Debian-11.6 offscreen +- + Id: 'debian-11.6-arm64-offscreen-qtbase-tests' + Template: 'qtci-linux-Debian-11.6-aarch64-50' + Compiler: 'GCC' + Features: ['Sccache', 'TestOnly'] + Environment variables: [ + 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', + 'QT_QPA_OFFSCREEN_NO_GLX=1', + 'QT_QPA_PLATFORM=offscreen' + ] + Platform dependency: 'debian-11.6-arm64' diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml index f9acdea8d71..2d986380d67 100644 --- a/coin/platform_configs/qtbase.yaml +++ b/coin/platform_configs/qtbase.yaml @@ -9,6 +9,7 @@ Include: [ wasm_qtbase_tests.yaml, cmake_platforms_qemu_vxworks_buildtest.yaml, qtlite.yaml, + qtbase-linux-arm64-offscreen.yaml, qtbase-new-compiler-testing.yaml ] Configurations: [] From 9d623692a8c9f6d35160510504d157b497b78a28 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 27 Aug 2024 15:43:43 +0200 Subject: [PATCH 113/288] CMake: Provision llvm-mingw for latest Windowss 11 23H2 image It was previously missed, and thus qdoc wasn't built for the windows-11_23H2-llvm Packaging configuration. Amends 9975595a5e74e2abc38e4d721d5cd2740e814cf2 Pick-to: 6.7 Fixes: QTBUG-121548 Task-number: QTBUG-111580 Change-Id: I1142b593f36c8366ceaeac91eba81e16f1a2557d Reviewed-by: Alexey Edelev (cherry picked from commit 8aa15db27fc81666746c6565b0989de8b03b72b9) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/qtci-windows-11_23H2-x86_64/08-libclang.ps1 | 1 + 1 file changed, 1 insertion(+) 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 7681f01a44e..88247275d9b 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,3 +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 From 3974ea45d269b90a0768267ce1fed4cdf0581238 Mon Sep 17 00:00:00 2001 From: Jukka Jokiniva Date: Thu, 1 Aug 2024 13:55:05 +0300 Subject: [PATCH 114/288] Make build phase blocking for qemu-arm64/arm7-developer-builds MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-6266 Change-Id: I3a7fc89518e71d0bf580a6abd6876b7b1d292a16 Reviewed-by: Simo Fält (cherry picked from commit 86529cd5bc58359c50425a2b81ba0fad4a01962c) Reviewed-by: Jukka Jokiniva Reviewed-by: Paul Wicking --- coin/platform_configs/cmake_platforms_qemu.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/platform_configs/cmake_platforms_qemu.yaml b/coin/platform_configs/cmake_platforms_qemu.yaml index d876f6092ba..f39a325c2ce 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: ['Sccache', 'UseConfigure', 'Insignificant'] + Features: ['Sccache', 'UseConfigure', 'InsignificantTests'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-release -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: ['Sccache', 'UseConfigure', 'Insignificant'] + Features: ['Sccache', 'UseConfigure', 'InsignificantTests'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-release -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', From 0e0732df1d203bfaba879ad0dca86755f4253c7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johanna=20=C3=84ij=C3=A4l=C3=A4?= Date: Tue, 2 Jul 2024 22:05:31 +0300 Subject: [PATCH 115/288] Provisioning: Update Squish 8.0.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add Squish provisioning to linux on arm and windows on arm machines also. Pick-to: 6.7 Change-Id: I52f0e8fc4931efd7c7fcf36c555cbae76e2f347b Reviewed-by: Simo Fält (cherry picked from commit 29194b8803ab5ae5be5275d57b2a72c0236138f1) Reviewed-by: Qt Cherry-pick Bot --- .../provisioning/common/unix/squishInstall.sh | 28 +++++++++---------- .../common/windows/squishInstall.ps1 | 6 ++-- .../90-squish.sh | 6 ++++ .../90-squish.sh | 6 ++++ .../90-squish.sh | 6 ++++ .../90-squish.ps1 | 1 + 6 files changed, 35 insertions(+), 18 deletions(-) create mode 100644 coin/provisioning/qtci-linux-Debian-11.6-aarch64/90-squish.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-22.04-aarch64/90-squish.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/90-squish.sh create mode 100644 coin/provisioning/qtci-windows-11_22H2-aarch64/90-squish.ps1 diff --git a/coin/provisioning/common/unix/squishInstall.sh b/coin/provisioning/common/unix/squishInstall.sh index 0195d84af84..5f9dc48b0c8 100755 --- a/coin/provisioning/common/unix/squishInstall.sh +++ b/coin/provisioning/common/unix/squishInstall.sh @@ -2,16 +2,17 @@ # 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 -# shellcheck source=./DownloadURL.sh +PROVISIONING_DIR="$(dirname "$0")/../../" source "${BASH_SOURCE%/*}/DownloadURL.sh" +source "$PROVISIONING_DIR"/common/unix/common.sourced.sh 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="7.2.1" -qtBranch="66x" +version="8.0.0" +qtBranch="67x" installFolder="/opt" squishFolder="$installFolder/squish" preBuildCacheUrl="ci-files01-hki.ci.qt.io:/hdd/www/input/squish/jenkins_build/stable" @@ -22,11 +23,16 @@ licenseSHA="e84b499a2011f9bb1a6eefc7b2338d7ae770927a" testSuiteUrl="ci-files01-hki.ci.qt.io:/hdd/www/input/squish/coin/suite_test_squish" testSuiteLocal="/tmp/squish_test_suite" if uname -a |grep -q Darwin; then - compressedFolder="prebuild-squish-$version-$qtBranch-mac.tar.gz" - sha1="7467c974b65255c86b8fccaeca90e0590d4f7c96" + compressedFolder="prebuild-squish-$version-$qtBranch-mac-x64.tar.gz" + sha1="8ae422b44af9b8e5f0d15cdca08df99973b8699a" else - compressedFolder="prebuild-squish-$version-$qtBranch-linux64.tar.gz" - sha1="950a6035c777c8ce0a50a0b3ad468044d07f898b" + if [ "$PROVISIONING_ARCH" = arm64 ] ; then + compressedFolder="prebuild-squish-$version-$qtBranch-linux-arm64.tar.gz" + sha1="06d542579271f88b1527d6ddca2bfd4eaf2dade5" + else + compressedFolder="prebuild-squish-$version-$qtBranch-linux-x64.tar.gz" + sha1="db5c48f359b46a460551cdf9362c63f557cbc04f" + fi fi mountFolder="/tmp/squish" @@ -69,14 +75,6 @@ if uname -a |grep -q Darwin; then sudo xattr -r -c "$squishFolder" fi -if uname -a |grep -q "Ubuntu"; then - if [ ! -e "/usr/lib/tcl8.6" ]; then - sudo mkdir /usr/lib/tcl8.6 - #this needs to be copied only to squish_for_qt65 - sudo cp "$squishFolder/squish_for_qt66/tcl/lib/tcl8.6/init.tcl" /usr/lib/tcl8.6/ - fi -fi - echo "Download Squish license" DownloadURL "$licenseUrl" "$licenseUrl" "$licenseSHA" "$HOME/$licenseFile" diff --git a/coin/provisioning/common/windows/squishInstall.ps1 b/coin/provisioning/common/windows/squishInstall.ps1 index ec4d240a273..4766d2e964b 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 = "7.2.1" -$qtBranch = "66x" +$version = "8.0.0" +$qtBranch = "67x" $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 = "eed4ed4936fbbacb11e0d8a00ff190e1ea808eeb" + $sha1 = "0f863c261f854ec38032815298f5636e99779bff" } } 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 new file mode 100644 index 00000000000..f803ccc1fa1 --- /dev/null +++ b/coin/provisioning/qtci-linux-Debian-11.6-aarch64/90-squish.sh @@ -0,0 +1,6 @@ +#!/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" + 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 new file mode 100644 index 00000000000..f803ccc1fa1 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-22.04-aarch64/90-squish.sh @@ -0,0 +1,6 @@ +#!/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" + diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/90-squish.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/90-squish.sh new file mode 100644 index 00000000000..f803ccc1fa1 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/90-squish.sh @@ -0,0 +1,6 @@ +#!/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" + diff --git a/coin/provisioning/qtci-windows-11_22H2-aarch64/90-squish.ps1 b/coin/provisioning/qtci-windows-11_22H2-aarch64/90-squish.ps1 new file mode 100644 index 00000000000..ff758845941 --- /dev/null +++ b/coin/provisioning/qtci-windows-11_22H2-aarch64/90-squish.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\squishInstall.ps1" From 8f7410b202f1896ab99177c907b1411330105da0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Fri, 23 Aug 2024 15:20:34 +0200 Subject: [PATCH 116/288] coin: Extend TCC permissions to SSH server and bundled boostrap agent We are experimenting with various ways of running and packaging the bootstrap agent. To support this, let's add the required permissions to both a standalone bootstrap-agent executable, as well as an app bundled version of it, if found. In addition, add the permissions to sshd-keygen-wrapper, which is the responsible process for the SSH server, and any ssh login sessions spawned by that. This serves two purposes. Firstly, this matches the permissions between a coin run (by the bootstrap agent) and what a developer will see when SSH'ing into the CI machine to debug an issue. Secondly, we might use ssh as an entrypoint to run the bootstrap-agent, in which case we need the permissions on sshd-keygen-wrapper anyways, so that they are inherited by the bootstrap-agent. Change-Id: I576349e93ca19d98384490c99102966e8ffe2833 Reviewed-by: Ville-Pekka Karhu (cherry picked from commit 5368f47fe022b1cf6c5eb8a601c79d998f92b3bb) Reviewed-by: Qt Cherry-pick Bot --- .../common/macos/set_tcc_permissions.sh | 109 +++++++++++++----- 1 file changed, 81 insertions(+), 28 deletions(-) diff --git a/coin/provisioning/common/macos/set_tcc_permissions.sh b/coin/provisioning/common/macos/set_tcc_permissions.sh index 274b01ff2a7..116263fac80 100755 --- a/coin/provisioning/common/macos/set_tcc_permissions.sh +++ b/coin/provisioning/common/macos/set_tcc_permissions.sh @@ -2,38 +2,91 @@ #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 -TCC_DATABASE="$HOME/Library/Application Support/com.apple.TCC/TCC.db" -if touch "$TCC_DATABASE"; then - # We can write to the TCC database - BOOTSTRAP_AGENT="$HOME/bootstrap-agent" - REQ_STR=$(codesign -d -r- "$BOOTSTRAP_AGENT" 2>&1 | awk -F ' => ' '/designated/{print $2}') - REQ_HEX=$(echo "$REQ_STR" | csreq -r- -b >(xxd -p | tr -d '\n')) +set -e - SERVICES=() +# ------ Clients ------ - # Qt Multimedia tests need microphone access - SERVICES+=('kTCCServiceMicrophone') +TCC_CLIENTS=() - # Qt Connectivity tests need Bluetooth access - SERVICES+=('kTCCServiceBluetoothAlways') +# The original path to bootstrap-agent +if [[ -x "$HOME/bootstrap-agent" ]]; then + TCC_CLIENTS+=("$HOME/bootstrap-agent") +fi + +# The app-bundle version of the agent, in case we install it like that +if [[ -d "$HOME/bootstrap-agent.app" ]]; then + TCC_CLIENTS+=("$HOME/bootstrap-agent.app") +fi + +# The responsible process for the SSH server. By giving this +# process the permissions we ensure that developers SSH'ing +# into a CI machine will have the same permissions when running +# tests as bootstrap-agent has. This also opens the door to +# running the boostrap agent via SSH, giving the exact same +# environment for interactive developer sessions as coin. +TCC_CLIENTS+=("/usr/libexec/sshd-keygen-wrapper") + +# ------ Services (permissions) ------ + +SERVICES=() + +# Qt Multimedia tests need microphone access +SERVICES+=("kTCCServiceMicrophone|$HOME") + +# Qt Connectivity tests need Bluetooth access +SERVICES+=("kTCCServiceBluetoothAlways|$HOME") + +# ------ Implementation ------ +function add_permission_for_client() { + local client="$1" + local service="$2" + + local path="${service#*|}" + local service="${service%|*}" + + tcc_database="${path%/}/Library/Application Support/com.apple.TCC/TCC.db" + if ! sudo touch "$tcc_database"; then + echo "TCC database is not writable. Is SIP disabled?" >&2 + exit 1 + fi + + if [[ -d "$client" && "${client%/}" == *.app ]]; then + info_plist="$client/Contents/Info.plist" + executable=$(defaults read $info_plist CFBundleExecutable) + executable="$client/Contents/MacOS/$executable" + client=$(defaults read $info_plist CFBundleIdentifier) + client_type="0" # Bundle ID + elif [[ -x "$client" ]]; then + executable=$client + client_type="1" # Absolute path + else + echo "Unknown or missing TCC client type '$client'!" >&2 + exit 1 + fi + + local req_str=$(codesign -d -r- "$executable" 2>&1 | awk -F ' => ' '/designated/{print $2}') + local req_hex=$(echo "$req_str" | csreq -r- -b >(xxd -p | tr -d '\n')) + + sudo sqlite3 -echo "$tcc_database" <&2 - exit 1 -fi +done From 6a340438f846ccd165350c7c6786cb4059014029 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Fri, 23 Aug 2024 15:21:19 +0200 Subject: [PATCH 117/288] coin: Add kTCCServiceScreenCapture permission to ssh/bootstrap-agent The screen capture permission might be useful for Qt Multimedia, and also allows us to do screen capturing of the state of the VM in case of test failures. For macOS 15 we need to work around the monthly nagging that an app has permission to capture the screen, otherwise this popup may interfere with test runs. Change-Id: I0398488c78b19a85ba527b780b264e0b915b6024 Reviewed-by: Ville-Pekka Karhu (cherry picked from commit 3a5f7bb8d834ad78cfe81b3484b7c22c4caab43d) Reviewed-by: Qt Cherry-pick Bot --- .../common/macos/set_tcc_permissions.sh | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/coin/provisioning/common/macos/set_tcc_permissions.sh b/coin/provisioning/common/macos/set_tcc_permissions.sh index 116263fac80..fa9994d5b35 100755 --- a/coin/provisioning/common/macos/set_tcc_permissions.sh +++ b/coin/provisioning/common/macos/set_tcc_permissions.sh @@ -36,6 +36,11 @@ SERVICES+=("kTCCServiceMicrophone|$HOME") # Qt Connectivity tests need Bluetooth access SERVICES+=("kTCCServiceBluetoothAlways|$HOME") +# Qt Multimedia might need screen capture, and it can +# also be useful for capturing the state of the VM when +# a test fails. +SERVICES+=("kTCCServiceScreenCapture|/") + # ------ Implementation ------ function add_permission_for_client() { @@ -81,6 +86,21 @@ function add_permission_for_client() { 0 -- flags ); EOF + + if [[ "$service" == "kTCCServiceScreenCapture" ]]; then + # macOS 15 will nag the user every month about applications + # that are permitted to capture the screen. We don't want this + # popup to come in the way of tests, so we manually extend + # the permission. + replayd_dir="$HOME/Library/Group Containers/group.com.apple.replayd" + mkdir -p "$replayd_dir" + approvals_file="$replayd_dir/ScreenCaptureApprovals.plist" + if [[ ! -f $approvals_file ]]; then + plutil -create xml1 "$approvals_file" + fi + key=${executable//\./\\.} + plutil -replace "$key" -date "2100-01-01T00:00:00Z" "$approvals_file" + fi } # shellcheck disable=SC2043 From e1718735144139ec34c1eaf95d5cb8964443fb07 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Thu, 29 Aug 2024 09:59:48 +0200 Subject: [PATCH 118/288] platform_configs: move QtLite to Ubuntu 24.04 arm64 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I447116f31f0f555d2ee41ae2f32332da07353c37 Reviewed-by: Simo Fält Reviewed-by: Jari Helaakoski (cherry picked from commit b153b3860e9091ab0e516e903af333ee30df2d98) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/qtlite.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/platform_configs/qtlite.yaml b/coin/platform_configs/qtlite.yaml index 9724ac601c1..3cd2f8b3241 100644 --- a/coin/platform_configs/qtlite.yaml +++ b/coin/platform_configs/qtlite.yaml @@ -1,8 +1,8 @@ Version: 2 Configurations: - - Id: 'debian-11.6-static-qtlite-arm64' - Template: 'qtci-linux-Debian-11.6-aarch64-50' + Id: 'ubuntu-24.04-arm64-static-qtlite' + Template: 'qtci-linux-Ubuntu-24.04-aarch64-50' Compiler: 'GCC' Features: ['UseConfigure', 'DoNotRunTests', 'MinimalStaticTests'] Configure arguments: > From 9bc2004e5cff31a0a621123920e78149d3edbf69 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 23 Aug 2024 09:59:33 +0200 Subject: [PATCH 119/288] platform_configs: remove InsignificantTests for u2404 arm64 offscreen Change-Id: I9c92566f59e3e6b651c86c5652b6acf12e2b74eb Reviewed-by: Jani Heikkinen Reviewed-by: Liang Qi (cherry picked from commit 420b779335d18da9074ac0f192a668a5dd68739b) 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 b92976382c3..a438abb7b25 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -65,7 +65,7 @@ Configurations: Id: 'ubuntu-24.04-arm64-offscreen-tests' Template: 'qtci-linux-Ubuntu-24.04-aarch64-50' Compiler: 'GCC' - Features: ['TestOnly', 'InsignificantTests'] + Features: ['TestOnly'] Environment variables: [ 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', 'QT_QPA_OFFSCREEN_NO_GLX=1', From ccca79aa5ec39e122cd806c37586b60d1cfe54a4 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 30 Aug 2024 10:50:27 +0200 Subject: [PATCH 120/288] platform_configs: drop 3 tests configs on debian-11 arm64 Change-Id: Ie9981ec2760780779a328370acb81fdb664e71a1 Reviewed-by: Jani Heikkinen (cherry picked from commit a32af8a106f39ccd767fec15fe0ae82ff3b0e423) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/cmake_platforms.yaml | 12 ------------ coin/platform_configs/qt5.yaml | 12 +----------- coin/platform_configs/qtwayland.yaml | 10 ---------- 3 files changed, 1 insertion(+), 33 deletions(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index a438abb7b25..21d8132859a 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -193,18 +193,6 @@ Configurations: Environment variables: [ 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}', ] -# Test on Debian-11.6 offscreen -- - Id: 'debian-11.6-arm64-offscreen-tests' - Template: 'qtci-linux-Debian-11.6-aarch64-50' - Compiler: 'GCC' - Features: ['Sccache', 'InsignificantTests', 'TestOnly'] - Environment variables: [ - 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', - 'QT_QPA_OFFSCREEN_NO_GLX=1', - 'QT_QPA_PLATFORM=offscreen' - ] - Platform dependency: 'debian-11.6-arm64' - Id: 'ios-universal' Template: 'qtci-macos-13-x86_64-103' diff --git a/coin/platform_configs/qt5.yaml b/coin/platform_configs/qt5.yaml index 512c705138e..7e8e4a89d83 100644 --- a/coin/platform_configs/qt5.yaml +++ b/coin/platform_configs/qt5.yaml @@ -3,14 +3,4 @@ Include: [ cmake_platforms.yaml, address_sanitizer_platforms.yaml ] -Configurations: -# Test on Debian-11.6 Wayland -- - Id: 'debian-11.6-arm64-wayland-tests' - Template: 'qtci-linux-Debian-11.6-aarch64-50' - Compiler: 'GCC' - Features: ['Sccache', 'TestOnly', 'RunDependencyTests', 'InsignificantTests'] - Environment variables: [ - 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY' - ] - Platform dependency: 'debian-11.6-arm64' +Configurations: [] diff --git a/coin/platform_configs/qtwayland.yaml b/coin/platform_configs/qtwayland.yaml index d2781a34044..97373aae4bc 100644 --- a/coin/platform_configs/qtwayland.yaml +++ b/coin/platform_configs/qtwayland.yaml @@ -43,13 +43,3 @@ Configurations: Compiler: 'GCC' Features: ['TestOnly', 'RunDependencyTests', 'InsignificantTests'] Platform dependency: 'ubuntu-24.04-x64' -# Test on Debian-11.6 Wayland -- - Id: 'debian-11.6-arm64-wayland-tests' - Template: 'qtci-linux-Debian-11.6-aarch64-50' - Compiler: 'GCC' - Features: ['Sccache', 'TestOnly', 'RunDependencyTests', 'InsignificantTests'] - Environment variables: [ - 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY' - ] - Platform dependency: 'debian-11.6-arm64' From a24acb5375a63097debb7e6752eaedeb0fcbde4c Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Mon, 2 Sep 2024 13:36:18 +0300 Subject: [PATCH 121/288] Restore WoA cross-compile build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTBUG-128554 Change-Id: I53cd170a1f63299dee0d59ddb92f38e30d214043 Reviewed-by: Simo Fält --- coin/platform_configs/cmake_platforms.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 21d8132859a..b427f91afc1 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -163,6 +163,22 @@ Configurations: 'NON_QTBASE_CMAKE_ARGS= -DFEATURE_clangcpp=OFF -DFEATURE_qdoc=OFF', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', ] +- + Id: 'windows-11_23H2-msvc2022-arm64' + Template: 'qtci-windows-11_23H2-x86_64-53' + Compiler: 'MSVC2022' + Target arch: 'arm64' + Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] + Platform dependency: 'windows-11_23H2-msvc2022' + Environment variables: [ + 'TARGET_CONFIGURE_ARGS=-debug-and-release -force-debug-info -platform win32-arm64-msvc', + '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: 'rhel-8.8' Template: 'qtci-linux-RHEL-8.8-x86_64-50' From e4defad5e2acf11c4851f5a21588c773507cda3d Mon Sep 17 00:00:00 2001 From: Tero Heikkinen Date: Mon, 26 Aug 2024 15:23:10 +0300 Subject: [PATCH 122/288] Provisioning: Build FFmpeg for Windows ARM64 in ARM64 host Install msys2 and FFmpeg for QtMultimedia plugin Task-number: QTBUG-124399 Pick-to: 6.7 Change-Id: Ied2bc1039d9571611666530850c525c35c170c69 Reviewed-by: Artem Dyomin Reviewed-by: Tero Heikkinen (cherry picked from commit 88ce03607354b68ab1da7f0230d13a664cada5e1) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/cmake_platforms.yaml | 2 +- .../common/windows/install-ffmpeg.ps1 | 62 ++++++++++++++----- .../10-install-msys2.ps1 | 1 + .../90-install-ffmpeg.ps1 | 1 + 4 files changed, 50 insertions(+), 16 deletions(-) create mode 100644 coin/provisioning/qtci-windows-11_22H2-aarch64/10-install-msys2.ps1 create mode 100644 coin/provisioning/qtci-windows-11_22H2-aarch64/90-install-ffmpeg.ps1 diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index b427f91afc1..440c9624053 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -160,7 +160,7 @@ Configurations: Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib -no-sql-psql -no-opengl' Environment variables: [ 'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_arm64}}\..', - 'NON_QTBASE_CMAKE_ARGS= -DFEATURE_clangcpp=OFF -DFEATURE_qdoc=OFF', + 'NON_QTBASE_CMAKE_ARGS= -DFEATURE_clangcpp=OFF -DFEATURE_qdoc=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC_ARM64}} -DQT_DEPLOY_FFMPEG=TRUE', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', ] - diff --git a/coin/provisioning/common/windows/install-ffmpeg.ps1 b/coin/provisioning/common/windows/install-ffmpeg.ps1 index 64b514559a5..77f642f3cb5 100644 --- a/coin/provisioning/common/windows/install-ffmpeg.ps1 +++ b/coin/provisioning/common/windows/install-ffmpeg.ps1 @@ -85,6 +85,7 @@ function InstallMingwFfmpeg { function InstallMsvcFfmpeg { Param ( + [string]$hostArch, [bool]$isArm64 ) @@ -98,10 +99,13 @@ function InstallMsvcFfmpeg { $arch = "arm64" $buildSystem += "-arm64" $ffmpegDirEnvVar += "_ARM64" - $config += " --enable-cross-compile --arch=arm64 --disable-asm" + $config += " --arch=arm64 --disable-asm" + if ($hostArch -eq "amd64") { + $config += " --enable-cross-compile" + } } - $result = EnterVSDevShell -Arch $arch + $result = EnterVSDevShell -HostArch $hostArch -Arch $arch if (-Not $result) { return $false } @@ -112,7 +116,7 @@ function InstallMsvcFfmpeg { # As ffmpeg build system creates lib*.a file we have to rename them to *.lib files to be recognized by WIN32 Write-Host "Rename libraries lib*.a -> *.lib" try { - $msvcDir = [System.Environment]::GetEnvironmentVariable("FFMPEG_DIR_MSVC", [System.EnvironmentVariableTarget]::Machine) + $msvcDir = [System.Environment]::GetEnvironmentVariable($ffmpegDirEnvVar, [System.EnvironmentVariableTarget]::Machine) Get-ChildItem "$msvcDir\lib\lib*.a" | ForEach-Object { $NewName = $_.Name -replace 'lib(\w+).a$', '$1.lib' $Destination = Join-Path -Path $_.Directory.FullName -ChildPath $NewName @@ -201,17 +205,45 @@ function InstallAndroidArmv7 { return $result } -$mingwRes = InstallMingwFfmpeg -$llvmMingwRes = InstallLlvmMingwFfmpeg -$androidArmV7Res = InstallAndroidArmv7 -$msvcRes = InstallMsvcFfmpeg -isArm64 $false -$msvcArm64Res = InstallMsvcFfmpeg -isArm64 $true +function InstallFfmpegsAMD64 { + $hostArch = "amd64" + $mingwRes = InstallMingwFfmpeg + $llvmMingwRes = InstallLlvmMingwFfmpeg + $androidArmV7Res = InstallAndroidArmv7 + $msvcRes = InstallMsvcFfmpeg -hostArch $hostArch -isArm64 $false + $msvcArm64Res = InstallMsvcFfmpeg -hostArch $hostArch -isArm64 $true + + Write-Host "Ffmpeg installation results:" + Write-Host " mingw:" $(if ($mingwRes) { "OK" } else { "FAIL" }) + Write-Host " llvm-mingw:" $(if ($llvmMingwRes) { "OK" } else { "FAIL" }) + Write-Host " android-armv7:" $(if ($androidArmV7Res) { "OK" } else { "FAIL" }) + Write-Host " msvc:" $(if ($msvcRes) { "OK" } else { "FAIL" }) + Write-Host " msvc-arm64:" $(if ($msvcArm64Res) { "OK" } else { "FAIL" }) + + exit $(if ($mingwRes -and $msvcRes -and $msvcArm64Res -and $llvmMingwRes -and $androidArmV7Res) { 0 } else { 1 }) +} + +function InstallFfmpegsARM64 { + $hostArch = "arm64" + $msvcArm64Res = InstallMsvcFfmpeg -hostArch $hostArch -isArm64 $true -Write-Host "Ffmpeg installation results:" -Write-Host " mingw:" $(if ($mingwRes) { "OK" } else { "FAIL" }) -Write-Host " msvc:" $(if ($msvcRes) { "OK" } else { "FAIL" }) -Write-Host " msvc-arm64:" $(if ($msvcArm64Res) { "OK" } else { "FAIL" }) -Write-Host " llvm-mingw:" $(if ($llvmMingwRes) { "OK" } else { "FAIL" }) -Write-Host " android-armv7:" $(if ($androidArmV7Res) { "OK" } else { "FAIL" }) + Write-Host "Ffmpeg installation results:" + Write-Host " msvc-arm64:" $(if ($msvcArm64Res) { "OK" } else { "FAIL" }) + + exit $(if ($msvcArm64Res) { 0 } else { 1 }) +} -exit $(if ($mingwRes -and $msvcRes -and $msvcArm64Res -and $llvmMingwRes -and $androidArmV7Res) { 0 } else { 1 }) +$cpu_arch = Get-CpuArchitecture +switch ($cpu_arch) { + arm64 { + InstallFfmpegsARM64 + Break + } + x64 { + InstallFfmpegsAMD64 + Break + } + default { + throw "Unknown architecture $cpu_arch" + } +} diff --git a/coin/provisioning/qtci-windows-11_22H2-aarch64/10-install-msys2.ps1 b/coin/provisioning/qtci-windows-11_22H2-aarch64/10-install-msys2.ps1 new file mode 100644 index 00000000000..be9a36349c8 --- /dev/null +++ b/coin/provisioning/qtci-windows-11_22H2-aarch64/10-install-msys2.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-msys2.ps1" diff --git a/coin/provisioning/qtci-windows-11_22H2-aarch64/90-install-ffmpeg.ps1 b/coin/provisioning/qtci-windows-11_22H2-aarch64/90-install-ffmpeg.ps1 new file mode 100644 index 00000000000..cd8df72f926 --- /dev/null +++ b/coin/provisioning/qtci-windows-11_22H2-aarch64/90-install-ffmpeg.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-ffmpeg.ps1" From 7562d37e666729e9c504f75b05c35d6a08fc583f Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Tue, 3 Sep 2024 12:53:45 +0200 Subject: [PATCH 123/288] platform_configs: remove a few configs in qtwayland.yaml Since Dec. 2022, qtwayland.yaml was included in qt5 integration, which has too many InsignificantTests configs, let's remove some. Change-Id: I7893578797895704bbb8d3ad05070816e30f4678 Reviewed-by: Jukka Jokiniva Reviewed-by: Tero Heikkinen (cherry picked from commit 262a798cdb98a05bd4a6a5a81f3bd23aebd8ad96) Reviewed-by: Liang Qi --- coin/platform_configs/qtwayland.yaml | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/coin/platform_configs/qtwayland.yaml b/coin/platform_configs/qtwayland.yaml index 97373aae4bc..aad1b39711c 100644 --- a/coin/platform_configs/qtwayland.yaml +++ b/coin/platform_configs/qtwayland.yaml @@ -4,19 +4,6 @@ Include: [ address_sanitizer_platforms.yaml ] Configurations: -# Test on Ubuntu 22.04 Wayland -- - Id: 'ubuntu-22.04-documentation-wayland-tests' - Template: 'qtci-linux-Ubuntu-22.04-x86_64-50' - Compiler: 'GCC' - Features: ['Sccache', 'TestDocs', 'TestOnly', 'RunDependencyTests', 'InsignificantTests'] - Platform dependency: 'ubuntu-22.04-documentation' -- - Id: 'ubuntu-22.04-wayland-tests' - Template: 'qtci-linux-Ubuntu-22.04-x86_64-50' - Compiler: 'GCC' - Features: ['Sccache', 'TestOnly', 'RunDependencyTests', 'InsignificantTests'] - Platform dependency: 'ubuntu-22.04' # Test on Ubuntu 24.04 ARM64 Wayland - Id: 'ubuntu-24.04-arm64-documentation-wayland-tests' @@ -24,19 +11,7 @@ Configurations: Compiler: 'GCC' Features: ['TestOnly', 'RunDependencyTests', 'InsignificantTests'] Platform dependency: 'ubuntu-24.04-arm64-documentation' -- - Id: 'ubuntu-24.04-arm64-wayland-tests' - Template: 'qtci-linux-Ubuntu-24.04-aarch64-50' - Compiler: 'GCC' - Features: ['TestOnly', 'RunDependencyTests', 'InsignificantTests'] - Platform dependency: 'ubuntu-24.04-arm64' # Test on Ubuntu 24.04 x64 Wayland -- - Id: 'ubuntu-24.04-x64-documentation-wayland-tests' - Template: 'qtci-linux-Ubuntu-24.04-x86_64-50' - Compiler: 'GCC' - Features: ['TestOnly', 'RunDependencyTests', 'InsignificantTests'] - Platform dependency: 'ubuntu-24.04-x64-documentation' - Id: 'ubuntu-24.04-x64-wayland-tests' Template: 'qtci-linux-Ubuntu-24.04-x86_64-50' From e7345107cb517a52520e462d7f752682524ac81e Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Sun, 1 Sep 2024 10:03:05 +0200 Subject: [PATCH 124/288] platform_configs: remove qtbase-linux-arm64-offscreen.yaml We have u2404 arm64 offscreen tested in qt5 since 420b779335d18da9074ac0f192a668a5dd68739b. Change-Id: Ibbb7d275d4abe4fc73646747939b2361c5317b26 Reviewed-by: Jukka Jokiniva Reviewed-by: Tero Heikkinen (cherry picked from commit dd2f96bcee26125dfe4edbc55aa660017174677e) Reviewed-by: Qt Cherry-pick Bot --- .../qtbase-linux-arm64-offscreen.yaml | 26 ------------------- coin/platform_configs/qtbase.yaml | 1 - 2 files changed, 27 deletions(-) delete mode 100644 coin/platform_configs/qtbase-linux-arm64-offscreen.yaml diff --git a/coin/platform_configs/qtbase-linux-arm64-offscreen.yaml b/coin/platform_configs/qtbase-linux-arm64-offscreen.yaml deleted file mode 100644 index 6b19d35ce4d..00000000000 --- a/coin/platform_configs/qtbase-linux-arm64-offscreen.yaml +++ /dev/null @@ -1,26 +0,0 @@ -Version: 2 -Configurations: -# Test on Ubuntu 24.04 ARM64 offscreen -- - Id: 'ubuntu-24.04-arm64-offscreen-qtbase-tests' - Template: 'qtci-linux-Ubuntu-24.04-aarch64-50' - Compiler: 'GCC' - Features: ['TestOnly'] - Environment variables: [ - 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', - 'QT_QPA_OFFSCREEN_NO_GLX=1', - 'QT_QPA_PLATFORM=offscreen' - ] - Platform dependency: 'ubuntu-24.04-arm64' -# Test on Debian-11.6 offscreen -- - Id: 'debian-11.6-arm64-offscreen-qtbase-tests' - Template: 'qtci-linux-Debian-11.6-aarch64-50' - Compiler: 'GCC' - Features: ['Sccache', 'TestOnly'] - Environment variables: [ - 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', - 'QT_QPA_OFFSCREEN_NO_GLX=1', - 'QT_QPA_PLATFORM=offscreen' - ] - Platform dependency: 'debian-11.6-arm64' diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml index 2d986380d67..f9acdea8d71 100644 --- a/coin/platform_configs/qtbase.yaml +++ b/coin/platform_configs/qtbase.yaml @@ -9,7 +9,6 @@ Include: [ wasm_qtbase_tests.yaml, cmake_platforms_qemu_vxworks_buildtest.yaml, qtlite.yaml, - qtbase-linux-arm64-offscreen.yaml, qtbase-new-compiler-testing.yaml ] Configurations: [] From cc79b9ec5d94eecf8695e0aa711d792934b67929 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Fri, 23 Aug 2024 14:12:31 +0200 Subject: [PATCH 125/288] CMake: Generate SBOM for more platforms tagged with Packaging Amends 3017e86d5459b9d158c3151fc358630142731ac8 Amends 562b56c8d78c4e31410966fad25a1d10f481a75f Task-number: QTBUG-122899 Task-number: QTBUG-127335 Change-Id: Ibad8957c4bc90d26f9f2f3ffe543ca243f72eb9b Reviewed-by: Alexey Edelev (cherry picked from commit 2cf756950465c88564dccba540afec2f087f5435) Reviewed-by: Alexey Edelev --- coin/platform_configs/cmake_platforms.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 440c9624053..61a2fa24aa8 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -53,7 +53,7 @@ Configurations: Id: 'ubuntu-24.04-arm64' Template: 'qtci-linux-Ubuntu-24.04-aarch64-50' Compiler: 'GCC' - Features: ['Packaging', 'UseConfigure', 'DoNotRunTests'] + Features: ['Packaging', 'UseConfigure', 'DoNotRunTests', 'GenerateSBOM', 'VerifySBOM'] 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 -qpa offscreen\;xcb' Environment variables: [ 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', @@ -204,7 +204,7 @@ Configurations: Id: 'debian-11.6-arm64' Template: 'qtci-linux-Debian-11.6-aarch64-50' Compiler: 'GCC' - Features: ['Packaging', 'UseConfigure', 'InstallQt5Dependencies', 'DoNotRunTests'] + Features: ['Packaging', 'UseConfigure', 'InstallQt5Dependencies', 'DoNotRunTests', 'GenerateSBOM', 'VerifySBOM'] Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-doubleconversion -qt-harfbuzz -no-libudev -bundled-xcb-xinput -qpa offscreen\;xcb' Environment variables: [ 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}', From 15179451a1768c178c6a2b1d29b27e70fed32e29 Mon Sep 17 00:00:00 2001 From: Tero Heikkinen Date: Tue, 20 Aug 2024 14:23:09 +0300 Subject: [PATCH 126/288] Provisioning: Add ICU to Ubuntu 24.04 arm64 Fixes: QTQAINFRA-6510 Change-Id: Ia6aed07afe9b69ca109d95945faa87c1424f557b Reviewed-by: Liang Qi Reviewed-by: Tero Heikkinen (cherry picked from commit 86a9bd1bb2c42d1ef45b72610a0a8d6dce307a5c) Reviewed-by: Qt Cherry-pick Bot --- .../30-install_icu.sh | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/30-install_icu.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/30-install_icu.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/30-install_icu.sh new file mode 100644 index 00000000000..f56ade93a16 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/30-install_icu.sh @@ -0,0 +1,48 @@ +#!/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=../common/unix/DownloadURL.sh +source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" + +set -ex + +# This script will install ICU + +icuVersion="73.2" +icuLocationLib="/opt/icu/lib64" +icuLocationInclude="/opt/icu/include" +sha1="82f3ed54fd7ea8ff469d9000164e4dc23378fc8c" +baseBinaryPackageURL="http://ci-files01-hki.ci.qt.io/input/icu/$icuVersion/icu-linux-g++-Ubuntu24.04-aarch64.7z" +baseBinaryPackageExternalURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Ubuntu24.04-aarch64.7z" + +sha1Dev="37c2528df9d2b5cba1765fe8036e69b7c326a1e1" +develPackageURL="http://ci-files01-hki.ci.qt.io/input/icu/$icuVersion/icu-linux-g++-Ubuntu24.04-aarch64-devel.7z" +develPackageExternalURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Ubuntu24.04-aarch64-devel.7z" + +echo "Installing custom ICU $icuVersion $sha1 packages on Ubuntu to $icuLocationLib" + +targetFile=$(mktemp) +sudo mkdir -p "$icuLocationLib" +sudo mkdir -p "$icuLocationInclude" +DownloadURL "$baseBinaryPackageURL" "$baseBinaryPackageExternalURL" "$sha1" "$targetFile" +sudo 7z x -y -o$icuLocationLib "$targetFile" +sudo rm "$targetFile" + +echo "Installing custom ICU devel packages on Ubuntu" + +tempDir=$(mktemp -d) + +targetFile=$(mktemp) +DownloadURL "$develPackageURL" "$develPackageExternalURL" "$sha1Dev" "$targetFile" +7z x -y -o"$tempDir" "$targetFile" + +sudo cp -a "$tempDir"/lib/* "$icuLocationLib" +sudo cp -a "$tempDir"/* /opt/icu/ + +sudo rm "$targetFile" +sudo rm -fr "$tempDir" + +sudo /sbin/ldconfig + +echo "ICU = $icuVersion" >> ~/versions.txt From b02cca2418dd0cddc52a2a7df64909f533aaf7e4 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 6 Sep 2024 01:43:23 +0000 Subject: [PATCH 127/288] Update submodules on '6.8 in qt/qt5' Change-Id: I787e942ab321d647acc932899f930ba96d786115 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 0cdd4027ae8..4bdf861d05c 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 0cdd4027ae88521e70e632f979e835484ebde7a3 +Subproject commit 4bdf861d05ce66ce7bbf419c33a0bf490adc6b63 diff --git a/qt5compat b/qt5compat index 49c169f552b..271f879c28b 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 49c169f552bceb46f54398a56e5bba188d809d93 +Subproject commit 271f879c28bf2513bfbcdb920977f01cfd9c6449 diff --git a/qtactiveqt b/qtactiveqt index 3bf0c808dc6..ddd43645697 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 3bf0c808dc62c9429d49c2e6106ec6995d676c77 +Subproject commit ddd43645697b7d1dcbf85d124d44ed6b0bff4f88 diff --git a/qtbase b/qtbase index e43f4a71421..fa254beb647 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit e43f4a71421955cb292d431d200a173e44bd1c53 +Subproject commit fa254beb647b3233b5a4670fc8cd56eca847a32f diff --git a/qtcharts b/qtcharts index 607889db1fd..0d193e0398a 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 607889db1fdcf7397308ce4add591e72826f47fe +Subproject commit 0d193e0398a61684e83038c674074fbea2d631ff diff --git a/qtcoap b/qtcoap index b9d7247c883..842655d7b62 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit b9d7247c883c4ff562829a8bc32213df3b2f13e9 +Subproject commit 842655d7b62426267c8fccef863a0ab02b1151c9 diff --git a/qtconnectivity b/qtconnectivity index 8366b003135..bdeaf49367b 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 8366b0031355978457e6b5c9c2926bc668394b31 +Subproject commit bdeaf49367bbb9582e8137d6f292ac008c289109 diff --git a/qtdatavis3d b/qtdatavis3d index efa5478b91a..28f29d6f96f 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit efa5478b91a4859b5020516237ec520fc8b02696 +Subproject commit 28f29d6f96f110a47667ba36ef7d9d6e6da9fd05 diff --git a/qtdeclarative b/qtdeclarative index d5171b14251..31ca5277445 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit d5171b14251cf4abd7d8ad16288690af53248856 +Subproject commit 31ca527744533b5895ae6547d21a90efc94737e3 diff --git a/qtdoc b/qtdoc index b7cbace2ee1..ae89cd8ad8d 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit b7cbace2ee117de90b6c44663fd50c81fcca916b +Subproject commit ae89cd8ad8d043d4e0ebd33c269264eddb5c0ae7 diff --git a/qtgraphs b/qtgraphs index 5a96189ea87..1cf035dd8fc 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit 5a96189ea87b4c7c0e1fedc301a412e58962f8a7 +Subproject commit 1cf035dd8fca4f655b278ecccb2a74da8df7bdf0 diff --git a/qtgrpc b/qtgrpc index 9d8461e747f..b71120964e7 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit 9d8461e747f70b5ae555da38bfe64e40b603f444 +Subproject commit b71120964e779e447a87cc33e1361e4ac23996a5 diff --git a/qthttpserver b/qthttpserver index a8585a49929..c2e725d7cc5 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit a8585a49929bcfc835c5ed39867bc7b837112ab8 +Subproject commit c2e725d7cc51663ee74c501a5c62106211a0c3a7 diff --git a/qtimageformats b/qtimageformats index c0dd2ec8b78..93bc4c2df24 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit c0dd2ec8b78b7091495bb1deb1108c7406cfee47 +Subproject commit 93bc4c2df2409c9381b7e07aa1b245211c8b9005 diff --git a/qtlanguageserver b/qtlanguageserver index cdb96abfc0e..cdd3dfa6f54 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit cdb96abfc0e76c4ac60abb301d7ff00ca9d845b5 +Subproject commit cdd3dfa6f54a69e45b09b5b35882d2f7f2d78040 diff --git a/qtlocation b/qtlocation index a8694f468de..d40e0f04411 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit a8694f468ded03b81b6a10814045c6784cd373f2 +Subproject commit d40e0f04411f01f0000075991fda503f6c9808d4 diff --git a/qtlottie b/qtlottie index 266c91152ed..613f34662a1 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 266c91152ed7da1aa3e8f727fe2ce4fecd0680f4 +Subproject commit 613f34662a16be2709aea347580907ddcd4df5d7 diff --git a/qtmqtt b/qtmqtt index 8876bd7725f..43991326d55 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit 8876bd7725fad058f64a7288e32ec69902f758fb +Subproject commit 43991326d552fd173440a043028e9edd0f639d0f diff --git a/qtmultimedia b/qtmultimedia index 75467fefb62..a23993cb01a 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 75467fefb6204ec1678b20c47c5d69d2bf8b6c5d +Subproject commit a23993cb01a9f08f1526e968be60f9349436405c diff --git a/qtnetworkauth b/qtnetworkauth index b22c9421ec0..de45cad5aa4 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit b22c9421ec0d3152f5bf813327a8756ef8d78d0d +Subproject commit de45cad5aa49278da3e537c9f495ece8b6051546 diff --git a/qtopcua b/qtopcua index 9375fe37872..f1c7655d845 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit 9375fe37872cb92ab068b95539f87ee23777f062 +Subproject commit f1c7655d8450db1bd67b2e365b95625fee01c8b4 diff --git a/qtpositioning b/qtpositioning index 9e17051c777..bdae173e970 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit 9e17051c777b460aa92632664d42eeb82158fbba +Subproject commit bdae173e970b00c22bb6538cc2a0b1cb6ea79943 diff --git a/qtquick3d b/qtquick3d index 9ab8e02c402..e588bd952be 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 9ab8e02c402f827d9abe8039fc8825964814aa90 +Subproject commit e588bd952bee5d7361b6407109e119115ddca2a2 diff --git a/qtquick3dphysics b/qtquick3dphysics index 8abbcb1f5c3..f9319dee7dc 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit 8abbcb1f5c3f2fe29b6e402b893c04b4e4c2e871 +Subproject commit f9319dee7dcf72b5c0e98d03f5c40313a680bfa2 diff --git a/qtquickeffectmaker b/qtquickeffectmaker index a7d563776e0..b42fd6d1e1d 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit a7d563776e0dc6a5b6abe1999e0f60b7c436931e +Subproject commit b42fd6d1e1d86cfbc8355692de0914dea0f610a3 diff --git a/qtquicktimeline b/qtquicktimeline index 61ebc26d215..3bd03466ed2 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 61ebc26d21574a339ec2b16865efb7860113c5d2 +Subproject commit 3bd03466ed268bc84832e1409dba0b12634e9155 diff --git a/qtremoteobjects b/qtremoteobjects index e97c664bf1e..33bec09e1c4 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit e97c664bf1ecf76fdfef9dea5873ca1339c25972 +Subproject commit 33bec09e1c4b5e9af8c1ea2c3b425df2f7f596c9 diff --git a/qtscxml b/qtscxml index 53d4da19692..4688afc215c 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 53d4da19692e93104beaf0892ce0e3b93e3c03e7 +Subproject commit 4688afc215c90df9cfd8d19b3ae65b53234a9637 diff --git a/qtsensors b/qtsensors index 7710523ef44..7c3e7d4f408 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 7710523ef449a57bf46a9417579bd5af3c4ed5f4 +Subproject commit 7c3e7d4f4083a0be7c1d9d9b73959ffd5f18cc96 diff --git a/qtserialbus b/qtserialbus index 2f885012691..1758f6bd4ba 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 2f885012691012511e584218f180bfbf2ba1c11b +Subproject commit 1758f6bd4ba49fb1decc9a0be7559182c6b0b052 diff --git a/qtserialport b/qtserialport index 87ef797dde9..1842c9a1f00 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 87ef797dde9532a98833c34707acb93352317b54 +Subproject commit 1842c9a1f00fe766f7a45add7483858411502e97 diff --git a/qtshadertools b/qtshadertools index 0fe8f4f390b..ac130f3e2c4 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 0fe8f4f390b50044b2e3d7752f1df86fb2563149 +Subproject commit ac130f3e2c453d98afb2adaa199139862430b431 diff --git a/qtspeech b/qtspeech index 31b66f094d3..82e9b364911 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 31b66f094d3d89e7898953be11bd194a8354c235 +Subproject commit 82e9b364911d22cedaf6c53221b0980deb04a4c0 diff --git a/qtsvg b/qtsvg index aa0ee15df91..0596b093f33 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit aa0ee15df9169e2e0211dd2435fc698cf4afa317 +Subproject commit 0596b093f338f4530a7e02fb28794afad219225e diff --git a/qttools b/qttools index 5034a500830..f8bcc983a9b 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 5034a5008302f830f0966162665a1249f288d2bb +Subproject commit f8bcc983a9baa7ea7000c7e7d1299e16a6b6650c diff --git a/qttranslations b/qttranslations index bf0f7a27515..3f9986778ef 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit bf0f7a27515c711bd75919dcb0824c0161008526 +Subproject commit 3f9986778ef93e878492ea0a9cf8f2d0b7d95266 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 79355603a33..48b7a3b8bca 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 79355603a3366bea4a6ec408b73ae028a153da08 +Subproject commit 48b7a3b8bca09eb2014a5e2231cfb8fd2f3c870e diff --git a/qtwayland b/qtwayland index 9251ddeca76..87905df73d6 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 9251ddeca76ba0949b3d76220cf7b005e551f3dd +Subproject commit 87905df73d68267fefa899f34b7600186ac0707e diff --git a/qtwebchannel b/qtwebchannel index c6dafd8d522..6f1e669290f 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit c6dafd8d5220d797c64b229a7378817369d0bc5b +Subproject commit 6f1e669290f0958055a728d5ec0d7327bc3caada diff --git a/qtwebengine b/qtwebengine index 6d62d33316b..9d9216f4286 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 6d62d33316bbf92b3bfd5cec75f7c2a04e06a23c +Subproject commit 9d9216f42861802fdb1b16c436924203031da2c9 diff --git a/qtwebsockets b/qtwebsockets index b4cb234e77b..8334d01cb1c 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit b4cb234e77be4ef91817b57f1752c4cc82d01118 +Subproject commit 8334d01cb1c76bc1bef4eb0d5c2ef787e6012d5d diff --git a/qtwebview b/qtwebview index 8fb1a383476..d999d6b9785 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 8fb1a383476b6e120d467f02ae961f65c3746634 +Subproject commit d999d6b97851a90d084ee05d1b16d9f61a62268a From 5b09ad616e55ed69d797b80ce550966e251529e6 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Thu, 5 Sep 2024 10:27:06 +0200 Subject: [PATCH 128/288] COIN/QtCreator: Use MSVC2022 Change-Id: I6b2c14fdcb7e7f536489b840dee02282c4d2be77 Reviewed-by: David Schulz (cherry picked from commit 2dc7eaf911528a32d3e62f841abf20bc8fd49a68) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/qt-creator.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/coin/platform_configs/qt-creator.yaml b/coin/platform_configs/qt-creator.yaml index bbf45168b45..f206bffb01a 100644 --- a/coin/platform_configs/qt-creator.yaml +++ b/coin/platform_configs/qt-creator.yaml @@ -3,18 +3,18 @@ Module only: True Configurations: - Template: 'qtci-windows-10_22H2-x86_64-52' - Compiler: 'MSVC2019' + Compiler: 'MSVC2022' Features: ['Packaging', 'Sccache', 'DebugAndRelease'] Configure arguments: '' Environment variables: [] - Environment script: ['%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64'] + Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64'] - Template: 'qtci-windows-10_22H2-x86_64-52' - Compiler: 'MSVC2019' + Compiler: 'MSVC2022' Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests'] Configure arguments: '' Environment variables: [] - Environment script: ['%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64'] + Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64'] - Template: 'qtci-linux-RHEL-8.8-x86_64-50' Compiler: 'GCC' From 0da50b756265fe2339865ca7ea8907629e859d47 Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Tue, 3 Sep 2024 14:49:21 +0300 Subject: [PATCH 129/288] Move static test build from msvc2019 to msvc2022 It has been agreed to drop MSVC2019 support from Qt 6.8 -> so let's drop that last build from dev and 6.8. See https://lists.qt-project.org/pipermail/development/2024-April/045178.html Change-Id: Iba32a6372cd0dfff6de2866be8dd08b8e2f14896 Reviewed-by: Oliver Wolff (cherry picked from commit e13bea5189e33f242522b01c0db12b6a1ac6ea66) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/cmake_platforms_static_tests.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/coin/platform_configs/cmake_platforms_static_tests.yaml b/coin/platform_configs/cmake_platforms_static_tests.yaml index cd4811af6e6..0a8f8c6b471 100644 --- a/coin/platform_configs/cmake_platforms_static_tests.yaml +++ b/coin/platform_configs/cmake_platforms_static_tests.yaml @@ -10,9 +10,9 @@ Configurations: 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}' ] - - Id: 'windows-10_22h2-minimal-static' - Template: 'qtci-windows-10_22H2-x86_64-52' - Compiler: 'MSVC2019' + Id: 'windows-11_23H2-minimal-static' + Template: 'qtci-windows-11_23H2-x86_64-53' + Compiler: 'MSVC2022' Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure'] Configure arguments: '-release -force-debug-info -static -nomake examples -qt-zlib' Environment variables: [ From 72a484279668a62b75bf4655a5394d5a96895b51 Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Thu, 22 Aug 2024 14:47:27 +0200 Subject: [PATCH 130/288] Add the missing provisioning of protobuf on the Ubuntu 24.04 aarch64 machine MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: QTBUG-128285 Change-Id: I2b0cd6098fdbcfb07d5210316d95749557970d07 Reviewed-by: Jani Heikkinen Reviewed-by: Tero Heikkinen Reviewed-by: Simo Fält --- .../60-install_protobuf.sh | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/60-install_protobuf.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/60-install_protobuf.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/60-install_protobuf.sh new file mode 100644 index 00000000000..3e2b8921878 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/60-install_protobuf.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash +# Copyright (C) 2018 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/install_protobuf.sh +source "${BASH_SOURCE%/*}/../common/unix/install_protobuf.sh" + From 852ea473505fadb0af01fc82cba91c59559bfe89 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 10 Sep 2024 08:47:35 +0000 Subject: [PATCH 131/288] Update submodules on '6.8 in qt/qt5' Change-Id: I3e0a4857cedbf2eecc5685691b0933f7b1639d97 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 4bdf861d05c..d60e2d445b0 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 4bdf861d05ce66ce7bbf419c33a0bf490adc6b63 +Subproject commit d60e2d445b00ec9582c1464bc0bda1cf0eaed0be diff --git a/qt5compat b/qt5compat index 271f879c28b..bdeecc1b6b7 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 271f879c28bf2513bfbcdb920977f01cfd9c6449 +Subproject commit bdeecc1b6b7b94a061a4f17f8ae3361baf7348c0 diff --git a/qtactiveqt b/qtactiveqt index ddd43645697..0c3acae95cc 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit ddd43645697b7d1dcbf85d124d44ed6b0bff4f88 +Subproject commit 0c3acae95cc9da66e16021d243a52c7b840708a0 diff --git a/qtbase b/qtbase index fa254beb647..893dc6d772f 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit fa254beb647b3233b5a4670fc8cd56eca847a32f +Subproject commit 893dc6d772f53d8ba44165397d79a2dbc762a6a7 diff --git a/qtcharts b/qtcharts index 0d193e0398a..48dd53757f9 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 0d193e0398a61684e83038c674074fbea2d631ff +Subproject commit 48dd53757f99a437ae9002ae28f8dc9967d71277 diff --git a/qtcoap b/qtcoap index 842655d7b62..315bb25a75b 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit 842655d7b62426267c8fccef863a0ab02b1151c9 +Subproject commit 315bb25a75bfa638b49505031800f3c50bcef5cd diff --git a/qtconnectivity b/qtconnectivity index bdeaf49367b..2127a595b49 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit bdeaf49367bbb9582e8137d6f292ac008c289109 +Subproject commit 2127a595b49b4e3ebb2900e66ba6754b1742495c diff --git a/qtdatavis3d b/qtdatavis3d index 28f29d6f96f..ee070e42766 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 28f29d6f96f110a47667ba36ef7d9d6e6da9fd05 +Subproject commit ee070e427661249465b064f6b041f64ed516ecea diff --git a/qtdeclarative b/qtdeclarative index 31ca5277445..a6e32c939e8 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 31ca527744533b5895ae6547d21a90efc94737e3 +Subproject commit a6e32c939e8d34839a74f97a4265aeb45266e52d diff --git a/qtdoc b/qtdoc index ae89cd8ad8d..1b013a03909 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit ae89cd8ad8d043d4e0ebd33c269264eddb5c0ae7 +Subproject commit 1b013a03909df6785ef3aa926837ed1e897db591 diff --git a/qtgraphs b/qtgraphs index 1cf035dd8fc..caa1d61b1ab 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit 1cf035dd8fca4f655b278ecccb2a74da8df7bdf0 +Subproject commit caa1d61b1abbdd2ad2b7f7b0db4e6f56e859bd97 diff --git a/qtgrpc b/qtgrpc index b71120964e7..861b3f68444 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit b71120964e779e447a87cc33e1361e4ac23996a5 +Subproject commit 861b3f6844489b3808fd12bacda6080d3c8f2798 diff --git a/qthttpserver b/qthttpserver index c2e725d7cc5..5419515d947 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit c2e725d7cc51663ee74c501a5c62106211a0c3a7 +Subproject commit 5419515d947de4a5c079f5f02121f1ae65d5152e diff --git a/qtimageformats b/qtimageformats index 93bc4c2df24..3eaefea887a 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 93bc4c2df2409c9381b7e07aa1b245211c8b9005 +Subproject commit 3eaefea887a07b0697027a5cebc0e2577499a707 diff --git a/qtlanguageserver b/qtlanguageserver index cdd3dfa6f54..c0c9f25a15c 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit cdd3dfa6f54a69e45b09b5b35882d2f7f2d78040 +Subproject commit c0c9f25a15cd54492cd5cb98163eae61a23ef6e7 diff --git a/qtlocation b/qtlocation index d40e0f04411..eec9fa59eef 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit d40e0f04411f01f0000075991fda503f6c9808d4 +Subproject commit eec9fa59eef0c3b5f02f06532a3519d642e2a037 diff --git a/qtlottie b/qtlottie index 613f34662a1..631bbef4123 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 613f34662a16be2709aea347580907ddcd4df5d7 +Subproject commit 631bbef41238533ec2bf9ff5fe237667cea1ea5f diff --git a/qtmqtt b/qtmqtt index 43991326d55..c8236b17e51 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit 43991326d552fd173440a043028e9edd0f639d0f +Subproject commit c8236b17e51cec51a71483437213d438484de4f4 diff --git a/qtmultimedia b/qtmultimedia index a23993cb01a..f21d55c67f0 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit a23993cb01a9f08f1526e968be60f9349436405c +Subproject commit f21d55c67f0ce27dd31298f0b95967bee126a72e diff --git a/qtnetworkauth b/qtnetworkauth index de45cad5aa4..71a856a1ef8 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit de45cad5aa49278da3e537c9f495ece8b6051546 +Subproject commit 71a856a1ef8a2b5c3f8b63ce6223655be2ea012a diff --git a/qtopcua b/qtopcua index f1c7655d845..ccb8caab8fa 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit f1c7655d8450db1bd67b2e365b95625fee01c8b4 +Subproject commit ccb8caab8fae71a38b617ef9302d872643cf7627 diff --git a/qtpositioning b/qtpositioning index bdae173e970..3f33d28148a 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit bdae173e970b00c22bb6538cc2a0b1cb6ea79943 +Subproject commit 3f33d28148ac21d9241e384f4cf2f8e0ebd6667f diff --git a/qtquick3d b/qtquick3d index e588bd952be..84193a94a59 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit e588bd952bee5d7361b6407109e119115ddca2a2 +Subproject commit 84193a94a59730a976266ca69efdafc64a928f98 diff --git a/qtquick3dphysics b/qtquick3dphysics index f9319dee7dc..abd5ed23a95 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit f9319dee7dcf72b5c0e98d03f5c40313a680bfa2 +Subproject commit abd5ed23a95c8ee81c27a3ed8a6bc7990907004b diff --git a/qtquickeffectmaker b/qtquickeffectmaker index b42fd6d1e1d..55e4c95a800 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit b42fd6d1e1d86cfbc8355692de0914dea0f610a3 +Subproject commit 55e4c95a800f53a4c81f8220931e3d856b0b0715 diff --git a/qtquicktimeline b/qtquicktimeline index 3bd03466ed2..e9e6ac72b99 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 3bd03466ed268bc84832e1409dba0b12634e9155 +Subproject commit e9e6ac72b99d44416de59e394f90e2c10e73ff50 diff --git a/qtremoteobjects b/qtremoteobjects index 33bec09e1c4..e324fded9ef 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 33bec09e1c4b5e9af8c1ea2c3b425df2f7f596c9 +Subproject commit e324fded9efb7c7e3ff22edf99bd3680bb5cb031 diff --git a/qtscxml b/qtscxml index 4688afc215c..9fece9db58c 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 4688afc215c90df9cfd8d19b3ae65b53234a9637 +Subproject commit 9fece9db58ceccdc171923b0e7a02f5a41dc5df9 diff --git a/qtsensors b/qtsensors index 7c3e7d4f408..e79a0635c75 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 7c3e7d4f4083a0be7c1d9d9b73959ffd5f18cc96 +Subproject commit e79a0635c7583836c18703b5565128a190167394 diff --git a/qtserialbus b/qtserialbus index 1758f6bd4ba..7f8944c226c 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 1758f6bd4ba49fb1decc9a0be7559182c6b0b052 +Subproject commit 7f8944c226c1f85f8ee68f34a324d71bb0a595d3 diff --git a/qtserialport b/qtserialport index 1842c9a1f00..9f6d070f979 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 1842c9a1f00fe766f7a45add7483858411502e97 +Subproject commit 9f6d070f97906a312a466eb3a778f5388e5685e2 diff --git a/qtshadertools b/qtshadertools index ac130f3e2c4..2f549300ab4 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit ac130f3e2c453d98afb2adaa199139862430b431 +Subproject commit 2f549300ab4f92d96216f26a3b61e03ec37f347b diff --git a/qtspeech b/qtspeech index 82e9b364911..d0c10d389f7 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 82e9b364911d22cedaf6c53221b0980deb04a4c0 +Subproject commit d0c10d389f7a7f927c403e83bf6086be3619b44c diff --git a/qtsvg b/qtsvg index 0596b093f33..8fd10b41923 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 0596b093f338f4530a7e02fb28794afad219225e +Subproject commit 8fd10b41923715b047f09449abe591389ba59033 diff --git a/qttools b/qttools index f8bcc983a9b..547410a5b51 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit f8bcc983a9baa7ea7000c7e7d1299e16a6b6650c +Subproject commit 547410a5b511ec4584953136b9c066525c14732e diff --git a/qttranslations b/qttranslations index 3f9986778ef..dd971b199a1 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 3f9986778ef93e878492ea0a9cf8f2d0b7d95266 +Subproject commit dd971b199a11440bd422a184975dda01dccc4d9f diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 48b7a3b8bca..eed40e1eee5 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 48b7a3b8bca09eb2014a5e2231cfb8fd2f3c870e +Subproject commit eed40e1eee559b46144e7d6c2ede33c4fc87633d diff --git a/qtwayland b/qtwayland index 87905df73d6..1ac84aab428 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 87905df73d68267fefa899f34b7600186ac0707e +Subproject commit 1ac84aab428dba24f2df7486fe553bf2c4ea022e diff --git a/qtwebchannel b/qtwebchannel index 6f1e669290f..d64d78c373f 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 6f1e669290f0958055a728d5ec0d7327bc3caada +Subproject commit d64d78c373fc7329a2e6c7810e4fc39305ade313 diff --git a/qtwebengine b/qtwebengine index 9d9216f4286..b75ae0661e7 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 9d9216f42861802fdb1b16c436924203031da2c9 +Subproject commit b75ae0661e7cd894adc89d6d6955f0dcb2dcefe1 diff --git a/qtwebsockets b/qtwebsockets index 8334d01cb1c..49fd7f6a3d2 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 8334d01cb1c76bc1bef4eb0d5c2ef787e6012d5d +Subproject commit 49fd7f6a3d2dbaff83af956db1e8260f7f258e40 diff --git a/qtwebview b/qtwebview index d999d6b9785..3d36b5c9931 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit d999d6b97851a90d084ee05d1b16d9f61a62268a +Subproject commit 3d36b5c9931748a351f86736ad4e0903560c840b From f9f017bf5a1cd772bfaca7260dc5ece06e64ce6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20=C3=85lund?= Date: Fri, 6 Sep 2024 13:51:33 +0200 Subject: [PATCH 132/288] Update Mimer SQL macOS binaries MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The Mimer SQL macOS binaries had a problem fixed in version 11.0.8E. Update provisioning script with new version. Since Mimer SQL on macOS is now universal binary only, remove the arm64 and x86_64 versions. Fixes: QTQAINFRA-6559 Change-Id: I7e202ffc945167db79430846571cd7e1bb5158f6 Reviewed-by: Elias Toivola Reviewed-by: Tor Arne Vestbø (cherry picked from commit 90308d841e92c752bc60bf7b87840bbe99bf80f3) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/common/macos/mimersql.sh | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/coin/provisioning/common/macos/mimersql.sh b/coin/provisioning/common/macos/mimersql.sh index 10ee1dc5a83..e1f232e040e 100755 --- a/coin/provisioning/common/macos/mimersql.sh +++ b/coin/provisioning/common/macos/mimersql.sh @@ -12,20 +12,11 @@ os="$1" source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" -mimerSqlVersion="11.0.7G" -if [ "$os" = "macos" ]; then - arch=$(uname -m) - if [ "$arch" = "x86_64" ]; then - mimerSqlPackageName="mimersql-110_x86_64.tgz" - SHA1="d748f87b72e7188c527f131db2590f552f18f544" - else - mimerSqlPackageName="mimersql-110_arm64.tgz" - SHA1="f209c97074d096e50e637441073e8aa355c5116e" - fi -else - mimerSqlPackageName="mimersql-110_universal.tgz" - SHA1="eab32be623f1cbde7c29cea0f0ca4332b8ca502b" -fi +mimerSqlVersion="11.0.8E" + +mimerSqlPackageName="mimersql-1108E_universal.tgz" +SHA1="8077db02be2b54147eb4a48ce4a7a2ff1159fb4d" + PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/mac/$mimerSqlPackageName" AltUrl="https://install.mimer.com/qt/macOS/$mimerSqlPackageName" From df4d7fb42dfb88ccc0a73a337d03bbce44cf6101 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 6 Sep 2024 08:45:19 +0200 Subject: [PATCH 133/288] sccache: Add arm linux support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I630cdc7bbff320c6ca8e17b33f0e9fc05f6a63af Reviewed-by: Simo Fält Reviewed-by: Liang Qi (cherry picked from commit cad194524e940aab61be3fdc943235a31c668de6) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/common/linux/sccache.sh | 11 +++++++++-- coin/provisioning/common/unix/sccache.sh | 4 ++++ .../qtci-linux-Debian-11.6-aarch64/20-sccache.sh | 3 +++ .../qtci-linux-Ubuntu-22.04-aarch64/20-sccache.sh | 3 +++ .../qtci-linux-Ubuntu-24.04-aarch64/20-sccache.sh | 3 +++ 5 files changed, 22 insertions(+), 2 deletions(-) create mode 100755 coin/provisioning/qtci-linux-Debian-11.6-aarch64/20-sccache.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-22.04-aarch64/20-sccache.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/20-sccache.sh diff --git a/coin/provisioning/common/linux/sccache.sh b/coin/provisioning/common/linux/sccache.sh index 5e4969b3ad6..b7e60187b7b 100755 --- a/coin/provisioning/common/linux/sccache.sh +++ b/coin/provisioning/common/linux/sccache.sh @@ -6,7 +6,14 @@ set -ex source "${BASH_SOURCE%/*}/../unix/sccache.sh" -targetArch=x86_64-unknown-linux-musl targetVersion=0.2.14 -sha1=281680c0fc2c09173e94d12ba45d9f1b8e62e5b3 + +if [[ $(uname -m) == 'aarch64' ]]; then + targetArch=aarch64-unknown-linux-musl + sha1=0f9b57c423d77f7aa89bb642864ac7689d84d6a0 +else + targetArch=x86_64-unknown-linux-musl + sha1=281680c0fc2c09173e94d12ba45d9f1b8e62e5b3 +fi + installSccache "$targetArch" "$targetVersion" "$sha1" diff --git a/coin/provisioning/common/unix/sccache.sh b/coin/provisioning/common/unix/sccache.sh index 8a403ba7474..ab4ffd3c63b 100755 --- a/coin/provisioning/common/unix/sccache.sh +++ b/coin/provisioning/common/unix/sccache.sh @@ -19,6 +19,7 @@ function installSccache { sudo mkdir -p /usr/local/sccache sudo tar -C /usr/local/sccache -x -z --totals --strip-components=1 --file="$targetFile" + sudo chmod +x /usr/local/sccache/sccache # add sccache __before__ the real compiler SetEnvVar "PATH" "/usr/local/sccache:\$PATH" @@ -32,4 +33,7 @@ function installSccache { chmod 755 "$HOME/sccache_wrapper/sccache" SetEnvVar "PATH" "$HOME/sccache_wrapper:\$PATH" + # Prevents some random network I/O errors from failing compilation + # Does not seem to affect much though + SetEnvVar "SCCACHE_IGNORE_SERVER_IO_ERROR" "1" } diff --git a/coin/provisioning/qtci-linux-Debian-11.6-aarch64/20-sccache.sh b/coin/provisioning/qtci-linux-Debian-11.6-aarch64/20-sccache.sh new file mode 100755 index 00000000000..b371d947924 --- /dev/null +++ b/coin/provisioning/qtci-linux-Debian-11.6-aarch64/20-sccache.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +source "${BASH_SOURCE%/*}/../common/linux/sccache.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-22.04-aarch64/20-sccache.sh b/coin/provisioning/qtci-linux-Ubuntu-22.04-aarch64/20-sccache.sh new file mode 100755 index 00000000000..b371d947924 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-22.04-aarch64/20-sccache.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +source "${BASH_SOURCE%/*}/../common/linux/sccache.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/20-sccache.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/20-sccache.sh new file mode 100755 index 00000000000..b371d947924 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/20-sccache.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +source "${BASH_SOURCE%/*}/../common/linux/sccache.sh" From 39facc0a9540d59afbb1bf5d7871fa1170b38a4b Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Thu, 12 Sep 2024 06:46:44 +0200 Subject: [PATCH 134/288] Ubuntu 24.04 arm64: enable the usage of sccache MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: If5c615ccadcf1c5e6e2dac5efdff8c65938f5c25 Reviewed-by: Simo Fält (cherry picked from commit 0e210958e6cab0c97d61941f5870e0795fa490da) Reviewed-by: Liang Qi --- coin/platform_configs/cmake_platforms.yaml | 4 ++-- coin/platform_configs/qtlite.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 61a2fa24aa8..48b16ce8aac 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -43,7 +43,7 @@ Configurations: Id: 'ubuntu-24.04-arm64-documentation' Template: 'qtci-linux-Ubuntu-24.04-aarch64-50' Compiler: 'GCC' - Features: ['Documentation', 'UseConfigure', 'DoNotRunTests'] + Features: ['Sccache', 'Documentation', 'UseConfigure', 'DoNotRunTests'] Configure arguments: '-make examples -developer-build -c++std c++20 -linker gold -qtlibinfix TestInfix -qtnamespace TestNamespace -qpa offscreen\;xcb' Environment variables: [ 'COMMON_TEST_CMAKE_ARGS=-DQT_SKIP_DOCKER_COMPOSE=ON', @@ -53,7 +53,7 @@ Configurations: Id: 'ubuntu-24.04-arm64' Template: 'qtci-linux-Ubuntu-24.04-aarch64-50' Compiler: 'GCC' - Features: ['Packaging', 'UseConfigure', 'DoNotRunTests', 'GenerateSBOM', 'VerifySBOM'] + Features: ['Sccache', 'Packaging', 'UseConfigure', 'DoNotRunTests', 'GenerateSBOM', 'VerifySBOM'] 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 -qpa offscreen\;xcb' Environment variables: [ 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', diff --git a/coin/platform_configs/qtlite.yaml b/coin/platform_configs/qtlite.yaml index 3cd2f8b3241..872d44ee55f 100644 --- a/coin/platform_configs/qtlite.yaml +++ b/coin/platform_configs/qtlite.yaml @@ -4,7 +4,7 @@ Configurations: Id: 'ubuntu-24.04-arm64-static-qtlite' Template: 'qtci-linux-Ubuntu-24.04-aarch64-50' Compiler: 'GCC' - Features: ['UseConfigure', 'DoNotRunTests', 'MinimalStaticTests'] + Features: ['Sccache', 'UseConfigure', 'DoNotRunTests', 'MinimalStaticTests'] Configure arguments: > -nomake examples -release From deea41c06cd1e3efa34413bb4eb18bc5eb1be3f6 Mon Sep 17 00:00:00 2001 From: Elias Toivola Date: Tue, 10 Sep 2024 13:57:34 +0300 Subject: [PATCH 135/288] WoA: Update Visual Studio to 17.11.2 and disable restore points This new tier-1 template has an updated MSVC (1941) and other small optimizations done to Windows 11: - .NET runtime optimization service is ran so it wont start automatically in later VMs. - Event viewer showed that Windows creates Restore Points during provisioning so this is now disabled. - Widgets are now disabled, so they no longer download weather/news data. Task-number: QTCREATORBUG-31485 Fixes: QTQAINFRA-6518 Change-Id: Ifb60e8a24642e7cff9c8ffef319d6008a6af1fa4 Reviewed-by: Cristian Adam (cherry picked from commit 2151c5510fc1264465429b6d125a584d54c4c3e5) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/cmake_platforms.yaml | 2 +- .../README_MANUAL_INSTALLATIONS | 6 ++++++ .../qtci-windows-11_22H2-aarch64/msvc2022.txt | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 48b16ce8aac..9090cdfeb5b 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -154,7 +154,7 @@ Configurations: ] - Id: 'windows-11_22h2-arm64-msvc2022' - Template: 'qtci-windows-11_22H2-aarch64-53' + Template: 'qtci-windows-11_22H2-aarch64-54' Compiler: 'MSVC2022' Features: ['Packaging', 'DebugAndRelease', 'UseConfigure', 'InsignificantTests', 'GenerateSBOM', 'VerifySBOM'] Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib -no-sql-psql -no-opengl' diff --git a/coin/pre-provisioning/qtci-windows-11_22H2-aarch64/README_MANUAL_INSTALLATIONS b/coin/pre-provisioning/qtci-windows-11_22H2-aarch64/README_MANUAL_INSTALLATIONS index abd3954dd65..2ddf733545e 100644 --- a/coin/pre-provisioning/qtci-windows-11_22H2-aarch64/README_MANUAL_INSTALLATIONS +++ b/coin/pre-provisioning/qtci-windows-11_22H2-aarch64/README_MANUAL_INSTALLATIONS @@ -54,10 +54,16 @@ - After reboot disable windows updates: - 'C:\ProgramData\Microsoft\Windows\Start Menu\Programs\Administrative Tools\Services' - 'Windows updates' - 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) * 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 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 9fd62d004ef..331a2615511 100644 --- a/coin/pre-provisioning/qtci-windows-11_22H2-aarch64/msvc2022.txt +++ b/coin/pre-provisioning/qtci-windows-11_22H2-aarch64/msvc2022.txt @@ -1,6 +1,7 @@ ### Visual Studio Professional 2022 Official release ### Visual Studio Professional 2022 version 17.3.5 was installed manually using installer: http://ci-files01-hki.ci.qt.io/input/windows/vs_professional__msvc2022_1339502178.1525841376.exe Visual Studio Professional 2022 was updated to 17.8.2 vith Visual Studio Installer +Visual Studio Professional 2022 was updated to 17.11.2 with Visual Studio Installer Installed MSVC-2022 Components: From 9f21a0b9cba65c06c028c55746c941407b9e55fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Wed, 15 Nov 2023 15:42:29 +0100 Subject: [PATCH 136/288] Use macOS 14 ARM to run minimal static tests Our x86_64 capacity is overloaded. The Mimer SQL plugin is skipped because it has problems in static builds. Change-Id: I5f89cb7aa6b373792090ea16b0137de05574b71b Reviewed-by: Jukka Jokiniva (cherry picked from commit 0d018fc073a41170b441576e3ee36635d83f685d) Reviewed-by: Qt Cherry-pick Bot --- 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 0a8f8c6b471..b7fdcf26d32 100644 --- a/coin/platform_configs/cmake_platforms_static_tests.yaml +++ b/coin/platform_configs/cmake_platforms_static_tests.yaml @@ -23,7 +23,7 @@ Configurations: ] - Id: 'macos-minimal-static' - Template: 'qtci-macos-13-x86_64-103' + Template: 'qtci-macos-14-arm-106' Compiler: 'Clang' Features: ['Sccache', 'MinimalStaticTests', 'UseConfigure'] Configure arguments: '-nomake examples -release -force-debug-info -static -no-framework' From a1b6183253973b9143f445c7733a3dfbd69c3a2b Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 13 Sep 2024 18:43:00 +0200 Subject: [PATCH 137/288] platform_configs: try to use lld linker on u24.04 arm64 Task-number: QTBUG-128887 Change-Id: I952f51560d5f01cc6093cd416c6ee49b9de7c922 Reviewed-by: Liang Qi Reviewed-by: Allan Sandfeld Jensen (cherry picked from commit 3f48f4f9effaf00aa90651a028896801c65e8194) --- coin/platform_configs/cmake_platforms.yaml | 2 +- coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 9090cdfeb5b..d5ba768e830 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -44,7 +44,7 @@ Configurations: Template: 'qtci-linux-Ubuntu-24.04-aarch64-50' Compiler: 'GCC' Features: ['Sccache', 'Documentation', 'UseConfigure', 'DoNotRunTests'] - Configure arguments: '-make examples -developer-build -c++std c++20 -linker gold -qtlibinfix TestInfix -qtnamespace TestNamespace -qpa offscreen\;xcb' + Configure arguments: '-make examples -developer-build -c++std c++20 -linker lld -qtlibinfix TestInfix -qtnamespace TestNamespace -qpa offscreen\;xcb' Environment variables: [ 'COMMON_TEST_CMAKE_ARGS=-DQT_SKIP_DOCKER_COMPOSE=ON', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}' 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 9262259af69..aea9e8460c9 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 @@ -229,6 +229,8 @@ installPackages+=(uml-utilities) installPackages+=(jq) # For building installPackages+=(cmake) +# extra linkers +installPackages+=(lld) echo "Running update for apt" waitLoop From 687c2c45516f69d1cc03f89a14586a1c45252d3f Mon Sep 17 00:00:00 2001 From: Marcus Tillmanns Date: Fri, 21 Jun 2024 11:45:27 +0200 Subject: [PATCH 138/288] Coin: Add golang & upx to Linux/macOS/Windows Qt Creator will soon start to rely on go for tools and upx for binary compression. Right now we can't install upx on macOS which we can live with. Leaving the script in for later re-enabling once brew has been fixed. Pick-to: 6.7 Change-Id: I4fdc67e469153e8a0530efd58ff251629dcabdfa Reviewed-by: Eike Ziller (cherry picked from commit 337206334e90ce77f1dbfa09e67e8fd866d25b60) Reviewed-by: Qt Cherry-pick Bot --- .../common/linux/install-golang.sh | 42 +++++++++++++++++++ coin/provisioning/common/linux/install-upx.sh | 42 +++++++++++++++++++ .../common/windows/install-golang.ps1 | 24 +++++++++++ .../common/windows/install-upx.ps1 | 41 ++++++++++++++++++ .../41-install-golang.sh | 7 ++++ .../41-install-upx.sh | 7 ++++ .../41-install-golang.sh | 7 ++++ .../41-install-upx.sh | 7 ++++ .../41-install-golang.sh | 7 ++++ .../41-install-upx.sh | 7 ++++ .../41-install-golang.sh | 7 ++++ .../41-install-upx.sh | 7 ++++ .../41-install-golang.sh | 7 ++++ .../41-install-upx.sh | 7 ++++ .../41-install-golang.sh | 7 ++++ .../41-install-upx.sh | 7 ++++ .../qtci-macos-12-x86_64/31-golang.sh | 7 ++++ .../qtci-macos-12-x86_64/31-upx.sh | 8 ++++ .../qtci-macos-14-arm/31-golang.sh | 7 ++++ coin/provisioning/qtci-macos-14-arm/31-upx.sh | 8 ++++ .../qtci-macos-14-x86_64/31-golang.sh | 7 ++++ .../qtci-macos-14-x86_64/31-upx.sh | 8 ++++ .../12-install-golang.ps1 | 1 + .../12-install-upx.ps1 | 1 + .../12-install-golang.ps1 | 1 + .../12-install-upx.ps1 | 1 + 26 files changed, 282 insertions(+) create mode 100755 coin/provisioning/common/linux/install-golang.sh create mode 100755 coin/provisioning/common/linux/install-upx.sh create mode 100644 coin/provisioning/common/windows/install-golang.ps1 create mode 100644 coin/provisioning/common/windows/install-upx.ps1 create mode 100755 coin/provisioning/qtci-linux-Debian-11.6-aarch64/41-install-golang.sh create mode 100755 coin/provisioning/qtci-linux-Debian-11.6-aarch64/41-install-upx.sh create mode 100755 coin/provisioning/qtci-linux-RHEL-8.6-x86_64/41-install-golang.sh create mode 100755 coin/provisioning/qtci-linux-RHEL-8.6-x86_64/41-install-upx.sh create mode 100755 coin/provisioning/qtci-linux-RHEL-8.8-x86_64/41-install-golang.sh create mode 100755 coin/provisioning/qtci-linux-RHEL-8.8-x86_64/41-install-upx.sh create mode 100755 coin/provisioning/qtci-linux-RHEL-9.0-x86_64/41-install-golang.sh create mode 100755 coin/provisioning/qtci-linux-RHEL-9.0-x86_64/41-install-upx.sh create mode 100755 coin/provisioning/qtci-linux-RHEL-9.2-x86_64/41-install-golang.sh create mode 100755 coin/provisioning/qtci-linux-RHEL-9.2-x86_64/41-install-upx.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/41-install-golang.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/41-install-upx.sh create mode 100755 coin/provisioning/qtci-macos-12-x86_64/31-golang.sh create mode 100755 coin/provisioning/qtci-macos-12-x86_64/31-upx.sh create mode 100755 coin/provisioning/qtci-macos-14-arm/31-golang.sh create mode 100755 coin/provisioning/qtci-macos-14-arm/31-upx.sh create mode 100755 coin/provisioning/qtci-macos-14-x86_64/31-golang.sh create mode 100755 coin/provisioning/qtci-macos-14-x86_64/31-upx.sh create mode 100644 coin/provisioning/qtci-windows-10_22H2-x86_64/12-install-golang.ps1 create mode 100644 coin/provisioning/qtci-windows-10_22H2-x86_64/12-install-upx.ps1 create mode 100644 coin/provisioning/qtci-windows-11_23H2-x86_64/12-install-golang.ps1 create mode 100644 coin/provisioning/qtci-windows-11_23H2-x86_64/12-install-upx.ps1 diff --git a/coin/provisioning/common/linux/install-golang.sh b/coin/provisioning/common/linux/install-golang.sh new file mode 100755 index 00000000000..a4f4cd0dcce --- /dev/null +++ b/coin/provisioning/common/linux/install-golang.sh @@ -0,0 +1,42 @@ +#!/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 + +# shellcheck source=../unix/DownloadURL.sh +source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" +# shellcheck source=../unix/SetEnvVar.sh +source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" + +# This script will install go 1.22.4 +version="1.22.4" + +uname_m="$(uname -m)" +case "$uname_m" in + x86_64|amd64) + sha256="ba79d4526102575196273416239cca418a651e049c2b099f3159db85e7bade7d" + pkgname="go$version.linux-amd64.tar.gz" + dirname="go$version.linux-amd64" + ;; + arm64|aarch64) + sha256="a8e177c354d2e4a1b61020aca3562e27ea3e8f8247eca3170e3fa1e0c2f9e771" + pkgname="go$version.linux-arm64.tar.gz" + dirname="go$version.linux-arm64" + ;; + *) fatal "Unknown architecture in uname: $uname_m" 43 ;; +esac + +internalUrl="http://ci-files01-hki.ci.qt.io/input/go/$pkgname" +externalUrl="https://go.dev/dl/$pkgname" + +targetFile="$HOME/$pkgname" +DownloadURL "$internalUrl" "$externalUrl" "$sha256" "$targetFile" +echo "Installing Go" +tar -xzf "$targetFile" -C "$HOME" +rm "$targetFile" + +installPrefix="/opt/$dirname" +sudo mv "$HOME/go" "$installPrefix" + +SetEnvVar "PATH" "$installPrefix/bin:\$PATH" + +echo "Go = $version" >> ~/versions.txt diff --git a/coin/provisioning/common/linux/install-upx.sh b/coin/provisioning/common/linux/install-upx.sh new file mode 100755 index 00000000000..e2225f09370 --- /dev/null +++ b/coin/provisioning/common/linux/install-upx.sh @@ -0,0 +1,42 @@ +#!/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 + +# shellcheck source=../unix/DownloadURL.sh +source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" +# shellcheck source=../unix/SetEnvVar.sh +source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" + +# This script will install UPX 4.2.4 +version="4.2.4" + +uname_m="$(uname -m)" +case "$uname_m" in + x86_64|amd64) + sha256="75cab4e57ab72fb4585ee45ff36388d280c7afd72aa03e8d4b9c3cbddb474193" + pkgname="upx-$version-amd64_linux.tar.xz" + dirname="upx-$version-amd64_linux" + ;; + arm64|aarch64) + sha256="6bfeae6714e34a82e63245289888719c41fd6af29f749a44ae3d3d166ba6a1c9" + pkgname="upx-$version-arm64_linux.tar.xz" + dirname="upx-$version-arm64_linux" + ;; + *) fatal "Unknown architecture in uname: $uname_m" 43 ;; +esac + +internalUrl="http://ci-files01-hki.ci.qt.io/input/upx/$pkgname" +externalUrl="https://github.com/upx/upx/releases/download/v$version/$pkgname" + +targetFile="$HOME/$pkgname" +DownloadURL "$internalUrl" "$externalUrl" "$sha256" "$targetFile" +echo "Installing UPX" +tar -xJf "$targetFile" -C "$HOME" +rm "$targetFile" + +installPrefix="/opt/$dirname" +sudo mv "$HOME/$dirname" "$installPrefix" + +SetEnvVar "PATH" "$installPrefix:\$PATH" + +echo "UPX = $version" >> ~/versions.txt diff --git a/coin/provisioning/common/windows/install-golang.ps1 b/coin/provisioning/common/windows/install-golang.ps1 new file mode 100644 index 00000000000..d40bcce2844 --- /dev/null +++ b/coin/provisioning/common/windows/install-golang.ps1 @@ -0,0 +1,24 @@ +# 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 +. "$PSScriptRoot\helpers.ps1" + +# Install Git + +$version = "1.22.4" +if (Is64BitWinHost) { + $arch = "amd64" + $sha256 = "3c21105d7b584759b6e266383b777caf6e87142d304a10b539dbc66ab482bb5f" +} else { + $arch = "386" + $sha256 = "5c6446e2ea80bc6a971d2b34446f16e6517e638b0ff8d3ea229228d1931790b0" +} +$goPackage = "C:\Windows\Temp\Go-" + $version + $arch + ".msi" +$url_cache = "\\ci-files01-hki.ci.qt.io\provisioning\windows\Go-" + $version + $arch + ".exe" +$url_official = "https://go.dev/dl/go" + $version + ".windows-" + $arch + ".msi" + +Write-Host "Fetching Go $version..." +Download $url_official $url_cache $goPackage +Verify-Checksum $goPackage $sha256 sha256 +Write-Host "Installing Go $version..." +Run-Executable "msiexec" "/quiet /i $goPackage" +Write-Output "Go = $version" >> ~\versions.txt diff --git a/coin/provisioning/common/windows/install-upx.ps1 b/coin/provisioning/common/windows/install-upx.ps1 new file mode 100644 index 00000000000..e29cc07b488 --- /dev/null +++ b/coin/provisioning/common/windows/install-upx.ps1 @@ -0,0 +1,41 @@ +# Copyright (C) 2019 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" + +$majorminorversion = "4.2" +$version = "4.2.4" + +$cpu_arch = Get-CpuArchitecture +Write-Host "Installing UPX for architecture $cpu_arch" +switch ($cpu_arch) { + x64 { + $arch = "win64" + $sha1 = "204ae110a84d0046b242222f97b19cf3f5594f4b" + } + default { + throw "Unknown architecture $cpu_arch" + } +} + +$filename = "upx-" + $version + "-" + $arch +$filename_zip = $filename + ".zip" + +$zip = Get-DownloadLocation ($filename_zip) +$officialurl = "https://github.com/upx/upx/releases/download/v" + $version + "/" + $filename_zip +$cachedurl = "https://ci-files01-hki.ci.qt.io/input/upx/" + $filename_zip + +Write-Host "Removing old UPX" +Remove "C:\UPX" + +Download $officialurl $cachedurl $zip +Verify-Checksum $zip $sha1 + +Extract-7Zip $zip C: +$defaultinstallfolder = "C:\" + $filename +Rename-Item $defaultinstallfolder C:\UPX + +Add-Path "C:\UPX" + +Write-Output "UPX = $version" >> ~\versions.txt + diff --git a/coin/provisioning/qtci-linux-Debian-11.6-aarch64/41-install-golang.sh b/coin/provisioning/qtci-linux-Debian-11.6-aarch64/41-install-golang.sh new file mode 100755 index 00000000000..6b72bc47515 --- /dev/null +++ b/coin/provisioning/qtci-linux-Debian-11.6-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-Debian-11.6-aarch64/41-install-upx.sh b/coin/provisioning/qtci-linux-Debian-11.6-aarch64/41-install-upx.sh new file mode 100755 index 00000000000..0bccc01efac --- /dev/null +++ b/coin/provisioning/qtci-linux-Debian-11.6-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" diff --git a/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/41-install-golang.sh b/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/41-install-golang.sh new file mode 100755 index 00000000000..6b72bc47515 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/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-RHEL-8.6-x86_64/41-install-upx.sh b/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/41-install-upx.sh new file mode 100755 index 00000000000..0bccc01efac --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-8.6-x86_64/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" diff --git a/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/41-install-golang.sh b/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/41-install-golang.sh new file mode 100755 index 00000000000..6b72bc47515 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/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-RHEL-8.8-x86_64/41-install-upx.sh b/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/41-install-upx.sh new file mode 100755 index 00000000000..0bccc01efac --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/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" diff --git a/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/41-install-golang.sh b/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/41-install-golang.sh new file mode 100755 index 00000000000..6b72bc47515 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/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-RHEL-9.0-x86_64/41-install-upx.sh b/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/41-install-upx.sh new file mode 100755 index 00000000000..0bccc01efac --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-9.0-x86_64/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" diff --git a/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/41-install-golang.sh b/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/41-install-golang.sh new file mode 100755 index 00000000000..6b72bc47515 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/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-RHEL-9.2-x86_64/41-install-upx.sh b/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/41-install-upx.sh new file mode 100755 index 00000000000..0bccc01efac --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/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" diff --git a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/41-install-golang.sh b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/41-install-golang.sh new file mode 100755 index 00000000000..6b72bc47515 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/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-22.04-x86_64/41-install-upx.sh b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/41-install-upx.sh new file mode 100755 index 00000000000..0bccc01efac --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/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" diff --git a/coin/provisioning/qtci-macos-12-x86_64/31-golang.sh b/coin/provisioning/qtci-macos-12-x86_64/31-golang.sh new file mode 100755 index 00000000000..0348d7eb0e1 --- /dev/null +++ b/coin/provisioning/qtci-macos-12-x86_64/31-golang.sh @@ -0,0 +1,7 @@ +#!/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 + +brew install go diff --git a/coin/provisioning/qtci-macos-12-x86_64/31-upx.sh b/coin/provisioning/qtci-macos-12-x86_64/31-upx.sh new file mode 100755 index 00000000000..519900f6dab --- /dev/null +++ b/coin/provisioning/qtci-macos-12-x86_64/31-upx.sh @@ -0,0 +1,8 @@ +#!/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 + +# The package was disabled in brew +#brew install upx diff --git a/coin/provisioning/qtci-macos-14-arm/31-golang.sh b/coin/provisioning/qtci-macos-14-arm/31-golang.sh new file mode 100755 index 00000000000..0348d7eb0e1 --- /dev/null +++ b/coin/provisioning/qtci-macos-14-arm/31-golang.sh @@ -0,0 +1,7 @@ +#!/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 + +brew install go diff --git a/coin/provisioning/qtci-macos-14-arm/31-upx.sh b/coin/provisioning/qtci-macos-14-arm/31-upx.sh new file mode 100755 index 00000000000..519900f6dab --- /dev/null +++ b/coin/provisioning/qtci-macos-14-arm/31-upx.sh @@ -0,0 +1,8 @@ +#!/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 + +# The package was disabled in brew +#brew install upx diff --git a/coin/provisioning/qtci-macos-14-x86_64/31-golang.sh b/coin/provisioning/qtci-macos-14-x86_64/31-golang.sh new file mode 100755 index 00000000000..0348d7eb0e1 --- /dev/null +++ b/coin/provisioning/qtci-macos-14-x86_64/31-golang.sh @@ -0,0 +1,7 @@ +#!/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 + +brew install go diff --git a/coin/provisioning/qtci-macos-14-x86_64/31-upx.sh b/coin/provisioning/qtci-macos-14-x86_64/31-upx.sh new file mode 100755 index 00000000000..f3637b0e9ff --- /dev/null +++ b/coin/provisioning/qtci-macos-14-x86_64/31-upx.sh @@ -0,0 +1,8 @@ +#!/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 + +# The package was disabled in brew +# brew install upx diff --git a/coin/provisioning/qtci-windows-10_22H2-x86_64/12-install-golang.ps1 b/coin/provisioning/qtci-windows-10_22H2-x86_64/12-install-golang.ps1 new file mode 100644 index 00000000000..c68f16a154e --- /dev/null +++ b/coin/provisioning/qtci-windows-10_22H2-x86_64/12-install-golang.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-golang.ps1" diff --git a/coin/provisioning/qtci-windows-10_22H2-x86_64/12-install-upx.ps1 b/coin/provisioning/qtci-windows-10_22H2-x86_64/12-install-upx.ps1 new file mode 100644 index 00000000000..768a15d7714 --- /dev/null +++ b/coin/provisioning/qtci-windows-10_22H2-x86_64/12-install-upx.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-upx.ps1" diff --git a/coin/provisioning/qtci-windows-11_23H2-x86_64/12-install-golang.ps1 b/coin/provisioning/qtci-windows-11_23H2-x86_64/12-install-golang.ps1 new file mode 100644 index 00000000000..c68f16a154e --- /dev/null +++ b/coin/provisioning/qtci-windows-11_23H2-x86_64/12-install-golang.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-golang.ps1" diff --git a/coin/provisioning/qtci-windows-11_23H2-x86_64/12-install-upx.ps1 b/coin/provisioning/qtci-windows-11_23H2-x86_64/12-install-upx.ps1 new file mode 100644 index 00000000000..768a15d7714 --- /dev/null +++ b/coin/provisioning/qtci-windows-11_23H2-x86_64/12-install-upx.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-upx.ps1" From dfaabdea43325cab09b978916d5a20ec0745a1b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8ger=20Hanseg=C3=A5rd?= Date: Tue, 17 Sep 2024 15:49:00 +0200 Subject: [PATCH 139/288] Add missing GStreamer libraries to provisioning of Ubuntu 24.04 x86_64 The missing libraries are needed to make unit tests pass in CI. With this patch, we install the same GStreamer libraries on 24.04 as on 22.04. This follows 02af86d2aad63b17391bb8dfa33d5a9f3b44d415 . Task-number: QTQAINFRA-6098 Change-Id: I9fcb5abe0eba01e1e248eb0eb5aff11de4986235 Reviewed-by: Liang Qi (cherry picked from commit 263624da126f1faea5d7326c6dc0fffdc4cf859b) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/02-apt.sh | 6 ++++++ 1 file changed, 6 insertions(+) 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 75b27462a0e..0aed8bb770a 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 @@ -99,6 +99,12 @@ installPackages+=(libgstreamer-plugins-base1.0-dev) installPackages+=(libgstreamer-plugins-good1.0-dev) installPackages+=(libgstreamer-plugins-bad1.0-dev) installPackages+=(libgstreamer-gl1.0-0) +installPackages+=(gstreamer1.0-libav) +installPackages+=(gstreamer1.0-plugins-base) +installPackages+=(gstreamer1.0-plugins-good) +installPackages+=(gstreamer1.0-plugins-bad) +installPackages+=(gstreamer1.0-plugins-rtp) +installPackages+=(gstreamer1.0-plugins-ugly) installPackages+=(gir1.2-gst-plugins-base-1.0) installPackages+=(gir1.2-gst-plugins-bad-1.0) installPackages+=(yasm) From f4568889f4a4c55844d65ce7a488f76449d1c3ff Mon Sep 17 00:00:00 2001 From: Toni Saario Date: Thu, 23 May 2024 10:23:55 +0300 Subject: [PATCH 140/288] Update and install dotnet on windows on arm MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Required on arm for installing azuresigntool. Task-number: QTQAINFRA-6396 Task-number: QTQAINFRA-6109 Change-Id: Ia0b2a4476338d090bc79d6a6bae46d1f09dc8600 Reviewed-by: Tero Heikkinen Reviewed-by: Simo Fält (cherry picked from commit 437e25844a17befc749def8d960c06733a2f713a) --- .../common/windows/install-dotnet.ps1 | 33 ++++++++++++++----- .../90-install-dotnet.ps1 | 2 ++ 2 files changed, 26 insertions(+), 9 deletions(-) create mode 100644 coin/provisioning/qtci-windows-11_22H2-aarch64/90-install-dotnet.ps1 diff --git a/coin/provisioning/common/windows/install-dotnet.ps1 b/coin/provisioning/common/windows/install-dotnet.ps1 index aea40e861b5..c74849de939 100644 --- a/coin/provisioning/common/windows/install-dotnet.ps1 +++ b/coin/provisioning/common/windows/install-dotnet.ps1 @@ -4,15 +4,30 @@ # This script will install Dotnet SDK which is required for Azure installation -$version = "2.1" -if (Is64BitWinHost) { - $urlCache = "http://ci-files01-hki.ci.qt.io/input/windows/dotnet-sdk-2.1.809-win-x64.exe" - $urlOfficial = "https://download.visualstudio.microsoft.com/download/pr/c980b6fb-e570-4c73-b344-e4dae6573777/f844ac1a4c6ea5de7227a701786126fd/dotnet-sdk-2.1.809-win-x64.exe" - $sha1 = "343e80c2ab558a30696dbe03ad2288bf435d5cd8" -} else { - $urlCache = "http://ci-files01-hki.ci.qt.io/input/windows/dotnet-sdk-2.1.809-win-x86.exe" - $urlOfficial = "https://download.visualstudio.microsoft.com/download/pr/cf86a2f3-f6b2-4959-8e41-cf84b0d2f294/a61e834f56abe2dc2e12599e1a60c10b/dotnet-sdk-2.1.809-win-x86.exe" - $sha1 = "b38a4e1392f17aed110508a1687f1c65b9d86161" +$version = "8.0.300" +$cpu_arch = Get-CpuArchitecture +switch ($cpu_arch) { + arm64 { + $sha1 = "3e68f606b205beeb0a557dad5b01e31d4d833459" + $urlCache = "http://ci-files01-hki.ci.qt.io/input/windows/dotnet-sdk-$version-win-arm64.exe" + $urlOfficial = "https://download.visualstudio.microsoft.com/download/pr/e195e4f5-00ee-4df3-8736-199aacf00b2a/1663c4f5dc168d390aa4507f09200423/dotnet-sdk-$version-win-arm64.exe" + Break + } + x64 { + $urlCache = "http://ci-files01-hki.ci.qt.io/input/windows/dotnet-sdk-$version-win-x64.exe" + $urlOfficial = "https://download.visualstudio.microsoft.com/download/pr/90486d8a-fb5a-41be-bfe4-ad292c06153f/6673965085e00f5b305bbaa0b931cc96/dotnet-sdk-$version-win-x64.exe" + $sha1 = "527321c1eeea964a7c50f6a24473f37400514cd1" + Break + } + x86 { + $urlCache = "http://ci-files01-hki.ci.qt.io/input/windows/dotnet-sdk-$version-win-x86.exe" + $urlOfficial = "https://download.visualstudio.microsoft.com/download/pr/9736c2dc-c21d-4df6-8cb7-9365ed5461a9/4c360dc61c7cb6d26b48d2718341c68e/dotnet-sdk-$version-win-x86.exe" + $sha1 = "f8857b5e06de5c33aee2fb2242f7781f1a65c4ef" + Break + } + default { + throw "Unknown architecture $cpu_arch" + } } $installer = "C:\Windows\Temp\dotnet-sdk-$version.exe" diff --git a/coin/provisioning/qtci-windows-11_22H2-aarch64/90-install-dotnet.ps1 b/coin/provisioning/qtci-windows-11_22H2-aarch64/90-install-dotnet.ps1 new file mode 100644 index 00000000000..a2ecfba2b81 --- /dev/null +++ b/coin/provisioning/qtci-windows-11_22H2-aarch64/90-install-dotnet.ps1 @@ -0,0 +1,2 @@ +. "$PSScriptRoot\..\common\windows\install-dotnet.ps1" + From e1aca355234c6a7951e0830a5b228fcad3cbb41b Mon Sep 17 00:00:00 2001 From: Toni Saario Date: Thu, 23 May 2024 10:25:01 +0300 Subject: [PATCH 141/288] Install azure tools on windows on arm MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Installs azure sign tool. Task-number: QTQAINFRA-6396 Task-number: QTQAINFRA-6109 Change-Id: I4748f9fd911582361ff5a416fa8e8b8b0aa48716 Reviewed-by: Simo Fält (cherry picked from commit cb832944b2242f0db38c6010d7fd54462a722146) --- .../qtci-windows-11_22H2-aarch64/91-install-azure-tool.ps1 | 1 + 1 file changed, 1 insertion(+) create mode 100644 coin/provisioning/qtci-windows-11_22H2-aarch64/91-install-azure-tool.ps1 diff --git a/coin/provisioning/qtci-windows-11_22H2-aarch64/91-install-azure-tool.ps1 b/coin/provisioning/qtci-windows-11_22H2-aarch64/91-install-azure-tool.ps1 new file mode 100644 index 00000000000..f1d5acc390e --- /dev/null +++ b/coin/provisioning/qtci-windows-11_22H2-aarch64/91-install-azure-tool.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-azure-tool.ps1" From 40d9225f487cce03a1faf4e5685074747730bee2 Mon Sep 17 00:00:00 2001 From: Toni Saario Date: Fri, 24 May 2024 11:49:07 +0300 Subject: [PATCH 142/288] Update azure sign tool to 5.0.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The signtool is dependent on dotnet version. This must be updated after the dotnet has been updated. Task-number: QTQAINFRA-6396 Task-number: QTQAINFRA-6109 Change-Id: I346acf6dfefc8e70e61ea05a569ebb5cfcf04c85 Reviewed-by: Simo Fält (cherry picked from commit e752c81add1b5841cac3480478a1c617efbccc3d) --- coin/provisioning/common/windows/install-azure-tool.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/provisioning/common/windows/install-azure-tool.ps1 b/coin/provisioning/common/windows/install-azure-tool.ps1 index 9f82f54e014..ccd5c20d3aa 100644 --- a/coin/provisioning/common/windows/install-azure-tool.ps1 +++ b/coin/provisioning/common/windows/install-azure-tool.ps1 @@ -5,6 +5,6 @@ # This script will install Azure singtool using Dotnet SDK $dotnet = "C:\Program Files\dotnet\dotnet.exe" -$version = "2.0.17" +$version = "5.0.0" Run-Executable "$dotnet" "tool install --global AzureSignTool --version $version" From 587e21bf1719cafa95aadcc3e4fff610511e2a59 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Thu, 13 Jun 2024 11:08:26 +0200 Subject: [PATCH 143/288] add support for ffmpeg on Ubuntu 24.04 arm64 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This follows * 5a79cf916821e0382dbdec3c544af1d280bbd618 adding 90-install-ffmpeg.sh * 83adc86c532f826565729cd963996222033e840c patchelf and -DQT_DEPLOY_FFMPEG=TRUE Task-number: QTBUG-126289 Change-Id: I15300c5be750a784490d1e6cce935aeb423609ab Reviewed-by: Jøger Hansegård Reviewed-by: Artem Dyomin (cherry picked from commit 522ac7fd76d51bc024b4ba2fce3b515cb4a16d96) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/cmake_platforms.yaml | 4 ++-- coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh | 2 ++ .../qtci-linux-Ubuntu-24.04-aarch64/90-install-ffmpeg.sh | 3 +++ 3 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/90-install-ffmpeg.sh diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index d5ba768e830..39cef73146a 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -47,7 +47,7 @@ Configurations: Configure arguments: '-make examples -developer-build -c++std c++20 -linker lld -qtlibinfix TestInfix -qtnamespace TestNamespace -qpa offscreen\;xcb' Environment variables: [ 'COMMON_TEST_CMAKE_ARGS=-DQT_SKIP_DOCKER_COMPOSE=ON', - 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}' + 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE' ] - Id: 'ubuntu-24.04-arm64' @@ -58,7 +58,7 @@ Configurations: Environment variables: [ 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', 'COMMON_TEST_CMAKE_ARGS=-DQT_SKIP_DOCKER_COMPOSE=ON', - 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DINPUT_headersclean=ON' + 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON' ] # Test on Ubuntu 24.04 ARM64 offscreen - 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 aea9e8460c9..8dc03d66bb1 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 @@ -231,6 +231,8 @@ installPackages+=(jq) installPackages+=(cmake) # extra linkers installPackages+=(lld) +# Fix dependencies in shared ffmpeg libs +installPackages+=(patchelf) echo "Running update for apt" waitLoop 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 new file mode 100644 index 00000000000..61da9b7b3a4 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/90-install-ffmpeg.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux" From ae7d959858efe324116651878aa73b36fd002a69 Mon Sep 17 00:00:00 2001 From: Elias Toivola Date: Thu, 19 Sep 2024 14:52:28 +0300 Subject: [PATCH 144/288] Remove Debian arm64 build from platform configs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Config 'debian-11.6-arm64' to build Debian LoA is not needed anymore as its purpose is now done by Ubuntu arm64 target which is based on Debian. Task-number: QTQAINFRA-6129 Change-Id: Ife8a61145e200df30a6f78ba7981b4ed8b5fe5c6 Reviewed-by: Liang Qi Reviewed-by: Simo Fält (cherry picked from commit db4d3efc3cf2d2740f284a3051c8e43c476f203d) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/cmake_platforms.yaml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 39cef73146a..e19068260f5 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -199,16 +199,6 @@ Configurations: 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON' ] -# Build on Debian-11.6 and split test on Wayland and offscreen later -- - Id: 'debian-11.6-arm64' - Template: 'qtci-linux-Debian-11.6-aarch64-50' - Compiler: 'GCC' - Features: ['Packaging', 'UseConfigure', 'InstallQt5Dependencies', 'DoNotRunTests', 'GenerateSBOM', 'VerifySBOM'] - Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-doubleconversion -qt-harfbuzz -no-libudev -bundled-xcb-xinput -qpa offscreen\;xcb' - Environment variables: [ - 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}', - ] - Id: 'ios-universal' Template: 'qtci-macos-13-x86_64-103' From 05792979affe4d6754b524f062953dd93c66c0a9 Mon Sep 17 00:00:00 2001 From: Tero Heikkinen Date: Tue, 20 Aug 2024 13:53:22 +0300 Subject: [PATCH 145/288] Provisioning: Install nodejs to Ubuntu 24.04 arm64 Fixes: QTQAINFRA-6509 Change-Id: I91bfbb24dadaf74707496ed1167de684b2f9dd61 Reviewed-by: Liang Qi (cherry picked from commit 9be8bb7ea6ba125cbbda0b8326e42013b1ea7805) --- .../qtci-linux-Ubuntu-24.04-aarch64/03-install-nodejs.sh | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/03-install-nodejs.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/03-install-nodejs.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/03-install-nodejs.sh new file mode 100644 index 00000000000..981ca727230 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/03-install-nodejs.sh @@ -0,0 +1,6 @@ +#!/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=../common/linux/install-nodejs.sh +source "${BASH_SOURCE%/*}/../common/linux/install-nodejs.sh" From cdaa9b540c0bcbb48e5cc59cae88b08d53a4e41e Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 27 Sep 2024 01:03:56 +0000 Subject: [PATCH 146/288] Update submodules on '6.8 in qt/qt5' Change-Id: I23b88c209c595a32f7bc42a38a9cc5a1c4766ade 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 d60e2d445b0..f657e0b1935 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit d60e2d445b00ec9582c1464bc0bda1cf0eaed0be +Subproject commit f657e0b1935d147d6896afee154d136c42d2b406 diff --git a/qt5compat b/qt5compat index bdeecc1b6b7..39f896738d8 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit bdeecc1b6b7b94a061a4f17f8ae3361baf7348c0 +Subproject commit 39f896738d8181eff86ef127a5e2d53e8d5013f4 diff --git a/qtactiveqt b/qtactiveqt index 0c3acae95cc..fc90435c005 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 0c3acae95cc9da66e16021d243a52c7b840708a0 +Subproject commit fc90435c0050cb2f09e27b7c79411e8c639d0227 diff --git a/qtbase b/qtbase index 893dc6d772f..c1b13a0c5ff 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 893dc6d772f53d8ba44165397d79a2dbc762a6a7 +Subproject commit c1b13a0c5ffa2589d9fa6e11d4a215fa38e4b02a diff --git a/qtcharts b/qtcharts index 48dd53757f9..e9fd711d75f 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 48dd53757f99a437ae9002ae28f8dc9967d71277 +Subproject commit e9fd711d75f997815ba101630d1a302fef1b87ad diff --git a/qtcoap b/qtcoap index 315bb25a75b..f78dedfbe76 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit 315bb25a75bfa638b49505031800f3c50bcef5cd +Subproject commit f78dedfbe76aa874de2e1e534a6293cae09661af diff --git a/qtconnectivity b/qtconnectivity index 2127a595b49..9b8860a7c48 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 2127a595b49b4e3ebb2900e66ba6754b1742495c +Subproject commit 9b8860a7c48d23e030159d03d39981ca72544224 diff --git a/qtdatavis3d b/qtdatavis3d index ee070e42766..f0e79f912a3 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit ee070e427661249465b064f6b041f64ed516ecea +Subproject commit f0e79f912a34e4ea156c6ef65231b2e245554249 diff --git a/qtdeclarative b/qtdeclarative index a6e32c939e8..06e9fa1b243 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit a6e32c939e8d34839a74f97a4265aeb45266e52d +Subproject commit 06e9fa1b24314872dce61fec10de6d186f63c1e3 diff --git a/qtdoc b/qtdoc index 1b013a03909..0e571aaf1d2 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 1b013a03909df6785ef3aa926837ed1e897db591 +Subproject commit 0e571aaf1d2bf78a0dcff57668191ad58dfe7406 diff --git a/qtgraphs b/qtgraphs index caa1d61b1ab..430b7a7ed7d 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit caa1d61b1abbdd2ad2b7f7b0db4e6f56e859bd97 +Subproject commit 430b7a7ed7dea486174393b23b8556fbe1cf13e0 diff --git a/qtgrpc b/qtgrpc index 861b3f68444..67b923173d5 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit 861b3f6844489b3808fd12bacda6080d3c8f2798 +Subproject commit 67b923173d5bf12564a2511061444f4520de9f20 diff --git a/qthttpserver b/qthttpserver index 5419515d947..349b93be62a 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit 5419515d947de4a5c079f5f02121f1ae65d5152e +Subproject commit 349b93be62a402c2545685c957632126dfdd8dba diff --git a/qtimageformats b/qtimageformats index 3eaefea887a..f1ca97de724 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 3eaefea887a07b0697027a5cebc0e2577499a707 +Subproject commit f1ca97de724d00a59fa48a4bdb8b0009b337f0c3 diff --git a/qtlanguageserver b/qtlanguageserver index c0c9f25a15c..6d3d806852c 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit c0c9f25a15cd54492cd5cb98163eae61a23ef6e7 +Subproject commit 6d3d806852c6d7ef059b4f93e9b37141068e48c3 diff --git a/qtlocation b/qtlocation index eec9fa59eef..df7d4595c1f 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit eec9fa59eef0c3b5f02f06532a3519d642e2a037 +Subproject commit df7d4595c1f878de1bb8587ad09960b229c21d52 diff --git a/qtlottie b/qtlottie index 631bbef4123..564b7c80c9a 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 631bbef41238533ec2bf9ff5fe237667cea1ea5f +Subproject commit 564b7c80c9a185a664b3be0bb60d9a41687e8e0e diff --git a/qtmqtt b/qtmqtt index c8236b17e51..17796f12a4a 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit c8236b17e51cec51a71483437213d438484de4f4 +Subproject commit 17796f12a4aa8e6f76ba22ab04b0499a453755d8 diff --git a/qtmultimedia b/qtmultimedia index f21d55c67f0..e986c4a0ccf 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit f21d55c67f0ce27dd31298f0b95967bee126a72e +Subproject commit e986c4a0ccf61c05cef96381a76c8e2eedfc5966 diff --git a/qtnetworkauth b/qtnetworkauth index 71a856a1ef8..5a565f88c36 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 71a856a1ef8a2b5c3f8b63ce6223655be2ea012a +Subproject commit 5a565f88c3624324d5071d8765edd4b54cbe0ad7 diff --git a/qtopcua b/qtopcua index ccb8caab8fa..dca88682615 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit ccb8caab8fae71a38b617ef9302d872643cf7627 +Subproject commit dca88682615e5b6db75917d81586fddaf193bd39 diff --git a/qtpositioning b/qtpositioning index 3f33d28148a..db580cf8f13 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit 3f33d28148ac21d9241e384f4cf2f8e0ebd6667f +Subproject commit db580cf8f1367a5842e4a44cc02218711b240b1a diff --git a/qtquick3d b/qtquick3d index 84193a94a59..5ce6dba17e4 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 84193a94a59730a976266ca69efdafc64a928f98 +Subproject commit 5ce6dba17e4843264249acb14f963bc973609271 diff --git a/qtquick3dphysics b/qtquick3dphysics index abd5ed23a95..ce8352677bb 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit abd5ed23a95c8ee81c27a3ed8a6bc7990907004b +Subproject commit ce8352677bbe7f796d2b2714cb46c294319de1be diff --git a/qtquickeffectmaker b/qtquickeffectmaker index 55e4c95a800..55db014a33d 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit 55e4c95a800f53a4c81f8220931e3d856b0b0715 +Subproject commit 55db014a33de7347f820d57d0713531885c90d71 diff --git a/qtquicktimeline b/qtquicktimeline index e9e6ac72b99..ff68e2e2189 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit e9e6ac72b99d44416de59e394f90e2c10e73ff50 +Subproject commit ff68e2e21898ca41a92c1aaa9fd298ee34100929 diff --git a/qtremoteobjects b/qtremoteobjects index e324fded9ef..0b1e487ba34 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit e324fded9efb7c7e3ff22edf99bd3680bb5cb031 +Subproject commit 0b1e487ba3431fc1a456f1d39bdcdce0aab0cd96 diff --git a/qtrepotools b/qtrepotools index 5bede66a74e..56f21565346 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 5bede66a74ebb2cc0bf3edb3b5725214c97dfdd8 +Subproject commit 56f21565346ec229b12faa762d052a0f67404bc5 diff --git a/qtscxml b/qtscxml index 9fece9db58c..91330899706 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 9fece9db58ceccdc171923b0e7a02f5a41dc5df9 +Subproject commit 9133089970634d3cdbc81b54a7a6da18dfe034b7 diff --git a/qtsensors b/qtsensors index e79a0635c75..45b7eb027bb 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit e79a0635c7583836c18703b5565128a190167394 +Subproject commit 45b7eb027bb4ccc7d8ade3471c1734cc47c81b4d diff --git a/qtserialbus b/qtserialbus index 7f8944c226c..9b9e3d66b96 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 7f8944c226c1f85f8ee68f34a324d71bb0a595d3 +Subproject commit 9b9e3d66b96a85fdb4a9e1ee07de020db7db2d88 diff --git a/qtserialport b/qtserialport index 9f6d070f979..37855a74afe 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 9f6d070f97906a312a466eb3a778f5388e5685e2 +Subproject commit 37855a74afe7cbc63430d45fd8d9aea81a1b565d diff --git a/qtshadertools b/qtshadertools index 2f549300ab4..b55945255bd 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 2f549300ab4f92d96216f26a3b61e03ec37f347b +Subproject commit b55945255bdad6e998dbc3a84166edd255fc9284 diff --git a/qtspeech b/qtspeech index d0c10d389f7..71af6181c17 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit d0c10d389f7a7f927c403e83bf6086be3619b44c +Subproject commit 71af6181c17433248f1fc23c9a805d9e313ca23e diff --git a/qtsvg b/qtsvg index 8fd10b41923..bfb351c8cbe 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 8fd10b41923715b047f09449abe591389ba59033 +Subproject commit bfb351c8cbe679db90fa79ae2bdebb76c9487062 diff --git a/qttools b/qttools index 547410a5b51..0001c690356 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 547410a5b511ec4584953136b9c066525c14732e +Subproject commit 0001c6903562e170f623ca7f504883052e3ad7db diff --git a/qttranslations b/qttranslations index dd971b199a1..1adf1fe1e76 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit dd971b199a11440bd422a184975dda01dccc4d9f +Subproject commit 1adf1fe1e760fc207552d0fad2cde66e8b160880 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index eed40e1eee5..cba42ffd348 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit eed40e1eee559b46144e7d6c2ede33c4fc87633d +Subproject commit cba42ffd3488afb0119c6c662fdc509bed06f98d diff --git a/qtwayland b/qtwayland index 1ac84aab428..98bbf9fded1 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 1ac84aab428dba24f2df7486fe553bf2c4ea022e +Subproject commit 98bbf9fded1597e59a7d695b24f495139e9d2479 diff --git a/qtwebchannel b/qtwebchannel index d64d78c373f..cde92e22072 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit d64d78c373fc7329a2e6c7810e4fc39305ade313 +Subproject commit cde92e22072fd4a6e14ab0f7371cf491ef657015 diff --git a/qtwebengine b/qtwebengine index b75ae0661e7..85b14b5455c 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit b75ae0661e7cd894adc89d6d6955f0dcb2dcefe1 +Subproject commit 85b14b5455c6f75d048c6163f7317a4b477a4c2b diff --git a/qtwebsockets b/qtwebsockets index 49fd7f6a3d2..aa13d51c089 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 49fd7f6a3d2dbaff83af956db1e8260f7f258e40 +Subproject commit aa13d51c08950b15bfb28c93139b9e20702d7bfb diff --git a/qtwebview b/qtwebview index 3d36b5c9931..5d9c0aebcd7 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 3d36b5c9931748a351f86736ad4e0903560c840b +Subproject commit 5d9c0aebcd79d58ec96ec12843165e60ebfb30a3 From ac13495b0cc27ec127675d23f9c9d6d64d7b2063 Mon Sep 17 00:00:00 2001 From: Tero Heikkinen Date: Tue, 3 Sep 2024 11:47:45 +0300 Subject: [PATCH 147/288] Provisioning: Make Windows on ARM tests as blocking in CI Tests have been monitored and passing now [CI Platforms] Task-number: QTQAINFRA-6109 Task-number: QTQAINFRA-6110 Task-number: QTQAINFRA-6396 Change-Id: I321123e08a4a910a9c7effb5d640773adf8a898c Reviewed-by: Oliver Wolff Reviewed-by: Jukka Jokiniva (cherry picked from commit 6ed781232a489fcb443a371b91d7d17e4fe6c44c) 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 e19068260f5..4544731aacf 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -156,7 +156,7 @@ Configurations: Id: 'windows-11_22h2-arm64-msvc2022' Template: 'qtci-windows-11_22H2-aarch64-54' Compiler: 'MSVC2022' - Features: ['Packaging', 'DebugAndRelease', 'UseConfigure', 'InsignificantTests', 'GenerateSBOM', 'VerifySBOM'] + Features: ['Packaging', 'DebugAndRelease', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib -no-sql-psql -no-opengl' Environment variables: [ 'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_arm64}}\..', From dafff66c2d6a97f03419c2784a8c34adf0118094 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 27 Sep 2024 10:58:07 +0200 Subject: [PATCH 148/288] Provisioning: Install libicu to /usr/local on Ubuntu 24.04 arm64 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This amends 86a9bd1bb2c42d1ef45b72610a0a8d6dce307a5c . Pick-to: 6.8.0 Task-number: QTQAINFRA-6510 Task-number: QTBUG-129422 Change-Id: I7ffa5c23dda20fbe3a32e302adc20d2b8e41f52f Reviewed-by: Simo Fält (cherry picked from commit 10da0ba4a342a93afdb4d57ef62a84c251991cdc) Reviewed-by: Qt Cherry-pick Bot --- .../qtci-linux-Ubuntu-24.04-aarch64/30-install_icu.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/30-install_icu.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/30-install_icu.sh index f56ade93a16..b565e686c97 100644 --- a/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/30-install_icu.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/30-install_icu.sh @@ -10,8 +10,8 @@ set -ex # This script will install ICU icuVersion="73.2" -icuLocationLib="/opt/icu/lib64" -icuLocationInclude="/opt/icu/include" +icuLocationLib="/usr/local/lib" +icuLocationInclude="/usr/local/include" sha1="82f3ed54fd7ea8ff469d9000164e4dc23378fc8c" baseBinaryPackageURL="http://ci-files01-hki.ci.qt.io/input/icu/$icuVersion/icu-linux-g++-Ubuntu24.04-aarch64.7z" baseBinaryPackageExternalURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Ubuntu24.04-aarch64.7z" @@ -38,7 +38,7 @@ DownloadURL "$develPackageURL" "$develPackageExternalURL" "$sha1Dev" "$targetFil 7z x -y -o"$tempDir" "$targetFile" sudo cp -a "$tempDir"/lib/* "$icuLocationLib" -sudo cp -a "$tempDir"/* /opt/icu/ +sudo cp -a "$tempDir"/include/* "$icuLocationInclude" sudo rm "$targetFile" sudo rm -fr "$tempDir" From 555085ae8dda509683cde893ad9706434711f883 Mon Sep 17 00:00:00 2001 From: Elias Toivola Date: Thu, 6 Jun 2024 15:32:13 +0300 Subject: [PATCH 149/288] Provisioning: Add Red Hat 8.10 as non-blocking in CI MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit RHEL-8.10 will be run in parallel with RHEL-8.8 in CI as non-blocking until RHEL-8.10 is confirmed stable, then it will replace RHEL-8.8. Task-number: QTQAINFRA-6367 Change-Id: I4b470754895a72be026e869eb4e4d273eb3801b4 (cherry picked from commit ba9d0e2e4e5682e71abd9ace7de348eecb82c5f4) Reviewed-by: Tero Heikkinen Reviewed-by: Simo Fält --- coin/platform_configs/cmake_platforms.yaml | 11 ++ .../cmake_platforms_target_android.yaml | 32 ++++ coin/platform_configs/flashing-wizard.yaml | 5 + .../linux_android_tests_developer.yaml | 15 ++ .../linux_android_tests_multi_abi.yaml | 27 +++ coin/platform_configs/qt-creator.yaml | 6 + .../qtsaferenderer-runtime.yaml | 1 + coin/platform_configs/qtsaferenderer.yaml | 11 ++ .../tqtc-android-automotive.yaml | 37 +++- coin/platform_configs/tqtc-qtpip.yaml | 1 + .../README_MANUAL_INSTALLATIONS | 62 ++++++ .../01-disable-automounting.sh | 15 ++ .../01-disable_net_lso.sh | 3 + .../01-install_telegraf.sh | 3 + .../01-refresh-subscription-manager.sh | 18 ++ .../01-remove_network_manager_secret_key.sh | 11 ++ .../01-remove_stable-privacy.sh | 8 + .../01-set-ulimit.sh | 8 + .../01-systemsetup.sh | 29 +++ .../03-enable-repos.sh | 34 ++++ .../03-install-gcc-toolset.sh | 10 + .../04-install-packages.sh | 178 ++++++++++++++++++ .../qtci-linux-RHEL-8.10-x86_64/04-p7zip.sh | 17 ++ .../05-install-patchelf.sh | 5 + .../05-libclang-v100-dyn.sh | 8 + .../05-libclang.sh | 8 + .../05-mount-vcpkg-cache-drive.sh | 8 + .../09-disable_selinux.sh | 9 + .../qtci-linux-RHEL-8.10-x86_64/09-openssl.sh | 10 + .../qtci-linux-RHEL-8.10-x86_64/20-sccache.sh | 3 + .../22-mqtt_broker.sh | 7 + .../qtci-linux-RHEL-8.10-x86_64/30-fbx.sh | 8 + .../30-install-conan.sh | 8 + .../30-install-git.sh | 8 + .../30-install_icu.sh | 46 +++++ .../35-install-breakpad.sh | 8 + .../40-android_linux.sh | 9 + .../40-install-cmake.sh | 13 ++ .../41-install-vcpkg.sh | 6 + .../42-install-vcpkg-ports.sh | 14 ++ .../50-openssl_for_android_linux.sh | 9 + .../60-install_protobuf.sh | 10 + .../61-install_grpc.sh | 10 + .../70-install_QemuGA.sh | 11 ++ .../70-install_dwz.sh | 12 ++ .../90-bootstrap-autostart.sh | 3 + .../90-install-ffmpeg.sh | 8 + .../qtci-linux-RHEL-8.10-x86_64/90-mimer.sh | 8 + .../qtci-linux-RHEL-8.10-x86_64/90-squish.sh | 6 + .../qtci-linux-RHEL-8.10-x86_64/99-cleanup.sh | 8 + .../99-enable_test_stacktraces.sh | 8 + .../qtci-linux-RHEL-8.10-x86_64/99-version.sh | 18 ++ 52 files changed, 830 insertions(+), 1 deletion(-) create mode 100644 coin/pre-provisioning/qtci-linux-RHEL-8.10-x86_64/README_MANUAL_INSTALLATIONS create mode 100644 coin/provisioning/qtci-linux-RHEL-8.10-x86_64/01-disable-automounting.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-8.10-x86_64/01-disable_net_lso.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-8.10-x86_64/01-install_telegraf.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-8.10-x86_64/01-refresh-subscription-manager.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-8.10-x86_64/01-remove_network_manager_secret_key.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-8.10-x86_64/01-remove_stable-privacy.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-8.10-x86_64/01-set-ulimit.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-8.10-x86_64/01-systemsetup.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-8.10-x86_64/03-enable-repos.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-8.10-x86_64/03-install-gcc-toolset.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-8.10-x86_64/04-install-packages.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-8.10-x86_64/04-p7zip.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-8.10-x86_64/05-install-patchelf.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-8.10-x86_64/05-libclang-v100-dyn.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-8.10-x86_64/05-libclang.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-8.10-x86_64/05-mount-vcpkg-cache-drive.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-8.10-x86_64/09-disable_selinux.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-8.10-x86_64/09-openssl.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-8.10-x86_64/20-sccache.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-8.10-x86_64/22-mqtt_broker.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-8.10-x86_64/30-fbx.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-8.10-x86_64/30-install-conan.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-8.10-x86_64/30-install-git.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-8.10-x86_64/30-install_icu.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-8.10-x86_64/35-install-breakpad.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-8.10-x86_64/40-android_linux.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-8.10-x86_64/40-install-cmake.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-8.10-x86_64/41-install-vcpkg.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-8.10-x86_64/42-install-vcpkg-ports.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-8.10-x86_64/50-openssl_for_android_linux.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-8.10-x86_64/60-install_protobuf.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-8.10-x86_64/61-install_grpc.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-8.10-x86_64/70-install_QemuGA.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-8.10-x86_64/70-install_dwz.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-8.10-x86_64/90-bootstrap-autostart.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-8.10-x86_64/90-install-ffmpeg.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-8.10-x86_64/90-mimer.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-8.10-x86_64/90-squish.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-8.10-x86_64/99-cleanup.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-8.10-x86_64/99-enable_test_stacktraces.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-8.10-x86_64/99-version.sh diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 4544731aacf..c6d57caa810 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -189,6 +189,17 @@ Configurations: 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON' ] +- + Id: 'rhel-8.10' + Template: 'qtci-linux-RHEL-8.10-x86_64-50' + Compiler: 'GCC' + Features: ['InsignificantTests', 'Sccache', 'UseConfigure', 'InstallQt5Dependencies'] + 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}}', + 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON' + ] + - Id: 'rhel-9.2' Template: 'qtci-linux-RHEL-9.2-x86_64-51' diff --git a/coin/platform_configs/cmake_platforms_target_android.yaml b/coin/platform_configs/cmake_platforms_target_android.yaml index be7c33c558a..02190c617ae 100644 --- a/coin/platform_configs/cmake_platforms_target_android.yaml +++ b/coin/platform_configs/cmake_platforms_target_android.yaml @@ -47,6 +47,22 @@ Configurations: 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}', 'ANDROID_EMULATOR=emulator_x86_api_28' ] +- + Id: 'android-9-x86-on-linux-rhel-8.10' + Template: 'qtci-linux-RHEL-8.10-x86_64-50' + Target os: 'Android_ANY' + Target arch: 'x86' + Compiler: 'GCC' + Target compiler: 'Clang' + Platform dependency: 'rhel-8.10' + Features: ['InsignificantTests', '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', + '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}} -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_api_28' + ] - Id: 'android-14-x86_64-on-linux' Template: 'qtci-linux-RHEL-8.8-x86_64-50' @@ -63,3 +79,19 @@ Configurations: 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}', 'ANDROID_EMULATOR=emulator_x86_64_api_34' ] +- + Id: 'android-14-x86_64-on-linux-rhel-8.10' + Template: 'qtci-linux-RHEL-8.10-x86_64-50' + Target os: 'Android_ANY' + Target arch: 'x86_64' + Compiler: 'GCC' + Target compiler: 'Clang' + Platform dependency: 'rhel-8.10' + Features: ['InsignificantTests', '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}} -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' + ] diff --git a/coin/platform_configs/flashing-wizard.yaml b/coin/platform_configs/flashing-wizard.yaml index d14647d1ae7..4df801785de 100644 --- a/coin/platform_configs/flashing-wizard.yaml +++ b/coin/platform_configs/flashing-wizard.yaml @@ -28,6 +28,11 @@ Configurations: Compiler: 'GCC' Features: ['Packaging', 'UseLegacyInstructions'] Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -openssl -qt-harfbuzz QMAKE_LFLAGS_APP+=-s -static -no-icu' + - + Template: 'qtci-linux-RHEL-8.10-x86_64-50' + Compiler: 'GCC' + Features: ['InsignificantTests', 'UseLegacyInstructions'] + Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -openssl -qt-harfbuzz QMAKE_LFLAGS_APP+=-s -static -no-icu' - Template: 'qtci-linux-Ubuntu-18.04-x86_64-50' Compiler: 'GCC' diff --git a/coin/platform_configs/linux_android_tests_developer.yaml b/coin/platform_configs/linux_android_tests_developer.yaml index c792158f6e8..9d6a90c0dc1 100644 --- a/coin/platform_configs/linux_android_tests_developer.yaml +++ b/coin/platform_configs/linux_android_tests_developer.yaml @@ -15,3 +15,18 @@ Configurations: 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}', 'NON_QTBASE_TARGET_CMAKE_ARGS=', 'ANDROID_EMULATOR=emulator_x86_api_28'] +- + Id: 'android-x86-developer-build-testrun-on-linux-rhel-8.10' + Template: 'qtci-linux-RHEL-8.10-x86_64-50' + Target os: 'Android_ANY' + Target arch: 'x86' + Compiler: 'GCC' + Target compiler: 'Clang' + Platform dependency: 'rhel-8.10' + Features: ['InsignificantTests', '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}}', + '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/linux_android_tests_multi_abi.yaml b/coin/platform_configs/linux_android_tests_multi_abi.yaml index 3477bce542d..6b149c53862 100644 --- a/coin/platform_configs/linux_android_tests_multi_abi.yaml +++ b/coin/platform_configs/linux_android_tests_multi_abi.yaml @@ -26,3 +26,30 @@ Configurations: 'COMMON_TARGET_TEST_CMAKE_ARGS=-DQT_ANDROID_ABIS="x86;x86_64"', 'ANDROID_EMULATOR=emulator_x86_api_28' ] +- + Id: 'android-9-multi-abi-rhel-8.10' + Template: 'qtci-linux-RHEL-8.10-x86_64-50' + Target os: 'Android_ANY' + Target arch: 'multi' + Compiler: 'GCC' + Target compiler: 'Clang' + Platform dependency: [ + 'rhel-8.10', + 'android-9-x86-on-linux-rhel-8.10', + 'android-14-x86_64-on-linux-rhel-8.10' + ] + Features: [ + 'Sccache', + 'InsignificantTests', + 'WarningsAreErrors', + 'AndroidTestRun', + 'MinimalAndroidMultiABITests', + 'InstallDepsPerPlatformSubdir' + ] + 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-rhel-8.10', + 'QT_CI_ARTIFACT_ID_PATH_Android-x86_64=QT_CI_ARTIFACT_ID_PATH_android-14-x86_64-on-linux-rhel-8.10', + 'COMMON_TARGET_TEST_CMAKE_ARGS=-DQT_ANDROID_ABIS="x86;x86_64"', + 'ANDROID_EMULATOR=emulator_x86_api_28' + ] diff --git a/coin/platform_configs/qt-creator.yaml b/coin/platform_configs/qt-creator.yaml index f206bffb01a..eed0f0954e7 100644 --- a/coin/platform_configs/qt-creator.yaml +++ b/coin/platform_configs/qt-creator.yaml @@ -21,6 +21,12 @@ Configurations: Features: ['Packaging', 'Sccache', 'DebugAndRelease'] Configure arguments: '' Environment variables: [] +- + Template: 'qtci-linux-RHEL-8.10-x86_64-50' + Compiler: 'GCC' + Features: ['InsignificantTests', 'Sccache', 'DebugAndRelease'] + Configure arguments: '' + Environment variables: [] - Template: 'qtci-macos-14-arm-106' Compiler: 'Clang' diff --git a/coin/platform_configs/qtsaferenderer-runtime.yaml b/coin/platform_configs/qtsaferenderer-runtime.yaml index a95c0295fcd..29cee966e92 100644 --- a/coin/platform_configs/qtsaferenderer-runtime.yaml +++ b/coin/platform_configs/qtsaferenderer-runtime.yaml @@ -14,6 +14,7 @@ Include: [ "windows-10_22h2-msvc2022", "windows-10_22h2-msvc2019-developer-build", "rhel-8.8", + "rhel-8.10", "windows-10_22h2-mingw13", "windows-10_22h2-mingw13-developer-build", "windows-10_22h2-llvm", diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index 744148f7567..3da3fc3a1ef 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -13,6 +13,7 @@ Include: [ "windows-10_22h2-msvc2019", "windows-10_22h2-msvc2022", "rhel-8.8", + "rhel-8.10", "windows-10_22h2-mingw13", "windows-10_22h2-llvm", "windows-11_23H2-msvc2019" @@ -45,6 +46,16 @@ Configurations: 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', 'NON_QTBASE_CMAKE_ARGS=-DINPUT_headersclean=ON' ] +- + Id: 'Linux-RHEL_8_10_Static' + Template: 'qtci-linux-RHEL-8.10-x86_64-50' + Compiler: 'GCC' + Features: ['InsignificantTests', 'Sccache', 'UseConfigure', 'MinimalStaticTests'] + Configure arguments: '-static -no-icu -nomake examples -release -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput -no-sql-mysql' + Environment variables: [ + 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', + 'NON_QTBASE_CMAKE_ARGS=-DINPUT_headersclean=ON' + ] - Id: 'Windows-MSVC2019_Static' Template: 'qtci-windows-10_22H2-x86_64-52' diff --git a/coin/platform_configs/tqtc-android-automotive.yaml b/coin/platform_configs/tqtc-android-automotive.yaml index 68f22659a69..f2609502508 100644 --- a/coin/platform_configs/tqtc-android-automotive.yaml +++ b/coin/platform_configs/tqtc-android-automotive.yaml @@ -2,6 +2,7 @@ Version: 2 Include: [ cmake_platforms.yaml: [ 'rhel-8.8', + "rhel-8.10", 'windows-10_22h2-mingw13', 'ubuntu-22.04-documentation', 'ubuntu-22.04-documentation-x11-tests' @@ -13,7 +14,9 @@ Include: [ 'android-arm64-on-macos', 'android-armv7-on-windows', 'android-9-x86-on-linux', - 'android-14-x86_64-on-linux' + 'android-9-x86-on-linux-rhel-8.10', + 'android-14-x86_64-on-linux', + 'android-14-x86_64-on-linux-rhel-8.10' ] ] Configurations: @@ -33,6 +36,22 @@ Configurations: 'NON_QTBASE_TARGET_CMAKE_ARGS= -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', 'ANDROID_EMULATOR=automotive_emulator_x86_64_api_34' ] +- + Id: "automotive-android-14-x86_64-on-linux-rhel-8.10" + Template: 'qtci-linux-RHEL-8.10-x86_64-50' + Target os: 'Android_ANY' + Target arch: 'x86_64' + Compiler: 'GCC' + Target compiler: 'Clang' + Platform dependency: 'rhel-8.10' + Features: ['InsignificantTests', '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}}', + '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' + ] - Id: "automotive-android-10-x86_64-on-linux" Template: 'qtci-linux-RHEL-8.8-x86_64-50' @@ -49,3 +68,19 @@ Configurations: 'NON_QTBASE_TARGET_CMAKE_ARGS= -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', 'ANDROID_EMULATOR=automotive_emulator_x86_64_api_29' ] +- + Id: "automotive-android-10-x86_64-on-linux-rhel-8.10" + Template: 'qtci-linux-RHEL-8.10-x86_64-50' + Target os: 'Android_ANY' + Target arch: 'x86_64' + Compiler: 'GCC' + Target compiler: 'Clang' + Platform dependency: 'rhel-8.10' + Features: ['InsignificantTests', '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}}', + '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/platform_configs/tqtc-qtpip.yaml b/coin/platform_configs/tqtc-qtpip.yaml index 7bc0741ea73..f70579aa6c6 100644 --- a/coin/platform_configs/tqtc-qtpip.yaml +++ b/coin/platform_configs/tqtc-qtpip.yaml @@ -3,6 +3,7 @@ Module only: true Include: [ cmake_platforms.yaml: [ "windows-10_22h2-msvc2019", + "rhel-8.10", "rhel-8.8" ], macos.yaml: [ diff --git a/coin/pre-provisioning/qtci-linux-RHEL-8.10-x86_64/README_MANUAL_INSTALLATIONS b/coin/pre-provisioning/qtci-linux-RHEL-8.10-x86_64/README_MANUAL_INSTALLATIONS new file mode 100644 index 00000000000..12fce8ed702 --- /dev/null +++ b/coin/pre-provisioning/qtci-linux-RHEL-8.10-x86_64/README_MANUAL_INSTALLATIONS @@ -0,0 +1,62 @@ +### RED HAT ENTERPRISE LINUX 8.10 ### + +Language: English (United States) +Time & Date: Etc/Coordinated Universal Time +Software Selection: Server with GUI +Installation Destination: Automatic partitioning selected +Root Passowrd: Set +Network & Host..: Connect +User Creation +Beging Installation + +Reboot + +Licensing: Accept +Finish Configuration + +gnome-initial-setup: +Language: English (US) +Typing:English (US) +Privacy: Location Services: OFF +Connect Your Online Accounts: Skip +Start Using Red Hat Enterprise Linux + +# Add user to sudoers +Add 'qt ALL=NOPASSWD: ALL' to /etc/sudoers.d/qt + +# Configure Settings + Notifications: + * Notification Popups: OFF + * Lock Screen Notifications: OFF + Privacy: + * Screen Lock: OFF + Power: + * Blank screen: Never + Details: + * Time & Date: Time Zone: UTC + * run "sudo timedatectl set-timezone Etc/UTC" + * Users: Automatic login on + +Add 'GRUB_GFXMODE=1280x800' to /etc/default/grub +sudo grub2-mkconfig -o /etc/grub2.cfg +sudo grub2-mkconfig -o /boot/grub2/grub.cfg + +# Add support for virtio driver +su +echo "add_drivers+=\" virtio-blk \"" >> /etc/dracut.conf.d/virtio.conf +dracut -f + +# Do these from Opennebula UI! + +# Enable network connection from right upper corner + + Devices: + * Displays: Resolution 1280 x 800 + +# Fetch and run coin-setup +Download http://coin/coin/binary/linux_amd64/coin-setup +# run as qt user +chmod 755 coin-setup +run './coin-setup' + +Reboot diff --git a/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/01-disable-automounting.sh b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/01-disable-automounting.sh new file mode 100644 index 00000000000..c9d490b1c3b --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/01-disable-automounting.sh @@ -0,0 +1,15 @@ +#!/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 + +sudo tee -a /etc/dconf/db/local.d/00-media-automount <<"EOF" +[org/gnome/desktop/media-handling] +automount=false +automount-open=false +EOF + +sudo dconf update + diff --git a/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/01-disable_net_lso.sh b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/01-disable_net_lso.sh new file mode 100644 index 00000000000..4da6aaaa453 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/01-disable_net_lso.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +echo "ETHTOOL_OPTS='-K \${DEVICE} tso off'" | sudo tee -a /etc/sysconfig/network-scripts/ifcfg-Wired_connection_1 diff --git a/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/01-install_telegraf.sh b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/01-install_telegraf.sh new file mode 100644 index 00000000000..729f90035bc --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/01-install_telegraf.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/unix/telegraf_install.sh diff --git a/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/01-refresh-subscription-manager.sh b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/01-refresh-subscription-manager.sh new file mode 100644 index 00000000000..51417f1b24e --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/01-refresh-subscription-manager.sh @@ -0,0 +1,18 @@ +#!/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 -e + +curl --retry 5 --retry-delay 10 --retry-max-time 60 http://ci-files01-hki.ci.qt.io/input/semisecure/redhat_ak_all_versions.sh -o "/tmp/redhat_ak.sh" &>/dev/null +sudo chmod 755 /tmp/redhat_ak.sh +/tmp/redhat_ak.sh + +# refresh local certificates +sudo subscription-manager refresh + +# Attach available subscriptions to system. This is needed when subscriptions are renewed. +sudo subscription-manager attach --auto + +sudo rm -f /tmp/redhat_ak.sh diff --git a/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/01-remove_network_manager_secret_key.sh b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/01-remove_network_manager_secret_key.sh new file mode 100644 index 00000000000..7f9790ae3fe --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/01-remove_network_manager_secret_key.sh @@ -0,0 +1,11 @@ +#!/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 + +# Ipv6 link local becomes tentative and dadfailed if two systems has the same secret_key +# New unique secret key will be created automatically during start up. +# https://access.redhat.com/solutions/3553581 +echo "Removing secret_key" +sudo rm -f "/var/lib/NetworkManager/secret_key" + + diff --git a/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/01-remove_stable-privacy.sh b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/01-remove_stable-privacy.sh new file mode 100644 index 00000000000..6d59f8668a1 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/01-remove_stable-privacy.sh @@ -0,0 +1,8 @@ +#!/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 + +echo "Change default stable-secret to based on MAC" +sudo sed -i '/^IPV6_ADDR_GEN_MODE/d' "/etc/sysconfig/network-scripts/ifcfg-enp1s0" diff --git a/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/01-set-ulimit.sh b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/01-set-ulimit.sh new file mode 100644 index 00000000000..e951e82ac2a --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/01-set-ulimit.sh @@ -0,0 +1,8 @@ +#!/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 + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/linux/set_ulimit.sh" 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 new file mode 100644 index 00000000000..8d43ace0785 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/01-systemsetup.sh @@ -0,0 +1,29 @@ +#!/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 + +BASEDIR=$(dirname "$0") +# shellcheck source=../common/shared/network_test_server_ip.txt +source "$BASEDIR/../common/shared/network_test_server_ip.txt" + +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" +echo 'export DISPLAY=":0"' >> ~/.bashrc +# for current session +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 + +# Set Wayland enable as false. +echo "Setting Wayland enable as false" +sudo sed -i 's/#WaylandEnable=false/WaylandEnable=false/g' /etc/gdm/custom.conf + diff --git a/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/03-enable-repos.sh b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/03-enable-repos.sh new file mode 100644 index 00000000000..292c02a1dfd --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/03-enable-repos.sh @@ -0,0 +1,34 @@ +#!/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 + +echo "set WritePreparedUpdates=false" | sudo tee -a /etc/PackageKit/PackageKit.conf +sudo systemctl stop packagekit +sudo systemctl disable packagekit +while sudo fuser /usr/libexec/packagekitd >/dev/null 2>&1; do + echo "Waiting for PackageKit to finish..." + sleep 1 +done +sudo yum -y remove PackageKit gnome-software + +sudo subscription-manager config --rhsm.manage_repos=1 +sudo subscription-manager refresh + +# List available RHEL versions and bind with correct one +sudo subscription-manager release --list +sudo subscription-manager release --set=8.10 +sudo yum clean all + +# sudo yum config-manager --enable 'rhceph-4-tools-for-rhel-8-x86_64-rpms' +sudo yum config-manager --enable 'codeready-builder-for-rhel-8-x86_64-rpms' +sudo yum config-manager --enable 'rhel-8-for-x86_64-baseos-rpms' +sudo yum config-manager --enable 'rhel-8-for-x86_64-appstream-rpms' +# Epel is required for 'double-conversion-devel', 'libsqlite3x' and 'p7zip' +sudo dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm + +sudo yum clean all +# As well as this fetching the repository data, we also get a printout of the used repos +sudo yum repolist diff --git a/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/03-install-gcc-toolset.sh b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/03-install-gcc-toolset.sh new file mode 100644 index 00000000000..dfed74894a2 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/03-install-gcc-toolset.sh @@ -0,0 +1,10 @@ +#!/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 + +sudo yum -y install gcc-toolset-10 gcc-toolset-10-libatomic-devel + +echo "source /opt/rh/gcc-toolset-10/enable" >> ~/.bashrc 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 new file mode 100644 index 00000000000..2045bcf313f --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/04-install-packages.sh @@ -0,0 +1,178 @@ +#!/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 + +# Remove update notifications and packagekit running in the background +sudo yum -y remove PackageKit gnome-software + +# CI: All platforms should have up-to-date packages when new provision is made +sudo yum -y update + +installPackages=() +installPackages+=(git) +installPackages+=(zlib-devel) +installPackages+=(glib2-devel) +installPackages+=(openssl3) +installPackages+=(openssl3-devel) +installPackages+=(freetype-devel) +installPackages+=(fontconfig-devel) +installPackages+=(curl-devel) +installPackages+=(expat-devel) +installPackages+=(gettext-devel) +installPackages+=(perl-devel) +installPackages+=(dh-autoreconf) +# cmake build +installPackages+=(ninja-build) +installPackages+=(pcre2-devel) +installPackages+=(double-conversion-devel) +installPackages+=(zstd) +installPackages+=(libzstd-devel) +# update kernel +installPackages+=(kernel) +installPackages+=(kernel-tools) +installPackages+=(kernel-devel) +installPackages+=(kernel-core) +installPackages+=(kernel-modules) +installPackages+=(kernel-headers) +# EGL support +# mesa-libraries need to use older version than 22.1.5-2 which cause Xorg to crash +installPackages+=(mesa-libEGL-devel-21.3.4-1.el8) +installPackages+=(mesa-libGL-devel-21.3.4-1.el8) +installPackages+=(mesa-dri-drivers-21.3.4-1.el8.x86_64) +installPackages+=(mesa-libgbm-21.3.4-1.el8.x86_64) +installPackages+=(mesa-vulkan-drivers-21.3.4-1.el8.x86_64) +installPackages+=(libxkbfile-devel) +# Xinput2 +installPackages+=(libXi-devel) +installPackages+=(mysql-server) +installPackages+=(mysql) +installPackages+=(mysql-devel) +installPackages+=(postgresql-devel) +installPackages+=(cups-devel) +installPackages+=(dbus-devel) +# gstreamer 1 for QtMultimedia +# Note! gstreamer1-plugins-bad-free needs to be upgraded or it will conflicts with gstreamer1-plugins-base-devel +installPackages+=(gstreamer1-plugins-bad-free) +installPackages+=(gstreamer1-devel) +installPackages+=(gstreamer1-plugins-base-devel) +# pipewire for QtMultimedia +installPackages+=(pipewire-devel) +# for QtMultimedia, ffmpeg +installPackages+=(yasm) +installPackages+=(libva-devel) +# gtk3 style for QtGui/QStyle +installPackages+=(gtk3-devel) +# libusb1 for tqtc-boot2qt/qdb +installPackages+=(libusbx-devel) +# speech-dispatcher-devel for QtSpeech, otherwise it has no backend on Linux +installPackages+=(speech-dispatcher-devel) +# Python for pyside +installPackages+=(python3.11) +installPackages+=(python3.11-pip) +installPackages+=(python3.11-devel) +# WebEngine +installPackages+=(bison) +installPackages+=(flex) +installPackages+=(gperftools-libs) +installPackages+=(gperf) +installPackages+=(alsa-lib-devel) +installPackages+=(pulseaudio-libs-devel) +installPackages+=(libdrm-devel) +installPackages+=(libva-devel) +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 +installPackages+=(java-17-openjdk-devel-17.0.9.0.9) +# For receiving shasum +installPackages+=(perl-Digest-SHA) +# INTEGRITY requirements +installPackages+=(glibc.i686) +# Enable Qt Bluetooth +installPackages+=(bluez-libs-devel) +# QtNfc +installPackages+=(pcsc-lite-devel) +# QtWebKit +installPackages+=(libxml2-devel) +installPackages+=(libxslt-devel) +# For building Wayland from source +installPackages+=(libffi-devel) +# QtWayland +#installPackages+=(mesa-libwayland-egl) +#installPackages+=(mesa-libwayland-egl-devel) +installPackages+=(libwayland-client) +installPackages+=(libwayland-cursor) +installPackages+=(libwayland-server) +# Jenkins +installPackages+=(chrpath) +# libxkbcommon +installPackages+=(libxkbcommon-devel) +installPackages+=(libxkbcommon-x11-devel) +# xcb-util-* libraries +installPackages+=(xcb-util) +installPackages+=(xcb-util-image-devel) +installPackages+=(xcb-util-keysyms-devel) +installPackages+=(xcb-util-wm-devel) +installPackages+=(xcb-util-renderutil-devel) +installPackages+=(xcb-util-cursor) +installPackages+=(xcb-util-cursor-devel) + +# ODBC support +installPackages+=(unixODBC-devel) +installPackages+=(unixODBC) +# Vulkan support +installPackages+=(vulkan-devel) +installPackages+=(vulkan-tools) +# Conan: For Python build +installPackages+=(xz-devel) +installPackages+=(zlib-devel) +installPackages+=(libffi-devel) +installPackages+=(libsqlite3x-devel) +# Build.pl +installPackages+=(perl-Data-Dumper) +# In RedHat these come with Devtoolset +installPackages+=(gcc) +installPackages+=(gcc-c++) +installPackages+=(make) +# Open source VMware Tools +installPackages+=(open-vm-tools) +# cifs-utils, for mounting smb drive +installPackages+=(keyutils) +installPackages+=(cifs-utils) +# used for reading vcpkg packages version, from vcpkg.json +installPackages+=(jq) +# zip, needed for vcpkg caching +installPackages+=(zip) +# OpenSSL requirement, built by vcpkg +installPackages+=(perl-IPC-Cmd) + +sudo yum -y install "${installPackages[@]}" + +sudo dnf -y module install nodejs:16 + +# We shouldn't use yum to install virtualenv. The one found from package repo is not +# working, but we can use installed pip +sudo pip3 install --upgrade pip +# Configure pip +sudo pip config --user set global.index https://ci-files01-hki.ci.qt.io/input/python_module_cache +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 -r "${BASH_SOURCE%/*}/../common/shared/sbom_requirements.txt" + +sudo /usr/bin/pip3 install wheel +sudo /usr/bin/pip3 install dataclasses + +OpenSSLVersion="$(openssl3 version |cut -b 9-14)" +echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt + +# List all available updates +sudo yum -y list updates diff --git a/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/04-p7zip.sh b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/04-p7zip.sh new file mode 100644 index 00000000000..98be8b40d10 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/04-p7zip.sh @@ -0,0 +1,17 @@ +#!/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 + +source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" + +set -ex + +name="p7zip" +version="7-11" +sudo yum -y install "$name" + +# Link 7za to 7z so we can use existing installation scripts +sudo ln -s /usr/bin/7za /usr/bin/7z + +echo "$name = $version" >> ~/versions.txt diff --git a/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/05-install-patchelf.sh b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/05-install-patchelf.sh new file mode 100644 index 00000000000..495e3d4ace5 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/05-install-patchelf.sh @@ -0,0 +1,5 @@ +#!/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 + +source "${BASH_SOURCE%/*}/../common/unix/install-patchelf.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/05-libclang-v100-dyn.sh b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/05-libclang-v100-dyn.sh new file mode 100644 index 00000000000..2e08049dcbe --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/05-libclang-v100-dyn.sh @@ -0,0 +1,8 @@ +#!/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 + +BASEDIR=$(dirname "$0") +# shellcheck source=../common/unix/libclang-v100-dyn.sh +"$BASEDIR/../common/unix/libclang-v100-dyn.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/05-libclang.sh b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/05-libclang.sh new file mode 100644 index 00000000000..cc68ed1f1ad --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/05-libclang.sh @@ -0,0 +1,8 @@ +#!/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 + +BASEDIR=$(dirname "$0") +# shellcheck source=../common/unix/libclang.sh +"$BASEDIR/../common/unix/libclang.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/05-mount-vcpkg-cache-drive.sh b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/05-mount-vcpkg-cache-drive.sh new file mode 100644 index 00000000000..ed49b3a5418 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/05-mount-vcpkg-cache-drive.sh @@ -0,0 +1,8 @@ +#!/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 + +# shellcheck source=../common/linux/mount-vcpkg-cache-drive.sh +source "${BASH_SOURCE%/*}/../common/linux/mount-vcpkg-cache-drive.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/09-disable_selinux.sh b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/09-disable_selinux.sh new file mode 100644 index 00000000000..17f9422fe1f --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/09-disable_selinux.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 + +# shellcheck source=../common/linux/disable_selinux.sh +source "${BASH_SOURCE%/*}/../common/linux/disable_selinux.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/09-openssl.sh b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/09-openssl.sh new file mode 100644 index 00000000000..ae8024f218a --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/09-openssl.sh @@ -0,0 +1,10 @@ +#!/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 + +# Required by Rhel source build +sudo yum -y install perl-IPC-Cmd + +"$(dirname "$0")/../common/unix/install-openssl.sh" "linux" diff --git a/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/20-sccache.sh b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/20-sccache.sh new file mode 100644 index 00000000000..b371d947924 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/20-sccache.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +source "${BASH_SOURCE%/*}/../common/linux/sccache.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/22-mqtt_broker.sh b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/22-mqtt_broker.sh new file mode 100644 index 00000000000..fd5685377d0 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/22-mqtt_broker.sh @@ -0,0 +1,7 @@ +#!/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 + +# shellcheck source=../common/unix/mqtt_broker.sh +source "${BASH_SOURCE%/*}/../common/unix/mqtt_broker.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/30-fbx.sh b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/30-fbx.sh new file mode 100644 index 00000000000..16a9bda85d9 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/30-fbx.sh @@ -0,0 +1,8 @@ +#!/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 + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/linux/fbx_linux.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/30-install-conan.sh b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/30-install-conan.sh new file mode 100644 index 00000000000..67a4f9116ec --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/30-install-conan.sh @@ -0,0 +1,8 @@ +#!/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 + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/unix/install-conan.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/30-install-git.sh b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/30-install-git.sh new file mode 100644 index 00000000000..7a73f354e16 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/30-install-git.sh @@ -0,0 +1,8 @@ +#!/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 + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/linux/install-git.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/30-install_icu.sh b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/30-install_icu.sh new file mode 100644 index 00000000000..0effaefaa72 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/30-install_icu.sh @@ -0,0 +1,46 @@ +#!/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 + +# shellcheck source=../common/unix/DownloadURL.sh +source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" + +set -ex + +# This script will install ICU + +icuVersion="73.2" +icuLocation="/usr/lib64" +sha1="d2bbb7b2a9a9ee00dba5cc6a68137f6c8a98c27e" +baseBinaryPackageURL="http://ci-files01-hki.ci.qt.io/input/icu/$icuVersion/icu-linux-g++-Rhel8.6-x64.7z" +baseBinaryPackageExternalURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel8.6-x64.7z" + +sha1Dev="edc9cba31ffeac28bf7360c52b85b5e4d2f39043" +develPackageURL="http://ci-files01-hki.ci.qt.io/input/icu/$icuVersion/icu-linux-g++-Rhel8.6-x64-devel.7z" +develPackageExternalURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel8.6-x64-devel.7z" + +echo "Installing custom ICU $icuVersion $sha1 packages on RHEL to $icuLocation" + +targetFile=$(mktemp) +DownloadURL "$baseBinaryPackageURL" "$baseBinaryPackageExternalURL" "$sha1" "$targetFile" +sudo 7z x -y -o/usr/lib64 "$targetFile" +sudo rm "$targetFile" + +echo "Installing custom ICU devel packages on RHEL" + +tempDir=$(mktemp -d) + +targetFile=$(mktemp) +DownloadURL "$develPackageURL" "$develPackageExternalURL" "$sha1Dev" "$targetFile" +7z x -y -o"$tempDir" "$targetFile" + +sudo cp -a "$tempDir"/lib/* /usr/lib64 +sudo cp -a "$tempDir"/* /usr/ + +sudo rm "$targetFile" +sudo rm -fr "$tempDir" + +sudo /sbin/ldconfig + +echo "ICU = $icuVersion" >> ~/versions.txt diff --git a/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/35-install-breakpad.sh b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/35-install-breakpad.sh new file mode 100644 index 00000000000..8a9dde56be4 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/35-install-breakpad.sh @@ -0,0 +1,8 @@ +#!/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 + +# shellcheck source=../common/unix/install-breakpad.sh +source "${BASH_SOURCE%/*}/../common/unix/install-breakpad.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/40-android_linux.sh b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/40-android_linux.sh new file mode 100644 index 00000000000..f7591d8253e --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/40-android_linux.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 + +# shellcheck source=../common/linux/android_linux.sh +source "${BASH_SOURCE%/*}/../common/linux/android_linux.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/40-install-cmake.sh b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/40-install-cmake.sh new file mode 100644 index 00000000000..7effb8d769d --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/40-install-cmake.sh @@ -0,0 +1,13 @@ +#!/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 installs CMake 3.6.2 + +set -ex + +# CMake is needed for autotests that verify that Qt can be built with CMake + +# shellcheck source=../common/linux/cmake_linux.sh +source "${BASH_SOURCE%/*}/../common/linux/cmake_linux.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/41-install-vcpkg.sh b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/41-install-vcpkg.sh new file mode 100644 index 00000000000..aa88364d005 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/41-install-vcpkg.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +set -ex + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/linux/install-vcpkg.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/42-install-vcpkg-ports.sh b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/42-install-vcpkg-ports.sh new file mode 100644 index 00000000000..4bc799eb6da --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/42-install-vcpkg-ports.sh @@ -0,0 +1,14 @@ +#!/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 + +echo "Installing vcpkg ports" +echo "VCPKG_ROOT: ${VCPKG_ROOT}" +echo "ANDOID_NDK_HOME: ${ANDROID_NDK_HOME}" + +# Installing common ports +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/linux/install-vcpkg-ports.sh" + +# Installing platform specific ports +"$BASEDIR/../common/linux/install-vcpkg-ports-android.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/50-openssl_for_android_linux.sh b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/50-openssl_for_android_linux.sh new file mode 100644 index 00000000000..4e5ec7f02ad --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/50-openssl_for_android_linux.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 + +# shellcheck source=../common/unix/openssl_for_android.sh +source "${BASH_SOURCE%/*}/../common/unix/openssl_for_android.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/60-install_protobuf.sh b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/60-install_protobuf.sh new file mode 100644 index 00000000000..ef6fdec0d19 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/60-install_protobuf.sh @@ -0,0 +1,10 @@ +#!/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 + +# shellcheck source=../common/unix/install_protobuf.sh +source "${BASH_SOURCE%/*}/../common/unix/install_protobuf.sh" + diff --git a/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/61-install_grpc.sh b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/61-install_grpc.sh new file mode 100644 index 00000000000..ba69ffefbe7 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/61-install_grpc.sh @@ -0,0 +1,10 @@ +#!/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 + +# shellcheck source=../common/unix/install_grpc.sh +source "${BASH_SOURCE%/*}/../common/unix/install_grpc.sh" + diff --git a/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/70-install_QemuGA.sh b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/70-install_QemuGA.sh new file mode 100644 index 00000000000..62b799e050f --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/70-install_QemuGA.sh @@ -0,0 +1,11 @@ +#!/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 installs QEMU Guest Agent + +set -ex + +sudo yum -y install qemu-guest-agent +sudo systemctl start qemu-guest-agent diff --git a/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/70-install_dwz.sh b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/70-install_dwz.sh new file mode 100644 index 00000000000..3647cc48903 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/70-install_dwz.sh @@ -0,0 +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 + +set -ex + +sudo yum -y install elfutils-libelf-devel + +# shellcheck source=../common/linux/install_dwz.sh +source "${BASH_SOURCE%/*}/../common/linux/install_dwz.sh" + diff --git a/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/90-bootstrap-autostart.sh b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/90-bootstrap-autostart.sh new file mode 100644 index 00000000000..1ff4385064d --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/90-bootstrap-autostart.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +source "${BASH_SOURCE%/*}/../common/linux/bootstrap-autostart.sh" 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 new file mode 100644 index 00000000000..04a3ffe9a6e --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/90-install-ffmpeg.sh @@ -0,0 +1,8 @@ +#!/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 + +# 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" "static" +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.10-x86_64/90-mimer.sh b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/90-mimer.sh new file mode 100644 index 00000000000..bff2a7c75d7 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/90-mimer.sh @@ -0,0 +1,8 @@ +#!/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 + +set -ex + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/linux/mimersql.sh" "openssl-1" "rpm" diff --git a/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/90-squish.sh b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/90-squish.sh new file mode 100644 index 00000000000..f803ccc1fa1 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/90-squish.sh @@ -0,0 +1,6 @@ +#!/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" + diff --git a/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/99-cleanup.sh b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/99-cleanup.sh new file mode 100644 index 00000000000..842cd294cef --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/99-cleanup.sh @@ -0,0 +1,8 @@ +#!/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 + +"$(dirname "$0")"/../common/linux/cleanup_cache.sh diff --git a/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/99-enable_test_stacktraces.sh b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/99-enable_test_stacktraces.sh new file mode 100644 index 00000000000..600b7850b25 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/99-enable_test_stacktraces.sh @@ -0,0 +1,8 @@ +#!/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 + +BASEDIR=$(dirname "$0") +"$BASEDIR"/../common/linux/enable_test_stacktraces.sh diff --git a/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/99-version.sh b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/99-version.sh new file mode 100644 index 00000000000..725351aeb61 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/99-version.sh @@ -0,0 +1,18 @@ +#!/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 needs to be called last during provisioning so that the software information will show up last in provision log. + +# Storage installed RPM packages information + +set -ex + +# shellcheck disable=SC2129 +echo "*********************************************" >> ~/versions.txt +echo "***** All installed RPM packages *****" >> ~/versions.txt +rpm -q -a | sort >> ~/versions.txt +echo "*********************************************" >> ~/versions.txt + +"$(dirname "$0")/../common/linux/version.sh" From cf1a53776ddb25763610a2e01b5388e3bc0c9f78 Mon Sep 17 00:00:00 2001 From: Elias Toivola Date: Tue, 6 Aug 2024 15:40:27 +0300 Subject: [PATCH 150/288] Make Red Hat 8.10 tests as blocking in CI MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 'InsignificantTests' is removed from all RHEL-8.10 targets and 'Packaging' feature is added to packaging RHEL-8.10 targets. [CI Platforms] Task-number: QTQAINFRA-6367 Change-Id: I0a83ccf5b75c7f2c7c8de871c267d286cf3a9296 (cherry picked from commit f221e65cf41109a8550588b6da068fc8dda9731d) Reviewed-by: Simo Fält Reviewed-by: Tero Heikkinen --- coin/platform_configs/cmake_platforms.yaml | 2 +- coin/platform_configs/cmake_platforms_target_android.yaml | 4 ++-- coin/platform_configs/flashing-wizard.yaml | 2 +- coin/platform_configs/linux_android_tests_developer.yaml | 2 +- coin/platform_configs/linux_android_tests_multi_abi.yaml | 1 - coin/platform_configs/qt-creator.yaml | 2 +- coin/platform_configs/qtsaferenderer.yaml | 2 +- coin/platform_configs/tqtc-android-automotive.yaml | 4 ++-- 8 files changed, 9 insertions(+), 10 deletions(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index c6d57caa810..98aa8aedc1b 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -193,7 +193,7 @@ Configurations: Id: 'rhel-8.10' Template: 'qtci-linux-RHEL-8.10-x86_64-50' Compiler: 'GCC' - Features: ['InsignificantTests', 'Sccache', 'UseConfigure', 'InstallQt5Dependencies'] + 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}}', diff --git a/coin/platform_configs/cmake_platforms_target_android.yaml b/coin/platform_configs/cmake_platforms_target_android.yaml index 02190c617ae..ecc0fe692a7 100644 --- a/coin/platform_configs/cmake_platforms_target_android.yaml +++ b/coin/platform_configs/cmake_platforms_target_android.yaml @@ -55,7 +55,7 @@ Configurations: Compiler: 'GCC' Target compiler: 'Clang' Platform dependency: 'rhel-8.10' - Features: ['InsignificantTests', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure'] + 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', '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', @@ -87,7 +87,7 @@ Configurations: Compiler: 'GCC' Target compiler: 'Clang' Platform dependency: 'rhel-8.10' - Features: ['InsignificantTests', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure'] + 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}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', diff --git a/coin/platform_configs/flashing-wizard.yaml b/coin/platform_configs/flashing-wizard.yaml index 4df801785de..46595c72007 100644 --- a/coin/platform_configs/flashing-wizard.yaml +++ b/coin/platform_configs/flashing-wizard.yaml @@ -31,7 +31,7 @@ Configurations: - Template: 'qtci-linux-RHEL-8.10-x86_64-50' Compiler: 'GCC' - Features: ['InsignificantTests', 'UseLegacyInstructions'] + Features: ['Packaging', 'UseLegacyInstructions'] Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -openssl -qt-harfbuzz QMAKE_LFLAGS_APP+=-s -static -no-icu' - Template: 'qtci-linux-Ubuntu-18.04-x86_64-50' diff --git a/coin/platform_configs/linux_android_tests_developer.yaml b/coin/platform_configs/linux_android_tests_developer.yaml index 9d6a90c0dc1..02fa300afb4 100644 --- a/coin/platform_configs/linux_android_tests_developer.yaml +++ b/coin/platform_configs/linux_android_tests_developer.yaml @@ -23,7 +23,7 @@ Configurations: Compiler: 'GCC' Target compiler: 'Clang' Platform dependency: 'rhel-8.10' - Features: ['InsignificantTests', 'Sccache', 'AndroidTestRun', 'UseConfigure'] + 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}}', diff --git a/coin/platform_configs/linux_android_tests_multi_abi.yaml b/coin/platform_configs/linux_android_tests_multi_abi.yaml index 6b149c53862..789bde7f92a 100644 --- a/coin/platform_configs/linux_android_tests_multi_abi.yaml +++ b/coin/platform_configs/linux_android_tests_multi_abi.yaml @@ -40,7 +40,6 @@ Configurations: ] Features: [ 'Sccache', - 'InsignificantTests', 'WarningsAreErrors', 'AndroidTestRun', 'MinimalAndroidMultiABITests', diff --git a/coin/platform_configs/qt-creator.yaml b/coin/platform_configs/qt-creator.yaml index eed0f0954e7..0416187be57 100644 --- a/coin/platform_configs/qt-creator.yaml +++ b/coin/platform_configs/qt-creator.yaml @@ -24,7 +24,7 @@ Configurations: - Template: 'qtci-linux-RHEL-8.10-x86_64-50' Compiler: 'GCC' - Features: ['InsignificantTests', 'Sccache', 'DebugAndRelease'] + Features: ['Packaging', 'Sccache', 'DebugAndRelease'] Configure arguments: '' Environment variables: [] - diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index 3da3fc3a1ef..87eae1c2a24 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -50,7 +50,7 @@ Configurations: Id: 'Linux-RHEL_8_10_Static' Template: 'qtci-linux-RHEL-8.10-x86_64-50' Compiler: 'GCC' - Features: ['InsignificantTests', 'Sccache', 'UseConfigure', 'MinimalStaticTests'] + Features: ['Packaging', 'Sccache', 'UseConfigure', 'MinimalStaticTests'] Configure arguments: '-static -no-icu -nomake examples -release -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput -no-sql-mysql' Environment variables: [ 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', diff --git a/coin/platform_configs/tqtc-android-automotive.yaml b/coin/platform_configs/tqtc-android-automotive.yaml index f2609502508..ec4e54e6572 100644 --- a/coin/platform_configs/tqtc-android-automotive.yaml +++ b/coin/platform_configs/tqtc-android-automotive.yaml @@ -44,7 +44,7 @@ Configurations: Compiler: 'GCC' Target compiler: 'Clang' Platform dependency: 'rhel-8.10' - Features: ['InsignificantTests', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure'] + 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}}', @@ -76,7 +76,7 @@ Configurations: Compiler: 'GCC' Target compiler: 'Clang' Platform dependency: 'rhel-8.10' - Features: ['InsignificantTests', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure'] + 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}}', From b28fbb4c298bf6b745d7384c62a0475601b063ec Mon Sep 17 00:00:00 2001 From: Elias Toivola Date: Tue, 6 Aug 2024 16:12:00 +0300 Subject: [PATCH 151/288] Remove Red Hat 8.8 from CI MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit RHEL-8.8 targets are replaced by RHEL-8.10 targets in platform configurations. [CI Platforms] Task-number: QTQAINFRA-6367 Change-Id: I2dcf70b030d72261ec7bd130058a6062644813d6 (cherry picked from commit d1b2722ad7a4632eab3766479b30648af5e55d21) Reviewed-by: Tero Heikkinen Reviewed-by: Simo Fält --- coin/platform_configs/cmake_platforms.yaml | 10 ----- .../cmake_platforms_target_android.yaml | 36 +----------------- coin/platform_configs/flashing-wizard.yaml | 5 --- .../linux_android_tests_developer.yaml | 15 -------- .../linux_android_tests_multi_abi.yaml | 32 ++-------------- coin/platform_configs/qt-creator.yaml | 6 --- .../qtsaferenderer-runtime.yaml | 1 - coin/platform_configs/qtsaferenderer.yaml | 11 ------ .../tqtc-android-automotive.yaml | 37 +------------------ coin/platform_configs/tqtc-qtpip.yaml | 3 +- 10 files changed, 7 insertions(+), 149 deletions(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 98aa8aedc1b..7bc1b1bbf47 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -179,16 +179,6 @@ Configurations: 'OPENSSL_LIB_x64={{.Env.OPENSSL_LIB_x64_arm64}}', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', ] -- - Id: 'rhel-8.8' - Template: 'qtci-linux-RHEL-8.8-x86_64-50' - Compiler: 'GCC' - 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}}', - 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON' - ] - Id: 'rhel-8.10' Template: 'qtci-linux-RHEL-8.10-x86_64-50' diff --git a/coin/platform_configs/cmake_platforms_target_android.yaml b/coin/platform_configs/cmake_platforms_target_android.yaml index ecc0fe692a7..4daaa9134e5 100644 --- a/coin/platform_configs/cmake_platforms_target_android.yaml +++ b/coin/platform_configs/cmake_platforms_target_android.yaml @@ -33,29 +33,13 @@ Configurations: ] - Id: 'android-9-x86-on-linux' - Template: 'qtci-linux-RHEL-8.8-x86_64-50' - Target os: 'Android_ANY' - Target arch: 'x86' - Compiler: 'GCC' - Target compiler: 'Clang' - Platform dependency: 'rhel-8.8' - 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', - '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_EMULATOR=emulator_x86_api_28' - ] -- - Id: 'android-9-x86-on-linux-rhel-8.10' Template: 'qtci-linux-RHEL-8.10-x86_64-50' Target os: 'Android_ANY' Target arch: 'x86' Compiler: 'GCC' Target compiler: 'Clang' Platform dependency: 'rhel-8.10' - Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure'] + 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', @@ -65,29 +49,13 @@ Configurations: ] - Id: 'android-14-x86_64-on-linux' - Template: 'qtci-linux-RHEL-8.8-x86_64-50' - Target os: 'Android_ANY' - Target arch: 'x86_64' - Compiler: 'GCC' - Target compiler: 'Clang' - Platform dependency: 'rhel-8.8' - 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', - '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-14-x86_64-on-linux-rhel-8.10' Template: 'qtci-linux-RHEL-8.10-x86_64-50' 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'] + 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/flashing-wizard.yaml b/coin/platform_configs/flashing-wizard.yaml index 46595c72007..f013f079c76 100644 --- a/coin/platform_configs/flashing-wizard.yaml +++ b/coin/platform_configs/flashing-wizard.yaml @@ -23,11 +23,6 @@ Configurations: Target arch: 'x86' Features: ['Packaging', 'UseLegacyInstructions'] Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -static -no-icu' - - - Template: 'qtci-linux-RHEL-8.8-x86_64-50' - Compiler: 'GCC' - Features: ['Packaging', 'UseLegacyInstructions'] - Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -openssl -qt-harfbuzz QMAKE_LFLAGS_APP+=-s -static -no-icu' - Template: 'qtci-linux-RHEL-8.10-x86_64-50' Compiler: 'GCC' diff --git a/coin/platform_configs/linux_android_tests_developer.yaml b/coin/platform_configs/linux_android_tests_developer.yaml index 02fa300afb4..305ef475d9b 100644 --- a/coin/platform_configs/linux_android_tests_developer.yaml +++ b/coin/platform_configs/linux_android_tests_developer.yaml @@ -2,21 +2,6 @@ Version: 2 Configurations: - Id: 'android-x86-developer-build-testrun-on-linux' - Template: 'qtci-linux-RHEL-8.8-x86_64-50' - Target os: 'Android_ANY' - Target arch: 'x86' - Compiler: 'GCC' - Target compiler: 'Clang' - Platform dependency: 'rhel-8.8' - 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}}', - 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}', - 'NON_QTBASE_TARGET_CMAKE_ARGS=', - 'ANDROID_EMULATOR=emulator_x86_api_28'] -- - Id: 'android-x86-developer-build-testrun-on-linux-rhel-8.10' Template: 'qtci-linux-RHEL-8.10-x86_64-50' Target os: 'Android_ANY' Target arch: 'x86' diff --git a/coin/platform_configs/linux_android_tests_multi_abi.yaml b/coin/platform_configs/linux_android_tests_multi_abi.yaml index 789bde7f92a..b6b88d974df 100644 --- a/coin/platform_configs/linux_android_tests_multi_abi.yaml +++ b/coin/platform_configs/linux_android_tests_multi_abi.yaml @@ -2,13 +2,13 @@ Version: 2 Configurations: - Id: 'android-9-multi-abi' - Template: 'qtci-linux-RHEL-8.8-x86_64-50' + Template: 'qtci-linux-RHEL-8.10-x86_64-50' Target os: 'Android_ANY' Target arch: 'multi' Compiler: 'GCC' Target compiler: 'Clang' Platform dependency: [ - 'rhel-8.8', + 'rhel-8.10', 'android-9-x86-on-linux', 'android-14-x86_64-on-linux' ] @@ -20,35 +20,9 @@ Configurations: 'InstallDepsPerPlatformSubdir' ] Environment variables: [ - 'QT_CI_ARTIFACT_ID_PATH_Android-host=QT_CI_ARTIFACT_ID_PATH_rhel-8.8', + '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', 'COMMON_TARGET_TEST_CMAKE_ARGS=-DQT_ANDROID_ABIS="x86;x86_64"', 'ANDROID_EMULATOR=emulator_x86_api_28' ] -- - Id: 'android-9-multi-abi-rhel-8.10' - Template: 'qtci-linux-RHEL-8.10-x86_64-50' - Target os: 'Android_ANY' - Target arch: 'multi' - Compiler: 'GCC' - Target compiler: 'Clang' - Platform dependency: [ - 'rhel-8.10', - 'android-9-x86-on-linux-rhel-8.10', - 'android-14-x86_64-on-linux-rhel-8.10' - ] - Features: [ - 'Sccache', - 'WarningsAreErrors', - 'AndroidTestRun', - 'MinimalAndroidMultiABITests', - 'InstallDepsPerPlatformSubdir' - ] - 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-rhel-8.10', - 'QT_CI_ARTIFACT_ID_PATH_Android-x86_64=QT_CI_ARTIFACT_ID_PATH_android-14-x86_64-on-linux-rhel-8.10', - 'COMMON_TARGET_TEST_CMAKE_ARGS=-DQT_ANDROID_ABIS="x86;x86_64"', - 'ANDROID_EMULATOR=emulator_x86_api_28' - ] diff --git a/coin/platform_configs/qt-creator.yaml b/coin/platform_configs/qt-creator.yaml index 0416187be57..d55cf569dd9 100644 --- a/coin/platform_configs/qt-creator.yaml +++ b/coin/platform_configs/qt-creator.yaml @@ -15,12 +15,6 @@ Configurations: Configure arguments: '' Environment variables: [] Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64'] -- - Template: 'qtci-linux-RHEL-8.8-x86_64-50' - Compiler: 'GCC' - Features: ['Packaging', 'Sccache', 'DebugAndRelease'] - Configure arguments: '' - Environment variables: [] - Template: 'qtci-linux-RHEL-8.10-x86_64-50' Compiler: 'GCC' diff --git a/coin/platform_configs/qtsaferenderer-runtime.yaml b/coin/platform_configs/qtsaferenderer-runtime.yaml index 29cee966e92..577949db7b7 100644 --- a/coin/platform_configs/qtsaferenderer-runtime.yaml +++ b/coin/platform_configs/qtsaferenderer-runtime.yaml @@ -13,7 +13,6 @@ Include: [ "windows-10_22h2-msvc2019", "windows-10_22h2-msvc2022", "windows-10_22h2-msvc2019-developer-build", - "rhel-8.8", "rhel-8.10", "windows-10_22h2-mingw13", "windows-10_22h2-mingw13-developer-build", diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index 87eae1c2a24..c1695f69302 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -12,7 +12,6 @@ Include: [ "sles-15_sp5-static", "windows-10_22h2-msvc2019", "windows-10_22h2-msvc2022", - "rhel-8.8", "rhel-8.10", "windows-10_22h2-mingw13", "windows-10_22h2-llvm", @@ -36,16 +35,6 @@ Configurations: Environment variables: [ 'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"' ] -- - Id: 'Linux-RHEL_8_8_Static' - Template: 'qtci-linux-RHEL-8.8-x86_64-50' - Compiler: 'GCC' - Features: ['Packaging', 'Sccache', 'UseConfigure', 'MinimalStaticTests'] - Configure arguments: '-static -no-icu -nomake examples -release -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput -no-sql-mysql' - Environment variables: [ - 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', - 'NON_QTBASE_CMAKE_ARGS=-DINPUT_headersclean=ON' - ] - Id: 'Linux-RHEL_8_10_Static' Template: 'qtci-linux-RHEL-8.10-x86_64-50' diff --git a/coin/platform_configs/tqtc-android-automotive.yaml b/coin/platform_configs/tqtc-android-automotive.yaml index ec4e54e6572..84543678c3a 100644 --- a/coin/platform_configs/tqtc-android-automotive.yaml +++ b/coin/platform_configs/tqtc-android-automotive.yaml @@ -1,7 +1,6 @@ Version: 2 Include: [ cmake_platforms.yaml: [ - 'rhel-8.8', "rhel-8.10", 'windows-10_22h2-mingw13', 'ubuntu-22.04-documentation', @@ -14,30 +13,12 @@ Include: [ 'android-arm64-on-macos', 'android-armv7-on-windows', 'android-9-x86-on-linux', - 'android-9-x86-on-linux-rhel-8.10', - 'android-14-x86_64-on-linux', - 'android-14-x86_64-on-linux-rhel-8.10' + 'android-14-x86_64-on-linux' ] ] Configurations: - Id: "automotive-android-14-x86_64-on-linux" - Template: 'qtci-linux-RHEL-8.8-x86_64-50' - Target os: 'Android_ANY' - Target arch: 'x86_64' - Compiler: 'GCC' - Target compiler: 'Clang' - Platform dependency: 'rhel-8.8' - 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}}', - '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' - ] -- - Id: "automotive-android-14-x86_64-on-linux-rhel-8.10" Template: 'qtci-linux-RHEL-8.10-x86_64-50' Target os: 'Android_ANY' Target arch: 'x86_64' @@ -54,22 +35,6 @@ Configurations: ] - Id: "automotive-android-10-x86_64-on-linux" - Template: 'qtci-linux-RHEL-8.8-x86_64-50' - Target os: 'Android_ANY' - Target arch: 'x86_64' - Compiler: 'GCC' - Target compiler: 'Clang' - Platform dependency: 'rhel-8.8' - 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}}', - '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' - ] -- - Id: "automotive-android-10-x86_64-on-linux-rhel-8.10" Template: 'qtci-linux-RHEL-8.10-x86_64-50' Target os: 'Android_ANY' Target arch: 'x86_64' diff --git a/coin/platform_configs/tqtc-qtpip.yaml b/coin/platform_configs/tqtc-qtpip.yaml index f70579aa6c6..480888ab2b4 100644 --- a/coin/platform_configs/tqtc-qtpip.yaml +++ b/coin/platform_configs/tqtc-qtpip.yaml @@ -3,8 +3,7 @@ Module only: true Include: [ cmake_platforms.yaml: [ "windows-10_22h2-msvc2019", - "rhel-8.10", - "rhel-8.8" + "rhel-8.10" ], macos.yaml: [ "macos-universal-on-x86_64" From 133ea8eb461f518db136b0b52a890fb59edde9f7 Mon Sep 17 00:00:00 2001 From: Elias Toivola Date: Mon, 16 Sep 2024 17:05:57 +0300 Subject: [PATCH 152/288] Fix and define cache links for golang and upx Windows script to install golang tries to download a .exe file from cache while the install file is really a .msi file. Golang and upx are new packages to ci-files so let's define their directory paths as neatly as possible to prevent more clutter to ci-files. This amends: 337206334e90ce77f1dbfa09e67e8fd866d25b60 Pick-to: 6.7 Change-Id: If6cfa38304bfec207500fcd7a67e3acba994eb9f Reviewed-by: Eike Ziller Reviewed-by: Marcus Tillmanns (cherry picked from commit f6313247cc01da3178d376dd8cf0bdd2fdfe2737) Reviewed-by: Qt Cherry-pick Bot --- .../common/linux/install-golang.sh | 4 +-- coin/provisioning/common/linux/install-upx.sh | 4 +-- .../common/windows/install-golang.ps1 | 35 +++++++++++++------ .../common/windows/install-upx.ps1 | 4 +-- 4 files changed, 31 insertions(+), 16 deletions(-) diff --git a/coin/provisioning/common/linux/install-golang.sh b/coin/provisioning/common/linux/install-golang.sh index a4f4cd0dcce..1f0f272ec2e 100755 --- a/coin/provisioning/common/linux/install-golang.sh +++ b/coin/provisioning/common/linux/install-golang.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Copyright (C) 2023 The Qt Company Ltd. +# 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 @@ -25,7 +25,7 @@ case "$uname_m" in *) fatal "Unknown architecture in uname: $uname_m" 43 ;; esac -internalUrl="http://ci-files01-hki.ci.qt.io/input/go/$pkgname" +internalUrl="http://ci-files01-hki.ci.qt.io/input/go/linux/$pkgname" externalUrl="https://go.dev/dl/$pkgname" targetFile="$HOME/$pkgname" diff --git a/coin/provisioning/common/linux/install-upx.sh b/coin/provisioning/common/linux/install-upx.sh index e2225f09370..8659bf193be 100755 --- a/coin/provisioning/common/linux/install-upx.sh +++ b/coin/provisioning/common/linux/install-upx.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Copyright (C) 2023 The Qt Company Ltd. +# 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 @@ -25,7 +25,7 @@ case "$uname_m" in *) fatal "Unknown architecture in uname: $uname_m" 43 ;; esac -internalUrl="http://ci-files01-hki.ci.qt.io/input/upx/$pkgname" +internalUrl="http://ci-files01-hki.ci.qt.io/input/upx/linux/$pkgname" externalUrl="https://github.com/upx/upx/releases/download/v$version/$pkgname" targetFile="$HOME/$pkgname" diff --git a/coin/provisioning/common/windows/install-golang.ps1 b/coin/provisioning/common/windows/install-golang.ps1 index d40bcce2844..42a79f45ed7 100644 --- a/coin/provisioning/common/windows/install-golang.ps1 +++ b/coin/provisioning/common/windows/install-golang.ps1 @@ -1,19 +1,34 @@ -# Copyright (C) 2022 The Qt Company Ltd. +# 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\helpers.ps1" -# Install Git +. "$PSScriptRoot\helpers.ps1" $version = "1.22.4" -if (Is64BitWinHost) { - $arch = "amd64" - $sha256 = "3c21105d7b584759b6e266383b777caf6e87142d304a10b539dbc66ab482bb5f" -} else { - $arch = "386" - $sha256 = "5c6446e2ea80bc6a971d2b34446f16e6517e638b0ff8d3ea229228d1931790b0" + +$cpu_arch = Get-CpuArchitecture +switch ($cpu_arch) { + x64 { + $arch = "amd64" + $sha256 = "3c21105d7b584759b6e266383b777caf6e87142d304a10b539dbc66ab482bb5f" + break + } + x86 { + $arch = "386" + $sha256 = "5c6446e2ea80bc6a971d2b34446f16e6517e638b0ff8d3ea229228d1931790b0" + break + } + arm64 { + $arch = "arm64" + $sha256 = "553cc6c460f4e3eb4fad5b897c0bb22cd8bbeb20929f0e3eeb939420320292ce" + break + } + default { + throw "Unknown architecture $cpu_arch" + } } + $goPackage = "C:\Windows\Temp\Go-" + $version + $arch + ".msi" -$url_cache = "\\ci-files01-hki.ci.qt.io\provisioning\windows\Go-" + $version + $arch + ".exe" +$url_cache = "https://ci-files01-hki.ci.qt.io/input/go/windows/go" + $version + ".windows-" + $arch + ".msi" $url_official = "https://go.dev/dl/go" + $version + ".windows-" + $arch + ".msi" Write-Host "Fetching Go $version..." diff --git a/coin/provisioning/common/windows/install-upx.ps1 b/coin/provisioning/common/windows/install-upx.ps1 index e29cc07b488..abfb6712068 100644 --- a/coin/provisioning/common/windows/install-upx.ps1 +++ b/coin/provisioning/common/windows/install-upx.ps1 @@ -1,4 +1,4 @@ -# Copyright (C) 2019 The Qt Company Ltd. +# 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\helpers.ps1" @@ -23,7 +23,7 @@ $filename_zip = $filename + ".zip" $zip = Get-DownloadLocation ($filename_zip) $officialurl = "https://github.com/upx/upx/releases/download/v" + $version + "/" + $filename_zip -$cachedurl = "https://ci-files01-hki.ci.qt.io/input/upx/" + $filename_zip +$cachedurl = "https://ci-files01-hki.ci.qt.io/input/upx/windows/" + $filename_zip Write-Host "Removing old UPX" Remove "C:\UPX" From 80158fdbf37c01c38684ebf4307bf12241e3f3a1 Mon Sep 17 00:00:00 2001 From: Elias Toivola Date: Mon, 16 Sep 2024 17:33:41 +0300 Subject: [PATCH 153/288] Add golang and upx to RHEL-8.10 and WoA Current RHEL 8 version is 8.10 in dev and soon in 6.8 (6.8.1). WoA is also an active platform in dev and 6.8 so let's add Go to it, upx for Windows on Arm has not been implemented yet. This amends: 337206334e90ce77f1dbfa09e67e8fd866d25b60 Change-Id: I8b538e5d68db529e4f396059565856d0af4d8f54 Reviewed-by: Eike Ziller Reviewed-by: Marcus Tillmanns (cherry picked from commit b22b144f651c3cac7d486990cdb771eaeccb5efc) Reviewed-by: Qt Cherry-pick Bot --- .../qtci-linux-RHEL-8.10-x86_64/41-install-golang.sh | 7 +++++++ .../qtci-linux-RHEL-8.10-x86_64/41-install-upx.sh | 7 +++++++ .../qtci-windows-11_22H2-aarch64/12-install-golang.ps1 | 1 + 3 files changed, 15 insertions(+) create mode 100644 coin/provisioning/qtci-linux-RHEL-8.10-x86_64/41-install-golang.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-8.10-x86_64/41-install-upx.sh create mode 100644 coin/provisioning/qtci-windows-11_22H2-aarch64/12-install-golang.ps1 diff --git a/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/41-install-golang.sh b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/41-install-golang.sh new file mode 100644 index 00000000000..6b72bc47515 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/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-RHEL-8.10-x86_64/41-install-upx.sh b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/41-install-upx.sh new file mode 100644 index 00000000000..0bccc01efac --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/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" diff --git a/coin/provisioning/qtci-windows-11_22H2-aarch64/12-install-golang.ps1 b/coin/provisioning/qtci-windows-11_22H2-aarch64/12-install-golang.ps1 new file mode 100644 index 00000000000..c68f16a154e --- /dev/null +++ b/coin/provisioning/qtci-windows-11_22H2-aarch64/12-install-golang.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install-golang.ps1" From be8abb4c4c0f845eab0eff233dcbd104ea13d03a Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 30 Sep 2024 19:57:39 +0000 Subject: [PATCH 154/288] Update submodules on '6.8 in qt/qt5' Change-Id: I6bbd260477dae8d907be101ff7703e2ecc8f0277 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 f657e0b1935..0870bd73956 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit f657e0b1935d147d6896afee154d136c42d2b406 +Subproject commit 0870bd73956efa275f8141bb769d0fc465627a6e diff --git a/qt5compat b/qt5compat index 39f896738d8..698f1608aa0 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 39f896738d8181eff86ef127a5e2d53e8d5013f4 +Subproject commit 698f1608aa01a6563618dc139a12f7640d750878 diff --git a/qtactiveqt b/qtactiveqt index fc90435c005..aa8eb193cd2 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit fc90435c0050cb2f09e27b7c79411e8c639d0227 +Subproject commit aa8eb193cd2bd602d2f3b32d76b839c183c042d5 diff --git a/qtbase b/qtbase index c1b13a0c5ff..7df3f20b910 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit c1b13a0c5ffa2589d9fa6e11d4a215fa38e4b02a +Subproject commit 7df3f20b9105d8a7360246a620978860cfaa5f7a diff --git a/qtcharts b/qtcharts index e9fd711d75f..fb3eeada31c 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit e9fd711d75f997815ba101630d1a302fef1b87ad +Subproject commit fb3eeada31c0d436cf5907dd8bdbe71b597ba851 diff --git a/qtcoap b/qtcoap index f78dedfbe76..e533abd4f20 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit f78dedfbe76aa874de2e1e534a6293cae09661af +Subproject commit e533abd4f209fd48bca282203b484bab1eb5ae55 diff --git a/qtconnectivity b/qtconnectivity index 9b8860a7c48..21517c30f57 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 9b8860a7c48d23e030159d03d39981ca72544224 +Subproject commit 21517c30f574d7f08f191fe427c3b9337bc6cd17 diff --git a/qtdatavis3d b/qtdatavis3d index f0e79f912a3..b35392562f1 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit f0e79f912a34e4ea156c6ef65231b2e245554249 +Subproject commit b35392562f1561cf446d71f38c42983e7a8df652 diff --git a/qtdeclarative b/qtdeclarative index 06e9fa1b243..14a16b1ed7f 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 06e9fa1b24314872dce61fec10de6d186f63c1e3 +Subproject commit 14a16b1ed7f3b59dae49a0881707d26a6010a5fa diff --git a/qtdoc b/qtdoc index 0e571aaf1d2..5739d51a7f5 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 0e571aaf1d2bf78a0dcff57668191ad58dfe7406 +Subproject commit 5739d51a7f59274d9654df7afc32c5bc623142a5 diff --git a/qtgraphs b/qtgraphs index 430b7a7ed7d..46dbf99606f 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit 430b7a7ed7dea486174393b23b8556fbe1cf13e0 +Subproject commit 46dbf99606faa965656044507532d4d14d269728 diff --git a/qtgrpc b/qtgrpc index 67b923173d5..c9b0ded679b 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit 67b923173d5bf12564a2511061444f4520de9f20 +Subproject commit c9b0ded679b9ef6961ebce0c85958968ecb4db02 diff --git a/qthttpserver b/qthttpserver index 349b93be62a..8229b69890c 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit 349b93be62a402c2545685c957632126dfdd8dba +Subproject commit 8229b69890cdd49bae60acab8051e11220164d5b diff --git a/qtimageformats b/qtimageformats index f1ca97de724..a7f2f23196c 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit f1ca97de724d00a59fa48a4bdb8b0009b337f0c3 +Subproject commit a7f2f23196c5efa66e2bec3cbf6f2539a9491cb9 diff --git a/qtlanguageserver b/qtlanguageserver index 6d3d806852c..c2968bbbb4e 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit 6d3d806852c6d7ef059b4f93e9b37141068e48c3 +Subproject commit c2968bbbb4e93fe1bd5d5053d1db7deda0fa4193 diff --git a/qtlocation b/qtlocation index df7d4595c1f..0f3167f19af 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit df7d4595c1f878de1bb8587ad09960b229c21d52 +Subproject commit 0f3167f19afd4a0086ac3df4367c7db39571358f diff --git a/qtlottie b/qtlottie index 564b7c80c9a..75f0582db3b 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 564b7c80c9a185a664b3be0bb60d9a41687e8e0e +Subproject commit 75f0582db3ba78579c4af35ff4b5be535545db23 diff --git a/qtmqtt b/qtmqtt index 17796f12a4a..d414ef74129 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit 17796f12a4aa8e6f76ba22ab04b0499a453755d8 +Subproject commit d414ef74129fcb50d93623f1c59ccd42d9276929 diff --git a/qtmultimedia b/qtmultimedia index e986c4a0ccf..3539d7c7913 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit e986c4a0ccf61c05cef96381a76c8e2eedfc5966 +Subproject commit 3539d7c7913e456e8802a213e4d2541ede25c82b diff --git a/qtnetworkauth b/qtnetworkauth index 5a565f88c36..63347eb1155 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 5a565f88c3624324d5071d8765edd4b54cbe0ad7 +Subproject commit 63347eb11551e5a36dd2a8bf885457f7df733798 diff --git a/qtopcua b/qtopcua index dca88682615..a1e210e752a 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit dca88682615e5b6db75917d81586fddaf193bd39 +Subproject commit a1e210e752af4b4fc856a13781b4b2f1fc590d64 diff --git a/qtpositioning b/qtpositioning index db580cf8f13..c0eef328816 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit db580cf8f1367a5842e4a44cc02218711b240b1a +Subproject commit c0eef32881615afde2428e5d2a1009277ce93a08 diff --git a/qtquick3d b/qtquick3d index 5ce6dba17e4..4c3a16b8fdc 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 5ce6dba17e4843264249acb14f963bc973609271 +Subproject commit 4c3a16b8fdc390bfb55b855f18704784f8e400b2 diff --git a/qtquick3dphysics b/qtquick3dphysics index ce8352677bb..62ca96c052b 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit ce8352677bbe7f796d2b2714cb46c294319de1be +Subproject commit 62ca96c052bed8524d595adfb3fae21a00dca317 diff --git a/qtquickeffectmaker b/qtquickeffectmaker index 55db014a33d..59bcbb92e58 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit 55db014a33de7347f820d57d0713531885c90d71 +Subproject commit 59bcbb92e585600c42011e4d83b5de579cc2a1f2 diff --git a/qtquicktimeline b/qtquicktimeline index ff68e2e2189..4062a74b487 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit ff68e2e21898ca41a92c1aaa9fd298ee34100929 +Subproject commit 4062a74b487d0f84b36f566ced870a9ee404b55f diff --git a/qtremoteobjects b/qtremoteobjects index 0b1e487ba34..37f7dfb5475 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 0b1e487ba3431fc1a456f1d39bdcdce0aab0cd96 +Subproject commit 37f7dfb5475bc9f8984e99e7a0602530595e4184 diff --git a/qtscxml b/qtscxml index 91330899706..a7cc4f88a5c 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 9133089970634d3cdbc81b54a7a6da18dfe034b7 +Subproject commit a7cc4f88a5c6414de358e46b9265c9335dcebe8f diff --git a/qtsensors b/qtsensors index 45b7eb027bb..863242edc32 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 45b7eb027bb4ccc7d8ade3471c1734cc47c81b4d +Subproject commit 863242edc3229eaefd4d7fff70d2a2583287423c diff --git a/qtserialbus b/qtserialbus index 9b9e3d66b96..6ed3d12a9f7 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 9b9e3d66b96a85fdb4a9e1ee07de020db7db2d88 +Subproject commit 6ed3d12a9f7efe20ec2be957065d701ae74d60a2 diff --git a/qtserialport b/qtserialport index 37855a74afe..7be7539245b 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 37855a74afe7cbc63430d45fd8d9aea81a1b565d +Subproject commit 7be7539245bc7ef7ab51c63639d6eea80f442ae1 diff --git a/qtshadertools b/qtshadertools index b55945255bd..e7eb8782d42 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit b55945255bdad6e998dbc3a84166edd255fc9284 +Subproject commit e7eb8782d426c1890bc47f11845c75d26f525345 diff --git a/qtspeech b/qtspeech index 71af6181c17..7873c176f57 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 71af6181c17433248f1fc23c9a805d9e313ca23e +Subproject commit 7873c176f5785fa1c1bc25e0423d0404187cd3f0 diff --git a/qtsvg b/qtsvg index bfb351c8cbe..aef40e75b61 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit bfb351c8cbe679db90fa79ae2bdebb76c9487062 +Subproject commit aef40e75b6158e43fd2b6367a0582232ea25b3f2 diff --git a/qttools b/qttools index 0001c690356..f156198c114 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 0001c6903562e170f623ca7f504883052e3ad7db +Subproject commit f156198c114560d540dac9bccb731471f65b9184 diff --git a/qttranslations b/qttranslations index 1adf1fe1e76..ab60e9c6f0e 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 1adf1fe1e760fc207552d0fad2cde66e8b160880 +Subproject commit ab60e9c6f0eca24b542e05cecbd6a920daf446bd diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index cba42ffd348..164ee7c089b 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit cba42ffd3488afb0119c6c662fdc509bed06f98d +Subproject commit 164ee7c089b3843e5c1b7cb05451a4e7525e07f3 diff --git a/qtwayland b/qtwayland index 98bbf9fded1..626fb60fc7f 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 98bbf9fded1597e59a7d695b24f495139e9d2479 +Subproject commit 626fb60fc7f613197c27f0e546c6cdffd4a6eeb7 diff --git a/qtwebchannel b/qtwebchannel index cde92e22072..9859a11e8ac 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit cde92e22072fd4a6e14ab0f7371cf491ef657015 +Subproject commit 9859a11e8acf8917ff832ebf8c3870496d048be3 diff --git a/qtwebengine b/qtwebengine index 85b14b5455c..ff816247421 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 85b14b5455c6f75d048c6163f7317a4b477a4c2b +Subproject commit ff816247421245e17b800c11877f1f2bccac85d2 diff --git a/qtwebsockets b/qtwebsockets index aa13d51c089..2ee7c3983d4 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit aa13d51c08950b15bfb28c93139b9e20702d7bfb +Subproject commit 2ee7c3983d4e49611d13f722a3b831597a28bec1 diff --git a/qtwebview b/qtwebview index 5d9c0aebcd7..ac6175eb79f 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 5d9c0aebcd79d58ec96ec12843165e60ebfb30a3 +Subproject commit ac6175eb79fe913417b20eeff2e2b2a4c142e295 From 3cb8fd1f1069e5cbd42a2de9d72033466bf97e6f Mon Sep 17 00:00:00 2001 From: Jani Korteniemi Date: Fri, 30 Aug 2024 10:50:27 +0200 Subject: [PATCH 155/288] Fix Android emulator timeout and restart on COIN Changed device's start timeout to 3 minutes, and restarting retries to 3. Changed emulator boot check loop to check against real time value instead int value. Some of the tests caused previous for-loop to take more than 1 second. Task-number: COIN-1154 Pick-to: 6.5 5.15 Change-Id: I58066ad8f440b2fdee3c5b64d094b2713007bf19 Reviewed-by: Assam Boudjelthia Reviewed-by: Jukka Jokiniva (cherry picked from commit 14c7c3061b02bd64092c48b8bb0e20985aefef51) Reviewed-by: Jani Korteniemi --- .../common/linux/android_emulator_launcher.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/coin/provisioning/common/linux/android_emulator_launcher.sh b/coin/provisioning/common/linux/android_emulator_launcher.sh index fad20148d0d..351a04f9f62 100755 --- a/coin/provisioning/common/linux/android_emulator_launcher.sh +++ b/coin/provisioning/common/linux/android_emulator_launcher.sh @@ -7,8 +7,8 @@ set -e -EMULATOR_MAX_RETRIES=5 -ADB_MAX_TIMEOUT=300 +EMULATOR_MAX_RETRIES=3 +ADB_MAX_TIMEOUT=180 EMULATOR_EXEC="$ANDROID_SDK_ROOT/emulator/emulator" ADB_EXEC="$ANDROID_SDK_ROOT/platform-tools/adb" LOGCAT_PATH="$COIN_CTEST_RESULTSDIR/emulator_logcat_%iter.txt" @@ -85,7 +85,11 @@ do echo "Waiting a few minutes for the emulator to fully boot..." emulator_status=down - for _ in $(seq ${ADB_MAX_TIMEOUT}) + + time_start=${SECONDS} + duration=0 + + while [ $duration -lt ${ADB_MAX_TIMEOUT} ] do sleep 1 @@ -94,6 +98,7 @@ do emulator_status=up break fi + duration=$(( SECONDS - time_start )) done # If emulator status is still offline after timeout period, From 87adc6ce0f4e9991b053edf4604e0a3550a99133 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 1 Oct 2024 18:23:19 +0000 Subject: [PATCH 156/288] Update submodules on '6.8 in qt/qt5' Change-Id: I58f3020045614dc4f5331e74192c822203dfc7a9 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 0870bd73956..91ffb00af7a 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 0870bd73956efa275f8141bb769d0fc465627a6e +Subproject commit 91ffb00af7a9dfab4510b9d785fa52169ece1954 diff --git a/qt5compat b/qt5compat index 698f1608aa0..059084298c9 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 698f1608aa01a6563618dc139a12f7640d750878 +Subproject commit 059084298c9f1fa24671d3fed45743e2d78d8531 diff --git a/qtactiveqt b/qtactiveqt index aa8eb193cd2..f1048f6e8cf 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit aa8eb193cd2bd602d2f3b32d76b839c183c042d5 +Subproject commit f1048f6e8cf5cbc850a505a9a62440428c2138b6 diff --git a/qtbase b/qtbase index 7df3f20b910..4b5b6451f44 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 7df3f20b9105d8a7360246a620978860cfaa5f7a +Subproject commit 4b5b6451f44b8fbff7d7a5212f1256a3edf17e74 diff --git a/qtcharts b/qtcharts index fb3eeada31c..4feb3db4f30 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit fb3eeada31c0d436cf5907dd8bdbe71b597ba851 +Subproject commit 4feb3db4f30b4103946f3ff55357195aefecb8ee diff --git a/qtcoap b/qtcoap index e533abd4f20..12a7990e243 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit e533abd4f209fd48bca282203b484bab1eb5ae55 +Subproject commit 12a7990e243a26dd0762f568ce8efc8c8c35ecc1 diff --git a/qtconnectivity b/qtconnectivity index 21517c30f57..c6a72364324 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 21517c30f574d7f08f191fe427c3b9337bc6cd17 +Subproject commit c6a723643240a0520e5995410e6c6f8caa611316 diff --git a/qtdatavis3d b/qtdatavis3d index b35392562f1..78a27c55618 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit b35392562f1561cf446d71f38c42983e7a8df652 +Subproject commit 78a27c5561831b89f440d45f839bc3f832da5807 diff --git a/qtdeclarative b/qtdeclarative index 14a16b1ed7f..280e7c78ec5 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 14a16b1ed7f3b59dae49a0881707d26a6010a5fa +Subproject commit 280e7c78ec56d72585a46becf05b4b72352968ce diff --git a/qtdoc b/qtdoc index 5739d51a7f5..cca47b5a28b 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 5739d51a7f59274d9654df7afc32c5bc623142a5 +Subproject commit cca47b5a28bc9fd4906c165ae671abe438228d06 diff --git a/qtgraphs b/qtgraphs index 46dbf99606f..d059cfdf146 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit 46dbf99606faa965656044507532d4d14d269728 +Subproject commit d059cfdf146423f15d745774addc94c7a004b7bf diff --git a/qtgrpc b/qtgrpc index c9b0ded679b..60ed358dd9d 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit c9b0ded679b9ef6961ebce0c85958968ecb4db02 +Subproject commit 60ed358dd9d7c307a9df7dc25dcef24ec976f943 diff --git a/qthttpserver b/qthttpserver index 8229b69890c..d75c89874b5 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit 8229b69890cdd49bae60acab8051e11220164d5b +Subproject commit d75c89874b5015b94314130fb746ff4a0b8e8cbd diff --git a/qtimageformats b/qtimageformats index a7f2f23196c..79ba66f1a8d 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit a7f2f23196c5efa66e2bec3cbf6f2539a9491cb9 +Subproject commit 79ba66f1a8d7d7d693b23c860171d6963631d830 diff --git a/qtlanguageserver b/qtlanguageserver index c2968bbbb4e..03c0aa6098b 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit c2968bbbb4e93fe1bd5d5053d1db7deda0fa4193 +Subproject commit 03c0aa6098b864aee5216fcb2d3906106368d2b0 diff --git a/qtlocation b/qtlocation index 0f3167f19af..2d4107152db 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 0f3167f19afd4a0086ac3df4367c7db39571358f +Subproject commit 2d4107152dbd228f3acd62e6d06a79b0df120895 diff --git a/qtlottie b/qtlottie index 75f0582db3b..847286d54e7 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 75f0582db3ba78579c4af35ff4b5be535545db23 +Subproject commit 847286d54e79051ee5dd84af4d4d791ab0d9260b diff --git a/qtmqtt b/qtmqtt index d414ef74129..535ec925fd8 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit d414ef74129fcb50d93623f1c59ccd42d9276929 +Subproject commit 535ec925fd875e589d584fe3553d27dc271095f9 diff --git a/qtmultimedia b/qtmultimedia index 3539d7c7913..2c0aefb7762 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 3539d7c7913e456e8802a213e4d2541ede25c82b +Subproject commit 2c0aefb77627568e88be85940f6e15cd2acf631f diff --git a/qtnetworkauth b/qtnetworkauth index 63347eb1155..f6cdf30cdec 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 63347eb11551e5a36dd2a8bf885457f7df733798 +Subproject commit f6cdf30cdecf21798477b34c3f9bf0fdf25117c2 diff --git a/qtopcua b/qtopcua index a1e210e752a..b557bb61955 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit a1e210e752af4b4fc856a13781b4b2f1fc590d64 +Subproject commit b557bb61955accc7f81d67413fd67987325fc76e diff --git a/qtpositioning b/qtpositioning index c0eef328816..46e9b29ed94 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit c0eef32881615afde2428e5d2a1009277ce93a08 +Subproject commit 46e9b29ed941213c5337da2cd000d1a3186cbb40 diff --git a/qtquick3d b/qtquick3d index 4c3a16b8fdc..c7555e037e9 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 4c3a16b8fdc390bfb55b855f18704784f8e400b2 +Subproject commit c7555e037e94e7bdf9239fa78b2020a848b2c945 diff --git a/qtquick3dphysics b/qtquick3dphysics index 62ca96c052b..f1bb0b209fc 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit 62ca96c052bed8524d595adfb3fae21a00dca317 +Subproject commit f1bb0b209fcb30a397810bebcb18f18e1f9f3c26 diff --git a/qtquickeffectmaker b/qtquickeffectmaker index 59bcbb92e58..6cc81531328 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit 59bcbb92e585600c42011e4d83b5de579cc2a1f2 +Subproject commit 6cc815313282b5ab0f05634b0d4341d2ed1a83fd diff --git a/qtquicktimeline b/qtquicktimeline index 4062a74b487..d073318779f 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 4062a74b487d0f84b36f566ced870a9ee404b55f +Subproject commit d073318779fc116b6746bf62f3390483b5dee1be diff --git a/qtremoteobjects b/qtremoteobjects index 37f7dfb5475..41052b6c50d 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 37f7dfb5475bc9f8984e99e7a0602530595e4184 +Subproject commit 41052b6c50d34e616f7f358249e72ad5520222c2 diff --git a/qtscxml b/qtscxml index a7cc4f88a5c..3a6aaa95dda 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit a7cc4f88a5c6414de358e46b9265c9335dcebe8f +Subproject commit 3a6aaa95dda164812701313c3eb57223a2be804c diff --git a/qtsensors b/qtsensors index 863242edc32..2b433f53ab7 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 863242edc3229eaefd4d7fff70d2a2583287423c +Subproject commit 2b433f53ab7d9d581aee5944d75d7984c541851a diff --git a/qtserialbus b/qtserialbus index 6ed3d12a9f7..8b5c93a0088 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 6ed3d12a9f7efe20ec2be957065d701ae74d60a2 +Subproject commit 8b5c93a00889a7bf557845419e7b0208b535c61c diff --git a/qtserialport b/qtserialport index 7be7539245b..9b71c355c61 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 7be7539245bc7ef7ab51c63639d6eea80f442ae1 +Subproject commit 9b71c355c61173e75dd1b973c616a50569f274d0 diff --git a/qtshadertools b/qtshadertools index e7eb8782d42..1e8e5bb1609 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit e7eb8782d426c1890bc47f11845c75d26f525345 +Subproject commit 1e8e5bb16090f9244a9498e9ddf4f664cbc202af diff --git a/qtspeech b/qtspeech index 7873c176f57..0f5f40a08f0 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 7873c176f5785fa1c1bc25e0423d0404187cd3f0 +Subproject commit 0f5f40a08f06e24f238df09c64bcfe8014097ec4 diff --git a/qtsvg b/qtsvg index aef40e75b61..8f3a7a45e45 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit aef40e75b6158e43fd2b6367a0582232ea25b3f2 +Subproject commit 8f3a7a45e45130609316c8cd6f6449adb1ce58a0 diff --git a/qttools b/qttools index f156198c114..b09d142d521 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit f156198c114560d540dac9bccb731471f65b9184 +Subproject commit b09d142d52183e8b9f257d24d029f5c88ffef295 diff --git a/qttranslations b/qttranslations index ab60e9c6f0e..6d353ca1d3e 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit ab60e9c6f0eca24b542e05cecbd6a920daf446bd +Subproject commit 6d353ca1d3e72e210245c685bf27c5bf299d0ef8 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 164ee7c089b..87832a2a23c 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 164ee7c089b3843e5c1b7cb05451a4e7525e07f3 +Subproject commit 87832a2a23c2ecdf9ffa7ad16bb9bd440473898f diff --git a/qtwayland b/qtwayland index 626fb60fc7f..dcae6c63761 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 626fb60fc7f613197c27f0e546c6cdffd4a6eeb7 +Subproject commit dcae6c63761e3271ae6bfc84810766c6a9575e77 diff --git a/qtwebchannel b/qtwebchannel index 9859a11e8ac..255b6588f35 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 9859a11e8acf8917ff832ebf8c3870496d048be3 +Subproject commit 255b6588f352972ca73007685ada66a67092c24d diff --git a/qtwebengine b/qtwebengine index ff816247421..ca2884c9027 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit ff816247421245e17b800c11877f1f2bccac85d2 +Subproject commit ca2884c902726cc6a17bdd29cea931da42ebd0e1 diff --git a/qtwebsockets b/qtwebsockets index 2ee7c3983d4..38c897e272d 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 2ee7c3983d4e49611d13f722a3b831597a28bec1 +Subproject commit 38c897e272dd4258eb6f331e60e368f5e2750c3e diff --git a/qtwebview b/qtwebview index ac6175eb79f..429ec6c471a 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit ac6175eb79fe913417b20eeff2e2b2a4c142e295 +Subproject commit 429ec6c471a370ac8622766f92116721b000857a From 1ee0e9903613e69cdee6c7ad94c860157486a4f4 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 17 May 2024 11:29:22 +0300 Subject: [PATCH 157/288] Update platform configs for QDB and flashing wizard Create common yaml for building static release packages for all host platforms, including arm linux and windows. Task-number: QTBUG-117504 Task-number: QTBUG-117819 Change-Id: I8ee78eb9aa4fa5150141227e3367dee1be10f907 Reviewed-by: Tero Heikkinen Reviewed-by: Toni Saario (cherry picked from commit 21e8dd696b8d01463cc4ef66d28fee54d0e3cac8) Reviewed-by: Qt Cherry-pick Bot --- .../cmake_platforms_static_release.yaml | 72 +++++++++++++++++++ coin/platform_configs/flashing-wizard.yaml | 39 +--------- coin/platform_configs/qdb.yaml | 3 +- 3 files changed, 76 insertions(+), 38 deletions(-) create mode 100644 coin/platform_configs/cmake_platforms_static_release.yaml diff --git a/coin/platform_configs/cmake_platforms_static_release.yaml b/coin/platform_configs/cmake_platforms_static_release.yaml new file mode 100644 index 00000000000..83003911bde --- /dev/null +++ b/coin/platform_configs/cmake_platforms_static_release.yaml @@ -0,0 +1,72 @@ +Version: 2 +Configurations: + +- + Id: 'windows-11_23H2-msvc2022-minimal-static-test' + Template: 'qtci-windows-11_23H2-x86_64-53' + 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' + Environment variables: [ + 'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..', + 'NON_QTBASE_CMAKE_ARGS=-DCMAKE_BUILD_TYPE=Release -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_native_grpc=OFF -DFEATURE_clangcpp=OFF -DINPUT_headersclean=ON', + 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}', + 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', + ] +- + Id: 'windows-11_22h2-arm64-msvc2022-minimal-static-test' + Template: 'qtci-windows-11_22H2-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', + 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', + ] +- + Id: 'rhel-8.10-minimal-static-test' + Template: 'qtci-linux-RHEL-8.10-x86_64-50' + Compiler: 'GCC' + Features: ['Packaging', 'Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'MinimalStaticTests'] + Configure arguments: '-static -nomake examples -release -qt-libjpeg -no-icu -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}}', + 'NON_QTBASE_CMAKE_ARGS=-DCMAKE_BUILD_TYPE=Release -DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DFEATURE_native_grpc=OFF' + ] +- + Id: 'ubuntu-24.04-arm64' + Template: 'qtci-linux-Ubuntu-24.04-aarch64-50' + Compiler: 'GCC' + Features: ['Packaging', 'UseConfigure', 'InstallQt5Dependencies', 'DoNotRunTests'] + Configure arguments: '-static -nomake examples -release -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -no-libudev -bundled-xcb-xinput -no-icu -qt-doubleconversion' + Environment variables: [ + 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', + 'NON_QTBASE_CMAKE_ARGS=-DCMAKE_BUILD_TYPE=Release' + ] + +- + Id: 'macos-universal-on-x86_64-minimal-static-test' + Template: 'qtci-macos-14-x86_64-105' + Compiler: 'Clang' + Target arch: 'x86_64-arm64' + 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}}', + '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' + ] + +- + Id: 'macos-14-minimal-static-tests-x86_64' + Template: 'qtci-macos-14-x86_64-105' + Compiler: 'Clang' + Features: ['TestOnly', 'Packaging'] + Platform dependency: 'macos-universal-on-x86_64-minimal-static-test' +- + Id: 'macos-14-minimal-static-tests-arm64' + Template: 'qtci-macos-14-arm-106' + Compiler: 'Clang' + Features: ['TestOnly', 'Packaging'] + Platform dependency: 'macos-universal-on-x86_64-minimal-static-test' diff --git a/coin/platform_configs/flashing-wizard.yaml b/coin/platform_configs/flashing-wizard.yaml index f013f079c76..46354a7ea9e 100644 --- a/coin/platform_configs/flashing-wizard.yaml +++ b/coin/platform_configs/flashing-wizard.yaml @@ -1,39 +1,4 @@ Version: 2 Module only: True -Configurations: - - - Template: 'qtci-windows-10-x86_64-52' - Compiler: 'MSVC2019' - Features: ['Packaging', 'UseLegacyInstructions'] - Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -static -no-icu' - - - Template: 'qtci-windows-10_22H2-x86_64-52' - Compiler: 'MSVC2019' - Features: ['Packaging', 'UseLegacyInstructions'] - Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -static -no-icu' - - - Template: 'qtci-windows-10-x86_64-52' - Compiler: 'MSVC2019' - Target arch: 'x86' - Features: ['Packaging', 'UseLegacyInstructions'] - Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -static -no-icu' - - - Template: 'qtci-windows-10_22H2-x86_64-52' - Compiler: 'MSVC2019' - Target arch: 'x86' - Features: ['Packaging', 'UseLegacyInstructions'] - Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -static -no-icu' - - - Template: 'qtci-linux-RHEL-8.10-x86_64-50' - Compiler: 'GCC' - Features: ['Packaging', 'UseLegacyInstructions'] - Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -openssl -qt-harfbuzz QMAKE_LFLAGS_APP+=-s -static -no-icu' - - - Template: 'qtci-linux-Ubuntu-18.04-x86_64-50' - Compiler: 'GCC' - Features: ['Packaging', 'UseLegacyInstructions'] - Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -openssl -qt-harfbuzz QMAKE_LFLAGS_APP+=-s -static -no-icu' - - - Template: 'qtci-linux-Ubuntu-22.04-x86_64-51' - Compiler: 'GCC' - Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions'] +Include: [cmake_platforms_static_release.yaml] +Configurations: [] diff --git a/coin/platform_configs/qdb.yaml b/coin/platform_configs/qdb.yaml index c32338426fc..46354a7ea9e 100644 --- a/coin/platform_configs/qdb.yaml +++ b/coin/platform_configs/qdb.yaml @@ -1,3 +1,4 @@ Version: 2 -Include: [cmake_platforms.yaml] +Module only: True +Include: [cmake_platforms_static_release.yaml] Configurations: [] From 0d2a4a10649111776ceec4be6d23fcb8ef9d0ffb Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Fri, 27 Sep 2024 14:53:56 +0200 Subject: [PATCH 158/288] COIN/QtCreator: Add precheck for Debian ARM Different compiler than on RHEL (10.2 vs 10.3) Change-Id: I3d115dfcc085c0d561a42022e61225f1f280493f Reviewed-by: Tim Jenssen (cherry picked from commit 725cd2faaa6adc1d463702ea5b0cd15922b89aaf) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/qt-creator.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/coin/platform_configs/qt-creator.yaml b/coin/platform_configs/qt-creator.yaml index d55cf569dd9..a0d6d763958 100644 --- a/coin/platform_configs/qt-creator.yaml +++ b/coin/platform_configs/qt-creator.yaml @@ -21,6 +21,12 @@ Configurations: Features: ['Packaging', 'Sccache', 'DebugAndRelease'] Configure arguments: '' Environment variables: [] +- + Template: 'qtci-linux-Debian-11.6-aarch64-50' + Compiler: 'GCC' + Features: ['Packaging', 'Sccache', 'DebugAndRelease'] + Configure arguments: '' + Environment variables: [] - Template: 'qtci-macos-14-arm-106' Compiler: 'Clang' From e5fa3230efbeb513d86358766b10879d7b7343a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Wed, 18 Sep 2024 08:31:36 +0300 Subject: [PATCH 159/288] Provisioning: Install libusb for Ubuntu 24.04 arm and macOS 14 arm Required by qt-apps/qdb Task-number: QTQAINFRA-6571 Change-Id: I6bf217af528e4daca548c14abef30ec9e76c2161 Reviewed-by: Tero Heikkinen Reviewed-by: Toni Saario (cherry picked from commit da55c4c620484f77d6d5942510cd1d3f0dbf596e) Reviewed-by: Qt Cherry-pick Bot --- .../qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh | 2 ++ coin/provisioning/qtci-macos-14-arm/29-libusb.sh | 9 +++++++++ 2 files changed, 11 insertions(+) create mode 100755 coin/provisioning/qtci-macos-14-arm/29-libusb.sh 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 8dc03d66bb1..10cf498b93d 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 @@ -233,6 +233,8 @@ installPackages+=(cmake) installPackages+=(lld) # Fix dependencies in shared ffmpeg libs installPackages+=(patchelf) +# For qp-apps/qdb +installPackages+=(libusb-1.0-0-dev) echo "Running update for apt" waitLoop diff --git a/coin/provisioning/qtci-macos-14-arm/29-libusb.sh b/coin/provisioning/qtci-macos-14-arm/29-libusb.sh new file mode 100755 index 00000000000..5562889ed11 --- /dev/null +++ b/coin/provisioning/qtci-macos-14-arm/29-libusb.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 + +BASEDIR=$(dirname "$0") + +"$BASEDIR/../common/macos/libusb.sh" From 251029c36b87f96b9fdb782504aeb41d6ccd0825 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Tue, 24 Sep 2024 10:29:54 +0200 Subject: [PATCH 160/288] platform_configs: remove InsignificantTests for u2404 x11 non-dev Change-Id: I62c9e581a32e1994affb83aa7c69f0075f7bc283 Reviewed-by: Jani Heikkinen (cherry picked from commit 0cd87bfd320fb78c506d45413e96ff122f78b67f) 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 7bc1b1bbf47..937790d29fc 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.5-developer-build' From f6fd6e1b5367ff7fc8f2617c47fbdf9f650eace5 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Sat, 8 Jun 2024 17:35:09 +0200 Subject: [PATCH 161/288] Add MSVC C++20 build to dev and '6.8' - add windows-11_23H2-msvc2022-developer-build Fixes: QTBUG-127127 Change-Id: I7e21a0d1c32675d904fa873fa13a6fdd08ecf1f6 Reviewed-by: Jani Heikkinen (cherry picked from commit d571f689ab102578e9bd51f9695355231d15861b) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/cmake_platforms.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 937790d29fc..e53aab4c069 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -179,6 +179,18 @@ Configurations: 'OPENSSL_LIB_x64={{.Env.OPENSSL_LIB_x64_arm64}}', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', ] +- + Id: 'windows-11_23H2-msvc2022-developer-build' + Template: 'qtci-windows-11_23H2-x86_64-53' + Compiler: 'MSVC2022' + Features: ['Sccache', 'DebugAndRelease', 'WarningsAreErrors', 'UseConfigure'] + Configure arguments: '-debug-and-release -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}}', + 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE', + 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', + 'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}', + ] - Id: 'rhel-8.10' Template: 'qtci-linux-RHEL-8.10-x86_64-50' From 84023b7ee1eb96870bc13c1ebb6e78f183a00f84 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 3 Oct 2024 13:58:23 +0000 Subject: [PATCH 162/288] Update submodules on '6.8 in qt/qt5' Change-Id: Iba6adb1dd7d679b0b6f25f9a6f934e5aebab4536 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 91ffb00af7a..15be1bcdae0 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 91ffb00af7a9dfab4510b9d785fa52169ece1954 +Subproject commit 15be1bcdae0e35fc3b4b6f574f21b7e1c09d60f9 diff --git a/qt5compat b/qt5compat index 059084298c9..295ede7fe7e 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 059084298c9f1fa24671d3fed45743e2d78d8531 +Subproject commit 295ede7fe7ef64aea1fd94e98ed309656b2895db diff --git a/qtactiveqt b/qtactiveqt index f1048f6e8cf..362a712a395 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit f1048f6e8cf5cbc850a505a9a62440428c2138b6 +Subproject commit 362a712a39534a0f841841f76f59426cd32783e6 diff --git a/qtbase b/qtbase index 4b5b6451f44..42439087eb6 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 4b5b6451f44b8fbff7d7a5212f1256a3edf17e74 +Subproject commit 42439087eb6b99022f852588b77653809f2d1b67 diff --git a/qtcharts b/qtcharts index 4feb3db4f30..5a388f8fe92 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 4feb3db4f30b4103946f3ff55357195aefecb8ee +Subproject commit 5a388f8fe921f5cdbd7a5214e27ffb883382f5ec diff --git a/qtcoap b/qtcoap index 12a7990e243..105a7a09d9f 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit 12a7990e243a26dd0762f568ce8efc8c8c35ecc1 +Subproject commit 105a7a09d9f67023adbfc8e83d0ec77ddb7c1bc6 diff --git a/qtconnectivity b/qtconnectivity index c6a72364324..d4468f536c9 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit c6a723643240a0520e5995410e6c6f8caa611316 +Subproject commit d4468f536c977a3301b4cc99541e6cd5cafa23bf diff --git a/qtdatavis3d b/qtdatavis3d index 78a27c55618..36f4e87eab6 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 78a27c5561831b89f440d45f839bc3f832da5807 +Subproject commit 36f4e87eab67dd29bae7a1e62914fa330e34f023 diff --git a/qtdeclarative b/qtdeclarative index 280e7c78ec5..0b4feaf97a8 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 280e7c78ec56d72585a46becf05b4b72352968ce +Subproject commit 0b4feaf97a83f1f4a4b0f2898e2c2ffd34e0928d diff --git a/qtdoc b/qtdoc index cca47b5a28b..fa78392132e 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit cca47b5a28bc9fd4906c165ae671abe438228d06 +Subproject commit fa78392132e1ff800cb1903833f8de91c2cf1b29 diff --git a/qtgraphs b/qtgraphs index d059cfdf146..a908edeef79 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit d059cfdf146423f15d745774addc94c7a004b7bf +Subproject commit a908edeef796b94828be8a5cd2dda94acd48af50 diff --git a/qtgrpc b/qtgrpc index 60ed358dd9d..9dfeb3980a8 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit 60ed358dd9d7c307a9df7dc25dcef24ec976f943 +Subproject commit 9dfeb3980a86caef168a8f89d7b2cc25e0d7e8ab diff --git a/qthttpserver b/qthttpserver index d75c89874b5..9efed242b4d 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit d75c89874b5015b94314130fb746ff4a0b8e8cbd +Subproject commit 9efed242b4d2384be9666cb090a8cd41b5b1d3e4 diff --git a/qtimageformats b/qtimageformats index 79ba66f1a8d..f9ef22227d1 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 79ba66f1a8d7d7d693b23c860171d6963631d830 +Subproject commit f9ef22227d1ab4c9eefaa6e326e400a6ccc80e93 diff --git a/qtlanguageserver b/qtlanguageserver index 03c0aa6098b..9d5eae71506 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit 03c0aa6098b864aee5216fcb2d3906106368d2b0 +Subproject commit 9d5eae715065b8b6be45bbc6acb94b3fa7a640b3 diff --git a/qtlocation b/qtlocation index 2d4107152db..b51c72d5b28 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 2d4107152dbd228f3acd62e6d06a79b0df120895 +Subproject commit b51c72d5b28aa8b44671aa9d0eb29b284e6e5fc3 diff --git a/qtlottie b/qtlottie index 847286d54e7..fd088054a3f 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 847286d54e79051ee5dd84af4d4d791ab0d9260b +Subproject commit fd088054a3ff7bf9f86dff5a0974b5556d7f41ff diff --git a/qtmqtt b/qtmqtt index 535ec925fd8..26a8a239e16 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit 535ec925fd875e589d584fe3553d27dc271095f9 +Subproject commit 26a8a239e1640514b9fd098193f59f9d459eb99f diff --git a/qtmultimedia b/qtmultimedia index 2c0aefb7762..173ab949120 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 2c0aefb77627568e88be85940f6e15cd2acf631f +Subproject commit 173ab949120d2c8fee9901e321f3b66ed6a02fda diff --git a/qtnetworkauth b/qtnetworkauth index f6cdf30cdec..bdaa1287f7e 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit f6cdf30cdecf21798477b34c3f9bf0fdf25117c2 +Subproject commit bdaa1287f7eaeefe5d1f55cfdbb14b461b045a91 diff --git a/qtopcua b/qtopcua index b557bb61955..d8f4315c33e 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit b557bb61955accc7f81d67413fd67987325fc76e +Subproject commit d8f4315c33e9e998ec01be3ec27957d19f617fcd diff --git a/qtpositioning b/qtpositioning index 46e9b29ed94..cfc1210ad29 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit 46e9b29ed941213c5337da2cd000d1a3186cbb40 +Subproject commit cfc1210ad29b2a006d7cbe13157f4f8f838fcffe diff --git a/qtquick3d b/qtquick3d index c7555e037e9..6d19b5f0a0b 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit c7555e037e94e7bdf9239fa78b2020a848b2c945 +Subproject commit 6d19b5f0a0bfec246bbdd056c218aba982a7bfa9 diff --git a/qtquick3dphysics b/qtquick3dphysics index f1bb0b209fc..77997ab4e8f 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit f1bb0b209fcb30a397810bebcb18f18e1f9f3c26 +Subproject commit 77997ab4e8f1470f91dedf83975ecb0f6e38c2dc diff --git a/qtquickeffectmaker b/qtquickeffectmaker index 6cc81531328..575f181a05e 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit 6cc815313282b5ab0f05634b0d4341d2ed1a83fd +Subproject commit 575f181a05e22099e579d98e31fae4b1f649a2e7 diff --git a/qtquicktimeline b/qtquicktimeline index d073318779f..4a2f345ad70 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit d073318779fc116b6746bf62f3390483b5dee1be +Subproject commit 4a2f345ad70e1f6b1d05c1a0ba37794fd98c5b57 diff --git a/qtremoteobjects b/qtremoteobjects index 41052b6c50d..42dc103e18d 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 41052b6c50d34e616f7f358249e72ad5520222c2 +Subproject commit 42dc103e18d1564083ba46b00577787fdb2149c0 diff --git a/qtscxml b/qtscxml index 3a6aaa95dda..c9eb85d7aad 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 3a6aaa95dda164812701313c3eb57223a2be804c +Subproject commit c9eb85d7aad1fac987e41c6f0fcb2195ec6d5985 diff --git a/qtsensors b/qtsensors index 2b433f53ab7..8fa4a69a764 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 2b433f53ab7d9d581aee5944d75d7984c541851a +Subproject commit 8fa4a69a764c0f58a9ee560e20384c2fd7d78ea0 diff --git a/qtserialbus b/qtserialbus index 8b5c93a0088..039af55ea34 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 8b5c93a00889a7bf557845419e7b0208b535c61c +Subproject commit 039af55ea348cf21b5eab080c6a3039df8939f72 diff --git a/qtserialport b/qtserialport index 9b71c355c61..f71aee4dfcf 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 9b71c355c61173e75dd1b973c616a50569f274d0 +Subproject commit f71aee4dfcf9c0799ca20a0b7691b4bd9ab7cd93 diff --git a/qtshadertools b/qtshadertools index 1e8e5bb1609..ad028bc94f8 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 1e8e5bb16090f9244a9498e9ddf4f664cbc202af +Subproject commit ad028bc94f8271b1a582ec7a496a7184481f69ac diff --git a/qtspeech b/qtspeech index 0f5f40a08f0..ff04bca96ab 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 0f5f40a08f06e24f238df09c64bcfe8014097ec4 +Subproject commit ff04bca96ab5a84613918f3d87af4b4551efa922 diff --git a/qtsvg b/qtsvg index 8f3a7a45e45..e972634dcb8 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 8f3a7a45e45130609316c8cd6f6449adb1ce58a0 +Subproject commit e972634dcb8c0535ec43f90384a51867a0db02f9 diff --git a/qttools b/qttools index b09d142d521..a3791a83459 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit b09d142d52183e8b9f257d24d029f5c88ffef295 +Subproject commit a3791a834593ee4279d0a5f688b149c0db97b831 diff --git a/qttranslations b/qttranslations index 6d353ca1d3e..84d6c8102aa 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 6d353ca1d3e72e210245c685bf27c5bf299d0ef8 +Subproject commit 84d6c8102aa51af9858095641e2d8d57bf58f72a diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 87832a2a23c..07e3f015c16 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 87832a2a23c2ecdf9ffa7ad16bb9bd440473898f +Subproject commit 07e3f015c1619b8a9844930391ccfb15f4e8bdcd diff --git a/qtwayland b/qtwayland index dcae6c63761..26f5aca7916 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit dcae6c63761e3271ae6bfc84810766c6a9575e77 +Subproject commit 26f5aca791642651bd113031fecbc0c19c4541d9 diff --git a/qtwebchannel b/qtwebchannel index 255b6588f35..78db08846c7 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 255b6588f352972ca73007685ada66a67092c24d +Subproject commit 78db08846c7efd9aae6eac707f6eca127b83c180 diff --git a/qtwebengine b/qtwebengine index ca2884c9027..207d1a4dc5e 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit ca2884c902726cc6a17bdd29cea931da42ebd0e1 +Subproject commit 207d1a4dc5e99b03a21ead58f128077de4ec2f27 diff --git a/qtwebsockets b/qtwebsockets index 38c897e272d..f29a01951bf 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 38c897e272dd4258eb6f331e60e368f5e2750c3e +Subproject commit f29a01951bfe976b4c48a951ac179821462cfd64 diff --git a/qtwebview b/qtwebview index 429ec6c471a..66cdae25436 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 429ec6c471a370ac8622766f92116721b000857a +Subproject commit 66cdae25436d5bc8ba373538c6d00567e280d559 From 7b3818271a93b5c4d5baab1054a6f0fd800d0d4f Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 4 Oct 2024 09:30:29 +0200 Subject: [PATCH 163/288] Revert "platform_configs: remove InsignificantTests for u2404 x11 non-dev" This reverts commit 0cd87bfd320fb78c506d45413e96ff122f78b67f. The platform is not stable enough, let's remove it first. Change-Id: Ia7a378dc1ad867b085528da02e9d7ed70658c1cd Reviewed-by: Axel Spoerl Reviewed-by: Jukka Jokiniva (cherry picked from commit 7525c795e7ca03befa0830e9f4b40de340ef70d8) 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 e53aab4c069..e4af7f546b9 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'] + Features: ['Sccache', 'TestOnly', 'InsignificantTests'] Platform dependency: 'ubuntu-24.04-x64' - Id: 'opensuse-15.5-developer-build' From f5bfa1122b8aad68f1e0278c0159f1188b10087d Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Fri, 4 Oct 2024 11:35:02 +0300 Subject: [PATCH 164/288] Android: upadate the sha for Gradle script for provisioning MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use the sha from last update of Gradle and update AGP version to match qtbase. Change-Id: Ia235dacfc3206246c4c4330fb185ce1319d45909 Reviewed-by: Simo Fält (cherry picked from commit 536555cde660c74dc15ae8825d61eeec9b212db2) Reviewed-by: Qt Cherry-pick Bot --- .../linux/android/gradle_project/gradle/libs.versions.toml | 2 +- coin/provisioning/common/linux/android_linux.sh | 2 +- 2 files changed, 2 insertions(+), 2 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 85d2f8de821..f45e66b0903 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.4.0" +agp = "8.6.0" core = "1.13.1" appcompat = "1.6.1" material = "1.11.0" diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index 7fb7bf08c7e..199eb2e8459 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -193,7 +193,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="f22e9795d9a32fc4e9f4d6f2a70c2f831028342b" +commit_sha="8436455e2740000a817e0b8154e13f47e6abb68c" 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 d48e42475ebab176f35c8c6c9d88f36cbc54e844 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Fri, 4 Oct 2024 11:59:54 +0300 Subject: [PATCH 165/288] Android: replace Android 9 revision 9 to revision 8 as it's more stable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The current revision 9 seems to have issues that are not reproducible on other environments and even not with other ABIs like x64 or arm64. Task-number: QTBUG-97650 Change-Id: I6f4827f170ea11b8aae9cc774c075fa043e4df5a Reviewed-by: Simo Fält (cherry picked from commit e1015f271888b8bcbca4b2c0385f802e5c876acf) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/common/linux/android_linux.sh | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index 199eb2e8459..a9e74a0c2a4 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -147,8 +147,20 @@ echo "Unzipping the Android Emulator to '$sdkTargetFolder'" sudo unzip -o -q "$emulatorTargetFile" -d "$sdkTargetFolder" rm "$emulatorTargetFile" -echo "y" | ./sdkmanager --install "system-images;android-28;google_apis;x86" \ - | eval "$sdkmanager_no_progress_bar_cmd" +echo "Download and unzip Android 9 System Image" +minVersionFileName="x86-28_r08.zip" +minVersionDestination="$sdkTargetFolder/system-images/android-28/google_apis/" +minVersionFilePath="$minVersionDestination/$minVersionFileName" +minVersionCiUrl="$basePath/system-images/google_apis/$minVersionFileName" +minVersionUrl="https://dl.google.com/android/repository/sys-img/google_apis/$minVersionFileName" +minVersionSha1="41e3b854d7987a3d8b7500631dae1f1d32d3db4e" + +mkdir -p "$minVersionDestination" +DownloadURL "$minVersionCiUrl" "$minVersionUrl" "$minVersionSha1" "$minVersionFilePath" + +echo "Unzipping the Android 9 to $minVersionDestination" +sudo unzip -o -q "$minVersionFilePath" -d "$minVersionDestination" +rm "$minVersionFilePath" echo "Extract stored Android 14 Beta $android14SystemZipName" DownloadURL "$android14SystemPath" "$android14SystemPath" "$android14SystemZipSha" \ From 661298dc77c7171e176ffc2f6796c12f9baa14ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Mon, 7 Oct 2024 13:44:52 +0300 Subject: [PATCH 166/288] Provisioning: Fix installing certificates Don't try to re-install, but install and let apt do its magic. Fixes: QTQAINFRA-6638 Change-Id: I60ccd2717854c6644d1b956362ee3fd535e2d87c Reviewed-by: Jukka Jokiniva (cherry picked from commit f24dacca36ab31778d4d9d6e401f725ea0885925) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/qtci-linux-Ubuntu-22.04-aarch64/02-apt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 b04190aea08..8d4e532ec69 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 @@ -31,7 +31,7 @@ EOC #(ping -c 3 repo-clones.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 +installPackages+=(ca-certificates) ## Tools # Git is not needed by builds themselves, but is nice to have From 97c6f7de382d729b88d08b4a2458e9c96c8f2e32 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 7 Oct 2024 17:59:25 +0000 Subject: [PATCH 167/288] Update submodules on '6.8 in qt/qt5' Change-Id: Ibda998b316e3086f845bed1ad0f9d8ab022adbb7 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 15be1bcdae0..966957e7689 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 15be1bcdae0e35fc3b4b6f574f21b7e1c09d60f9 +Subproject commit 966957e7689355ccc11db92e23e8ba830e4216b9 diff --git a/qt5compat b/qt5compat index 295ede7fe7e..3778d9671e7 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 295ede7fe7ef64aea1fd94e98ed309656b2895db +Subproject commit 3778d9671e7063c9e18f0a37769704066f7da60c diff --git a/qtactiveqt b/qtactiveqt index 362a712a395..fa388cceb68 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 362a712a39534a0f841841f76f59426cd32783e6 +Subproject commit fa388cceb68716822e0c56f799efe4669388317f diff --git a/qtbase b/qtbase index 42439087eb6..258d90222d1 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 42439087eb6b99022f852588b77653809f2d1b67 +Subproject commit 258d90222d16107768b985f96a014898cd6d2393 diff --git a/qtcharts b/qtcharts index 5a388f8fe92..757641f4e69 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 5a388f8fe921f5cdbd7a5214e27ffb883382f5ec +Subproject commit 757641f4e69f9c18eca1e6bb27d54ac3a0d4c36b diff --git a/qtcoap b/qtcoap index 105a7a09d9f..9c4b789b341 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit 105a7a09d9f67023adbfc8e83d0ec77ddb7c1bc6 +Subproject commit 9c4b789b3413b95e51b9910c2b6ada82c820d103 diff --git a/qtconnectivity b/qtconnectivity index d4468f536c9..a5aa5d2c448 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit d4468f536c977a3301b4cc99541e6cd5cafa23bf +Subproject commit a5aa5d2c44890d772e2f1e5a390fea4803d18c8c diff --git a/qtdatavis3d b/qtdatavis3d index 36f4e87eab6..f526d8637a8 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 36f4e87eab67dd29bae7a1e62914fa330e34f023 +Subproject commit f526d8637a8cc379d52b92c65c1018841f04a335 diff --git a/qtdeclarative b/qtdeclarative index 0b4feaf97a8..b95062be66a 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 0b4feaf97a83f1f4a4b0f2898e2c2ffd34e0928d +Subproject commit b95062be66a3bfcfbd83bfafe56e754dd6ecda86 diff --git a/qtdoc b/qtdoc index fa78392132e..470fe713377 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit fa78392132e1ff800cb1903833f8de91c2cf1b29 +Subproject commit 470fe713377412c876fcb65dcf07d04a5d893ca9 diff --git a/qtgraphs b/qtgraphs index a908edeef79..a6f57ad7d29 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit a908edeef796b94828be8a5cd2dda94acd48af50 +Subproject commit a6f57ad7d29586a265e5955a3f02a93e6a344d66 diff --git a/qtgrpc b/qtgrpc index 9dfeb3980a8..53cf7f6fd7b 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit 9dfeb3980a86caef168a8f89d7b2cc25e0d7e8ab +Subproject commit 53cf7f6fd7b8e1d27d512eb5dfdf759f321a354b diff --git a/qthttpserver b/qthttpserver index 9efed242b4d..52fd365f4c6 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit 9efed242b4d2384be9666cb090a8cd41b5b1d3e4 +Subproject commit 52fd365f4c64a067fcd3bb7c3d7031b00ad526d7 diff --git a/qtimageformats b/qtimageformats index f9ef22227d1..3ae5e26d5d9 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit f9ef22227d1ab4c9eefaa6e326e400a6ccc80e93 +Subproject commit 3ae5e26d5d9b65a5f6e94e62643a85d4331504d0 diff --git a/qtlanguageserver b/qtlanguageserver index 9d5eae71506..64990843247 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit 9d5eae715065b8b6be45bbc6acb94b3fa7a640b3 +Subproject commit 6499084324785e986b6563341e650418fc086cbe diff --git a/qtlocation b/qtlocation index b51c72d5b28..b5d8612b32e 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit b51c72d5b28aa8b44671aa9d0eb29b284e6e5fc3 +Subproject commit b5d8612b32ee2a7ca27abc92fd6b5c5193c07320 diff --git a/qtlottie b/qtlottie index fd088054a3f..4be50e45cc2 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit fd088054a3ff7bf9f86dff5a0974b5556d7f41ff +Subproject commit 4be50e45cc21461ebf09f00c6226dea2999302dd diff --git a/qtmqtt b/qtmqtt index 26a8a239e16..d80d49e2c16 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit 26a8a239e1640514b9fd098193f59f9d459eb99f +Subproject commit d80d49e2c165082991273ef00b94c689de1e03a8 diff --git a/qtmultimedia b/qtmultimedia index 173ab949120..2c537892ce1 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 173ab949120d2c8fee9901e321f3b66ed6a02fda +Subproject commit 2c537892ce14603b3d1e9053c0352f9524766dcb diff --git a/qtnetworkauth b/qtnetworkauth index bdaa1287f7e..aa111fb2351 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit bdaa1287f7eaeefe5d1f55cfdbb14b461b045a91 +Subproject commit aa111fb2351c3a962bec56a12f01a6ab4fdc42fe diff --git a/qtopcua b/qtopcua index d8f4315c33e..ddbadea795e 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit d8f4315c33e9e998ec01be3ec27957d19f617fcd +Subproject commit ddbadea795e01879c7e2c095f0f01f934407ab91 diff --git a/qtpositioning b/qtpositioning index cfc1210ad29..6d1ac78af34 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit cfc1210ad29b2a006d7cbe13157f4f8f838fcffe +Subproject commit 6d1ac78af34e024da0caaa031b655944721a3492 diff --git a/qtquick3d b/qtquick3d index 6d19b5f0a0b..8bf99d923f2 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 6d19b5f0a0bfec246bbdd056c218aba982a7bfa9 +Subproject commit 8bf99d923f206ec155e77354540365d8a3a93892 diff --git a/qtquick3dphysics b/qtquick3dphysics index 77997ab4e8f..6c0e9bf8f3b 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit 77997ab4e8f1470f91dedf83975ecb0f6e38c2dc +Subproject commit 6c0e9bf8f3bf527820c28487b3c456e5f704c016 diff --git a/qtquickeffectmaker b/qtquickeffectmaker index 575f181a05e..a26a022f003 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit 575f181a05e22099e579d98e31fae4b1f649a2e7 +Subproject commit a26a022f00384f19ee5ef11630696b65e06a40f1 diff --git a/qtquicktimeline b/qtquicktimeline index 4a2f345ad70..f37fc4fe2d0 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 4a2f345ad70e1f6b1d05c1a0ba37794fd98c5b57 +Subproject commit f37fc4fe2d0810357584a385512121f42543628f diff --git a/qtremoteobjects b/qtremoteobjects index 42dc103e18d..cc2202b0fef 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 42dc103e18d1564083ba46b00577787fdb2149c0 +Subproject commit cc2202b0fef67f0b61c5894144a765db3ad13bfe diff --git a/qtscxml b/qtscxml index c9eb85d7aad..2be162b186a 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit c9eb85d7aad1fac987e41c6f0fcb2195ec6d5985 +Subproject commit 2be162b186a3b443ebbc09c828f1aaddd0158ffb diff --git a/qtsensors b/qtsensors index 8fa4a69a764..d5bb623cbb8 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 8fa4a69a764c0f58a9ee560e20384c2fd7d78ea0 +Subproject commit d5bb623cbb807d8a03c86c0abe97c828701532c2 diff --git a/qtserialbus b/qtserialbus index 039af55ea34..881fad47f24 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 039af55ea348cf21b5eab080c6a3039df8939f72 +Subproject commit 881fad47f2412ee198da6417a0a3a15f6eb3c0e2 diff --git a/qtserialport b/qtserialport index f71aee4dfcf..b1984503f94 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit f71aee4dfcf9c0799ca20a0b7691b4bd9ab7cd93 +Subproject commit b1984503f94ffd79ecdff89e42a8c1ff174b01ae diff --git a/qtshadertools b/qtshadertools index ad028bc94f8..6ffc275c11a 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit ad028bc94f8271b1a582ec7a496a7184481f69ac +Subproject commit 6ffc275c11a5fbbe4394eab65baab079b1914252 diff --git a/qtspeech b/qtspeech index ff04bca96ab..bea88380a99 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit ff04bca96ab5a84613918f3d87af4b4551efa922 +Subproject commit bea88380a9986a284ff6218305e4e9708fc2f10e diff --git a/qtsvg b/qtsvg index e972634dcb8..f5ce0de7272 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit e972634dcb8c0535ec43f90384a51867a0db02f9 +Subproject commit f5ce0de72727cf651f164016ca6662ddf94f6f75 diff --git a/qttools b/qttools index a3791a83459..2ad3a85beb8 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit a3791a834593ee4279d0a5f688b149c0db97b831 +Subproject commit 2ad3a85beb8abfb2d8a7c8c2ab6df7b76ea3f212 diff --git a/qttranslations b/qttranslations index 84d6c8102aa..d3964fb7c5e 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 84d6c8102aa51af9858095641e2d8d57bf58f72a +Subproject commit d3964fb7c5ee10bcffccf89f385f80b936abecfd diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 07e3f015c16..db69a6f0689 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 07e3f015c1619b8a9844930391ccfb15f4e8bdcd +Subproject commit db69a6f0689947958c6cc61e4e54c411fe6416cd diff --git a/qtwayland b/qtwayland index 26f5aca7916..94d5a4c26ca 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 26f5aca791642651bd113031fecbc0c19c4541d9 +Subproject commit 94d5a4c26ca448f871d61af1df0dd31f9b379c19 diff --git a/qtwebchannel b/qtwebchannel index 78db08846c7..f5124192eae 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 78db08846c7efd9aae6eac707f6eca127b83c180 +Subproject commit f5124192eaeb20711243872ce8fe000bbc2b6a07 diff --git a/qtwebengine b/qtwebengine index 207d1a4dc5e..34bdce39879 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 207d1a4dc5e99b03a21ead58f128077de4ec2f27 +Subproject commit 34bdce39879b8595e0d2dd41bf2f0ec50ba046a8 diff --git a/qtwebsockets b/qtwebsockets index f29a01951bf..e4ecbaf4760 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit f29a01951bfe976b4c48a951ac179821462cfd64 +Subproject commit e4ecbaf47609d22d9880f76693893a5fc28ff933 diff --git a/qtwebview b/qtwebview index 66cdae25436..59bf4f47a89 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 66cdae25436d5bc8ba373538c6d00567e280d559 +Subproject commit 59bf4f47a89a35f692f51f4ada323a604532b9f1 From 44717fb041ced911931ab91b88fd28b5b7d49dfb Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 8 Oct 2024 19:01:31 +0000 Subject: [PATCH 168/288] Update submodules on '6.8 in qt/qt5' Change-Id: Icc9f7edf569fce0946061731352dced57abe4b44 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 966957e7689..7c05951181d 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 966957e7689355ccc11db92e23e8ba830e4216b9 +Subproject commit 7c05951181dc44925760f1d492428cbdd10c7653 diff --git a/qt5compat b/qt5compat index 3778d9671e7..410db654b88 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 3778d9671e7063c9e18f0a37769704066f7da60c +Subproject commit 410db654b884fd530d4fb4c4cf4743acbd9dd0e5 diff --git a/qtactiveqt b/qtactiveqt index fa388cceb68..38e5f94659f 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit fa388cceb68716822e0c56f799efe4669388317f +Subproject commit 38e5f94659fcb45a6f2a24968151a33ce70318c3 diff --git a/qtbase b/qtbase index 258d90222d1..c60505140d1 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 258d90222d16107768b985f96a014898cd6d2393 +Subproject commit c60505140d170b6fa1f6684463a15fb5b4529e44 diff --git a/qtcharts b/qtcharts index 757641f4e69..52a56d2bbf3 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 757641f4e69f9c18eca1e6bb27d54ac3a0d4c36b +Subproject commit 52a56d2bbf3346e32f9fcccbe19042b08800aba7 diff --git a/qtcoap b/qtcoap index 9c4b789b341..0cb860c3d71 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit 9c4b789b3413b95e51b9910c2b6ada82c820d103 +Subproject commit 0cb860c3d7143ca0865029ee94bd0d75ed8f4721 diff --git a/qtconnectivity b/qtconnectivity index a5aa5d2c448..8c7affbc2fe 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit a5aa5d2c44890d772e2f1e5a390fea4803d18c8c +Subproject commit 8c7affbc2fece00da39aa44b02404d8bf890266a diff --git a/qtdatavis3d b/qtdatavis3d index f526d8637a8..92cf3da40ea 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit f526d8637a8cc379d52b92c65c1018841f04a335 +Subproject commit 92cf3da40ea496295f45ab1f0b214a9557e7f21b diff --git a/qtdeclarative b/qtdeclarative index b95062be66a..1700e54cbcf 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit b95062be66a3bfcfbd83bfafe56e754dd6ecda86 +Subproject commit 1700e54cbcf28fe1c2913e6501e11672ae92fe72 diff --git a/qtdoc b/qtdoc index 470fe713377..9335c36ff8b 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 470fe713377412c876fcb65dcf07d04a5d893ca9 +Subproject commit 9335c36ff8b977f3f2cb8f516ff30f959c2e15f3 diff --git a/qtgraphs b/qtgraphs index a6f57ad7d29..43037f63ced 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit a6f57ad7d29586a265e5955a3f02a93e6a344d66 +Subproject commit 43037f63cedcdb8b7dcf8be6f9434cda6bcb92e6 diff --git a/qtgrpc b/qtgrpc index 53cf7f6fd7b..7bd266f8763 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit 53cf7f6fd7b8e1d27d512eb5dfdf759f321a354b +Subproject commit 7bd266f8763aca1f4ea72b0ffcb0747aa6daa562 diff --git a/qthttpserver b/qthttpserver index 52fd365f4c6..f602a97fb67 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit 52fd365f4c64a067fcd3bb7c3d7031b00ad526d7 +Subproject commit f602a97fb674f60164f6ccbab4f4e65ade7504f3 diff --git a/qtimageformats b/qtimageformats index 3ae5e26d5d9..7113b5a0c33 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 3ae5e26d5d9b65a5f6e94e62643a85d4331504d0 +Subproject commit 7113b5a0c33f65ac063eccc97c22b8b837bf41a4 diff --git a/qtlanguageserver b/qtlanguageserver index 64990843247..902cebff99f 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit 6499084324785e986b6563341e650418fc086cbe +Subproject commit 902cebff99fa4b5d0cc180fee2a51edc8237ddf9 diff --git a/qtlocation b/qtlocation index b5d8612b32e..72931b61ebc 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit b5d8612b32ee2a7ca27abc92fd6b5c5193c07320 +Subproject commit 72931b61ebc539aa53b8495bb074c2c86d522a5d diff --git a/qtlottie b/qtlottie index 4be50e45cc2..9d69e11aec8 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 4be50e45cc21461ebf09f00c6226dea2999302dd +Subproject commit 9d69e11aec8d50b7ca0a188897958d25fdfafa55 diff --git a/qtmqtt b/qtmqtt index d80d49e2c16..a23b4932155 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit d80d49e2c165082991273ef00b94c689de1e03a8 +Subproject commit a23b4932155333b1d1515064c83aaf617f1dd03e diff --git a/qtmultimedia b/qtmultimedia index 2c537892ce1..eb411efc709 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 2c537892ce14603b3d1e9053c0352f9524766dcb +Subproject commit eb411efc709e59825ace7d8277896f85caab2e07 diff --git a/qtnetworkauth b/qtnetworkauth index aa111fb2351..dbed04c0248 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit aa111fb2351c3a962bec56a12f01a6ab4fdc42fe +Subproject commit dbed04c0248a07c2ee83556654339c808b193415 diff --git a/qtopcua b/qtopcua index ddbadea795e..d887868b466 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit ddbadea795e01879c7e2c095f0f01f934407ab91 +Subproject commit d887868b466df3fd701259bc2f7b75341cd2d254 diff --git a/qtpositioning b/qtpositioning index 6d1ac78af34..98cfee404af 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit 6d1ac78af34e024da0caaa031b655944721a3492 +Subproject commit 98cfee404afaf8fb012c0cb8bb2ed671160fbe5b diff --git a/qtquick3d b/qtquick3d index 8bf99d923f2..115d27179c7 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 8bf99d923f206ec155e77354540365d8a3a93892 +Subproject commit 115d27179c7c25a5132875d7ff01d35c1bdfb5e7 diff --git a/qtquick3dphysics b/qtquick3dphysics index 6c0e9bf8f3b..bb201265e7b 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit 6c0e9bf8f3bf527820c28487b3c456e5f704c016 +Subproject commit bb201265e7b9cafeed7739148dfa02a63e35749d diff --git a/qtquickeffectmaker b/qtquickeffectmaker index a26a022f003..e634eb704f2 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit a26a022f00384f19ee5ef11630696b65e06a40f1 +Subproject commit e634eb704f276f64bb85f77bc02819365657bed4 diff --git a/qtquicktimeline b/qtquicktimeline index f37fc4fe2d0..77b24706d11 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit f37fc4fe2d0810357584a385512121f42543628f +Subproject commit 77b24706d1138bdafa0e8970268eed37173bf903 diff --git a/qtremoteobjects b/qtremoteobjects index cc2202b0fef..3311cd29c99 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit cc2202b0fef67f0b61c5894144a765db3ad13bfe +Subproject commit 3311cd29c99b4497c4b952f895bbd0f3f9aa7128 diff --git a/qtscxml b/qtscxml index 2be162b186a..3133a478a4b 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 2be162b186a3b443ebbc09c828f1aaddd0158ffb +Subproject commit 3133a478a4be7b15e0f6dd35ce74f530dac9cf9a diff --git a/qtsensors b/qtsensors index d5bb623cbb8..2cc670c9ac4 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit d5bb623cbb807d8a03c86c0abe97c828701532c2 +Subproject commit 2cc670c9ac45b1d7628d57ecf197f8b6d3b6ea70 diff --git a/qtserialbus b/qtserialbus index 881fad47f24..14e2d2a3537 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 881fad47f2412ee198da6417a0a3a15f6eb3c0e2 +Subproject commit 14e2d2a35375f8c1b32813e7268925f171b008d7 diff --git a/qtserialport b/qtserialport index b1984503f94..f417ceebfbe 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit b1984503f94ffd79ecdff89e42a8c1ff174b01ae +Subproject commit f417ceebfbe253a3c25aca613cba81344c329eb5 diff --git a/qtshadertools b/qtshadertools index 6ffc275c11a..3275a6a2661 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 6ffc275c11a5fbbe4394eab65baab079b1914252 +Subproject commit 3275a6a2661d2f505049da8c09d8e6667f017c67 diff --git a/qtspeech b/qtspeech index bea88380a99..a61f7736eeb 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit bea88380a9986a284ff6218305e4e9708fc2f10e +Subproject commit a61f7736eeba04dbb0ea5343e818003193ff428e diff --git a/qtsvg b/qtsvg index f5ce0de7272..ab615045299 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit f5ce0de72727cf651f164016ca6662ddf94f6f75 +Subproject commit ab615045299e451823a9e603b015594226253463 diff --git a/qttools b/qttools index 2ad3a85beb8..32fc47a6778 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 2ad3a85beb8abfb2d8a7c8c2ab6df7b76ea3f212 +Subproject commit 32fc47a677821a34a9bafc9014a3496ff4b57113 diff --git a/qttranslations b/qttranslations index d3964fb7c5e..5e2718159da 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit d3964fb7c5ee10bcffccf89f385f80b936abecfd +Subproject commit 5e2718159da467f6779d6cd3449f1b36549a9543 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index db69a6f0689..3e4291d01f7 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit db69a6f0689947958c6cc61e4e54c411fe6416cd +Subproject commit 3e4291d01f7e1b1e84cb3f388c6bb1b042efa78b diff --git a/qtwayland b/qtwayland index 94d5a4c26ca..ce5a2dda1f0 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 94d5a4c26ca448f871d61af1df0dd31f9b379c19 +Subproject commit ce5a2dda1f0979252fec49848c30ed95325ac3e2 diff --git a/qtwebchannel b/qtwebchannel index f5124192eae..a97bc6ce13f 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit f5124192eaeb20711243872ce8fe000bbc2b6a07 +Subproject commit a97bc6ce13f89b2796b61365334306dce9ca0d3f diff --git a/qtwebengine b/qtwebengine index 34bdce39879..ddddbe178df 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 34bdce39879b8595e0d2dd41bf2f0ec50ba046a8 +Subproject commit ddddbe178dfc7bf2d6116a15c6e0c72f35c7ab87 diff --git a/qtwebsockets b/qtwebsockets index e4ecbaf4760..e58f2db336d 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit e4ecbaf47609d22d9880f76693893a5fc28ff933 +Subproject commit e58f2db336d107295d6c4c6f779bc62b0e854e7a diff --git a/qtwebview b/qtwebview index 59bf4f47a89..b828bb30e60 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 59bf4f47a89a35f692f51f4ada323a604532b9f1 +Subproject commit b828bb30e60c7216191addc1398af376d1058216 From 7fbb1c2aecce6827f4bfdf5c96c7038ef2d0518f Mon Sep 17 00:00:00 2001 From: Tero Heikkinen Date: Tue, 24 Sep 2024 23:53:24 +0300 Subject: [PATCH 169/288] Provisioning: Add libclang for Windows on ARM Libclang is needed for QDoc. Adding support for WoA (arch=arm64) also introduced a need to change archVer parameter from Integer to a string. Task-number: QTBUG-129256 Change-Id: I13f15925a7639c6f926c564146fbbc88f73fff8f Reviewed-by: Paul Wicking (cherry picked from commit 1fe16f55f02a0d1378f1b54b22462910ae099cd7) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/common/windows/libclang.ps1 | 21 +++++++++++++++---- .../08-libclang.ps1 | 2 ++ 2 files changed, 19 insertions(+), 4 deletions(-) create mode 100644 coin/provisioning/qtci-windows-11_22H2-aarch64/08-libclang.ps1 diff --git a/coin/provisioning/common/windows/libclang.ps1 b/coin/provisioning/common/windows/libclang.ps1 index 103d7cdd952..615c496bef2 100644 --- a/coin/provisioning/common/windows/libclang.ps1 +++ b/coin/provisioning/common/windows/libclang.ps1 @@ -1,5 +1,5 @@ param( - [Int32]$archVer=32, + [string]$archVer="32", [string]$toolchain="vs2019", [bool]$setDefault=$true ) @@ -36,8 +36,21 @@ function install() { $toolchainSuffix = "" +if ( $toolchain -eq "vs2022" ) { + if ( $archVer -eq "64" ) { + $sha1 = "7e51f0eabdfe8eea17aaf1dce7b2ffe1ea064f66" + } + elseif ( $archVer -eq "arm64" ) { + $sha1 = "986d4d0f253de505ef499345238c101dac1ca3a6" + } + else { + $sha1 = "" + } + $toolchainSuffix = "msvc" +} + if ( $toolchain -eq "vs2019" ) { - if ( $archVer -eq 64 ) { + if ( $archVer -eq "64" ) { $sha1 = "8e0862386caef7e4537599ef980eeb6ebee8767f" } else { @@ -47,7 +60,7 @@ if ( $toolchain -eq "vs2019" ) { } if ( $toolchain -eq "mingw" ) { - if ( $archVer -eq 64 ) { + if ( $archVer -eq "64" ) { $sha1 = "a23cbb0822cf2eb8d1cecf26e8614ef37a7611e3" } else { @@ -58,7 +71,7 @@ if ( $toolchain -eq "mingw" ) { if ( $toolchain -eq "llvm-mingw" ) { - if ( $archVer -eq 64 ) { + if ( $archVer -eq "64" ) { $sha1 = "9c34f99eb575b42c2befe27829c08e6d3f01ae58" } else { diff --git a/coin/provisioning/qtci-windows-11_22H2-aarch64/08-libclang.ps1 b/coin/provisioning/qtci-windows-11_22H2-aarch64/08-libclang.ps1 new file mode 100644 index 00000000000..516adaf0643 --- /dev/null +++ b/coin/provisioning/qtci-windows-11_22H2-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 From 31a68bde20b5f24c3291a411f78adbffa7311d63 Mon Sep 17 00:00:00 2001 From: Tero Heikkinen Date: Wed, 25 Sep 2024 00:29:21 +0300 Subject: [PATCH 170/288] Provisioning: Enable QDoc for Windows on ARM Task-number: QTBUG-129256 Change-Id: Iabf378f4ae00efcce8cd0608969a08f5ce997fa9 Reviewed-by: Paul Wicking (cherry picked from commit 8cde06eae258e76e4f56e911e86f3040f184aaf9) 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 e4af7f546b9..7ffa4fa734e 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -160,7 +160,7 @@ Configurations: Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib -no-sql-psql -no-opengl' Environment variables: [ 'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_arm64}}\..', - 'NON_QTBASE_CMAKE_ARGS= -DFEATURE_clangcpp=OFF -DFEATURE_qdoc=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC_ARM64}} -DQT_DEPLOY_FFMPEG=TRUE', + 'NON_QTBASE_CMAKE_ARGS= -DFEATURE_clangcpp=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC_ARM64}} -DQT_DEPLOY_FFMPEG=TRUE', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', ] - From f836c2ce76ceead1ee5bb2d024c6fb2069cffc02 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 9 Oct 2024 22:15:54 +0000 Subject: [PATCH 171/288] Update submodules on '6.8 in qt/qt5' Change-Id: I6b69b37bb7c2c11e24767edc6b93d795b2b17ade 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 7c05951181d..6972b993b08 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 7c05951181dc44925760f1d492428cbdd10c7653 +Subproject commit 6972b993b0854c83ce7c5848374243f588020212 diff --git a/qt5compat b/qt5compat index 410db654b88..6b4bf0cfe62 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 410db654b884fd530d4fb4c4cf4743acbd9dd0e5 +Subproject commit 6b4bf0cfe62dda68741624ff5defe4c57b1a6d8a diff --git a/qtactiveqt b/qtactiveqt index 38e5f94659f..bb11c5f6252 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 38e5f94659fcb45a6f2a24968151a33ce70318c3 +Subproject commit bb11c5f62525a17f1224ab1ee5b1fca2acb977df diff --git a/qtbase b/qtbase index c60505140d1..3946e7af6f9 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit c60505140d170b6fa1f6684463a15fb5b4529e44 +Subproject commit 3946e7af6f9e700db6c27898352b260cb58e5a77 diff --git a/qtcharts b/qtcharts index 52a56d2bbf3..ae037da6c90 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 52a56d2bbf3346e32f9fcccbe19042b08800aba7 +Subproject commit ae037da6c9059d66823c8885a034e87b8001109b diff --git a/qtcoap b/qtcoap index 0cb860c3d71..83ebd0cf510 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit 0cb860c3d7143ca0865029ee94bd0d75ed8f4721 +Subproject commit 83ebd0cf5106514a53d5b899b47e0bc6e2bd6f44 diff --git a/qtconnectivity b/qtconnectivity index 8c7affbc2fe..7a9c7935ddf 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 8c7affbc2fece00da39aa44b02404d8bf890266a +Subproject commit 7a9c7935ddfe5b0b0f04db3f2116fd508a2ff860 diff --git a/qtdatavis3d b/qtdatavis3d index 92cf3da40ea..e97f61ed02c 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 92cf3da40ea496295f45ab1f0b214a9557e7f21b +Subproject commit e97f61ed02c9dd5966761c36e1a23afc599657cc diff --git a/qtdeclarative b/qtdeclarative index 1700e54cbcf..c367deb846f 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 1700e54cbcf28fe1c2913e6501e11672ae92fe72 +Subproject commit c367deb846f8996f59b4657d43800dc4bf3e9338 diff --git a/qtdoc b/qtdoc index 9335c36ff8b..ccb1645be8d 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 9335c36ff8b977f3f2cb8f516ff30f959c2e15f3 +Subproject commit ccb1645be8db2d134d3a3e4653b593fe7e5f9774 diff --git a/qtgraphs b/qtgraphs index 43037f63ced..1f605ce8852 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit 43037f63cedcdb8b7dcf8be6f9434cda6bcb92e6 +Subproject commit 1f605ce8852bc1502eb34b4a9f3a6e5ddea8c566 diff --git a/qtgrpc b/qtgrpc index 7bd266f8763..445deb3574a 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit 7bd266f8763aca1f4ea72b0ffcb0747aa6daa562 +Subproject commit 445deb3574afb985e3bbaba1bc039a2d0b671bad diff --git a/qthttpserver b/qthttpserver index f602a97fb67..0e5f0e869ce 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit f602a97fb674f60164f6ccbab4f4e65ade7504f3 +Subproject commit 0e5f0e869ce611bf4ff3c310c7fd9dacd0cfbece diff --git a/qtimageformats b/qtimageformats index 7113b5a0c33..1934530bb8d 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 7113b5a0c33f65ac063eccc97c22b8b837bf41a4 +Subproject commit 1934530bb8df0707c7e02b4945e82ac11a3d33b8 diff --git a/qtlanguageserver b/qtlanguageserver index 902cebff99f..14ac0dc67c9 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit 902cebff99fa4b5d0cc180fee2a51edc8237ddf9 +Subproject commit 14ac0dc67c9a33073fbe5eb009c23ecdbd18dd4d diff --git a/qtlocation b/qtlocation index 72931b61ebc..682ca27207f 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 72931b61ebc539aa53b8495bb074c2c86d522a5d +Subproject commit 682ca27207f1b3a6f1536d26465429fe76efe290 diff --git a/qtlottie b/qtlottie index 9d69e11aec8..a53e342ab44 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 9d69e11aec8d50b7ca0a188897958d25fdfafa55 +Subproject commit a53e342ab44895885b1a89fd315256fbb5917d71 diff --git a/qtmqtt b/qtmqtt index a23b4932155..9cb80defb42 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit a23b4932155333b1d1515064c83aaf617f1dd03e +Subproject commit 9cb80defb42b11e906bed62fc8210f904d041127 diff --git a/qtmultimedia b/qtmultimedia index eb411efc709..1baec9dd483 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit eb411efc709e59825ace7d8277896f85caab2e07 +Subproject commit 1baec9dd483cb451e78f9e30296f75ad8a1791d3 diff --git a/qtnetworkauth b/qtnetworkauth index dbed04c0248..222056e1abf 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit dbed04c0248a07c2ee83556654339c808b193415 +Subproject commit 222056e1abfea362e3615b09681e06dbab1896f4 diff --git a/qtopcua b/qtopcua index d887868b466..cb6775003af 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit d887868b466df3fd701259bc2f7b75341cd2d254 +Subproject commit cb6775003afd7050f4509b46e87fc734cd288ed7 diff --git a/qtpositioning b/qtpositioning index 98cfee404af..1a3a33941ae 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit 98cfee404afaf8fb012c0cb8bb2ed671160fbe5b +Subproject commit 1a3a33941aeb8f1e84bbddc812a9307e0365e66c diff --git a/qtquick3d b/qtquick3d index 115d27179c7..bdd7bffcbdf 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 115d27179c7c25a5132875d7ff01d35c1bdfb5e7 +Subproject commit bdd7bffcbdf751a83c96569ffb2fa83d7c430060 diff --git a/qtquick3dphysics b/qtquick3dphysics index bb201265e7b..47da8b5f678 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit bb201265e7b9cafeed7739148dfa02a63e35749d +Subproject commit 47da8b5f678ae385220e6b90fe5581ec24546f8c diff --git a/qtquickeffectmaker b/qtquickeffectmaker index e634eb704f2..bd1fc224319 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit e634eb704f276f64bb85f77bc02819365657bed4 +Subproject commit bd1fc2243190b3e39e16c12fa392d56d700de955 diff --git a/qtquicktimeline b/qtquicktimeline index 77b24706d11..58be290e585 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 77b24706d1138bdafa0e8970268eed37173bf903 +Subproject commit 58be290e585fc191522883694baa832446cc385f diff --git a/qtremoteobjects b/qtremoteobjects index 3311cd29c99..b63cad40a7b 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 3311cd29c99b4497c4b952f895bbd0f3f9aa7128 +Subproject commit b63cad40a7b0e98b61e115668a50c0f912db88a4 diff --git a/qtscxml b/qtscxml index 3133a478a4b..2020c2ca660 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 3133a478a4be7b15e0f6dd35ce74f530dac9cf9a +Subproject commit 2020c2ca66025bbb2697bb00643bd6d2fcb2e4de diff --git a/qtsensors b/qtsensors index 2cc670c9ac4..e06a4470b62 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 2cc670c9ac45b1d7628d57ecf197f8b6d3b6ea70 +Subproject commit e06a4470b62405c0c0cdda9ed9e0630c9fb6be9f diff --git a/qtserialbus b/qtserialbus index 14e2d2a3537..6fe94a94086 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 14e2d2a35375f8c1b32813e7268925f171b008d7 +Subproject commit 6fe94a9408653d85ad6b3b55e8cc0f99c818d74d diff --git a/qtserialport b/qtserialport index f417ceebfbe..88f63c0ee10 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit f417ceebfbe253a3c25aca613cba81344c329eb5 +Subproject commit 88f63c0ee10f1bdecceaa2e36dc15a654f85f2ff diff --git a/qtshadertools b/qtshadertools index 3275a6a2661..9b60ef8fc22 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 3275a6a2661d2f505049da8c09d8e6667f017c67 +Subproject commit 9b60ef8fc2250f7d5a51678c67cc28bab9216425 diff --git a/qtspeech b/qtspeech index a61f7736eeb..e6ed46c0cae 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit a61f7736eeba04dbb0ea5343e818003193ff428e +Subproject commit e6ed46c0caeaa5c6b0fa62cf8724eaf97c5d7c33 diff --git a/qtsvg b/qtsvg index ab615045299..79bb6788635 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit ab615045299e451823a9e603b015594226253463 +Subproject commit 79bb678863537701bc084f61303ddb26b794b83f diff --git a/qttools b/qttools index 32fc47a6778..b0ed42f2cc6 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 32fc47a677821a34a9bafc9014a3496ff4b57113 +Subproject commit b0ed42f2cc6e6a6dfe8df964da0e3738c114a7bf diff --git a/qttranslations b/qttranslations index 5e2718159da..59d85415f98 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 5e2718159da467f6779d6cd3449f1b36549a9543 +Subproject commit 59d85415f985d005504b39e08dfdfd2489171d7d diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 3e4291d01f7..ccfcb93741d 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 3e4291d01f7e1b1e84cb3f388c6bb1b042efa78b +Subproject commit ccfcb93741d12c513342593ec9ababb18526a751 diff --git a/qtwayland b/qtwayland index ce5a2dda1f0..612c625bfea 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit ce5a2dda1f0979252fec49848c30ed95325ac3e2 +Subproject commit 612c625bfeac017138e0dfb82adfc1841d1d0007 diff --git a/qtwebchannel b/qtwebchannel index a97bc6ce13f..25baff54782 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit a97bc6ce13f89b2796b61365334306dce9ca0d3f +Subproject commit 25baff547827ff8a8ccbe2faaf927cc9dab28235 diff --git a/qtwebengine b/qtwebengine index ddddbe178df..f5b6a7414bb 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit ddddbe178dfc7bf2d6116a15c6e0c72f35c7ab87 +Subproject commit f5b6a7414bbb1f685e262a90455b66ebf4fa37dc diff --git a/qtwebsockets b/qtwebsockets index e58f2db336d..b88371aaa84 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit e58f2db336d107295d6c4c6f779bc62b0e854e7a +Subproject commit b88371aaa84b77e7e0c9043730ccf7eda7ee5c64 diff --git a/qtwebview b/qtwebview index b828bb30e60..a17bc2f993d 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit b828bb30e60c7216191addc1398af376d1058216 +Subproject commit a17bc2f993d58e9518e2429031688c2982023f93 From c56cda562f1a71d4a06ba6eb0766841a15509d80 Mon Sep 17 00:00:00 2001 From: Jukka Jokiniva Date: Mon, 7 Oct 2024 14:57:58 +0300 Subject: [PATCH 172/288] Change precheck on Windows and macOS to developer build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This patch includes the followup fix that also adds the "non tests" developer build configuration for macos. Task-number: COIN-1181 Change-Id: I91b156bf4217aba517d02d9003605b09edb08ec6 Reviewed-by: Oliver Wolff Reviewed-by: Tor Arne Vestbø (cherry picked from commit 49b80c57c65a043fb0a22abf3d20036702544ab4) --- coin/platform_configs/precheck.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/coin/platform_configs/precheck.yaml b/coin/platform_configs/precheck.yaml index bf81338a582..cd697181ec2 100644 --- a/coin/platform_configs/precheck.yaml +++ b/coin/platform_configs/precheck.yaml @@ -5,11 +5,12 @@ Include: [ "ubuntu-22.04", "ubuntu-22.04-documentation", "ubuntu-22.04-documentation-x11-tests", - "windows-11_23H2-msvc2022", + "windows-11_23H2-msvc2022-developer-build", "ios-universal" ], macos.yaml: [ - "macos-14-x86_64-tests", + "macos-14-arm64-developer-build", + "macos-14-arm64-developer-build-tests", ], cmake_platforms_target_android.yaml: [ "android-arm64-on-macos" From 607d8786cb164b36b30c3af278e67570afafeae3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konsta=20Alaj=C3=A4rvi?= Date: Mon, 23 Sep 2024 15:36:14 +0300 Subject: [PATCH 173/288] Coin: Android: Add Android 15 in CI Add Android 15 to CI with InsignificantTests flag. Task-number: QTBUG-127802 Pick-to: 6.5 Change-Id: I16e787e1633edd15efd2191f7e23ac275d4f90f7 Reviewed-by: Assam Boudjelthia (cherry picked from commit b5b95a2fa145b9707d6e75159933459a87d1adb9) Reviewed-by: Qt Cherry-pick Bot --- .../cmake_platforms_target_android.yaml | 17 +++++++++++++++++ coin/provisioning/common/linux/android_linux.sh | 6 ++++++ 2 files changed, 23 insertions(+) diff --git a/coin/platform_configs/cmake_platforms_target_android.yaml b/coin/platform_configs/cmake_platforms_target_android.yaml index 4daaa9134e5..02006ba3935 100644 --- a/coin/platform_configs/cmake_platforms_target_android.yaml +++ b/coin/platform_configs/cmake_platforms_target_android.yaml @@ -63,3 +63,20 @@ Configurations: '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-50' + 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_35' + ] + diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index a9e74a0c2a4..96b67a17ce2 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -162,6 +162,9 @@ 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 "Extract stored Android 14 Beta $android14SystemZipName" DownloadURL "$android14SystemPath" "$android14SystemPath" "$android14SystemZipSha" \ "/tmp/$android14SystemZipName" @@ -176,6 +179,9 @@ echo "no" | ./avdmanager create avd -n emulator_x86_api_28 -c 2048M -f \ 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" + echo "Install maximum supported SDK level image for Android Automotive $sdkApiLevelAutomotiveMax" DownloadURL "$androidAutomotiveMaxUrl" "$androidAutomotiveMaxUrl" "$androidAutomotiveMaxSha" \ "/tmp/${sdkApiLevelAutomotiveMax}_automotive.tar.gz" From 8e61993566d706e4d524c9afcea746b652f1783e Mon Sep 17 00:00:00 2001 From: Axel Spoerl Date: Wed, 9 Oct 2024 17:11:49 +0200 Subject: [PATCH 174/288] macOS platform configs: Bump image version to 107 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit qtci-macos-11-x86_64-107 and qtci-macos-12-x86_64-107 have been created to add VNC accessibility. Bump the image version used in CI, in order access debug VMs. Task-number: QTQAINFRA-5815 Task-number: QTQAINFRA-6626 Pick-to: 6.5 Change-Id: I42c6602f9524b1fbfe47da081a7a15deff001f68 Reviewed-by: Tor Arne Vestbø (cherry picked from commit 03f00931ecd33405aba36a0b0a2ba5d2061f8a52) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/macos.yaml | 4 ++-- coin/platform_configs/qtsaferenderer.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/coin/platform_configs/macos.yaml b/coin/platform_configs/macos.yaml index bfaccb86d1f..d32f66f81ca 100644 --- a/coin/platform_configs/macos.yaml +++ b/coin/platform_configs/macos.yaml @@ -39,7 +39,7 @@ Configurations: - Id: 'macos-12-x86_64-tests' - Template: 'qtci-macos-12-x86_64-106' + Template: 'qtci-macos-12-x86_64-107' Compiler: 'Clang' Features: ['Sccache', 'TestOnly', 'Packaging'] Platform dependency: 'macos-universal-on-x86_64' @@ -87,7 +87,7 @@ Configurations: Platform dependency: 'macos-universal-on-arm64' - Id: 'macos-12-arm-on-x86_64-tests' - Template: 'qtci-macos-12-x86_64-106' + Template: 'qtci-macos-12-x86_64-107' Compiler: 'Clang' Features: ['Sccache', 'TestOnly'] Platform dependency: 'macos-universal-on-arm64' diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index c1695f69302..00423596585 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -27,7 +27,7 @@ Include: [ Configurations: - Id: 'macos-latest-xcode-universal-static-build' - Template: 'qtci-macos-12-x86_64-106' + Template: 'qtci-macos-12-x86_64-107' Compiler: 'Clang' Target arch: 'x86_64-arm64' Features: ['Packaging', 'Sccache', 'UseConfigure', 'MinimalStaticTests'] From 2dd0731d72822d571b854218623a484efad5d493 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Tue, 6 Aug 2024 12:27:25 +0200 Subject: [PATCH 175/288] COIN: Add libsecret-dev on Linux machines for Qt Creator Qt Creator uses libsecret for saving passwords. It is dynamically resolved during runtime, but we need the development package at build time to enable the feature. Fixes: QTCREATORBUG-31381 Change-Id: I71077694ff0f4d04b1d85215791dc7f6f6663f64 Reviewed-by: Marcus Tillmanns (cherry picked from commit 3369aab7fb3c7a29b54d19350988448ad4a2cf33) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/qtci-linux-Debian-11.6-aarch64/02-apt.sh | 3 ++- .../qtci-linux-RHEL-8.10-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 ++ coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh | 2 ++ 6 files changed, 12 insertions(+), 1 deletion(-) 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 68019f79467..73695f23f62 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 @@ -246,7 +246,8 @@ installPackages+=(pkg-kde-tools) installPackages+=(unixodbc-dev) installPackages+=(zlib1g-dev) installPackages+=(libusb-1.0-0-dev) - +# password management support for Qt Creator +installPackages+=(libsecret-1-dev) echo "Running update for apt" waitLoop 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 2045bcf313f..209afc53ec2 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 @@ -152,6 +152,8 @@ installPackages+=(jq) installPackages+=(zip) # OpenSSL requirement, built by vcpkg installPackages+=(perl-IPC-Cmd) +# password management support for Qt Creator +installPackages+=(libsecret-devel) sudo yum -y install "${installPackages[@]}" 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 7a186b236a4..7d2361600b9 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 @@ -152,6 +152,8 @@ installPackages+=(jq) installPackages+=(zip) # OpenSSL requirement, built by vcpkg installPackages+=(perl-IPC-Cmd) +# password management support for Qt Creator +installPackages+=(libsecret-devel) sudo yum -y install "${installPackages[@]}" 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 fff4ba3bd7a..77837171dec 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 @@ -140,6 +140,8 @@ installPackages+=(nfs-utils) # cifs-utils, for mounting smb drive installPackages+=(keyutils) installPackages+=(cifs-utils) +# password management support for Qt Creator +installPackages+=(libsecret-devel) sudo yum -y install "${installPackages[@]}" 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 4908e91d63f..299ed222680 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 @@ -162,6 +162,8 @@ installPackages+=(jq) installPackages+=(zip) # OpenSSL requirement, built by vcpkg installPackages+=(perl-IPC-Cmd) +# password management support for Qt Creator +installPackages+=(libsecret-devel) sudo yum -y install "${installPackages[@]}" 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 10cf498b93d..2939f46c478 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 @@ -235,6 +235,8 @@ installPackages+=(lld) installPackages+=(patchelf) # For qp-apps/qdb installPackages+=(libusb-1.0-0-dev) +# password management support for Qt Creator +installPackages+=(libsecret-1-dev) echo "Running update for apt" waitLoop From 11dcad85e9def95774c1e6f1db5f68c9d9fbe750 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Thu, 25 Jul 2024 13:19:36 +0200 Subject: [PATCH 176/288] coin: Run license check from qtqa/dev for all of qt5.git/dev Currently any configuration tagged with the 'LicenseCheck' feature uses the qtqa/master tst_licenses.pl script for license checking. The exact instructions that are run are hard-coded in the Coin repository. This is inflexible, and also confusing because qtqa has a dev and a master branch, and people forget to cherry-pick changes to the master branch. Furthermore always using the qtqa/master branch for all qt5.git branches is limiting, because no instruction changes can be made to a specific qt5.git branch. Using the new instructions added in qtbase commit 2a0e89981a52633c497f62bad0c7d26c466493cb we can now tag configurations with the 'LicenseCheckV2' feature. Integrations will then use the instructions from the active qtbase SHA1 to run the license check. Currently the qtbase instructions will always use the qtqa/dev branch for the license check, for both the dev and 6.8 branches, but in the near future we will likely want to create versioned branches for the qtqa repo, just like the rest of our repositories, so that we can have specific license check instructions for specific branches. Task-number: QTBUG-124453 Task-number: QTBUG-125211 Task-number: QTBUG-125569 Task-number: QTQAINFRA-3935 Change-Id: Ica024dec44a9581c49cdfb555ba93667f7b34780 Reviewed-by: Toni Saario Reviewed-by: Lucie Gerard (cherry picked from commit 0055441fc71792714a81710fa4d6e32ad76d4062) --- coin/platform_configs/default.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 082f9702ed6..1ac6aa4bad3 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -4,9 +4,9 @@ Configurations: Id: 'ubuntu-22.04-license-check' Template: 'qtci-linux-Ubuntu-22.04-x86_64-51' Compiler: 'GCC' - Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions'] + Features: ['TestOnly', 'LicenseCheckV2'] - Id: 'ubuntu-24.04-x64-license-check' Template: 'qtci-linux-Ubuntu-24.04-x86_64-50' Compiler: 'GCC' - Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions'] + Features: ['TestOnly', 'LicenseCheckV2'] From c4dbafcc016b2ca40f39006f59b50fb9f622a7d0 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 17 Oct 2024 22:59:50 +0000 Subject: [PATCH 177/288] Update submodules on '6.8 in qt/qt5' Change-Id: Ib4f9852317fdddf2def59144aaec81b71783f03a Reviewed-by: Akseli Salovaara --- 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 +- qtqa | 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 +- 43 files changed, 43 insertions(+), 43 deletions(-) diff --git a/qt3d b/qt3d index 6972b993b08..1f885d00871 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 6972b993b0854c83ce7c5848374243f588020212 +Subproject commit 1f885d00871503c42613e2ae9a9c86be8cc8832f diff --git a/qt5compat b/qt5compat index 6b4bf0cfe62..04f910621d6 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 6b4bf0cfe62dda68741624ff5defe4c57b1a6d8a +Subproject commit 04f910621d6089c0e839c4a0c78f00d3331f0842 diff --git a/qtactiveqt b/qtactiveqt index bb11c5f6252..d68e792d254 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit bb11c5f62525a17f1224ab1ee5b1fca2acb977df +Subproject commit d68e792d254da86b5b4386a0c631b71a365a4535 diff --git a/qtbase b/qtbase index 3946e7af6f9..d6c592aa2f6 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 3946e7af6f9e700db6c27898352b260cb58e5a77 +Subproject commit d6c592aa2f62edbd13baa7fbf9b19ea93b0994a4 diff --git a/qtcharts b/qtcharts index ae037da6c90..d62dfccb5de 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit ae037da6c9059d66823c8885a034e87b8001109b +Subproject commit d62dfccb5de37a0ba5d5d4f3a1a69d03493f9bfd diff --git a/qtcoap b/qtcoap index 83ebd0cf510..5efc1e048a0 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit 83ebd0cf5106514a53d5b899b47e0bc6e2bd6f44 +Subproject commit 5efc1e048a08506c34692133668c56c2835248d6 diff --git a/qtconnectivity b/qtconnectivity index 7a9c7935ddf..58381958ccc 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 7a9c7935ddfe5b0b0f04db3f2116fd508a2ff860 +Subproject commit 58381958ccc8fa2aa07ad060f8415b7edd396d32 diff --git a/qtdatavis3d b/qtdatavis3d index e97f61ed02c..e496e999043 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit e97f61ed02c9dd5966761c36e1a23afc599657cc +Subproject commit e496e99904347e42f502123043bbdd43973f39f6 diff --git a/qtdeclarative b/qtdeclarative index c367deb846f..76fe874d3f1 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit c367deb846f8996f59b4657d43800dc4bf3e9338 +Subproject commit 76fe874d3f15ee25df29d3d855b1f33785e5a3f9 diff --git a/qtdoc b/qtdoc index ccb1645be8d..cc0c04f38c3 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit ccb1645be8db2d134d3a3e4653b593fe7e5f9774 +Subproject commit cc0c04f38c390b82c12c17531d59b3a031cba8e0 diff --git a/qtgraphs b/qtgraphs index 1f605ce8852..bd46ddf8d86 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit 1f605ce8852bc1502eb34b4a9f3a6e5ddea8c566 +Subproject commit bd46ddf8d86e7d58f176fbbbdf8393e04b71bcca diff --git a/qtgrpc b/qtgrpc index 445deb3574a..fe5c8383f35 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit 445deb3574afb985e3bbaba1bc039a2d0b671bad +Subproject commit fe5c8383f359ddfe8a35005993f3153371a47ae8 diff --git a/qthttpserver b/qthttpserver index 0e5f0e869ce..bc4495aec00 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit 0e5f0e869ce611bf4ff3c310c7fd9dacd0cfbece +Subproject commit bc4495aec00887398f360afd4498cfff716b604c diff --git a/qtimageformats b/qtimageformats index 1934530bb8d..bfc073bf0a4 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 1934530bb8df0707c7e02b4945e82ac11a3d33b8 +Subproject commit bfc073bf0a436eb2e4bbcb5cc83b5c26d8060021 diff --git a/qtlanguageserver b/qtlanguageserver index 14ac0dc67c9..9ccf6e321fd 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit 14ac0dc67c9a33073fbe5eb009c23ecdbd18dd4d +Subproject commit 9ccf6e321fd3bb5e1e0f336f5606ca6d9adf7442 diff --git a/qtlocation b/qtlocation index 682ca27207f..2e8b2e4f7f3 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 682ca27207f1b3a6f1536d26465429fe76efe290 +Subproject commit 2e8b2e4f7f3ae4a27a518daf824a0535aceb0e74 diff --git a/qtlottie b/qtlottie index a53e342ab44..4e5859d2b95 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit a53e342ab44895885b1a89fd315256fbb5917d71 +Subproject commit 4e5859d2b955f12dac322c91a62df0a35904491c diff --git a/qtmqtt b/qtmqtt index 9cb80defb42..67c91fa585f 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit 9cb80defb42b11e906bed62fc8210f904d041127 +Subproject commit 67c91fa585f89fdc915dbf729bf592bdb9cf73ce diff --git a/qtmultimedia b/qtmultimedia index 1baec9dd483..0c53e942f77 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 1baec9dd483cb451e78f9e30296f75ad8a1791d3 +Subproject commit 0c53e942f77f79c01f3effbb489d3742fa0b95d1 diff --git a/qtnetworkauth b/qtnetworkauth index 222056e1abf..9cd2233c272 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 222056e1abfea362e3615b09681e06dbab1896f4 +Subproject commit 9cd2233c2726dcb73f4ea5ed9034fab4afb2113c diff --git a/qtopcua b/qtopcua index cb6775003af..e8ded5135d0 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit cb6775003afd7050f4509b46e87fc734cd288ed7 +Subproject commit e8ded5135d0729deec9c9ec79bce3434aeb7e8a0 diff --git a/qtpositioning b/qtpositioning index 1a3a33941ae..d11badc3481 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit 1a3a33941aeb8f1e84bbddc812a9307e0365e66c +Subproject commit d11badc34816223130be35a7e830a6be82810a70 diff --git a/qtqa b/qtqa index 4bfb694a7ff..5f3716fc8fb 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 4bfb694a7ff5229c63d0bdcea13b296792af3f88 +Subproject commit 5f3716fc8fbdd6c7b609e265c4dcb97aca63f470 diff --git a/qtquick3d b/qtquick3d index bdd7bffcbdf..eafa875d3aa 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit bdd7bffcbdf751a83c96569ffb2fa83d7c430060 +Subproject commit eafa875d3aaa35a4613d2bab3e330e8d7ec6af07 diff --git a/qtquick3dphysics b/qtquick3dphysics index 47da8b5f678..72b10713d64 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit 47da8b5f678ae385220e6b90fe5581ec24546f8c +Subproject commit 72b10713d6455ff39db72cabd8c6d901e71eb25b diff --git a/qtquickeffectmaker b/qtquickeffectmaker index bd1fc224319..abee16bc8db 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit bd1fc2243190b3e39e16c12fa392d56d700de955 +Subproject commit abee16bc8db33a6a96df2febb08da99db48541df diff --git a/qtquicktimeline b/qtquicktimeline index 58be290e585..5012d276fb3 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 58be290e585fc191522883694baa832446cc385f +Subproject commit 5012d276fb3d580b1c2ab941d3c8b63b39f19769 diff --git a/qtremoteobjects b/qtremoteobjects index b63cad40a7b..c9630a981be 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit b63cad40a7b0e98b61e115668a50c0f912db88a4 +Subproject commit c9630a981be81f710ab0b6cbadfdbbd121188fe2 diff --git a/qtscxml b/qtscxml index 2020c2ca660..61a2da41407 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 2020c2ca66025bbb2697bb00643bd6d2fcb2e4de +Subproject commit 61a2da41407cec4de5b0f68b595f9df4daf96dd9 diff --git a/qtsensors b/qtsensors index e06a4470b62..ee92ab2480d 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit e06a4470b62405c0c0cdda9ed9e0630c9fb6be9f +Subproject commit ee92ab2480d1b8d51bc22e22d3de1d6f58af468f diff --git a/qtserialbus b/qtserialbus index 6fe94a94086..9e8664186bc 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 6fe94a9408653d85ad6b3b55e8cc0f99c818d74d +Subproject commit 9e8664186bc49b39a08ff69dcb7a56338b917e2f diff --git a/qtserialport b/qtserialport index 88f63c0ee10..3ca247fff66 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 88f63c0ee10f1bdecceaa2e36dc15a654f85f2ff +Subproject commit 3ca247fff667a5bd0bff20d3dc0487cb929ac18d diff --git a/qtshadertools b/qtshadertools index 9b60ef8fc22..29cf1cd75c9 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 9b60ef8fc2250f7d5a51678c67cc28bab9216425 +Subproject commit 29cf1cd75c9c0787795b81eb7e62cc01c1c5f679 diff --git a/qtspeech b/qtspeech index e6ed46c0cae..d62938f1c6a 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit e6ed46c0caeaa5c6b0fa62cf8724eaf97c5d7c33 +Subproject commit d62938f1c6a6a277a48190884dc49de786d27bd3 diff --git a/qtsvg b/qtsvg index 79bb6788635..ec751b540ad 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 79bb678863537701bc084f61303ddb26b794b83f +Subproject commit ec751b540ad4ab3a3e290052c701cc7373eab4df diff --git a/qttools b/qttools index b0ed42f2cc6..027054ec343 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit b0ed42f2cc6e6a6dfe8df964da0e3738c114a7bf +Subproject commit 027054ec343a83ad2e8dc77c89122c1b4c5b3451 diff --git a/qttranslations b/qttranslations index 59d85415f98..b77a8768ff9 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 59d85415f985d005504b39e08dfdfd2489171d7d +Subproject commit b77a8768ff97a28669ad8395361d9c674f7fa271 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index ccfcb93741d..9be7a5adea7 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit ccfcb93741d12c513342593ec9ababb18526a751 +Subproject commit 9be7a5adea75e0d65461ec7029b6ef3114385cae diff --git a/qtwayland b/qtwayland index 612c625bfea..90000b5a38c 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 612c625bfeac017138e0dfb82adfc1841d1d0007 +Subproject commit 90000b5a38c05aa9fe77baf867c8364992e4130d diff --git a/qtwebchannel b/qtwebchannel index 25baff54782..760a514f762 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 25baff547827ff8a8ccbe2faaf927cc9dab28235 +Subproject commit 760a514f7625aa7121bd5a44f9775ca85afbad90 diff --git a/qtwebengine b/qtwebengine index f5b6a7414bb..0ca5fbaefae 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit f5b6a7414bbb1f685e262a90455b66ebf4fa37dc +Subproject commit 0ca5fbaefaef3ac52d2aced7acead3e03c637b50 diff --git a/qtwebsockets b/qtwebsockets index b88371aaa84..4c59cbceaad 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit b88371aaa84b77e7e0c9043730ccf7eda7ee5c64 +Subproject commit 4c59cbceaad226bf0483d87bad1d48a57c07a08e diff --git a/qtwebview b/qtwebview index a17bc2f993d..d99facec651 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit a17bc2f993d58e9518e2429031688c2982023f93 +Subproject commit d99facec651faddaaaa63f5cfdc5062d8b036f63 From 9af35703bfbdd40fdaa81c6c6493eaba24af2ee5 Mon Sep 17 00:00:00 2001 From: Tero Heikkinen Date: Tue, 15 Oct 2024 11:30:57 +0300 Subject: [PATCH 178/288] Provisioning: Fix ci-files01-hki to use correct URL MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Replace ci-files01-hki.intra.qt.io with ci-files01-hki.ci.qt.io Task-number: QTQAINFRA-6663 Pick-to: 6.5 5.15 Change-Id: Ia9a6b1fc5a23b6f1a393d6e4be8be41e2991e876 Reviewed-by: Simo Fält (cherry picked from commit d197f066343bcca439a6415761f17feec0a71d98) Reviewed-by: Aku Pietikäinen Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/common/unix/install-patchelf.sh | 2 +- coin/provisioning/common/windows/install-ffmpeg.ps1 | 2 +- .../93-download-files-for-sbuild.sh | 2 +- .../93-download-files-for-sbuild.sh | 2 +- .../93-download-files-for-sbuild.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/coin/provisioning/common/unix/install-patchelf.sh b/coin/provisioning/common/unix/install-patchelf.sh index 8e10e351265..3779478a935 100755 --- a/coin/provisioning/common/unix/install-patchelf.sh +++ b/coin/provisioning/common/unix/install-patchelf.sh @@ -6,7 +6,7 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" patchelf_version="0.17.2" -url_cached="https://ci-files01-hki.intra.qt.io/input/android/patchelf/$patchelf_version.tar.gz" +url_cached="https://ci-files01-hki.ci.qt.io/input/android/patchelf/$patchelf_version.tar.gz" url_public="https://github.com/NixOS/patchelf/archive/refs/tags/$patchelf_version.tar.gz" sha1="ddd46a2e2a16a308245c008721d877455b23bba8" diff --git a/coin/provisioning/common/windows/install-ffmpeg.ps1 b/coin/provisioning/common/windows/install-ffmpeg.ps1 index 77f642f3cb5..f2c36417878 100644 --- a/coin/provisioning/common/windows/install-ffmpeg.ps1 +++ b/coin/provisioning/common/windows/install-ffmpeg.ps1 @@ -188,7 +188,7 @@ function InstallAndroidArmv7 { Start-Process -NoNewWindow -Wait -PassThru -ErrorAction Stop -FilePath $msys -ArgumentList ("-lc", "`"pacman -Sy --noconfirm libtool`"") $patchelf_sha1 = "DDD46A2E2A16A308245C008721D877455B23BBA8" - $patchelf_sources = "https://ci-files01-hki.intra.qt.io/input/android/patchelf/0.17.2.tar.gz" + $patchelf_sources = "https://ci-files01-hki.ci.qt.io/input/android/patchelf/0.17.2.tar.gz" $patchelf_download_location = "C:\Windows\Temp\0.17.2.tar.gz" Invoke-WebRequest -UseBasicParsing $patchelf_sources -OutFile $patchelf_download_location diff --git a/coin/provisioning/qtci-linux-Debian-11.6-aarch64/93-download-files-for-sbuild.sh b/coin/provisioning/qtci-linux-Debian-11.6-aarch64/93-download-files-for-sbuild.sh index b31a86f23e7..8d0e9e70f3c 100755 --- a/coin/provisioning/qtci-linux-Debian-11.6-aarch64/93-download-files-for-sbuild.sh +++ b/coin/provisioning/qtci-linux-Debian-11.6-aarch64/93-download-files-for-sbuild.sh @@ -6,7 +6,7 @@ mkdir -p /home/qt/debian_packages cd /home/qt/debian_packages || exit # Backported cmake 3.24 -wget https://ci-files01-hki.intra.qt.io/input/debian/cmake/arm64-jammy/cmake-3.24-deb.tar.gz +wget https://ci-files01-hki.ci.qt.io/input/debian/cmake/arm64-jammy/cmake-3.24-deb.tar.gz tar xzf cmake-3.24-deb.tar.gz # get rest of ready made Ubuntu arm debian packages # so that sbuild can find those diff --git a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/93-download-files-for-sbuild.sh b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/93-download-files-for-sbuild.sh index 8b8530a3424..d344956b70b 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/93-download-files-for-sbuild.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/93-download-files-for-sbuild.sh @@ -6,7 +6,7 @@ mkdir -p /home/qt/debian_packages cd /home/qt/debian_packages || exit # Backported cmake 3.24 -wget https://ci-files01-hki.intra.qt.io/input/debian/cmake/amd64-jammy/cmake-3.24-deb.tar.gz +wget https://ci-files01-hki.ci.qt.io/input/debian/cmake/amd64-jammy/cmake-3.24-deb.tar.gz tar xzf cmake-3.24-deb.tar.gz rm -rf cmake-3.24-deb.tar.gz # get rest of ready made Ubuntu jammy arm debian packages diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/93-download-files-for-sbuild.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/93-download-files-for-sbuild.sh index f2192a4fd4c..8f53319ca83 100644 --- a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/93-download-files-for-sbuild.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/93-download-files-for-sbuild.sh @@ -6,7 +6,7 @@ mkdir -p /home/qt/debian_packages cd /home/qt/debian_packages || exit # Backported cmake 3.24 -wget https://ci-files01-hki.intra.qt.io/input/debian/cmake/amd64-jammy/cmake-3.24-deb.tar.gz +wget https://ci-files01-hki.ci.qt.io/input/debian/cmake/amd64-jammy/cmake-3.24-deb.tar.gz tar xzf cmake-3.24-deb.tar.gz rm -rf cmake-3.24-deb.tar.gz # TODO: Adapt this from jammy to noble Ubuntu 24.04: From 6a4aac317bd8e96931774107e08fb9226f142d32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aku=20Pietik=C3=A4inen?= Date: Thu, 17 Oct 2024 14:57:06 +0300 Subject: [PATCH 179/288] Enable vnc remote management on macOS Task-number: QTQAINFRA-6668 Pick-to: 6.5 Change-Id: I5af8e460059cdcaad22f637e1c92d9a46950f775 Reviewed-by: Axel Spoerl (cherry picked from commit cfd06e54fd11d6fe5acc08b1418646e0bebff33f) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/common/macos/enable_vnc.sh | 7 +++++++ coin/provisioning/qtci-macos-12-arm/10-enable-vnc.sh | 7 +++++++ coin/provisioning/qtci-macos-12-x86_64/10-enable-vnc.sh | 7 +++++++ coin/provisioning/qtci-macos-13-arm/10-enable-vnc.sh | 7 +++++++ coin/provisioning/qtci-macos-13-x86_64/10-enable-vnc.sh | 7 +++++++ coin/provisioning/qtci-macos-14-arm/10-enable-vnc.sh | 7 +++++++ coin/provisioning/qtci-macos-14-x86_64/10-enable-vnc.sh | 7 +++++++ coin/provisioning/qtci-macos-15-arm/10-enable-vnc.sh | 7 +++++++ coin/provisioning/qtci-macos-15-x86_64/10-enable-vnc.sh | 7 +++++++ 9 files changed, 63 insertions(+) create mode 100755 coin/provisioning/common/macos/enable_vnc.sh create mode 100755 coin/provisioning/qtci-macos-12-arm/10-enable-vnc.sh create mode 100755 coin/provisioning/qtci-macos-12-x86_64/10-enable-vnc.sh create mode 100755 coin/provisioning/qtci-macos-13-arm/10-enable-vnc.sh create mode 100755 coin/provisioning/qtci-macos-13-x86_64/10-enable-vnc.sh create mode 100755 coin/provisioning/qtci-macos-14-arm/10-enable-vnc.sh create mode 100755 coin/provisioning/qtci-macos-14-x86_64/10-enable-vnc.sh create mode 100755 coin/provisioning/qtci-macos-15-arm/10-enable-vnc.sh create mode 100755 coin/provisioning/qtci-macos-15-x86_64/10-enable-vnc.sh diff --git a/coin/provisioning/common/macos/enable_vnc.sh b/coin/provisioning/common/macos/enable_vnc.sh new file mode 100755 index 00000000000..b5aaff6ca97 --- /dev/null +++ b/coin/provisioning/common/macos/enable_vnc.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash +# Copyright (C) 2024 The Qt Company Ltd. + +# This script enables remote management vnc +set -ex + +sudo /System/Library/CoreServices/RemoteManagement/ARDAgent.app/Contents/Resources/kickstart -activate -configure -access -on -clientopts -setvnclegacy -vnclegacy yes diff --git a/coin/provisioning/qtci-macos-12-arm/10-enable-vnc.sh b/coin/provisioning/qtci-macos-12-arm/10-enable-vnc.sh new file mode 100755 index 00000000000..27a1a13a61f --- /dev/null +++ b/coin/provisioning/qtci-macos-12-arm/10-enable-vnc.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash +#Copyright (C) 2024 The Qt Company Ltd + +set -ex + +# shellcheck source=../common/macos/enable_vnc.sh +source "${BASH_SOURCE%/*}/../common/macos/enable_vnc.sh" diff --git a/coin/provisioning/qtci-macos-12-x86_64/10-enable-vnc.sh b/coin/provisioning/qtci-macos-12-x86_64/10-enable-vnc.sh new file mode 100755 index 00000000000..27a1a13a61f --- /dev/null +++ b/coin/provisioning/qtci-macos-12-x86_64/10-enable-vnc.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash +#Copyright (C) 2024 The Qt Company Ltd + +set -ex + +# shellcheck source=../common/macos/enable_vnc.sh +source "${BASH_SOURCE%/*}/../common/macos/enable_vnc.sh" diff --git a/coin/provisioning/qtci-macos-13-arm/10-enable-vnc.sh b/coin/provisioning/qtci-macos-13-arm/10-enable-vnc.sh new file mode 100755 index 00000000000..27a1a13a61f --- /dev/null +++ b/coin/provisioning/qtci-macos-13-arm/10-enable-vnc.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash +#Copyright (C) 2024 The Qt Company Ltd + +set -ex + +# shellcheck source=../common/macos/enable_vnc.sh +source "${BASH_SOURCE%/*}/../common/macos/enable_vnc.sh" diff --git a/coin/provisioning/qtci-macos-13-x86_64/10-enable-vnc.sh b/coin/provisioning/qtci-macos-13-x86_64/10-enable-vnc.sh new file mode 100755 index 00000000000..27a1a13a61f --- /dev/null +++ b/coin/provisioning/qtci-macos-13-x86_64/10-enable-vnc.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash +#Copyright (C) 2024 The Qt Company Ltd + +set -ex + +# shellcheck source=../common/macos/enable_vnc.sh +source "${BASH_SOURCE%/*}/../common/macos/enable_vnc.sh" diff --git a/coin/provisioning/qtci-macos-14-arm/10-enable-vnc.sh b/coin/provisioning/qtci-macos-14-arm/10-enable-vnc.sh new file mode 100755 index 00000000000..27a1a13a61f --- /dev/null +++ b/coin/provisioning/qtci-macos-14-arm/10-enable-vnc.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash +#Copyright (C) 2024 The Qt Company Ltd + +set -ex + +# shellcheck source=../common/macos/enable_vnc.sh +source "${BASH_SOURCE%/*}/../common/macos/enable_vnc.sh" diff --git a/coin/provisioning/qtci-macos-14-x86_64/10-enable-vnc.sh b/coin/provisioning/qtci-macos-14-x86_64/10-enable-vnc.sh new file mode 100755 index 00000000000..27a1a13a61f --- /dev/null +++ b/coin/provisioning/qtci-macos-14-x86_64/10-enable-vnc.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash +#Copyright (C) 2024 The Qt Company Ltd + +set -ex + +# shellcheck source=../common/macos/enable_vnc.sh +source "${BASH_SOURCE%/*}/../common/macos/enable_vnc.sh" diff --git a/coin/provisioning/qtci-macos-15-arm/10-enable-vnc.sh b/coin/provisioning/qtci-macos-15-arm/10-enable-vnc.sh new file mode 100755 index 00000000000..27a1a13a61f --- /dev/null +++ b/coin/provisioning/qtci-macos-15-arm/10-enable-vnc.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash +#Copyright (C) 2024 The Qt Company Ltd + +set -ex + +# shellcheck source=../common/macos/enable_vnc.sh +source "${BASH_SOURCE%/*}/../common/macos/enable_vnc.sh" diff --git a/coin/provisioning/qtci-macos-15-x86_64/10-enable-vnc.sh b/coin/provisioning/qtci-macos-15-x86_64/10-enable-vnc.sh new file mode 100755 index 00000000000..27a1a13a61f --- /dev/null +++ b/coin/provisioning/qtci-macos-15-x86_64/10-enable-vnc.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash +#Copyright (C) 2024 The Qt Company Ltd + +set -ex + +# shellcheck source=../common/macos/enable_vnc.sh +source "${BASH_SOURCE%/*}/../common/macos/enable_vnc.sh" From c6c18d6bf910c78037b074290b3f05044da859d9 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 16 Oct 2024 11:05:32 +0200 Subject: [PATCH 180/288] coin: Provision ninja 1.12.1 for RHEL 8.10 and 9.2 It is needed to successfully build Qt with CMake 3.30. Fixes: QTQAINFRA-6484 Change-Id: I70b7d91571f5b20a008947eb0837dd8351965665 Reviewed-by: Joerg Bornemann (cherry picked from commit da3c68ba0cc4c6f6722d0b1af8d84e88e03ba9d0) Reviewed-by: Qt Cherry-pick Bot --- .../common/linux/install-ninja.sh | 42 +++++++++++++++++++ .../05-install-ninja.sh | 8 ++++ .../05-install-ninja.sh | 8 ++++ 3 files changed, 58 insertions(+) create mode 100755 coin/provisioning/common/linux/install-ninja.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-8.10-x86_64/05-install-ninja.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-9.2-x86_64/05-install-ninja.sh diff --git a/coin/provisioning/common/linux/install-ninja.sh b/coin/provisioning/common/linux/install-ninja.sh new file mode 100755 index 00000000000..b89fc9da5b0 --- /dev/null +++ b/coin/provisioning/common/linux/install-ninja.sh @@ -0,0 +1,42 @@ +#!/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 + +# shellcheck source=../unix/DownloadURL.sh +source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" +# shellcheck source=../unix/SetEnvVar.sh +source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" + +# This script will install ninja +version="1.12.1" + +uname_m="$(uname -m)" +case "$uname_m" in + x86_64|amd64) + sha256="6f98805688d19672bd699fbbfa2c2cf0fc054ac3df1f0e6a47664d963d530255" + pkgname="ninja-$version-linux-x64.zip" + dirname="ninja-$version-linux-x64" + ;; + arm64|aarch64) + sha256="5c25c6570b0155e95fce5918cb95f1ad9870df5768653afe128db822301a05a1" + pkgname="ninja-$version-linux-arm64.zip" + dirname="ninja-$version-linux-arm64" + ;; + *) fatal "Unknown architecture in uname: $uname_m" 43 ;; +esac + +internalUrl="http://ci-files01-hki.ci.qt.io/input/ninja/$pkgname" +externalUrl="https://github.com/ninja-build/ninja/releases/download/v$version/$pkgname" + +targetFile="$HOME/$pkgname" +DownloadURL "$internalUrl" "$externalUrl" "$sha256" "$targetFile" +echo "Installing ninja ${version}" +sudo unzip -o -q ${targetFile} -d "${HOME}/${dirname}" +rm "$targetFile" + +installPrefix="/opt/$dirname" +sudo mv "$HOME/$dirname" "$installPrefix" + +SetEnvVar "PATH" "$installPrefix:\$PATH" + +echo "ninja = $version" >> ~/versions.txt diff --git a/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/05-install-ninja.sh b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/05-install-ninja.sh new file mode 100644 index 00000000000..adbb6349a42 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-8.10-x86_64/05-install-ninja.sh @@ -0,0 +1,8 @@ +#!/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 + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/linux/install-ninja.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/05-install-ninja.sh b/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/05-install-ninja.sh new file mode 100644 index 00000000000..adbb6349a42 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-9.2-x86_64/05-install-ninja.sh @@ -0,0 +1,8 @@ +#!/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 + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/linux/install-ninja.sh" From d6402b31f879577706acbb81a101f9b984688321 Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Sat, 7 Sep 2024 13:59:35 +0200 Subject: [PATCH 181/288] Add the missing archiving tool to QNX toolchain files Pick-to: 6.7 Fixes: QTBUG-128747 Change-Id: Iee9eca2ef8c53e1171b8d88ded6d313a6b096bea Reviewed-by: Joerg Bornemann (cherry picked from commit f747d2dec7e98fe0ea550cc6165925a1c9ce1451) 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 9a207b0edd3..d787d555126 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 @@ -24,5 +24,6 @@ set(CMAKE_CXX_COMPILER q++) 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_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 062bb794fcc..d270530b815 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 @@ -24,5 +24,6 @@ set(CMAKE_CXX_COMPILER q++) 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_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 e11488bc991..a7bb7b5e1c4 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 @@ -24,5 +24,6 @@ set(CMAKE_CXX_COMPILER q++) 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_SYSROOT $ENV{QNX_TARGET}) From 95234b04c04984592b355e9d00072af42aa72972 Mon Sep 17 00:00:00 2001 From: Elias Toivola Date: Thu, 3 Oct 2024 16:57:30 +0300 Subject: [PATCH 182/288] Fix SSH for RHEL-8.10 Red Hat 8.10 VM template -50 does not have a user set for SSH. This is fixed in template -51. Change-Id: I602976a0214f6e0f4661e6b876c0710bc3ea9df9 Reviewed-by: Assam Boudjelthia (cherry picked from commit 293aeab453a6f8e223d3fae8fd20b5566cf60ea9) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/cmake_platforms.yaml | 2 +- coin/platform_configs/cmake_platforms_static_release.yaml | 2 +- coin/platform_configs/cmake_platforms_target_android.yaml | 4 ++-- coin/platform_configs/linux_android_tests_developer.yaml | 2 +- coin/platform_configs/linux_android_tests_multi_abi.yaml | 2 +- coin/platform_configs/qt-creator.yaml | 2 +- coin/platform_configs/qtsaferenderer.yaml | 2 +- coin/platform_configs/tqtc-android-automotive.yaml | 4 ++-- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 7ffa4fa734e..0d97c2f216c 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -193,7 +193,7 @@ Configurations: ] - Id: 'rhel-8.10' - Template: 'qtci-linux-RHEL-8.10-x86_64-50' + Template: 'qtci-linux-RHEL-8.10-x86_64-51' Compiler: 'GCC' 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' diff --git a/coin/platform_configs/cmake_platforms_static_release.yaml b/coin/platform_configs/cmake_platforms_static_release.yaml index 83003911bde..6bd5f994edb 100644 --- a/coin/platform_configs/cmake_platforms_static_release.yaml +++ b/coin/platform_configs/cmake_platforms_static_release.yaml @@ -26,7 +26,7 @@ Configurations: ] - Id: 'rhel-8.10-minimal-static-test' - Template: 'qtci-linux-RHEL-8.10-x86_64-50' + Template: 'qtci-linux-RHEL-8.10-x86_64-51' Compiler: 'GCC' Features: ['Packaging', 'Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'MinimalStaticTests'] Configure arguments: '-static -nomake examples -release -qt-libjpeg -no-icu -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput' diff --git a/coin/platform_configs/cmake_platforms_target_android.yaml b/coin/platform_configs/cmake_platforms_target_android.yaml index 02006ba3935..9995b87194c 100644 --- a/coin/platform_configs/cmake_platforms_target_android.yaml +++ b/coin/platform_configs/cmake_platforms_target_android.yaml @@ -33,7 +33,7 @@ Configurations: ] - Id: 'android-9-x86-on-linux' - Template: 'qtci-linux-RHEL-8.10-x86_64-50' + Template: 'qtci-linux-RHEL-8.10-x86_64-51' Target os: 'Android_ANY' Target arch: 'x86' Compiler: 'GCC' @@ -49,7 +49,7 @@ Configurations: ] - Id: 'android-14-x86_64-on-linux' - Template: 'qtci-linux-RHEL-8.10-x86_64-50' + Template: 'qtci-linux-RHEL-8.10-x86_64-51' Target os: 'Android_ANY' Target arch: 'x86_64' Compiler: 'GCC' diff --git a/coin/platform_configs/linux_android_tests_developer.yaml b/coin/platform_configs/linux_android_tests_developer.yaml index 305ef475d9b..3488a44d73b 100644 --- a/coin/platform_configs/linux_android_tests_developer.yaml +++ b/coin/platform_configs/linux_android_tests_developer.yaml @@ -2,7 +2,7 @@ Version: 2 Configurations: - Id: 'android-x86-developer-build-testrun-on-linux' - Template: 'qtci-linux-RHEL-8.10-x86_64-50' + Template: 'qtci-linux-RHEL-8.10-x86_64-51' Target os: 'Android_ANY' Target arch: 'x86' Compiler: 'GCC' diff --git a/coin/platform_configs/linux_android_tests_multi_abi.yaml b/coin/platform_configs/linux_android_tests_multi_abi.yaml index b6b88d974df..4f6e9d3fa2e 100644 --- a/coin/platform_configs/linux_android_tests_multi_abi.yaml +++ b/coin/platform_configs/linux_android_tests_multi_abi.yaml @@ -2,7 +2,7 @@ Version: 2 Configurations: - Id: 'android-9-multi-abi' - Template: 'qtci-linux-RHEL-8.10-x86_64-50' + Template: 'qtci-linux-RHEL-8.10-x86_64-51' Target os: 'Android_ANY' Target arch: 'multi' Compiler: 'GCC' diff --git a/coin/platform_configs/qt-creator.yaml b/coin/platform_configs/qt-creator.yaml index a0d6d763958..95a89747579 100644 --- a/coin/platform_configs/qt-creator.yaml +++ b/coin/platform_configs/qt-creator.yaml @@ -16,7 +16,7 @@ Configurations: Environment variables: [] Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64'] - - Template: 'qtci-linux-RHEL-8.10-x86_64-50' + Template: 'qtci-linux-RHEL-8.10-x86_64-51' Compiler: 'GCC' Features: ['Packaging', 'Sccache', 'DebugAndRelease'] Configure arguments: '' diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index 00423596585..f1f82d14b75 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -37,7 +37,7 @@ Configurations: ] - Id: 'Linux-RHEL_8_10_Static' - Template: 'qtci-linux-RHEL-8.10-x86_64-50' + Template: 'qtci-linux-RHEL-8.10-x86_64-51' Compiler: 'GCC' Features: ['Packaging', 'Sccache', 'UseConfigure', 'MinimalStaticTests'] Configure arguments: '-static -no-icu -nomake examples -release -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput -no-sql-mysql' diff --git a/coin/platform_configs/tqtc-android-automotive.yaml b/coin/platform_configs/tqtc-android-automotive.yaml index 84543678c3a..be9bc87699b 100644 --- a/coin/platform_configs/tqtc-android-automotive.yaml +++ b/coin/platform_configs/tqtc-android-automotive.yaml @@ -19,7 +19,7 @@ Include: [ Configurations: - Id: "automotive-android-14-x86_64-on-linux" - Template: 'qtci-linux-RHEL-8.10-x86_64-50' + Template: 'qtci-linux-RHEL-8.10-x86_64-51' Target os: 'Android_ANY' Target arch: 'x86_64' Compiler: 'GCC' @@ -35,7 +35,7 @@ Configurations: ] - Id: "automotive-android-10-x86_64-on-linux" - Template: 'qtci-linux-RHEL-8.10-x86_64-50' + Template: 'qtci-linux-RHEL-8.10-x86_64-51' Target os: 'Android_ANY' Target arch: 'x86_64' Compiler: 'GCC' From 26c0acf2661eb3b0274f9bf98d4d3f7dfcd68713 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 16 Oct 2024 11:47:07 +0200 Subject: [PATCH 183/288] coin: Build MSVC as standalone examples in a separate build directory The MSVC platform was not there when the rest of the platforms where adjusted to build examples as standalone. Now that it's here, add it. This is a pre-requisite for building examples as external projects with MSVC. Augments d278e682c622cf5f355edc63a503af97f079ba79 Task-number: QTBUG-90820 Task-number: QTBUG-96232 Change-Id: I4a77d16e0f683f5984beeedb6e6d32707847383b Reviewed-by: Joerg Bornemann (cherry picked from commit 2dce30db01777b9a8f815efbd6d991272b36b108) 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 0d97c2f216c..371bf97c644 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -183,7 +183,7 @@ Configurations: Id: 'windows-11_23H2-msvc2022-developer-build' Template: 'qtci-windows-11_23H2-x86_64-53' Compiler: 'MSVC2022' - Features: ['Sccache', 'DebugAndRelease', 'WarningsAreErrors', 'UseConfigure'] + Features: ['Sccache', 'DebugAndRelease', 'WarningsAreErrors', 'UseConfigure', 'StandaloneExamples'] Configure arguments: '-debug-and-release -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}}', From c1edd84a8a0fbc1f24df5e5d3073ab2a5aa50c37 Mon Sep 17 00:00:00 2001 From: Matti Paaso Date: Tue, 13 Aug 2024 09:46:08 +0300 Subject: [PATCH 184/288] Update java in macOS x64 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Android requires java 17 in Qt 6.8 and RTA needs java 17 into VMs to compile Qt examples. Task-number: QTQAINFRA-6492 Change-Id: I873c188154c2eae2a9eebddb94279c41ca822576 Reviewed-by: Johanna Äijälä Reviewed-by: Ville-Pekka Karhu (cherry picked from commit 73cc61c389bbb3ae62313e544fd1564dd14a660c) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/common/macos/java.sh | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/coin/provisioning/common/macos/java.sh b/coin/provisioning/common/macos/java.sh index 1429f82410b..829b94c61da 100755 --- a/coin/provisioning/common/macos/java.sh +++ b/coin/provisioning/common/macos/java.sh @@ -1,17 +1,20 @@ #!/usr/bin/env bash -# Copyright (C) 2021 The Qt Company Ltd. +# 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 installs JDK set -ex +source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" + echo "Installing Java Development Kit" -version=11.0.12 -targetFile=jdk-${version}_osx-x64_bin.dmg +version=17.0.12 +targetFile=jdk-${version}_macos-x64_bin.dmg +expectedHash="6fba2fbe5d181bd2ef7fd79e0335278c13f611cb" url=ci-files01-hki.ci.qt.io:/hdd/www/input/mac -# url_alt=https://www.oracle.com/java/technologies/downloads/#java11-linux +# url_alt=https://www.oracle.com/java/technologies/downloads/#jdk17-mac echo "Mounting $targetFile" sudo mkdir -p /Volumes/files @@ -19,6 +22,8 @@ sudo mount -o locallocks "$url" /Volumes/files sudo cp "/Volumes/files/$targetFile" /tmp sudo umount /Volumes/files +cd /tmp +VerifyHash "$targetFile" "$expectedHash" sudo hdiutil attach "/tmp/$targetFile" echo Installing JDK From 1b70600c42bf46a6e7d700491fddd7739946e00b Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 27 Oct 2024 08:06:26 +0000 Subject: [PATCH 185/288] Update submodules on '6.8 in qt/qt5' Change-Id: I52683b0dccc6ed85114e8d9796341926e470573d 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 1f885d00871..d394b30ad1c 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 1f885d00871503c42613e2ae9a9c86be8cc8832f +Subproject commit d394b30ad1c543e3985440cb30ab35be0de774f1 diff --git a/qt5compat b/qt5compat index 04f910621d6..49c733c67f2 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 04f910621d6089c0e839c4a0c78f00d3331f0842 +Subproject commit 49c733c67f293ca9e4720a724483cf246a745dfc diff --git a/qtactiveqt b/qtactiveqt index d68e792d254..0ec8a626de6 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit d68e792d254da86b5b4386a0c631b71a365a4535 +Subproject commit 0ec8a626de6fa387c2107e06de995fde5f77bbc0 diff --git a/qtbase b/qtbase index d6c592aa2f6..71cba1359e3 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit d6c592aa2f62edbd13baa7fbf9b19ea93b0994a4 +Subproject commit 71cba1359e372a8f4cc4a439084a647fffc59081 diff --git a/qtcharts b/qtcharts index d62dfccb5de..f19667f4c53 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit d62dfccb5de37a0ba5d5d4f3a1a69d03493f9bfd +Subproject commit f19667f4c5351e219e3ae62e334f75275b3b2e5c diff --git a/qtcoap b/qtcoap index 5efc1e048a0..d29cef36f67 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit 5efc1e048a08506c34692133668c56c2835248d6 +Subproject commit d29cef36f67e75ce4d8118a43f4e3671ae6461af diff --git a/qtconnectivity b/qtconnectivity index 58381958ccc..cd02ec39c2c 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 58381958ccc8fa2aa07ad060f8415b7edd396d32 +Subproject commit cd02ec39c2cf9030c96cdc515ef956f962b4b96c diff --git a/qtdatavis3d b/qtdatavis3d index e496e999043..372b6132a11 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit e496e99904347e42f502123043bbdd43973f39f6 +Subproject commit 372b6132a111b63a74ea0dfda7bbb675e6c057a5 diff --git a/qtdeclarative b/qtdeclarative index 76fe874d3f1..4ed387feddf 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 76fe874d3f15ee25df29d3d855b1f33785e5a3f9 +Subproject commit 4ed387feddf0e3683252af2fe1ba38789ad71c0e diff --git a/qtdoc b/qtdoc index cc0c04f38c3..3bc534d07ac 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit cc0c04f38c390b82c12c17531d59b3a031cba8e0 +Subproject commit 3bc534d07ac5717e7ba6e4dfbc9353cb642805b2 diff --git a/qtgraphs b/qtgraphs index bd46ddf8d86..94d38c2f7d7 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit bd46ddf8d86e7d58f176fbbbdf8393e04b71bcca +Subproject commit 94d38c2f7d7ae8003b5fa8232fd447ca3ca61345 diff --git a/qtgrpc b/qtgrpc index fe5c8383f35..235b6a17b75 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit fe5c8383f359ddfe8a35005993f3153371a47ae8 +Subproject commit 235b6a17b75be02874224ad7a4594e20a7c6bfcc diff --git a/qthttpserver b/qthttpserver index bc4495aec00..bd837f6fa81 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit bc4495aec00887398f360afd4498cfff716b604c +Subproject commit bd837f6fa811165abc380567bd77bb2deb6f670e diff --git a/qtimageformats b/qtimageformats index bfc073bf0a4..86a31ed9586 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit bfc073bf0a436eb2e4bbcb5cc83b5c26d8060021 +Subproject commit 86a31ed9586453bb4234be76d3e3d628f61b9b28 diff --git a/qtlanguageserver b/qtlanguageserver index 9ccf6e321fd..6898db5f649 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit 9ccf6e321fd3bb5e1e0f336f5606ca6d9adf7442 +Subproject commit 6898db5f649c2576316433bc2af46c99de9eab7b diff --git a/qtlocation b/qtlocation index 2e8b2e4f7f3..0a250bf39d7 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 2e8b2e4f7f3ae4a27a518daf824a0535aceb0e74 +Subproject commit 0a250bf39d79ea68a3fcabf681a3bd794551b6e7 diff --git a/qtlottie b/qtlottie index 4e5859d2b95..99d1be57ecb 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 4e5859d2b955f12dac322c91a62df0a35904491c +Subproject commit 99d1be57ecb8c884510658e30a6da009c2a66b99 diff --git a/qtmqtt b/qtmqtt index 67c91fa585f..3abb1ab323c 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit 67c91fa585f89fdc915dbf729bf592bdb9cf73ce +Subproject commit 3abb1ab323c2d647128eb039169513c8bad7f9b6 diff --git a/qtmultimedia b/qtmultimedia index 0c53e942f77..9045632f671 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 0c53e942f77f79c01f3effbb489d3742fa0b95d1 +Subproject commit 9045632f67104af4193508dbc139b16f468f87f0 diff --git a/qtnetworkauth b/qtnetworkauth index 9cd2233c272..b78f6ec2a85 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 9cd2233c2726dcb73f4ea5ed9034fab4afb2113c +Subproject commit b78f6ec2a853910f146743dfef724b3afce7cb92 diff --git a/qtopcua b/qtopcua index e8ded5135d0..ab44a500ad3 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit e8ded5135d0729deec9c9ec79bce3434aeb7e8a0 +Subproject commit ab44a500ad3a93726654c24ad8c9c8d174f3e183 diff --git a/qtpositioning b/qtpositioning index d11badc3481..3d75fffb836 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit d11badc34816223130be35a7e830a6be82810a70 +Subproject commit 3d75fffb83671bac854daa4231720c602c03136f diff --git a/qtquick3d b/qtquick3d index eafa875d3aa..0f0ef89fd8c 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit eafa875d3aaa35a4613d2bab3e330e8d7ec6af07 +Subproject commit 0f0ef89fd8c27b3c114d8492932bf43314e0d597 diff --git a/qtquick3dphysics b/qtquick3dphysics index 72b10713d64..0feda22dcda 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit 72b10713d6455ff39db72cabd8c6d901e71eb25b +Subproject commit 0feda22dcda0f0e9e3a329c3881840f9366a625f diff --git a/qtquickeffectmaker b/qtquickeffectmaker index abee16bc8db..a3d0c7dcf4a 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit abee16bc8db33a6a96df2febb08da99db48541df +Subproject commit a3d0c7dcf4a4b51e047878f3094dcdd29292ea53 diff --git a/qtquicktimeline b/qtquicktimeline index 5012d276fb3..a7a9513f5f1 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 5012d276fb3d580b1c2ab941d3c8b63b39f19769 +Subproject commit a7a9513f5f12c9ff79adc4b558fbe8977c40308e diff --git a/qtremoteobjects b/qtremoteobjects index c9630a981be..06d6ec8db39 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit c9630a981be81f710ab0b6cbadfdbbd121188fe2 +Subproject commit 06d6ec8db3966aa1dc2af12489db8e97ec2a1c2d diff --git a/qtscxml b/qtscxml index 61a2da41407..d9c7c49e8f5 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 61a2da41407cec4de5b0f68b595f9df4daf96dd9 +Subproject commit d9c7c49e8f56caabe6cd5e1aa171d79716d06cfd diff --git a/qtsensors b/qtsensors index ee92ab2480d..972ec5ddab7 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit ee92ab2480d1b8d51bc22e22d3de1d6f58af468f +Subproject commit 972ec5ddab740a4b0eb81a937a765713d775ae9f diff --git a/qtserialbus b/qtserialbus index 9e8664186bc..b266868b6cd 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 9e8664186bc49b39a08ff69dcb7a56338b917e2f +Subproject commit b266868b6cd245801096d1a5466dfd977873d836 diff --git a/qtserialport b/qtserialport index 3ca247fff66..10fc87c6721 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 3ca247fff667a5bd0bff20d3dc0487cb929ac18d +Subproject commit 10fc87c672161ef9fb4c79997d901c7518296548 diff --git a/qtshadertools b/qtshadertools index 29cf1cd75c9..46a6254f82a 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 29cf1cd75c9c0787795b81eb7e62cc01c1c5f679 +Subproject commit 46a6254f82ae5762a09be6d6f2ea58ad2a714ba1 diff --git a/qtspeech b/qtspeech index d62938f1c6a..b7340114558 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit d62938f1c6a6a277a48190884dc49de786d27bd3 +Subproject commit b7340114558282cd3abccade5e1e7e7e53d5be7c diff --git a/qtsvg b/qtsvg index ec751b540ad..d37a437117a 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit ec751b540ad4ab3a3e290052c701cc7373eab4df +Subproject commit d37a437117a3eae3c3e449734984e557086a4c3a diff --git a/qttools b/qttools index 027054ec343..d15a1b25827 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 027054ec343a83ad2e8dc77c89122c1b4c5b3451 +Subproject commit d15a1b25827c9c7d3c903904607d972f125db6f1 diff --git a/qttranslations b/qttranslations index b77a8768ff9..f4f67b17bb0 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit b77a8768ff97a28669ad8395361d9c674f7fa271 +Subproject commit f4f67b17bb055966e040bb81d92bdab94574b4c4 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 9be7a5adea7..adad3aca3fe 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 9be7a5adea75e0d65461ec7029b6ef3114385cae +Subproject commit adad3aca3fe6d64df9a356fa525e61d32b5b2b23 diff --git a/qtwayland b/qtwayland index 90000b5a38c..d114731b8e6 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 90000b5a38c05aa9fe77baf867c8364992e4130d +Subproject commit d114731b8e60d93e9bf4f00962e1cac035d112b5 diff --git a/qtwebchannel b/qtwebchannel index 760a514f762..4ef0f73fc3a 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 760a514f7625aa7121bd5a44f9775ca85afbad90 +Subproject commit 4ef0f73fc3a3c15a10d42ad44c78efa9efa59af9 diff --git a/qtwebengine b/qtwebengine index 0ca5fbaefae..c0f3bfdb864 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 0ca5fbaefaef3ac52d2aced7acead3e03c637b50 +Subproject commit c0f3bfdb86406a9b4210948e618e9eee73d9779c diff --git a/qtwebsockets b/qtwebsockets index 4c59cbceaad..f281e232f59 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 4c59cbceaad226bf0483d87bad1d48a57c07a08e +Subproject commit f281e232f591c47bf10f09282a15db2b892d17a2 diff --git a/qtwebview b/qtwebview index d99facec651..3c3832eb3dd 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit d99facec651faddaaaa63f5cfdc5062d8b036f63 +Subproject commit 3c3832eb3ddbe73023587314fdc0dcdd574cd8b6 From 9de96e816b4cda8a048f9c8cd5c2e97679069a27 Mon Sep 17 00:00:00 2001 From: Tim Blechmann Date: Mon, 5 Aug 2024 11:17:41 +0800 Subject: [PATCH 186/288] Provisioning: linux - install virtual video test driver vivid MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The vivid kernel module emulates a v4l2 video devices like webcams. We instantiate two devices via vivid to allow qt multimedia unit tests requiring multiple cameras to run correctly. Pick-to: 6.7 6.5 Change-Id: I1b87954e3c8af797f5b09dabf2d4939d8320db06 Reviewed-by: Artem Dyomin Reviewed-by: Jøger Hansegård (cherry picked from commit 8ba7d0c382ee3125741c63f75953ff33190ab9dc) Reviewed-by: Qt Cherry-pick Bot --- .../common/linux/install-vivid-camera.sh | 56 +++++++++++++++++++ .../91-install-vivid-camera.sh | 8 +++ .../91-install-vivid-camera.sh | 8 +++ .../91-install-vivid-camera.sh | 8 +++ .../91-install-vivid-camera.sh | 8 +++ 5 files changed, 88 insertions(+) create mode 100755 coin/provisioning/common/linux/install-vivid-camera.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-22.04-aarch64/91-install-vivid-camera.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/91-install-vivid-camera.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/91-install-vivid-camera.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/91-install-vivid-camera.sh diff --git a/coin/provisioning/common/linux/install-vivid-camera.sh b/coin/provisioning/common/linux/install-vivid-camera.sh new file mode 100755 index 00000000000..1cf29b2c325 --- /dev/null +++ b/coin/provisioning/common/linux/install-vivid-camera.sh @@ -0,0 +1,56 @@ +#!/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 + +systemd_folder=/etc/systemd/system +systemd_file=vivid.service +script_folder=/home/qt/bin +script_file=vivid.sh + +# Ensure that script folder exists +if [ ! -d ${script_folder} ]; then + sudo mkdir ${script_folder} + sudo chmod 750 ${script_folder} +fi + +# Create script to install virtual video test driver module +sudo tee "${script_folder}/${script_file}" <<"EOF" +# load vivid +sudo modprobe vivid n_devs=2 # create two video devices + +# Check result +if lsmod | grep -q vivid +then + echo "(**) Virtual video test driver vivid installed."; +else + echo "(EE) Failed to load vivid driver."; + exit 1; +fi +EOF + +# set permissions +sudo chmod 750 "${script_folder}/${script_file}" + +# Create service file +sudo tee "${systemd_folder}/${systemd_file}" <<"EOF" +# /etc/systemd/system/vivid.service +# + +[Unit] +Description=Install virtual video test driver (vivid) + +[Service] +Type=oneshot +ExecStart=/bin/sh -c "/home/qt/bin/vivid.sh" + +[Install] +WantedBy=multi-user.target +EOF + +# Start service and output result, just for logging +sudo systemctl start vivid.service + +# enable service +sudo systemctl enable vivid.service diff --git a/coin/provisioning/qtci-linux-Ubuntu-22.04-aarch64/91-install-vivid-camera.sh b/coin/provisioning/qtci-linux-Ubuntu-22.04-aarch64/91-install-vivid-camera.sh new file mode 100755 index 00000000000..4c14ef03197 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-22.04-aarch64/91-install-vivid-camera.sh @@ -0,0 +1,8 @@ +#!/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/install-vivid-camera.sh +source "${BASH_SOURCE%/*}/../common/linux/install-vivid-camera.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/91-install-vivid-camera.sh b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/91-install-vivid-camera.sh new file mode 100755 index 00000000000..4c14ef03197 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/91-install-vivid-camera.sh @@ -0,0 +1,8 @@ +#!/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/install-vivid-camera.sh +source "${BASH_SOURCE%/*}/../common/linux/install-vivid-camera.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/91-install-vivid-camera.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/91-install-vivid-camera.sh new file mode 100755 index 00000000000..4c14ef03197 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/91-install-vivid-camera.sh @@ -0,0 +1,8 @@ +#!/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/install-vivid-camera.sh +source "${BASH_SOURCE%/*}/../common/linux/install-vivid-camera.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/91-install-vivid-camera.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/91-install-vivid-camera.sh new file mode 100755 index 00000000000..4c14ef03197 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/91-install-vivid-camera.sh @@ -0,0 +1,8 @@ +#!/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/install-vivid-camera.sh +source "${BASH_SOURCE%/*}/../common/linux/install-vivid-camera.sh" From 6b453e2221044ef25cddf9c467ac3e11a3061e33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nils=20Petter=20Ska=CC=8Alerud?= Date: Wed, 23 Oct 2024 12:03:58 +0200 Subject: [PATCH 187/288] coin, macOS, FFmpeg: Fix incorrect popd in install-ffmpeg-android.sh MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit popd was placed incorrectly and caused the script to be unable to find the fix_ffmpeg_dependencies.sh file. Change-Id: I7922a698e90d1b3899ecc7b2240a260ea706707f Reviewed-by: Tor Arne Vestbø (cherry picked from commit 8f47837a59497e536204b992c25c3d8ef94a3c3f) Reviewed-by: Qt Cherry-pick Bot --- 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 fdd803365c2..e50571a1adb 100755 --- a/coin/provisioning/common/unix/install-ffmpeg-android.sh +++ b/coin/provisioning/common/unix/install-ffmpeg-android.sh @@ -95,6 +95,8 @@ build_ffmpeg_android() { sudo make install -j4 + popd + rm -f "${openssl_libs}/libcrypto.so" rm -f "${openssl_libs}/libssl.so" @@ -102,8 +104,6 @@ build_ffmpeg_android() { fix_dependencies="${BASH_SOURCE%/*}/../shared/fix_ffmpeg_dependencies.sh" sudo "${fix_dependencies}" "${target_dir}" "${libs_prefix}" "no" fi - - popd } if [ "$os" == "android-x86" ]; then From 225eca6109d8e9f2c8b94f4f404b11b6148e3d60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nils=20Petter=20Ska=CC=8Alerud?= Date: Wed, 23 Oct 2024 10:38:37 +0200 Subject: [PATCH 188/288] coin, macOS, FFmpeg: Fix install-ffmpeg-android.sh MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Script would previously unconditionally run ln even if target file sometimes exists in precompiled OpenSSL library. Change-Id: I90c4ad7c6cbf9207c2c82114936b478a9ba4ae54 Reviewed-by: Tor Arne Vestbø (cherry picked from commit 758ac7896ff268605e88548ac0bec89414f43f3d) Reviewed-by: Qt Cherry-pick Bot --- 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 e50571a1adb..9eab75d88ed 100755 --- a/coin/provisioning/common/unix/install-ffmpeg-android.sh +++ b/coin/provisioning/common/unix/install-ffmpeg-android.sh @@ -57,8 +57,8 @@ build_ffmpeg_android() { libs_prefix="_arm64-v8a" fi - ln -s "${openssl_libs}/libcrypto_3.so" "${openssl_libs}/libcrypto.so" - ln -s "${openssl_libs}/libssl_3.so" "${openssl_libs}/libssl.so" + 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 From 36fe46a392721c21169f9a8cb9b7a7e3fd2bd1e9 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 7 Oct 2024 16:35:42 +0200 Subject: [PATCH 189/288] coin: Explicitly specify Python 3.10 for SBOM processing on Windows MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The 'reuse' tool installed into the Python 3.8 environment on Windows has a broken 'jinja2' package, due to conan being installed after the sbom tool, which replaces the jinja package. pip reports the issue but does not actually exit with a non-zero status for some reason, thus not blocking the initial provisioning. The jinja2 version installed in the Python 3.10 environment on Windows is compatible with both conan and reuse. To work around the issue, explicitly install the sbom tools only for Python 3.10 on Windows platforms, and specify the path to the Python interpreter in an environment variable for the build system to use. Amends 1f2fb6312c1a8c92ab6700faa785e046aca2ecf9 Task-number: QTBUG-122899 Task-number: QTBUG-124453 Task-number: QTBUG-125211 Change-Id: I386da17a1902dd26af332cef3482dbcb2221a1b3 Reviewed-by: Joerg Bornemann Reviewed-by: Simo Fält (cherry picked from commit e874a76a484f7d0db7460c68db5e683fa6e8c06b) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/common/windows/python3.ps1 | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/common/windows/python3.ps1 b/coin/provisioning/common/windows/python3.ps1 index 13637c6cb0d..1422fc5b735 100644 --- a/coin/provisioning/common/windows/python3.ps1 +++ b/coin/provisioning/common/windows/python3.ps1 @@ -78,10 +78,17 @@ Run-Executable "$install_path\python.exe" "-m pip config --user set global.index Run-Executable "$install_path\python.exe" "-m pip config --user set global.extra-index-url https://pypi.org/simple/" Run-Executable "$install_path\Scripts\pip3.exe" "$pip_args install virtualenv wheel html5lib" -# Check if python version is higher than 3.8. +# Check if python version is higher than 3.10. # ntia-conformance-checker requires at least 3.8 -if ([version]::Parse($version) -gt [version]::Parse("3.8")) { +# reuse requires at least 3.9, to avoid conflict with installed conan jinja package, +# at least until we use virtual envs. +# The lowest version available on all windows platforms that we currently run on that satisfies +# these requirements is 3.10. +if ([version]::Parse($version) -gt [version]::Parse("3.10")) { Run-Executable "$install_path\Scripts\pip3.exe" "$pip_args install -r $PSScriptRoot\..\shared\sbom_requirements.txt" + # Set the environment variable for the build system to know which python path to use for SBOM + # processing. + Set-EnvironmentVariable "SBOM_PYTHON_APPS_PATH" "$install_path\Scripts" } # Install PyPDF2 for QSR documentation From db32c6b6effdaf7d254bb95165ac47cd6eb33e70 Mon Sep 17 00:00:00 2001 From: Jukka Jokiniva Date: Mon, 7 Oct 2024 15:52:52 +0300 Subject: [PATCH 190/288] Add -force-asserts to developer builds with -release MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: QTQAINFRA-6624 Change-Id: Ia8741e4a92774fee3af78c3292fa47677b36158d Reviewed-by: Simo Fält Reviewed-by: Fabian Kosmale Reviewed-by: Dimitrios Apostolou (cherry picked from commit c5ab2fe4fa189f892b6616b743a77b749b6e2511) --- coin/platform_configs/cmake_platforms.yaml | 2 +- coin/platform_configs/cmake_platforms_qemu.yaml | 6 +++--- coin/platform_configs/macos.yaml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 371bf97c644..0235b93bd03 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -256,7 +256,7 @@ Configurations: Template: 'qtci-windows-11_23H2-x86_64-53' Compiler: 'Mingw' Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure'] - Configure arguments: '-developer-build -release -force-debug-info -separate-debug-info -make examples' + Configure arguments: '-developer-build -release -force-asserts -force-debug-info -separate-debug-info -make examples' Environment variables: [ 'Path={{.Env.MINGW_PATH}}\bin;{{.Env.Path}}', 'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c -DMySQL_ROOT={{.Env.ENV_MySQL_ROOT}} -DMySQL_LIBRARY_DIR={{.Env.ENV_MySQL_LIBRARY_DIR}}', diff --git a/coin/platform_configs/cmake_platforms_qemu.yaml b/coin/platform_configs/cmake_platforms_qemu.yaml index f39a325c2ce..58a41dd8cd2 100644 --- a/coin/platform_configs/cmake_platforms_qemu.yaml +++ b/coin/platform_configs/cmake_platforms_qemu.yaml @@ -9,7 +9,7 @@ Configurations: Platform dependency: 'ubuntu-22.04' Features: ['Sccache', 'UseConfigure', 'InsignificantTests'] Environment variables: [ - 'TARGET_CONFIGURE_ARGS=-release -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_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', 'QT_YOCTO_ENVSETUP={{.Env.QEMUARMV7_TOOLCHAIN_ENVSETUP}}', "QT_CMAKE_DIR=/opt/cmake-3.27.7/bin", @@ -26,7 +26,7 @@ Configurations: Platform dependency: 'ubuntu-22.04' Features: ['Sccache', 'UseConfigure', 'InsignificantTests'] Environment variables: [ - 'TARGET_CONFIGURE_ARGS=-release -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_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', 'QT_YOCTO_ENVSETUP={{.Env.QEMUARM64_TOOLCHAIN_ENVSETUP}}', "QT_CMAKE_DIR=/opt/cmake-3.27.7/bin", @@ -43,7 +43,7 @@ Configurations: Platform dependency: 'ubuntu-22.04' Features: ['Sccache', 'DisableTests', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] Environment variables: [ - 'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-warnings-are-errors -nomake examples -qt-harfbuzz -device linux-generic-g++ -device-option "CROSS_COMPILE={{.Env.QEMUMIPS64_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=boot2qt" -no-feature-forkfd_pidfd', + '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.QEMUMIPS64_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=boot2qt" -no-feature-forkfd_pidfd', 'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUMIPS64_TOOLCHAIN_FILE}} -DQT_FORCE_BUILD_TOOLS=ON', 'QT_YOCTO_ENVSETUP={{.Env.QEMUMIPS64_TOOLCHAIN_ENVSETUP}}', "QT_CMAKE_DIR=/opt/cmake-3.27.7/bin", diff --git a/coin/platform_configs/macos.yaml b/coin/platform_configs/macos.yaml index d32f66f81ca..3f9bd4ee72d 100644 --- a/coin/platform_configs/macos.yaml +++ b/coin/platform_configs/macos.yaml @@ -115,7 +115,7 @@ Configurations: Template: 'qtci-macos-14-x86_64-105' Compiler: 'Clang' Features: ['Sccache', 'DoNotRunTests', 'WarningsAreErrors', 'UseConfigure'] - Configure arguments: '-developer-build -release -force-debug-info -no-pch -no-framework -qtnamespace TestNamespace -make examples' + Configure arguments: '-developer-build -release -force-asserts -force-debug-info -no-pch -no-framework -qtnamespace TestNamespace -make examples' Environment variables: [ 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE', @@ -126,7 +126,7 @@ Configurations: Template: 'qtci-macos-14-arm-106' Compiler: 'Clang' Features: ['DoNotRunTests', 'WarningsAreErrors', 'UseConfigure'] - Configure arguments: '-developer-build -nomake examples -release -force-debug-info -separate-debug-info -framework' + Configure arguments: '-developer-build -nomake examples -release -force-asserts -force-debug-info -separate-debug-info -framework' Environment variables: [ 'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}', 'Protobuf_ROOT=/usr/local/lib/cmake/protobuf', From 81d2c30cb432f798cb2f1b6ada72f35f16ea8086 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 7 Oct 2024 16:41:27 +0200 Subject: [PATCH 191/288] coin: Explicitly specify SBOM_PYTHON_APPS_PATH for all platforms Instead of relying on the qtbase coin instructions to compute the SBOM_PYTHON_APPS_PATH path based on the platform, which does not work reliably, especially when multiple python installations are present, explicitly specify the path in the provisioning scripts. Amends 1f2fb6312c1a8c92ab6700faa785e046aca2ecf9 Task-number: QTBUG-122899 Task-number: QTBUG-124453 Task-number: QTBUG-125211 Change-Id: I097fd1c4119a203d82f88c477dbf0fc0f67f19f2 Reviewed-by: Joerg Bornemann (cherry picked from commit 6f991b55a33a9299042978019453399be71949d1) --- coin/provisioning/common/macos/python3.sh | 1 + coin/provisioning/qtci-linux-Debian-11.6-aarch64/02-apt.sh | 4 ++++ .../qtci-linux-RHEL-8.10-x86_64/04-install-packages.sh | 2 ++ .../qtci-linux-RHEL-8.8-x86_64/04-install-packages.sh | 2 ++ .../qtci-linux-RHEL-9.2-x86_64/04-install-packages.sh | 6 ++++++ .../qtci-linux-SLES-15_SP5-x86_64/08-pythondev.sh | 5 +++++ coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh | 5 +++++ coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh | 5 +++++ coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/02-apt.sh | 5 +++++ .../qtci-linux-openSUSE-15.5-x86_64/08-pythondev.sh | 5 +++++ coin/provisioning/qtci-macos-12-arm/25-python.sh | 5 +++++ coin/provisioning/qtci-macos-13-arm/25-python.sh | 5 +++++ coin/provisioning/qtci-macos-14-arm/25-python.sh | 5 +++++ 13 files changed, 55 insertions(+) diff --git a/coin/provisioning/common/macos/python3.sh b/coin/provisioning/common/macos/python3.sh index cbc9d58188b..247c6b82987 100755 --- a/coin/provisioning/common/macos/python3.sh +++ b/coin/provisioning/common/macos/python3.sh @@ -30,6 +30,7 @@ echo "Configure pip" SetEnvVar "PYTHON3_PATH" "/Library/Frameworks/Python.framework/Versions/3.9/bin" SetEnvVar "PIP3_PATH" "/Library/Frameworks/Python.framework/Versions/3.9/bin" +SetEnvVar "SBOM_PYTHON_APPS_PATH" "/Library/Frameworks/Python.framework/Versions/3.9/bin" # Install Python certificates. Required at least for emsdk installation open /Applications/Python\ 3.9/Install\ Certificates.command 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 73695f23f62..26cc4876849 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 @@ -262,6 +262,10 @@ keyring --disable pip install --user -r "${BASH_SOURCE%/*}/../common/shared/sbom_requirements.txt" +source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" + +SetEnvVar "SBOM_PYTHON_APPS_PATH" "/home/qt/.local/bin" + # SetEnvVar "PATH" "/usr/lib/nodejs-mozilla/bin:\$PATH" #OpenSSLVersion="$(openssl version |cut -b 9-14)" 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 209afc53ec2..42b62022d91 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 @@ -169,6 +169,8 @@ 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 -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. sudo /usr/bin/pip3 install wheel sudo /usr/bin/pip3 install dataclasses 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 7d2361600b9..14dec198219 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 @@ -170,6 +170,8 @@ sudo pip3 install virtualenv wheel # Just make sure we have virtualenv to run with python3.8 -m virtualenv sudo python3.11 -m pip install virtualenv wheel 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. sudo /usr/bin/pip3 install wheel sudo /usr/bin/pip3 install dataclasses 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 299ed222680..d0facbe93c8 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 @@ -186,6 +186,12 @@ sudo python -m pip install -r "${BASH_SOURCE%/*}/../common/shared/sbom_requireme sudo /usr/bin/pip3 install wheel sudo /usr/bin/pip3 install -r "${BASH_SOURCE%/*}/../common/shared/sbom_requirements.txt" +# Provisioning during installation says: +# 'The script sbom2doc is installed in '/usr/local/bin' which is not on PATH.' +# hence the explicit assignment to SBOM_PYTHON_APPS_PATH. +source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" +SetEnvVar "SBOM_PYTHON_APPS_PATH" "/usr/local/bin" + # Make FindPython3.cmake to find python3 sudo ln -s /usr/bin/python3 /usr/local/bin/python3 diff --git a/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/08-pythondev.sh index 79d0f1b2a18..51558ea0c97 100644 --- a/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/08-pythondev.sh +++ b/coin/provisioning/qtci-linux-SLES-15_SP5-x86_64/08-pythondev.sh @@ -76,3 +76,8 @@ pip3 install --user -r "${BASH_SOURCE%/*}/../common/shared/sbom_requirements.txt # shellcheck source=../common/unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" SetEnvVar "PYTHON3_PATH" "/usr/local/bin" + +# Provisioning during installation says: +# 'The script sbom2doc is installed in '/home/qt/.local/bin' which is not on PATH.' +# hence the explicit assignment to SBOM_PYTHON_APPS_PATH. +SetEnvVar "SBOM_PYTHON_APPS_PATH" "/home/qt/.local/bin" 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 d5c899e5fed..653ef084df2 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 @@ -253,5 +253,10 @@ pip install --user -r "${BASH_SOURCE%/*}/../common/shared/sbom_requirements.txt" source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" # SetEnvVar "PATH" "/usr/lib/nodejs-mozilla/bin:\$PATH" +# Provisioning during installation says: +# 'The script sbom2doc is installed in '/home/qt/.local/bin' which is not on PATH.' +# hence the explicit assignment to SBOM_PYTHON_APPS_PATH. +SetEnvVar "SBOM_PYTHON_APPS_PATH" "/home/qt/.local/bin" + 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 2939f46c478..3e6e92f8ea0 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 @@ -255,5 +255,10 @@ pip install --user -r "${BASH_SOURCE%/*}/../common/shared/sbom_requirements.txt" source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" # SetEnvVar "PATH" "/usr/lib/nodejs-mozilla/bin:\$PATH" +# Provisioning during installation says: +# 'The script sbom2doc is installed in '/home/qt/.local/bin' which is not on PATH.' +# hence the explicit assignment to SBOM_PYTHON_APPS_PATH. +SetEnvVar "SBOM_PYTHON_APPS_PATH" "/home/qt/.local/bin" + 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 0aed8bb770a..4ba0c1db901 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 @@ -258,5 +258,10 @@ pip config --user set global.extra-index-url https://pypi.org/simple/ source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" # SetEnvVar "PATH" "/usr/lib/nodejs-mozilla/bin:\$PATH" +# Provisioning during installation says: +# 'The script sbom2doc is installed in '/home/qt/.local/bin' which is not on PATH.' +# hence the explicit assignment to SBOM_PYTHON_APPS_PATH. +SetEnvVar "SBOM_PYTHON_APPS_PATH" "/home/qt/.local/bin" + OpenSSLVersion="$(openssl version |cut -b 9-14)" echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt diff --git a/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/08-pythondev.sh index 7f7d867ae47..e6b15cb97bf 100755 --- a/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/08-pythondev.sh +++ b/coin/provisioning/qtci-linux-openSUSE-15.5-x86_64/08-pythondev.sh @@ -17,3 +17,8 @@ python3.11 -m pip install selenium netifaces scache webdriver-manager python3.11 -m pip install -r "${BASH_SOURCE%/*}/../common/shared/sbom_requirements.txt" SetEnvVar "PYTHON3_EXECUTABLE" "/usr/bin/python3.11" + +# Provisioning during installation says: +# 'Defaulting to user installation because normal site-packages is not writeable' +# So it implicitly uses pip install --user, hence the path. +SetEnvVar "SBOM_PYTHON_APPS_PATH" "/home/qt/.local/bin" diff --git a/coin/provisioning/qtci-macos-12-arm/25-python.sh b/coin/provisioning/qtci-macos-12-arm/25-python.sh index 11a157cf7be..ef90d763f49 100755 --- a/coin/provisioning/qtci-macos-12-arm/25-python.sh +++ b/coin/provisioning/qtci-macos-12-arm/25-python.sh @@ -18,6 +18,11 @@ 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/qt/.local/bin' which is not on PATH.' +# hence the explicit assignment to SBOM_PYTHON_APPS_PATH. +SetEnvVar "SBOM_PYTHON_APPS_PATH" "/home/qt/.local/bin" + # QtWebengine still requires python2 pyenv install 2.7.18 SetEnvVar "PYTHON2_PATH" "/Users/qt/.pyenv/versions/2.7.18/bin/" diff --git a/coin/provisioning/qtci-macos-13-arm/25-python.sh b/coin/provisioning/qtci-macos-13-arm/25-python.sh index 11a157cf7be..ef90d763f49 100755 --- a/coin/provisioning/qtci-macos-13-arm/25-python.sh +++ b/coin/provisioning/qtci-macos-13-arm/25-python.sh @@ -18,6 +18,11 @@ 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/qt/.local/bin' which is not on PATH.' +# hence the explicit assignment to SBOM_PYTHON_APPS_PATH. +SetEnvVar "SBOM_PYTHON_APPS_PATH" "/home/qt/.local/bin" + # QtWebengine still requires python2 pyenv install 2.7.18 SetEnvVar "PYTHON2_PATH" "/Users/qt/.pyenv/versions/2.7.18/bin/" diff --git a/coin/provisioning/qtci-macos-14-arm/25-python.sh b/coin/provisioning/qtci-macos-14-arm/25-python.sh index 36bbc0e14ab..2a03b217808 100755 --- a/coin/provisioning/qtci-macos-14-arm/25-python.sh +++ b/coin/provisioning/qtci-macos-14-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/qt/.local/bin' which is not on PATH.' +# hence the explicit assignment to SBOM_PYTHON_APPS_PATH. +SetEnvVar "SBOM_PYTHON_APPS_PATH" "/home/qt/.local/bin" + echo "python3 = 3.9.7" >> ~/versions.txt From 419f19563dc6f1598f576dd2f8ab7b4d965106c1 Mon Sep 17 00:00:00 2001 From: Ville-Pekka Karhu Date: Tue, 29 Oct 2024 16:20:50 +0200 Subject: [PATCH 192/288] Provisioning: Add Docker installation to macOS 13 x64 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-6714 Pick-to: 6.5 Change-Id: I5044ca4fc8f965e31720e7a94820153213afc14d Reviewed-by: Milla Pohjanheimo Reviewed-by: Tor Arne Vestbø (cherry picked from commit 2f3d052720514dfbfe1c5a913f72fb1d9e52f92f) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/qtci-macos-13-x86_64/90-docker.sh | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100755 coin/provisioning/qtci-macos-13-x86_64/90-docker.sh diff --git a/coin/provisioning/qtci-macos-13-x86_64/90-docker.sh b/coin/provisioning/qtci-macos-13-x86_64/90-docker.sh new file mode 100755 index 00000000000..1ab281cbaea --- /dev/null +++ b/coin/provisioning/qtci-macos-13-x86_64/90-docker.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 + +# shellcheck source=../common/macos/docker.sh +source "${BASH_SOURCE%/*}/../common/macos/docker.sh" "amd64" + From b87098e90d5f8b4e2552633d578ef90dbb008e07 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 7 Aug 2024 12:18:52 +0200 Subject: [PATCH 193/288] CMake: Update provisioned CMake to version 3.30.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: QTQAINFRA-6484 Change-Id: Iacccb9f43059c78080e338da6680f5c50284c057 Reviewed-by: Simo Fält (cherry picked from commit 400776459bd92722f266dcc811c4e63a94820dd3) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/cmake_platforms_qemu.yaml | 6 +++--- .../cmake_platforms_qemu_qnx710.yaml | 2 +- coin/platform_configs/qtsaferenderer-runtime.yaml | 2 +- coin/provisioning/common/linux/cmake_linux.sh | 6 +++--- coin/provisioning/common/macos/cmake.sh | 6 +++--- coin/provisioning/common/windows/cmake.ps1 | 12 ++++++------ 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/coin/platform_configs/cmake_platforms_qemu.yaml b/coin/platform_configs/cmake_platforms_qemu.yaml index 58a41dd8cd2..1dd136f2d4b 100644 --- a/coin/platform_configs/cmake_platforms_qemu.yaml +++ b/coin/platform_configs/cmake_platforms_qemu.yaml @@ -12,7 +12,7 @@ Configurations: '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', 'QT_YOCTO_ENVSETUP={{.Env.QEMUARMV7_TOOLCHAIN_ENVSETUP}}', - "QT_CMAKE_DIR=/opt/cmake-3.27.7/bin", + "QT_CMAKE_DIR=/opt/cmake-3.30.5/bin", 'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}', 'GST_PLUGIN_SCANNER={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}/usr/libexec/gstreamer-1.0/gst-plugin-scanner', 'QT_QUICK_BACKEND=software', @@ -29,7 +29,7 @@ Configurations: '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', 'QT_YOCTO_ENVSETUP={{.Env.QEMUARM64_TOOLCHAIN_ENVSETUP}}', - "QT_CMAKE_DIR=/opt/cmake-3.27.7/bin", + "QT_CMAKE_DIR=/opt/cmake-3.30.5/bin", 'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}', 'GST_PLUGIN_SCANNER={{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}/usr/libexec/gstreamer-1.0/gst-plugin-scanner', 'QT_QUICK_BACKEND=software', @@ -46,7 +46,7 @@ Configurations: '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.QEMUMIPS64_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=boot2qt" -no-feature-forkfd_pidfd', 'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUMIPS64_TOOLCHAIN_FILE}} -DQT_FORCE_BUILD_TOOLS=ON', 'QT_YOCTO_ENVSETUP={{.Env.QEMUMIPS64_TOOLCHAIN_ENVSETUP}}', - "QT_CMAKE_DIR=/opt/cmake-3.27.7/bin", + "QT_CMAKE_DIR=/opt/cmake-3.30.5/bin", 'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUMIPS64_TOOLCHAIN_SYSROOT}}', 'GST_PLUGIN_SCANNER={{.Env.QEMUMIPS64_TOOLCHAIN_SYSROOT}}/usr/libexec/gstreamer-1.0/gst-plugin-scanner', 'QT_QUICK_BACKEND=software', diff --git a/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml b/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml index eba1efa9d2f..92834126fae 100644 --- a/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml +++ b/coin/platform_configs/cmake_platforms_qemu_qnx710.yaml @@ -12,7 +12,7 @@ Configurations: 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', - 'QT_CMAKE_DIR=/opt/cmake-3.27.7/bin', + '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', ] diff --git a/coin/platform_configs/qtsaferenderer-runtime.yaml b/coin/platform_configs/qtsaferenderer-runtime.yaml index 577949db7b7..74116f8c912 100644 --- a/coin/platform_configs/qtsaferenderer-runtime.yaml +++ b/coin/platform_configs/qtsaferenderer-runtime.yaml @@ -46,7 +46,7 @@ Configurations: 'TARGET_CONFIGURE_ARGS=-release -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 -qtlibinfix TestInfix', 'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARM64_TOOLCHAIN_FILE}} -DQT_FORCE_BUILD_TOOLS=ON', 'QT_YOCTO_ENVSETUP={{.Env.QEMUARM64_TOOLCHAIN_ENVSETUP}}', - "QT_CMAKE_DIR=/opt/cmake-3.27.7/bin", + "QT_CMAKE_DIR=/opt/cmake-3.30.5/bin", 'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}', 'GST_PLUGIN_SCANNER={{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}/usr/libexec/gstreamer-1.0/gst-plugin-scanner', 'QT_QUICK_BACKEND=software', diff --git a/coin/provisioning/common/linux/cmake_linux.sh b/coin/provisioning/common/linux/cmake_linux.sh index 5fadad249f3..dccd0b1a497 100755 --- a/coin/provisioning/common/linux/cmake_linux.sh +++ b/coin/provisioning/common/linux/cmake_linux.sh @@ -11,11 +11,11 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -majorminorversion="3.27" -version="3.27.7" +majorminorversion="3.30" +version="3.30.5" 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="83ab00c8432a71cfc81e933ee7b3c3e14d50ad6f" +SHA1="61b339cac5f110d5ed2934f66a26c2e991945e01" targetFolder="/opt/cmake-$version" appPrefix="cmake-$version-linux-x86_64" diff --git a/coin/provisioning/common/macos/cmake.sh b/coin/provisioning/common/macos/cmake.sh index b9ff8dfbfc5..3c4ef84783f 100755 --- a/coin/provisioning/common/macos/cmake.sh +++ b/coin/provisioning/common/macos/cmake.sh @@ -11,11 +11,11 @@ source "${BASH_SOURCE%/*}/InstallAppFromCompressedFileFromURL.sh" # shellcheck source=../unix/SetEnvVar.sh source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" -majorminorversion="3.27.7" -version="3.27.7" +majorminorversion="3.30.5" +version="3.30.5" PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/cmake/cmake-$version-macos-universal.tar.gz" AltUrl="https://cmake.org/files/v$majorminorversion/cmake-$version-macos-universal.tar.gz" -SHA1="75153b6c7a418bc7120c6217d4698c7d245d00e0" +SHA1="c81c2f7482a901c4a32a81034920c23c22233a0f" appPrefix="cmake-$version-macos-universal" InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix" diff --git a/coin/provisioning/common/windows/cmake.ps1 b/coin/provisioning/common/windows/cmake.ps1 index af1e2872fde..f4c0f6ff88c 100644 --- a/coin/provisioning/common/windows/cmake.ps1 +++ b/coin/provisioning/common/windows/cmake.ps1 @@ -3,22 +3,22 @@ . "$PSScriptRoot\helpers.ps1" -$majorminorversion = "3.27" -$version = "3.27.7" +$majorminorversion = "3.30" +$version = "3.30.5" $cpu_arch = Get-CpuArchitecture Write-Host "Installing CMake for architecture $cpu_arch" switch ($cpu_arch) { arm64 { $arch = "arm64" - $sha1 = "52ee08671dcb478c5ec6e862f41717f65047c598" - $majorminorversion = "3.29" - $version = "3.29.2" + $sha1 = "408977a174476407bd660604f110a26ba41a6efd" + $majorminorversion = "3.30" + $version = "3.30.5" Break } x64 { $arch = "i386" - $sha1 = "b6147215a5f9cd1138b012265229fbf2224d02c6" + $sha1 = "d0636735c2d13a4443662605cd80c708f265eacc" } default { throw "Unknown architecture $cpu_arch" From 39b4307edfa8e1d16c80cd840ccef9d51f1b302d Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 31 Oct 2024 22:29:45 +0000 Subject: [PATCH 194/288] Update submodules on '6.8 in qt/qt5' Change-Id: Iff8b22b3c24a590b21ae1fd2bede913203c5b9de 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 d394b30ad1c..fc53bf55a1a 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit d394b30ad1c543e3985440cb30ab35be0de774f1 +Subproject commit fc53bf55a1a346ab63a4f42cbc3c943a2c66cd06 diff --git a/qt5compat b/qt5compat index 49c733c67f2..371d7b5b803 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 49c733c67f293ca9e4720a724483cf246a745dfc +Subproject commit 371d7b5b8038f60d6529bc08a71ee290974a5995 diff --git a/qtactiveqt b/qtactiveqt index 0ec8a626de6..b48d8b574ce 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 0ec8a626de6fa387c2107e06de995fde5f77bbc0 +Subproject commit b48d8b574ce4eeb50a964489b5a5dc0dd2ab459d diff --git a/qtbase b/qtbase index 71cba1359e3..53835c957bc 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 71cba1359e372a8f4cc4a439084a647fffc59081 +Subproject commit 53835c957bcc4e6a4ffd13a3870e262048eef615 diff --git a/qtcharts b/qtcharts index f19667f4c53..b3a774f7652 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit f19667f4c5351e219e3ae62e334f75275b3b2e5c +Subproject commit b3a774f76525f7629617aff60b823585f5a559f3 diff --git a/qtcoap b/qtcoap index d29cef36f67..5c69f4b4ca6 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit d29cef36f67e75ce4d8118a43f4e3671ae6461af +Subproject commit 5c69f4b4ca638c5ac2a518b7c7b2be557e718110 diff --git a/qtconnectivity b/qtconnectivity index cd02ec39c2c..a88c30f84b8 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit cd02ec39c2cf9030c96cdc515ef956f962b4b96c +Subproject commit a88c30f84b85e03f5b263ee7ad6965398dfaf291 diff --git a/qtdatavis3d b/qtdatavis3d index 372b6132a11..d76671ab1a7 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 372b6132a111b63a74ea0dfda7bbb675e6c057a5 +Subproject commit d76671ab1a71de6e13098eacedd286ff0d49bda8 diff --git a/qtdeclarative b/qtdeclarative index 4ed387feddf..556e4646066 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 4ed387feddf0e3683252af2fe1ba38789ad71c0e +Subproject commit 556e46460661f1f16baed4151289ef7c3ba7ba5c diff --git a/qtdoc b/qtdoc index 3bc534d07ac..9dd5f3ee9d7 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 3bc534d07ac5717e7ba6e4dfbc9353cb642805b2 +Subproject commit 9dd5f3ee9d7dfb984ea7a05ad1172234f648e9fd diff --git a/qtgraphs b/qtgraphs index 94d38c2f7d7..0bf7d20d20b 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit 94d38c2f7d7ae8003b5fa8232fd447ca3ca61345 +Subproject commit 0bf7d20d20b8357a90e466f769e9e5a8442250b1 diff --git a/qtgrpc b/qtgrpc index 235b6a17b75..6177e1606ed 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit 235b6a17b75be02874224ad7a4594e20a7c6bfcc +Subproject commit 6177e1606ed2aa4375b5dc9c8158bde5afe1727a diff --git a/qthttpserver b/qthttpserver index bd837f6fa81..fffd5b15f5a 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit bd837f6fa811165abc380567bd77bb2deb6f670e +Subproject commit fffd5b15f5a2987074af4025fe34e0bcd99bd7b9 diff --git a/qtimageformats b/qtimageformats index 86a31ed9586..925614ddafd 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 86a31ed9586453bb4234be76d3e3d628f61b9b28 +Subproject commit 925614ddafdf97517db83d0153c5268202f89beb diff --git a/qtlanguageserver b/qtlanguageserver index 6898db5f649..502db071fa5 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit 6898db5f649c2576316433bc2af46c99de9eab7b +Subproject commit 502db071fa518e4895c37bd5107d66139f0edcc9 diff --git a/qtlocation b/qtlocation index 0a250bf39d7..f789950899e 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 0a250bf39d79ea68a3fcabf681a3bd794551b6e7 +Subproject commit f789950899e6d2148d6a198093f83f9d5558c6af diff --git a/qtlottie b/qtlottie index 99d1be57ecb..b4a1b5c28a2 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 99d1be57ecb8c884510658e30a6da009c2a66b99 +Subproject commit b4a1b5c28a22c2fd739b641116274a417497abc4 diff --git a/qtmqtt b/qtmqtt index 3abb1ab323c..0da8622224e 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit 3abb1ab323c2d647128eb039169513c8bad7f9b6 +Subproject commit 0da8622224ee5dd249e5131920635c89b571a0be diff --git a/qtmultimedia b/qtmultimedia index 9045632f671..ea3a298be73 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 9045632f67104af4193508dbc139b16f468f87f0 +Subproject commit ea3a298be737f8cb759d05ba85d36894f7de9529 diff --git a/qtnetworkauth b/qtnetworkauth index b78f6ec2a85..ce305d937bd 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit b78f6ec2a853910f146743dfef724b3afce7cb92 +Subproject commit ce305d937bd23715b88defbdb423ece8fc37115e diff --git a/qtopcua b/qtopcua index ab44a500ad3..98bd26a764b 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit ab44a500ad3a93726654c24ad8c9c8d174f3e183 +Subproject commit 98bd26a764beece7d2e9e2625570eb8eafb805b9 diff --git a/qtpositioning b/qtpositioning index 3d75fffb836..7127083cd62 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit 3d75fffb83671bac854daa4231720c602c03136f +Subproject commit 7127083cd623a8fc4ddd5958b20a3ab066642b8e diff --git a/qtquick3d b/qtquick3d index 0f0ef89fd8c..ea1dce81aac 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 0f0ef89fd8c27b3c114d8492932bf43314e0d597 +Subproject commit ea1dce81aac166c53f18117d1ac5b4ac5ff3ca73 diff --git a/qtquick3dphysics b/qtquick3dphysics index 0feda22dcda..7a12ae37134 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit 0feda22dcda0f0e9e3a329c3881840f9366a625f +Subproject commit 7a12ae371344b4b882a67093dd680dcab42b6831 diff --git a/qtquickeffectmaker b/qtquickeffectmaker index a3d0c7dcf4a..0521e923bb6 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit a3d0c7dcf4a4b51e047878f3094dcdd29292ea53 +Subproject commit 0521e923bb659f3e8ae590f54a21339a3e75ad8d diff --git a/qtquicktimeline b/qtquicktimeline index a7a9513f5f1..ae6ead910ac 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit a7a9513f5f12c9ff79adc4b558fbe8977c40308e +Subproject commit ae6ead910ac1ba1f2a8a0dde767fdad586411516 diff --git a/qtremoteobjects b/qtremoteobjects index 06d6ec8db39..926a28a3e61 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 06d6ec8db3966aa1dc2af12489db8e97ec2a1c2d +Subproject commit 926a28a3e617ffd95c7e666d69e35c165e5924c1 diff --git a/qtrepotools b/qtrepotools index 56f21565346..7b6b3b5959e 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 56f21565346ec229b12faa762d052a0f67404bc5 +Subproject commit 7b6b3b5959e8b33a6054df03ea166fd2a7783fed diff --git a/qtscxml b/qtscxml index d9c7c49e8f5..dc4ca540bf1 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit d9c7c49e8f56caabe6cd5e1aa171d79716d06cfd +Subproject commit dc4ca540bf1be3f2a6a33bcecafde7434fd8ba77 diff --git a/qtsensors b/qtsensors index 972ec5ddab7..fde48c6a7d7 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 972ec5ddab740a4b0eb81a937a765713d775ae9f +Subproject commit fde48c6a7d7c2269e543e9b8880e4220c8553bd3 diff --git a/qtserialbus b/qtserialbus index b266868b6cd..0b266adb02f 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit b266868b6cd245801096d1a5466dfd977873d836 +Subproject commit 0b266adb02f529d5e0d3ccd74aa092a2224ebb7b diff --git a/qtserialport b/qtserialport index 10fc87c6721..9c4776d053e 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 10fc87c672161ef9fb4c79997d901c7518296548 +Subproject commit 9c4776d053e90963b70e661fe7cdfd24076c0662 diff --git a/qtshadertools b/qtshadertools index 46a6254f82a..53d2c892910 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 46a6254f82ae5762a09be6d6f2ea58ad2a714ba1 +Subproject commit 53d2c892910d427a1968e1d7758232d9ab764e1b diff --git a/qtspeech b/qtspeech index b7340114558..97c83f01e7c 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit b7340114558282cd3abccade5e1e7e7e53d5be7c +Subproject commit 97c83f01e7cb3c033a1853b0d1a882fa8880f566 diff --git a/qtsvg b/qtsvg index d37a437117a..ce0a7ec5a7a 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit d37a437117a3eae3c3e449734984e557086a4c3a +Subproject commit ce0a7ec5a7a6dfc6c7bd440f924c235e7d7605d5 diff --git a/qttools b/qttools index d15a1b25827..342a6332e32 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit d15a1b25827c9c7d3c903904607d972f125db6f1 +Subproject commit 342a6332e320f32ac5cc26afd208467a456c0ed7 diff --git a/qttranslations b/qttranslations index f4f67b17bb0..58d5fe6ccb5 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit f4f67b17bb055966e040bb81d92bdab94574b4c4 +Subproject commit 58d5fe6ccb5fc000ff535584e32922e8ab0da21d diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index adad3aca3fe..c5d06692fd8 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit adad3aca3fe6d64df9a356fa525e61d32b5b2b23 +Subproject commit c5d06692fd8e2346596b6aec40382c8a28542eaa diff --git a/qtwayland b/qtwayland index d114731b8e6..400a5367f4e 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit d114731b8e60d93e9bf4f00962e1cac035d112b5 +Subproject commit 400a5367f4ed3d3d9c1c297c694418d00c7bd8f0 diff --git a/qtwebchannel b/qtwebchannel index 4ef0f73fc3a..615bc04acdf 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 4ef0f73fc3a3c15a10d42ad44c78efa9efa59af9 +Subproject commit 615bc04acdfa1cf56fb25468c4fd19fff884928b diff --git a/qtwebengine b/qtwebengine index c0f3bfdb864..9685f5e408c 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit c0f3bfdb86406a9b4210948e618e9eee73d9779c +Subproject commit 9685f5e408cfb29c9b758bcde6b3507b29409365 diff --git a/qtwebsockets b/qtwebsockets index f281e232f59..4056941ed4c 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit f281e232f591c47bf10f09282a15db2b892d17a2 +Subproject commit 4056941ed4cc0ead24a85955b7474770315b579b diff --git a/qtwebview b/qtwebview index 3c3832eb3dd..a746dc5f15c 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 3c3832eb3ddbe73023587314fdc0dcdd574cd8b6 +Subproject commit a746dc5f15c1bf3f4327c2f900df5ea236d7b5df From 92f122511d951a74bf5a3af30af391c330565bd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8ger=20Hanseg=C3=A5rd?= Date: Mon, 21 Oct 2024 19:43:01 +0200 Subject: [PATCH 195/288] Add provisioning of FFmpeg for Android and iOS with qtci-macos MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This patch adds FFmpeg provisioning for Android and iOS for qtci-macos-12..15-arm..x86-64 by syncing with qtci-macos-13-x86_64 where this was already done. Change-Id: I070514cbff12504db7c6fa77111e12d7e500ce30 Reviewed-by: Timur Pocheptsov Reviewed-by: Tor Arne Vestbø (cherry picked from commit 2728b7ac6fa882e49487af028187cc80ad65442f) Reviewed-by: Nils Petter Skålerud --- coin/provisioning/qtci-macos-12-arm/90-install-ffmpeg.sh | 2 ++ .../qtci-macos-12-x86_64/90-install-ffmpeg.sh | 1 + coin/provisioning/qtci-macos-13-arm/90-install-ffmpeg.sh | 2 ++ coin/provisioning/qtci-macos-14-arm/90-install-ffmpeg.sh | 2 ++ .../qtci-macos-14-x86_64/90-install-ffmpeg.sh | 2 ++ coin/provisioning/qtci-macos-15-arm/90-install-ffmpeg.sh | 9 +++++++++ .../qtci-macos-15-x86_64/90-install-ffmpeg.sh | 9 +++++++++ 7 files changed, 27 insertions(+) create mode 100755 coin/provisioning/qtci-macos-15-arm/90-install-ffmpeg.sh create mode 100755 coin/provisioning/qtci-macos-15-x86_64/90-install-ffmpeg.sh 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 23cb13e141c..4d4169bb657 100755 --- a/coin/provisioning/qtci-macos-12-arm/90-install-ffmpeg.sh +++ b/coin/provisioning/qtci-macos-12-arm/90-install-ffmpeg.sh @@ -5,3 +5,5 @@ set -ex source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.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 8f6da818626..dfdc1022c27 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 @@ -6,3 +6,4 @@ set -ex source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.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 23cb13e141c..4d4169bb657 100755 --- a/coin/provisioning/qtci-macos-13-arm/90-install-ffmpeg.sh +++ b/coin/provisioning/qtci-macos-13-arm/90-install-ffmpeg.sh @@ -5,3 +5,5 @@ set -ex source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.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 23cb13e141c..4d4169bb657 100755 --- a/coin/provisioning/qtci-macos-14-arm/90-install-ffmpeg.sh +++ b/coin/provisioning/qtci-macos-14-arm/90-install-ffmpeg.sh @@ -5,3 +5,5 @@ set -ex source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.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 23cb13e141c..dfdc1022c27 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 @@ -5,3 +5,5 @@ set -ex source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.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 new file mode 100755 index 00000000000..4d4169bb657 --- /dev/null +++ b/coin/provisioning/qtci-macos-15-arm/90-install-ffmpeg.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 + +source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.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 new file mode 100755 index 00000000000..dfdc1022c27 --- /dev/null +++ b/coin/provisioning/qtci-macos-15-x86_64/90-install-ffmpeg.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 + +source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "macos-universal" +source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-arm64" +source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-ios.sh" From 85eb37bf83bda03584c3868b3c233acb3333192a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Tue, 29 Oct 2024 12:25:28 +0200 Subject: [PATCH 196/288] Provisioning: Fix once more the SBOM_PYTHON_APPS_PATH in macOS Change-Id: I733a6b2ea25e4d76c19ef921b7706cd0464c3120 Reviewed-by: Alexandru Croitor (cherry picked from commit e7ef5d8f1b9df3e19e82323aa399e74d0005d9cc) Reviewed-by: Jukka Jokiniva --- coin/provisioning/qtci-macos-12-arm/25-python.sh | 4 ++-- coin/provisioning/qtci-macos-13-arm/25-python.sh | 4 ++-- coin/provisioning/qtci-macos-14-arm/25-python.sh | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/coin/provisioning/qtci-macos-12-arm/25-python.sh b/coin/provisioning/qtci-macos-12-arm/25-python.sh index ef90d763f49..bc0857a56fe 100755 --- a/coin/provisioning/qtci-macos-12-arm/25-python.sh +++ b/coin/provisioning/qtci-macos-12-arm/25-python.sh @@ -19,9 +19,9 @@ SetEnvVar "PIP3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/" SetEnvVar "PATH" "\$PYTHON3_PATH:\$PATH" # Provisioning during installation says: -# 'The script sbom2doc is installed in '/home/qt/.local/bin' which is not on PATH.' +# '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" "/home/qt/.local/bin" +SetEnvVar "SBOM_PYTHON_APPS_PATH" "/Users/qt/.local/bin" # QtWebengine still requires python2 pyenv install 2.7.18 diff --git a/coin/provisioning/qtci-macos-13-arm/25-python.sh b/coin/provisioning/qtci-macos-13-arm/25-python.sh index ef90d763f49..bc0857a56fe 100755 --- a/coin/provisioning/qtci-macos-13-arm/25-python.sh +++ b/coin/provisioning/qtci-macos-13-arm/25-python.sh @@ -19,9 +19,9 @@ SetEnvVar "PIP3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/" SetEnvVar "PATH" "\$PYTHON3_PATH:\$PATH" # Provisioning during installation says: -# 'The script sbom2doc is installed in '/home/qt/.local/bin' which is not on PATH.' +# '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" "/home/qt/.local/bin" +SetEnvVar "SBOM_PYTHON_APPS_PATH" "/Users/qt/.local/bin" # QtWebengine still requires python2 pyenv install 2.7.18 diff --git a/coin/provisioning/qtci-macos-14-arm/25-python.sh b/coin/provisioning/qtci-macos-14-arm/25-python.sh index 2a03b217808..37c61881cc8 100755 --- a/coin/provisioning/qtci-macos-14-arm/25-python.sh +++ b/coin/provisioning/qtci-macos-14-arm/25-python.sh @@ -19,8 +19,8 @@ SetEnvVar "PIP3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/" SetEnvVar "PATH" "\$PYTHON3_PATH:\$PATH" # Provisioning during installation says: -# 'The script sbom2doc is installed in '/home/qt/.local/bin' which is not on PATH.' +# '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" "/home/qt/.local/bin" +SetEnvVar "SBOM_PYTHON_APPS_PATH" "/Users/qt/.local/bin" echo "python3 = 3.9.7" >> ~/versions.txt From a9dfa0737d571ca15b5782d7af77c74c7f108902 Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Wed, 30 Oct 2024 12:29:10 +0200 Subject: [PATCH 197/288] Add 'QT_FEATURE_open62541_security=OFF' for macOS packaging build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: QTBUG-125252 Pick-to: 6.5 Change-Id: Ic6daa4c589dda54294a787261be6884cdbf3dff0 Reviewed-by: Simo Fält (cherry picked from commit 0149acd42b4efdd855d61d66b9e3690586593fc2) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/macos.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/macos.yaml b/coin/platform_configs/macos.yaml index 3f9bd4ee72d..db8bc719028 100644 --- a/coin/platform_configs/macos.yaml +++ b/coin/platform_configs/macos.yaml @@ -16,7 +16,7 @@ Configurations: 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}}', - 'NON_QTBASE_CMAKE_ARGS=-DFEATURE_gds=OFF -DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON', + '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' ] From ff795c101fb13a92523e9af06048f6591cba3207 Mon Sep 17 00:00:00 2001 From: Tim Blechmann Date: Mon, 16 Sep 2024 10:22:49 +0800 Subject: [PATCH 198/288] ubuntu: install pulseaudio 16 with time smoother bugfixes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The GStreamer backend of Qt Multimedia has known issues with pulseaudio, caused by bugs in the time smoother. We therefore install pulseaudio 16 from a PPA on our ubuntu testers. Task-number: QTBUG-112014 Task-number: QTBUG-124372 Task-number: QTBUG-126799 Pick-to: 6.5 Change-Id: Ifd18ff4b9904ac0ee022c9158e96ebca8768599f Reviewed-by: Jøger Hansegård Reviewed-by: Dimitrios Apostolou (cherry picked from commit cc17f25cd1d762e1534b2776b381f91e2eea2304) Reviewed-by: Qt Cherry-pick Bot --- ...-install-pulseaudio-16-bugfix-backports.sh | 40 +++++++++++++++++++ ...-install-pulseaudio-16-bugfix-backports.sh | 32 +++++++++++++++ ...-install-pulseaudio-16-bugfix-backports.sh | 32 +++++++++++++++ 3 files changed, 104 insertions(+) create mode 100755 coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/03-install-pulseaudio-16-bugfix-backports.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/03-install-pulseaudio-16-bugfix-backports.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/03-install-pulseaudio-16-bugfix-backports.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/03-install-pulseaudio-16-bugfix-backports.sh b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/03-install-pulseaudio-16-bugfix-backports.sh new file mode 100755 index 00000000000..8b4afb8e44b --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/03-install-pulseaudio-16-bugfix-backports.sh @@ -0,0 +1,40 @@ +#!/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 + +# backport of: +# https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/745 +# https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/764 +# compare: https://doc-snapshots.qt.io/qt6-6.8/qtmultimedia-gstreamer.html#limitations-and-known-issues + +# shellcheck source=../common/unix/DownloadURL.sh +source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" + +set -ex + +DownloadDeb () { + deb="$1" + checksum="$2" + + url="https://launchpad.net/~tim-klingt/+archive/ubuntu/pulseaudio-16-bugfixes/+files/$%7Bdeb%7D" + url_cached="http://ci-files01-hki.ci.qt.io/input/pulseaudio-16-bugfixes/jammy_amd64/$%7Bdeb%7D" + + DownloadURL $url_cached $url $checksum $deb +} + +DownloadDeb libpulse0_15.99.1+dfsg1-1ubuntu2.2timesmootherfix~jammy_amd64.deb 5607f464fc73d09e2067a12b7e20d3b175d17e94 +DownloadDeb libpulse-dev_15.99.1+dfsg1-1ubuntu2.2timesmootherfix~jammy_amd64.deb 674de26bb5a5148479d0c9e81c22462e2ffefa42 +DownloadDeb libpulsedsp_15.99.1+dfsg1-1ubuntu2.2timesmootherfix~jammy_amd64.deb 0e06bea12c267cdeade4dce48ceba709f3a57036 +DownloadDeb libpulse-mainloop-glib0_15.99.1+dfsg1-1ubuntu2.2timesmootherfix~jammy_amd64.deb 6fbb84697ac3e46664f3a9aff63bb8c04666c0a2 +DownloadDeb pulseaudio_15.99.1+dfsg1-1ubuntu2.2timesmootherfix~jammy_amd64.deb 0988e8357a7024b8bf55c6fe0f51c0c0a72813e7 +DownloadDeb pulseaudio-utils_15.99.1+dfsg1-1ubuntu2.2timesmootherfix~jammy_amd64.deb 667a6a570e9bf03317de6e548443ea058ad5195d +DownloadDeb pulseaudio-module-bluetooth_15.99.1+dfsg1-1ubuntu2.2timesmootherfix~jammy_amd64.deb fd22382092cc45b7d717895f342fa5f5b6bc22e0 + +sudo dpkg -i \ + libpulse0_15.99.1+dfsg1-1ubuntu2.2timesmootherfix~jammy_amd64.deb \ + libpulse-dev_15.99.1+dfsg1-1ubuntu2.2timesmootherfix~jammy_amd64.deb \ + libpulsedsp_15.99.1+dfsg1-1ubuntu2.2timesmootherfix~jammy_amd64.deb \ + libpulse-mainloop-glib0_15.99.1+dfsg1-1ubuntu2.2timesmootherfix~jammy_amd64.deb \ + pulseaudio_15.99.1+dfsg1-1ubuntu2.2timesmootherfix~jammy_amd64.deb \ + pulseaudio-module-bluetooth_15.99.1+dfsg1-1ubuntu2.2timesmootherfix~jammy_amd64.deb \ + pulseaudio-utils_15.99.1+dfsg1-1ubuntu2.2timesmootherfix~jammy_amd64.deb diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/03-install-pulseaudio-16-bugfix-backports.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/03-install-pulseaudio-16-bugfix-backports.sh new file mode 100755 index 00000000000..4fe4451f9de --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/03-install-pulseaudio-16-bugfix-backports.sh @@ -0,0 +1,32 @@ +#!/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 + +# backport of: +# https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/745 +# https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/764 +# compare: https://doc-snapshots.qt.io/qt6-6.8/qtmultimedia-gstreamer.html#limitations-and-known-issues + +# shellcheck source=../common/unix/DownloadURL.sh +source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" + +set -ex + +DownloadDeb () { + deb="$1" + checksum="$2" + + url="https://launchpad.net/~tim-klingt/+archive/ubuntu/pulseaudio-16-bugfixes/+files/$%7Bdeb%7D" + url_cached="http://ci-files01-hki.ci.qt.io/input/pulseaudio-16-bugfixes/noble_arm64/$%7Bdeb%7D" + + DownloadURL $url_cached $url $checksum $deb +} + +DownloadDeb libpulse0_16.1+dfsg1-2ubuntu10timesmootherfix~noble_arm64.deb 4fa467972542a3851aad892833dc0149efe5c6f3 +DownloadDeb libpulse-dev_16.1+dfsg1-2ubuntu10timesmootherfix~noble_arm64.deb 20045425b0522ec39adc0231d6727146ce910dd4 +DownloadDeb libpulse-mainloop-glib0_16.1+dfsg1-2ubuntu10timesmootherfix~noble_arm64.deb cd94fd91e6f5a4b67ccd148c50e93a9dc9a59b33 + +sudo dpkg -i \ + libpulse0_16.1+dfsg1-2ubuntu10timesmootherfix~noble_arm64.deb \ + libpulse-dev_16.1+dfsg1-2ubuntu10timesmootherfix~noble_arm64.deb \ + libpulse-mainloop-glib0_16.1+dfsg1-2ubuntu10timesmootherfix~noble_arm64.deb diff --git a/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/03-install-pulseaudio-16-bugfix-backports.sh b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/03-install-pulseaudio-16-bugfix-backports.sh new file mode 100755 index 00000000000..938b7a85609 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-24.04-x86_64/03-install-pulseaudio-16-bugfix-backports.sh @@ -0,0 +1,32 @@ +#!/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 + +# backport of: +# https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/745 +# https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/764 +# compare: https://doc-snapshots.qt.io/qt6-6.8/qtmultimedia-gstreamer.html#limitations-and-known-issues + +# shellcheck source=../common/unix/DownloadURL.sh +source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" + +set -ex + +DownloadDeb () { + deb="$1" + checksum="$2" + + url="https://launchpad.net/~tim-klingt/+archive/ubuntu/pulseaudio-16-bugfixes/+files/$%7Bdeb%7D" + url_cached="http://ci-files01-hki.ci.qt.io/input/pulseaudio-16-bugfixes/noble_amd64/$%7Bdeb%7D" + + DownloadURL $url_cached $url $checksum $deb +} + +DownloadDeb libpulse0_16.1+dfsg1-2ubuntu10timesmootherfix~noble_amd64.deb 65458740897d0e939d07cf1c892060c381e68441 +DownloadDeb libpulse-dev_16.1+dfsg1-2ubuntu10timesmootherfix~noble_amd64.deb a998bd30f4ca13ad9e66a2a8fb4b9bfe9aade8e2 +DownloadDeb libpulse-mainloop-glib0_16.1+dfsg1-2ubuntu10timesmootherfix~noble_amd64.deb 326baf3c11a4f490dac6dad2d4e56c0821b31b80 + +sudo dpkg -i \ + libpulse0_16.1+dfsg1-2ubuntu10timesmootherfix~noble_amd64.deb \ + libpulse-dev_16.1+dfsg1-2ubuntu10timesmootherfix~noble_amd64.deb \ + libpulse-mainloop-glib0_16.1+dfsg1-2ubuntu10timesmootherfix~noble_amd64.deb From 7db1e0a0530c0e77289cc5f88aacbafbe12bf47e Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 11 Sep 2024 17:22:12 +0200 Subject: [PATCH 199/288] CMake: Improve qt5.git "QtSynchronizeRepo.cmake" / sync-to script The QtSynchronizeRepo.cmake script, which is meant to be driven by a git-sync-to script, has been rewritten to support more use cases, as well as improve the code readability and error reporting. The script now supports the following additional use cases: - Clone a specified qt/{repo} submodule from code.qt.io into the current directory, and initialize (clone) its dependencies - Initialize a submodule and its dependencies in an existing qt5.git super repo. This is similar to what init-repository does, except instead of using the qt5.git sha1s, it uses the dependencies.yaml of the specified submodule - Support for git fetch --depth, to allow shallow cloning of the specified submodule and its dependencies. This is useful for CI where only a specific revision needs to be checked out. The main incentive for this change is allow cloning qttools/dev/HEAD and its dependencies in a CI run, but it's useful for daily work as well. At some point we should check what can be merged together with the existing init-repository script. Task-number: QTBUG-128730 Change-Id: Ie6d49d253223cc93b8831ef41d25e0adeac39b8b Reviewed-by: Joerg Bornemann (cherry picked from commit 710bc2d90e0b3afe187e443ed0c05b69bc1fd12a) Reviewed-by: Qt Cherry-pick Bot --- cmake/QtSynchronizeRepo.cmake | 53 +- cmake/QtTopLevelHelpers.cmake | 894 +++++++++++++++++++++++++++++++--- 2 files changed, 869 insertions(+), 78 deletions(-) diff --git a/cmake/QtSynchronizeRepo.cmake b/cmake/QtSynchronizeRepo.cmake index eabd5c7c9a8..3876fc0a9df 100644 --- a/cmake/QtSynchronizeRepo.cmake +++ b/cmake/QtSynchronizeRepo.cmake @@ -3,13 +3,62 @@ # This script is to be called (ideally from a git-sync-to alias script): # cmake -DSYNC_TO_MODULE="$1" -DSYNC_TO_BRANCH="$2" -P cmake/QtSynchronizeRepo.cmake + # Or as follows (ideally from a git-qt-foreach alias script): # cmake -DQT_FOREACH=TRUE "-DARGS=$*" -P cmake/QtSynchronizeRepo.cmake +# +# The script can take additional options. +# +# SYNC_REF_SPEC - an alias for SYNC_TO_BRANCH, can be a tag, branch or commit sha1. +# +# REMOTE_NAME - remote name to use for fetching, default is origin. +# +# GIT_DEPTH - corresponds to git's --depth option, will be passed to git clone and git submodule +# update --init operations. +# +# SHOW_PROGRESS - passes --progress to git submodule update operations +# +# VERBOSE - enables more verbose output +# +# The script also takes the following environment variables: +# +# QT_TL_SUBMODULE_UPDATE_FLAGS - additional flags to pass to git submodule update calls. +# +# To run the script in full debug mode use: +# cmake -DSYNC_TO_MODULE="$1" -DSYNC_TO_BRANCH="$2" -DSHOW_PROGRESS=1 -DVERBOSE=1 +# -P cmake/QtSynchronizeRepo.cmake --log-level=DEBUG --trace-redirect=log.txt --trace-expand cmake_policy(VERSION 3.16) -include(cmake/QtTopLevelHelpers.cmake) +include("${CMAKE_CURRENT_LIST_DIR}/QtTopLevelHelpers.cmake") if(QT_FOREACH) qt_internal_foreach_repo_run(ARGS ${ARGS}) else() - qt_internal_sync_to(${SYNC_TO_MODULE} ${SYNC_TO_BRANCH}) + set(args "") + + if(SYNC_REF_SPEC) + set(ref_spec "${SYNC_REF_SPEC}") + elseif(SYNC_TO_BRANCH) + set(ref_spec "${SYNC_TO_BRANCH}") + endif() + + if(REMOTE_NAME) + list(APPEND args REMOTE_NAME "${REMOTE_NAME}") + endif() + + if(GIT_DEPTH) + list(APPEND args GIT_DEPTH "${GIT_DEPTH}") + endif() + + if(SHOW_PROGRESS) + list(APPEND args SHOW_PROGRESS) + endif() + + if(VERBOSE) + list(APPEND args VERBOSE) + endif() + + qt_internal_sync_to(${SYNC_TO_MODULE} + SYNC_REF ${ref_spec} + ${args} + ) endif() diff --git a/cmake/QtTopLevelHelpers.cmake b/cmake/QtTopLevelHelpers.cmake index 7fe21e4f42c..69873d18258 100644 --- a/cmake/QtTopLevelHelpers.cmake +++ b/cmake/QtTopLevelHelpers.cmake @@ -379,16 +379,560 @@ function(qt_internal_sort_module_dependencies modules out_all_ordered) set(${out_all_ordered} "${ordered}" PARENT_SCOPE) endfunction() -# does what it says, but also updates submodules -function(qt_internal_checkout module revision) +# Checks whether any unparsed arguments have been passed to the function at the call site. +# Use this right after `cmake_parse_arguments`. +function(qt_internal_tl_validate_all_args_are_parsed prefix) + if(DEFINED ${prefix}_UNPARSED_ARGUMENTS) + message(FATAL_ERROR "Unknown arguments: (${${prefix}_UNPARSED_ARGUMENTS})") + endif() +endfunction() + +# If VERBOSE is not set or FALSE in the parent or root scopes, swallow the git output. +# If VERBOSE is true, echo the stdout output, as well as the command run. +function(qt_internal_tl_handle_verbose_git_operations) set(swallow_output "") # unless VERBOSE, eat git output, show it in case of error if (NOT VERBOSE) list(APPEND swallow_output "OUTPUT_VARIABLE" "git_output" "ERROR_VARIABLE" "git_output") + else() + list(APPEND swallow_output COMMAND_ECHO STDOUT) + endif() + set(swallow_output "${swallow_output}" PARENT_SCOPE) +endfunction() + +# Returns true if the current working directory is a super module with a .gitmodules file. +# Likely means it's the qt5.git super repo. +function(qt_internal_tl_is_super_repo out_var) + execute_process( + COMMAND "git" "rev-parse" "--show-toplevel" + RESULT_VARIABLE git_result + OUTPUT_VARIABLE top_level_path + ERROR_VARIABLE git_stderr + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + + if(NOT git_result AND top_level_path AND EXISTS "${top_level_path}/.gitmodules") + set(result TRUE) + else() + set(result FALSE) + endif() + + set(${out_var} ${result} PARENT_SCOPE) +endfunction() + +# Returns whether the given git repo is shallow (cloned with --depth arg). +function(qt_internal_tl_is_git_repo_shallow out_var working_directory) + message(DEBUG "Checking if repo in '${working_directory}' is shallow") + + execute_process( + COMMAND "git" "rev-parse" "--is-shallow-repository" + RESULT_VARIABLE git_result + OUTPUT_VARIABLE git_stdout + ERROR_VARIABLE git_stderr + WORKING_DIRECTORY "${working_directory}" + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + + if(git_result) + message(FATAL_ERROR + "Failed to check if repo is shallow in '${working_directory}'\n" + "stdout: ${git_stdout}\n" + "stderr: ${git_stderr}") + endif() + + string(STRIP "${git_stdout}" git_stdout) + if(git_stdout) + set(value TRUE) + else() + set(value FALSE) + endif() + set(${out_var} "${value}" PARENT_SCOPE) +endfunction() + +# Returns whether the given refspec is known to the repo in the given working directory. +function(qt_internal_tl_is_git_ref_spec_known out_var refspec working_directory) + # The funny ^{commit} syntax means the refpsec resolves to a commit, as opposed to a blob or a + # tree. + execute_process( + COMMAND "git" "cat-file" "-e" "${refspec}^{commit}" + RESULT_VARIABLE git_result + OUTPUT_VARIABLE git_stdout + ERROR_VARIABLE git_stderr + WORKING_DIRECTORY "${working_directory}" + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + + # A non-0 exit code means it doesn't exist. + if(git_result) + set(value FALSE) + else() + set(value TRUE) + endif() + + set(${out_var} "${value}" PARENT_SCOPE) +endfunction() + +# Unshallow the given git repo. +function(qt_internal_tl_git_unshallow_repo) + set(opt_args + SHOW_PROGRESS + ) + set(single_args + WORKING_DIRECTORY + ) + set(multi_args "") + cmake_parse_arguments(PARSE_ARGV 0 arg "${opt_args}" "${single_args}" "${multi_args}") + qt_internal_tl_validate_all_args_are_parsed(arg) + + if(NOT arg_WORKING_DIRECTORY) + message(FATAL_ERROR "WORKING_DIRECTORY is required") + endif() + + set(args "") + if(arg_SHOW_PROGRESS) + list(APPEND args --progress) + endif() + + execute_process( + COMMAND "git" "fetch" "--unshallow" ${args} + RESULT_VARIABLE git_result + WORKING_DIRECTORY "${arg_WORKING_DIRECTORY}" + ${swallow_output} + ) + + if(git_result) + message(FATAL_ERROR + "Failed to unshallow repo in '${arg_WORKING_DIRECTORY}': ${git_stderr}") + endif() +endfunction() + +# Fetches a shallow ref spec (--depth 1) from the given remote. +function(qt_internal_tl_git_fetch_shallow_ref_spec) + set(opt_args + SHOW_PROGRESS + FATAL + ) + set(single_args + REMOTE + REF_SPEC + WORKING_DIRECTORY + OUT_VAR_RESULT + ) + set(multi_args "") + cmake_parse_arguments(PARSE_ARGV 0 arg "${opt_args}" "${single_args}" "${multi_args}") + qt_internal_tl_validate_all_args_are_parsed(arg) + + if(NOT arg_REF_SPEC) + message(FATAL_ERROR "REF_SPEC is required") + endif() + + if(NOT arg_REMOTE) + message(FATAL_ERROR "REMOTE is required") + endif() + + if(NOT arg_WORKING_DIRECTORY) + message(FATAL_ERROR "WORKING_DIRECTORY is required") + endif() + + if(NOT arg_OUT_VAR_RESULT) + message(FATAL_ERROR "OUT_VAR_RESULT is required") + endif() + + set(args "") + if(arg_SHOW_PROGRESS) + list(APPEND args --progress) + endif() + + execute_process( + COMMAND "git" "fetch" "--depth" "1" "${arg_REMOTE}" "${arg_REF_SPEC}" ${args} + RESULT_VARIABLE git_result + WORKING_DIRECTORY "${arg_WORKING_DIRECTORY}" + ${swallow_output} + ) + + if(git_result) + set(result FALSE) + if(arg_FATAL) + set(message_type FATAL_ERROR) + else() + set(message_type DEBUG) + endif() + message(${message_type} + "Failed to fetch shallow ref spec '${arg_REF_SPEC}' " + "in '${arg_WORKING_DIRECTORY}': ${git_stderr}") + else() + set(result TRUE) + endif() + + if(arg_OUT_VAR_RESULT) + set("${arg_OUT_VAR_RESULT}" "${result}" PARENT_SCOPE) endif() +endfunction() + +# Detects if a repo is shallow. If it is, checks if the given ref spec is known. If not, it will +# try to fetch it. If it's still unknown, will try to unshallow the repo. +function(qt_internal_tl_handle_shallow_repo) + set(opt_args + SHOW_PROGRESS + ) + set(single_args + REF_SPEC + REMOTE_NAME + WORKING_DIRECTORY + ) + set(multi_args "") + cmake_parse_arguments(PARSE_ARGV 0 arg "${opt_args}" "${single_args}" "${multi_args}") + qt_internal_tl_validate_all_args_are_parsed(arg) + + if(NOT arg_REF_SPEC) + message(FATAL_ERROR "REF_SPEC is required") + endif() + + if(NOT arg_REMOTE_NAME) + message(FATAL_ERROR "REMOTE_NAME is required") + endif() + + if(NOT arg_WORKING_DIRECTORY) + message(FATAL_ERROR "WORKING_DIRECTORY is required") + endif() + + qt_internal_tl_is_git_repo_shallow(is_shallow "${arg_WORKING_DIRECTORY}") + if(NOT is_shallow) + return() + endif() + + qt_internal_tl_is_git_ref_spec_known(is_known "${arg_REF_SPEC}" "${arg_WORKING_DIRECTORY}") + if(is_known) + return() + endif() + + set(remote "${arg_REMOTE_NAME}") + message(DEBUG + "Fetching with --depth 1 from '${remote}' due to unknown refspec '${arg_REF_SPEC}'") + + set(args "") + if(arg_SHOW_PROGRESS) + list(APPEND args SHOW_PROGRESS) + endif() + + qt_internal_tl_git_fetch_shallow_ref_spec( + REF_SPEC "${arg_REF_SPEC}" + REMOTE "${remote}" + WORKING_DIRECTORY "${arg_WORKING_DIRECTORY}" + OUT_VAR_RESULT shallow_fetch_succeeded + ${args} + ) + + # Attempt to unshallow a repo if a ref spec that we are meant to check out to, + # is not known. + if(shallow_fetch_succeeded) + return() + endif() + + message(DEBUG + "Unshallowing repo in ${arg_WORKING_DIRECTORY} due to unknown " + "refspec ${arg_REF_SPEC}") + + qt_internal_tl_git_unshallow_repo( + WORKING_DIRECTORY "${arg_WORKING_DIRECTORY}" + ${args} + ) +endfunction() + +# Checks if given string looks like a sha1. +function(qt_internal_tl_is_sha1_ish value out_var) + set(hex_digit "[0-9a-fA-F]") + string(REPEAT "${hex_digit}" 5 hex_5) + + set(hex_digit_maybe "${hex_digit}?") + string(REPEAT "${hex_digit_maybe}" 35 hex_35) + + # A sha1 would have at least 5 hex digits followed by 35 optional hex digits. + set(sha1_regex "^${hex_5}${hex_35}$") + + if("${value}" MATCHES "${sha1_regex}") + set(result TRUE) + else() + set(result FALSE) + endif() + + set(${out_var} "${result}" PARENT_SCOPE) +endfunction() + +# Directly updates the submodule sha in the supermodule, without having to checkout the submodule +# first. +# This is useful to be able to clone a specific revision with --depth 1 when using the "sync to +# module" feature. +# Causes the super module to have a "staged" change for the given submodule. +# Can only be used with a sha1, not a branch or tag or other refspec, because there might not be +# any repo info yet to resolve that refspec. +function(qt_internal_tl_modify_submodule_sha module revision working_directory) + qt_internal_tl_handle_verbose_git_operations() + + # This mode means 'treat path as a git submodule'. + set(mode "160000") + + execute_process( + COMMAND git update-index --add --cacheinfo "${mode},${revision},${module}" + RESULT_VARIABLE git_result + WORKING_DIRECTORY "${working_directory}" + ${swallow_output} + ) + if(git_result) + message(FATAL_ERROR "Failed to set initial submodule revision for '${module}'") + endif() +endfunction() + +# Unstages a previously staged change to the submodule sha in the supermodule. +# This should be run after qt_internal_tl_modify_submodule_sha and the submodule update operation, +# to not accidentally stage the change to the supermodule. +# It might still lieave the worktree dirty, because the checked out revision might be different +# from the one the supermodule expects, but that's fine, that's the point of the sync-to script. +function(qt_internal_tl_unstage_submodule_sha module working_directory) + qt_internal_tl_handle_verbose_git_operations() + + execute_process( + COMMAND git restore --staged "${module}" + RESULT_VARIABLE git_result + WORKING_DIRECTORY "${working_directory}" + ${swallow_output} + ) + if(git_result) + message(FATAL_ERROR "Failed to unstage submodule revision change for '${module}'") + endif() +endfunction() + +# Transforms a refspec into a commit sha1. +# Useful for git commands that can't take a refspec. +function(qt_internal_tl_get_refspec_as_sha) + set(opt_args + FATAL + ) + set(single_args + REF_SPEC + WORKING_DIRECTORY + OUT_VAR + ) + set(multi_args "") + cmake_parse_arguments(PARSE_ARGV 0 arg "${opt_args}" "${single_args}" "${multi_args}") + qt_internal_tl_validate_all_args_are_parsed(arg) + + if(NOT arg_REF_SPEC) + message(FATAL_ERROR "REF_SPEC is required") + endif() + + if(NOT arg_WORKING_DIRECTORY) + message(FATAL_ERROR "WORKING_DIRECTORY is required") + endif() + + if(NOT arg_OUT_VAR) + message(FATAL_ERROR "OUT_VAR is required") + endif() + + execute_process( + COMMAND "git" "rev-parse" "${arg_REF_SPEC}" + WORKING_DIRECTORY "${arg_WORKING_DIRECTORY}" + RESULT_VARIABLE git_result + OUTPUT_VARIABLE git_stdout + ERROR_VARIABLE git_stderr + OUTPUT_STRIP_TRAILING_WHITESPACE + ) + if(git_result) + message(WARNING "${git_stdout}") + if(arg_FATAL) + set(message_type FATAL_ERROR) + else() + set(message_type WARNING) + endif() + message("${message_type}" + "Failed to get sha1 of ${arg_REF_SPEC} in '${arg_WORKING_DIRECTORY}': ${git_stderr}") + endif() + + string(STRIP "${git_stdout}" git_stdout) + set(${arg_OUT_VAR} "${git_stdout}" PARENT_SCOPE) +endfunction() + +# Runs `submodule update --init` for a submodule. +# +# If REF_SPEC is passed and is a valid commit sha1, sets the current active submodule sha1 in the +# super module to the given sha1. This is useful for cloning a specific sha1 with --depth 1. +# +# GIT_DEPTH passes the given --depth for the submodule update operation. +# +# SHOW_PROGRESS passes --progress to the submodule update operation. +# +# OUT_VAR_RESULT - set to TRUE or FALSE depending on whether the submodule update init succeeded. + +function(qt_internal_tl_run_submodule_update_init module) + set(opt_args + FAILURE_IS_WARNING + SHOW_PROGRESS + ) + set(single_args + REF_SPEC + GIT_DEPTH + FAILURE_MESSAGE + WORKING_DIRECTORY + OUT_VAR_RESULT + ) + set(multi_args "") + cmake_parse_arguments(PARSE_ARGV 1 arg "${opt_args}" "${single_args}" "${multi_args}") + qt_internal_tl_validate_all_args_are_parsed(arg) + + qt_internal_tl_handle_verbose_git_operations() + + if(NOT arg_WORKING_DIRECTORY) + message(FATAL_ERROR "WORKING_DIRECTORY is required") + endif() + + qt_internal_tl_is_sha1_ish("${arg_REF_SPEC}" is_sha1_revision) + + # We can only modify the submodule sha1 if we are given a sha1 reference, not any kind of + # refspec. + if(arg_REF_SPEC AND is_sha1_revision) + qt_internal_tl_modify_submodule_sha("${module}" "${arg_REF_SPEC}" + "${arg_WORKING_DIRECTORY}") + endif() + + set(args "") + set(extra_flags "$ENV{QT_TL_SUBMODULE_UPDATE_FLAGS}") + if(extra_flags) + list(APPEND args ${extra_flags}) + endif() + if(arg_GIT_DEPTH) + list(APPEND args --depth "${arg_GIT_DEPTH}") + endif() + if(arg_SHOW_PROGRESS) + list(APPEND args --progress) + endif() + + execute_process( + COMMAND "git" "submodule" "update" "--init" ${args} "${module}" + RESULT_VARIABLE git_result + WORKING_DIRECTORY "${arg_WORKING_DIRECTORY}" + ${swallow_output} + ) + + if(arg_REF_SPEC AND is_sha1_revision) + qt_internal_tl_unstage_submodule_sha("${module}" "${arg_WORKING_DIRECTORY}") + endif() + + if(git_result) + set(result FALSE) + + if(arg_FAILURE_IS_WARNING) + set(message_type WARNING) + else() + set(message_type FATAL_ERROR) + endif() + + message(${message_type} "${arg_FAILURE_MESSAGE}") + else() + set(result TRUE) + endif() + + if(arg_OUT_VAR_RESULT) + set("${arg_OUT_VAR_RESULT}" "${result}" PARENT_SCOPE) + endif() +endfunction() + +# Clones a 'qt/${REPO_NAME}' repo from code.qt.io. +function(qt_internal_tl_git_clone_repo) + set(opt_args + SHOW_PROGRESS + ) + set(single_args + REPO_NAME + GIT_DEPTH + REMOTE_URL_BASE + WORKING_DIRECTORY + ) + set(multi_args "") + cmake_parse_arguments(PARSE_ARGV 0 arg "${opt_args}" "${single_args}" "${multi_args}") + qt_internal_tl_validate_all_args_are_parsed(arg) + + qt_internal_tl_handle_verbose_git_operations() + + if(NOT arg_WORKING_DIRECTORY) + message(FATAL_ERROR "WORKING_DIRECTORY is required") + endif() + + if(NOT arg_REPO_NAME) + message(FATAL_ERROR "REPO_NAME is required") + endif() + + if(arg_REMOTE_URL_BASE) + set(remote_url_base "${arg_REMOTE_URL_BASE}") + else() + set(remote_url_base "https://code.qt.io/qt/") + endif() + + set(remote_url "${remote_url_base}${arg_REPO_NAME}.git") + + message(NOTICE "Cloning '${arg_REPO_NAME}' from '${remote_url}'") + + set(clone_args "") + if(arg_GIT_DEPTH) + list(APPEND clone_args --depth "${arg_GIT_DEPTH}") + endif() + if(arg_SHOW_PROGRESS) + list(APPEND clone_args --progress) + endif() + + # Note that cloning does not allow fetching a specific sha1 directly if --depth is + # specified. It can only take a branch or tag name. So we don't pass REF_SPEC here. + execute_process( + COMMAND "git" "clone" "${remote_url}" ${clone_args} + WORKING_DIRECTORY "${arg_WORKING_DIRECTORY}" + RESULT_VARIABLE git_result + ${swallow_output} + ) + if(git_result) + message(FATAL_ERROR + "Failed to clone '${module}' from '${remote_url}': ${git_output}") + endif() +endfunction() + +# Checks out a submodule to a given refspec, and runs 'git submodule update' in the submodule +# directory. +# If a regular checkout does not work, a detached checkout is attempted. +function(qt_internal_checkout module revision) + set(opt_args + SHOW_PROGRESS + ) + set(single_args + REMOTE_NAME + WORKING_DIRECTORY + ) + set(multi_args "") + cmake_parse_arguments(PARSE_ARGV 2 arg "${opt_args}" "${single_args}" "${multi_args}") + qt_internal_tl_validate_all_args_are_parsed(arg) + + qt_internal_tl_handle_verbose_git_operations() + + if(NOT arg_WORKING_DIRECTORY) + message(FATAL_ERROR "WORKING_DIRECTORY is required") + endif() + + if(NOT arg_REMOTE_NAME) + message(FATAL_ERROR "REMOTE_NAME is required") + endif() + + set(shallow_args "") + if(arg_SHOW_PROGRESS) + list(APPEND shallow_args SHOW_PROGRESS) + endif() + + qt_internal_tl_handle_shallow_repo( + REF_SPEC "${revision}" + REMOTE_NAME "${arg_REMOTE_NAME}" + WORKING_DIRECTORY "${arg_WORKING_DIRECTORY}/${module}" + ${shallow_args} + ) + message(NOTICE "Checking '${module}' out to revision '${revision}'") execute_process( COMMAND "git" "checkout" "${revision}" - WORKING_DIRECTORY "./${module}" + WORKING_DIRECTORY "${arg_WORKING_DIRECTORY}/${module}" RESULT_VARIABLE git_result ${swallow_output} ) @@ -396,7 +940,7 @@ function(qt_internal_checkout module revision) message(WARNING "${git_output}, trying detached checkout") execute_process( COMMAND "git" "checkout" "--detach" "${revision}" - WORKING_DIRECTORY "./${module}" + WORKING_DIRECTORY "${arg_WORKING_DIRECTORY}/${module}" RESULT_VARIABLE git_result ${swallow_output} ) @@ -404,45 +948,89 @@ function(qt_internal_checkout module revision) if (git_result) message(FATAL_ERROR "Failed to check '${module}' out to '${revision}': ${git_output}") endif() + + set(args "") + set(extra_flags "$ENV{QT_TL_SUBMODULE_UPDATE_FLAGS}") + if(extra_flags) + list(APPEND args ${extra_flags}) + endif() + if(arg_SHOW_PROGRESS) + list(APPEND args --progress) + endif() + execute_process( - COMMAND "git" "submodule" "update" - WORKING_DIRECTORY "./${module}" + COMMAND "git" "submodule" "update" ${args} + WORKING_DIRECTORY "${arg_WORKING_DIRECTORY}/${module}" RESULT_VARIABLE git_result - OUTPUT_VARIABLE git_stdout - ERROR_VARIABLE git_stderr + ${swallow_output} ) endfunction() -# clones or creates a worktree for $dependency, using the source of $dependent +# Clones or creates a worktree, or initializes a submodule for $dependency, using the source of +# $dependent. +# Example dependent: qtdeclarative +# Example dependency: qtbase function(qt_internal_get_dependency dependent dependency) - set(swallow_output "") # unless VERBOSE, eat git output, show it in case of error - if (NOT VERBOSE) - list(APPEND swallow_output "OUTPUT_VARIABLE" "git_output" "ERROR_VARIABLE" "git_output") + set(opt_args + SHOW_PROGRESS + ) + set(single_args + GIT_DEPTH + REMOTE_NAME + REF_SPEC + ) + set(multi_args "") + cmake_parse_arguments(PARSE_ARGV 2 arg "${opt_args}" "${single_args}" "${multi_args}") + qt_internal_tl_validate_all_args_are_parsed(arg) + + qt_internal_tl_handle_verbose_git_operations() + + if(NOT arg_REMOTE_NAME) + message(FATAL_ERROR "REMOTE_NAME is required") endif() + set(show_progress_args "") + if(arg_SHOW_PROGRESS) + set(show_progress_args SHOW_PROGRESS) + endif() + + # This will hold the path to parent dir of the main ${dependent} worktree, regardless if it's a + # clone or a git worktree. + # So if dependent is 'src/qt6/qtshadertools' + # gitdir will be 'src/qt6' + # If dependent is 'worktrees/6.8-worktree/qtshadertools' + # gitdir will still be 'src/qt6', not 'worktrees/6.8-worktree' set(gitdir "") + + # The remote url. set(remote "") - # try to read the worktree source + # Worktree of dependent, aka who depends on dependency. + set(dependent_path "${CMAKE_CURRENT_SOURCE_DIR}/${dependent}") + + # Try to get the dependent worktree git dir. execute_process( - COMMAND "git" "rev-parse" "--git-dir" - WORKING_DIRECTORY "./${dependent}" + COMMAND "git" "rev-parse" "--absolute-git-dir" + WORKING_DIRECTORY "${dependent_path}" RESULT_VARIABLE git_result OUTPUT_VARIABLE git_stdout ERROR_VARIABLE git_stderr OUTPUT_STRIP_TRAILING_WHITESPACE ) + message(DEBUG "Original gitdir for '${dependent_path}' is '${git_stdout}'") + string(FIND "${git_stdout}" "${module}" index) string(SUBSTRING "${git_stdout}" 0 ${index} gitdir) string(FIND "${gitdir}" ".git/modules" index) if(index GREATER -1) # submodules have not been absorbed string(SUBSTRING "${gitdir}" 0 ${index} gitdir) endif() - message(DEBUG "Will look for clones in ${gitdir}") + + message(DEBUG "Will check computed '${gitdir}' for worktrees and clones.") execute_process( - COMMAND "git" "remote" "get-url" "origin" - WORKING_DIRECTORY "./${dependent}" + COMMAND "git" "remote" "get-url" "${arg_REMOTE_NAME}" + WORKING_DIRECTORY "${dependent_path}" RESULT_VARIABLE git_result OUTPUT_VARIABLE git_stdout ERROR_VARIABLE git_stderr @@ -450,67 +1038,200 @@ function(qt_internal_get_dependency dependent dependency) ) string(FIND "${git_stdout}" "${dependent}.git" index) string(SUBSTRING "${git_stdout}" 0 ${index} remote) - message(DEBUG "Will clone from ${remote}") - if(EXISTS "${gitdir}.gitmodules" AND NOT EXISTS "${gitdir}${dependency}/.git") + message(DEBUG "Original remote for '${dependent_path}' is '${git_stdout}'") + + set(maybe_super_module_path "${gitdir}") + set(maybe_submodule_path "${maybe_super_module_path}${dependency}") + set(maybe_submodule_git_path "${maybe_submodule_path}/.git") + + set(maybe_existing_worktree_path "${maybe_submodule_path}") + + if(EXISTS "${maybe_super_module_path}.gitmodules" AND NOT EXISTS "${maybe_submodule_git_path}") + set(use_submodule_init TRUE) + message(DEBUG + "Will attempt to initialize submodule using supermodule ${maybe_super_module_path}") + else() + set(use_submodule_init FALSE) + if(EXISTS "${maybe_existing_worktree_path}") + message(DEBUG "Will attempt to use worktree from ${maybe_existing_worktree_path}") + else() + message(DEBUG "Will clone from ${remote}") + endif() + endif() + + if(use_submodule_init) # super repo exists, but the submodule we need does not - try to initialize - message(NOTICE "Initializing submodule '${dependency}' from ${gitdir}") - execute_process( - COMMAND "git" "submodule" "update" "--init" "${dependency}" + message(NOTICE "Initializing submodule '${dependency}' from ${maybe_super_module_path}") + + set(args + FAILURE_MESSAGE + "Failed to initialize submodule '${dependency}' from ${maybe_super_module_path}" + + # Ignore errors, fall back to an independent clone below. + FAILURE_IS_WARNING + + OUT_VAR_RESULT submodule_update_init_result WORKING_DIRECTORY "${gitdir}" - RESULT_VARIABLE git_result - ${swallow_output} + ${show_progress_args} + ) + if(arg_GIT_DEPTH) + list(APPEND args + GIT_DEPTH "${arg_GIT_DEPTH}" + REF_SPEC "${arg_REF_SPEC}" ) - if (git_result) - # ignore errors, fall back to an independent clone instead - message(WARNING "Failed to initialize submodule '${dependency}' from ${gitdir}") endif() + qt_internal_tl_run_submodule_update_init("${dependency}" ${args}) endif() - if(EXISTS "${gitdir}${dependency}") + # If the submodule was initialized in the super repo in the code above, and the location where + # we're supposed to clone the dependency is the same, skip trying to clone the dependency or + # setting up a worktree, because it's already there. + set(new_dependency_path "${CMAKE_CURRENT_SOURCE_DIR}/${dependency}") + if(EXISTS "${new_dependency_path}" AND + "${new_dependency_path}" STREQUAL "${maybe_existing_worktree_path}") + return() + endif() + + if(EXISTS "${maybe_existing_worktree_path}") # for the module we want, there seems to be a clone parallel to what we have message(NOTICE "Adding worktree for ${dependency} from ${gitdir}${dependency}") execute_process( - COMMAND "git" "worktree" "add" "--detach" "${CMAKE_CURRENT_SOURCE_DIR}/${dependency}" - WORKING_DIRECTORY "${gitdir}/${dependency}" + COMMAND "git" "worktree" "add" "--detach" "${new_dependency_path}" + WORKING_DIRECTORY "${maybe_existing_worktree_path}" RESULT_VARIABLE git_result ${swallow_output} ) - if (git_result) - message(FATAL_ERROR "Failed to check '${module}' out to '${revision}': ${git_output}") + if(git_result) + message(FATAL_ERROR + "Failed to add worktree '${module}' from '${new_dependency_path}': ${git_output}") endif() else() - # we don't find the existing clone, so clone from the same remote - message(NOTICE "Cloning ${dependency} from ${remote}${dependency}.git") - execute_process( - COMMAND "git" "clone" "${remote}${dependency}.git" - WORKING_DIRECTORY "." - RESULT_VARIABLE git_result - ${swallow_output} - ) - if (git_result) - message(FATAL_ERROR "Failed to check '${module}' out to '${revision}': ${git_output}") + # We didn't find an existing clone or worktree, so clone from the same remote. + set(clone_args "") + if(arg_GIT_DEPTH) + list(APPEND clone_args GIT_DEPTH "${arg_GIT_DEPTH}") endif() + if(arg_SHOW_PROGRESS) + list(APPEND clone_args SHOW_PROGRESS) + endif() + + qt_internal_tl_git_clone_repo( + REPO_NAME "${dependency}" + REMOTE_URL_BASE "${remote}" + WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" + ${clone_args} + ) endif() endfunction() -# evaluates the dependencies for $module, and checks all dependencies -# out so that it is a consistent set +# Syncs a submodule to a given refspec, collects its dependencies, and then checks out +# the submodule and its dependencies to a consistent set, according to the submodule +# dependencies.yaml file. +# +# A special case is when the module is ".", in which case all submodules are checked out to the +# given refspec, e.g. check out everything to origin/dev/HEAD. +# +# Initializes the submodule and any of its dependencies if they are not already initialized, when +# executed in a qt5.git checkout. +# +# Clones the specified submodule from code.qt.io if it missing, and not in a qt5.git checkout. function(qt_internal_sync_to module) - if(ARGN) - set(revision "${ARGV1}") - # special casing "." as the target module - checkout all out to $revision - if("${module}" STREQUAL ".") - qt_internal_find_modules(modules) - foreach(module IN LISTS modules) - qt_internal_checkout("${module}" "${revision}") - endforeach() - return() - endif() + set(opt_args + VERBOSE + SHOW_PROGRESS + ) + set(single_args + SYNC_REF + REMOTE_NAME + GIT_DEPTH + ) + set(multi_args "") + cmake_parse_arguments(PARSE_ARGV 1 arg "${opt_args}" "${single_args}" "${multi_args}") + qt_internal_tl_validate_all_args_are_parsed(arg) + + if(arg_VERBOSE) + # This is meant to trickle into scopes of other functions as well. + set(VERBOSE TRUE) + endif() + + set(show_progress_args "") + if(arg_SHOW_PROGRESS) + set(show_progress_args SHOW_PROGRESS) + endif() + + if(arg_REMOTE_NAME) + set(remote_name "${arg_REMOTE_NAME}") else() + set(remote_name "origin") + endif() + + set(revision "${arg_SYNC_REF}") + + # Special casing "." as the target module - checkout all initialized submodules to $revision. + # If revision is unset, check out to dev. + if("${module}" STREQUAL ".") + if(NOT revision) + set(revision "dev") + endif() + + qt_internal_find_modules(modules) + foreach(module IN LISTS modules) + qt_internal_checkout("${module}" "${revision}" ${show_progress_args} + REMOTE_NAME "${remote_name}" + WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" + ) + endforeach() + return() + endif() + + # If no revision given, checkout to the HEAD as specified by the super module. + if(NOT revision) set(revision "HEAD") endif() - qt_internal_checkout("${module}" "${revision}") + + set(submodule_path "${CMAKE_CURRENT_SOURCE_DIR}/${module}") + set(submodule_git_path "${submodule_path}/.git") + + # We are in a qt5.git dir, but the requested submodule is not initialized yet, try to + # initialize it. + qt_internal_tl_is_super_repo(is_super_repo) + if(is_super_repo AND NOT EXISTS "${submodule_git_path}") + message(NOTICE "Initializing submodule '${module}' within supermodule.") + + set(args + FAILURE_MESSAGE "Failed to initialize initial submodule '${module}'" + WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" + ${show_progress_args} + ) + if(arg_GIT_DEPTH) + list(APPEND args + GIT_DEPTH "${arg_GIT_DEPTH}" + REF_SPEC "${revision}" + ) + endif() + qt_internal_tl_run_submodule_update_init("${module}" ${args}) + endif() + + # If we were in a qt5.git dir, the submodule should have been initialized by now. + # If we were in some random src/ dir, we need to manually clone the repo. + if(NOT EXISTS "${submodule_path}") + qt_internal_tl_git_clone_repo( + REPO_NAME "${module}" + WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" + ${show_progress_args} + ) + endif() + + if(NOT EXISTS "${submodule_git_path}") + message(FATAL_ERROR "No worktree for '${module}' found in '${submodule_path}'") + endif() + + # Check out the submodule to the given refspec. + qt_internal_checkout("${module}" "${revision}" ${show_progress_args} + REMOTE_NAME "${remote_name}" + WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" + ) qt_internal_resolve_module_dependencies(${module} initial_dependencies initial_revisions) if(initial_dependencies) @@ -524,12 +1245,12 @@ function(qt_internal_sync_to module) endif() set(revision "") - set(checkedout "1") + set(should_visit_dependencies "1") # Load all dependencies for $module, then iterate over the dependencies in reverse order, # and check out the first that isn't already at the required revision. # Repeat everything (we need to reload dependencies after each checkout) until no more checkouts # are done. - while(${checkedout}) + while(${should_visit_dependencies}) qt_internal_resolve_module_dependencies(${module} dependencies revisions) message(DEBUG "${module} dependencies: ${dependencies}") message(DEBUG "${module} revisions : ${revisions}") @@ -541,7 +1262,7 @@ function(qt_internal_sync_to module) endif() math(EXPR count "${count} - 1") - set(checkedout 0) + set(should_visit_dependencies 0) foreach(i RANGE ${count} 0 -1 ) list(GET dependencies ${i} dependency) list(GET revisions ${i} revision) @@ -550,32 +1271,53 @@ function(qt_internal_sync_to module) continue() endif() - if(NOT EXISTS "./${dependency}") - message(DEBUG "No worktree for '${dependency}' found in '${CMAKE_CURRENT_SOURCE_DIR}'") - qt_internal_get_dependency("${module}" "${dependency}") + # When in a super module, the dependency directory might exist, but is empty if the + # submodule was not yet initiallized. Check its existence and initialization state + # by looking at the existence of the .git file or directory. + if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${dependency}/.git") + message(DEBUG + "No worktree for '${dependency}' found in '${CMAKE_CURRENT_SOURCE_DIR}'. " + "Trying to acquire it." + ) + + set(args ${show_progress_args}) + if(arg_GIT_DEPTH) + list(APPEND args GIT_DEPTH "${arg_GIT_DEPTH}") + endif() + qt_internal_get_dependency("${module}" "${dependency}" + REF_SPEC "${revision}" + REMOTE_NAME "${remote_name}" + ${args} + ) + + set(should_visit_dependencies 1) endif() - execute_process( - COMMAND "git" "rev-parse" "HEAD" - WORKING_DIRECTORY "./${dependency}" - RESULT_VARIABLE git_result - OUTPUT_VARIABLE git_stdout - ERROR_VARIABLE git_stderr - OUTPUT_STRIP_TRAILING_WHITESPACE + qt_internal_tl_get_refspec_as_sha( + REF_SPEC "HEAD" + WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${dependency}" + OUT_VAR head_ref ) - if (git_result) - message(WARNING "${git_stdout}") - message(FATAL_ERROR "Failed to get current HEAD of '${dependency}': ${git_stderr}") - endif() - if ("${git_stdout}" STREQUAL "${revision}") + + if("${head_ref}" STREQUAL "${revision}") + message(DEBUG + "The dependency ${dependency} is already checked out to ${revision}. " + "Continuing to next dependency." + ) continue() endif() - qt_internal_checkout("${dependency}" "${revision}") - set(checkedout 1) + qt_internal_checkout("${dependency}" "${revision}" ${show_progress_args} + REMOTE_NAME "${remote_name}" + WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" + ) + set(should_visit_dependencies 1) + + # Start revisiting the dependencies in the while loop. break() endforeach() endwhile() + message(DEBUG "Module syncing finished.") endfunction() # Runs user specified command for all qt repositories in qt directory. From 886eb3a7f77c04fe11df168e7752c2da514a2f27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nils=20Petter=20Sk=C3=A5lerud?= Date: Tue, 3 Sep 2024 13:55:22 +0200 Subject: [PATCH 200/288] coin, macOS: Add arm64 support to fix-ffmpeg-dependencies.sh This file is used by the script common/unix/install-ffmpeg-android.sh. This script is useful for compiling FFmpeg for Android locally on macOS. Currently the script assumes the Homebrew installation of readelf is that of x86. The Homebrews path for readelf is different under arm64 and this change accounts for this. Pick-to: 6.5 Change-Id: I7ec1d4173e35fe91bc988492e56dd9a5fcbad072 Reviewed-by: Artem Dyomin (cherry picked from commit 03ffb922631bfd388ac4003aad94abe6165e24c1) Reviewed-by: Qt Cherry-pick Bot --- .../provisioning/common/shared/fix_ffmpeg_dependencies.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/coin/provisioning/common/shared/fix_ffmpeg_dependencies.sh b/coin/provisioning/common/shared/fix_ffmpeg_dependencies.sh index 54d566a1f01..f3972f07221 100755 --- a/coin/provisioning/common/shared/fix_ffmpeg_dependencies.sh +++ b/coin/provisioning/common/shared/fix_ffmpeg_dependencies.sh @@ -8,10 +8,10 @@ lib_dir="$1/lib" additional_suffix="${2:-}" set_rpath="${3:-yes}" -if uname -a |grep -q "Darwin"; then - readelf() { - /usr/local/opt/binutils/bin/readelf "$@" - } +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" "$@"; } fi ffmpeg_libs=("avcodec" "avdevice" "avfilter" "avformat" "avutil" "swresample" "swscale") From cf813eedfde46a6aaf08650ed4e7cf2cf691c2f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Fri, 14 Jun 2024 07:27:48 +0300 Subject: [PATCH 201/288] CI: Move ios-universal config to Arm host MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-6378 Change-Id: I7f8147f4c2c8c138d55558cd5a7d8d976d2e2b82 Reviewed-by: Tor Arne Vestbø (cherry picked from commit ec0228377dd20197d4845df54282afdb0ea4c84a) --- 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 0235b93bd03..ce8949785a3 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -214,7 +214,7 @@ Configurations: ] - Id: 'ios-universal' - Template: 'qtci-macos-13-x86_64-103' + Template: 'qtci-macos-13-arm-107' Target os: 'IOS_ANY' Target arch: 'arm64' Compiler: 'Clang' From de62c92b286167861ce013e7bbd03701102cff4d Mon Sep 17 00:00:00 2001 From: Artem Dyomin Date: Wed, 23 Oct 2024 13:56:54 +0200 Subject: [PATCH 202/288] Replace static FFmpeg build with shared on rhel8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On RHEL8, openssl1.x.x is default, and openssl3 pc files are with the suffix "3", so FFmpeg cannot find them. The patch fixes pc files so that ffmpeg can find them. Task-number: QTBUG-130257 Change-Id: I5a95daae0a78aadede109535b2823483bfcbc09d Reviewed-by: Tim Blechmann Reviewed-by: Pavel Dubsky Reviewed-by: Jøger Hansegård (cherry picked from commit 6cd74e132a08b3660be5c814b32dbf67051b4aee) Reviewed-by: Qt Cherry-pick Bot --- .../common/unix/install-ffmpeg.sh | 48 +++++++++++++++---- .../90-install-ffmpeg.sh | 2 +- .../90-install-ffmpeg.sh | 2 +- 3 files changed, 42 insertions(+), 10 deletions(-) diff --git a/coin/provisioning/common/unix/install-ffmpeg.sh b/coin/provisioning/common/unix/install-ffmpeg.sh index 44198bfcfca..28b68a49568 100755 --- a/coin/provisioning/common/unix/install-ffmpeg.sh +++ b/coin/provisioning/common/unix/install-ffmpeg.sh @@ -5,6 +5,12 @@ # 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" @@ -27,6 +33,9 @@ then fi ffmpeg_config_options=$(cat "${BASH_SOURCE%/*}/../shared/ffmpeg_config_options.txt") +if [ "$build_type" != "static" ]; then + ffmpeg_config_options+=" --enable-shared --disable-static" +fi 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 @@ -46,6 +55,35 @@ install_ff_nvcodec_headers() { 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" @@ -71,15 +109,11 @@ build_ffmpeg() { } if [ "$os" == "linux" ]; then - build_type="$2" - install_ff_nvcodec_headers ffmpeg_config_options+=" --enable-openssl" - - if [ "$build_type" != "static" ]; then - ffmpeg_config_options+=" --enable-shared --disable-static" - fi + fix_openssl3_pc_files + echo "pkg-config openssl version: $(pkg-config --modversion openssl)" build_ffmpeg @@ -94,8 +128,6 @@ if [ "$os" == "linux" ]; then SetEnvVar "FFMPEG_DIR" "/usr/local/$ffmpeg_name" elif [ "$os" == "macos" ] || [ "$os" == "macos-universal" ]; then - ffmpeg_config_options+=" --enable-shared --disable-static" - brew install yasm export MACOSX_DEPLOYMENT_TARGET=12 fix_relative_dependencies="${BASH_SOURCE%/*}/../macos/fix_relative_dependencies.sh" 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 04a3ffe9a6e..2c805227332 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 @@ -3,6 +3,6 @@ #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" "static" +source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux" 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.8-x86_64/90-install-ffmpeg.sh b/coin/provisioning/qtci-linux-RHEL-8.8-x86_64/90-install-ffmpeg.sh index 18d46d7ec08..08d455cf5f2 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 @@ -3,6 +3,6 @@ #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" "static" +source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux" source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-x86_64" source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-x86" From 9b29286325d5acfef2f1c730ac50f102dd108a76 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 29 Oct 2024 19:53:46 +0100 Subject: [PATCH 203/288] coin: Bump ios-universal config macos version to get iOS SDK 17 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTBUG-119490 Change-Id: Icaf2ed63daecbc25dc18dd4a7b7733029a02be19 Reviewed-by: Tor Arne Vestbø (cherry picked from commit b6b6fac86afc65f8406ba764bc1e2c92229bb525) 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 ce8949785a3..26b46858a9a 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -214,7 +214,7 @@ Configurations: ] - Id: 'ios-universal' - Template: 'qtci-macos-13-arm-107' + Template: 'qtci-macos-14-arm-106' Target os: 'IOS_ANY' Target arch: 'arm64' Compiler: 'Clang' From 82c6c4cbdc12803c1cca902489fd48547d192788 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Mon, 28 Oct 2024 15:40:30 +0100 Subject: [PATCH 204/288] QtCreator: Remove unused 'Packaging' feature We don't use any configurations for packaging, the feature doesn't trigger anything. Change-Id: I977566123b491284e029cf1d828c0ce0a36703f2 Reviewed-by: David Schulz (cherry picked from commit c4d897e3809a7060d96d7e3e9f886e1fdd7759ca) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/qt-creator.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/coin/platform_configs/qt-creator.yaml b/coin/platform_configs/qt-creator.yaml index 95a89747579..79311c0eaf5 100644 --- a/coin/platform_configs/qt-creator.yaml +++ b/coin/platform_configs/qt-creator.yaml @@ -4,33 +4,33 @@ Configurations: - Template: 'qtci-windows-10_22H2-x86_64-52' Compiler: 'MSVC2022' - Features: ['Packaging', 'Sccache', 'DebugAndRelease'] + Features: ['Sccache', 'DebugAndRelease'] Configure arguments: '' Environment variables: [] Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64'] - Template: 'qtci-windows-10_22H2-x86_64-52' Compiler: 'MSVC2022' - Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests'] + Features: ['Sccache', 'DebugAndRelease', 'DisableTests'] Configure arguments: '' Environment variables: [] Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64'] - Template: 'qtci-linux-RHEL-8.10-x86_64-51' Compiler: 'GCC' - Features: ['Packaging', 'Sccache', 'DebugAndRelease'] + Features: ['Sccache', 'DebugAndRelease'] Configure arguments: '' Environment variables: [] - Template: 'qtci-linux-Debian-11.6-aarch64-50' Compiler: 'GCC' - Features: ['Packaging', 'Sccache', 'DebugAndRelease'] + Features: ['Sccache', 'DebugAndRelease'] Configure arguments: '' Environment variables: [] - Template: 'qtci-macos-14-arm-106' Compiler: 'Clang' - Features: ['Packaging', 'Sccache', 'DebugAndRelease'] + Features: ['Sccache', 'DebugAndRelease'] Configure arguments: '' Environment variables: [] - From 5a0ebc689be63c04437ec0074e1ee2c31e3b426f Mon Sep 17 00:00:00 2001 From: Jukka Jokiniva Date: Tue, 5 Nov 2024 09:01:58 +0200 Subject: [PATCH 205/288] Temporarily remove Integrity from CI MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit GHS compiler license has expired. Change-Id: I5f495d24b5693c1841cb292d791188e1f3896d93 Reviewed-by: Teemu Holappa Reviewed-by: Toni Saario (cherry picked from commit e30681866020dafeaca02f14c9f8a4d05ea54b8b) Reviewed-by: Simo Fält --- coin/platform_configs/integrity.yaml | 38 ++++++++--------- .../qtsaferenderer-runtime.yaml | 42 +++++++++---------- 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/coin/platform_configs/integrity.yaml b/coin/platform_configs/integrity.yaml index d740656d6b1..b11d2e6484a 100644 --- a/coin/platform_configs/integrity.yaml +++ b/coin/platform_configs/integrity.yaml @@ -1,20 +1,20 @@ Version: 2 -Configurations: - - - Id: "integrity-arm64" - Template: 'qtci-linux-Ubuntu-22.04-x86_64-51' - Compiler: 'GCC' - Target os: 'INTEGRITY' - Platform dependency: 'ubuntu-22.04' - Features: ['MinimalStaticTests', 'DoNotRunTests', 'VMSize16', 'UseConfigure'] - Environment variables: [ - 'TARGET_CONFIGURE_ARGS=-nomake examples -device integrity-armv8-SA8155P -no-feature-library -no-feature-printdialog -no-dbus -no-feature-gtk3 -no-feature-glib -no-feature-libudev -qt-harfbuzz -qt-pcre -no-sql-mysql -no-feature-brotli', - 'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE=/home/qt/integrity_toolchain/toolchain.cmake -DCMAKE_C_COMPILER=cxintarm64 -DCMAKE_CXX_COMPILER=cxintarm64 -DBUILD_qtdoc=OFF -DBUILD_qttranslations=OFF -DUNIX=ON --debug-trycompile', - 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_system_webp=OFF -DQT_FEATURE_timezone=OFF', - 'INTEGRITY_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/integrity', - 'INTEGRITY_BSP=platform-sa8155', 'INTEGRITY_BUILD_TARGET=rel', - 'QC_MULTIMEDIA_INC_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/include/amss/multimedia', - 'GL_INC_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/AMSS/multimedia/graphics/include/public', - 'GL_LIB_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/base:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/multimedia/display:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/multimedia/graphics:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/platform/:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/AMSS/multimedia/graphics/opengl/esx/build/integrity/prebuilt/', - 'PATH=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/comp:$PATH', - ] +Configurations: [] +# - +# Id: "integrity-arm64" +# Template: 'qtci-linux-Ubuntu-22.04-x86_64-51' +# Compiler: 'GCC' +# Target os: 'INTEGRITY' +# Platform dependency: 'ubuntu-22.04' +# Features: ['MinimalStaticTests', 'DoNotRunTests', 'VMSize16', 'UseConfigure'] +# Environment variables: [ +# 'TARGET_CONFIGURE_ARGS=-nomake examples -device integrity-armv8-SA8155P -no-feature-library -no-feature-printdialog -no-dbus -no-feature-gtk3 -no-feature-glib -no-feature-libudev -qt-harfbuzz -qt-pcre -no-sql-mysql -no-feature-brotli', +# 'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE=/home/qt/integrity_toolchain/toolchain.cmake -DCMAKE_C_COMPILER=cxintarm64 -DCMAKE_CXX_COMPILER=cxintarm64 -DBUILD_qtdoc=OFF -DBUILD_qttranslations=OFF -DUNIX=ON --debug-trycompile', +# 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_system_webp=OFF -DQT_FEATURE_timezone=OFF', +# 'INTEGRITY_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/integrity', +# 'INTEGRITY_BSP=platform-sa8155', 'INTEGRITY_BUILD_TARGET=rel', +# 'QC_MULTIMEDIA_INC_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/include/amss/multimedia', +# 'GL_INC_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/AMSS/multimedia/graphics/include/public', +# 'GL_LIB_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/base:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/multimedia/display:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/multimedia/graphics:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/platform/:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/AMSS/multimedia/graphics/opengl/esx/build/integrity/prebuilt/', +# 'PATH=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/comp:$PATH', +# ] diff --git a/coin/platform_configs/qtsaferenderer-runtime.yaml b/coin/platform_configs/qtsaferenderer-runtime.yaml index 74116f8c912..d374c9671b4 100644 --- a/coin/platform_configs/qtsaferenderer-runtime.yaml +++ b/coin/platform_configs/qtsaferenderer-runtime.yaml @@ -24,9 +24,9 @@ Include: [ "qnx-710-arm64-on-linux", "qnx-710-armv7-on-linux" ], - integrity.yaml: [ - "integrity-arm64" - ], +# integrity.yaml: [ +# "integrity-arm64" +# ], cmake_platforms_qemu.yaml: [ "qemu-arm64-developer-build", "qemu-armv7-developer-build", @@ -64,22 +64,22 @@ Configurations: 'TARGET_CONFIGURE_ARGS=-release -no-dbus -nomake examples -qtlibinfix TestInfix', 'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-aarch64le.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', ] -- - Id: "Axivion-integrity-arm64" - Template: 'qtci-linux-Ubuntu-22.04-x86_64-51' - Compiler: 'GCC' - Target os: 'INTEGRITY' - Platform dependency: 'ubuntu-22.04' - Features: ['UseConfigure', 'DoNotRunTests', 'DisableTests', 'Axivion_QSR', 'VMSize16'] - Environment variables: [ - 'TARGET_CONFIGURE_ARGS=-nomake examples -device integrity-armv8-SA8155P -no-feature-library -no-feature-printdialog -no-dbus -no-feature-gtk3 -no-feature-glib -no-feature-libudev -qt-harfbuzz -qt-pcre -no-sql-mysql -no-feature-brotli', - 'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE=/home/qt/integrity_toolchain/toolchain.cmake -DCMAKE_C_COMPILER=cxintarm64 -DCMAKE_CXX_COMPILER=cxintarm64 -DBUILD_qtdoc=OFF -DBUILD_qttranslations=OFF -DUNIX=ON --debug-trycompile', - 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_system_webp=OFF -DQT_FEATURE_timezone=OFF', - 'INTEGRITY_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/integrity', - 'INTEGRITY_BSP=platform-sa8155', 'INTEGRITY_BUILD_TARGET=rel', - 'QC_MULTIMEDIA_INC_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/include/amss/multimedia', - 'GL_INC_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/AMSS/multimedia/graphics/include/public', - 'GL_LIB_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/base:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/multimedia/display:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/multimedia/graphics:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/platform/:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/AMSS/multimedia/graphics/opengl/esx/build/integrity/prebuilt/', - 'PATH=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/comp:$PATH', - ] +#- +# Id: "Axivion-integrity-arm64" +# Template: 'qtci-linux-Ubuntu-22.04-x86_64-51' +# Compiler: 'GCC' +# Target os: 'INTEGRITY' +# Platform dependency: 'ubuntu-22.04' +# Features: ['UseConfigure', 'DoNotRunTests', 'DisableTests', 'Axivion_QSR', 'VMSize16'] +# Environment variables: [ +# 'TARGET_CONFIGURE_ARGS=-nomake examples -device integrity-armv8-SA8155P -no-feature-library -no-feature-printdialog -no-dbus -no-feature-gtk3 -no-feature-glib -no-feature-libudev -qt-harfbuzz -qt-pcre -no-sql-mysql -no-feature-brotli', +# 'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE=/home/qt/integrity_toolchain/toolchain.cmake -DCMAKE_C_COMPILER=cxintarm64 -DCMAKE_CXX_COMPILER=cxintarm64 -DBUILD_qtdoc=OFF -DBUILD_qttranslations=OFF -DUNIX=ON --debug-trycompile', +# 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_system_webp=OFF -DQT_FEATURE_timezone=OFF', +# 'INTEGRITY_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/integrity', +# 'INTEGRITY_BSP=platform-sa8155', 'INTEGRITY_BUILD_TARGET=rel', +# 'QC_MULTIMEDIA_INC_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/include/amss/multimedia', +# 'GL_INC_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/AMSS/multimedia/graphics/include/public', +# 'GL_LIB_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/base:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/multimedia/display:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/multimedia/graphics:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/platform/:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/AMSS/multimedia/graphics/opengl/esx/build/integrity/prebuilt/', +# 'PATH=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/comp:$PATH', +# ] From 5c3284464fc223d37d776b7ed55819138ad7db02 Mon Sep 17 00:00:00 2001 From: Jukka Jokiniva Date: Tue, 5 Nov 2024 10:02:23 +0000 Subject: [PATCH 206/288] Revert "Temporarily remove Integrity from CI" This reverts commit 5a0ebc689be63c04437ec0074e1ee2c31e3b426f. Reason for revert: GHS compiler license renewed. Change-Id: Ic53576cc7eca91fe2cf3b4c426505954053b270b Reviewed-by: Kimmo Ollila Reviewed-by: Jukka Jokiniva --- coin/platform_configs/integrity.yaml | 38 ++++++++--------- .../qtsaferenderer-runtime.yaml | 42 +++++++++---------- 2 files changed, 40 insertions(+), 40 deletions(-) diff --git a/coin/platform_configs/integrity.yaml b/coin/platform_configs/integrity.yaml index b11d2e6484a..d740656d6b1 100644 --- a/coin/platform_configs/integrity.yaml +++ b/coin/platform_configs/integrity.yaml @@ -1,20 +1,20 @@ Version: 2 -Configurations: [] -# - -# Id: "integrity-arm64" -# Template: 'qtci-linux-Ubuntu-22.04-x86_64-51' -# Compiler: 'GCC' -# Target os: 'INTEGRITY' -# Platform dependency: 'ubuntu-22.04' -# Features: ['MinimalStaticTests', 'DoNotRunTests', 'VMSize16', 'UseConfigure'] -# Environment variables: [ -# 'TARGET_CONFIGURE_ARGS=-nomake examples -device integrity-armv8-SA8155P -no-feature-library -no-feature-printdialog -no-dbus -no-feature-gtk3 -no-feature-glib -no-feature-libudev -qt-harfbuzz -qt-pcre -no-sql-mysql -no-feature-brotli', -# 'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE=/home/qt/integrity_toolchain/toolchain.cmake -DCMAKE_C_COMPILER=cxintarm64 -DCMAKE_CXX_COMPILER=cxintarm64 -DBUILD_qtdoc=OFF -DBUILD_qttranslations=OFF -DUNIX=ON --debug-trycompile', -# 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_system_webp=OFF -DQT_FEATURE_timezone=OFF', -# 'INTEGRITY_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/integrity', -# 'INTEGRITY_BSP=platform-sa8155', 'INTEGRITY_BUILD_TARGET=rel', -# 'QC_MULTIMEDIA_INC_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/include/amss/multimedia', -# 'GL_INC_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/AMSS/multimedia/graphics/include/public', -# 'GL_LIB_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/base:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/multimedia/display:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/multimedia/graphics:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/platform/:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/AMSS/multimedia/graphics/opengl/esx/build/integrity/prebuilt/', -# 'PATH=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/comp:$PATH', -# ] +Configurations: + - + Id: "integrity-arm64" + Template: 'qtci-linux-Ubuntu-22.04-x86_64-51' + Compiler: 'GCC' + Target os: 'INTEGRITY' + Platform dependency: 'ubuntu-22.04' + Features: ['MinimalStaticTests', 'DoNotRunTests', 'VMSize16', 'UseConfigure'] + Environment variables: [ + 'TARGET_CONFIGURE_ARGS=-nomake examples -device integrity-armv8-SA8155P -no-feature-library -no-feature-printdialog -no-dbus -no-feature-gtk3 -no-feature-glib -no-feature-libudev -qt-harfbuzz -qt-pcre -no-sql-mysql -no-feature-brotli', + 'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE=/home/qt/integrity_toolchain/toolchain.cmake -DCMAKE_C_COMPILER=cxintarm64 -DCMAKE_CXX_COMPILER=cxintarm64 -DBUILD_qtdoc=OFF -DBUILD_qttranslations=OFF -DUNIX=ON --debug-trycompile', + 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_system_webp=OFF -DQT_FEATURE_timezone=OFF', + 'INTEGRITY_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/integrity', + 'INTEGRITY_BSP=platform-sa8155', 'INTEGRITY_BUILD_TARGET=rel', + 'QC_MULTIMEDIA_INC_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/include/amss/multimedia', + 'GL_INC_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/AMSS/multimedia/graphics/include/public', + 'GL_LIB_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/base:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/multimedia/display:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/multimedia/graphics:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/platform/:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/AMSS/multimedia/graphics/opengl/esx/build/integrity/prebuilt/', + 'PATH=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/comp:$PATH', + ] diff --git a/coin/platform_configs/qtsaferenderer-runtime.yaml b/coin/platform_configs/qtsaferenderer-runtime.yaml index d374c9671b4..74116f8c912 100644 --- a/coin/platform_configs/qtsaferenderer-runtime.yaml +++ b/coin/platform_configs/qtsaferenderer-runtime.yaml @@ -24,9 +24,9 @@ Include: [ "qnx-710-arm64-on-linux", "qnx-710-armv7-on-linux" ], -# integrity.yaml: [ -# "integrity-arm64" -# ], + integrity.yaml: [ + "integrity-arm64" + ], cmake_platforms_qemu.yaml: [ "qemu-arm64-developer-build", "qemu-armv7-developer-build", @@ -64,22 +64,22 @@ Configurations: 'TARGET_CONFIGURE_ARGS=-release -no-dbus -nomake examples -qtlibinfix TestInfix', 'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-aarch64le.cmake -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', ] -#- -# Id: "Axivion-integrity-arm64" -# Template: 'qtci-linux-Ubuntu-22.04-x86_64-51' -# Compiler: 'GCC' -# Target os: 'INTEGRITY' -# Platform dependency: 'ubuntu-22.04' -# Features: ['UseConfigure', 'DoNotRunTests', 'DisableTests', 'Axivion_QSR', 'VMSize16'] -# Environment variables: [ -# 'TARGET_CONFIGURE_ARGS=-nomake examples -device integrity-armv8-SA8155P -no-feature-library -no-feature-printdialog -no-dbus -no-feature-gtk3 -no-feature-glib -no-feature-libudev -qt-harfbuzz -qt-pcre -no-sql-mysql -no-feature-brotli', -# 'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE=/home/qt/integrity_toolchain/toolchain.cmake -DCMAKE_C_COMPILER=cxintarm64 -DCMAKE_CXX_COMPILER=cxintarm64 -DBUILD_qtdoc=OFF -DBUILD_qttranslations=OFF -DUNIX=ON --debug-trycompile', -# 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_system_webp=OFF -DQT_FEATURE_timezone=OFF', -# 'INTEGRITY_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/integrity', -# 'INTEGRITY_BSP=platform-sa8155', 'INTEGRITY_BUILD_TARGET=rel', -# 'QC_MULTIMEDIA_INC_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/include/amss/multimedia', -# 'GL_INC_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/AMSS/multimedia/graphics/include/public', -# 'GL_LIB_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/base:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/multimedia/display:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/multimedia/graphics:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/platform/:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/AMSS/multimedia/graphics/opengl/esx/build/integrity/prebuilt/', -# 'PATH=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/comp:$PATH', -# ] +- + Id: "Axivion-integrity-arm64" + Template: 'qtci-linux-Ubuntu-22.04-x86_64-51' + Compiler: 'GCC' + Target os: 'INTEGRITY' + Platform dependency: 'ubuntu-22.04' + Features: ['UseConfigure', 'DoNotRunTests', 'DisableTests', 'Axivion_QSR', 'VMSize16'] + Environment variables: [ + 'TARGET_CONFIGURE_ARGS=-nomake examples -device integrity-armv8-SA8155P -no-feature-library -no-feature-printdialog -no-dbus -no-feature-gtk3 -no-feature-glib -no-feature-libudev -qt-harfbuzz -qt-pcre -no-sql-mysql -no-feature-brotli', + 'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE=/home/qt/integrity_toolchain/toolchain.cmake -DCMAKE_C_COMPILER=cxintarm64 -DCMAKE_CXX_COMPILER=cxintarm64 -DBUILD_qtdoc=OFF -DBUILD_qttranslations=OFF -DUNIX=ON --debug-trycompile', + 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_system_webp=OFF -DQT_FEATURE_timezone=OFF', + 'INTEGRITY_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/integrity', + 'INTEGRITY_BSP=platform-sa8155', 'INTEGRITY_BUILD_TARGET=rel', + 'QC_MULTIMEDIA_INC_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/include/amss/multimedia', + 'GL_INC_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/AMSS/multimedia/graphics/include/public', + 'GL_LIB_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/base:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/multimedia/display:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/multimedia/graphics:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/platform/:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/AMSS/multimedia/graphics/opengl/esx/build/integrity/prebuilt/', + 'PATH=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/comp:$PATH', + ] From 2ce2817b8dd9c31fef3c5c61b7178605b5f92efb Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Mon, 24 Jun 2024 15:25:26 +0200 Subject: [PATCH 207/288] Fix the '-submodules' argument to 'BUILD_' argument transformation Ensure the coma-separated argument is transformed to CMake list properly. Amends 7c8bab37bb792086f38d704f37bc8b712311d0f7 Task-number: QTBUG-122954 Fixes: QTBUG-130883 Change-Id: I082ad2c9c964c66feee3a8deff55ae137adafe8b Reviewed-by: Alexandru Croitor (cherry picked from commit 9b5e0b581f53fba1bcfd7dcdfcda423efb67eb0c) Reviewed-by: Joerg Bornemann --- cmake/QtIRHelpers.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/QtIRHelpers.cmake b/cmake/QtIRHelpers.cmake index 8e2af7f88c7..678848f6cbf 100644 --- a/cmake/QtIRHelpers.cmake +++ b/cmake/QtIRHelpers.cmake @@ -117,7 +117,7 @@ function(qt_ir_get_args_from_optfile_configure_filtered optfile_path out_var) if(submodules) qt_ir_get_top_level_submodules(include_submodules exclude_submodules) if(NOT include_submodules AND arg_ALREADY_INITIALIZED) - set(include_submodules "${submodules}") + string(REPLACE "," ";" include_submodules "${submodules}") endif() # qtrepotools is always implicitly cloned, but it doesn't actually From 96c8820cf8b4f5234f37b1d7762362eb97f3dad1 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Mon, 28 Oct 2024 15:44:44 +0100 Subject: [PATCH 208/288] QtCreator: Add configurations for oldest supported Qt version Change-Id: I2a69d05a157524238ed9ac7e32b84c56e2750a9d Reviewed-by: David Schulz (cherry picked from commit f531da9cbb5aab622ea1fc8c4ca15eb12774f5d9) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/qt-creator.yaml | 34 ++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/coin/platform_configs/qt-creator.yaml b/coin/platform_configs/qt-creator.yaml index 79311c0eaf5..c30819a54f3 100644 --- a/coin/platform_configs/qt-creator.yaml +++ b/coin/platform_configs/qt-creator.yaml @@ -8,6 +8,25 @@ Configurations: Configure arguments: '' Environment variables: [] Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64'] +- + Template: 'qtci-linux-RHEL-8.10-x86_64-51' + Compiler: 'GCC' + Features: ['Sccache', 'DebugAndRelease'] + Configure arguments: '' + Environment variables: [] +- + Template: 'qtci-linux-Debian-11.6-aarch64-50' + Compiler: 'GCC' + Features: ['Sccache', 'DebugAndRelease'] + Configure arguments: '' + Environment variables: [] +- + Template: 'qtci-macos-14-arm-106' + Compiler: 'Clang' + Features: ['Sccache', 'DebugAndRelease'] + Configure arguments: '' + Environment variables: [] +# without tests - Template: 'qtci-windows-10_22H2-x86_64-52' Compiler: 'MSVC2022' @@ -15,24 +34,27 @@ Configurations: Configure arguments: '' Environment variables: [] Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64'] +# oldest Qt version - - Template: 'qtci-linux-RHEL-8.10-x86_64-51' - Compiler: 'GCC' - Features: ['Sccache', 'DebugAndRelease'] + Template: 'qtci-windows-10_22H2-x86_64-52' + Compiler: 'MSVC2022' + Features: ['Sccache', 'DebugAndRelease', 'OldestQt'] Configure arguments: '' Environment variables: [] + Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64'] - - Template: 'qtci-linux-Debian-11.6-aarch64-50' + Template: 'qtci-linux-RHEL-8.10-x86_64-51' Compiler: 'GCC' - Features: ['Sccache', 'DebugAndRelease'] + Features: ['Sccache', 'DebugAndRelease', 'OldestQt'] Configure arguments: '' Environment variables: [] - Template: 'qtci-macos-14-arm-106' Compiler: 'Clang' - Features: ['Sccache', 'DebugAndRelease'] + Features: ['Sccache', 'DebugAndRelease', 'OldestQt'] Configure arguments: '' Environment variables: [] +# license check - Template: 'qtci-linux-Ubuntu-22.04-x86_64-51' Compiler: 'GCC' From d7c80e60f7b15de0ffd532380b3bd8e17b6cac6a Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 7 Nov 2024 00:11:52 +0000 Subject: [PATCH 209/288] Update submodules on '6.8 in qt/qt5' Change-Id: Ie47093cc87a224e3ca57405c37d003923bcf8b38 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 fc53bf55a1a..df973634f49 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit fc53bf55a1a346ab63a4f42cbc3c943a2c66cd06 +Subproject commit df973634f4969dc26113aae941090a499876687e diff --git a/qt5compat b/qt5compat index 371d7b5b803..b55224f4677 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 371d7b5b8038f60d6529bc08a71ee290974a5995 +Subproject commit b55224f4677fe494085ca820ff5ab51df6a09298 diff --git a/qtactiveqt b/qtactiveqt index b48d8b574ce..1c3da4064ec 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit b48d8b574ce4eeb50a964489b5a5dc0dd2ab459d +Subproject commit 1c3da4064ec463ddfcf97056b14b1a608817fd3e diff --git a/qtbase b/qtbase index 53835c957bc..075b3f16e2c 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 53835c957bcc4e6a4ffd13a3870e262048eef615 +Subproject commit 075b3f16e2cfcdf331416b3f1fc5024a80db5f45 diff --git a/qtcharts b/qtcharts index b3a774f7652..7f6ea759c40 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit b3a774f76525f7629617aff60b823585f5a559f3 +Subproject commit 7f6ea759c401f0817347b2c74c2f53c3c58e307e diff --git a/qtcoap b/qtcoap index 5c69f4b4ca6..3701d622db1 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit 5c69f4b4ca638c5ac2a518b7c7b2be557e718110 +Subproject commit 3701d622db189e89c13e4b34bda269b414211b68 diff --git a/qtconnectivity b/qtconnectivity index a88c30f84b8..0e7a6ab3b48 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit a88c30f84b85e03f5b263ee7ad6965398dfaf291 +Subproject commit 0e7a6ab3b48b5d53a89631f07eb0d6571523b76a diff --git a/qtdatavis3d b/qtdatavis3d index d76671ab1a7..6c69db8baf0 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit d76671ab1a71de6e13098eacedd286ff0d49bda8 +Subproject commit 6c69db8baf0b5f0b1627672e4c2c0b3685e5809f diff --git a/qtdeclarative b/qtdeclarative index 556e4646066..9fb945184d6 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 556e46460661f1f16baed4151289ef7c3ba7ba5c +Subproject commit 9fb945184d6ef220fcdef4bc4a7b08df020a2bdd diff --git a/qtdoc b/qtdoc index 9dd5f3ee9d7..b476afa8bb6 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 9dd5f3ee9d7dfb984ea7a05ad1172234f648e9fd +Subproject commit b476afa8bb6d830843160525a198d5157e98689f diff --git a/qtgraphs b/qtgraphs index 0bf7d20d20b..4674dfebc2d 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit 0bf7d20d20b8357a90e466f769e9e5a8442250b1 +Subproject commit 4674dfebc2d4563e584e0653241717f87d4a91a3 diff --git a/qtgrpc b/qtgrpc index 6177e1606ed..eb25aeb6833 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit 6177e1606ed2aa4375b5dc9c8158bde5afe1727a +Subproject commit eb25aeb683330ba55287f2a1b0ddcb93b0752bba diff --git a/qthttpserver b/qthttpserver index fffd5b15f5a..6770dc12fa9 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit fffd5b15f5a2987074af4025fe34e0bcd99bd7b9 +Subproject commit 6770dc12fa937abf71f19668a63fa88b2d5ec443 diff --git a/qtimageformats b/qtimageformats index 925614ddafd..fae9148f7c2 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 925614ddafdf97517db83d0153c5268202f89beb +Subproject commit fae9148f7c283f85aa320d8421f2814850eb2fed diff --git a/qtlanguageserver b/qtlanguageserver index 502db071fa5..ee9cb3b8d77 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit 502db071fa518e4895c37bd5107d66139f0edcc9 +Subproject commit ee9cb3b8d770c7bbc9e43087c9b711e41e55d4b7 diff --git a/qtlocation b/qtlocation index f789950899e..7eb25522bff 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit f789950899e6d2148d6a198093f83f9d5558c6af +Subproject commit 7eb25522bffe2606ecc42b36e88fee07e3bfe1b8 diff --git a/qtlottie b/qtlottie index b4a1b5c28a2..0881b5427a5 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit b4a1b5c28a22c2fd739b641116274a417497abc4 +Subproject commit 0881b5427a53a0f7a4572d1d380d25600f9998ac diff --git a/qtmqtt b/qtmqtt index 0da8622224e..04d3a0fbc66 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit 0da8622224ee5dd249e5131920635c89b571a0be +Subproject commit 04d3a0fbc6620cadb11000865101d0ff11dc8550 diff --git a/qtmultimedia b/qtmultimedia index ea3a298be73..3052df8d980 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit ea3a298be737f8cb759d05ba85d36894f7de9529 +Subproject commit 3052df8d980b4a81a4b2c568b7f26150bac03f17 diff --git a/qtnetworkauth b/qtnetworkauth index ce305d937bd..4e4fadca4d9 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit ce305d937bd23715b88defbdb423ece8fc37115e +Subproject commit 4e4fadca4d998d08b3bb9d2925998e742a337add diff --git a/qtopcua b/qtopcua index 98bd26a764b..2b1a908eb66 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit 98bd26a764beece7d2e9e2625570eb8eafb805b9 +Subproject commit 2b1a908eb664efaf5551cdf829e5d2b18644a018 diff --git a/qtpositioning b/qtpositioning index 7127083cd62..75f7c7b108e 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit 7127083cd623a8fc4ddd5958b20a3ab066642b8e +Subproject commit 75f7c7b108e5aa143afbe733a810c8b552c77d8b diff --git a/qtquick3d b/qtquick3d index ea1dce81aac..e4cd83fc7f0 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit ea1dce81aac166c53f18117d1ac5b4ac5ff3ca73 +Subproject commit e4cd83fc7f07088be27a676e7be1ac695df61e3e diff --git a/qtquick3dphysics b/qtquick3dphysics index 7a12ae37134..bb3e4601bfd 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit 7a12ae371344b4b882a67093dd680dcab42b6831 +Subproject commit bb3e4601bfdcf0d51a1ec70ddc50de6e3021c665 diff --git a/qtquickeffectmaker b/qtquickeffectmaker index 0521e923bb6..1e1fadfe1da 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit 0521e923bb659f3e8ae590f54a21339a3e75ad8d +Subproject commit 1e1fadfe1da21882b2cc301f06e3c9f9fc2c656b diff --git a/qtquicktimeline b/qtquicktimeline index ae6ead910ac..83cd2b0f3d7 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit ae6ead910ac1ba1f2a8a0dde767fdad586411516 +Subproject commit 83cd2b0f3d76e23970080658c76b316aee6cfb3e diff --git a/qtremoteobjects b/qtremoteobjects index 926a28a3e61..1a49931e4f1 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 926a28a3e617ffd95c7e666d69e35c165e5924c1 +Subproject commit 1a49931e4f1ceb8a1735b6ed9d4a727db24500c5 diff --git a/qtscxml b/qtscxml index dc4ca540bf1..54b62a5daf9 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit dc4ca540bf1be3f2a6a33bcecafde7434fd8ba77 +Subproject commit 54b62a5daf94fafca14381f9d0d41d1721c7c977 diff --git a/qtsensors b/qtsensors index fde48c6a7d7..8033b076c3a 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit fde48c6a7d7c2269e543e9b8880e4220c8553bd3 +Subproject commit 8033b076c3aadac400219a0b85ce5f9c8f30f672 diff --git a/qtserialbus b/qtserialbus index 0b266adb02f..a081414691c 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 0b266adb02f529d5e0d3ccd74aa092a2224ebb7b +Subproject commit a081414691c58a2355dfbe296d4c216683eeea53 diff --git a/qtserialport b/qtserialport index 9c4776d053e..a4bb9d234d2 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 9c4776d053e90963b70e661fe7cdfd24076c0662 +Subproject commit a4bb9d234d296d9d6167480071e862d6726b9a7b diff --git a/qtshadertools b/qtshadertools index 53d2c892910..c1b249b304e 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 53d2c892910d427a1968e1d7758232d9ab764e1b +Subproject commit c1b249b304ef0ccdbcc58ad6a1a8fe0d00fc074e diff --git a/qtspeech b/qtspeech index 97c83f01e7c..72a8fe89db5 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 97c83f01e7cb3c033a1853b0d1a882fa8880f566 +Subproject commit 72a8fe89db582910e3193505126a331de105571b diff --git a/qtsvg b/qtsvg index ce0a7ec5a7a..3a2dc47989b 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit ce0a7ec5a7a6dfc6c7bd440f924c235e7d7605d5 +Subproject commit 3a2dc47989b3882facb60c353de1f5c3d2491dc8 diff --git a/qttools b/qttools index 342a6332e32..1d446b0b09c 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 342a6332e320f32ac5cc26afd208467a456c0ed7 +Subproject commit 1d446b0b09cb8cde96c3642391d199850a09aa7a diff --git a/qttranslations b/qttranslations index 58d5fe6ccb5..9d431d9ee0d 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 58d5fe6ccb5fc000ff535584e32922e8ab0da21d +Subproject commit 9d431d9ee0d7aa640fd2fe4ea67e16c6dbdb8039 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index c5d06692fd8..477323e0a57 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit c5d06692fd8e2346596b6aec40382c8a28542eaa +Subproject commit 477323e0a572ee4a452f5911bece84b31c0bc3e1 diff --git a/qtwayland b/qtwayland index 400a5367f4e..94bc0966c26 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 400a5367f4ed3d3d9c1c297c694418d00c7bd8f0 +Subproject commit 94bc0966c26487a20cd388bc90e459bb35f92d69 diff --git a/qtwebchannel b/qtwebchannel index 615bc04acdf..30dacf6896e 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 615bc04acdfa1cf56fb25468c4fd19fff884928b +Subproject commit 30dacf6896eb0488bf203b72510d2bd69cb772fe diff --git a/qtwebengine b/qtwebengine index 9685f5e408c..629da6d9ca1 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 9685f5e408cfb29c9b758bcde6b3507b29409365 +Subproject commit 629da6d9ca1acb8e9e5dc78bcb6e531ac1533aa5 diff --git a/qtwebsockets b/qtwebsockets index 4056941ed4c..2df02a0ba19 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 4056941ed4cc0ead24a85955b7474770315b579b +Subproject commit 2df02a0ba1959d17b76a53a78c0261b32cccaab7 diff --git a/qtwebview b/qtwebview index a746dc5f15c..fa5ea6105a5 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit a746dc5f15c1bf3f4327c2f900df5ea236d7b5df +Subproject commit fa5ea6105a53b947d4b9ea019dbe9b05467080cc From 4ae967a5f91d344c5ff3e732d3cbffce13da1f7a Mon Sep 17 00:00:00 2001 From: Elias Toivola Date: Wed, 2 Oct 2024 15:17:46 +0300 Subject: [PATCH 210/288] Add Red Hat 9.4 with non-blocking tests in CI RHEL-9.4 will be run in parallel with RHEL-9.2 with insignificant tests until RHEL-9.4 is confirmed stable, then it will replace RHEL-9.2. [CI Platforms] Adapted for 6.8: * remove install-firebird.sh, which is only in dev * remove 90-install-oracle.sh, which is only in dev Task-number: QTQAINFRA-6362 Change-Id: I92c10a15346e7bd0c0190a8d6a6513cf6143d2a8 (cherry picked from commit ee8ee93d91c7c5600a87ce0abac35efe3aa10575) Reviewed-by: Tim Blechmann --- coin/platform_configs/cmake_platforms.yaml | 10 + coin/platform_configs/qmake2cmake.yaml | 4 + .../qtbase-new-compiler-testing.yaml | 11 + .../01-disable-automounting.sh | 13 ++ .../README_MANUAL_INSTALLATIONS | 54 +++++ .../01-disable_net_lso.sh | 3 + .../01-install_telegraf.sh | 3 + .../01-refresh-subscription-manager.sh | 18 ++ .../01-remove_network_manager_secret_key.sh | 11 + .../01-set-ulimit.sh | 8 + .../01-systemsetup.sh | 31 +++ .../02-install-xcb_util_cursor.sh | 10 + .../03-enable-repos.sh | 34 +++ .../04-install-packages.sh | 204 ++++++++++++++++++ .../qtci-linux-RHEL-9.4-x86_64/04-p7zip.sh | 15 ++ .../05-install-ninja.sh | 8 + .../05-install-patchelf.sh | 5 + .../05-libclang-v100-dyn.sh | 8 + .../qtci-linux-RHEL-9.4-x86_64/05-libclang.sh | 8 + .../05-mount-vcpkg-cache-drive.sh | 8 + .../09-disable_selinux.sh | 8 + .../qtci-linux-RHEL-9.4-x86_64/20-sccache.sh | 3 + .../22-mqtt_broker.sh | 6 + .../qtci-linux-RHEL-9.4-x86_64/30-fbx.sh | 8 + .../30-install-conan.sh | 8 + .../30-install-git.sh | 8 + .../30-install_icu.sh | 45 ++++ .../35-install-breakpad.sh | 8 + .../40-android_linux.sh | 8 + .../40-install-cmake.sh | 12 ++ .../41-install-golang.sh | 7 + .../41-install-upx.sh | 7 + .../41-install-vcpkg.sh | 6 + .../42-install-vcpkg-ports.sh | 6 + .../50-openssl_for_android_linux.sh | 7 + .../60-install_protobuf.sh | 9 + .../61-install_grpc.sh | 9 + .../70-install_QemuGA.sh | 10 + .../70-install_dwz.sh | 11 + .../90-bootstrap-autostart.sh | 3 + .../90-install-ffmpeg.sh | 3 + .../qtci-linux-RHEL-9.4-x86_64/90-mimer.sh | 8 + .../qtci-linux-RHEL-9.4-x86_64/90-squish.sh | 6 + .../qtci-linux-RHEL-9.4-x86_64/99-cleanup.sh | 7 + .../99-enable_test_stacktraces.sh | 8 + .../qtci-linux-RHEL-9.4-x86_64/99-version.sh | 17 ++ 46 files changed, 704 insertions(+) create mode 100644 coin/pre-provisioning/qtci-linux-RHEL-9.4-x86_64/01-disable-automounting.sh create mode 100644 coin/pre-provisioning/qtci-linux-RHEL-9.4-x86_64/README_MANUAL_INSTALLATIONS create mode 100644 coin/provisioning/qtci-linux-RHEL-9.4-x86_64/01-disable_net_lso.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-9.4-x86_64/01-install_telegraf.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-9.4-x86_64/01-refresh-subscription-manager.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-9.4-x86_64/01-remove_network_manager_secret_key.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-9.4-x86_64/01-set-ulimit.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-9.4-x86_64/01-systemsetup.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-9.4-x86_64/02-install-xcb_util_cursor.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-9.4-x86_64/03-enable-repos.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-9.4-x86_64/04-install-packages.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-9.4-x86_64/04-p7zip.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-9.4-x86_64/05-install-ninja.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-9.4-x86_64/05-install-patchelf.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-9.4-x86_64/05-libclang-v100-dyn.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-9.4-x86_64/05-libclang.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-9.4-x86_64/05-mount-vcpkg-cache-drive.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-9.4-x86_64/09-disable_selinux.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-9.4-x86_64/20-sccache.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-9.4-x86_64/22-mqtt_broker.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-9.4-x86_64/30-fbx.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-9.4-x86_64/30-install-conan.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-9.4-x86_64/30-install-git.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-9.4-x86_64/30-install_icu.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-9.4-x86_64/35-install-breakpad.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-9.4-x86_64/40-android_linux.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-9.4-x86_64/40-install-cmake.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-9.4-x86_64/41-install-golang.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-9.4-x86_64/41-install-upx.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-9.4-x86_64/41-install-vcpkg.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-9.4-x86_64/42-install-vcpkg-ports.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-9.4-x86_64/50-openssl_for_android_linux.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-9.4-x86_64/60-install_protobuf.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-9.4-x86_64/61-install_grpc.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-9.4-x86_64/70-install_QemuGA.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-9.4-x86_64/70-install_dwz.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-9.4-x86_64/90-bootstrap-autostart.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-9.4-x86_64/90-install-ffmpeg.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-9.4-x86_64/90-mimer.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-9.4-x86_64/90-squish.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-9.4-x86_64/99-cleanup.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-9.4-x86_64/99-enable_test_stacktraces.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-9.4-x86_64/99-version.sh diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 26b46858a9a..b0571910941 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -212,6 +212,16 @@ Configurations: 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON' ] +- + Id: 'rhel-9.4' + Template: 'qtci-linux-RHEL-9.4-x86_64-50' + Compiler: 'GCC' + Features: ['Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'GenerateSBOM', 'VerifySBOM', 'InsignificantTests'] + 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', + 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON' + ] - Id: 'ios-universal' Template: 'qtci-macos-14-arm-106' diff --git a/coin/platform_configs/qmake2cmake.yaml b/coin/platform_configs/qmake2cmake.yaml index ac1190633a5..82674ec9171 100644 --- a/coin/platform_configs/qmake2cmake.yaml +++ b/coin/platform_configs/qmake2cmake.yaml @@ -13,6 +13,10 @@ Configurations: Template: 'qtci-linux-RHEL-9.2-x86_64-51' Compiler: 'GCC' Features: ['DisableTests'] +- + Template: 'qtci-linux-RHEL-9.4-x86_64-50' + Compiler: 'GCC' + Features: ['DisableTests'] - Template: 'qtci-linux-Ubuntu-22.04-x86_64-51' Compiler: 'GCC' diff --git a/coin/platform_configs/qtbase-new-compiler-testing.yaml b/coin/platform_configs/qtbase-new-compiler-testing.yaml index 19361ff94f6..808fa526959 100644 --- a/coin/platform_configs/qtbase-new-compiler-testing.yaml +++ b/coin/platform_configs/qtbase-new-compiler-testing.yaml @@ -12,3 +12,14 @@ Configurations: 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DINPUT_headersclean=ON' ] +- + Id: 'rhel-9.4-gcc12' + Template: 'qtci-linux-RHEL-9.4-x86_64-50' + Compiler: 'GCC' + Features: ['Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'DoNotRunTests', 'InsignificantTests'] + Configure arguments: '-developer-build -nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-pcre -no-libudev -bundled-xcb-xinput' + Environment variables: [ + 'PATH=/opt/rh/gcc-toolset-12/root/usr/bin/:{{.Env.PATH}}', + 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', + 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DINPUT_headersclean=ON' + ] diff --git a/coin/pre-provisioning/qtci-linux-RHEL-9.4-x86_64/01-disable-automounting.sh b/coin/pre-provisioning/qtci-linux-RHEL-9.4-x86_64/01-disable-automounting.sh new file mode 100644 index 00000000000..a99e64a78c7 --- /dev/null +++ b/coin/pre-provisioning/qtci-linux-RHEL-9.4-x86_64/01-disable-automounting.sh @@ -0,0 +1,13 @@ +#!/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 + +sudo tee -a /etc/dconf/db/local.d/00-media-automount <<"EOF" +[org/gnome/desktop/media-handling] +automount=false +automount-open=false +EOF + +sudo dconf update diff --git a/coin/pre-provisioning/qtci-linux-RHEL-9.4-x86_64/README_MANUAL_INSTALLATIONS b/coin/pre-provisioning/qtci-linux-RHEL-9.4-x86_64/README_MANUAL_INSTALLATIONS new file mode 100644 index 00000000000..71eff051d2d --- /dev/null +++ b/coin/pre-provisioning/qtci-linux-RHEL-9.4-x86_64/README_MANUAL_INSTALLATIONS @@ -0,0 +1,54 @@ +### RHEL 9.4 ### +Hard Disk: 500G +Network: CI +Video Card: Total Video Memory: 64MB +Boot options/Firmware: BIOS +Language: English (United States) +Keyboard: English (US), Norwegian (Windows), Finnish (Windows) +Time & Date: Etc/Coordinated Universal Time +Software Selection: Server with GUI +Installation Destination: Automatic partitioning selected +Root Passowrd: Set +Network & Host..: Connected +KDUMP enabled: Memory Reservation: automatic +Begin Installation +Reboot +# Configure Settings + Notifications: + * Lock Screen Notifications: OFF + * Applications: Set notification off + * Do Not Disturb: on + Applications: + * Disable notifications from all applications + Privacy: + * Blank Screen Delay: Never + * Screen Lock: OFF + Power: + * Blank screen: Never + Displays: + * Resolution: 1280 x 800 + Users: + * Automatic login on +# Add user to sudoers +Add 'qt ALL=NOPASSWD: ALL' to /etc/sudoers.d/qt +Add 'GRUB_GFXMODE=1280x800' to /etc/default/grub +sudo grub2-mkconfig -o /etc/grub2.cfg +sudo grub2-mkconfig -o /boot/grub2/grub.cfg +# Add support for virtio driver +su +echo "add_drivers+=\" virtio-blk \"" >> /etc/dracut.conf.d/virtio.conf +dracut -f +# Do these from Opennebula UI! + +# Enable network connection from right upper corner +This is done when the VM is launched as persistent in OpenNebula. +# Fetch and run coin-setup +Download http://coin/coin/binary/linux_amd64/coin-setup +# run as qt user +run './coin-setup' +# Switch to use GNOME Classic user interface +# GNOME Classic was selected because there's an issue with Starndard (wayland display server). Autotest start failing because terminal session remains in Activities Overview. +# https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/3854 +First execute script ./01-disable-automounting.sh (dconf update crash in GNOME Classic) +logout -> Select user (without it the drop down menu won't appear) -> switch to 'GNOME Classic' from drop down menu in login screen +Reboot diff --git a/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/01-disable_net_lso.sh b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/01-disable_net_lso.sh new file mode 100644 index 00000000000..4da6aaaa453 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/01-disable_net_lso.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +echo "ETHTOOL_OPTS='-K \${DEVICE} tso off'" | sudo tee -a /etc/sysconfig/network-scripts/ifcfg-Wired_connection_1 diff --git a/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/01-install_telegraf.sh b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/01-install_telegraf.sh new file mode 100644 index 00000000000..729f90035bc --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/01-install_telegraf.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/unix/telegraf_install.sh diff --git a/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/01-refresh-subscription-manager.sh b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/01-refresh-subscription-manager.sh new file mode 100644 index 00000000000..51417f1b24e --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/01-refresh-subscription-manager.sh @@ -0,0 +1,18 @@ +#!/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 -e + +curl --retry 5 --retry-delay 10 --retry-max-time 60 http://ci-files01-hki.ci.qt.io/input/semisecure/redhat_ak_all_versions.sh -o "/tmp/redhat_ak.sh" &>/dev/null +sudo chmod 755 /tmp/redhat_ak.sh +/tmp/redhat_ak.sh + +# refresh local certificates +sudo subscription-manager refresh + +# Attach available subscriptions to system. This is needed when subscriptions are renewed. +sudo subscription-manager attach --auto + +sudo rm -f /tmp/redhat_ak.sh diff --git a/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/01-remove_network_manager_secret_key.sh b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/01-remove_network_manager_secret_key.sh new file mode 100644 index 00000000000..7f9790ae3fe --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/01-remove_network_manager_secret_key.sh @@ -0,0 +1,11 @@ +#!/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 + +# Ipv6 link local becomes tentative and dadfailed if two systems has the same secret_key +# New unique secret key will be created automatically during start up. +# https://access.redhat.com/solutions/3553581 +echo "Removing secret_key" +sudo rm -f "/var/lib/NetworkManager/secret_key" + + diff --git a/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/01-set-ulimit.sh b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/01-set-ulimit.sh new file mode 100644 index 00000000000..e951e82ac2a --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/01-set-ulimit.sh @@ -0,0 +1,8 @@ +#!/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 + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/linux/set_ulimit.sh" 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 new file mode 100644 index 00000000000..fbd00eef436 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/01-systemsetup.sh @@ -0,0 +1,31 @@ +#!/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 + +BASEDIR=$(dirname "$0") +# shellcheck source=../common/shared/network_test_server_ip.txt +source "$BASEDIR/../common/shared/network_test_server_ip.txt" + +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" +echo 'export DISPLAY=":0"' >> ~/.bashrc +# for current session +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 +gsettings set org.gnome.mutter overlay-key "" + +# Set Wayland enable as false. +echo "Setting Wayland enable as false" +sudo sed -i 's/#WaylandEnable=false/WaylandEnable=false/g' /etc/gdm/custom.conf diff --git a/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/02-install-xcb_util_cursor.sh b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/02-install-xcb_util_cursor.sh new file mode 100644 index 00000000000..353297db11d --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/02-install-xcb_util_cursor.sh @@ -0,0 +1,10 @@ +#!/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 + +# Install xcb-util-cursor* libraries before updating repos. In updated repos these libraries are no longer available. +# QTQAINFRA-6325 +sudo yum -y install xcb-util-cursor +sudo yum -y install xcb-util-cursor-devel diff --git a/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/03-enable-repos.sh b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/03-enable-repos.sh new file mode 100644 index 00000000000..30f07320393 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/03-enable-repos.sh @@ -0,0 +1,34 @@ +#!/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 + +echo "set WritePreparedUpdates=false" | sudo tee -a /etc/PackageKit/PackageKit.conf +sudo systemctl stop packagekit +sudo systemctl mask --now packagekit +while sudo fuser /usr/libexec/packagekitd >/dev/null 2>&1; do + echo "Waiting for PackageKit to finish..." + sleep 1 + sudo systemctl stop packagekit +done +sudo yum -y remove PackageKit gnome-software + +sudo subscription-manager config --rhsm.manage_repos=1 +sudo subscription-manager refresh + +# List available RHEL versions and bind with correct one +sudo subscription-manager release --list +sudo subscription-manager release --set=9.4 +sudo yum clean all + +# sudo yum config-manager --enable 'rhceph-4-tools-for-rhel-8-x86_64-rpms' +sudo yum config-manager --enable 'codeready-builder-for-rhel-9-x86_64-rpms' +sudo yum config-manager --enable 'rhel-9-for-x86_64-baseos-rpms' +sudo yum config-manager --enable 'rhel-9-for-x86_64-appstream-rpms' +# Epel is required for 'double-conversion-devel', 'libsqlite3x' and 'p7zip' +sudo dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-9.noarch.rpm + +sudo yum clean all +# As well as this fetching the repository data, we also get a printout of the used repos +sudo yum repolist 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 new file mode 100644 index 00000000000..dd5c6fbfd81 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/04-install-packages.sh @@ -0,0 +1,204 @@ +#!/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 + +# Remove update notifications and packagekit running in the background +sudo yum -y remove PackageKit gnome-software + +# CI: All platforms should have up-to-date packages when new provision is made +sudo yum -y update + +installPackages=() +installPackages+=(git) +installPackages+=(zlib-devel) +installPackages+=(glib2-devel) +installPackages+=(openssl-devel) +installPackages+=(freetype-devel) +installPackages+=(fontconfig-devel) +installPackages+=(curl-devel) +installPackages+=(expat-devel) +installPackages+=(gettext-devel) +installPackages+=(perl-devel) +# Required by some old pkg perl script, FindBin.pm was moved to new package in perl 5.32 +installPackages+=(perl-FindBin) +installPackages+=(dh-autoreconf) +# cmake build +installPackages+=(ninja-build) +installPackages+=(pcre2-devel) +installPackages+=(double-conversion-devel) +installPackages+=(zstd) +installPackages+=(libzstd-devel) +# EGL support +# mesa-libEGL-devel need to use older version than 22.1.5-2.el9 which cause Xorg to crash +#installPackages+=(mesa-libEGL-devel-21.3.4-2.el9) +#installPackages+=(mesa-libGL-devel-21.3.4-2.el9) + +# Using same mesa libraries for RHEL 9.2 which also RHEL 8.8 had due to Xorg crash issue: +#installPackages+=(mesa-libEGL-devel-21.3.4-1.el9.x86_64) +#installPackages+=(mesa-libGL-devel-21.3.4-1.el9.x86_64) +#installPackages+=(mesa-dri-drivers-21.3.4-1.el9.x86_64) +#installPackages+=(mesa-libgbm-21.3.4-1.el9.x86_64) +#installPackages+=(mesa-vulkan-drivers-21.3.4-1.el9.x86_64) + +# Same as lines above but with -2 version which should be found for el9 +installPackages+=(mesa-libEGL-devel-21.3.4-2.el9.x86_64) +installPackages+=(mesa-libGL-devel-21.3.4-2.el9.x86_64) +installPackages+=(mesa-dri-drivers-21.3.4-2.el9.x86_64) +installPackages+=(mesa-libgbm-21.3.4-2.el9.x86_64) +installPackages+=(mesa-vulkan-drivers-21.3.4-2.el9.x86_64) + +installPackages+=(libxkbfile-devel) +# Xinput2 +installPackages+=(libXi-devel) +installPackages+=(mysql-server) +installPackages+=(mysql) +installPackages+=(mysql-devel) +installPackages+=(postgresql-devel) +installPackages+=(cups-devel) +installPackages+=(dbus-devel) +# gstreamer 1 for QtMultimedia +# Note! gstreamer1-plugins-bad-free needs to be upgraded or it will conflicts with gstreamer1-plugins-base-devel +installPackages+=(gstreamer1-plugins-bad-free) +installPackages+=(gstreamer1-devel) +installPackages+=(gstreamer1-plugins-base-devel) +# pipewire for QtMultimedia +installPackages+=(pipewire-devel) +# yasm for QtMultimedia +installPackages+=(yasm) +# gtk3 style for QtGui/QStyle +installPackages+=(gtk3-devel) +# libusb1 for tqtc-boot2qt/qdb +installPackages+=(libusbx-devel) +# speech-dispatcher-devel for QtSpeech, otherwise it has no backend on Linux +installPackages+=(speech-dispatcher-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) +# Python 3 with python-devel, pip and virtualenv +installPackages+=(python3) +installPackages+=(python3-devel) +# WebEngine +installPackages+=(bison) +installPackages+=(flex) +installPackages+=(gperftools-libs) +installPackages+=(gperf) +installPackages+=(alsa-lib-devel) +installPackages+=(pulseaudio-libs-devel) +installPackages+=(libdrm-devel) +installPackages+=(libva-devel) +installPackages+=(libXtst-devel) +installPackages+=(libxshmfence-devel) +installPackages+=(nspr-devel) +installPackages+=(nss-devel) +installPackages+=(python3-html5lib) +installPackages+=(libstdc++-static) +installPackages+=(mesa-libgbm-devel-21.3.4-2.el9.x86_64) +# For Android builds +installPackages+=(java-17-openjdk-devel-17.0.9.0.9) +# For receiving shasum +installPackages+=(perl-Digest-SHA) +# INTEGRITY requirements +installPackages+=(glibc.i686) +# Enable Qt Bluetooth +installPackages+=(bluez-libs-devel) +# QtNfc +installPackages+=(pcsc-lite-devel) +# QtWebKit +installPackages+=(libxml2-devel) +installPackages+=(libxslt-devel) +# For building Wayland from source +installPackages+=(libffi-devel) +# QtWayland +# installPackages+=(mesa-libwayland-egl) +# installPackages+=(mesa-libwayland-egl-devel) +installPackages+=(libwayland-egl) +installPackages+=(libwayland-client) +installPackages+=(libwayland-cursor) +installPackages+=(libwayland-server) +# Jenkins +installPackages+=(chrpath) +# libxkbcommon +installPackages+=(libxkbcommon-devel) +installPackages+=(libxkbcommon-x11-devel) +# xcb-util-* libraries +installPackages+=(xcb-util) +installPackages+=(xcb-util-image-devel) +installPackages+=(xcb-util-keysyms-devel) +installPackages+=(xcb-util-wm-devel) +installPackages+=(xcb-util-renderutil-devel) +installPackages+=(xcb-util-cursor) +installPackages+=(xcb-util-cursor-devel) + +# ODBC support +installPackages+=(unixODBC-devel) +installPackages+=(unixODBC) +# Vulkan support +installPackages+=(vulkan-devel) +installPackages+=(vulkan-tools) +# Conan: For Python build +installPackages+=(xz-devel) +installPackages+=(zlib-devel) +installPackages+=(libffi-devel) +installPackages+=(libsqlite3x-devel) +# Build.pl +installPackages+=(perl-Data-Dumper) +# In RedHat these come with Devtoolset +installPackages+=(gcc) +installPackages+=(gcc-c++) +installPackages+=(make) +installPackages+=(gcc-toolset-12) +# Open source VMware Tools +installPackages+=(open-vm-tools) +# nfs-utils is needed to make mount work with ci-files01 +installPackages+=(nfs-utils) +# cifs-utils, for mounting smb drive +installPackages+=(keyutils) +installPackages+=(cifs-utils) +# used for reading vcpkg packages version, from vcpkg.json +installPackages+=(jq) +# zip, needed for vcpkg caching +installPackages+=(zip) +# OpenSSL requirement, built by vcpkg +installPackages+=(perl-IPC-Cmd) +# password management support for Qt Creator +installPackages+=(libsecret-devel) +# For Firebird in RTA +installPackages+=(libtommath-devel) + +sudo yum -y install "${installPackages[@]}" + +sudo dnf install nodejs-16.14.0-4.el9_0 -y +# Required by QtCore +sudo dnf install 'perl(English)' -y + +# We shouldn't use yum to install virtualenv. The one found from package repo is not +# working, but we can use installed pip +sudo pip3 install --upgrade pip +# Configure pip +sudo pip config --user set global.index https://ci-files01-hki.ci.qt.io/input/python_module_cache +sudo pip config --user set global.extra-index-url https://pypi.org/simple/ + +sudo pip3 install virtualenv wheel +# Just make sure we have virtualenv to run with python3.8 -m virtualenv +sudo python -m pip install virtualenv wheel +sudo python -m pip install -r "${BASH_SOURCE%/*}/../common/shared/sbom_requirements.txt" + +sudo /usr/bin/pip3 install wheel +sudo /usr/bin/pip3 install -r "${BASH_SOURCE%/*}/../common/shared/sbom_requirements.txt" + +# Provisioning during installation says: +# 'The script sbom2doc is installed in '/usr/local/bin' which is not on PATH.' +# hence the explicit assignment to SBOM_PYTHON_APPS_PATH. +source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" +SetEnvVar "SBOM_PYTHON_APPS_PATH" "/usr/local/bin" + +# Make FindPython3.cmake to find python3 +sudo ln -s /usr/bin/python3 /usr/local/bin/python3 + +OpenSSLVersion="$(openssl version |cut -b 9-14)" +echo "System's OpenSSL = $OpenSSLVersion" >> ~/versions.txt + +# List all available updates +sudo yum -y list updates diff --git a/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/04-p7zip.sh b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/04-p7zip.sh new file mode 100644 index 00000000000..f1035285410 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/04-p7zip.sh @@ -0,0 +1,15 @@ +#!/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 +source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" + +set -ex + +name="p7zip" +version="7-11" +sudo yum -y install "$name" + +# Link 7za to 7z so we can use existing installation scripts +sudo ln -s /usr/bin/7za /usr/bin/7z + +echo "$name = $version" >> ~/versions.txt diff --git a/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/05-install-ninja.sh b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/05-install-ninja.sh new file mode 100644 index 00000000000..adbb6349a42 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/05-install-ninja.sh @@ -0,0 +1,8 @@ +#!/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 + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/linux/install-ninja.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/05-install-patchelf.sh b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/05-install-patchelf.sh new file mode 100644 index 00000000000..495e3d4ace5 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/05-install-patchelf.sh @@ -0,0 +1,5 @@ +#!/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 + +source "${BASH_SOURCE%/*}/../common/unix/install-patchelf.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/05-libclang-v100-dyn.sh b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/05-libclang-v100-dyn.sh new file mode 100644 index 00000000000..2e08049dcbe --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/05-libclang-v100-dyn.sh @@ -0,0 +1,8 @@ +#!/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 + +BASEDIR=$(dirname "$0") +# shellcheck source=../common/unix/libclang-v100-dyn.sh +"$BASEDIR/../common/unix/libclang-v100-dyn.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/05-libclang.sh b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/05-libclang.sh new file mode 100644 index 00000000000..cc68ed1f1ad --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/05-libclang.sh @@ -0,0 +1,8 @@ +#!/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 + +BASEDIR=$(dirname "$0") +# shellcheck source=../common/unix/libclang.sh +"$BASEDIR/../common/unix/libclang.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/05-mount-vcpkg-cache-drive.sh b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/05-mount-vcpkg-cache-drive.sh new file mode 100644 index 00000000000..ed49b3a5418 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/05-mount-vcpkg-cache-drive.sh @@ -0,0 +1,8 @@ +#!/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 + +# shellcheck source=../common/linux/mount-vcpkg-cache-drive.sh +source "${BASH_SOURCE%/*}/../common/linux/mount-vcpkg-cache-drive.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/09-disable_selinux.sh b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/09-disable_selinux.sh new file mode 100644 index 00000000000..d044472b192 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/09-disable_selinux.sh @@ -0,0 +1,8 @@ +#!/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 + +# shellcheck source=../common/linux/disable_selinux.sh +source "${BASH_SOURCE%/*}/../common/linux/disable_selinux.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/20-sccache.sh b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/20-sccache.sh new file mode 100644 index 00000000000..b371d947924 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/20-sccache.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +source "${BASH_SOURCE%/*}/../common/linux/sccache.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/22-mqtt_broker.sh b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/22-mqtt_broker.sh new file mode 100644 index 00000000000..bb69e88a694 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/22-mqtt_broker.sh @@ -0,0 +1,6 @@ +#!/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 + +# shellcheck source=../common/unix/mqtt_broker.sh +source "${BASH_SOURCE%/*}/../common/unix/mqtt_broker.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/30-fbx.sh b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/30-fbx.sh new file mode 100644 index 00000000000..16a9bda85d9 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/30-fbx.sh @@ -0,0 +1,8 @@ +#!/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 + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/linux/fbx_linux.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/30-install-conan.sh b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/30-install-conan.sh new file mode 100644 index 00000000000..67a4f9116ec --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/30-install-conan.sh @@ -0,0 +1,8 @@ +#!/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 + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/unix/install-conan.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/30-install-git.sh b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/30-install-git.sh new file mode 100644 index 00000000000..7a73f354e16 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/30-install-git.sh @@ -0,0 +1,8 @@ +#!/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 + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/linux/install-git.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/30-install_icu.sh b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/30-install_icu.sh new file mode 100644 index 00000000000..8d365c9d556 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/30-install_icu.sh @@ -0,0 +1,45 @@ +#!/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 + +# shellcheck source=../common/unix/DownloadURL.sh +source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" + +set -ex + +# This script will install ICU + +icuVersion="73.2" +icuLocation="/usr/lib64" +sha1="d2bbb7b2a9a9ee00dba5cc6a68137f6c8a98c27e" +baseBinaryPackageURL="http://ci-files01-hki.ci.qt.io/input/icu/$icuVersion/icu-linux-g++-Rhel8.6-x64.7z" +baseBinaryPackageExternalURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel8.6-x64.7z" + +sha1Dev="edc9cba31ffeac28bf7360c52b85b5e4d2f39043" +develPackageURL="http://ci-files01-hki.ci.qt.io/input/icu/$icuVersion/icu-linux-g++-Rhel8.6-x64-devel.7z" +develPackageExternalURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel8.6-x64-devel.7z" + +echo "Installing custom ICU $icuVersion $sha1 packages on RHEL to $icuLocation" + +targetFile=$(mktemp) +DownloadURL "$baseBinaryPackageURL" "$baseBinaryPackageExternalURL" "$sha1" "$targetFile" +sudo 7z x -y -o/usr/lib64 "$targetFile" +sudo rm "$targetFile" + +echo "Installing custom ICU devel packages on RHEL" + +tempDir=$(mktemp -d) + +targetFile=$(mktemp) +DownloadURL "$develPackageURL" "$develPackageExternalURL" "$sha1Dev" "$targetFile" +7z x -y -o"$tempDir" "$targetFile" + +sudo cp -a "$tempDir"/lib/* /usr/lib64 +sudo cp -a "$tempDir"/* /usr/ + +sudo rm "$targetFile" +sudo rm -fr "$tempDir" + +sudo /sbin/ldconfig + +echo "ICU = $icuVersion" >> ~/versions.txt diff --git a/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/35-install-breakpad.sh b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/35-install-breakpad.sh new file mode 100644 index 00000000000..8a9dde56be4 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/35-install-breakpad.sh @@ -0,0 +1,8 @@ +#!/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 + +# shellcheck source=../common/unix/install-breakpad.sh +source "${BASH_SOURCE%/*}/../common/unix/install-breakpad.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/40-android_linux.sh b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/40-android_linux.sh new file mode 100644 index 00000000000..877dfd08eb9 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/40-android_linux.sh @@ -0,0 +1,8 @@ +#!/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 + +# shellcheck source=../common/linux/android_linux.sh +source "${BASH_SOURCE%/*}/../common/linux/android_linux.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/40-install-cmake.sh b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/40-install-cmake.sh new file mode 100644 index 00000000000..155f6b7dcf2 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/40-install-cmake.sh @@ -0,0 +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 + +# This script installs CMake 3.6.2 + +set -ex + +# CMake is needed for autotests that verify that Qt can be built with CMake + +# shellcheck source=../common/linux/cmake_linux.sh +source "${BASH_SOURCE%/*}/../common/linux/cmake_linux.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/41-install-golang.sh b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/41-install-golang.sh new file mode 100644 index 00000000000..6b72bc47515 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/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-RHEL-9.4-x86_64/41-install-upx.sh b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/41-install-upx.sh new file mode 100644 index 00000000000..0bccc01efac --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/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" diff --git a/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/41-install-vcpkg.sh b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/41-install-vcpkg.sh new file mode 100644 index 00000000000..aa88364d005 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/41-install-vcpkg.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +set -ex + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/linux/install-vcpkg.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/42-install-vcpkg-ports.sh b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/42-install-vcpkg-ports.sh new file mode 100644 index 00000000000..71a46f9a4e6 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/42-install-vcpkg-ports.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +set -ex + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/linux/install-vcpkg-ports.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 new file mode 100644 index 00000000000..a71ba0a7b40 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/50-openssl_for_android_linux.sh @@ -0,0 +1,7 @@ +#!/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 + +# shellcheck source=../common/unix/openssl_for_android.sh +source "${BASH_SOURCE%/*}/../common/unix/openssl_3_for_android.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/60-install_protobuf.sh b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/60-install_protobuf.sh new file mode 100644 index 00000000000..b07613744dd --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/60-install_protobuf.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 + +# shellcheck source=../common/unix/install_protobuf.sh +source "${BASH_SOURCE%/*}/../common/unix/install_protobuf.sh" + diff --git a/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/61-install_grpc.sh b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/61-install_grpc.sh new file mode 100644 index 00000000000..3d14832de61 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/61-install_grpc.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 + +# shellcheck source=../common/unix/install_grpc.sh +source "${BASH_SOURCE%/*}/../common/unix/install_grpc.sh" + diff --git a/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/70-install_QemuGA.sh b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/70-install_QemuGA.sh new file mode 100644 index 00000000000..dbaed25d45c --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/70-install_QemuGA.sh @@ -0,0 +1,10 @@ +#!/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 installs QEMU Guest Agent + +set -ex + +sudo yum -y install qemu-guest-agent +sudo systemctl start qemu-guest-agent diff --git a/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/70-install_dwz.sh b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/70-install_dwz.sh new file mode 100644 index 00000000000..518c5533702 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/70-install_dwz.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash +# Copyright (C) 2023 Konstantin Tokarev +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only + +set -ex + +sudo yum -y install elfutils-libelf-devel + +# shellcheck source=../common/linux/install_dwz.sh +source "${BASH_SOURCE%/*}/../common/linux/install_dwz.sh" + diff --git a/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/90-bootstrap-autostart.sh b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/90-bootstrap-autostart.sh new file mode 100644 index 00000000000..1ff4385064d --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/90-bootstrap-autostart.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +source "${BASH_SOURCE%/*}/../common/linux/bootstrap-autostart.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 new file mode 100644 index 00000000000..61da9b7b3a4 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/90-install-ffmpeg.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux" diff --git a/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/90-mimer.sh b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/90-mimer.sh new file mode 100644 index 00000000000..4683452a0df --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/90-mimer.sh @@ -0,0 +1,8 @@ +#!/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 + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/linux/mimersql.sh" "openssl-3" "rpm" diff --git a/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/90-squish.sh b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/90-squish.sh new file mode 100644 index 00000000000..f803ccc1fa1 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/90-squish.sh @@ -0,0 +1,6 @@ +#!/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" + diff --git a/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/99-cleanup.sh b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/99-cleanup.sh new file mode 100644 index 00000000000..dd2682102d0 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/99-cleanup.sh @@ -0,0 +1,7 @@ +#!/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 + +"$(dirname "$0")"/../common/linux/cleanup_cache.sh diff --git a/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/99-enable_test_stacktraces.sh b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/99-enable_test_stacktraces.sh new file mode 100644 index 00000000000..600b7850b25 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/99-enable_test_stacktraces.sh @@ -0,0 +1,8 @@ +#!/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 + +BASEDIR=$(dirname "$0") +"$BASEDIR"/../common/linux/enable_test_stacktraces.sh diff --git a/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/99-version.sh b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/99-version.sh new file mode 100644 index 00000000000..b12622c636c --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-9.4-x86_64/99-version.sh @@ -0,0 +1,17 @@ +#!/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 needs to be called last during provisioning so that the software information will show up last in provision log. + +# Storage installed RPM packages information + +set -ex + +# shellcheck disable=SC2129 +echo "*********************************************" >> ~/versions.txt +echo "***** All installed RPM packages *****" >> ~/versions.txt +rpm -q -a | sort >> ~/versions.txt +echo "*********************************************" >> ~/versions.txt + +"$(dirname "$0")/../common/linux/version.sh" From 3dc55bdfb83323c53a52c1277e178e3c6a6362ff Mon Sep 17 00:00:00 2001 From: Tim Blechmann Date: Wed, 6 Nov 2024 09:52:02 +0800 Subject: [PATCH 211/288] provisioning: install gstreamer h264 codec on openSUSE and rhel9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The h264 codec is required to run the gstreamer-based unit tests on CI. Change-Id: Ic47ee086687230613d56f30d3fd613288e37ce7f Reviewed-by: Jøger Hansegård (cherry picked from commit 58e0090020260601c29178bf814f4f156ea63169) Reviewed-by: Tim Blechmann --- .../qtci-linux-RHEL-9.2-x86_64/04-install-packages.sh | 1 + .../qtci-linux-RHEL-9.4-x86_64/04-install-packages.sh | 1 + .../qtci-linux-openSUSE-15.5-x86_64/04-zypperpackages.sh | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) 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 d0facbe93c8..845cea5440e 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 @@ -63,6 +63,7 @@ installPackages+=(dbus-devel) installPackages+=(gstreamer1-plugins-bad-free) installPackages+=(gstreamer1-devel) installPackages+=(gstreamer1-plugins-base-devel) +installPackages+=(gstreamer1-plugin-openh264) # pipewire for QtMultimedia installPackages+=(pipewire-devel) # yasm for QtMultimedia 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 dd5c6fbfd81..8b1739632c2 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 @@ -63,6 +63,7 @@ installPackages+=(dbus-devel) installPackages+=(gstreamer1-plugins-bad-free) installPackages+=(gstreamer1-devel) installPackages+=(gstreamer1-plugins-base-devel) +installPackages+=(gstreamer1-plugin-openh264) # pipewire for QtMultimedia installPackages+=(pipewire-devel) # yasm for QtMultimedia 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 0cad2372f39..808c025ed69 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 @@ -49,7 +49,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-1.20-plugin-openh264 # cups sudo zypper -nq install cups-devel From ad1e94d511f05251dccce49809f11bf194c22774 Mon Sep 17 00:00:00 2001 From: Tim Blechmann Date: Fri, 8 Nov 2024 09:09:05 +0800 Subject: [PATCH 212/288] provisioning: install development files for gstreamer-plugins-bad Required for gst-play Change-Id: Id41d4359aa8e573e360c565eea6900b33918743f Reviewed-by: Artem Dyomin (cherry picked from commit 01f6c96002bf3eecc7500a58a9dec1f286d48cba) Reviewed-by: Qt Cherry-pick Bot --- .../qtci-linux-SLES-15_SP5-x86_64/02-zypperpackages.sh | 3 ++- .../qtci-linux-openSUSE-15.5-x86_64/04-zypperpackages.sh | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) 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 275592eabdd..c2a8318dfc3 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 @@ -67,7 +67,8 @@ 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 +sudo zypper -nq install gstreamer-devel gstreamer-plugins-base-devel libpulse-devel \ + gstreamer-plugins-bad-devel # cups sudo zypper -nq install cups-devel 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 808c025ed69..058d576d557 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 @@ -49,7 +49,8 @@ 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 \ + gstreamer-1.20-plugin-openh264 gstreamer-plugins-bad-devel # cups sudo zypper -nq install cups-devel From 5f00935059f5d1fa7e86ffd94526217d10eb9d9d Mon Sep 17 00:00:00 2001 From: Matti Paaso Date: Wed, 6 Nov 2024 13:48:16 +0200 Subject: [PATCH 213/288] Update Java version into 17 Jenkins needs version 17 to get agent running in VM Task-number: QTQAINFRA-6263 Pick-to: 6.5 6.2 Change-Id: I57daadad6baa2e7e538874769af3fbe0cdd42878 Reviewed-by: Ville-Pekka Karhu Reviewed-by: Tero Heikkinen (cherry picked from commit 5128df0130a599a81226b1e38be9ef0cf3d73455) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/common/macos/java_arm.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/coin/provisioning/common/macos/java_arm.sh b/coin/provisioning/common/macos/java_arm.sh index 1c4b1ed10f5..2957d81a86b 100755 --- a/coin/provisioning/common/macos/java_arm.sh +++ b/coin/provisioning/common/macos/java_arm.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -# Copyright (C) 2021 The Qt Company Ltd. +# 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 installs JDK @@ -8,10 +8,10 @@ set -ex echo "Installing Java Development Kit" -targetFile=zulu15.29.15-ca-jdk15.0.2-macosx_aarch64.dmg +targetFile=zulu17.54.21-ca-jdk17.0.13-macosx_aarch64.dmg url=ci-files01-hki.ci.qt.io:/hdd/www/input/mac -# url_alt=https://cdn.azul.com/zulu/bin/zulu15.29.15-ca-jdk15.0.2-macosx_aarch64.dmg +# url_alt=https://cdn.azul.com/zulu/bin/zulu17.54.21-ca-jdk17.0.13-macosx_aarch64.dmg echo "Mounting $targetFile" sudo mkdir -p /Volumes/files @@ -22,12 +22,12 @@ sudo umount /Volumes/files sudo hdiutil attach "/tmp/$targetFile" echo Installing JDK -cd /Volumes/Zulu\ OpenJDK\ 15.29+15 && sudo installer -pkg Double-Click\ to\ Install\ Zulu\ 15.pkg -target / +cd /Volumes/Azul\ Zulu\ JDK\ 17.54+21 && sudo installer -pkg Double-Click\ to\ Install\ Azul\ Zulu\ JDK\ 17.pkg -target / echo "Unmounting $targetFile" -sudo hdiutil unmount /Volumes/Zulu\ OpenJDK\ 15.29+15 -force +sudo hdiutil unmount /Volumes/Azul\ Zulu\ JDK\ 17.54+21 -force echo "Disable auto update" sudo defaults write /Library/Preferences/com.oracle.java.Java-Updater JavaAutoUpdateEnabled -bool false -echo "JDK Version = 15.0.2" >> ~/versions.txt +echo "JDK Version = 17.0.13" >> ~/versions.txt From cb765fe3c14da62e361d26d4f6c0ac6bccb9d898 Mon Sep 17 00:00:00 2001 From: Matti Paaso Date: Wed, 6 Nov 2024 14:01:45 +0200 Subject: [PATCH 214/288] Change Java version to 17 on Linux arm Jenkins needs Java 17 to run agent on VM Task-number: QTQAINFRA-6263 Change-Id: Ia2749a4812402df8b11f6388f8e6bc3b995d5e53 Reviewed-by: Toni Saario (cherry picked from commit 7a2a226e8a259599ba490fddbd2d55d0a6a21d33) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/qtci-linux-Debian-11.6-aarch64/02-apt.sh | 2 +- coin/provisioning/qtci-linux-Ubuntu-24.04-aarch64/02-apt.sh | 4 +--- 2 files changed, 2 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 26cc4876849..a6ecb6ad501 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 @@ -113,7 +113,7 @@ installPackages+=(libcurl4-openssl-dev) installPackages+=(libicu-dev) installPackages+=(zlib1g-dev) installPackages+=(zlib1g) -installPackages+=(openjdk-11-jdk) +installPackages+=(openjdk-17-jdk) installPackages+=(libgtk-3-dev) installPackages+=(ninja-build) installPackages+=(libssl-dev) 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 3e6e92f8ea0..ff083309609 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 @@ -146,9 +146,7 @@ installPackages+=(libcurl4-openssl-dev) installPackages+=(libicu-dev) installPackages+=(zlib1g-dev) installPackages+=(zlib1g) -installPackages+=(openjdk-8-jdk) -#Java 11 for Android -installPackages+=(openjdk-11-jdk) +installPackages+=(openjdk-17-jdk) installPackages+=(libgtk-3-dev) installPackages+=(ninja-build) installPackages+=(libssl-dev) From 90e0464453f150de802dfcd3fdc16a9180a88553 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Mon, 8 Jul 2024 17:50:38 +0200 Subject: [PATCH 215/288] coin: Build macOS ARM developer-build in debug mode To get as close as possible to how developers build and run tests, and to get debug-build test coverage on macOS in CI. Change-Id: Ice12b7230d56284d352e6a73ac503588b22107bb Reviewed-by: Joerg Bornemann Reviewed-by: Alexey Edelev (cherry picked from commit 8c74d54deb2e1d6fd8e2d1fdb432699682183ddb) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/macos.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/macos.yaml b/coin/platform_configs/macos.yaml index db8bc719028..d35b7e30963 100644 --- a/coin/platform_configs/macos.yaml +++ b/coin/platform_configs/macos.yaml @@ -126,7 +126,7 @@ Configurations: Template: 'qtci-macos-14-arm-106' Compiler: 'Clang' Features: ['DoNotRunTests', 'WarningsAreErrors', 'UseConfigure'] - Configure arguments: '-developer-build -nomake examples -release -force-asserts -force-debug-info -separate-debug-info -framework' + 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', From 2d5dc5af3d76a27a357d757d479f4efe81f705b4 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Fri, 18 Oct 2024 18:41:40 +0200 Subject: [PATCH 216/288] coin: Use new doc tools building instructions for TestDocs configs The documentation warning configurations marked with the TestDocs feature will now use the new doc tools building instructions from qtbase, instead of using the provisioned qdoc tools when checking the documentation for warnings. This means that each qtbase integration will build the doc tools from qttools/dev/HEAD and use those built tools associated with that qtbase sha1 integration to check documentation in all other repositories. The doc tools will be rebuilt whenever a new qtbase integration starts. See the qtbase commit 1f646bb978ed94c25f6224e801779c929096c0ae for more details. Task-number: QTBUG-128730 Change-Id: I5a981afa9ec2c2b3a5c519b961e566ec5d2cc925 Reviewed-by: Alexey Edelev (cherry picked from commit d36c17487c606bf0bcbfbaf139a5db7f5e56f261) --- coin/platform_configs/cmake_platforms.yaml | 4 ++-- coin/platform_configs/nightly_ubuntu_22_04_xwayland.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index b0571910941..52bb135295d 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -12,7 +12,7 @@ Configurations: Id: 'ubuntu-22.04-documentation' Template: 'qtci-linux-Ubuntu-22.04-x86_64-51' Compiler: 'GCC' - Features: ['Sccache', 'Documentation', 'UseConfigure', 'DoNotRunTests'] + Features: ['Sccache', 'Documentation', 'UseConfigure', 'DoNotRunTests', 'DocsGenerationV2'] Configure arguments: '-make examples -developer-build -c++std c++20 -linker gold -qtlibinfix TestInfix -qtnamespace TestNamespace' Environment variables: ['NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE'] - @@ -30,7 +30,7 @@ Configurations: Id: 'ubuntu-22.04-documentation-x11-tests' Template: 'qtci-linux-Ubuntu-22.04-x86_64-51' Compiler: 'GCC' - Features: ['Sccache', 'TestDocs', 'TestOnly'] + Features: ['Sccache', 'TestDocs', 'TestOnly', 'DocsGenerationV2'] Platform dependency: 'ubuntu-22.04-documentation' - Id: 'ubuntu-22.04-x11-tests' diff --git a/coin/platform_configs/nightly_ubuntu_22_04_xwayland.yaml b/coin/platform_configs/nightly_ubuntu_22_04_xwayland.yaml index d95746e8ad6..3caebbc2a45 100644 --- a/coin/platform_configs/nightly_ubuntu_22_04_xwayland.yaml +++ b/coin/platform_configs/nightly_ubuntu_22_04_xwayland.yaml @@ -4,7 +4,7 @@ Configurations: # cmake_platforms.yaml Template: 'qtci-linux-Ubuntu-22.04-x86_64-50' Compiler: 'GCC' - Features: ['Sccache', 'Documentation', 'TestDocs', 'UseConfigure'] + Features: ['Sccache', 'Documentation', 'TestDocs', 'UseConfigure', 'DocsGenerationV2'] Configure arguments: '-make examples -developer-build -c++std c++20 -qtlibinfix TestInfix -qtnamespace TestNamespace' - Id: 'Ubuntu-22.04-xwayland-host' From 9a6b5caef5be6d0d095868cbde8e10f1ff12069b Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 18 Nov 2024 23:16:09 +0000 Subject: [PATCH 217/288] Update submodules on '6.8 in qt/qt5' Change-Id: I27af4cf5157aee20304527fc74bb6100448196b4 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 df973634f49..e322babd68e 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit df973634f4969dc26113aae941090a499876687e +Subproject commit e322babd68ee7edf0b7c510155b972491db32d56 diff --git a/qt5compat b/qt5compat index b55224f4677..b82fc5a2a15 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit b55224f4677fe494085ca820ff5ab51df6a09298 +Subproject commit b82fc5a2a15a8618a62ddf7cd79ffd43f585652e diff --git a/qtactiveqt b/qtactiveqt index 1c3da4064ec..e2889abf4a6 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 1c3da4064ec463ddfcf97056b14b1a608817fd3e +Subproject commit e2889abf4a672ef8030f7bc6d9734126b014e56d diff --git a/qtbase b/qtbase index 075b3f16e2c..3d9a48ad37f 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 075b3f16e2cfcdf331416b3f1fc5024a80db5f45 +Subproject commit 3d9a48ad37f4c7f33d6e0898e8f66fe07f27c403 diff --git a/qtcharts b/qtcharts index 7f6ea759c40..f05d03477c4 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 7f6ea759c401f0817347b2c74c2f53c3c58e307e +Subproject commit f05d03477c439010e577626746a2b6ff45fc41d7 diff --git a/qtcoap b/qtcoap index 3701d622db1..771215dab82 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit 3701d622db189e89c13e4b34bda269b414211b68 +Subproject commit 771215dab82d6e7efa126457f7de10cd69ca1ba9 diff --git a/qtconnectivity b/qtconnectivity index 0e7a6ab3b48..f396e943d4a 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 0e7a6ab3b48b5d53a89631f07eb0d6571523b76a +Subproject commit f396e943d4a98ab5110d36182671554c0aa571c1 diff --git a/qtdatavis3d b/qtdatavis3d index 6c69db8baf0..a85e1d42df6 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 6c69db8baf0b5f0b1627672e4c2c0b3685e5809f +Subproject commit a85e1d42df6038eaa32516184698c237e22b155c diff --git a/qtdeclarative b/qtdeclarative index 9fb945184d6..88b82c561c1 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 9fb945184d6ef220fcdef4bc4a7b08df020a2bdd +Subproject commit 88b82c561c1cc1e78fbd630cb3a827fb7cb51b30 diff --git a/qtdoc b/qtdoc index b476afa8bb6..19aef6e16ae 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit b476afa8bb6d830843160525a198d5157e98689f +Subproject commit 19aef6e16ae953ca6549f529e0153e059ad6de06 diff --git a/qtgraphs b/qtgraphs index 4674dfebc2d..a1507d09194 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit 4674dfebc2d4563e584e0653241717f87d4a91a3 +Subproject commit a1507d091943c1ee26a78d17743d16473f977210 diff --git a/qtgrpc b/qtgrpc index eb25aeb6833..421eda81246 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit eb25aeb683330ba55287f2a1b0ddcb93b0752bba +Subproject commit 421eda8124696a170ddad1e0da40d06b484afc8e diff --git a/qthttpserver b/qthttpserver index 6770dc12fa9..10a977f51aa 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit 6770dc12fa937abf71f19668a63fa88b2d5ec443 +Subproject commit 10a977f51aa04a5b26e3831591705a9f10b24e39 diff --git a/qtimageformats b/qtimageformats index fae9148f7c2..9ca72bd3c87 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit fae9148f7c283f85aa320d8421f2814850eb2fed +Subproject commit 9ca72bd3c8756c4c4ac1f1def3f2773c52eb31be diff --git a/qtlanguageserver b/qtlanguageserver index ee9cb3b8d77..5e711a02ead 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit ee9cb3b8d770c7bbc9e43087c9b711e41e55d4b7 +Subproject commit 5e711a02ead81c540f08811f6725d36670ab4613 diff --git a/qtlocation b/qtlocation index 7eb25522bff..8c3fbf862fd 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 7eb25522bffe2606ecc42b36e88fee07e3bfe1b8 +Subproject commit 8c3fbf862fdfcf59f9d7e48db2cc2c3b06d1dc05 diff --git a/qtlottie b/qtlottie index 0881b5427a5..82a07d287c7 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 0881b5427a53a0f7a4572d1d380d25600f9998ac +Subproject commit 82a07d287c7398b14dac4debab4b84c2ac3e0f9a diff --git a/qtmqtt b/qtmqtt index 04d3a0fbc66..0891799d332 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit 04d3a0fbc6620cadb11000865101d0ff11dc8550 +Subproject commit 0891799d3323e0ffb7d68b0f8a4b8b7de02dbfbc diff --git a/qtmultimedia b/qtmultimedia index 3052df8d980..447d692bd45 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 3052df8d980b4a81a4b2c568b7f26150bac03f17 +Subproject commit 447d692bd455d492d7c48b8a7f8eb9b7b34a32f6 diff --git a/qtnetworkauth b/qtnetworkauth index 4e4fadca4d9..4ddfcd577c1 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 4e4fadca4d998d08b3bb9d2925998e742a337add +Subproject commit 4ddfcd577c19ec35ea0b62922a250bb48f6cbdf0 diff --git a/qtopcua b/qtopcua index 2b1a908eb66..e7c92444ef7 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit 2b1a908eb664efaf5551cdf829e5d2b18644a018 +Subproject commit e7c92444ef74df359ad2e2c91ceb5fa5f825b80b diff --git a/qtpositioning b/qtpositioning index 75f7c7b108e..c9ff0aeccc3 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit 75f7c7b108e5aa143afbe733a810c8b552c77d8b +Subproject commit c9ff0aeccc37df73e2c81a6c2a5cc4823011a5b7 diff --git a/qtquick3d b/qtquick3d index e4cd83fc7f0..16c50870971 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit e4cd83fc7f07088be27a676e7be1ac695df61e3e +Subproject commit 16c508709711bc882547da89c640db48ca0f9564 diff --git a/qtquick3dphysics b/qtquick3dphysics index bb3e4601bfd..30645ddfe0c 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit bb3e4601bfdcf0d51a1ec70ddc50de6e3021c665 +Subproject commit 30645ddfe0ce50e94945cfa92a90f266bc23c994 diff --git a/qtquickeffectmaker b/qtquickeffectmaker index 1e1fadfe1da..6178c8d7490 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit 1e1fadfe1da21882b2cc301f06e3c9f9fc2c656b +Subproject commit 6178c8d7490e67820b128035998167a42a84529b diff --git a/qtquicktimeline b/qtquicktimeline index 83cd2b0f3d7..c12e0bb5807 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 83cd2b0f3d76e23970080658c76b316aee6cfb3e +Subproject commit c12e0bb58078d2a6b4fa16a2fbea36aadeda4f69 diff --git a/qtremoteobjects b/qtremoteobjects index 1a49931e4f1..91cbb95be6e 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 1a49931e4f1ceb8a1735b6ed9d4a727db24500c5 +Subproject commit 91cbb95be6e036f0d3b67a599fe559c068418aab diff --git a/qtrepotools b/qtrepotools index 7b6b3b5959e..c29a3c2801d 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 7b6b3b5959e8b33a6054df03ea166fd2a7783fed +Subproject commit c29a3c2801d99b128ab68aab6a829d96c231d281 diff --git a/qtscxml b/qtscxml index 54b62a5daf9..79993bb87c1 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 54b62a5daf94fafca14381f9d0d41d1721c7c977 +Subproject commit 79993bb87c16c79b861941c92083562c2ead9925 diff --git a/qtsensors b/qtsensors index 8033b076c3a..12754d05761 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 8033b076c3aadac400219a0b85ce5f9c8f30f672 +Subproject commit 12754d05761b3278f2c707536857ea82c4d635da diff --git a/qtserialbus b/qtserialbus index a081414691c..115b70b2e6c 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit a081414691c58a2355dfbe296d4c216683eeea53 +Subproject commit 115b70b2e6c297e6ad8e6de99fbd406097d831ea diff --git a/qtserialport b/qtserialport index a4bb9d234d2..a4bce248693 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit a4bb9d234d296d9d6167480071e862d6726b9a7b +Subproject commit a4bce248693ebcf4913c0a0c17dc7d591399570a diff --git a/qtshadertools b/qtshadertools index c1b249b304e..2706894e2f8 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit c1b249b304ef0ccdbcc58ad6a1a8fe0d00fc074e +Subproject commit 2706894e2f8889f0da906541203093653c1f9344 diff --git a/qtspeech b/qtspeech index 72a8fe89db5..a4518f4564d 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 72a8fe89db582910e3193505126a331de105571b +Subproject commit a4518f4564d0e7d208c92bdb1722d2d67b3015b8 diff --git a/qtsvg b/qtsvg index 3a2dc47989b..087f26a8681 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 3a2dc47989b3882facb60c353de1f5c3d2491dc8 +Subproject commit 087f26a8681ad081add07325dab7816069b16245 diff --git a/qttools b/qttools index 1d446b0b09c..1639035dfbd 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 1d446b0b09cb8cde96c3642391d199850a09aa7a +Subproject commit 1639035dfbdaadb225ae814720a3b502bf03bdb2 diff --git a/qttranslations b/qttranslations index 9d431d9ee0d..12b429b7106 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 9d431d9ee0d7aa640fd2fe4ea67e16c6dbdb8039 +Subproject commit 12b429b7106c0211e449bdc1f4ed69965eb54c9c diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 477323e0a57..dbe6ab905c8 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 477323e0a572ee4a452f5911bece84b31c0bc3e1 +Subproject commit dbe6ab905c89baabef8320f8e26edd5cda741f70 diff --git a/qtwayland b/qtwayland index 94bc0966c26..d1da6121fc9 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 94bc0966c26487a20cd388bc90e459bb35f92d69 +Subproject commit d1da6121fc91f02a2a9d89873b423cdb32930999 diff --git a/qtwebchannel b/qtwebchannel index 30dacf6896e..2c2559fe93c 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 30dacf6896eb0488bf203b72510d2bd69cb772fe +Subproject commit 2c2559fe93ccf2683ed72c501c30332c86a99d69 diff --git a/qtwebengine b/qtwebengine index 629da6d9ca1..e20bd5347ea 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 629da6d9ca1acb8e9e5dc78bcb6e531ac1533aa5 +Subproject commit e20bd5347eacf3a21df7c2cbecf374904faa5512 diff --git a/qtwebsockets b/qtwebsockets index 2df02a0ba19..ffaed77f09c 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 2df02a0ba1959d17b76a53a78c0261b32cccaab7 +Subproject commit ffaed77f09c325491f2c277a557ad380fea2c27d diff --git a/qtwebview b/qtwebview index fa5ea6105a5..24d216d993d 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit fa5ea6105a53b947d4b9ea019dbe9b05467080cc +Subproject commit 24d216d993dbf992095b90bf2a999f5e586c1072 From fcca7f16d02fca9850c3278a1967bf82d16584f2 Mon Sep 17 00:00:00 2001 From: Matti Paaso Date: Tue, 12 Nov 2024 09:03:19 +0200 Subject: [PATCH 218/288] Add Java 17 into OpenSuSE 15 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit RTA Jenkins needs this Task-number: QTQAINFRA-6263 Pick-to: 6.5 Change-Id: Ied9465f1c5542f77e327e3e515ed2b831e606569 Reviewed-by: Tero Heikkinen Reviewed-by: Simo Fält Reviewed-by: Aku Pietikäinen Reviewed-by: Johanna Äijälä (cherry picked from commit dbb4ca8e26a606ab9880e83bf21da0270370bc0d) Reviewed-by: Ville-Pekka Karhu --- .../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 +++ 3 files changed, 9 insertions(+) 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 49d2333da5f..25bea45b298 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 @@ -66,6 +66,9 @@ sudo zypper -nq install make # Tools to build Git 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)" echo "GCC = $gccVersion" >> 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 f55387b4827..5ee179e33e6 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 @@ -72,6 +72,9 @@ sudo zypper -nq install openssl-3 # Valgrind (Needed for testlib selftests) sudo zypper -nq install valgrind-devel +# Java +sudo zypper -nq install java-17-openjdk + gccVersion="$(gcc --version |grep gcc |cut -b 17-23)" echo "GCC = $gccVersion" >> 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 058d576d557..8f524960a8a 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 @@ -79,6 +79,9 @@ sudo zypper -nq install valgrind-devel # cifs-utils, for mounting smb drive sudo zypper -nq install cifs-utils +# Java +sudo zypper -nq install java-17-openjdk + gccVersion="$(gcc --version |grep gcc |cut -b 17-23)" echo "GCC = $gccVersion" >> versions.txt From 09baa95ad12a83a735e9c5d8122ac6d3496b0efc Mon Sep 17 00:00:00 2001 From: Matti Paaso Date: Wed, 13 Nov 2024 15:39:20 +0200 Subject: [PATCH 219/288] Update Java for Ubuntu-22.04- aarch64 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Jenkins needs Java 17 Task-number: QTQAINFRA-6263 Change-Id: I5405a6e76a231f81ab514fcad387fd0b2b877f87 Reviewed-by: Matti Paaso Reviewed-by: Aku Pietikäinen (cherry picked from commit 382ea574bb813031f2e036a77d9615c26bea7594) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/qtci-linux-Ubuntu-22.04-aarch64/02-apt.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 8d4e532ec69..1727d896c54 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 @@ -42,7 +42,7 @@ installPackages+=(git) installPackages+=(p7zip-full) # Packages needed for RTA and Squish -installPackages+=(default-jdk) +installPackages+=(openjdk-17-jdk) installPackages+=(gcc) echo "Running update for apt" From 4aa6b8cc47d2fec6c15eff0b309d0baafd5e2ce5 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 20 Nov 2024 19:11:56 +0000 Subject: [PATCH 220/288] Update submodules on '6.8 in qt/qt5' Change-Id: I5d7c7e1ac34e8b909edb34fbcf7334c4a75dcb96 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 e322babd68e..2b242c94007 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit e322babd68ee7edf0b7c510155b972491db32d56 +Subproject commit 2b242c94007f15d1db01b335135ebe8fa4b360f8 diff --git a/qt5compat b/qt5compat index b82fc5a2a15..87ce2a79493 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit b82fc5a2a15a8618a62ddf7cd79ffd43f585652e +Subproject commit 87ce2a79493a30aae96502af3bdf9cafd8ebebee diff --git a/qtactiveqt b/qtactiveqt index e2889abf4a6..a6c25bdfb29 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit e2889abf4a672ef8030f7bc6d9734126b014e56d +Subproject commit a6c25bdfb299e5ebf64546dd043cd8ec6a363999 diff --git a/qtbase b/qtbase index 3d9a48ad37f..5642b6fe7cd 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 3d9a48ad37f4c7f33d6e0898e8f66fe07f27c403 +Subproject commit 5642b6fe7cd84d3fa39d7285e314777cd3c00a4f diff --git a/qtcharts b/qtcharts index f05d03477c4..fed2d790860 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit f05d03477c439010e577626746a2b6ff45fc41d7 +Subproject commit fed2d79086050f26ba775c481519c24e66c2b9ec diff --git a/qtcoap b/qtcoap index 771215dab82..4efbf6f2841 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit 771215dab82d6e7efa126457f7de10cd69ca1ba9 +Subproject commit 4efbf6f28414fc3763c33037fbe1295859451ca9 diff --git a/qtconnectivity b/qtconnectivity index f396e943d4a..e54f9a7a49b 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit f396e943d4a98ab5110d36182671554c0aa571c1 +Subproject commit e54f9a7a49b3e5837bb04c929529a48343b89b97 diff --git a/qtdatavis3d b/qtdatavis3d index a85e1d42df6..5ba4a85d5d4 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit a85e1d42df6038eaa32516184698c237e22b155c +Subproject commit 5ba4a85d5d46dd5817f0261c5d44f7da837e9931 diff --git a/qtdeclarative b/qtdeclarative index 88b82c561c1..eba5ac070a1 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 88b82c561c1cc1e78fbd630cb3a827fb7cb51b30 +Subproject commit eba5ac070a1a35bf7acfef875f526970981d8692 diff --git a/qtdoc b/qtdoc index 19aef6e16ae..81e3a0a71e7 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 19aef6e16ae953ca6549f529e0153e059ad6de06 +Subproject commit 81e3a0a71e750a81843c1c690330c7caccb5086d diff --git a/qtgraphs b/qtgraphs index a1507d09194..333d18a2c6e 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit a1507d091943c1ee26a78d17743d16473f977210 +Subproject commit 333d18a2c6e6a67e7f1bb5a10fa9a879cc00f325 diff --git a/qtgrpc b/qtgrpc index 421eda81246..ec13e4f8bc3 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit 421eda8124696a170ddad1e0da40d06b484afc8e +Subproject commit ec13e4f8bc3fb3d64c59e90d49fe540f3b16b61c diff --git a/qthttpserver b/qthttpserver index 10a977f51aa..6eda34b4d00 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit 10a977f51aa04a5b26e3831591705a9f10b24e39 +Subproject commit 6eda34b4d0065d739209f8ffd8f05fc7e65678b2 diff --git a/qtimageformats b/qtimageformats index 9ca72bd3c87..9a819827697 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 9ca72bd3c8756c4c4ac1f1def3f2773c52eb31be +Subproject commit 9a81982769792ddab522b16020e1f07a47bdd3ca diff --git a/qtlanguageserver b/qtlanguageserver index 5e711a02ead..62b50dd6418 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit 5e711a02ead81c540f08811f6725d36670ab4613 +Subproject commit 62b50dd6418d6cd3bd73f2ec8413210770abaf2b diff --git a/qtlocation b/qtlocation index 8c3fbf862fd..2958d53f0a8 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 8c3fbf862fdfcf59f9d7e48db2cc2c3b06d1dc05 +Subproject commit 2958d53f0a8b76ca68dc1cb21954c9bc3116ab35 diff --git a/qtlottie b/qtlottie index 82a07d287c7..96521a0a369 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 82a07d287c7398b14dac4debab4b84c2ac3e0f9a +Subproject commit 96521a0a369500bc380345f02a48024718c55212 diff --git a/qtmqtt b/qtmqtt index 0891799d332..953e86d5b31 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit 0891799d3323e0ffb7d68b0f8a4b8b7de02dbfbc +Subproject commit 953e86d5b31dc057c88703d1cc2456a5fb050732 diff --git a/qtmultimedia b/qtmultimedia index 447d692bd45..0f1c8b8d203 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 447d692bd455d492d7c48b8a7f8eb9b7b34a32f6 +Subproject commit 0f1c8b8d203a78dbbe997016486a60a0fcf2cdce diff --git a/qtnetworkauth b/qtnetworkauth index 4ddfcd577c1..5b8d99898da 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 4ddfcd577c19ec35ea0b62922a250bb48f6cbdf0 +Subproject commit 5b8d99898da9706beb60fb923a41a33255c3043c diff --git a/qtopcua b/qtopcua index e7c92444ef7..87ccb280331 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit e7c92444ef74df359ad2e2c91ceb5fa5f825b80b +Subproject commit 87ccb280331db7446b8fbf434d9a7631ec7458d7 diff --git a/qtpositioning b/qtpositioning index c9ff0aeccc3..8bd4a48e3e1 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit c9ff0aeccc37df73e2c81a6c2a5cc4823011a5b7 +Subproject commit 8bd4a48e3e1814239dd575e4752045dd9ebe7675 diff --git a/qtquick3d b/qtquick3d index 16c50870971..4d21b321d5b 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 16c508709711bc882547da89c640db48ca0f9564 +Subproject commit 4d21b321d5b9de3714ca05a9237d42170798232c diff --git a/qtquick3dphysics b/qtquick3dphysics index 30645ddfe0c..8677f5aff18 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit 30645ddfe0ce50e94945cfa92a90f266bc23c994 +Subproject commit 8677f5aff18d22b7f0b1ce9689b36dbf176c9ca6 diff --git a/qtquickeffectmaker b/qtquickeffectmaker index 6178c8d7490..daec38998bf 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit 6178c8d7490e67820b128035998167a42a84529b +Subproject commit daec38998bf773fd66cd8d1ca8c362178495117c diff --git a/qtquicktimeline b/qtquicktimeline index c12e0bb5807..9fe7c024104 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit c12e0bb58078d2a6b4fa16a2fbea36aadeda4f69 +Subproject commit 9fe7c024104a2ca6bc46cedca18abc6a1962408c diff --git a/qtremoteobjects b/qtremoteobjects index 91cbb95be6e..2a4136a1aad 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 91cbb95be6e036f0d3b67a599fe559c068418aab +Subproject commit 2a4136a1aadfb3e8f9d4382824ca5a034e9fa870 diff --git a/qtscxml b/qtscxml index 79993bb87c1..d17753f21c5 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 79993bb87c16c79b861941c92083562c2ead9925 +Subproject commit d17753f21c590468145cb207ecf858165437d0b2 diff --git a/qtsensors b/qtsensors index 12754d05761..e8fcc259d0c 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 12754d05761b3278f2c707536857ea82c4d635da +Subproject commit e8fcc259d0c83b9f973a0fd7e7e9dc945a0b1421 diff --git a/qtserialbus b/qtserialbus index 115b70b2e6c..375f8b6012d 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 115b70b2e6c297e6ad8e6de99fbd406097d831ea +Subproject commit 375f8b6012d796e65f423d1d6b8e84d7144e7116 diff --git a/qtserialport b/qtserialport index a4bce248693..fea7f41b6dd 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit a4bce248693ebcf4913c0a0c17dc7d591399570a +Subproject commit fea7f41b6ddcdcdc36b52649fe2335891ba02fbb diff --git a/qtshadertools b/qtshadertools index 2706894e2f8..853f52508ce 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 2706894e2f8889f0da906541203093653c1f9344 +Subproject commit 853f52508ce1958f9bf42e30c6925f0685b5a090 diff --git a/qtspeech b/qtspeech index a4518f4564d..b98f176115d 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit a4518f4564d0e7d208c92bdb1722d2d67b3015b8 +Subproject commit b98f176115dee15ff977a466698e309a5fd3d6ab diff --git a/qtsvg b/qtsvg index 087f26a8681..84a151e5074 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 087f26a8681ad081add07325dab7816069b16245 +Subproject commit 84a151e50749005697ef363ba5df0382a893a2ce diff --git a/qttools b/qttools index 1639035dfbd..0cd8dda6775 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 1639035dfbdaadb225ae814720a3b502bf03bdb2 +Subproject commit 0cd8dda6775554b57d71c4cc905c1f36bde485f9 diff --git a/qttranslations b/qttranslations index 12b429b7106..cc4bc9e57e9 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 12b429b7106c0211e449bdc1f4ed69965eb54c9c +Subproject commit cc4bc9e57e9ed31d9bc3309cc8383956300a011f diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index dbe6ab905c8..896177fd617 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit dbe6ab905c89baabef8320f8e26edd5cda741f70 +Subproject commit 896177fd617216306cdf29de5b141c7d006386fb diff --git a/qtwayland b/qtwayland index d1da6121fc9..3bea0852f30 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit d1da6121fc91f02a2a9d89873b423cdb32930999 +Subproject commit 3bea0852f306dd61a2e1236470337ab17589dbd9 diff --git a/qtwebchannel b/qtwebchannel index 2c2559fe93c..1a698614e29 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 2c2559fe93ccf2683ed72c501c30332c86a99d69 +Subproject commit 1a698614e29ea98166331fefd9d2d653ed63c5fe diff --git a/qtwebengine b/qtwebengine index e20bd5347ea..e3e6bf6b050 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit e20bd5347eacf3a21df7c2cbecf374904faa5512 +Subproject commit e3e6bf6b050dd8ce3a17f546412aaf7760ad6369 diff --git a/qtwebsockets b/qtwebsockets index ffaed77f09c..614d8f00e59 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit ffaed77f09c325491f2c277a557ad380fea2c27d +Subproject commit 614d8f00e59a1f4c4212ed991d2f88d9140c7cc8 diff --git a/qtwebview b/qtwebview index 24d216d993d..9fd910c3b70 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 24d216d993dbf992095b90bf2a999f5e586c1072 +Subproject commit 9fd910c3b70c6c726097a35fb3cfe456255ae3fa From dee952b0dd0325eed5798f68da8670c6aa3e9926 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 26 Nov 2024 07:22:35 +0000 Subject: [PATCH 221/288] Update submodules on '6.8 in qt/qt5' Change-Id: Iab72a77009c14db3cb1f3fe0d9a8d6273ff11974 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 2b242c94007..64c1cc2e64d 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 2b242c94007f15d1db01b335135ebe8fa4b360f8 +Subproject commit 64c1cc2e64db96087130da4bcb60cc6e59c920d9 diff --git a/qt5compat b/qt5compat index 87ce2a79493..57fdad719ac 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 87ce2a79493a30aae96502af3bdf9cafd8ebebee +Subproject commit 57fdad719ac6a5bcb116788a4a9a5612da751bfa diff --git a/qtactiveqt b/qtactiveqt index a6c25bdfb29..15269f87013 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit a6c25bdfb299e5ebf64546dd043cd8ec6a363999 +Subproject commit 15269f8701352bf4800aedca124edc30bf70f20a diff --git a/qtbase b/qtbase index 5642b6fe7cd..4aa38ca8a6f 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 5642b6fe7cd84d3fa39d7285e314777cd3c00a4f +Subproject commit 4aa38ca8a6f0c18097fac4c50ee3dab5f98f753e diff --git a/qtcharts b/qtcharts index fed2d790860..0cb9699421b 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit fed2d79086050f26ba775c481519c24e66c2b9ec +Subproject commit 0cb9699421b8d6a5009688ec38dbf96ebf0be15c diff --git a/qtcoap b/qtcoap index 4efbf6f2841..225f798742f 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit 4efbf6f28414fc3763c33037fbe1295859451ca9 +Subproject commit 225f798742f5fb3f88a8352c87f2f75558d2b4e1 diff --git a/qtconnectivity b/qtconnectivity index e54f9a7a49b..107cbed6225 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit e54f9a7a49b3e5837bb04c929529a48343b89b97 +Subproject commit 107cbed622578f3c3a8c8a6bfa29ca99c0d7ecda diff --git a/qtdatavis3d b/qtdatavis3d index 5ba4a85d5d4..cc57b760a58 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 5ba4a85d5d46dd5817f0261c5d44f7da837e9931 +Subproject commit cc57b760a58c348b07bb0a1a2e2b403956091825 diff --git a/qtdeclarative b/qtdeclarative index eba5ac070a1..8aee3140a32 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit eba5ac070a1a35bf7acfef875f526970981d8692 +Subproject commit 8aee3140a329feb85afcc5eed5b50817c8c20bfd diff --git a/qtdoc b/qtdoc index 81e3a0a71e7..25c88918577 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 81e3a0a71e750a81843c1c690330c7caccb5086d +Subproject commit 25c88918577add7bc797839ec61aa7d62a67324a diff --git a/qtgraphs b/qtgraphs index 333d18a2c6e..2221fb2e443 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit 333d18a2c6e6a67e7f1bb5a10fa9a879cc00f325 +Subproject commit 2221fb2e44317eeef2f70b1acc4b765f67af7aaa diff --git a/qtgrpc b/qtgrpc index ec13e4f8bc3..7126a0e5663 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit ec13e4f8bc3fb3d64c59e90d49fe540f3b16b61c +Subproject commit 7126a0e566347eb4aaa0dc60338fe70b572f3f06 diff --git a/qthttpserver b/qthttpserver index 6eda34b4d00..fa38b9b8bc9 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit 6eda34b4d0065d739209f8ffd8f05fc7e65678b2 +Subproject commit fa38b9b8bc9fdade4985d56eb830f99ebceb01bc diff --git a/qtimageformats b/qtimageformats index 9a819827697..598b07173de 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 9a81982769792ddab522b16020e1f07a47bdd3ca +Subproject commit 598b07173deb78a39fdf980b2e2f8ae093f4a281 diff --git a/qtlanguageserver b/qtlanguageserver index 62b50dd6418..44e3c21b40e 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit 62b50dd6418d6cd3bd73f2ec8413210770abaf2b +Subproject commit 44e3c21b40e817b328a1b3004855897748fe6dfb diff --git a/qtlocation b/qtlocation index 2958d53f0a8..94bbd3c3ad4 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 2958d53f0a8b76ca68dc1cb21954c9bc3116ab35 +Subproject commit 94bbd3c3ad4442c6bcadcf04c6a6b9151a05c584 diff --git a/qtlottie b/qtlottie index 96521a0a369..93e97ea945d 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 96521a0a369500bc380345f02a48024718c55212 +Subproject commit 93e97ea945d6f87f49425e0cac477f25cb0f5ce8 diff --git a/qtmqtt b/qtmqtt index 953e86d5b31..34971366a6b 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit 953e86d5b31dc057c88703d1cc2456a5fb050732 +Subproject commit 34971366a6b3112021a321256e5bad3b0273a149 diff --git a/qtmultimedia b/qtmultimedia index 0f1c8b8d203..25d694f56e1 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 0f1c8b8d203a78dbbe997016486a60a0fcf2cdce +Subproject commit 25d694f56e1e95ad6442c0a3822bb4d0a60b33af diff --git a/qtnetworkauth b/qtnetworkauth index 5b8d99898da..54b02651e1b 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 5b8d99898da9706beb60fb923a41a33255c3043c +Subproject commit 54b02651e1bff589a2e6b25e6372f44774873be1 diff --git a/qtopcua b/qtopcua index 87ccb280331..fb05f8cbae0 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit 87ccb280331db7446b8fbf434d9a7631ec7458d7 +Subproject commit fb05f8cbae00327536fa9fc8c4c54cd603d1e6ec diff --git a/qtpositioning b/qtpositioning index 8bd4a48e3e1..16280581f96 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit 8bd4a48e3e1814239dd575e4752045dd9ebe7675 +Subproject commit 16280581f96ce7e5dd6ed1a7eb0d8a7a214458e3 diff --git a/qtquick3d b/qtquick3d index 4d21b321d5b..d07d9ca1eb1 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 4d21b321d5b9de3714ca05a9237d42170798232c +Subproject commit d07d9ca1eb1aaaf2441d16b75a94e5b4b14b55b2 diff --git a/qtquick3dphysics b/qtquick3dphysics index 8677f5aff18..8b852fb5ef6 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit 8677f5aff18d22b7f0b1ce9689b36dbf176c9ca6 +Subproject commit 8b852fb5ef63c9a5d6dc2030c602fe5f34fbb7e8 diff --git a/qtquickeffectmaker b/qtquickeffectmaker index daec38998bf..14f4948f96f 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit daec38998bf773fd66cd8d1ca8c362178495117c +Subproject commit 14f4948f96fb93ba4279ad25d25f7a3811d74a54 diff --git a/qtquicktimeline b/qtquicktimeline index 9fe7c024104..c512815cfd6 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 9fe7c024104a2ca6bc46cedca18abc6a1962408c +Subproject commit c512815cfd6eefe083d4be42dc8bdb79a26bc985 diff --git a/qtremoteobjects b/qtremoteobjects index 2a4136a1aad..a95e1fdeb6b 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 2a4136a1aadfb3e8f9d4382824ca5a034e9fa870 +Subproject commit a95e1fdeb6b6207fbf46a37106fc77086c78252a diff --git a/qtscxml b/qtscxml index d17753f21c5..5fb435ebcf3 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit d17753f21c590468145cb207ecf858165437d0b2 +Subproject commit 5fb435ebcf39f41392723ca8c5e23487a46237a9 diff --git a/qtsensors b/qtsensors index e8fcc259d0c..d7ef0c82467 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit e8fcc259d0c83b9f973a0fd7e7e9dc945a0b1421 +Subproject commit d7ef0c824675e676caecab5a07ce4cab586c346e diff --git a/qtserialbus b/qtserialbus index 375f8b6012d..8bf97a2aac9 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 375f8b6012d796e65f423d1d6b8e84d7144e7116 +Subproject commit 8bf97a2aac9941d0a944146930582065e26ab47b diff --git a/qtserialport b/qtserialport index fea7f41b6dd..b32a440554a 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit fea7f41b6ddcdcdc36b52649fe2335891ba02fbb +Subproject commit b32a440554a089e4964d8acca83797ef02bdf1c0 diff --git a/qtshadertools b/qtshadertools index 853f52508ce..de901773a87 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 853f52508ce1958f9bf42e30c6925f0685b5a090 +Subproject commit de901773a87dfe29111a65fa6447c886280292be diff --git a/qtspeech b/qtspeech index b98f176115d..797c8637655 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit b98f176115dee15ff977a466698e309a5fd3d6ab +Subproject commit 797c863765523a8136a8967112af54cf72f5e7f4 diff --git a/qtsvg b/qtsvg index 84a151e5074..00cb1187e08 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 84a151e50749005697ef363ba5df0382a893a2ce +Subproject commit 00cb1187e080582a3d8e1af7ff68a003f739b6d6 diff --git a/qttools b/qttools index 0cd8dda6775..5005193da80 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 0cd8dda6775554b57d71c4cc905c1f36bde485f9 +Subproject commit 5005193da801151e813e5ef252a09067ac9bb7ac diff --git a/qttranslations b/qttranslations index cc4bc9e57e9..8119bd18e5b 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit cc4bc9e57e9ed31d9bc3309cc8383956300a011f +Subproject commit 8119bd18e5b1de3da661831b9d11b692acdb7bcb diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 896177fd617..a182ba45169 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 896177fd617216306cdf29de5b141c7d006386fb +Subproject commit a182ba45169f77814fe1982e2ab2b87d3d9a71c3 diff --git a/qtwayland b/qtwayland index 3bea0852f30..9998fa80051 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 3bea0852f306dd61a2e1236470337ab17589dbd9 +Subproject commit 9998fa80051adee0f9041d1023230f5a0fd8bfa8 diff --git a/qtwebchannel b/qtwebchannel index 1a698614e29..e2369232b32 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 1a698614e29ea98166331fefd9d2d653ed63c5fe +Subproject commit e2369232b32e7a3d82b4f95ff8e13b498d84b605 diff --git a/qtwebengine b/qtwebengine index e3e6bf6b050..08b3a4086ae 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit e3e6bf6b050dd8ce3a17f546412aaf7760ad6369 +Subproject commit 08b3a4086ae970183cce50d1ae49dd340bd97fc7 diff --git a/qtwebsockets b/qtwebsockets index 614d8f00e59..b498d48432c 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 614d8f00e59a1f4c4212ed991d2f88d9140c7cc8 +Subproject commit b498d48432cbd41b4c09459435f5ac3837763dc8 diff --git a/qtwebview b/qtwebview index 9fd910c3b70..dab01de0523 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 9fd910c3b70c6c726097a35fb3cfe456255ae3fa +Subproject commit dab01de05238cc7e2cd32203619aa9c4e5fd357c From 08d194ac9d2f25e79d4e680835b5413a5eb676c2 Mon Sep 17 00:00:00 2001 From: Elias Toivola Date: Fri, 3 May 2024 11:39:56 +0300 Subject: [PATCH 222/288] Install more packages for Ubuntu 22.04 arm64 for RTA MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-6212 Change-Id: I47376ebe1bf3bcded2621ee5a416a98f40343ab8 (cherry picked from commit 46be92729a692e470ae29ab597cd3a5a2102db4b) Reviewed-by: Simo Fält --- coin/provisioning/qtci-linux-Ubuntu-22.04-aarch64/02-apt.sh | 6 ++++++ 1 file changed, 6 insertions(+) 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 1727d896c54..bb4dfc68fe7 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 @@ -44,6 +44,12 @@ installPackages+=(p7zip-full) # Packages needed for RTA and Squish installPackages+=(openjdk-17-jdk) installPackages+=(gcc) +installPackages+=(curl) +installPackages+=(libicu-dev) +installPackages+=(python3-dev) +installPackages+=(python3-pip) +installPackages+=(python3-venv) +installPackages+=(virtualenv) echo "Running update for apt" waitLoop From 5ccfd0ab2285ca69da2a2eefa2b35f62b2c2517c Mon Sep 17 00:00:00 2001 From: Elias Toivola Date: Thu, 26 Sep 2024 13:34:38 +0300 Subject: [PATCH 223/288] Ubuntu 22.04 arm64: install NFS packages for Squish MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ubuntu 22 arm64 target is missing packages to mount ci-files01 for Squish. Task-number: QTQAINFRA-6212 Change-Id: Ia5c38f12f2c6ce8ff19d2d46ce1e46f6e1c627f0 (cherry picked from commit 64bd882464eb742f644a93a20a274607713fdff5) Reviewed-by: Simo Fält --- coin/provisioning/qtci-linux-Ubuntu-22.04-aarch64/02-apt.sh | 2 ++ 1 file changed, 2 insertions(+) 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 bb4dfc68fe7..8395b22ae05 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 @@ -50,6 +50,8 @@ installPackages+=(python3-dev) installPackages+=(python3-pip) installPackages+=(python3-venv) installPackages+=(virtualenv) +# For mounting ci-files01 for Squish +installPackages+=(nfs-common) echo "Running update for apt" waitLoop From d18c70e9043ec93a2051b27da6ed176115673e07 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 27 Nov 2024 16:33:11 +0000 Subject: [PATCH 224/288] Update submodules on '6.8 in qt/qt5' Change-Id: I26be68cf20dc009cd3a1f138b7505592c8823aab 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 64c1cc2e64d..b71751b72fb 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 64c1cc2e64db96087130da4bcb60cc6e59c920d9 +Subproject commit b71751b72fb184ad8d17dc320c299e55efff171f diff --git a/qt5compat b/qt5compat index 57fdad719ac..2d829aab293 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 57fdad719ac6a5bcb116788a4a9a5612da751bfa +Subproject commit 2d829aab293f55f2e1ff34d6599427c714e1004d diff --git a/qtactiveqt b/qtactiveqt index 15269f87013..8638af16688 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 15269f8701352bf4800aedca124edc30bf70f20a +Subproject commit 8638af166880fe89d3479dc18d05406aba0dd829 diff --git a/qtbase b/qtbase index 4aa38ca8a6f..a1c74e054c0 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 4aa38ca8a6f0c18097fac4c50ee3dab5f98f753e +Subproject commit a1c74e054c056dc30c015a4a60e99eeba4f73663 diff --git a/qtcharts b/qtcharts index 0cb9699421b..eaa33777107 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 0cb9699421b8d6a5009688ec38dbf96ebf0be15c +Subproject commit eaa33777107788e77de78acdaf7a44fb03e0e2e8 diff --git a/qtcoap b/qtcoap index 225f798742f..26c1328c72e 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit 225f798742f5fb3f88a8352c87f2f75558d2b4e1 +Subproject commit 26c1328c72e50ab0040f17a20baf126073d96f61 diff --git a/qtconnectivity b/qtconnectivity index 107cbed6225..b3f7bb204ad 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 107cbed622578f3c3a8c8a6bfa29ca99c0d7ecda +Subproject commit b3f7bb204ad4a768d168ba2a90a1116ceb357828 diff --git a/qtdatavis3d b/qtdatavis3d index cc57b760a58..2da5bc56b2e 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit cc57b760a58c348b07bb0a1a2e2b403956091825 +Subproject commit 2da5bc56b2e8405352b362c345ffcf7185418676 diff --git a/qtdeclarative b/qtdeclarative index 8aee3140a32..b0e84f58e62 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 8aee3140a329feb85afcc5eed5b50817c8c20bfd +Subproject commit b0e84f58e62b3d3f708bc4ede495c3ba054b4f48 diff --git a/qtdoc b/qtdoc index 25c88918577..1985d430cbe 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 25c88918577add7bc797839ec61aa7d62a67324a +Subproject commit 1985d430cbe2431b98f521713f5064477dcaeca5 diff --git a/qtgraphs b/qtgraphs index 2221fb2e443..9bbb6da180e 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit 2221fb2e44317eeef2f70b1acc4b765f67af7aaa +Subproject commit 9bbb6da180e59530b7735c8053187f69e6aee510 diff --git a/qtgrpc b/qtgrpc index 7126a0e5663..bc08699ac00 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit 7126a0e566347eb4aaa0dc60338fe70b572f3f06 +Subproject commit bc08699ac008609e4cef8aca75ce97bf729bb93c diff --git a/qthttpserver b/qthttpserver index fa38b9b8bc9..d8f6f4243bb 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit fa38b9b8bc9fdade4985d56eb830f99ebceb01bc +Subproject commit d8f6f4243bb1e05164d5d11191d63495e233a9d8 diff --git a/qtimageformats b/qtimageformats index 598b07173de..7d760e0995c 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 598b07173deb78a39fdf980b2e2f8ae093f4a281 +Subproject commit 7d760e0995c14b3b318563135db9fdc8353bb741 diff --git a/qtlanguageserver b/qtlanguageserver index 44e3c21b40e..aea7e1c08db 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit 44e3c21b40e817b328a1b3004855897748fe6dfb +Subproject commit aea7e1c08dbdc01e663e4cdae58d4f6898769249 diff --git a/qtlocation b/qtlocation index 94bbd3c3ad4..aa1cac95d75 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 94bbd3c3ad4442c6bcadcf04c6a6b9151a05c584 +Subproject commit aa1cac95d75ceeca124448eeb91373c1d2ee6454 diff --git a/qtlottie b/qtlottie index 93e97ea945d..9c4a6a286dd 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 93e97ea945d6f87f49425e0cac477f25cb0f5ce8 +Subproject commit 9c4a6a286ddcce960e6bbf6206cc0ef5eb5174b7 diff --git a/qtmqtt b/qtmqtt index 34971366a6b..50bb1d590cb 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit 34971366a6b3112021a321256e5bad3b0273a149 +Subproject commit 50bb1d590cbd39f91940cc39040d8cc072030ffc diff --git a/qtmultimedia b/qtmultimedia index 25d694f56e1..2c06d4b9c8b 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 25d694f56e1e95ad6442c0a3822bb4d0a60b33af +Subproject commit 2c06d4b9c8b2cdb219d8c912f7073196f6173301 diff --git a/qtnetworkauth b/qtnetworkauth index 54b02651e1b..c8b2a725d29 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 54b02651e1bff589a2e6b25e6372f44774873be1 +Subproject commit c8b2a725d299581883ed8c13896259163bf3420f diff --git a/qtopcua b/qtopcua index fb05f8cbae0..1404a524469 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit fb05f8cbae00327536fa9fc8c4c54cd603d1e6ec +Subproject commit 1404a524469a3d3928bc29c8f37ba4de305b88e7 diff --git a/qtpositioning b/qtpositioning index 16280581f96..b91194679c7 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit 16280581f96ce7e5dd6ed1a7eb0d8a7a214458e3 +Subproject commit b91194679c7a5e2ce9bde52b3df00a93bce09911 diff --git a/qtquick3d b/qtquick3d index d07d9ca1eb1..06fda36f67b 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit d07d9ca1eb1aaaf2441d16b75a94e5b4b14b55b2 +Subproject commit 06fda36f67b7d12d43ca032b7b5f098acb266791 diff --git a/qtquick3dphysics b/qtquick3dphysics index 8b852fb5ef6..6d040e051e1 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit 8b852fb5ef63c9a5d6dc2030c602fe5f34fbb7e8 +Subproject commit 6d040e051e12c16b1446c2648d998633dda3af0e diff --git a/qtquickeffectmaker b/qtquickeffectmaker index 14f4948f96f..749617f747a 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit 14f4948f96fb93ba4279ad25d25f7a3811d74a54 +Subproject commit 749617f747ae0d9b3642a7413bb08f7324518121 diff --git a/qtquicktimeline b/qtquicktimeline index c512815cfd6..f25fdbfa28b 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit c512815cfd6eefe083d4be42dc8bdb79a26bc985 +Subproject commit f25fdbfa28be6a718e2349a873f16e9148385615 diff --git a/qtremoteobjects b/qtremoteobjects index a95e1fdeb6b..448a0655737 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit a95e1fdeb6b6207fbf46a37106fc77086c78252a +Subproject commit 448a0655737091e1a6ccbbf9090e5c36b9a61f62 diff --git a/qtscxml b/qtscxml index 5fb435ebcf3..b0ac33e6385 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 5fb435ebcf39f41392723ca8c5e23487a46237a9 +Subproject commit b0ac33e6385be3d74c214dff5494ededeeba8678 diff --git a/qtsensors b/qtsensors index d7ef0c82467..991587d4647 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit d7ef0c824675e676caecab5a07ce4cab586c346e +Subproject commit 991587d46478dd2ef693053881c1ceeacf6be819 diff --git a/qtserialbus b/qtserialbus index 8bf97a2aac9..8902252d880 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 8bf97a2aac9941d0a944146930582065e26ab47b +Subproject commit 8902252d880e0df1046664f605148da588c1783d diff --git a/qtserialport b/qtserialport index b32a440554a..fca624f20e5 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit b32a440554a089e4964d8acca83797ef02bdf1c0 +Subproject commit fca624f20e5d3ead4788eb5a8650bbecd4a844ca diff --git a/qtshadertools b/qtshadertools index de901773a87..7e25df2b37f 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit de901773a87dfe29111a65fa6447c886280292be +Subproject commit 7e25df2b37f641ea944199810b55e1f9070c5c73 diff --git a/qtspeech b/qtspeech index 797c8637655..c13a0ef6a75 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 797c863765523a8136a8967112af54cf72f5e7f4 +Subproject commit c13a0ef6a7559bdea59a0c7a4c734c3bcd138730 diff --git a/qtsvg b/qtsvg index 00cb1187e08..91abd0bb775 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 00cb1187e080582a3d8e1af7ff68a003f739b6d6 +Subproject commit 91abd0bb775033a6acf580fc8fd9a76cc52d2578 diff --git a/qttools b/qttools index 5005193da80..fed01a3f284 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 5005193da801151e813e5ef252a09067ac9bb7ac +Subproject commit fed01a3f28459de21f00734e267bcbbe2b3df966 diff --git a/qttranslations b/qttranslations index 8119bd18e5b..016bc00cd06 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 8119bd18e5b1de3da661831b9d11b692acdb7bcb +Subproject commit 016bc00cd069cfb57db66bc1d911a3d197bf0bbe diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index a182ba45169..ac4ca47db5e 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit a182ba45169f77814fe1982e2ab2b87d3d9a71c3 +Subproject commit ac4ca47db5e44363648595fe59ec536dc14c2aff diff --git a/qtwayland b/qtwayland index 9998fa80051..5f7049b0c02 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 9998fa80051adee0f9041d1023230f5a0fd8bfa8 +Subproject commit 5f7049b0c02690fe50b705674611f09e1638e5ac diff --git a/qtwebchannel b/qtwebchannel index e2369232b32..7431b98939b 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit e2369232b32e7a3d82b4f95ff8e13b498d84b605 +Subproject commit 7431b98939b163cb75ed3cb4f56f696fc39cf7ad diff --git a/qtwebengine b/qtwebengine index 08b3a4086ae..a160ee920f5 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 08b3a4086ae970183cce50d1ae49dd340bd97fc7 +Subproject commit a160ee920f5e37e6c86f7631e2a1c299c7eff2eb diff --git a/qtwebsockets b/qtwebsockets index b498d48432c..402e37985e0 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit b498d48432cbd41b4c09459435f5ac3837763dc8 +Subproject commit 402e37985e0f8b6d197761f9ec95c953e84416d3 diff --git a/qtwebview b/qtwebview index dab01de0523..52d05132beb 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit dab01de05238cc7e2cd32203619aa9c4e5fd357c +Subproject commit 52d05132beba5a82a7590cc0c6117b42da6682d4 From b237f313998006cbfcabf8f4c88a769a15fb28c8 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 4 Dec 2024 05:54:23 +0000 Subject: [PATCH 225/288] Update submodules on '6.8 in qt/qt5' Change-Id: I19ddce8b5e597b5979ed55165e0a3ef9a44eb727 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 b71751b72fb..fb4e931a4f0 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit b71751b72fb184ad8d17dc320c299e55efff171f +Subproject commit fb4e931a4f0fa2a5227b2921011182479f053c40 diff --git a/qt5compat b/qt5compat index 2d829aab293..7c934a522d5 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 2d829aab293f55f2e1ff34d6599427c714e1004d +Subproject commit 7c934a522d583f51b335ba7b2f495839f9769223 diff --git a/qtactiveqt b/qtactiveqt index 8638af16688..9cf07a44a14 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 8638af166880fe89d3479dc18d05406aba0dd829 +Subproject commit 9cf07a44a144811907137a4e61027905acf8e0f7 diff --git a/qtbase b/qtbase index a1c74e054c0..cdd257c6742 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit a1c74e054c056dc30c015a4a60e99eeba4f73663 +Subproject commit cdd257c6742585c6ef1fb47fd44bbed8a642624c diff --git a/qtcharts b/qtcharts index eaa33777107..f7ffc7dee9f 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit eaa33777107788e77de78acdaf7a44fb03e0e2e8 +Subproject commit f7ffc7dee9fda50b0aebefc1639e51ccc385488c diff --git a/qtcoap b/qtcoap index 26c1328c72e..b3c77f99d15 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit 26c1328c72e50ab0040f17a20baf126073d96f61 +Subproject commit b3c77f99d153fbc998b1e9de630240953f44fb97 diff --git a/qtconnectivity b/qtconnectivity index b3f7bb204ad..a2b007af5b0 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit b3f7bb204ad4a768d168ba2a90a1116ceb357828 +Subproject commit a2b007af5b07bb0100da7880d4ed2d643b709e77 diff --git a/qtdatavis3d b/qtdatavis3d index 2da5bc56b2e..71766e6a08c 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 2da5bc56b2e8405352b362c345ffcf7185418676 +Subproject commit 71766e6a08cfbe66cee6ff487d5294edf175dfce diff --git a/qtdeclarative b/qtdeclarative index b0e84f58e62..0011dad7f1f 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit b0e84f58e62b3d3f708bc4ede495c3ba054b4f48 +Subproject commit 0011dad7f1f4f0945ae17876146619719b723e4d diff --git a/qtdoc b/qtdoc index 1985d430cbe..d61bba7c826 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 1985d430cbe2431b98f521713f5064477dcaeca5 +Subproject commit d61bba7c82667c2f972b72ead946c9ecba0931b8 diff --git a/qtgraphs b/qtgraphs index 9bbb6da180e..a07ba9912e8 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit 9bbb6da180e59530b7735c8053187f69e6aee510 +Subproject commit a07ba9912e82ede54e5df4a4bf0627876d7c2086 diff --git a/qtgrpc b/qtgrpc index bc08699ac00..e82a2a4d20a 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit bc08699ac008609e4cef8aca75ce97bf729bb93c +Subproject commit e82a2a4d20abf4b1a225efa1930b99a386d00a79 diff --git a/qthttpserver b/qthttpserver index d8f6f4243bb..023303f13e3 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit d8f6f4243bb1e05164d5d11191d63495e233a9d8 +Subproject commit 023303f13e34f58d0d6acbfdf844a028227bf05b diff --git a/qtimageformats b/qtimageformats index 7d760e0995c..ab03057daf1 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 7d760e0995c14b3b318563135db9fdc8353bb741 +Subproject commit ab03057daf14e654b42ca833c296ee6b8366fc72 diff --git a/qtlanguageserver b/qtlanguageserver index aea7e1c08db..1f5900565c0 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit aea7e1c08dbdc01e663e4cdae58d4f6898769249 +Subproject commit 1f5900565c0f4fb7228c9e05e0dbeabf9175084c diff --git a/qtlocation b/qtlocation index aa1cac95d75..b0c4136e1f4 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit aa1cac95d75ceeca124448eeb91373c1d2ee6454 +Subproject commit b0c4136e1f47a3dbdea225cc3dae42c0969a3435 diff --git a/qtlottie b/qtlottie index 9c4a6a286dd..493c9354115 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 9c4a6a286ddcce960e6bbf6206cc0ef5eb5174b7 +Subproject commit 493c9354115ca1d95b39e4769203a2a579642389 diff --git a/qtmqtt b/qtmqtt index 50bb1d590cb..de7d7eb13cf 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit 50bb1d590cbd39f91940cc39040d8cc072030ffc +Subproject commit de7d7eb13cf12f9dbd618ca948c71aedc792d89d diff --git a/qtmultimedia b/qtmultimedia index 2c06d4b9c8b..f97716685db 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 2c06d4b9c8b2cdb219d8c912f7073196f6173301 +Subproject commit f97716685db39441f55665b9f668acf41657b0ea diff --git a/qtnetworkauth b/qtnetworkauth index c8b2a725d29..369803605b1 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit c8b2a725d299581883ed8c13896259163bf3420f +Subproject commit 369803605b19afd3150195ddf73f837336deac55 diff --git a/qtopcua b/qtopcua index 1404a524469..6dadbc9a9ed 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit 1404a524469a3d3928bc29c8f37ba4de305b88e7 +Subproject commit 6dadbc9a9ed86a258aed2632810ba4e02b1e287d diff --git a/qtpositioning b/qtpositioning index b91194679c7..e2012e7529c 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit b91194679c7a5e2ce9bde52b3df00a93bce09911 +Subproject commit e2012e7529c83953e64e9dbee0cbcb2423960bc3 diff --git a/qtquick3d b/qtquick3d index 06fda36f67b..838611fbb5d 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 06fda36f67b7d12d43ca032b7b5f098acb266791 +Subproject commit 838611fbb5d823132d6c749bab371f3a2a83c5c0 diff --git a/qtquick3dphysics b/qtquick3dphysics index 6d040e051e1..fa55192503a 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit 6d040e051e12c16b1446c2648d998633dda3af0e +Subproject commit fa55192503a41cd49b5f008ef00d51f1747f2eff diff --git a/qtquickeffectmaker b/qtquickeffectmaker index 749617f747a..84ad3768993 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit 749617f747ae0d9b3642a7413bb08f7324518121 +Subproject commit 84ad376899337e49d66cc2909264ea08ef134c5e diff --git a/qtquicktimeline b/qtquicktimeline index f25fdbfa28b..7175c9426f4 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit f25fdbfa28be6a718e2349a873f16e9148385615 +Subproject commit 7175c9426f4947c536b5eef4a77f2777646c148c diff --git a/qtremoteobjects b/qtremoteobjects index 448a0655737..50cc8237d01 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 448a0655737091e1a6ccbbf9090e5c36b9a61f62 +Subproject commit 50cc8237d01820e44bfba9798b7b7eb1a6ee9e6d diff --git a/qtscxml b/qtscxml index b0ac33e6385..6d88d7b6e21 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit b0ac33e6385be3d74c214dff5494ededeeba8678 +Subproject commit 6d88d7b6e21279003f1c828b005306f276ed66e6 diff --git a/qtsensors b/qtsensors index 991587d4647..588612e2e2d 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 991587d46478dd2ef693053881c1ceeacf6be819 +Subproject commit 588612e2e2d64e04f444a5d28321090cd0945958 diff --git a/qtserialbus b/qtserialbus index 8902252d880..509e496d4ec 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 8902252d880e0df1046664f605148da588c1783d +Subproject commit 509e496d4ecb33d71c043dd7e9617570a7d1839e diff --git a/qtserialport b/qtserialport index fca624f20e5..82cbb19ed3c 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit fca624f20e5d3ead4788eb5a8650bbecd4a844ca +Subproject commit 82cbb19ed3c2434083f877407fe2fc25dcf58f5c diff --git a/qtshadertools b/qtshadertools index 7e25df2b37f..f87e3176af8 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 7e25df2b37f641ea944199810b55e1f9070c5c73 +Subproject commit f87e3176af83cf0481cb6de5366fbfd7de1d9487 diff --git a/qtspeech b/qtspeech index c13a0ef6a75..c106007cbb6 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit c13a0ef6a7559bdea59a0c7a4c734c3bcd138730 +Subproject commit c106007cbb62d258e7b30f6b017fea85cb9a7fcc diff --git a/qtsvg b/qtsvg index 91abd0bb775..b6ea339ce34 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 91abd0bb775033a6acf580fc8fd9a76cc52d2578 +Subproject commit b6ea339ce3429fcde457d4cbf7066102dda6babb diff --git a/qttools b/qttools index fed01a3f284..0d6b5c5fe5a 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit fed01a3f28459de21f00734e267bcbbe2b3df966 +Subproject commit 0d6b5c5fe5aa635d59c923c93377da1cd03f3e88 diff --git a/qttranslations b/qttranslations index 016bc00cd06..0c9efa01700 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 016bc00cd069cfb57db66bc1d911a3d197bf0bbe +Subproject commit 0c9efa017000c56946383b9959b4681ade63439c diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index ac4ca47db5e..aaccb9d7e86 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit ac4ca47db5e44363648595fe59ec536dc14c2aff +Subproject commit aaccb9d7e86b7faf5505e216426082cc27400e92 diff --git a/qtwayland b/qtwayland index 5f7049b0c02..a7486633d06 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 5f7049b0c02690fe50b705674611f09e1638e5ac +Subproject commit a7486633d06eab290400e47279d0996bcbf260c8 diff --git a/qtwebchannel b/qtwebchannel index 7431b98939b..1449463a3c9 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 7431b98939b163cb75ed3cb4f56f696fc39cf7ad +Subproject commit 1449463a3c956468309e53b2924da13d78b9e9dc diff --git a/qtwebengine b/qtwebengine index a160ee920f5..45e9cb61d96 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit a160ee920f5e37e6c86f7631e2a1c299c7eff2eb +Subproject commit 45e9cb61d96dc5fda1e783bcb3b07d7a9e207692 diff --git a/qtwebsockets b/qtwebsockets index 402e37985e0..1152ae259b0 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 402e37985e0f8b6d197761f9ec95c953e84416d3 +Subproject commit 1152ae259b079141ee9a18703f460ab495c59f9b diff --git a/qtwebview b/qtwebview index 52d05132beb..d093df2d80b 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 52d05132beba5a82a7590cc0c6117b42da6682d4 +Subproject commit d093df2d80b1aa6344937ce5b75af8ad7b16e0bf From d35962050eb6b0712565f27dd38dd20a24589834 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 13 Dec 2024 16:14:55 +0000 Subject: [PATCH 226/288] Update submodules on '6.8 in qt/qt5' Change-Id: If67ee65967de04d34045f113c3a50d5500e18daf 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 fb4e931a4f0..24bb273b9f4 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit fb4e931a4f0fa2a5227b2921011182479f053c40 +Subproject commit 24bb273b9f456d54bcb48ca3c04fbc65719f32b6 diff --git a/qt5compat b/qt5compat index 7c934a522d5..07d78ff4bd9 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 7c934a522d583f51b335ba7b2f495839f9769223 +Subproject commit 07d78ff4bd9a483ec127f4e76bad066228fda34a diff --git a/qtactiveqt b/qtactiveqt index 9cf07a44a14..90d146c9c7d 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 9cf07a44a144811907137a4e61027905acf8e0f7 +Subproject commit 90d146c9c7d3bf7c311dda2e1a07c5cee1cad93f diff --git a/qtbase b/qtbase index cdd257c6742..4f2c976b7e9 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit cdd257c6742585c6ef1fb47fd44bbed8a642624c +Subproject commit 4f2c976b7e9c6835610a6860c012a70ccb9a6ec3 diff --git a/qtcharts b/qtcharts index f7ffc7dee9f..e5a8b0683f7 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit f7ffc7dee9fda50b0aebefc1639e51ccc385488c +Subproject commit e5a8b0683f7defcd81d1686c8670259282f03f0a diff --git a/qtcoap b/qtcoap index b3c77f99d15..b3643f1f64a 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit b3c77f99d153fbc998b1e9de630240953f44fb97 +Subproject commit b3643f1f64ab7dd0019cd57d396fddb3f374b179 diff --git a/qtconnectivity b/qtconnectivity index a2b007af5b0..dd4ae88506c 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit a2b007af5b07bb0100da7880d4ed2d643b709e77 +Subproject commit dd4ae88506cc3207905ce9ac79ae8b708197eb1d diff --git a/qtdatavis3d b/qtdatavis3d index 71766e6a08c..59a4d84063e 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 71766e6a08cfbe66cee6ff487d5294edf175dfce +Subproject commit 59a4d84063eb3ce331d13f681d4cca47f6eada0d diff --git a/qtdeclarative b/qtdeclarative index 0011dad7f1f..ac6425d3eca 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 0011dad7f1f4f0945ae17876146619719b723e4d +Subproject commit ac6425d3eca23da0463d68e61de912079aea17ab diff --git a/qtdoc b/qtdoc index d61bba7c826..3f034d6917c 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit d61bba7c82667c2f972b72ead946c9ecba0931b8 +Subproject commit 3f034d6917c1098492de94740b2d88d2efc54e29 diff --git a/qtgraphs b/qtgraphs index a07ba9912e8..30713588006 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit a07ba9912e82ede54e5df4a4bf0627876d7c2086 +Subproject commit 307135880060746a42c75134e5234742cdc065f9 diff --git a/qtgrpc b/qtgrpc index e82a2a4d20a..0d1c8556908 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit e82a2a4d20abf4b1a225efa1930b99a386d00a79 +Subproject commit 0d1c85569081374d340a11e993a1c188a64aa82e diff --git a/qthttpserver b/qthttpserver index 023303f13e3..8e3223a5a87 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit 023303f13e34f58d0d6acbfdf844a028227bf05b +Subproject commit 8e3223a5a87420d64eb8fb03f68d58df8b079ae1 diff --git a/qtimageformats b/qtimageformats index ab03057daf1..9dd45f8d4d5 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit ab03057daf14e654b42ca833c296ee6b8366fc72 +Subproject commit 9dd45f8d4d5a7a071205d9f74a21eb20816f7f99 diff --git a/qtlanguageserver b/qtlanguageserver index 1f5900565c0..b9accf0f62d 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit 1f5900565c0f4fb7228c9e05e0dbeabf9175084c +Subproject commit b9accf0f62d45922b42d06a206082a319f15bb63 diff --git a/qtlocation b/qtlocation index b0c4136e1f4..d43377ae2d7 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit b0c4136e1f47a3dbdea225cc3dae42c0969a3435 +Subproject commit d43377ae2d75aec88dc5519836defe5604e4e22b diff --git a/qtlottie b/qtlottie index 493c9354115..6376baf2c43 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 493c9354115ca1d95b39e4769203a2a579642389 +Subproject commit 6376baf2c43fbec931a53843c4cc41c8256b1466 diff --git a/qtmqtt b/qtmqtt index de7d7eb13cf..3fc7d8824e1 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit de7d7eb13cf12f9dbd618ca948c71aedc792d89d +Subproject commit 3fc7d8824e1de6eaefd0afb8ab49d4a22978f3ef diff --git a/qtmultimedia b/qtmultimedia index f97716685db..e88b898b257 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit f97716685db39441f55665b9f668acf41657b0ea +Subproject commit e88b898b2576f7825293eea0c12c55cbecf19865 diff --git a/qtnetworkauth b/qtnetworkauth index 369803605b1..965f0e0975c 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 369803605b19afd3150195ddf73f837336deac55 +Subproject commit 965f0e0975c0258f2bb96c059de34149c9761968 diff --git a/qtopcua b/qtopcua index 6dadbc9a9ed..5f220e7256e 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit 6dadbc9a9ed86a258aed2632810ba4e02b1e287d +Subproject commit 5f220e7256ee932eb71a832d0e2ef8b21a17e7f6 diff --git a/qtpositioning b/qtpositioning index e2012e7529c..a943bda6f48 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit e2012e7529c83953e64e9dbee0cbcb2423960bc3 +Subproject commit a943bda6f483f3faa60127220035023bca17cce8 diff --git a/qtquick3d b/qtquick3d index 838611fbb5d..5a3e04a5648 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 838611fbb5d823132d6c749bab371f3a2a83c5c0 +Subproject commit 5a3e04a56480b7f76628fd01a49bde3ef6a4d77a diff --git a/qtquick3dphysics b/qtquick3dphysics index fa55192503a..5477f7063dc 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit fa55192503a41cd49b5f008ef00d51f1747f2eff +Subproject commit 5477f7063dc07f0bece1b63472faee535e396459 diff --git a/qtquickeffectmaker b/qtquickeffectmaker index 84ad3768993..c2e0319783b 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit 84ad376899337e49d66cc2909264ea08ef134c5e +Subproject commit c2e0319783bcafbc0f20ddd0470729d50aae78f5 diff --git a/qtquicktimeline b/qtquicktimeline index 7175c9426f4..1846f0bc549 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 7175c9426f4947c536b5eef4a77f2777646c148c +Subproject commit 1846f0bc549492df0e0b0b75ba9fd5770101f2c1 diff --git a/qtremoteobjects b/qtremoteobjects index 50cc8237d01..c05686076fa 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 50cc8237d01820e44bfba9798b7b7eb1a6ee9e6d +Subproject commit c05686076fabf0342492705c6555376aedbcd6d8 diff --git a/qtscxml b/qtscxml index 6d88d7b6e21..1478fd2cc93 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 6d88d7b6e21279003f1c828b005306f276ed66e6 +Subproject commit 1478fd2cc93cfea2e0715232ac6204105fdcb25c diff --git a/qtsensors b/qtsensors index 588612e2e2d..2f608a14e3d 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 588612e2e2d64e04f444a5d28321090cd0945958 +Subproject commit 2f608a14e3d4229eb5954b915437937d02022ab7 diff --git a/qtserialbus b/qtserialbus index 509e496d4ec..91fc8552ad8 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 509e496d4ecb33d71c043dd7e9617570a7d1839e +Subproject commit 91fc8552ad856a30749a9c09f556a5009430b329 diff --git a/qtserialport b/qtserialport index 82cbb19ed3c..653b1991ce7 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 82cbb19ed3c2434083f877407fe2fc25dcf58f5c +Subproject commit 653b1991ce78e73c6d14531179c4003d28826c30 diff --git a/qtshadertools b/qtshadertools index f87e3176af8..ba46d1558a1 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit f87e3176af83cf0481cb6de5366fbfd7de1d9487 +Subproject commit ba46d1558a135dd86e599b97ef5a61fb4d3de850 diff --git a/qtspeech b/qtspeech index c106007cbb6..fbe99891099 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit c106007cbb62d258e7b30f6b017fea85cb9a7fcc +Subproject commit fbe9989109969a67e15475010d4c90ca73cff652 diff --git a/qtsvg b/qtsvg index b6ea339ce34..f3944b67ec0 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit b6ea339ce3429fcde457d4cbf7066102dda6babb +Subproject commit f3944b67ec0e76a467c5bf26d8b72008456c12f8 diff --git a/qttools b/qttools index 0d6b5c5fe5a..f2dbab334df 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 0d6b5c5fe5aa635d59c923c93377da1cd03f3e88 +Subproject commit f2dbab334df5b001bd38d6b29f910f87fdaf5ab6 diff --git a/qttranslations b/qttranslations index 0c9efa01700..63eaf0025b7 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 0c9efa017000c56946383b9959b4681ade63439c +Subproject commit 63eaf0025b76f018b6790ceb709c579fb983f53f diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index aaccb9d7e86..96f41867160 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit aaccb9d7e86b7faf5505e216426082cc27400e92 +Subproject commit 96f418671603107adf702988fdc7e0c60644643c diff --git a/qtwayland b/qtwayland index a7486633d06..fcb5006c5d6 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit a7486633d06eab290400e47279d0996bcbf260c8 +Subproject commit fcb5006c5d6c009b34fdf1a35270272638b28592 diff --git a/qtwebchannel b/qtwebchannel index 1449463a3c9..7bf5f5a79bb 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 1449463a3c956468309e53b2924da13d78b9e9dc +Subproject commit 7bf5f5a79bb815bf82d7c1a4fabc99083ff957b5 diff --git a/qtwebengine b/qtwebengine index 45e9cb61d96..e7c9f9a7ddc 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 45e9cb61d96dc5fda1e783bcb3b07d7a9e207692 +Subproject commit e7c9f9a7ddca8fec772c893422b2eac4b12066d8 diff --git a/qtwebsockets b/qtwebsockets index 1152ae259b0..d8547c23ddb 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 1152ae259b079141ee9a18703f460ab495c59f9b +Subproject commit d8547c23ddbc38a103df0f7ca315cb1efdfd52fd diff --git a/qtwebview b/qtwebview index d093df2d80b..1c65892228a 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit d093df2d80b1aa6344937ce5b75af8ad7b16e0bf +Subproject commit 1c65892228ab843040956a2257e2cafb2d3d40e0 From 189bf2b9561d4c2174abfb3ec611fb3518ea4b47 Mon Sep 17 00:00:00 2001 From: Elias Toivola Date: Thu, 3 Oct 2024 13:04:52 +0300 Subject: [PATCH 227/288] Make Red Hat 9.4 tests as blocking in CI 'InsignificantTests' are removed from all RHEL-9.4 targets [CI Platforms] Task-number: QTQAINFRA-6362 Change-Id: Id034a3f4cfa63e2f8813fad1e25a3bcc2b365851 (cherry picked from commit 490769cdef0acf8576e8e1dcd7aaac8db7c815c7) Reviewed-by: Heikki Halmet --- coin/platform_configs/cmake_platforms.yaml | 2 +- coin/platform_configs/qtbase-new-compiler-testing.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 52bb135295d..8882dc1b293 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -216,7 +216,7 @@ Configurations: Id: 'rhel-9.4' Template: 'qtci-linux-RHEL-9.4-x86_64-50' Compiler: 'GCC' - Features: ['Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'GenerateSBOM', 'VerifySBOM', 'InsignificantTests'] + 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', diff --git a/coin/platform_configs/qtbase-new-compiler-testing.yaml b/coin/platform_configs/qtbase-new-compiler-testing.yaml index 808fa526959..68d3b5c7959 100644 --- a/coin/platform_configs/qtbase-new-compiler-testing.yaml +++ b/coin/platform_configs/qtbase-new-compiler-testing.yaml @@ -16,7 +16,7 @@ Configurations: Id: 'rhel-9.4-gcc12' Template: 'qtci-linux-RHEL-9.4-x86_64-50' Compiler: 'GCC' - Features: ['Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'DoNotRunTests', 'InsignificantTests'] + Features: ['Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'DoNotRunTests'] Configure arguments: '-developer-build -nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-pcre -no-libudev -bundled-xcb-xinput' Environment variables: [ 'PATH=/opt/rh/gcc-toolset-12/root/usr/bin/:{{.Env.PATH}}', From 9baaa2d1669b9222ff1a9488aa458012950709b5 Mon Sep 17 00:00:00 2001 From: Elias Toivola Date: Thu, 3 Oct 2024 13:23:56 +0300 Subject: [PATCH 228/288] Remove Red Hat 9.2 from CI RHEL-9.2 targets are replaced by RHEL-9.4 targets in platform configurations. [CI Platforms] Task-number: QTQAINFRA-6363 Change-Id: I9287309fe136e9aaae6c0c970cc0859dbfaf8635 (cherry picked from commit 66f09bb69d05995e1254beea5cfbc9b840c506c5) Reviewed-by: Tero Heikkinen Reviewed-by: Heikki Halmet --- coin/platform_configs/cmake_platforms.yaml | 11 ----------- coin/platform_configs/qmake2cmake.yaml | 4 ---- .../qtbase-new-compiler-testing.yaml | 13 +------------ 3 files changed, 1 insertion(+), 27 deletions(-) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 8882dc1b293..179b0a83c17 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -201,17 +201,6 @@ Configurations: 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON' ] - -- - Id: 'rhel-9.2' - Template: 'qtci-linux-RHEL-9.2-x86_64-51' - Compiler: 'GCC' - 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', - 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON' - ] - Id: 'rhel-9.4' Template: 'qtci-linux-RHEL-9.4-x86_64-50' diff --git a/coin/platform_configs/qmake2cmake.yaml b/coin/platform_configs/qmake2cmake.yaml index 82674ec9171..9ffcbaee45f 100644 --- a/coin/platform_configs/qmake2cmake.yaml +++ b/coin/platform_configs/qmake2cmake.yaml @@ -9,10 +9,6 @@ Configurations: Template: 'qtci-macos-13-x86_64-103' Compiler: 'Clang' Features: ['DisableTests'] -- - Template: 'qtci-linux-RHEL-9.2-x86_64-51' - Compiler: 'GCC' - Features: ['DisableTests'] - Template: 'qtci-linux-RHEL-9.4-x86_64-50' Compiler: 'GCC' diff --git a/coin/platform_configs/qtbase-new-compiler-testing.yaml b/coin/platform_configs/qtbase-new-compiler-testing.yaml index 68d3b5c7959..f75a003f855 100644 --- a/coin/platform_configs/qtbase-new-compiler-testing.yaml +++ b/coin/platform_configs/qtbase-new-compiler-testing.yaml @@ -1,17 +1,6 @@ Version: 2 Configurations: -# Test gcc-12 on RHEL 9.2 -- - Id: 'rhel-9.2-gcc12' - Template: 'qtci-linux-RHEL-9.2-x86_64-51' - Compiler: 'GCC' - Features: ['Sccache', 'UseConfigure', 'InstallQt5Dependencies', 'DoNotRunTests'] - Configure arguments: '-developer-build -nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-pcre -no-libudev -bundled-xcb-xinput' - Environment variables: [ - 'PATH=/opt/rh/gcc-toolset-12/root/usr/bin/:{{.Env.PATH}}', - 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', - 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DINPUT_headersclean=ON' - ] +# Test gcc-12 on RHEL 9.4 - Id: 'rhel-9.4-gcc12' Template: 'qtci-linux-RHEL-9.4-x86_64-50' From d499318730fb04de7d8d96eff71d3ab9b595ca81 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 19 Dec 2024 06:17:08 +0000 Subject: [PATCH 229/288] Update submodules on '6.8 in qt/qt5' Change-Id: I4769f3ff69c41a215ca5bb6b60ef0c076951d3b2 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 24bb273b9f4..335eba25e26 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 24bb273b9f456d54bcb48ca3c04fbc65719f32b6 +Subproject commit 335eba25e26862b41185ad93537fc63c2ff93022 diff --git a/qt5compat b/qt5compat index 07d78ff4bd9..3ef71226f75 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 07d78ff4bd9a483ec127f4e76bad066228fda34a +Subproject commit 3ef71226f752d404402c08d0c49bd04bf94758ab diff --git a/qtactiveqt b/qtactiveqt index 90d146c9c7d..d5245c851b5 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 90d146c9c7d3bf7c311dda2e1a07c5cee1cad93f +Subproject commit d5245c851b567b2912e2616ef12710261f1aee76 diff --git a/qtbase b/qtbase index 4f2c976b7e9..596278c7cba 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 4f2c976b7e9c6835610a6860c012a70ccb9a6ec3 +Subproject commit 596278c7cbaf4b9f18c0738dc237398301d6c9e6 diff --git a/qtcharts b/qtcharts index e5a8b0683f7..d3c16fc942e 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit e5a8b0683f7defcd81d1686c8670259282f03f0a +Subproject commit d3c16fc942e284ae5efd36b61b9087bc05cd42a8 diff --git a/qtcoap b/qtcoap index b3643f1f64a..8add3bda32c 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit b3643f1f64ab7dd0019cd57d396fddb3f374b179 +Subproject commit 8add3bda32c09191e17a68b5930e27a27da8fb81 diff --git a/qtconnectivity b/qtconnectivity index dd4ae88506c..5fa13b2aa48 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit dd4ae88506cc3207905ce9ac79ae8b708197eb1d +Subproject commit 5fa13b2aa48ee8c01d06dc86b3026f684e891611 diff --git a/qtdatavis3d b/qtdatavis3d index 59a4d84063e..bdc401dd2b4 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 59a4d84063eb3ce331d13f681d4cca47f6eada0d +Subproject commit bdc401dd2b4885bb9bb1dfdd178fcaba60f68baf diff --git a/qtdeclarative b/qtdeclarative index ac6425d3eca..28955a0dc80 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit ac6425d3eca23da0463d68e61de912079aea17ab +Subproject commit 28955a0dc80b7eb0bf5a02181f458161085a0823 diff --git a/qtdoc b/qtdoc index 3f034d6917c..cefefa8d6eb 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 3f034d6917c1098492de94740b2d88d2efc54e29 +Subproject commit cefefa8d6ebf47ad343e3ff2e4a65688b8b7b9b0 diff --git a/qtgraphs b/qtgraphs index 30713588006..0b82dea0238 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit 307135880060746a42c75134e5234742cdc065f9 +Subproject commit 0b82dea0238b8c1d18cc06363da06ae01d92118a diff --git a/qtgrpc b/qtgrpc index 0d1c8556908..92d0b2dce6c 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit 0d1c85569081374d340a11e993a1c188a64aa82e +Subproject commit 92d0b2dce6c5b343785cf6f2c6e945027f06e8b5 diff --git a/qthttpserver b/qthttpserver index 8e3223a5a87..0406bbd8f3d 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit 8e3223a5a87420d64eb8fb03f68d58df8b079ae1 +Subproject commit 0406bbd8f3d87fc05601c55058a2dd6ec2856b59 diff --git a/qtimageformats b/qtimageformats index 9dd45f8d4d5..6be2670fca1 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 9dd45f8d4d5a7a071205d9f74a21eb20816f7f99 +Subproject commit 6be2670fca1813c973f192cc3817f3fe5096e796 diff --git a/qtlanguageserver b/qtlanguageserver index b9accf0f62d..05100b054ce 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit b9accf0f62d45922b42d06a206082a319f15bb63 +Subproject commit 05100b054cedde5d7fa2820264f7254738d7506b diff --git a/qtlocation b/qtlocation index d43377ae2d7..c5f7d1e79ef 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit d43377ae2d75aec88dc5519836defe5604e4e22b +Subproject commit c5f7d1e79ef7c0c1755c99b6e80977acdbfaf414 diff --git a/qtlottie b/qtlottie index 6376baf2c43..99f5bb914b5 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 6376baf2c43fbec931a53843c4cc41c8256b1466 +Subproject commit 99f5bb914b5c50ad4fd65a36a0da0d4f421ab5d6 diff --git a/qtmqtt b/qtmqtt index 3fc7d8824e1..1bbed1af84c 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit 3fc7d8824e1de6eaefd0afb8ab49d4a22978f3ef +Subproject commit 1bbed1af84c0edf78b8d9b530672182d423aebf7 diff --git a/qtmultimedia b/qtmultimedia index e88b898b257..bd81c12d6a4 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit e88b898b2576f7825293eea0c12c55cbecf19865 +Subproject commit bd81c12d6a4b8503aa1d3de56d7d920080121ef6 diff --git a/qtnetworkauth b/qtnetworkauth index 965f0e0975c..add3a813ac7 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 965f0e0975c0258f2bb96c059de34149c9761968 +Subproject commit add3a813ac78b9cb2fe2bcea78dc9d8a7d0e4f29 diff --git a/qtopcua b/qtopcua index 5f220e7256e..fef61a01067 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit 5f220e7256ee932eb71a832d0e2ef8b21a17e7f6 +Subproject commit fef61a01067bdf79812b93142d71733922a8ca19 diff --git a/qtpositioning b/qtpositioning index a943bda6f48..7dabe03d504 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit a943bda6f483f3faa60127220035023bca17cce8 +Subproject commit 7dabe03d504f020887d454e3f50ce5b01c2ea1f2 diff --git a/qtquick3d b/qtquick3d index 5a3e04a5648..506bbcdcd66 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 5a3e04a56480b7f76628fd01a49bde3ef6a4d77a +Subproject commit 506bbcdcd665eb1511c2849445722d26dc9ceaa2 diff --git a/qtquick3dphysics b/qtquick3dphysics index 5477f7063dc..7e91810dfc6 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit 5477f7063dc07f0bece1b63472faee535e396459 +Subproject commit 7e91810dfc6a797edf236444887e4ad9e9c6eb9a diff --git a/qtquickeffectmaker b/qtquickeffectmaker index c2e0319783b..b88cb2a3c9d 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit c2e0319783bcafbc0f20ddd0470729d50aae78f5 +Subproject commit b88cb2a3c9d943169138720d0b0f0b83be8af605 diff --git a/qtquicktimeline b/qtquicktimeline index 1846f0bc549..c666da561da 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 1846f0bc549492df0e0b0b75ba9fd5770101f2c1 +Subproject commit c666da561daaa33e410bd994e09151a4679da0af diff --git a/qtremoteobjects b/qtremoteobjects index c05686076fa..72dbe0c9c52 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit c05686076fabf0342492705c6555376aedbcd6d8 +Subproject commit 72dbe0c9c5250205c9ee281919ce4395512a417e diff --git a/qtscxml b/qtscxml index 1478fd2cc93..046069984d5 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 1478fd2cc93cfea2e0715232ac6204105fdcb25c +Subproject commit 046069984d53861779b8f50148819b302fafd2db diff --git a/qtsensors b/qtsensors index 2f608a14e3d..7964d0b2c07 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 2f608a14e3d4229eb5954b915437937d02022ab7 +Subproject commit 7964d0b2c0735db2d3c1d1f8e283c8e8b63f6b91 diff --git a/qtserialbus b/qtserialbus index 91fc8552ad8..782b0e6f52c 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 91fc8552ad856a30749a9c09f556a5009430b329 +Subproject commit 782b0e6f52c6d3245a62c4d8b74488f81da4a2e7 diff --git a/qtserialport b/qtserialport index 653b1991ce7..b5cf5a15baf 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 653b1991ce78e73c6d14531179c4003d28826c30 +Subproject commit b5cf5a15bafe0b9d7564a8a0878d929d4ff9d048 diff --git a/qtshadertools b/qtshadertools index ba46d1558a1..09546f718c2 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit ba46d1558a135dd86e599b97ef5a61fb4d3de850 +Subproject commit 09546f718c2a052e81d09ddcb93bd57ab544734b diff --git a/qtspeech b/qtspeech index fbe99891099..024cc963c3b 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit fbe9989109969a67e15475010d4c90ca73cff652 +Subproject commit 024cc963c3bfac21749476b76495fb7676970577 diff --git a/qtsvg b/qtsvg index f3944b67ec0..96a683763d2 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit f3944b67ec0e76a467c5bf26d8b72008456c12f8 +Subproject commit 96a683763d263b4259ebbfda4513ac0d1100c7f7 diff --git a/qttools b/qttools index f2dbab334df..cee47fe6d30 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit f2dbab334df5b001bd38d6b29f910f87fdaf5ab6 +Subproject commit cee47fe6d3034be007bf3e77dfc6c6283a2a4bba diff --git a/qttranslations b/qttranslations index 63eaf0025b7..ef156c6f5f1 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 63eaf0025b76f018b6790ceb709c579fb983f53f +Subproject commit ef156c6f5f1a08147e3ba84a606b3be196f7fa9c diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 96f41867160..083b44d3151 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 96f418671603107adf702988fdc7e0c60644643c +Subproject commit 083b44d31511c2028f46da94ed34b065e67c1360 diff --git a/qtwayland b/qtwayland index fcb5006c5d6..702765ae315 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit fcb5006c5d6c009b34fdf1a35270272638b28592 +Subproject commit 702765ae315b75338d2ba5bae2c761205c7a588b diff --git a/qtwebchannel b/qtwebchannel index 7bf5f5a79bb..cf2747f8986 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 7bf5f5a79bb815bf82d7c1a4fabc99083ff957b5 +Subproject commit cf2747f89861f9881ecb4e6e957795d094691564 diff --git a/qtwebengine b/qtwebengine index e7c9f9a7ddc..3cdf0a21294 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit e7c9f9a7ddca8fec772c893422b2eac4b12066d8 +Subproject commit 3cdf0a2129448a7ac061d1a7eedc60842ce25a64 diff --git a/qtwebsockets b/qtwebsockets index d8547c23ddb..45b9872661d 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit d8547c23ddbc38a103df0f7ca315cb1efdfd52fd +Subproject commit 45b9872661d1650ede0be453af1c47c1ee159254 diff --git a/qtwebview b/qtwebview index 1c65892228a..b4f68342ea7 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 1c65892228ab843040956a2257e2cafb2d3d40e0 +Subproject commit b4f68342ea7c9236a765075df352c2ebc9b3b746 From 2849740c9896a52cc649d3f9ea492a1ba21f4ebc Mon Sep 17 00:00:00 2001 From: Tero Heikkinen Date: Tue, 26 Nov 2024 16:13:07 +0200 Subject: [PATCH 230/288] 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 Change-Id: I3fb56cdbe4cbda8f779852b0a16121916aa5a1d4 Reviewed-by: Jøger Hansegård Reviewed-by: Jukka Jokiniva (cherry picked from commit 6569f201c1359d09dba9627cda2ca375ecf6b8c3) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit b7abace8945ddd45436a87a4b7b4a354df0c077d) --- 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 21e4d7d8013..85b997066d7 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 e112372259b1c1ef9b9ea1cdae4519440781c385 Mon Sep 17 00:00:00 2001 From: Tero Heikkinen Date: Wed, 12 Jun 2024 11:28:13 +0300 Subject: [PATCH 231/288] 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 Change-Id: Idce79eb06d73894ae648e0be53ff1f07bb21392d Reviewed-by: Tony Sarajärvi (cherry picked from commit 444167f5fb29f266cf8447ff932086c403037182) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 5ae41db58600f3c9e7ded138d62aa3867b3d5e04) --- 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 21c39aa75902f3905e7099f58694b165fb04a5cf Mon Sep 17 00:00:00 2001 From: Pavel Dubsky Date: Thu, 3 Oct 2024 12:54:29 +0200 Subject: [PATCH 232/288] 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.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 (cherry picked from commit 22b3565849350cf0bd5bce1a117fa04b565402b9) --- 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 85b997066d7..2f18b5c40b8 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 28b68a49568..76912c83c44 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 0b041deffd0ce74f894f492357915a068c596fc7 Mon Sep 17 00:00:00 2001 From: Elias Toivola Date: Wed, 4 Dec 2024 13:47:13 +0200 Subject: [PATCH 233/288] Android: update emulator version to 35.2.10 The newest stable version of Android emulator should bring more stability. Pick-to: 6.5 Fixes: QTQAINFRA-6805 Change-Id: Id67d3ec888b486e6aae862588928528788583aae Reviewed-by: Assam Boudjelthia (cherry picked from commit 9078baf0a9b7cb9e56ff681d19b60737532973a0) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit d777fa29268961196411ef7ebd87262fa93ccb1a) --- 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 1cdf0b38ae4a141b03d5e4f909387d4ef6289b91 Mon Sep 17 00:00:00 2001 From: Tero Heikkinen Date: Tue, 3 Dec 2024 22:30:38 +0200 Subject: [PATCH 234/288] Provisioning: Add missing Vulkan library to Windows on ARM Fixes: QTQAINFRA-6830 Change-Id: Ia074c55ddd20414f0d6b0dbcc674cc8eb82b1cf8 Reviewed-by: Axel Spoerl Reviewed-by: Jonas Karlsson (cherry picked from commit e17927996244732778b9a5b0e72211ea1e9e0937) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 5e74968c61cc1e0bb421aa7c862261f35833cf14) --- .../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 f4f8266821f7c3293a25d7fe25d49cfa4f0203cb Mon Sep 17 00:00:00 2001 From: Ville-Pekka Karhu Date: Thu, 21 Nov 2024 12:43:19 +0200 Subject: [PATCH 235/288] Provisioning: Add Simulator Runtime installation to macOS Task-number: QTQAINFRA-6774 Change-Id: I2461911d20ba2fda7b2c53d38b0e688139501e22 Reviewed-by: Jukka Jokiniva (cherry picked from commit 1f6f97a141fbcb84da949e57ce07fc23b271ff0e) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit dc1f9e060a69c8e4c8b8303771c20967aebd2076) --- .../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 6e853cc6fc7530e8761961cd55ab0caf10ce1817 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Mon, 11 Nov 2024 17:27:13 +0100 Subject: [PATCH 236/288] 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. Task-number: QTBUG-119490 Change-Id: Ie9ff2b2f4fe40bda2856d4b12a03aaa05f836de4 Reviewed-by: Tor Arne Vestbø (cherry picked from commit f5970f9c6219362ae034df1bf35dc092efa1e1d8) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 6db401bedaa0900b4b04c67b2d606cb1c85000df) --- 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 a1b6b42a96b..1cfb652f77e 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 cc2729920f9c5e14bef636bf48c30174f5d88ad3 Mon Sep 17 00:00:00 2001 From: Oliver Wolff Date: Mon, 2 Dec 2024 08:17:20 +0100 Subject: [PATCH 237/288] README.md: Update minimal versions of Windows compilers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Id743e89d0858fde4678b7ba4e848d780d19771fc Reviewed-by: Kai Köhne (cherry picked from commit 8319245b04c644bd5c4b3cc84838b04ef3971d0f) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 51dec3728f8af5393b9aefdde503daa2e5921389) --- 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 e18fe73ac6e261afd5b440aa763248884885a357 Mon Sep 17 00:00:00 2001 From: Matti Paaso Date: Thu, 31 Oct 2024 11:33:38 +0200 Subject: [PATCH 238/288] Provisioning: Update Axivion bauhaus suite to 7.8.4 Task-number: QTQAINFRA-6720 Pick-to: 6.5 Change-Id: Idb303652355b8937ea199a3415101d49f27a2e98 Reviewed-by: Teemu Holappa (cherry picked from commit cf921a5146df448e2752178ae8f90989942aa38d) Reviewed-by: Ville-Pekka Karhu --- .../common/linux/axivion/axivion_config.json | 10 + .../linux/axivion/ci_config_common.json | 33 + .../linux/axivion/code_annotations.json | 32 + .../common/linux/axivion/compiler_config.json | 786 ++++++++++++++++++ .../common/linux/axivion/post_processing.py | 34 + .../common/linux/axivion/rule_config.json | 210 +++++ .../common/linux/axivion/start_analysis.sh | 13 + .../93-axivion-bauhaus-suite.sh | 39 +- 8 files changed, 1154 insertions(+), 3 deletions(-) create mode 100644 coin/provisioning/common/linux/axivion/axivion_config.json create mode 100644 coin/provisioning/common/linux/axivion/ci_config_common.json create mode 100644 coin/provisioning/common/linux/axivion/code_annotations.json create mode 100644 coin/provisioning/common/linux/axivion/compiler_config.json create mode 100644 coin/provisioning/common/linux/axivion/post_processing.py create mode 100644 coin/provisioning/common/linux/axivion/rule_config.json create mode 100755 coin/provisioning/common/linux/axivion/start_analysis.sh diff --git a/coin/provisioning/common/linux/axivion/axivion_config.json b/coin/provisioning/common/linux/axivion/axivion_config.json new file mode 100644 index 00000000000..36461c6af04 --- /dev/null +++ b/coin/provisioning/common/linux/axivion/axivion_config.json @@ -0,0 +1,10 @@ +{ + "_Layers": [ + "post_processing.py", + "ci_config.json", + "ci_config_common.json", + "compiler_config.json", + "rule_config.json", + "code_annotations.json" + ] +} diff --git a/coin/provisioning/common/linux/axivion/ci_config_common.json b/coin/provisioning/common/linux/axivion/ci_config_common.json new file mode 100644 index 00000000000..f637eff5b1a --- /dev/null +++ b/coin/provisioning/common/linux/axivion/ci_config_common.json @@ -0,0 +1,33 @@ +{ + "Project": { + "Git": { + "_active": true, + "sourceserver_gitdir": "/data/axivion/databases/$(env:TESTED_MODULE_COIN).git", + "sourceserver_remote_url": "ssh://codereview.qt-project.org:29418/qt/$(env:TESTED_MODULE_COIN)" + }, + "Project-GlobalOptions": { + "ci_mode": { + "clean_before": false + }, + "directory": "../work/qt/$(env:TESTED_MODULE_COIN)", + "ir": "$(env:IRNAME)", + "name": "qt_$(env:PACKAGE)_$(env:MODULE)_dev_$(env:TARGET_OS_COIN)" + } + }, + "Results": { + "Dashboard": { + "ci_mode": { + "directory": "/data/axivion/databases" + }, + "dashboard_url": "https://axivion-srv.ci.qt.io/axivion/" + } + }, + "_Format": "1.0", + "_Version": "7.6.2", + "_VersionNum": [ + 7, + 6, + 2, + 12725 + ] +} diff --git a/coin/provisioning/common/linux/axivion/code_annotations.json b/coin/provisioning/common/linux/axivion/code_annotations.json new file mode 100644 index 00000000000..62bd38bd847 --- /dev/null +++ b/coin/provisioning/common/linux/axivion/code_annotations.json @@ -0,0 +1,32 @@ +{ + "Analysis": { + "CatchMalformedComments": { + "_active": true + }, + "EnableDisable": { + "_active": true + }, + "NextLine": { + "_active": true + }, + "ReportUnclosedRestOfFileComments": { + "_active": true + }, + "ReportUnusedComments": { + "_active": true + } + }, + "Results": { + "Dashboard": { + "import_suppressed_issues": true + } + }, + "_Format": "1.0", + "_Version": "trunk-d23a11ca62e", + "_VersionNum": [ + 7, + 8, + 0, + 14394 + ] +} diff --git a/coin/provisioning/common/linux/axivion/compiler_config.json b/coin/provisioning/common/linux/axivion/compiler_config.json new file mode 100644 index 00000000000..315b01f668f --- /dev/null +++ b/coin/provisioning/common/linux/axivion/compiler_config.json @@ -0,0 +1,786 @@ +{ + "Project": { + "GNUToolchain": { + "_active": true, + "advanced": { + "no_macro_invocations_for_system_headers": false + }, + "archiver": { + "native_archiver": "/usr/bin/ar" + }, + "language_c": { + "emulated_compiler": "GNU", + "emulated_compiler_version": 90300, + "language_version": "C18", + "native_compiler": "/usr/bin/gcc", + "preprocessing": { + "predefined_macros": { + "_LP64": "1", + "_STDC_PREDEF_H": "1", + "__ATOMIC_ACQUIRE": "2", + "__ATOMIC_ACQ_REL": "4", + "__ATOMIC_CONSUME": "1", + "__ATOMIC_HLE_ACQUIRE": "65536", + "__ATOMIC_HLE_RELEASE": "131072", + "__ATOMIC_RELAXED": "0", + "__ATOMIC_RELEASE": "3", + "__ATOMIC_SEQ_CST": "5", + "__BIGGEST_ALIGNMENT__": "16", + "__BYTE_ORDER__": "__ORDER_LITTLE_ENDIAN__", + "__CHAR_BIT__": "8", + "__DBL_DECIMAL_DIG__": "17", + "__DBL_DENORM_MIN__": "((double)4.94065645841246544176568792868221372e-324L)", + "__DBL_DIG__": "15", + "__DBL_EPSILON__": "((double)2.22044604925031308084726333618164062e-16L)", + "__DBL_HAS_DENORM__": "1", + "__DBL_HAS_INFINITY__": "1", + "__DBL_HAS_QUIET_NAN__": "1", + "__DBL_MANT_DIG__": "53", + "__DBL_MAX_10_EXP__": "308", + "__DBL_MAX_EXP__": "1024", + "__DBL_MAX__": "((double)1.79769313486231570814527423731704357e+308L)", + "__DBL_MIN_10_EXP__": "(-307)", + "__DBL_MIN_EXP__": "(-1021)", + "__DBL_MIN__": "((double)2.22507385850720138309023271733240406e-308L)", + "__DEC128_EPSILON__": "1E-33DL", + "__DEC128_MANT_DIG__": "34", + "__DEC128_MAX_EXP__": "6145", + "__DEC128_MAX__": "9.999999999999999999999999999999999E6144DL", + "__DEC128_MIN_EXP__": "(-6142)", + "__DEC128_MIN__": "1E-6143DL", + "__DEC128_SUBNORMAL_MIN__": "0.000000000000000000000000000000001E-6143DL", + "__DEC32_EPSILON__": "1E-6DF", + "__DEC32_MANT_DIG__": "7", + "__DEC32_MAX_EXP__": "97", + "__DEC32_MAX__": "9.999999E96DF", + "__DEC32_MIN_EXP__": "(-94)", + "__DEC32_MIN__": "1E-95DF", + "__DEC32_SUBNORMAL_MIN__": "0.000001E-95DF", + "__DEC64_EPSILON__": "1E-15DD", + "__DEC64_MANT_DIG__": "16", + "__DEC64_MAX_EXP__": "385", + "__DEC64_MAX__": "9.999999999999999E384DD", + "__DEC64_MIN_EXP__": "(-382)", + "__DEC64_MIN__": "1E-383DD", + "__DEC64_SUBNORMAL_MIN__": "0.000000000000001E-383DD", + "__DECIMAL_BID_FORMAT__": "1", + "__DECIMAL_DIG__": "21", + "__DEC_EVAL_METHOD__": "2", + "__ELF__": "1", + "__FINITE_MATH_ONLY__": "0", + "__FLOAT_WORD_ORDER__": "__ORDER_LITTLE_ENDIAN__", + "__FLT128_DECIMAL_DIG__": "36", + "__FLT128_DENORM_MIN__": "6.47517511943802511092443895822764655e-4966F128", + "__FLT128_DIG__": "33", + "__FLT128_EPSILON__": "1.92592994438723585305597794258492732e-34F128", + "__FLT128_HAS_DENORM__": "1", + "__FLT128_HAS_INFINITY__": "1", + "__FLT128_HAS_QUIET_NAN__": "1", + "__FLT128_MANT_DIG__": "113", + "__FLT128_MAX_10_EXP__": "4932", + "__FLT128_MAX_EXP__": "16384", + "__FLT128_MAX__": "1.18973149535723176508575932662800702e+4932F128", + "__FLT128_MIN_10_EXP__": "(-4931)", + "__FLT128_MIN_EXP__": "(-16381)", + "__FLT128_MIN__": "3.36210314311209350626267781732175260e-4932F128", + "__FLT32X_DECIMAL_DIG__": "17", + "__FLT32X_DENORM_MIN__": "4.94065645841246544176568792868221372e-324F32x", + "__FLT32X_DIG__": "15", + "__FLT32X_EPSILON__": "2.22044604925031308084726333618164062e-16F32x", + "__FLT32X_HAS_DENORM__": "1", + "__FLT32X_HAS_INFINITY__": "1", + "__FLT32X_HAS_QUIET_NAN__": "1", + "__FLT32X_MANT_DIG__": "53", + "__FLT32X_MAX_10_EXP__": "308", + "__FLT32X_MAX_EXP__": "1024", + "__FLT32X_MAX__": "1.79769313486231570814527423731704357e+308F32x", + "__FLT32X_MIN_10_EXP__": "(-307)", + "__FLT32X_MIN_EXP__": "(-1021)", + "__FLT32X_MIN__": "2.22507385850720138309023271733240406e-308F32x", + "__FLT32_DECIMAL_DIG__": "9", + "__FLT32_DENORM_MIN__": "1.40129846432481707092372958328991613e-45F32", + "__FLT32_DIG__": "6", + "__FLT32_EPSILON__": "1.19209289550781250000000000000000000e-7F32", + "__FLT32_HAS_DENORM__": "1", + "__FLT32_HAS_INFINITY__": "1", + "__FLT32_HAS_QUIET_NAN__": "1", + "__FLT32_MANT_DIG__": "24", + "__FLT32_MAX_10_EXP__": "38", + "__FLT32_MAX_EXP__": "128", + "__FLT32_MAX__": "3.40282346638528859811704183484516925e+38F32", + "__FLT32_MIN_10_EXP__": "(-37)", + "__FLT32_MIN_EXP__": "(-125)", + "__FLT32_MIN__": "1.17549435082228750796873653722224568e-38F32", + "__FLT64X_DECIMAL_DIG__": "21", + "__FLT64X_DENORM_MIN__": "3.64519953188247460252840593361941982e-4951F64x", + "__FLT64X_DIG__": "18", + "__FLT64X_EPSILON__": "1.08420217248550443400745280086994171e-19F64x", + "__FLT64X_HAS_DENORM__": "1", + "__FLT64X_HAS_INFINITY__": "1", + "__FLT64X_HAS_QUIET_NAN__": "1", + "__FLT64X_MANT_DIG__": "64", + "__FLT64X_MAX_10_EXP__": "4932", + "__FLT64X_MAX_EXP__": "16384", + "__FLT64X_MAX__": "1.18973149535723176502126385303097021e+4932F64x", + "__FLT64X_MIN_10_EXP__": "(-4931)", + "__FLT64X_MIN_EXP__": "(-16381)", + "__FLT64X_MIN__": "3.36210314311209350626267781732175260e-4932F64x", + "__FLT64_DECIMAL_DIG__": "17", + "__FLT64_DENORM_MIN__": "4.94065645841246544176568792868221372e-324F64", + "__FLT64_DIG__": "15", + "__FLT64_EPSILON__": "2.22044604925031308084726333618164062e-16F64", + "__FLT64_HAS_DENORM__": "1", + "__FLT64_HAS_INFINITY__": "1", + "__FLT64_HAS_QUIET_NAN__": "1", + "__FLT64_MANT_DIG__": "53", + "__FLT64_MAX_10_EXP__": "308", + "__FLT64_MAX_EXP__": "1024", + "__FLT64_MAX__": "1.79769313486231570814527423731704357e+308F64", + "__FLT64_MIN_10_EXP__": "(-307)", + "__FLT64_MIN_EXP__": "(-1021)", + "__FLT64_MIN__": "2.22507385850720138309023271733240406e-308F64", + "__FLT_DECIMAL_DIG__": "9", + "__FLT_DENORM_MIN__": "1.40129846432481707092372958328991613e-45F", + "__FLT_DIG__": "6", + "__FLT_EPSILON__": "1.19209289550781250000000000000000000e-7F", + "__FLT_EVAL_METHOD_TS_18661_3__": "0", + "__FLT_EVAL_METHOD__": "0", + "__FLT_HAS_DENORM__": "1", + "__FLT_HAS_INFINITY__": "1", + "__FLT_HAS_QUIET_NAN__": "1", + "__FLT_MANT_DIG__": "24", + "__FLT_MAX_10_EXP__": "38", + "__FLT_MAX_EXP__": "128", + "__FLT_MAX__": "3.40282346638528859811704183484516925e+38F", + "__FLT_MIN_10_EXP__": "(-37)", + "__FLT_MIN_EXP__": "(-125)", + "__FLT_MIN__": "1.17549435082228750796873653722224568e-38F", + "__FLT_RADIX__": "2", + "__FXSR__": "1", + "__GCC_ASM_FLAG_OUTPUTS__": "1", + "__GCC_ATOMIC_BOOL_LOCK_FREE": "2", + "__GCC_ATOMIC_CHAR16_T_LOCK_FREE": "2", + "__GCC_ATOMIC_CHAR32_T_LOCK_FREE": "2", + "__GCC_ATOMIC_CHAR_LOCK_FREE": "2", + "__GCC_ATOMIC_INT_LOCK_FREE": "2", + "__GCC_ATOMIC_LLONG_LOCK_FREE": "2", + "__GCC_ATOMIC_LONG_LOCK_FREE": "2", + "__GCC_ATOMIC_POINTER_LOCK_FREE": "2", + "__GCC_ATOMIC_SHORT_LOCK_FREE": "2", + "__GCC_ATOMIC_TEST_AND_SET_TRUEVAL": "1", + "__GCC_ATOMIC_WCHAR_T_LOCK_FREE": "2", + "__GCC_HAVE_DWARF2_CFI_ASM": "1", + "__GCC_HAVE_SYNC_COMPARE_AND_SWAP_1": "1", + "__GCC_HAVE_SYNC_COMPARE_AND_SWAP_2": "1", + "__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4": "1", + "__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8": "1", + "__GCC_IEC_559": "2", + "__GCC_IEC_559_COMPLEX": "2", + "__GXX_ABI_VERSION": "1013", + "__HAVE_SPECULATION_SAFE_VALUE": "1", + "__INT16_C(c)": "c", + "__INT16_MAX__": "0x7fff", + "__INT16_TYPE__": "short int", + "__INT32_C(c)": "c", + "__INT32_MAX__": "0x7fffffff", + "__INT32_TYPE__": "int", + "__INT64_C(c)": "c ## L", + "__INT64_MAX__": "0x7fffffffffffffffL", + "__INT64_TYPE__": "long int", + "__INT8_C(c)": "c", + "__INT8_MAX__": "0x7f", + "__INT8_TYPE__": "signed char", + "__INTMAX_C(c)": "c ## L", + "__INTMAX_MAX__": "0x7fffffffffffffffL", + "__INTMAX_TYPE__": "long int", + "__INTMAX_WIDTH__": "64", + "__INTPTR_MAX__": "0x7fffffffffffffffL", + "__INTPTR_TYPE__": "long int", + "__INTPTR_WIDTH__": "64", + "__INT_FAST16_MAX__": "0x7fffffffffffffffL", + "__INT_FAST16_TYPE__": "long int", + "__INT_FAST16_WIDTH__": "64", + "__INT_FAST32_MAX__": "0x7fffffffffffffffL", + "__INT_FAST32_TYPE__": "long int", + "__INT_FAST32_WIDTH__": "64", + "__INT_FAST64_MAX__": "0x7fffffffffffffffL", + "__INT_FAST64_TYPE__": "long int", + "__INT_FAST64_WIDTH__": "64", + "__INT_FAST8_MAX__": "0x7f", + "__INT_FAST8_TYPE__": "signed char", + "__INT_FAST8_WIDTH__": "8", + "__INT_LEAST16_MAX__": "0x7fff", + "__INT_LEAST16_TYPE__": "short int", + "__INT_LEAST16_WIDTH__": "16", + "__INT_LEAST32_MAX__": "0x7fffffff", + "__INT_LEAST32_TYPE__": "int", + "__INT_LEAST32_WIDTH__": "32", + "__INT_LEAST64_MAX__": "0x7fffffffffffffffL", + "__INT_LEAST64_TYPE__": "long int", + "__INT_LEAST64_WIDTH__": "64", + "__INT_LEAST8_MAX__": "0x7f", + "__INT_LEAST8_TYPE__": "signed char", + "__INT_LEAST8_WIDTH__": "8", + "__INT_MAX__": "0x7fffffff", + "__INT_WIDTH__": "32", + "__LDBL_DECIMAL_DIG__": "21", + "__LDBL_DENORM_MIN__": "3.64519953188247460252840593361941982e-4951L", + "__LDBL_DIG__": "18", + "__LDBL_EPSILON__": "1.08420217248550443400745280086994171e-19L", + "__LDBL_HAS_DENORM__": "1", + "__LDBL_HAS_INFINITY__": "1", + "__LDBL_HAS_QUIET_NAN__": "1", + "__LDBL_MANT_DIG__": "64", + "__LDBL_MAX_10_EXP__": "4932", + "__LDBL_MAX_EXP__": "16384", + "__LDBL_MAX__": "1.18973149535723176502126385303097021e+4932L", + "__LDBL_MIN_10_EXP__": "(-4931)", + "__LDBL_MIN_EXP__": "(-16381)", + "__LDBL_MIN__": "3.36210314311209350626267781732175260e-4932L", + "__LONG_LONG_MAX__": "0x7fffffffffffffffLL", + "__LONG_LONG_WIDTH__": "64", + "__LONG_MAX__": "0x7fffffffffffffffL", + "__LONG_WIDTH__": "64", + "__LP64__": "1", + "__MMX__": "1", + "__NO_INLINE__": "1", + "__ORDER_BIG_ENDIAN__": "4321", + "__ORDER_LITTLE_ENDIAN__": "1234", + "__ORDER_PDP_ENDIAN__": "3412", + "__PRAGMA_REDEFINE_EXTNAME": "1", + "__PTRDIFF_MAX__": "0x7fffffffffffffffL", + "__PTRDIFF_TYPE__": "long int", + "__PTRDIFF_WIDTH__": "64", + "__REGISTER_PREFIX__": "", + "__SCHAR_MAX__": "0x7f", + "__SCHAR_WIDTH__": "8", + "__SEG_FS": "1", + "__SEG_GS": "1", + "__SHRT_MAX__": "0x7fff", + "__SHRT_WIDTH__": "16", + "__SIG_ATOMIC_MAX__": "0x7fffffff", + "__SIG_ATOMIC_MIN__": "(-__SIG_ATOMIC_MAX__ - 1)", + "__SIG_ATOMIC_TYPE__": "int", + "__SIG_ATOMIC_WIDTH__": "32", + "__SIZEOF_DOUBLE__": "8", + "__SIZEOF_FLOAT128__": "16", + "__SIZEOF_FLOAT80__": "16", + "__SIZEOF_FLOAT__": "4", + "__SIZEOF_INT128__": "16", + "__SIZEOF_INT__": "4", + "__SIZEOF_LONG_DOUBLE__": "16", + "__SIZEOF_LONG_LONG__": "8", + "__SIZEOF_LONG__": "8", + "__SIZEOF_POINTER__": "8", + "__SIZEOF_PTRDIFF_T__": "8", + "__SIZEOF_SHORT__": "2", + "__SIZEOF_SIZE_T__": "8", + "__SIZEOF_WCHAR_T__": "4", + "__SIZEOF_WINT_T__": "4", + "__SIZE_MAX__": "0xffffffffffffffffUL", + "__SIZE_TYPE__": "long unsigned int", + "__SIZE_WIDTH__": "64", + "__SSE2_MATH__": "1", + "__SSE2__": "1", + "__SSE_MATH__": "1", + "__SSE__": "1", + "__STDC_HOSTED__": "1", + "__STDC_IEC_559_COMPLEX__": "1", + "__STDC_IEC_559__": "1", + "__STDC_ISO_10646__": "201706L", + "__STDC_UTF_16__": "1", + "__STDC_UTF_32__": "1", + "__UINT16_C(c)": "c", + "__UINT16_MAX__": "0xffff", + "__UINT16_TYPE__": "short unsigned int", + "__UINT32_C(c)": "c ## U", + "__UINT32_MAX__": "0xffffffffU", + "__UINT32_TYPE__": "unsigned int", + "__UINT64_C(c)": "c ## UL", + "__UINT64_MAX__": "0xffffffffffffffffUL", + "__UINT64_TYPE__": "long unsigned int", + "__UINT8_C(c)": "c", + "__UINT8_MAX__": "0xff", + "__UINT8_TYPE__": "unsigned char", + "__UINTMAX_C(c)": "c ## UL", + "__UINTMAX_MAX__": "0xffffffffffffffffUL", + "__UINTMAX_TYPE__": "long unsigned int", + "__UINTPTR_MAX__": "0xffffffffffffffffUL", + "__UINTPTR_TYPE__": "long unsigned int", + "__UINT_FAST16_MAX__": "0xffffffffffffffffUL", + "__UINT_FAST16_TYPE__": "long unsigned int", + "__UINT_FAST32_MAX__": "0xffffffffffffffffUL", + "__UINT_FAST32_TYPE__": "long unsigned int", + "__UINT_FAST64_MAX__": "0xffffffffffffffffUL", + "__UINT_FAST64_TYPE__": "long unsigned int", + "__UINT_FAST8_MAX__": "0xff", + "__UINT_FAST8_TYPE__": "unsigned char", + "__UINT_LEAST16_MAX__": "0xffff", + "__UINT_LEAST16_TYPE__": "short unsigned int", + "__UINT_LEAST32_MAX__": "0xffffffffU", + "__UINT_LEAST32_TYPE__": "unsigned int", + "__UINT_LEAST64_MAX__": "0xffffffffffffffffUL", + "__UINT_LEAST64_TYPE__": "long unsigned int", + "__UINT_LEAST8_MAX__": "0xff", + "__UINT_LEAST8_TYPE__": "unsigned char", + "__USER_LABEL_PREFIX__": "", + "__WCHAR_MAX__": "0x7fffffff", + "__WCHAR_MIN__": "(-__WCHAR_MAX__ - 1)", + "__WCHAR_TYPE__": "int", + "__WCHAR_WIDTH__": "32", + "__WINT_MAX__": "0xffffffffU", + "__WINT_MIN__": "0U", + "__WINT_TYPE__": "unsigned int", + "__WINT_WIDTH__": "32", + "__amd64": "1", + "__amd64__": "1", + "__code_model_small__": "1", + "__gnu_linux__": "1", + "__k8": "1", + "__k8__": "1", + "__linux": "1", + "__linux__": "1", + "__unix": "1", + "__unix__": "1", + "__x86_64": "1", + "__x86_64__": "1", + "linux": "1", + "unix": "1" + }, + "sys_include_envvar": null, + "sys_include_path": [ + "/usr/local/lib/gcc/x86_64-pc-linux-gnu/9.3.0/include", + "/usr/local/include", + "/usr/local/lib/gcc/x86_64-pc-linux-gnu/9.3.0/include-fixed", + "/usr/include/x86_64-linux-gnu", + "/usr/include" + ] + } + }, + "language_c.command.#": "/usr/bin/gcc", + "language_c.info.#": "Using built-in specs.\nCOLLECT_GCC=/usr/bin/gcc\nCOLLECT_LTO_WRAPPER=/usr/local/libexec/gcc/x86_64-pc-linux-gnu/9.3.0/lto-wrapper\nTarget: x86_64-pc-linux-gnu\nConfigured with: /tmp/gcc-9.3.0/configure --disable-bootstrap --enable-languages=c,c++,lto --prefix=/usr/local --program-suffix=-9.3\nThread model: posix\ngcc version 9.3.0 (GCC) \n", + "language_cxx": { + "emulated_compiler": "GNU", + "emulated_compiler_version": 90300, + "language_version": "Cpp14", + "native_compiler": "/usr/bin/g++", + "preprocessing": { + "predefined_macros": { + "_GNU_SOURCE": "1", + "_LP64": "1", + "_STDC_PREDEF_H": "1", + "__ATOMIC_ACQUIRE": "2", + "__ATOMIC_ACQ_REL": "4", + "__ATOMIC_CONSUME": "1", + "__ATOMIC_HLE_ACQUIRE": "65536", + "__ATOMIC_HLE_RELEASE": "131072", + "__ATOMIC_RELAXED": "0", + "__ATOMIC_RELEASE": "3", + "__ATOMIC_SEQ_CST": "5", + "__BIGGEST_ALIGNMENT__": "16", + "__BYTE_ORDER__": "__ORDER_LITTLE_ENDIAN__", + "__CHAR_BIT__": "8", + "__DBL_DECIMAL_DIG__": "17", + "__DBL_DENORM_MIN__": "double(4.94065645841246544176568792868221372e-324L)", + "__DBL_DIG__": "15", + "__DBL_EPSILON__": "double(2.22044604925031308084726333618164062e-16L)", + "__DBL_HAS_DENORM__": "1", + "__DBL_HAS_INFINITY__": "1", + "__DBL_HAS_QUIET_NAN__": "1", + "__DBL_MANT_DIG__": "53", + "__DBL_MAX_10_EXP__": "308", + "__DBL_MAX_EXP__": "1024", + "__DBL_MAX__": "double(1.79769313486231570814527423731704357e+308L)", + "__DBL_MIN_10_EXP__": "(-307)", + "__DBL_MIN_EXP__": "(-1021)", + "__DBL_MIN__": "double(2.22507385850720138309023271733240406e-308L)", + "__DEC128_EPSILON__": "1E-33DL", + "__DEC128_MANT_DIG__": "34", + "__DEC128_MAX_EXP__": "6145", + "__DEC128_MAX__": "9.999999999999999999999999999999999E6144DL", + "__DEC128_MIN_EXP__": "(-6142)", + "__DEC128_MIN__": "1E-6143DL", + "__DEC128_SUBNORMAL_MIN__": "0.000000000000000000000000000000001E-6143DL", + "__DEC32_EPSILON__": "1E-6DF", + "__DEC32_MANT_DIG__": "7", + "__DEC32_MAX_EXP__": "97", + "__DEC32_MAX__": "9.999999E96DF", + "__DEC32_MIN_EXP__": "(-94)", + "__DEC32_MIN__": "1E-95DF", + "__DEC32_SUBNORMAL_MIN__": "0.000001E-95DF", + "__DEC64_EPSILON__": "1E-15DD", + "__DEC64_MANT_DIG__": "16", + "__DEC64_MAX_EXP__": "385", + "__DEC64_MAX__": "9.999999999999999E384DD", + "__DEC64_MIN_EXP__": "(-382)", + "__DEC64_MIN__": "1E-383DD", + "__DEC64_SUBNORMAL_MIN__": "0.000000000000001E-383DD", + "__DECIMAL_BID_FORMAT__": "1", + "__DECIMAL_DIG__": "21", + "__DEC_EVAL_METHOD__": "2", + "__DEPRECATED": "1", + "__ELF__": "1", + "__FINITE_MATH_ONLY__": "0", + "__FLOAT_WORD_ORDER__": "__ORDER_LITTLE_ENDIAN__", + "__FLT128_DECIMAL_DIG__": "36", + "__FLT128_DENORM_MIN__": "6.47517511943802511092443895822764655e-4966F128", + "__FLT128_DIG__": "33", + "__FLT128_EPSILON__": "1.92592994438723585305597794258492732e-34F128", + "__FLT128_HAS_DENORM__": "1", + "__FLT128_HAS_INFINITY__": "1", + "__FLT128_HAS_QUIET_NAN__": "1", + "__FLT128_MANT_DIG__": "113", + "__FLT128_MAX_10_EXP__": "4932", + "__FLT128_MAX_EXP__": "16384", + "__FLT128_MAX__": "1.18973149535723176508575932662800702e+4932F128", + "__FLT128_MIN_10_EXP__": "(-4931)", + "__FLT128_MIN_EXP__": "(-16381)", + "__FLT128_MIN__": "3.36210314311209350626267781732175260e-4932F128", + "__FLT32X_DECIMAL_DIG__": "17", + "__FLT32X_DENORM_MIN__": "4.94065645841246544176568792868221372e-324F32x", + "__FLT32X_DIG__": "15", + "__FLT32X_EPSILON__": "2.22044604925031308084726333618164062e-16F32x", + "__FLT32X_HAS_DENORM__": "1", + "__FLT32X_HAS_INFINITY__": "1", + "__FLT32X_HAS_QUIET_NAN__": "1", + "__FLT32X_MANT_DIG__": "53", + "__FLT32X_MAX_10_EXP__": "308", + "__FLT32X_MAX_EXP__": "1024", + "__FLT32X_MAX__": "1.79769313486231570814527423731704357e+308F32x", + "__FLT32X_MIN_10_EXP__": "(-307)", + "__FLT32X_MIN_EXP__": "(-1021)", + "__FLT32X_MIN__": "2.22507385850720138309023271733240406e-308F32x", + "__FLT32_DECIMAL_DIG__": "9", + "__FLT32_DENORM_MIN__": "1.40129846432481707092372958328991613e-45F32", + "__FLT32_DIG__": "6", + "__FLT32_EPSILON__": "1.19209289550781250000000000000000000e-7F32", + "__FLT32_HAS_DENORM__": "1", + "__FLT32_HAS_INFINITY__": "1", + "__FLT32_HAS_QUIET_NAN__": "1", + "__FLT32_MANT_DIG__": "24", + "__FLT32_MAX_10_EXP__": "38", + "__FLT32_MAX_EXP__": "128", + "__FLT32_MAX__": "3.40282346638528859811704183484516925e+38F32", + "__FLT32_MIN_10_EXP__": "(-37)", + "__FLT32_MIN_EXP__": "(-125)", + "__FLT32_MIN__": "1.17549435082228750796873653722224568e-38F32", + "__FLT64X_DECIMAL_DIG__": "21", + "__FLT64X_DENORM_MIN__": "3.64519953188247460252840593361941982e-4951F64x", + "__FLT64X_DIG__": "18", + "__FLT64X_EPSILON__": "1.08420217248550443400745280086994171e-19F64x", + "__FLT64X_HAS_DENORM__": "1", + "__FLT64X_HAS_INFINITY__": "1", + "__FLT64X_HAS_QUIET_NAN__": "1", + "__FLT64X_MANT_DIG__": "64", + "__FLT64X_MAX_10_EXP__": "4932", + "__FLT64X_MAX_EXP__": "16384", + "__FLT64X_MAX__": "1.18973149535723176502126385303097021e+4932F64x", + "__FLT64X_MIN_10_EXP__": "(-4931)", + "__FLT64X_MIN_EXP__": "(-16381)", + "__FLT64X_MIN__": "3.36210314311209350626267781732175260e-4932F64x", + "__FLT64_DECIMAL_DIG__": "17", + "__FLT64_DENORM_MIN__": "4.94065645841246544176568792868221372e-324F64", + "__FLT64_DIG__": "15", + "__FLT64_EPSILON__": "2.22044604925031308084726333618164062e-16F64", + "__FLT64_HAS_DENORM__": "1", + "__FLT64_HAS_INFINITY__": "1", + "__FLT64_HAS_QUIET_NAN__": "1", + "__FLT64_MANT_DIG__": "53", + "__FLT64_MAX_10_EXP__": "308", + "__FLT64_MAX_EXP__": "1024", + "__FLT64_MAX__": "1.79769313486231570814527423731704357e+308F64", + "__FLT64_MIN_10_EXP__": "(-307)", + "__FLT64_MIN_EXP__": "(-1021)", + "__FLT64_MIN__": "2.22507385850720138309023271733240406e-308F64", + "__FLT_DECIMAL_DIG__": "9", + "__FLT_DENORM_MIN__": "1.40129846432481707092372958328991613e-45F", + "__FLT_DIG__": "6", + "__FLT_EPSILON__": "1.19209289550781250000000000000000000e-7F", + "__FLT_EVAL_METHOD_TS_18661_3__": "0", + "__FLT_EVAL_METHOD__": "0", + "__FLT_HAS_DENORM__": "1", + "__FLT_HAS_INFINITY__": "1", + "__FLT_HAS_QUIET_NAN__": "1", + "__FLT_MANT_DIG__": "24", + "__FLT_MAX_10_EXP__": "38", + "__FLT_MAX_EXP__": "128", + "__FLT_MAX__": "3.40282346638528859811704183484516925e+38F", + "__FLT_MIN_10_EXP__": "(-37)", + "__FLT_MIN_EXP__": "(-125)", + "__FLT_MIN__": "1.17549435082228750796873653722224568e-38F", + "__FLT_RADIX__": "2", + "__FXSR__": "1", + "__GCC_ASM_FLAG_OUTPUTS__": "1", + "__GCC_ATOMIC_BOOL_LOCK_FREE": "2", + "__GCC_ATOMIC_CHAR16_T_LOCK_FREE": "2", + "__GCC_ATOMIC_CHAR32_T_LOCK_FREE": "2", + "__GCC_ATOMIC_CHAR_LOCK_FREE": "2", + "__GCC_ATOMIC_INT_LOCK_FREE": "2", + "__GCC_ATOMIC_LLONG_LOCK_FREE": "2", + "__GCC_ATOMIC_LONG_LOCK_FREE": "2", + "__GCC_ATOMIC_POINTER_LOCK_FREE": "2", + "__GCC_ATOMIC_SHORT_LOCK_FREE": "2", + "__GCC_ATOMIC_TEST_AND_SET_TRUEVAL": "1", + "__GCC_ATOMIC_WCHAR_T_LOCK_FREE": "2", + "__GCC_HAVE_DWARF2_CFI_ASM": "1", + "__GCC_HAVE_SYNC_COMPARE_AND_SWAP_1": "1", + "__GCC_HAVE_SYNC_COMPARE_AND_SWAP_2": "1", + "__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4": "1", + "__GCC_HAVE_SYNC_COMPARE_AND_SWAP_8": "1", + "__GCC_IEC_559": "2", + "__GCC_IEC_559_COMPLEX": "2", + "__GLIBCXX_BITSIZE_INT_N_0": "128", + "__GLIBCXX_TYPE_INT_N_0": "__int128", + "__GXX_ABI_VERSION": "1013", + "__GXX_WEAK__": "1", + "__HAVE_SPECULATION_SAFE_VALUE": "1", + "__INT16_C(c)": "c", + "__INT16_MAX__": "0x7fff", + "__INT16_TYPE__": "short int", + "__INT32_C(c)": "c", + "__INT32_MAX__": "0x7fffffff", + "__INT32_TYPE__": "int", + "__INT64_C(c)": "c ## L", + "__INT64_MAX__": "0x7fffffffffffffffL", + "__INT64_TYPE__": "long int", + "__INT8_C(c)": "c", + "__INT8_MAX__": "0x7f", + "__INT8_TYPE__": "signed char", + "__INTMAX_C(c)": "c ## L", + "__INTMAX_MAX__": "0x7fffffffffffffffL", + "__INTMAX_TYPE__": "long int", + "__INTMAX_WIDTH__": "64", + "__INTPTR_MAX__": "0x7fffffffffffffffL", + "__INTPTR_TYPE__": "long int", + "__INTPTR_WIDTH__": "64", + "__INT_FAST16_MAX__": "0x7fffffffffffffffL", + "__INT_FAST16_TYPE__": "long int", + "__INT_FAST16_WIDTH__": "64", + "__INT_FAST32_MAX__": "0x7fffffffffffffffL", + "__INT_FAST32_TYPE__": "long int", + "__INT_FAST32_WIDTH__": "64", + "__INT_FAST64_MAX__": "0x7fffffffffffffffL", + "__INT_FAST64_TYPE__": "long int", + "__INT_FAST64_WIDTH__": "64", + "__INT_FAST8_MAX__": "0x7f", + "__INT_FAST8_TYPE__": "signed char", + "__INT_FAST8_WIDTH__": "8", + "__INT_LEAST16_MAX__": "0x7fff", + "__INT_LEAST16_TYPE__": "short int", + "__INT_LEAST16_WIDTH__": "16", + "__INT_LEAST32_MAX__": "0x7fffffff", + "__INT_LEAST32_TYPE__": "int", + "__INT_LEAST32_WIDTH__": "32", + "__INT_LEAST64_MAX__": "0x7fffffffffffffffL", + "__INT_LEAST64_TYPE__": "long int", + "__INT_LEAST64_WIDTH__": "64", + "__INT_LEAST8_MAX__": "0x7f", + "__INT_LEAST8_TYPE__": "signed char", + "__INT_LEAST8_WIDTH__": "8", + "__INT_MAX__": "0x7fffffff", + "__INT_WIDTH__": "32", + "__LDBL_DECIMAL_DIG__": "21", + "__LDBL_DENORM_MIN__": "3.64519953188247460252840593361941982e-4951L", + "__LDBL_DIG__": "18", + "__LDBL_EPSILON__": "1.08420217248550443400745280086994171e-19L", + "__LDBL_HAS_DENORM__": "1", + "__LDBL_HAS_INFINITY__": "1", + "__LDBL_HAS_QUIET_NAN__": "1", + "__LDBL_MANT_DIG__": "64", + "__LDBL_MAX_10_EXP__": "4932", + "__LDBL_MAX_EXP__": "16384", + "__LDBL_MAX__": "1.18973149535723176502126385303097021e+4932L", + "__LDBL_MIN_10_EXP__": "(-4931)", + "__LDBL_MIN_EXP__": "(-16381)", + "__LDBL_MIN__": "3.36210314311209350626267781732175260e-4932L", + "__LONG_LONG_MAX__": "0x7fffffffffffffffLL", + "__LONG_LONG_WIDTH__": "64", + "__LONG_MAX__": "0x7fffffffffffffffL", + "__LONG_WIDTH__": "64", + "__LP64__": "1", + "__MMX__": "1", + "__NO_INLINE__": "1", + "__ORDER_BIG_ENDIAN__": "4321", + "__ORDER_LITTLE_ENDIAN__": "1234", + "__ORDER_PDP_ENDIAN__": "3412", + "__PRAGMA_REDEFINE_EXTNAME": "1", + "__PTRDIFF_MAX__": "0x7fffffffffffffffL", + "__PTRDIFF_TYPE__": "long int", + "__PTRDIFF_WIDTH__": "64", + "__REGISTER_PREFIX__": "", + "__SCHAR_MAX__": "0x7f", + "__SCHAR_WIDTH__": "8", + "__SEG_FS": "1", + "__SEG_GS": "1", + "__SHRT_MAX__": "0x7fff", + "__SHRT_WIDTH__": "16", + "__SIG_ATOMIC_MAX__": "0x7fffffff", + "__SIG_ATOMIC_MIN__": "(-__SIG_ATOMIC_MAX__ - 1)", + "__SIG_ATOMIC_TYPE__": "int", + "__SIG_ATOMIC_WIDTH__": "32", + "__SIZEOF_DOUBLE__": "8", + "__SIZEOF_FLOAT128__": "16", + "__SIZEOF_FLOAT80__": "16", + "__SIZEOF_FLOAT__": "4", + "__SIZEOF_INT128__": "16", + "__SIZEOF_INT__": "4", + "__SIZEOF_LONG_DOUBLE__": "16", + "__SIZEOF_LONG_LONG__": "8", + "__SIZEOF_LONG__": "8", + "__SIZEOF_POINTER__": "8", + "__SIZEOF_PTRDIFF_T__": "8", + "__SIZEOF_SHORT__": "2", + "__SIZEOF_SIZE_T__": "8", + "__SIZEOF_WCHAR_T__": "4", + "__SIZEOF_WINT_T__": "4", + "__SIZE_MAX__": "0xffffffffffffffffUL", + "__SIZE_TYPE__": "long unsigned int", + "__SIZE_WIDTH__": "64", + "__SSE2_MATH__": "1", + "__SSE2__": "1", + "__SSE_MATH__": "1", + "__SSE__": "1", + "__STDC_HOSTED__": "1", + "__STDC_IEC_559_COMPLEX__": "1", + "__STDC_IEC_559__": "1", + "__STDC_ISO_10646__": "201706L", + "__STDC_UTF_16__": "1", + "__STDC_UTF_32__": "1", + "__UINT16_C(c)": "c", + "__UINT16_MAX__": "0xffff", + "__UINT16_TYPE__": "short unsigned int", + "__UINT32_C(c)": "c ## U", + "__UINT32_MAX__": "0xffffffffU", + "__UINT32_TYPE__": "unsigned int", + "__UINT64_C(c)": "c ## UL", + "__UINT64_MAX__": "0xffffffffffffffffUL", + "__UINT64_TYPE__": "long unsigned int", + "__UINT8_C(c)": "c", + "__UINT8_MAX__": "0xff", + "__UINT8_TYPE__": "unsigned char", + "__UINTMAX_C(c)": "c ## UL", + "__UINTMAX_MAX__": "0xffffffffffffffffUL", + "__UINTMAX_TYPE__": "long unsigned int", + "__UINTPTR_MAX__": "0xffffffffffffffffUL", + "__UINTPTR_TYPE__": "long unsigned int", + "__UINT_FAST16_MAX__": "0xffffffffffffffffUL", + "__UINT_FAST16_TYPE__": "long unsigned int", + "__UINT_FAST32_MAX__": "0xffffffffffffffffUL", + "__UINT_FAST32_TYPE__": "long unsigned int", + "__UINT_FAST64_MAX__": "0xffffffffffffffffUL", + "__UINT_FAST64_TYPE__": "long unsigned int", + "__UINT_FAST8_MAX__": "0xff", + "__UINT_FAST8_TYPE__": "unsigned char", + "__UINT_LEAST16_MAX__": "0xffff", + "__UINT_LEAST16_TYPE__": "short unsigned int", + "__UINT_LEAST32_MAX__": "0xffffffffU", + "__UINT_LEAST32_TYPE__": "unsigned int", + "__UINT_LEAST64_MAX__": "0xffffffffffffffffUL", + "__UINT_LEAST64_TYPE__": "long unsigned int", + "__UINT_LEAST8_MAX__": "0xff", + "__UINT_LEAST8_TYPE__": "unsigned char", + "__USER_LABEL_PREFIX__": "", + "__WCHAR_MAX__": "0x7fffffff", + "__WCHAR_MIN__": "(-__WCHAR_MAX__ - 1)", + "__WCHAR_TYPE__": "int", + "__WCHAR_WIDTH__": "32", + "__WINT_MAX__": "0xffffffffU", + "__WINT_MIN__": "0U", + "__WINT_TYPE__": "unsigned int", + "__WINT_WIDTH__": "32", + "__amd64": "1", + "__amd64__": "1", + "__code_model_small__": "1", + "__gnu_linux__": "1", + "__k8": "1", + "__k8__": "1", + "__linux": "1", + "__linux__": "1", + "__unix": "1", + "__unix__": "1", + "__x86_64": "1", + "__x86_64__": "1", + "linux": "1", + "unix": "1" + }, + "sys_include_envvar": null, + "sys_include_path": [ + "/usr/local/lib/gcc/x86_64-pc-linux-gnu/9.3.0/../../../../include/c++/9.3.0", + "/usr/local/lib/gcc/x86_64-pc-linux-gnu/9.3.0/../../../../include/c++/9.3.0/x86_64-pc-linux-gnu", + "/usr/local/lib/gcc/x86_64-pc-linux-gnu/9.3.0/../../../../include/c++/9.3.0/backward", + "/usr/local/lib/gcc/x86_64-pc-linux-gnu/9.3.0/include", + "/usr/local/include", + "/usr/local/lib/gcc/x86_64-pc-linux-gnu/9.3.0/include-fixed", + "/usr/include/x86_64-linux-gnu", + "/usr/include" + ] + } + }, + "language_cxx.command.#": "/usr/bin/g++", + "language_cxx.info.#": "Using built-in specs.\nCOLLECT_GCC=/usr/bin/g++\nCOLLECT_LTO_WRAPPER=/usr/local/libexec/gcc/x86_64-pc-linux-gnu/9.3.0/lto-wrapper\nTarget: x86_64-pc-linux-gnu\nConfigured with: /tmp/gcc-9.3.0/configure --disable-bootstrap --enable-languages=c,c++,lto --prefix=/usr/local --program-suffix=-9.3\nThread model: posix\ngcc version 9.3.0 (GCC) \n", + "linker": { + "library_path": [ + "/usr/local/lib/gcc/x86_64-pc-linux-gnu/9.3.0/", + "/usr/local/lib/gcc/x86_64-pc-linux-gnu/9.3.0/../../../../lib64/", + "/lib/x86_64-linux-gnu/", + "/lib/../lib64/", + "/usr/lib/x86_64-linux-gnu/", + "/usr/lib/../lib64/", + "/usr/local/lib/gcc/x86_64-pc-linux-gnu/9.3.0/../../../", + "/lib/", + "/usr/lib/" + ] + }, + "types": { + "char16_t_type": "unsigned short", + "char32_t_type": "unsigned int", + "char_bits": 8, + "double_type": { + "alignof": 8, + "sizeof": 8 + }, + "float_type": { + "alignof": 4, + "sizeof": 4 + }, + "int_type": { + "alignof": 4, + "sizeof": 4 + }, + "long_double_type": { + "alignof": 16, + "sizeof": 16 + }, + "long_long_type": { + "alignof": 8, + "sizeof": 8 + }, + "long_type": { + "alignof": 8, + "sizeof": 8 + }, + "pointer_type": { + "alignof": 8, + "sizeof": 8 + }, + "ptrdiff_t_type": "signed long", + "short_type": { + "alignof": 2, + "sizeof": 2 + }, + "size_t_type": "unsigned long", + "wchar_t_type": "signed int", + "wint_t_type": "unsigned int" + } + } + }, + "_Format": "1.0", + "_Version": "7.5.0", + "_VersionNum": [ + 7, + 5, + 0, + 11376 + ] +} + diff --git a/coin/provisioning/common/linux/axivion/post_processing.py b/coin/provisioning/common/linux/axivion/post_processing.py new file mode 100644 index 00000000000..53f7223bdf4 --- /dev/null +++ b/coin/provisioning/common/linux/axivion/post_processing.py @@ -0,0 +1,34 @@ +#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 + +import re + +import axivion.config +from axivion.analysis.post_processing import FilterAction +from bauhaus import ir + +analysis = axivion.config.get_analysis() + +qt_inline_pattern = re.compile(r"QT_.*_INLINE(_IMPL)?_SINCE\(\d+,\d+\)") +def exclude_inlined_by_qt_inline_macro(sv, ir_graph): + node = ir_graph.get_node(ir.Physical, sv.primary_sloc.pir_node_number) + + # we have to check on the token stream as the macro might expand to nothing + # -> only the invocation is in the IR, but not in the AST of the routine decl / def + preceeding_string = "" + + token = node.Token + while True: + try: + token_value = re.sub('^#\\s+', '#', token.Value) + if token_value in {';', '{', '}', '#define'}: + break + preceeding_string = token.Value + preceeding_string + token = token.prev() + except StopIteration: + break + if re.match(qt_inline_pattern, preceeding_string): + return FilterAction.exclude + return FilterAction.normal + +analysis['Qt-Generic-NoFunctionDefinitionInHeader'].post_processing.add_filter(exclude_inlined_by_qt_inline_macro, inputs=[ir.Graph]) diff --git a/coin/provisioning/common/linux/axivion/rule_config.json b/coin/provisioning/common/linux/axivion/rule_config.json new file mode 100644 index 00000000000..bc6505e4cb2 --- /dev/null +++ b/coin/provisioning/common/linux/axivion/rule_config.json @@ -0,0 +1,210 @@ +{ + "Analysis": { + "CloneDetection": { + "_active": true, + "excludes": [ + "$(splitpath:EXCLUDE_FILES)" + ] + }, + "Frameworks-QtSupport": { + "_active": true, + "exclude_qt_generated_files": true, + "qtdir": "/home/qt/work/install" + }, + "Qt-AutoUnexpectedQStringbuilder": { + "_active": true + }, + "Qt-BaseClassEvent": { + "_active": true + }, + "Qt-ChildEventQObjectCast": { + "_active": true + }, + "Qt-Connect3argLambda": { + "_active": true + }, + "Qt-ConnectByName": { + "_active": true + }, + "Qt-ConnectNonSignal": { + "_active": true + }, + "Qt-ConstSignalOrSlot": { + "_active": true + }, + "Qt-CtorMissingParentArgument": { + "_active": true + }, + "Qt-DetachingTemporary": { + "_active": true + }, + "Qt-FullyQualifiedMocTypes": { + "_active": true + }, + "Qt-FunctionArgsByValueRef": { + "_active": true + }, + "Qt-Generic-DuplicateIncludeGuard": { + "_active": true + }, + "Qt-Generic-FormatSpecifier": { + "_active": true + }, + "Qt-Generic-InitializeAllFieldsInConstructor": { + "_active": true + }, + "Qt-Generic-MissingBaseCopy": { + "_active": true + }, + "Qt-Generic-MissingIncludeGuard": { + "_active": true + }, + "Qt-Generic-NoAbsoluteInclude": { + "_active": true + }, + "Qt-Generic-NoFunctionDefinitionInHeader": { + "_active": true + }, + "Qt-Generic-NoIrregularInclude": { + "_active": true + }, + "Qt-Generic-NoMixOfClassStruct": { + "_active": true + }, + "Qt-Generic-NoOverloadedOperators": { + "_active": true + }, + "Qt-Generic-NoReferenceToLocalVariable": { + "_active": true + }, + "Qt-Generic-QNetworkReplyDeleteLater": { + "_active": true + }, + "Qt-Generic-ThrowByValueCatchByReference": { + "_active": true + }, + "Qt-Generic-TypedefCheck": { + "_active": true + }, + "Qt-Generic-WrongIncludeCasing": { + "_active": true + }, + "Qt-GlobalConstCharPointer": { + "_active": true + }, + "Qt-IncorrectEmit": { + "_active": true + }, + "Qt-InstallEventFilter": { + "_active": true + }, + "Qt-LambdaInConnect": { + "_active": true + }, + "Qt-LambdaUniqueConnection": { + "_active": true + }, + "Qt-LowercaseQmlTypeName": { + "_active": true + }, + "Qt-MissingQObjectMacro": { + "_active": true + }, + "Qt-MutableContainerKey": { + "_active": true + }, + "Qt-NonPodGlobalStatic": { + "_active": true + }, + "Qt-OldStyleConnect": { + "_active": true + }, + "Qt-OverloadedSignal": { + "_active": true + }, + "Qt-OverriddenSignal": { + "_active": true + }, + "Qt-PostEvent": { + "_active": true + }, + "Qt-QDateTimeUTC": { + "_active": true + }, + "Qt-QEnums": { + "_active": true + }, + "Qt-QLatin1StringNonAscii": { + "_active": true + }, + "Qt-QMapWithPointerKey": { + "_active": true + }, + "Qt-QPropertyWithoutNotify": { + "_active": true + }, + "Qt-QStringArg": { + "_active": true + }, + "Qt-QStringComparisonToImplicitChar": { + "_active": true + }, + "Qt-QhashNamespace": { + "_active": true + }, + "Qt-QtMacros": { + "_active": true + }, + "Qt-RangeLoopDetach": { + "_active": false + }, + "Qt-RangeLoopReference": { + "_active": true + }, + "Qt-ReturningDataFromTemporary": { + "_active": true + }, + "Qt-RuleOfThree": { + "_active": true + }, + "Qt-RuleOfTwoSoft": { + "_active": true + }, + "Qt-SkippedBaseMethod": { + "_active": true + }, + "Qt-StrictIterators": { + "_active": true + }, + "Qt-TemporaryIterator": { + "_active": true + }, + "Qt-UnusedNonTrivialVariable": { + "_active": true + }, + "Qt-VirtualSignal": { + "_active": true + }, + "Qt-WritingToTemporary": { + "_active": true + }, + "Qt-WrongQEventCast": { + "_active": true + }, + "Qt-WrongQGlobalStatic": { + "_active": true + }, + "Stylechecks": { + "excludes": [ + "$(splitpath:EXCLUDE_FILES)" + ] + } + }, + "_Format": "1.0", + "_VersionNum": [ + 7, + 8, + 0, + 15004 + ] +} diff --git a/coin/provisioning/common/linux/axivion/start_analysis.sh b/coin/provisioning/common/linux/axivion/start_analysis.sh new file mode 100755 index 00000000000..b5becfa9809 --- /dev/null +++ b/coin/provisioning/common/linux/axivion/start_analysis.sh @@ -0,0 +1,13 @@ +#!/bin/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 + +$HOME/bauhaus-suite/setup.sh --non-interactive +export PATH=/home/qt/bauhaus-suite/bin:$PATH +export BAUHAUS_CONFIG=$(cd $(dirname $(readlink -f $0)) && pwd) +export AXIVION_VERSION_NAME=$(git rev-parse HEAD) +export EXCLUDE_FILES="build/*:src/3rdparty/*" +export MODULE=$TESTED_MODULE_COIN +export PACKAGE="Add-ons" +export IRNAME=build/$TESTED_MODULE_COIN.ir +axivion_ci "$@" 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 8cecbbc3788..ba9e8fbf954 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 @@ -1,6 +1,39 @@ #!/bin/bash -#Copyright (C) 2023 The Qt Company Ltd +#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=../common/linux/axivion-bauhaus-suite.sh -source "${BASH_SOURCE%/*}/../common/linux/axivion-bauhaus-suite.sh" +# This script installs Axivion Bauhaus Suite tool. + +set -ex + +# shellcheck source=../common/unix/DownloadURL.sh +source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" + +DownloadAndExtract () { + url=$1 + sha=$2 + file=$3 + + DownloadURL "$url" "$url" "$sha" "$file" + tar -xzvf "$file" + + rm -rf "$file" +} + + +# 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" +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 +cd "$HOME" + +#Axivion configuration +cp -r "${BASH_SOURCE%/*}/../common/linux/axivion/" "$HOME/" + +echo "Axivion Bauhaus Suite = 7.8.4" >> ~/versions.txt From cceb2909ddeb8401c9d329c57f101cf8b06bd422 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 4 Dec 2024 18:48:07 +0100 Subject: [PATCH 239/288] 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. Change-Id: Iaa8e58104c92858318ad66aefa5a38d63ad7a155 Reviewed-by: Joerg Bornemann (cherry picked from commit ff25d705a346a06f77b14c64266cb02528871bff) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 22ae1bb5eec41c426dce4334e3e7a2ceb74cbd44) --- cmake/QtIRGitHelpers.cmake | 25 ++++++-- cmake/QtIRParsingHelpers.cmake | 111 ++++++++++++++++++++++++++------- 2 files changed, 110 insertions(+), 26 deletions(-) diff --git a/cmake/QtIRGitHelpers.cmake b/cmake/QtIRGitHelpers.cmake index 288f4ac78fb..d851b65a31e 100644 --- a/cmake/QtIRGitHelpers.cmake +++ b/cmake/QtIRGitHelpers.cmake @@ -93,9 +93,15 @@ function(qt_ir_run_git_submodule_init submodules working_directory) qt_ir_setup_commit_template("${working_directory}" "${working_directory}") endfunction() -# Add gerrit remotes to the repository. -function(qt_ir_add_git_remotes repo_name working_directory) - set(gerrit_ssh_base "ssh://@USER@codereview.qt-project.org@PORT@/qt/") +# Add gerrit remotes to the repository located in the working_directory. +# repo_relative_url is the relative URL of the repository. +# Examples: +# - qt5 +# - qttools.git +# - ../playground/qlitehtml.git +# - ../qt/qttools-litehtml.git +function(qt_ir_add_git_remotes repo_relative_url working_directory) + set(gerrit_ssh_base "ssh://@USER@codereview.qt-project.org@PORT@/") set(gerrit_repo_url "${gerrit_ssh_base}") qt_ir_get_option_value(codereview-username username) @@ -110,7 +116,10 @@ function(qt_ir_add_git_remotes repo_name working_directory) string(REPLACE "@PORT@" "" gerrit_repo_url "${gerrit_repo_url}") endif() - string(APPEND gerrit_repo_url "${repo_name}") + set(namespace "qt") + set(repo_relative_url_with_namespace "${namespace}/${repo_relative_url}") + qt_ir_normalize_git_url("http://github.com/$%7Brepo_relative_url_with_namespace%7D%22%20normalized_url) + string(APPEND gerrit_repo_url "${normalized_url}") qt_ir_execute_process_and_log_and_handle_error( COMMAND_ARGS git config remote.gerrit.url "${gerrit_repo_url}" @@ -193,15 +202,21 @@ function(qt_ir_clone_one_submodule submodule_name) set(submodule_base_git_path "${${prefix}_${submodule_name}_base_git_path}") set(submodule_url "${submodule_base_git_path}") - qt_ir_has_url_scheme("${submodule_url}" has_url_scheme) + qt_ir_parse_git_url( + URL "${submodule_url}" + OUT_VAR_HAS_URL_SCHEME has_url_scheme + ) + if(NOT has_url_scheme AND arg_BASE_URL) set(submodule_url "${arg_BASE_URL}${submodule_url}") + qt_ir_normalize_git_url("http://github.com/$%7Bsubmodule_url%7D%22%20submodule_url) endif() qt_ir_get_mirror(mirror_url) set(mirror "") if(NOT has_url_scheme AND mirror_url AND (should_clone OR arg_FETCH)) set(mirror "${mirror_url}${submodule_base_git_path}") + qt_ir_normalize_git_url("http://github.com/$%7Bmirror%7D%22%20mirror) endif() set(mirror_or_original_url "${submodule_url}") diff --git a/cmake/QtIRParsingHelpers.cmake b/cmake/QtIRParsingHelpers.cmake index d7d3f20e9d3..04a344234f5 100644 --- a/cmake/QtIRParsingHelpers.cmake +++ b/cmake/QtIRParsingHelpers.cmake @@ -40,18 +40,79 @@ function(qt_ir_get_git_config_contents out_var) set(${out_var} "${git_output}" PARENT_SCOPE) endfunction() -# Checks whether the given url has a scheme like https:// or is just a -# relative path. -function(qt_ir_has_url_scheme url out_var) - string(REGEX MATCH "^[a-z][a-z0-9+\-.]*://" has_url_scheme "${url}") +# Parses a git repo url to: +# - check if the given url has a scheme like https:// or git:// or is just a +# relative path with no scheme (possibly containing '../' segments) +# - extracts the scheme if it exists +# - extracts the url without the scheme +function(qt_ir_parse_git_url) + set(options "") + set(oneValueArgs + URL + OUT_VAR_HAS_URL_SCHEME + OUT_VAR_SCHEME + OUT_VAR_URL_WITHOUT_SCHEME + ) + set(multiValueArgs "") + cmake_parse_arguments(arg "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) - if(has_url_scheme) - set(${out_var} TRUE PARENT_SCOPE) + string(REGEX MATCH "^([a-z][a-z0-9+\-.]*://)(.+)" url_scheme_match "${arg_URL}") + + if(url_scheme_match) + set(has_url_scheme TRUE) + set(scheme "${CMAKE_MATCH_1}") + set(url_without_scheme "${CMAKE_MATCH_2}") else() - set(${out_var} FALSE PARENT_SCOPE) + set(has_url_scheme FALSE) + set(scheme "") + set(url_without_scheme "${url}") + endif() + + if(arg_OUT_VAR_HAS_URL_SCHEME) + set(${arg_OUT_VAR_HAS_URL_SCHEME} "${has_url_scheme}" PARENT_SCOPE) + endif() + + if(arg_OUT_VAR_SCHEME) + set(${arg_OUT_VAR_SCHEME} "${scheme}" PARENT_SCOPE) + endif() + + if(arg_OUT_VAR_URL_WITHOUT_SCHEME) + set(${arg_OUT_VAR_URL_WITHOUT_SCHEME} "${url_without_scheme}" PARENT_SCOPE) endif() endfunction() +# Normalizes a url that contains '../' path segments. +# Removes the '../' segments and the directories that they precede. +# Example: +# git://code.qt.io/qt/../playground/qlitehtml.git +# will be normalized to: +# git://code.qt.io/playground/qlitehtml.git +function(qt_ir_normalize_git_url url out_var) + # The exact perl code was while ($base =~ s,(?!\.\./)[^/]+/\.\./,,g) {} + # That got rid of ../ and ../../ in the path, but it broke down + # when more than two '../' segments were present. + # + # In CMake, we instead parse the url to get the non-scheme suffix, + # use get_filename_component(ABSOLUTE) to resolve the url as if it was a relative path + # and then re-add the scheme if it was present. + qt_ir_parse_git_url( + URL "${url}" + OUT_VAR_HAS_URL_SCHEME has_url_scheme + OUT_VAR_SCHEME url_scheme + OUT_VAR_URL_WITHOUT_SCHEME url_without_scheme + ) + + # Note the empty BASE_DIR is important, otherwise the path is relative to + # ${CMAKE_CURRENT_SOURCE_DIR}. + get_filename_component(normalized_url "${url_without_scheme}" ABSOLUTE BASE_DIR "") + + if(has_url_scheme) + string(PREPEND normalized_url "${url_scheme}") + endif() + + set(${out_var} "${normalized_url}" PARENT_SCOPE) +endfunction() + # Parses a key-value line from a .git/config or .gitmodules file macro(qt_ir_parse_git_key_value) string(REGEX REPLACE "^submodule\\.([^.=]+)\\.([^.=]+)=(.*)$" "\\1;\\2;\\3" @@ -79,14 +140,22 @@ endmacro() # url_value # the url where to clone a repo from # in perl script it was called $base -# e.g. '../qtbase.git', 'https://code.qt.io/playground/qlitehtml.git' +# Examples: +# - '../qtbase.git' +# - 'https://code.qt.io/playground/qlitehtml.git' +# - '../../playground/qlitehtml.git' # parent_repo_base_git_path # the base git path of the parent of the submodule # it is either a relative dir or a full url # in the perl script it was called $my_repo_base, # it was passed as first arg to git_clone_all_submodules, # it was passed the value of $subbases{$module} when doing recursive submodule cloning -# e.g. 'qt5', 'tqtc-qt5', 'qtdeclarative.git', 'https://code.qt.io/playground/qlitehtml.git' +# Examples: +# - 'qt5' +# - 'tqtc-qt5' +# - 'qtdeclarative.git' +# - 'qttools.git' +# - 'https://code.qt.io/playground/qlitehtml.git' # # Outputs # @@ -94,21 +163,21 @@ endmacro() # just the value of ${url_value} # ${out_var_prefix}_${submodule_name}_base_git_path # the whole url if it has a scheme, otherwise it's the value of -# ${url_value} relative to ${parent_repo_base_git_path}, so all the ../ are collapsed -# e.g. 'qtdeclarative.git' -# 'https://code.qt.io/playground/qlitehtml.git', +# ${url_value} relative to ${parent_repo_base_git_path}, so some of the '../' segments +# are collapsed depending on how many path segments are available in +# ${parent_repo_base_git_path}. +# Examples: +# - 'qtdeclarative.git' +# - 'https://code.qt.io/playground/qlitehtml.git' +# - '../playground/qlitehtml.git' macro(qt_ir_parse_git_url_key out_var_prefix submodule_name url_value parent_repo_base_git_path) - qt_ir_has_url_scheme("${url_value}" has_url_scheme) + qt_ir_parse_git_url( + URL "${url_value}" + OUT_VAR_HAS_URL_SCHEME has_url_scheme + ) if(NOT has_url_scheme) set(base_git_path "${parent_repo_base_git_path}/${url_value}") - - # The exact code perl code was while ($base =~ s,(?!\.\./)[^/]+/\.\./,,g) {} - # That got rid of ../ and ../../ in the path, but it broke down - # when more than two ../ were present. - # We just use ABSOLUTE to resolve the path and get rid of all ../ - # Note the empty BASE_DIR is important, otherwise the path is relative to - # ${CMAKE_CURRENT_SOURCE_DIR}. - get_filename_component(base_git_path "${base_git_path}" ABSOLUTE BASE_DIR "") + qt_ir_normalize_git_url("http://github.com/$%7Bbase_git_path%7D%22%20base_git_path) else() set(base_git_path "${url_value}") endif() From 83b40b020d6283dccde3a7ee7d1cb73d5306fa30 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 12 Nov 2024 08:44:49 +0200 Subject: [PATCH 240/288] 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. Change-Id: Ie2ee9e62f9bc10753bd527a2b1a7edc5de46ca60 Reviewed-by: Tero Heikkinen Reviewed-by: Simo Fält (cherry picked from commit 69dfa0449cd8843b4e992efaa74ceb785dade96b) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit b07fbbf935ff452497dc74c46b0c11eb811998e9) --- 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 6bd5f994edb..e89c9609254 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 2b137b3f41765aa60e9ee3c8ba79f06e3a45407d Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Wed, 15 Jan 2025 15:32:07 +0100 Subject: [PATCH 241/288] 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 Change-Id: Ia06dde53825e882e78a8c6be9e62779aaedcebf4 Reviewed-by: Toni Saario (cherry picked from commit 6f0c6b1614d7f0f336d656da947e7ca09cfe4145) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 5b0d2e87d0fcef5a56d4f04c0bc0c07bd615ffd7) --- 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 9e7829bf5e191d8ede073f36f487e9e22ba0eabd Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 18 Jan 2025 05:57:43 +0000 Subject: [PATCH 242/288] Update submodules on '6.8 in qt/qt5' Change-Id: I228744d899c717f255f168122af6eea1c03d90a3 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 335eba25e26..af9eacd0caf 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 335eba25e26862b41185ad93537fc63c2ff93022 +Subproject commit af9eacd0caf5e31b7925dcd6e2cec8b0a15a83a3 diff --git a/qt5compat b/qt5compat index 3ef71226f75..451b375e83e 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 3ef71226f752d404402c08d0c49bd04bf94758ab +Subproject commit 451b375e83ee883be84555ecc25cd9df50fff90f diff --git a/qtactiveqt b/qtactiveqt index d5245c851b5..6aae7807e2a 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit d5245c851b567b2912e2616ef12710261f1aee76 +Subproject commit 6aae7807e2a23050ad8d272a6159e8cf1c6ce260 diff --git a/qtbase b/qtbase index 596278c7cba..3accb0bc640 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 596278c7cbaf4b9f18c0738dc237398301d6c9e6 +Subproject commit 3accb0bc64044a3d99212ec23bfa6f766c726ebc diff --git a/qtcharts b/qtcharts index d3c16fc942e..e29c3161189 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit d3c16fc942e284ae5efd36b61b9087bc05cd42a8 +Subproject commit e29c3161189983a82c95debf1ea7c7a3b74bc413 diff --git a/qtcoap b/qtcoap index 8add3bda32c..0fec4ee7eb5 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit 8add3bda32c09191e17a68b5930e27a27da8fb81 +Subproject commit 0fec4ee7eb5fa4f939cdab68b742a2edc96a193d diff --git a/qtconnectivity b/qtconnectivity index 5fa13b2aa48..6a61cd41f3b 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 5fa13b2aa48ee8c01d06dc86b3026f684e891611 +Subproject commit 6a61cd41f3be056561a7f63c7a34744964e0d8a1 diff --git a/qtdatavis3d b/qtdatavis3d index bdc401dd2b4..753c5354c0b 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit bdc401dd2b4885bb9bb1dfdd178fcaba60f68baf +Subproject commit 753c5354c0bb59723ac1e0d05da999c6c1043926 diff --git a/qtdeclarative b/qtdeclarative index 28955a0dc80..2f13709a649 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 28955a0dc80b7eb0bf5a02181f458161085a0823 +Subproject commit 2f13709a649bfbaf17f619da7f5f04d0641e08fb diff --git a/qtdoc b/qtdoc index cefefa8d6eb..2015f68366e 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit cefefa8d6ebf47ad343e3ff2e4a65688b8b7b9b0 +Subproject commit 2015f68366e74fc042c56099053ab626e447be6e diff --git a/qtgraphs b/qtgraphs index 0b82dea0238..873724e1b1b 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit 0b82dea0238b8c1d18cc06363da06ae01d92118a +Subproject commit 873724e1b1ba1bf553166ba505c340dc43230fe9 diff --git a/qtgrpc b/qtgrpc index 92d0b2dce6c..6b03d3ed6cc 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit 92d0b2dce6c5b343785cf6f2c6e945027f06e8b5 +Subproject commit 6b03d3ed6cc7fe4b7898f158386513d2d451dae0 diff --git a/qthttpserver b/qthttpserver index 0406bbd8f3d..04e88ef9cdb 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit 0406bbd8f3d87fc05601c55058a2dd6ec2856b59 +Subproject commit 04e88ef9cdbcb0202c243cf05b33afc58e6c5c73 diff --git a/qtimageformats b/qtimageformats index 6be2670fca1..1d9e0901923 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 6be2670fca1813c973f192cc3817f3fe5096e796 +Subproject commit 1d9e0901923a71338285bce3b324a315a711e99c diff --git a/qtlanguageserver b/qtlanguageserver index 05100b054ce..4ac861b8e5d 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit 05100b054cedde5d7fa2820264f7254738d7506b +Subproject commit 4ac861b8e5da0537b59a2aeba084e726e4200ef0 diff --git a/qtlocation b/qtlocation index c5f7d1e79ef..d48616ac8b9 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit c5f7d1e79ef7c0c1755c99b6e80977acdbfaf414 +Subproject commit d48616ac8b9b8f9a159d30ddf6d6d36326899fc8 diff --git a/qtlottie b/qtlottie index 99f5bb914b5..37aed2767e3 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 99f5bb914b5c50ad4fd65a36a0da0d4f421ab5d6 +Subproject commit 37aed2767e31474545d095b6aee12368a43f0048 diff --git a/qtmqtt b/qtmqtt index 1bbed1af84c..6e874f3444c 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit 1bbed1af84c0edf78b8d9b530672182d423aebf7 +Subproject commit 6e874f3444c09a046b98c40febe843d6f2ce32ee diff --git a/qtmultimedia b/qtmultimedia index bd81c12d6a4..87ade15eb77 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit bd81c12d6a4b8503aa1d3de56d7d920080121ef6 +Subproject commit 87ade15eb777c1ead664ca65c384e05d00f5f99c diff --git a/qtnetworkauth b/qtnetworkauth index add3a813ac7..323788577ad 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit add3a813ac78b9cb2fe2bcea78dc9d8a7d0e4f29 +Subproject commit 323788577ad08ec016b3995c1c954435b3a78a97 diff --git a/qtopcua b/qtopcua index fef61a01067..027eff74e6c 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit fef61a01067bdf79812b93142d71733922a8ca19 +Subproject commit 027eff74e6c76bb79e4e1b39d16905021ba86aba diff --git a/qtpositioning b/qtpositioning index 7dabe03d504..4ebea88f0ff 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit 7dabe03d504f020887d454e3f50ce5b01c2ea1f2 +Subproject commit 4ebea88f0ffc2bb1c43ffae0097cfcb9c9c41f1b diff --git a/qtquick3d b/qtquick3d index 506bbcdcd66..0720aa9b16e 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 506bbcdcd665eb1511c2849445722d26dc9ceaa2 +Subproject commit 0720aa9b16e4951a76b4e5591eae9994e5d89da9 diff --git a/qtquick3dphysics b/qtquick3dphysics index 7e91810dfc6..96959b8e577 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit 7e91810dfc6a797edf236444887e4ad9e9c6eb9a +Subproject commit 96959b8e577a3d1c9a190d87706728e2a2cf75b2 diff --git a/qtquickeffectmaker b/qtquickeffectmaker index b88cb2a3c9d..3a140b00aed 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit b88cb2a3c9d943169138720d0b0f0b83be8af605 +Subproject commit 3a140b00aed6f48bb2157555c1a0765febc2bc30 diff --git a/qtquicktimeline b/qtquicktimeline index c666da561da..4b36a034eb7 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit c666da561daaa33e410bd994e09151a4679da0af +Subproject commit 4b36a034eb724a272041fa3237e912b7ba792ea7 diff --git a/qtremoteobjects b/qtremoteobjects index 72dbe0c9c52..9cc5ec7489f 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 72dbe0c9c5250205c9ee281919ce4395512a417e +Subproject commit 9cc5ec7489f751582825ef2457ae477a4e574cc3 diff --git a/qtscxml b/qtscxml index 046069984d5..64c76855f7e 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 046069984d53861779b8f50148819b302fafd2db +Subproject commit 64c76855f7e5cbfef68e01da535dbc1169ecfa77 diff --git a/qtsensors b/qtsensors index 7964d0b2c07..bb18d192565 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 7964d0b2c0735db2d3c1d1f8e283c8e8b63f6b91 +Subproject commit bb18d192565fadae907ddbac81cfc5647c317f1f diff --git a/qtserialbus b/qtserialbus index 782b0e6f52c..2057d3a1559 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 782b0e6f52c6d3245a62c4d8b74488f81da4a2e7 +Subproject commit 2057d3a1559642a1c2a639d331339f015bfe01b3 diff --git a/qtserialport b/qtserialport index b5cf5a15baf..5e5d3774ae9 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit b5cf5a15bafe0b9d7564a8a0878d929d4ff9d048 +Subproject commit 5e5d3774ae996d8b9fcd404c2c8cf4096235b6d8 diff --git a/qtshadertools b/qtshadertools index 09546f718c2..059a14e9b44 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 09546f718c2a052e81d09ddcb93bd57ab544734b +Subproject commit 059a14e9b443344fd500b079fefd910d63b8cf33 diff --git a/qtspeech b/qtspeech index 024cc963c3b..b7871922779 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 024cc963c3bfac21749476b76495fb7676970577 +Subproject commit b7871922779adbb954e060efd5a72d5c444802d3 diff --git a/qtsvg b/qtsvg index 96a683763d2..d55d9d4eea7 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 96a683763d263b4259ebbfda4513ac0d1100c7f7 +Subproject commit d55d9d4eea764a72f4ca116a8fa07572c092b3b3 diff --git a/qttools b/qttools index cee47fe6d30..1500ab1758e 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit cee47fe6d3034be007bf3e77dfc6c6283a2a4bba +Subproject commit 1500ab1758e8bb37f94ec788aa89b7aa03f82533 diff --git a/qttranslations b/qttranslations index ef156c6f5f1..8312cd36819 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit ef156c6f5f1a08147e3ba84a606b3be196f7fa9c +Subproject commit 8312cd3681988081097cd40039867cf7d57a67ae diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 083b44d3151..10d486d65fb 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 083b44d31511c2028f46da94ed34b065e67c1360 +Subproject commit 10d486d65fb1ca0b6c039f3adbc2007842f2f8cd diff --git a/qtwayland b/qtwayland index 702765ae315..bf36bcf5b5f 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 702765ae315b75338d2ba5bae2c761205c7a588b +Subproject commit bf36bcf5b5f6d2f20a1e50e2d39f1110617a45e1 diff --git a/qtwebchannel b/qtwebchannel index cf2747f8986..1d9b0323b70 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit cf2747f89861f9881ecb4e6e957795d094691564 +Subproject commit 1d9b0323b70e83461aedec08093da03aa48fcf8a diff --git a/qtwebengine b/qtwebengine index 3cdf0a21294..0beb5882452 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 3cdf0a2129448a7ac061d1a7eedc60842ce25a64 +Subproject commit 0beb588245230f5d4034d475d279cac6e4806056 diff --git a/qtwebsockets b/qtwebsockets index 45b9872661d..93881271489 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 45b9872661d1650ede0be453af1c47c1ee159254 +Subproject commit 938812714893d014fda0a560a5e6bc23317aa6a5 diff --git a/qtwebview b/qtwebview index b4f68342ea7..2c0a3b8ea63 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit b4f68342ea7c9236a765075df352c2ebc9b3b746 +Subproject commit 2c0a3b8ea631ed187f4883c01adea0bcaafdafa9 From e600f0a85b929ff7b888f95bf68f924caa662861 Mon Sep 17 00:00:00 2001 From: Matti Paaso Date: Thu, 9 Jan 2025 15:10:14 +0200 Subject: [PATCH 243/288] 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.5 Change-Id: I92a70dcb14bbba0ded889894059f2de849b1f557 Reviewed-by: Simo Fält (cherry picked from commit 45491c61fc2ec94b5bf4817be26814fe49eab9fa) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 3579a0c95ceb37857d82f629eee80d652e182a94) --- .../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 bdd49adae99e7791b10d822765ffc4ec1e645958 Mon Sep 17 00:00:00 2001 From: Rami Potinkara Date: Wed, 13 Nov 2024 10:49:06 +0200 Subject: [PATCH 244/288] 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-6653 Pick-to: 6.5 Change-Id: Icb6de43f3e2c2f7f98f3172c83d66bebf9603d24 Reviewed-by: Assam Boudjelthia (cherry picked from commit 2c85a91e072241572372c98a667401bf27174a1b) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit f537715537329906842c360c101e8c6be8ecc8eb) --- .../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 9995b87194c..fe3697f2978 100644 --- a/coin/platform_configs/cmake_platforms_target_android.yaml +++ b/coin/platform_configs/cmake_platforms_target_android.yaml @@ -48,7 +48,7 @@ Configurations: 'ANDROID_EMULATOR=emulator_x86_api_28' ] - - Id: 'android-14-x86_64-on-linux' + Id: 'android-15-x86_64-on-linux' Template: 'qtci-linux-RHEL-8.10-x86_64-51' Target os: 'Android_ANY' Target arch: 'x86_64' @@ -56,22 +56,6 @@ Configurations: Target compiler: 'Clang' 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', - '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-50' - 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', diff --git a/coin/platform_configs/linux_android_tests_multi_abi.yaml b/coin/platform_configs/linux_android_tests_multi_abi.yaml index 4f6e9d3fa2e..8188a2ba93c 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: [ 'Sccache', @@ -22,7 +22,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 be9bc87699b..7a2df5f2edb 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' ] ] Configurations: 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 e9cd37a1e0ff6bab521444fe9634260c0b28aae5 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 20 Jan 2025 18:20:56 +0000 Subject: [PATCH 245/288] Update submodules on '6.8 in qt/qt5' Change-Id: I2b86a4185c5afa2605b7ce2b64d1507cf8119468 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 af9eacd0caf..05b0106fae5 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit af9eacd0caf5e31b7925dcd6e2cec8b0a15a83a3 +Subproject commit 05b0106fae508fea0e0417d5de0c3b6849454717 diff --git a/qt5compat b/qt5compat index 451b375e83e..514bf753a13 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 451b375e83ee883be84555ecc25cd9df50fff90f +Subproject commit 514bf753a13be4c3120079e1f2b8e8cd53e04d91 diff --git a/qtactiveqt b/qtactiveqt index 6aae7807e2a..77fd196acb0 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 6aae7807e2a23050ad8d272a6159e8cf1c6ce260 +Subproject commit 77fd196acb047b2410e17f0dcc42f8e2b8a04215 diff --git a/qtbase b/qtbase index 3accb0bc640..085780b3d85 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 3accb0bc64044a3d99212ec23bfa6f766c726ebc +Subproject commit 085780b3d858aeee4157fb618954f2a61363464e diff --git a/qtcharts b/qtcharts index e29c3161189..1385e4c6d1f 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit e29c3161189983a82c95debf1ea7c7a3b74bc413 +Subproject commit 1385e4c6d1f781619d5d561a9e474cd4537efdec diff --git a/qtcoap b/qtcoap index 0fec4ee7eb5..991c1ab1c2d 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit 0fec4ee7eb5fa4f939cdab68b742a2edc96a193d +Subproject commit 991c1ab1c2d5eb733b56eb67a2ad07abc86d1d04 diff --git a/qtconnectivity b/qtconnectivity index 6a61cd41f3b..56b6f47044d 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 6a61cd41f3be056561a7f63c7a34744964e0d8a1 +Subproject commit 56b6f47044d9af19e040cf516bfdf6c2fab36436 diff --git a/qtdatavis3d b/qtdatavis3d index 753c5354c0b..98802d80bc8 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 753c5354c0bb59723ac1e0d05da999c6c1043926 +Subproject commit 98802d80bc87e90cb96f645942abade57f7c21f1 diff --git a/qtdeclarative b/qtdeclarative index 2f13709a649..d9d4c8c948b 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 2f13709a649bfbaf17f619da7f5f04d0641e08fb +Subproject commit d9d4c8c948b21e2ff96d5e90ab7bf78f77258329 diff --git a/qtdoc b/qtdoc index 2015f68366e..34c7cd1efb4 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 2015f68366e74fc042c56099053ab626e447be6e +Subproject commit 34c7cd1efb4dfb2afaf0b1232f5b8f7e4e620312 diff --git a/qtgraphs b/qtgraphs index 873724e1b1b..0444b662663 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit 873724e1b1ba1bf553166ba505c340dc43230fe9 +Subproject commit 0444b66266341c1d4e61c3c2e853058abd47a828 diff --git a/qtgrpc b/qtgrpc index 6b03d3ed6cc..55dbfa60c63 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit 6b03d3ed6cc7fe4b7898f158386513d2d451dae0 +Subproject commit 55dbfa60c634d64b49e8fd0499a72b91024cb684 diff --git a/qthttpserver b/qthttpserver index 04e88ef9cdb..84b1db97306 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit 04e88ef9cdbcb0202c243cf05b33afc58e6c5c73 +Subproject commit 84b1db973060f0221a651bd8f4d1b468b4e14342 diff --git a/qtimageformats b/qtimageformats index 1d9e0901923..3dfa957a11b 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 1d9e0901923a71338285bce3b324a315a711e99c +Subproject commit 3dfa957a11b7507dec006f7a57750c8e67f761a3 diff --git a/qtlanguageserver b/qtlanguageserver index 4ac861b8e5d..0b7ab3bb508 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit 4ac861b8e5da0537b59a2aeba084e726e4200ef0 +Subproject commit 0b7ab3bb50831c44d5e12f50742e9a6bf231ecb5 diff --git a/qtlocation b/qtlocation index d48616ac8b9..c47fb03a72e 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit d48616ac8b9b8f9a159d30ddf6d6d36326899fc8 +Subproject commit c47fb03a72e9414c39a6081be5d7137b9ff76e7b diff --git a/qtlottie b/qtlottie index 37aed2767e3..a6567d66d07 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 37aed2767e31474545d095b6aee12368a43f0048 +Subproject commit a6567d66d07feed3bca47953488f65d04d2a8ce7 diff --git a/qtmqtt b/qtmqtt index 6e874f3444c..3111781d899 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit 6e874f3444c09a046b98c40febe843d6f2ce32ee +Subproject commit 3111781d899743364198313729e29b8dc53ff3ef diff --git a/qtmultimedia b/qtmultimedia index 87ade15eb77..ffc7a1f5ce0 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 87ade15eb777c1ead664ca65c384e05d00f5f99c +Subproject commit ffc7a1f5ce09c040d0b272b5612396c2bf64cc3c diff --git a/qtnetworkauth b/qtnetworkauth index 323788577ad..212a75cd8b5 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 323788577ad08ec016b3995c1c954435b3a78a97 +Subproject commit 212a75cd8b53cb45532ef66966d35bde72e3f443 diff --git a/qtopcua b/qtopcua index 027eff74e6c..a5c2433c06c 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit 027eff74e6c76bb79e4e1b39d16905021ba86aba +Subproject commit a5c2433c06c825b11ca1726b8134ca4ec818ee8d diff --git a/qtpositioning b/qtpositioning index 4ebea88f0ff..f9f194cf33e 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit 4ebea88f0ffc2bb1c43ffae0097cfcb9c9c41f1b +Subproject commit f9f194cf33ed5ebe9eb0dd6b79feeb21838037a2 diff --git a/qtquick3d b/qtquick3d index 0720aa9b16e..9cf0935cf0d 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 0720aa9b16e4951a76b4e5591eae9994e5d89da9 +Subproject commit 9cf0935cf0dd2ccc2713de656e2b1292c00e6995 diff --git a/qtquick3dphysics b/qtquick3dphysics index 96959b8e577..d41e80df80f 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit 96959b8e577a3d1c9a190d87706728e2a2cf75b2 +Subproject commit d41e80df80f093eb731c94fc30b8b920ff23b017 diff --git a/qtquickeffectmaker b/qtquickeffectmaker index 3a140b00aed..706b418f6c8 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit 3a140b00aed6f48bb2157555c1a0765febc2bc30 +Subproject commit 706b418f6c882ac04ee06634a21c6d84245b0c22 diff --git a/qtquicktimeline b/qtquicktimeline index 4b36a034eb7..7f69632c615 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 4b36a034eb724a272041fa3237e912b7ba792ea7 +Subproject commit 7f69632c615608aa54f3c9a9c3fd027da430f4c5 diff --git a/qtremoteobjects b/qtremoteobjects index 9cc5ec7489f..178a323cd9e 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 9cc5ec7489f751582825ef2457ae477a4e574cc3 +Subproject commit 178a323cd9e75644971ccc0fe338e7c53038ca14 diff --git a/qtscxml b/qtscxml index 64c76855f7e..1472a10847c 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 64c76855f7e5cbfef68e01da535dbc1169ecfa77 +Subproject commit 1472a10847cd0180da2a7405ffaf6e31a81f4794 diff --git a/qtsensors b/qtsensors index bb18d192565..4f9c509f0a3 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit bb18d192565fadae907ddbac81cfc5647c317f1f +Subproject commit 4f9c509f0a3cf2f06f26f4a90fd46fd5d9333ff5 diff --git a/qtserialbus b/qtserialbus index 2057d3a1559..28b701d26d1 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 2057d3a1559642a1c2a639d331339f015bfe01b3 +Subproject commit 28b701d26d152948ddc9689d8ff991b2f3040bb6 diff --git a/qtserialport b/qtserialport index 5e5d3774ae9..88434665b49 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 5e5d3774ae996d8b9fcd404c2c8cf4096235b6d8 +Subproject commit 88434665b499d247217de725ea3a34e9a731d2e1 diff --git a/qtshadertools b/qtshadertools index 059a14e9b44..0a005c8c93d 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 059a14e9b443344fd500b079fefd910d63b8cf33 +Subproject commit 0a005c8c93db06884e06232f56b3201ac7d5d9ce diff --git a/qtspeech b/qtspeech index b7871922779..dfb48bdb750 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit b7871922779adbb954e060efd5a72d5c444802d3 +Subproject commit dfb48bdb750cbad6232caa92cc73f925c85982a4 diff --git a/qtsvg b/qtsvg index d55d9d4eea7..323be6d3a14 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit d55d9d4eea764a72f4ca116a8fa07572c092b3b3 +Subproject commit 323be6d3a14599d17b0e2149ba24793ac502fca5 diff --git a/qttools b/qttools index 1500ab1758e..d2a55ba82b6 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 1500ab1758e8bb37f94ec788aa89b7aa03f82533 +Subproject commit d2a55ba82b692c9403fe0df95bd30591c154cfc8 diff --git a/qttranslations b/qttranslations index 8312cd36819..6f0548c28c3 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 8312cd3681988081097cd40039867cf7d57a67ae +Subproject commit 6f0548c28c39e73a4c17ed9bc0e914e3311ce615 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 10d486d65fb..16e23daa551 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 10d486d65fb1ca0b6c039f3adbc2007842f2f8cd +Subproject commit 16e23daa55164f7a07705a7ae02e0242051e17d3 diff --git a/qtwayland b/qtwayland index bf36bcf5b5f..fcb28ffa4f7 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit bf36bcf5b5f6d2f20a1e50e2d39f1110617a45e1 +Subproject commit fcb28ffa4f70eee885803479fa35ccddd55f0617 diff --git a/qtwebchannel b/qtwebchannel index 1d9b0323b70..0a0648ea62f 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 1d9b0323b70e83461aedec08093da03aa48fcf8a +Subproject commit 0a0648ea62f5359082c88240cba7842a6bf1d78b diff --git a/qtwebengine b/qtwebengine index 0beb5882452..54ecf0cc289 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 0beb588245230f5d4034d475d279cac6e4806056 +Subproject commit 54ecf0cc289cb5f71a8ad63ac4a778e4c46ce0fc diff --git a/qtwebsockets b/qtwebsockets index 93881271489..20c870c5c2d 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 938812714893d014fda0a560a5e6bc23317aa6a5 +Subproject commit 20c870c5c2dadd27f71c1b6e9bd4ff19f27e20e9 diff --git a/qtwebview b/qtwebview index 2c0a3b8ea63..08f232637dc 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 2c0a3b8ea631ed187f4883c01adea0bcaafdafa9 +Subproject commit 08f232637dcf217ed2921906e5af76199f24d7ca From b2e6211e4b83ab5875aabc0fb55ac8caad32e54d Mon Sep 17 00:00:00 2001 From: Antti Kokko Date: Fri, 20 Dec 2024 12:02:02 +0200 Subject: [PATCH 246/288] Add Ubuntu and Windows 11 arm64 targets for QSR 2.2 Targets Ubuntu 24.04 arm64 & Windows 11 22H2 arm64 MSVC 2022 added. Static and dynamic build targets for tooling repository. Dynamic build targets for runtime repository. Task-number: QSR-2686 Change-Id: I8946a4b107ebc7c652f7f1a3a50193fa62d8ed56 Reviewed-by: Jani Heikkinen Reviewed-by: Tarja Sundqvist (cherry picked from commit fd3268e81502a23bbb8fa0cf4080249769fc2847) Reviewed-by: Qt Cherry-pick Bot --- .../qtsaferenderer-runtime.yaml | 10 +++--- coin/platform_configs/qtsaferenderer.yaml | 35 +++++++++++++++---- 2 files changed, 34 insertions(+), 11 deletions(-) diff --git a/coin/platform_configs/qtsaferenderer-runtime.yaml b/coin/platform_configs/qtsaferenderer-runtime.yaml index 74116f8c912..6a74751978c 100644 --- a/coin/platform_configs/qtsaferenderer-runtime.yaml +++ b/coin/platform_configs/qtsaferenderer-runtime.yaml @@ -8,16 +8,16 @@ Include: [ cmake_platforms.yaml: [ "ubuntu-22.04", "ubuntu-22.04-documentation", + "ubuntu-24.04-arm64", "opensuse-15.5-developer-build", "sles-15_sp5-static", - "windows-10_22h2-msvc2019", "windows-10_22h2-msvc2022", - "windows-10_22h2-msvc2019-developer-build", "rhel-8.10", "windows-10_22h2-mingw13", - "windows-10_22h2-mingw13-developer-build", - "windows-10_22h2-llvm", - "windows-11_23H2-msvc2019" + "windows-11_23H2-mingw13-developer-build", + "windows-11_23H2-llvm", + "windows-11_23H2-msvc2022", + "windows-11_22h2-arm64-msvc2022" ], cmake_platforms_qemu_qnx710.yaml: [ "qnx-710-x86_64-developer-build-on-linux", diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index f1f82d14b75..68973bbb169 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -8,14 +8,15 @@ Include: [ cmake_platforms.yaml: [ "ubuntu-22.04", "ubuntu-22.04-documentation", + "ubuntu-24.04-arm64", "opensuse-15.5-developer-build", "sles-15_sp5-static", - "windows-10_22h2-msvc2019", "windows-10_22h2-msvc2022", "rhel-8.10", "windows-10_22h2-mingw13", - "windows-10_22h2-llvm", - "windows-11_23H2-msvc2019" + "windows-11_23H2-llvm", + "windows-11_23H2-msvc2022", + "windows-11_22h2-arm64-msvc2022" ], cmake_platforms_qemu_qnx710.yaml: [ "qnx-710-x86_64-developer-build-on-linux", @@ -26,7 +27,7 @@ Include: [ # Static build configurations for tools Configurations: - - Id: 'macos-latest-xcode-universal-static-build' + Id: 'macOS-12-latest-xcode-universal_Static' Template: 'qtci-macos-12-x86_64-107' Compiler: 'Clang' Target arch: 'x86_64-arm64' @@ -46,9 +47,31 @@ Configurations: 'NON_QTBASE_CMAKE_ARGS=-DINPUT_headersclean=ON' ] - - Id: 'Windows-MSVC2019_Static' + Id: 'Ubuntu-24.04-arm64_Static' + Template: 'qtci-linux-Ubuntu-24.04-aarch64-50' + Compiler: 'GCC' + Features: ['Packaging', 'Sccache', 'UseConfigure', 'MinimalStaticTests'] + Configure arguments: '-static -no-icu -nomake examples -release -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput -no-sql-mysql' + Environment variables: [ + 'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY', + 'COMMON_TEST_CMAKE_ARGS=-DQT_SKIP_DOCKER_COMPOSE=ON', + 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}} -DQT_DEPLOY_FFMPEG=TRUE -DINPUT_headersclean=ON' + ] +- + Id: 'Windows-MSVC2022-arm64_Static' + Template: 'qtci-windows-11_22H2-aarch64-54' + Compiler: 'MSVC2022' + Features: ['Packaging', 'UseConfigure', 'MinimalStaticTests'] + Configure arguments: '-release -headersclean -nomake examples -qt-zlib -static -no-icu -no-sql-psql -no-opengl' + 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-MSVC2022_Static' Template: 'qtci-windows-10_22H2-x86_64-52' - Compiler: 'MSVC2019' + 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 -plugin-sql-sqlite -plugin-sql-odbc' Environment variables: [ From 22e56fdf90c23cdca00b926a58ab75e8660ddcc8 Mon Sep 17 00:00:00 2001 From: Teemu Holappa Date: Mon, 27 Jan 2025 10:38:43 +0200 Subject: [PATCH 247/288] Fix QtSafeRenderer MSVC static build Fixes compile error: Unknown command line option '-plugin-sql-sqlite' Change-Id: I5b52552492de3efb0aa80e94ecf670539e93b09e Reviewed-by: Tarja Sundqvist (cherry picked from commit 6800c5916f9b06ab894cf63b217c3f88dada4c35) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/qtsaferenderer.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index 68973bbb169..39cc8a5842d 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -73,7 +73,7 @@ Configurations: Template: 'qtci-windows-10_22H2-x86_64-52' 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 -plugin-sql-sqlite -plugin-sql-odbc' + Configure arguments: '-release -headersclean -nomake examples -qt-zlib -static -no-icu -no-sql-mysql -no-sql-odbc -no-sql-psql' Environment variables: [ 'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..', 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}', From ab2ec657cd6d6696531b6027b080691e7e6315e8 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 27 Jan 2025 14:19:06 +0000 Subject: [PATCH 248/288] Update submodules on '6.8 in qt/qt5' Change-Id: Ic4b2b60bd57273fb5480d834116f76d226166090 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 05b0106fae5..e6c8fb90c50 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 05b0106fae508fea0e0417d5de0c3b6849454717 +Subproject commit e6c8fb90c505535638e6a7713c98241ad7d8663e diff --git a/qt5compat b/qt5compat index 514bf753a13..ba3762ad8f8 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 514bf753a13be4c3120079e1f2b8e8cd53e04d91 +Subproject commit ba3762ad8f8f6f5aea9d58adde5fda595eacabd1 diff --git a/qtactiveqt b/qtactiveqt index 77fd196acb0..943a9afcb70 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 77fd196acb047b2410e17f0dcc42f8e2b8a04215 +Subproject commit 943a9afcb702ff36180bbdaa89f3ca3e2adceb4c diff --git a/qtbase b/qtbase index 085780b3d85..e79d6db33b7 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 085780b3d858aeee4157fb618954f2a61363464e +Subproject commit e79d6db33b7727443e8ad3b9c37e0546a33c1721 diff --git a/qtcharts b/qtcharts index 1385e4c6d1f..cf2fefa46f9 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 1385e4c6d1f781619d5d561a9e474cd4537efdec +Subproject commit cf2fefa46f9238dbe29501a54c86d5feaa410982 diff --git a/qtcoap b/qtcoap index 991c1ab1c2d..86879dafb1b 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit 991c1ab1c2d5eb733b56eb67a2ad07abc86d1d04 +Subproject commit 86879dafb1b77b53419a4e667b7925c3064b51fb diff --git a/qtconnectivity b/qtconnectivity index 56b6f47044d..8241f11b0be 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 56b6f47044d9af19e040cf516bfdf6c2fab36436 +Subproject commit 8241f11b0bea3cfd4495a6c883b0d5fdb91ff1f3 diff --git a/qtdatavis3d b/qtdatavis3d index 98802d80bc8..718aa68c5cb 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 98802d80bc87e90cb96f645942abade57f7c21f1 +Subproject commit 718aa68c5cb3e224220226c32a508efe0886de54 diff --git a/qtdeclarative b/qtdeclarative index d9d4c8c948b..6aa1a977270 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit d9d4c8c948b21e2ff96d5e90ab7bf78f77258329 +Subproject commit 6aa1a9772709feba9761574e607a4d66fc0215de diff --git a/qtdoc b/qtdoc index 34c7cd1efb4..73bd62ac6a4 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 34c7cd1efb4dfb2afaf0b1232f5b8f7e4e620312 +Subproject commit 73bd62ac6a44fd99287e8d5853f59d4fd6cfb395 diff --git a/qtgraphs b/qtgraphs index 0444b662663..d9376c418a3 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit 0444b66266341c1d4e61c3c2e853058abd47a828 +Subproject commit d9376c418a3897b9e5dde80bd93d4dcc816a9353 diff --git a/qtgrpc b/qtgrpc index 55dbfa60c63..38c8ed714b8 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit 55dbfa60c634d64b49e8fd0499a72b91024cb684 +Subproject commit 38c8ed714b86c23886f846ba1b59d9c9bc66493a diff --git a/qthttpserver b/qthttpserver index 84b1db97306..bbe464f7971 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit 84b1db973060f0221a651bd8f4d1b468b4e14342 +Subproject commit bbe464f7971cd34bb34a793918eaba9f165f1ef9 diff --git a/qtimageformats b/qtimageformats index 3dfa957a11b..e1708366e8e 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 3dfa957a11b7507dec006f7a57750c8e67f761a3 +Subproject commit e1708366e8ec0f558f142dd93cdf73027f224119 diff --git a/qtlanguageserver b/qtlanguageserver index 0b7ab3bb508..d329c4bbc2b 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit 0b7ab3bb50831c44d5e12f50742e9a6bf231ecb5 +Subproject commit d329c4bbc2bfb1669a1b16d5f53922a6092d1751 diff --git a/qtlocation b/qtlocation index c47fb03a72e..f2a6c455500 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit c47fb03a72e9414c39a6081be5d7137b9ff76e7b +Subproject commit f2a6c4555005a0f86ebbdec2ff8cbedad61ae2d8 diff --git a/qtlottie b/qtlottie index a6567d66d07..afb0e83ef4f 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit a6567d66d07feed3bca47953488f65d04d2a8ce7 +Subproject commit afb0e83ef4ffff42e2a5e73313a85073f53ac426 diff --git a/qtmqtt b/qtmqtt index 3111781d899..78149bb92b3 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit 3111781d899743364198313729e29b8dc53ff3ef +Subproject commit 78149bb92b3461fed479c298c65c3a87d3f805ae diff --git a/qtmultimedia b/qtmultimedia index ffc7a1f5ce0..cc1d99fdc4b 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit ffc7a1f5ce09c040d0b272b5612396c2bf64cc3c +Subproject commit cc1d99fdc4bf6753ebb370f26df4b252dfcaab67 diff --git a/qtnetworkauth b/qtnetworkauth index 212a75cd8b5..73fb0dcbe07 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 212a75cd8b53cb45532ef66966d35bde72e3f443 +Subproject commit 73fb0dcbe075e47f97074e9a833a25c0c645315f diff --git a/qtopcua b/qtopcua index a5c2433c06c..514ac3f3133 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit a5c2433c06c825b11ca1726b8134ca4ec818ee8d +Subproject commit 514ac3f313324c171c379f2fcd155dca61fdf07f diff --git a/qtpositioning b/qtpositioning index f9f194cf33e..8c21d8b72c2 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit f9f194cf33ed5ebe9eb0dd6b79feeb21838037a2 +Subproject commit 8c21d8b72c25dd9cf1631f4fb9935fa075e7dd41 diff --git a/qtquick3d b/qtquick3d index 9cf0935cf0d..1f2f95b289d 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 9cf0935cf0dd2ccc2713de656e2b1292c00e6995 +Subproject commit 1f2f95b289d069dd0b10f508572753bd5670e313 diff --git a/qtquick3dphysics b/qtquick3dphysics index d41e80df80f..55a65467e2c 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit d41e80df80f093eb731c94fc30b8b920ff23b017 +Subproject commit 55a65467e2c28a2bb001ed7ee40355d0802cd0d3 diff --git a/qtquickeffectmaker b/qtquickeffectmaker index 706b418f6c8..cdabe6207df 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit 706b418f6c882ac04ee06634a21c6d84245b0c22 +Subproject commit cdabe6207df3ca89b49c946a6b5adf77f018b9db diff --git a/qtquicktimeline b/qtquicktimeline index 7f69632c615..cf577f823a8 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 7f69632c615608aa54f3c9a9c3fd027da430f4c5 +Subproject commit cf577f823a800a952165fe03ed5c06aae7faff5a diff --git a/qtremoteobjects b/qtremoteobjects index 178a323cd9e..105aaf01634 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 178a323cd9e75644971ccc0fe338e7c53038ca14 +Subproject commit 105aaf0163440c31acd8fcee274f42c529e880a8 diff --git a/qtscxml b/qtscxml index 1472a10847c..a7bf73e4aef 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 1472a10847cd0180da2a7405ffaf6e31a81f4794 +Subproject commit a7bf73e4aef751c34f51b2e4da859fceb637dce3 diff --git a/qtsensors b/qtsensors index 4f9c509f0a3..d6335fa49c7 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 4f9c509f0a3cf2f06f26f4a90fd46fd5d9333ff5 +Subproject commit d6335fa49c723b9d2dea9732a49a02ed6b8fce43 diff --git a/qtserialbus b/qtserialbus index 28b701d26d1..79075f8d1ab 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 28b701d26d152948ddc9689d8ff991b2f3040bb6 +Subproject commit 79075f8d1abf8a6d8ea4a1ff32a04603fddc8b92 diff --git a/qtserialport b/qtserialport index 88434665b49..28c30a8212a 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 88434665b499d247217de725ea3a34e9a731d2e1 +Subproject commit 28c30a8212ac503eb4c8da0944df330a02f877ad diff --git a/qtshadertools b/qtshadertools index 0a005c8c93d..52e9f494a28 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 0a005c8c93db06884e06232f56b3201ac7d5d9ce +Subproject commit 52e9f494a289c30c54b488999c23af3e391691c0 diff --git a/qtspeech b/qtspeech index dfb48bdb750..3647e5e592d 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit dfb48bdb750cbad6232caa92cc73f925c85982a4 +Subproject commit 3647e5e592d6d30f35632e150939f0043ccf92c9 diff --git a/qtsvg b/qtsvg index 323be6d3a14..40dc145abe5 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 323be6d3a14599d17b0e2149ba24793ac502fca5 +Subproject commit 40dc145abe55b81cafcca1cf60d7230e6b98d759 diff --git a/qttools b/qttools index d2a55ba82b6..bb53cfd1976 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit d2a55ba82b692c9403fe0df95bd30591c154cfc8 +Subproject commit bb53cfd19768fdf38cee17ce17e4e67857ee3802 diff --git a/qttranslations b/qttranslations index 6f0548c28c3..344f591ae14 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 6f0548c28c39e73a4c17ed9bc0e914e3311ce615 +Subproject commit 344f591ae14a45a1d5e4aa597e1fb038ff295cef diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 16e23daa551..f21ad018eba 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 16e23daa55164f7a07705a7ae02e0242051e17d3 +Subproject commit f21ad018ebab357b56bcbb4e8b51aacc74f3c047 diff --git a/qtwayland b/qtwayland index fcb28ffa4f7..53503066cfa 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit fcb28ffa4f70eee885803479fa35ccddd55f0617 +Subproject commit 53503066cfafc127275e2347ea236330c5cfb4d1 diff --git a/qtwebchannel b/qtwebchannel index 0a0648ea62f..ed8af9fd6da 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 0a0648ea62f5359082c88240cba7842a6bf1d78b +Subproject commit ed8af9fd6da84e75a414f7d683456b6281e7b617 diff --git a/qtwebengine b/qtwebengine index 54ecf0cc289..8ff002c1091 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 54ecf0cc289cb5f71a8ad63ac4a778e4c46ce0fc +Subproject commit 8ff002c1091f6499f7e2250766239d63ff35cfd7 diff --git a/qtwebsockets b/qtwebsockets index 20c870c5c2d..a04b135927d 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 20c870c5c2dadd27f71c1b6e9bd4ff19f27e20e9 +Subproject commit a04b135927d84f88ee30d0baa12166f76387a454 diff --git a/qtwebview b/qtwebview index 08f232637dc..3cfdae5829d 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 08f232637dcf217ed2921906e5af76199f24d7ca +Subproject commit 3cfdae5829d9dee1c22be3d375a4dea8a55cb36d From fb7e442a1e092c8969dc90632c8f08663a5eec2a Mon Sep 17 00:00:00 2001 From: Teemu Holappa Date: Mon, 27 Jan 2025 16:02:42 +0200 Subject: [PATCH 249/288] Update macOS from 12 to 14 in qtsaferenderer.yaml Change-Id: Ie03a14449e941a71acc58e5de78b980690ce221f Reviewed-by: Tarja Sundqvist (cherry picked from commit 8a98b34cc718700c8e5fe8a52c8012dcaf5ef9c5) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/qtsaferenderer.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index 39cc8a5842d..f660cbecf8d 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -2,8 +2,8 @@ Version: 2 Include: [ macos.yaml: [ "macos-universal-on-x86_64", - "macos-12-x86_64-tests", - "macos-12-arm-on-arm64-tests" + "macos-14-x86_64-tests", + "macos-14-arm64-tests" ], cmake_platforms.yaml: [ "ubuntu-22.04", @@ -27,8 +27,8 @@ Include: [ # Static build configurations for tools Configurations: - - Id: 'macOS-12-latest-xcode-universal_Static' - Template: 'qtci-macos-12-x86_64-107' + Id: 'macos-latest-x code-universal-static-build' + Template: 'qtci-macos-14-arm-106' Compiler: 'Clang' Target arch: 'x86_64-arm64' Features: ['Packaging', 'Sccache', 'UseConfigure', 'MinimalStaticTests'] From 15e437335ddfc6c9a5ed494e6fc8d86cc0746ca1 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 28 Jan 2025 19:22:27 +0000 Subject: [PATCH 250/288] Update submodules on '6.8 in qt/qt5' Change-Id: I68d7209b6049ebe792a62d7b40c3b868f88b554b 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 e6c8fb90c50..043b681d922 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit e6c8fb90c505535638e6a7713c98241ad7d8663e +Subproject commit 043b681d9225644bd36ea1ee0fea42d5c705ccc1 diff --git a/qt5compat b/qt5compat index ba3762ad8f8..31cf32e71ae 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit ba3762ad8f8f6f5aea9d58adde5fda595eacabd1 +Subproject commit 31cf32e71aedeae8179872c9b9c783c6dbf34f58 diff --git a/qtactiveqt b/qtactiveqt index 943a9afcb70..f5c159538f3 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 943a9afcb702ff36180bbdaa89f3ca3e2adceb4c +Subproject commit f5c159538f37f1979e8e45ecd27d073864456112 diff --git a/qtbase b/qtbase index e79d6db33b7..39ba5ed46aa 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit e79d6db33b7727443e8ad3b9c37e0546a33c1721 +Subproject commit 39ba5ed46aa96392148ee462de5fae4b9953b940 diff --git a/qtcharts b/qtcharts index cf2fefa46f9..b83aea30549 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit cf2fefa46f9238dbe29501a54c86d5feaa410982 +Subproject commit b83aea3054995020580c81d59e9114e88678611c diff --git a/qtcoap b/qtcoap index 86879dafb1b..6e1fa17161c 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit 86879dafb1b77b53419a4e667b7925c3064b51fb +Subproject commit 6e1fa17161cccf3d6387ff18a2cd74a4f7ccb9b5 diff --git a/qtconnectivity b/qtconnectivity index 8241f11b0be..dd41661cbde 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 8241f11b0bea3cfd4495a6c883b0d5fdb91ff1f3 +Subproject commit dd41661cbde3ec81744463b7d6d46ec6daa57796 diff --git a/qtdatavis3d b/qtdatavis3d index 718aa68c5cb..7b59ea85b2a 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 718aa68c5cb3e224220226c32a508efe0886de54 +Subproject commit 7b59ea85b2a87c4e37f5ef336979de2f2f3675c1 diff --git a/qtdeclarative b/qtdeclarative index 6aa1a977270..ca9ff6bd040 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 6aa1a9772709feba9761574e607a4d66fc0215de +Subproject commit ca9ff6bd040372c91b2b493d89bb58b231a82afc diff --git a/qtdoc b/qtdoc index 73bd62ac6a4..c544b0c8e32 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 73bd62ac6a44fd99287e8d5853f59d4fd6cfb395 +Subproject commit c544b0c8e32c676bc91b2a82f9bc35f5162cd226 diff --git a/qtgraphs b/qtgraphs index d9376c418a3..8d6d7f57c4f 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit d9376c418a3897b9e5dde80bd93d4dcc816a9353 +Subproject commit 8d6d7f57c4f22a5a5c3d0489b6b48a14b772321a diff --git a/qtgrpc b/qtgrpc index 38c8ed714b8..37198cec35f 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit 38c8ed714b86c23886f846ba1b59d9c9bc66493a +Subproject commit 37198cec35ff1ef33c2f48e6ba2e03475af0ea61 diff --git a/qthttpserver b/qthttpserver index bbe464f7971..ac5ef7cd491 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit bbe464f7971cd34bb34a793918eaba9f165f1ef9 +Subproject commit ac5ef7cd491f60ce1cdbeceff5b44bd44c8d500c diff --git a/qtimageformats b/qtimageformats index e1708366e8e..642df38deb0 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit e1708366e8ec0f558f142dd93cdf73027f224119 +Subproject commit 642df38deb07693f803100a9b63f967e639dcb8c diff --git a/qtlanguageserver b/qtlanguageserver index d329c4bbc2b..3055c27e946 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit d329c4bbc2bfb1669a1b16d5f53922a6092d1751 +Subproject commit 3055c27e94698189ac1dacbd65dbd095a6f9ec29 diff --git a/qtlocation b/qtlocation index f2a6c455500..bb4c30f04cc 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit f2a6c4555005a0f86ebbdec2ff8cbedad61ae2d8 +Subproject commit bb4c30f04cc396d2570242dd6d07caf59287789c diff --git a/qtlottie b/qtlottie index afb0e83ef4f..6a157cc3831 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit afb0e83ef4ffff42e2a5e73313a85073f53ac426 +Subproject commit 6a157cc3831228365be35ab693813be24e584591 diff --git a/qtmqtt b/qtmqtt index 78149bb92b3..895f66c1a11 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit 78149bb92b3461fed479c298c65c3a87d3f805ae +Subproject commit 895f66c1a1131d1029a0863a777ac22b8816a2fc diff --git a/qtmultimedia b/qtmultimedia index cc1d99fdc4b..d6604a523cc 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit cc1d99fdc4bf6753ebb370f26df4b252dfcaab67 +Subproject commit d6604a523cc5bff1cd081d9b069bbf8dbab40c06 diff --git a/qtnetworkauth b/qtnetworkauth index 73fb0dcbe07..3786470edad 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 73fb0dcbe075e47f97074e9a833a25c0c645315f +Subproject commit 3786470edad842b0285c1363c83cf26a1c35f520 diff --git a/qtopcua b/qtopcua index 514ac3f3133..23f9ad54a57 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit 514ac3f313324c171c379f2fcd155dca61fdf07f +Subproject commit 23f9ad54a57db08aefd775483c1347ace9e6b014 diff --git a/qtpositioning b/qtpositioning index 8c21d8b72c2..be59c8f65b8 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit 8c21d8b72c25dd9cf1631f4fb9935fa075e7dd41 +Subproject commit be59c8f65b84f9c008f45bf8110668c6eab0d9a5 diff --git a/qtquick3d b/qtquick3d index 1f2f95b289d..79c36f3e4c9 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 1f2f95b289d069dd0b10f508572753bd5670e313 +Subproject commit 79c36f3e4c9b760ed3e8be1bddac2166e3601df4 diff --git a/qtquick3dphysics b/qtquick3dphysics index 55a65467e2c..0742b5b7005 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit 55a65467e2c28a2bb001ed7ee40355d0802cd0d3 +Subproject commit 0742b5b7005d9c9da71d994d3f67f4517db66cb9 diff --git a/qtquickeffectmaker b/qtquickeffectmaker index cdabe6207df..f0e37792b23 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit cdabe6207df3ca89b49c946a6b5adf77f018b9db +Subproject commit f0e37792b23355f3ebedf9321f54bf89b62ce89e diff --git a/qtquicktimeline b/qtquicktimeline index cf577f823a8..6ebc0cf8f71 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit cf577f823a800a952165fe03ed5c06aae7faff5a +Subproject commit 6ebc0cf8f71f12d915886e013aecd0442d2cf3b9 diff --git a/qtremoteobjects b/qtremoteobjects index 105aaf01634..cf311f50b37 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 105aaf0163440c31acd8fcee274f42c529e880a8 +Subproject commit cf311f50b37859052f1fce55177c6ed67d5d9cd9 diff --git a/qtscxml b/qtscxml index a7bf73e4aef..7f8e78b69a3 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit a7bf73e4aef751c34f51b2e4da859fceb637dce3 +Subproject commit 7f8e78b69a3f257f0bc30e27ca107f215b081c93 diff --git a/qtsensors b/qtsensors index d6335fa49c7..93cde88fbb0 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit d6335fa49c723b9d2dea9732a49a02ed6b8fce43 +Subproject commit 93cde88fbb0bafd13e0cee6ee6093fcfe9dab082 diff --git a/qtserialbus b/qtserialbus index 79075f8d1ab..c5917147285 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 79075f8d1abf8a6d8ea4a1ff32a04603fddc8b92 +Subproject commit c59171472856997e896ef37da61c08235bc8c13c diff --git a/qtserialport b/qtserialport index 28c30a8212a..7ae2b040c7b 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 28c30a8212ac503eb4c8da0944df330a02f877ad +Subproject commit 7ae2b040c7ba7e9fd3b805ea7daec0973280de21 diff --git a/qtshadertools b/qtshadertools index 52e9f494a28..e4a9a744efa 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 52e9f494a289c30c54b488999c23af3e391691c0 +Subproject commit e4a9a744efa8303756c92ef08344c2de84967043 diff --git a/qtspeech b/qtspeech index 3647e5e592d..22342c033c7 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 3647e5e592d6d30f35632e150939f0043ccf92c9 +Subproject commit 22342c033c79dab3b3b2a1734fea407e4c8f6a87 diff --git a/qtsvg b/qtsvg index 40dc145abe5..7f1ddfd0cbc 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 40dc145abe55b81cafcca1cf60d7230e6b98d759 +Subproject commit 7f1ddfd0cbcb0c13770233dabc138bbbdabad04b diff --git a/qttools b/qttools index bb53cfd1976..2d2f9c09faf 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit bb53cfd19768fdf38cee17ce17e4e67857ee3802 +Subproject commit 2d2f9c09fafba1bcf50dfb5eb4c82351a5610997 diff --git a/qttranslations b/qttranslations index 344f591ae14..be9cbeaae24 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 344f591ae14a45a1d5e4aa597e1fb038ff295cef +Subproject commit be9cbeaae24b6d91fa60340b6029d840478ca21e diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index f21ad018eba..020e7293e0c 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit f21ad018ebab357b56bcbb4e8b51aacc74f3c047 +Subproject commit 020e7293e0cc3d683e8631c0cf5db08ee0da1dba diff --git a/qtwayland b/qtwayland index 53503066cfa..3c8c06d5825 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 53503066cfafc127275e2347ea236330c5cfb4d1 +Subproject commit 3c8c06d58259850d4c4b3109c23047c6ec2ff710 diff --git a/qtwebchannel b/qtwebchannel index ed8af9fd6da..ebd28d7bab9 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit ed8af9fd6da84e75a414f7d683456b6281e7b617 +Subproject commit ebd28d7bab9237c661b88d4fca971302cf7ec860 diff --git a/qtwebengine b/qtwebengine index 8ff002c1091..7a4b0f128ba 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 8ff002c1091f6499f7e2250766239d63ff35cfd7 +Subproject commit 7a4b0f128baf2c7d5bc92ecd5742c8d848e7a3ea diff --git a/qtwebsockets b/qtwebsockets index a04b135927d..1e7f9f2c42f 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit a04b135927d84f88ee30d0baa12166f76387a454 +Subproject commit 1e7f9f2c42f96d6aa39b19a6ca55434f77f38332 diff --git a/qtwebview b/qtwebview index 3cfdae5829d..8b10a8d5bae 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 3cfdae5829d9dee1c22be3d375a4dea8a55cb36d +Subproject commit 8b10a8d5bae29e26af869a90e5e757e4b681682e From 2cc991e88c4f5e085208509c03437df74aaa980e Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 29 Jan 2025 15:28:19 +0000 Subject: [PATCH 251/288] Update submodules on '6.8 in qt/qt5' Change-Id: I184b4db540b9c8d148a81313cd84140a3a7b3014 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 043b681d922..cbe54c58278 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 043b681d9225644bd36ea1ee0fea42d5c705ccc1 +Subproject commit cbe54c58278532a041d50df807c5fec947c9a1f8 diff --git a/qt5compat b/qt5compat index 31cf32e71ae..ed05476aa08 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 31cf32e71aedeae8179872c9b9c783c6dbf34f58 +Subproject commit ed05476aa08801ad39a664aabc9526be3a5c8e4f diff --git a/qtactiveqt b/qtactiveqt index f5c159538f3..2b62b69b248 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit f5c159538f37f1979e8e45ecd27d073864456112 +Subproject commit 2b62b69b248b75062d388fc6190a13f14fa5b918 diff --git a/qtbase b/qtbase index 39ba5ed46aa..1f55a339d2d 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 39ba5ed46aa96392148ee462de5fae4b9953b940 +Subproject commit 1f55a339d2d4a07d8749aef5630e192b84dbc781 diff --git a/qtcharts b/qtcharts index b83aea30549..43636baf3fe 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit b83aea3054995020580c81d59e9114e88678611c +Subproject commit 43636baf3feda566dfcf5ca34730b9f28c3dfd82 diff --git a/qtcoap b/qtcoap index 6e1fa17161c..464009685d0 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit 6e1fa17161cccf3d6387ff18a2cd74a4f7ccb9b5 +Subproject commit 464009685d07e9fa9c6a31e74102ad71e9ef3388 diff --git a/qtconnectivity b/qtconnectivity index dd41661cbde..bee92997f34 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit dd41661cbde3ec81744463b7d6d46ec6daa57796 +Subproject commit bee92997f348477bbaf8bd598195e6e41813827b diff --git a/qtdatavis3d b/qtdatavis3d index 7b59ea85b2a..9ece2807118 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 7b59ea85b2a87c4e37f5ef336979de2f2f3675c1 +Subproject commit 9ece2807118b7e08c379a4a07ee63e8bc3543c39 diff --git a/qtdeclarative b/qtdeclarative index ca9ff6bd040..fcd48036a29 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit ca9ff6bd040372c91b2b493d89bb58b231a82afc +Subproject commit fcd48036a29428a333e5ee0a0301994edd5025fa diff --git a/qtdoc b/qtdoc index c544b0c8e32..4fb574ab26a 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit c544b0c8e32c676bc91b2a82f9bc35f5162cd226 +Subproject commit 4fb574ab26afc80bd9574b40d03cad80a96dfe8b diff --git a/qtgraphs b/qtgraphs index 8d6d7f57c4f..2afc79bd96a 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit 8d6d7f57c4f22a5a5c3d0489b6b48a14b772321a +Subproject commit 2afc79bd96a81b134486242107727858acb1a9f7 diff --git a/qtgrpc b/qtgrpc index 37198cec35f..95a82f3e2a9 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit 37198cec35ff1ef33c2f48e6ba2e03475af0ea61 +Subproject commit 95a82f3e2a9fb43831e83abcca982cc43fa89598 diff --git a/qthttpserver b/qthttpserver index ac5ef7cd491..aedf7300855 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit ac5ef7cd491f60ce1cdbeceff5b44bd44c8d500c +Subproject commit aedf73008558d74e8c0045637d1b8f325ba926ce diff --git a/qtimageformats b/qtimageformats index 642df38deb0..7c39f4310da 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 642df38deb07693f803100a9b63f967e639dcb8c +Subproject commit 7c39f4310da8f1efa4606950e125528011ba03f9 diff --git a/qtlanguageserver b/qtlanguageserver index 3055c27e946..a7c6d9e0704 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit 3055c27e94698189ac1dacbd65dbd095a6f9ec29 +Subproject commit a7c6d9e0704e240b3b9181166af09d3423846807 diff --git a/qtlocation b/qtlocation index bb4c30f04cc..8236d9593d0 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit bb4c30f04cc396d2570242dd6d07caf59287789c +Subproject commit 8236d9593d090df708ab63f52fe50379c0b6c560 diff --git a/qtlottie b/qtlottie index 6a157cc3831..7090e1ca2e2 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 6a157cc3831228365be35ab693813be24e584591 +Subproject commit 7090e1ca2e2039726dc075155796b2b4a220ad29 diff --git a/qtmqtt b/qtmqtt index 895f66c1a11..747f2adad14 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit 895f66c1a1131d1029a0863a777ac22b8816a2fc +Subproject commit 747f2adad14aa98c7c50251b04bb8550347e1175 diff --git a/qtmultimedia b/qtmultimedia index d6604a523cc..848740ba7ed 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit d6604a523cc5bff1cd081d9b069bbf8dbab40c06 +Subproject commit 848740ba7ede6789c33973dc68101ed513f3933b diff --git a/qtnetworkauth b/qtnetworkauth index 3786470edad..a8d380ab960 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 3786470edad842b0285c1363c83cf26a1c35f520 +Subproject commit a8d380ab9600a9a9dd261ae836131b134734979b diff --git a/qtopcua b/qtopcua index 23f9ad54a57..0b837a353e2 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit 23f9ad54a57db08aefd775483c1347ace9e6b014 +Subproject commit 0b837a353e2f102f7f06e03f1fc67953011389e3 diff --git a/qtpositioning b/qtpositioning index be59c8f65b8..4637d0a4e9b 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit be59c8f65b84f9c008f45bf8110668c6eab0d9a5 +Subproject commit 4637d0a4e9b91f6f525d1ed21363baadc291d61f diff --git a/qtquick3d b/qtquick3d index 79c36f3e4c9..cbd4f390653 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 79c36f3e4c9b760ed3e8be1bddac2166e3601df4 +Subproject commit cbd4f390653c468508ff39d41d37726b8bf040df diff --git a/qtquick3dphysics b/qtquick3dphysics index 0742b5b7005..4ac851d2735 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit 0742b5b7005d9c9da71d994d3f67f4517db66cb9 +Subproject commit 4ac851d27357f19bd2bd8da7a41c4fd9f32486f7 diff --git a/qtquickeffectmaker b/qtquickeffectmaker index f0e37792b23..f49f3b9f159 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit f0e37792b23355f3ebedf9321f54bf89b62ce89e +Subproject commit f49f3b9f159643ae79008f55e480a0e2d5b35c12 diff --git a/qtquicktimeline b/qtquicktimeline index 6ebc0cf8f71..a760ad94620 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 6ebc0cf8f71f12d915886e013aecd0442d2cf3b9 +Subproject commit a760ad946207169d9d666c416a9cbbf0e47c46b6 diff --git a/qtremoteobjects b/qtremoteobjects index cf311f50b37..0539c941751 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit cf311f50b37859052f1fce55177c6ed67d5d9cd9 +Subproject commit 0539c94175105761c93fd1277ddc31f786fe1d7c diff --git a/qtscxml b/qtscxml index 7f8e78b69a3..11b53d24e93 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 7f8e78b69a3f257f0bc30e27ca107f215b081c93 +Subproject commit 11b53d24e93cf99de52fa01ab9877131ff87d99a diff --git a/qtsensors b/qtsensors index 93cde88fbb0..505390465bb 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 93cde88fbb0bafd13e0cee6ee6093fcfe9dab082 +Subproject commit 505390465bb22a51433186e74c671b6a4f2bcdd6 diff --git a/qtserialbus b/qtserialbus index c5917147285..480a6044835 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit c59171472856997e896ef37da61c08235bc8c13c +Subproject commit 480a6044835e8c903ce7b854f9ee8748b850577f diff --git a/qtserialport b/qtserialport index 7ae2b040c7b..10ab8a4104a 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 7ae2b040c7ba7e9fd3b805ea7daec0973280de21 +Subproject commit 10ab8a4104af7dfde699c1a29a57da2821a81af8 diff --git a/qtshadertools b/qtshadertools index e4a9a744efa..72d400042e2 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit e4a9a744efa8303756c92ef08344c2de84967043 +Subproject commit 72d400042e23eb4c35eab996224585332be9738c diff --git a/qtspeech b/qtspeech index 22342c033c7..d5c67b915d0 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 22342c033c79dab3b3b2a1734fea407e4c8f6a87 +Subproject commit d5c67b915d009a343f63d69cd5cff62499f816bc diff --git a/qtsvg b/qtsvg index 7f1ddfd0cbc..609299ed859 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 7f1ddfd0cbcb0c13770233dabc138bbbdabad04b +Subproject commit 609299ed859d3aa276b1b498dba89ebeb5bd1843 diff --git a/qttools b/qttools index 2d2f9c09faf..f66065751b5 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 2d2f9c09fafba1bcf50dfb5eb4c82351a5610997 +Subproject commit f66065751b537bb3fa3cc0957759dcd248ded716 diff --git a/qttranslations b/qttranslations index be9cbeaae24..2ff00f726aa 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit be9cbeaae24b6d91fa60340b6029d840478ca21e +Subproject commit 2ff00f726aa0ae8549521b42a111a44db93a66db diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 020e7293e0c..8288c58589c 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 020e7293e0cc3d683e8631c0cf5db08ee0da1dba +Subproject commit 8288c58589c099a565e0c2e929c6e10c205b0b20 diff --git a/qtwayland b/qtwayland index 3c8c06d5825..bb3b9c3208f 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 3c8c06d58259850d4c4b3109c23047c6ec2ff710 +Subproject commit bb3b9c3208fd49fa3f0f24782492ecca4536951f diff --git a/qtwebchannel b/qtwebchannel index ebd28d7bab9..96ba65c4ff8 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit ebd28d7bab9237c661b88d4fca971302cf7ec860 +Subproject commit 96ba65c4ff8e02b742e68c5e5ecc8d46c37f210f diff --git a/qtwebengine b/qtwebengine index 7a4b0f128ba..f6ba4e58ece 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 7a4b0f128baf2c7d5bc92ecd5742c8d848e7a3ea +Subproject commit f6ba4e58ece5ea5873dbce4d5bc19c788a8823ab diff --git a/qtwebsockets b/qtwebsockets index 1e7f9f2c42f..19f32ea69ed 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 1e7f9f2c42f96d6aa39b19a6ca55434f77f38332 +Subproject commit 19f32ea69edfc2792b4f93e911a4e0604ab82951 diff --git a/qtwebview b/qtwebview index 8b10a8d5bae..4c8e3c0e513 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 8b10a8d5bae29e26af869a90e5e757e4b681682e +Subproject commit 4c8e3c0e5138559191b43fedac178afbcd5a2088 From 3cf6241e47344dc75ee6d11b78ac514e739e2f46 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 30 Jan 2025 15:05:33 +0000 Subject: [PATCH 252/288] Update submodules on '6.8 in qt/qt5' Change-Id: I2f180046ea7b3c05d9b10602d9f48f47140a168a 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 cbe54c58278..4acdb74cb05 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit cbe54c58278532a041d50df807c5fec947c9a1f8 +Subproject commit 4acdb74cb0505e612fb587bd1d410c6bbad09f8d diff --git a/qt5compat b/qt5compat index ed05476aa08..144f848e057 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit ed05476aa08801ad39a664aabc9526be3a5c8e4f +Subproject commit 144f848e057a0412d89971da6b656a5813171330 diff --git a/qtactiveqt b/qtactiveqt index 2b62b69b248..3724cc8a5db 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 2b62b69b248b75062d388fc6190a13f14fa5b918 +Subproject commit 3724cc8a5db58aa8e8ac5b9d8bc842bf6fe0d80a diff --git a/qtbase b/qtbase index 1f55a339d2d..5e5667da237 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 1f55a339d2d4a07d8749aef5630e192b84dbc781 +Subproject commit 5e5667da2376b155578246e85221dfbb71e2a65e diff --git a/qtcharts b/qtcharts index 43636baf3fe..cc2d00697b0 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 43636baf3feda566dfcf5ca34730b9f28c3dfd82 +Subproject commit cc2d00697b0da57a0bb05100ecbe8c02f2c68fed diff --git a/qtcoap b/qtcoap index 464009685d0..fdba3ebffde 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit 464009685d07e9fa9c6a31e74102ad71e9ef3388 +Subproject commit fdba3ebffde994d6f4d14f088f26658cf72f5354 diff --git a/qtconnectivity b/qtconnectivity index bee92997f34..e3406d15651 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit bee92997f348477bbaf8bd598195e6e41813827b +Subproject commit e3406d156519af8921c8aa8ad1dec690ec0e0bcd diff --git a/qtdatavis3d b/qtdatavis3d index 9ece2807118..808cfe9e73d 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 9ece2807118b7e08c379a4a07ee63e8bc3543c39 +Subproject commit 808cfe9e73dc63a0a0ecaf4b9f79da3da020a1ba diff --git a/qtdeclarative b/qtdeclarative index fcd48036a29..72d314d1e51 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit fcd48036a29428a333e5ee0a0301994edd5025fa +Subproject commit 72d314d1e51709a71d856fa0bf1eb0d146013f8e diff --git a/qtdoc b/qtdoc index 4fb574ab26a..be32cdc9edc 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 4fb574ab26afc80bd9574b40d03cad80a96dfe8b +Subproject commit be32cdc9edcd53ab3954d94ce5cdce1463896076 diff --git a/qtgraphs b/qtgraphs index 2afc79bd96a..e34366571b4 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit 2afc79bd96a81b134486242107727858acb1a9f7 +Subproject commit e34366571b4a255ed2dbe52a46762c571d8e930e diff --git a/qtgrpc b/qtgrpc index 95a82f3e2a9..5a8d675bb6c 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit 95a82f3e2a9fb43831e83abcca982cc43fa89598 +Subproject commit 5a8d675bb6c3ac094a2ede8c8c0e75de4cecc9cd diff --git a/qthttpserver b/qthttpserver index aedf7300855..0c5bb56d5ba 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit aedf73008558d74e8c0045637d1b8f325ba926ce +Subproject commit 0c5bb56d5ba8cb0bfcfd9b9a9b5a1da4321b3d73 diff --git a/qtimageformats b/qtimageformats index 7c39f4310da..0f87de71514 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 7c39f4310da8f1efa4606950e125528011ba03f9 +Subproject commit 0f87de7151473526e21e45b6c95149b88512095e diff --git a/qtlanguageserver b/qtlanguageserver index a7c6d9e0704..938a0f83024 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit a7c6d9e0704e240b3b9181166af09d3423846807 +Subproject commit 938a0f83024bc3ae71ea33c28769bbb0d44e8e3f diff --git a/qtlocation b/qtlocation index 8236d9593d0..f3215eb05b6 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 8236d9593d090df708ab63f52fe50379c0b6c560 +Subproject commit f3215eb05b6ae70602f6b2c6f84158c53ff10aee diff --git a/qtlottie b/qtlottie index 7090e1ca2e2..0ccf5b3fb48 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 7090e1ca2e2039726dc075155796b2b4a220ad29 +Subproject commit 0ccf5b3fb488cbf784bc7e66b006b9cfdd4d0180 diff --git a/qtmqtt b/qtmqtt index 747f2adad14..b0f6adb76cf 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit 747f2adad14aa98c7c50251b04bb8550347e1175 +Subproject commit b0f6adb76cf0a3341b61064e6f2e84f761962da2 diff --git a/qtmultimedia b/qtmultimedia index 848740ba7ed..acb778102e8 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 848740ba7ede6789c33973dc68101ed513f3933b +Subproject commit acb778102e8ef95cb2684161d22d3e28598e8c4b diff --git a/qtnetworkauth b/qtnetworkauth index a8d380ab960..1a60682c198 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit a8d380ab9600a9a9dd261ae836131b134734979b +Subproject commit 1a60682c1987ff7bf45267deb543faf66fac8e19 diff --git a/qtopcua b/qtopcua index 0b837a353e2..a2d1d70dd11 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit 0b837a353e2f102f7f06e03f1fc67953011389e3 +Subproject commit a2d1d70dd11c9440e455ec4a0a93de645120a2c1 diff --git a/qtpositioning b/qtpositioning index 4637d0a4e9b..d439b858a90 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit 4637d0a4e9b91f6f525d1ed21363baadc291d61f +Subproject commit d439b858a902e16f198a973ac605bdc13c171ad7 diff --git a/qtquick3d b/qtquick3d index cbd4f390653..2b584b9347f 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit cbd4f390653c468508ff39d41d37726b8bf040df +Subproject commit 2b584b9347f7fd94f9756d283d00d8ea87ba2723 diff --git a/qtquick3dphysics b/qtquick3dphysics index 4ac851d2735..405a8ec30f0 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit 4ac851d27357f19bd2bd8da7a41c4fd9f32486f7 +Subproject commit 405a8ec30f0151831e34c59fdeed5c4edef4fa0d diff --git a/qtquickeffectmaker b/qtquickeffectmaker index f49f3b9f159..dd4f23dec6c 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit f49f3b9f159643ae79008f55e480a0e2d5b35c12 +Subproject commit dd4f23dec6c22b17226996b72c9c54e97efe8d5d diff --git a/qtquicktimeline b/qtquicktimeline index a760ad94620..7c7a552ccc2 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit a760ad946207169d9d666c416a9cbbf0e47c46b6 +Subproject commit 7c7a552ccc2cea1586e5df702ca9c61665d05021 diff --git a/qtremoteobjects b/qtremoteobjects index 0539c941751..cc386a36a4f 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 0539c94175105761c93fd1277ddc31f786fe1d7c +Subproject commit cc386a36a4faab9fb22a96da0bbec1dcdf293785 diff --git a/qtscxml b/qtscxml index 11b53d24e93..89e56688805 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 11b53d24e93cf99de52fa01ab9877131ff87d99a +Subproject commit 89e56688805a5d6d8b56c24b57afe17d40c9bb1e diff --git a/qtsensors b/qtsensors index 505390465bb..88625df0301 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 505390465bb22a51433186e74c671b6a4f2bcdd6 +Subproject commit 88625df03018130933f7e38c022a974f355f029e diff --git a/qtserialbus b/qtserialbus index 480a6044835..a48f33460b5 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 480a6044835e8c903ce7b854f9ee8748b850577f +Subproject commit a48f33460b5e80c9f6ca8c87ea63c200f9e91809 diff --git a/qtserialport b/qtserialport index 10ab8a4104a..0b90ec86fd4 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 10ab8a4104af7dfde699c1a29a57da2821a81af8 +Subproject commit 0b90ec86fd411152a3f40818490f62ae6d017f76 diff --git a/qtshadertools b/qtshadertools index 72d400042e2..09065b17d80 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 72d400042e23eb4c35eab996224585332be9738c +Subproject commit 09065b17d80c86ed94ffbd09ae44fd667514b50f diff --git a/qtspeech b/qtspeech index d5c67b915d0..4e7a2e8892d 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit d5c67b915d009a343f63d69cd5cff62499f816bc +Subproject commit 4e7a2e8892dc506171f8cea6a443f315f8a6e18a diff --git a/qtsvg b/qtsvg index 609299ed859..d3a596a61a5 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 609299ed859d3aa276b1b498dba89ebeb5bd1843 +Subproject commit d3a596a61a586714a728644e4a06656c31d8ba7b diff --git a/qttools b/qttools index f66065751b5..53798d1ceb1 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit f66065751b537bb3fa3cc0957759dcd248ded716 +Subproject commit 53798d1ceb1ff9fa4fc1b291b49f656929f8059d diff --git a/qttranslations b/qttranslations index 2ff00f726aa..358ebfa2e91 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 2ff00f726aa0ae8549521b42a111a44db93a66db +Subproject commit 358ebfa2e910878b80a4cf03fe2248ff0c49be40 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 8288c58589c..429a5375c56 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 8288c58589c099a565e0c2e929c6e10c205b0b20 +Subproject commit 429a5375c5627889ed20d0b880819bff335f2164 diff --git a/qtwayland b/qtwayland index bb3b9c3208f..7745e3cc3bf 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit bb3b9c3208fd49fa3f0f24782492ecca4536951f +Subproject commit 7745e3cc3bf8ea6e29c0e4046a668e1007549ea6 diff --git a/qtwebchannel b/qtwebchannel index 96ba65c4ff8..fcfe7c1a7d3 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 96ba65c4ff8e02b742e68c5e5ecc8d46c37f210f +Subproject commit fcfe7c1a7d3f841111bb6e5409411e46d0f5b116 diff --git a/qtwebengine b/qtwebengine index f6ba4e58ece..17d252f02da 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit f6ba4e58ece5ea5873dbce4d5bc19c788a8823ab +Subproject commit 17d252f02da75a1e30349a2b3919b00a1a295bea diff --git a/qtwebsockets b/qtwebsockets index 19f32ea69ed..48f347ee9ff 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 19f32ea69edfc2792b4f93e911a4e0604ab82951 +Subproject commit 48f347ee9ff4ced2529717a8ebe4a7110618b405 diff --git a/qtwebview b/qtwebview index 4c8e3c0e513..f1fbf3abdae 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 4c8e3c0e5138559191b43fedac178afbcd5a2088 +Subproject commit f1fbf3abdaec2fe4eb47d06ea6cb50b348b3f238 From e8a94de2ea4675fb30c48c448ad829532f69bf2f 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 253/288] 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. Change-Id: I40aa3c1852fb0baf3366fa1a9dab85a66eef95e2 Reviewed-by: Joerg Bornemann Reviewed-by: Alexandru Croitor (cherry picked from commit 124957a8cb55a9dc6a068d424a93cc7642bb03d7) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 1bb142175a5447149020a994b83e9ca9c2a58269) --- 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 e89c9609254..911ff9fb2d8 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 d35b7e30963..73a86201bad 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 5aec4aa15756191702712433d96bdf09370ad3e3 Mon Sep 17 00:00:00 2001 From: Tero Heikkinen Date: Tue, 7 Jan 2025 13:52:37 +0200 Subject: [PATCH 254/288] 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: Lucie Gerard --- .../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 +++ coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/02-apt.sh | 3 +++ 4 files changed, 10 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 42b62022d91..1ce01ced8f1 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 @@ -154,6 +154,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 c2a8318dfc3..58a5a84ec3a 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 @@ -107,6 +107,9 @@ sudo zypper -nq install openssl-3 # cifs-utils, for mounting smb drive sudo zypper -nq install cifs-utils +# 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 653ef084df2..395985387ea 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 @@ -238,6 +238,9 @@ installPackages+=(jq) installPackages+=(patchelf) +# For tst_license.pl with all the machines generating SBOM +installPackages+=(libjson-perl) + echo "Running update for apt" waitLoop sudo apt-get update From d15dfbd2b4a03d9e831b2bf111e5463afc55ae3b Mon Sep 17 00:00:00 2001 From: Timur Pocheptsov Date: Thu, 19 Dec 2024 14:55:56 +0100 Subject: [PATCH 255/288] 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). Task-number: QTBUG-132313 Change-Id: Ic683f58dffcef8a06adb4a915c4e3abc4ab219e5 Reviewed-by: Artem Dyomin (cherry picked from commit 1968adc126bb5b7896e7a12475481f10bb56a543) Reviewed-by: Timur Pocheptsov Reviewed-by: Jukka Jokiniva (cherry picked from commit 27be5c2f98551abbeaa9cf60e3b280dea9091084) Reviewed-by: Qt Cherry-pick Bot --- .../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 3994524b70641ca9e6f0b1b3a1ee42bb7bcb2642 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 256/288] 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.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 (cherry picked from commit 3b9008ca759412dc84e6538b4c2f78c4751204bc) --- 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 4c6b800263ce1cc872aa9c27ec246848b22018a4 Mon Sep 17 00:00:00 2001 From: Elias Toivola Date: Thu, 12 Dec 2024 00:45:17 +0200 Subject: [PATCH 257/288] 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 Change-Id: Ia78f8d3b67c3aa546a4f47ad503f44782722631f Reviewed-by: Michal Klocek (cherry picked from commit 75578f016a706773fc7113ff9ed3e882ac5430fa) Reviewed-by: Jukka Jokiniva (cherry picked from commit 2c0ce8b3f2cebaf8b6bc7fdef793946c3fb2e64f) Reviewed-by: Eike Ziller --- 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 179b0a83c17..c3fafd0f8df 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -130,7 +130,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: ['Sccache', "DebugAndRelease", 'UseConfigure', 'GenerateSBOM', 'VerifySBOM'] Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib' @@ -226,7 +226,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: ['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 fe3697f2978..369bd5339c1 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 846afb3b9d0..c39c75d9af8 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 f660cbecf8d..d82964f29a6 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -70,7 +70,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 7b616ebe4511543160a9fd31d44afe203023d3c6 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Thu, 13 Feb 2025 10:38:35 +0100 Subject: [PATCH 258/288] COIN/QtCreator: Update to Windows 11 23H2 That is what we are using for packages too. Change-Id: I88ab02f577933292c882ec4633d9087b1bf957ea Reviewed-by: Tero Heikkinen (cherry picked from commit 53280b0697e7be0b53c55852957ad2c9a422998f) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit db2d504099e854eddab6e4c71ba21368c33a73e3) --- 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 3d77301e1c9dbb9cfd06b03bdab1a74b33a74f86 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Fri, 14 Feb 2025 14:49:58 +0100 Subject: [PATCH 259/288] COIN/QtCreator: Move to Ubuntu 24.04 for ARM Debian is no longer supported for Qt 6.8.1 and later Change-Id: Ic9ddac3d95451b900f60be6a90efd5fb32985601 Reviewed-by: Patrik Teivonen Reviewed-by: David Schulz (cherry picked from commit 014bdc24ab8c08320df7ca0989ea2eb7a6fb8541) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 626a22cc74f482e11200838e3789b104352a8ec0) --- 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 9cad1bede1460403e9b3c7014a2faf4fe382835c Mon Sep 17 00:00:00 2001 From: Paul Wicking Date: Mon, 17 Feb 2025 09:21:42 +0100 Subject: [PATCH 260/288] 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 Change-Id: Iea428aeaa1b4cdbaabd3477aaf061b8960efc887 Reviewed-by: Samuel Gaist (cherry picked from commit 9b8cb71d6bb56ae05cb42ea09061b06a12ef9da8) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit be88fababd355f4a8dacfe965b7cb4cb613d5aa4) --- .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 dd41f83ef18e416e7c5d1a12472fc7f868bb0a2f Mon Sep 17 00:00:00 2001 From: Tero Heikkinen Date: Thu, 27 Feb 2025 13:52:07 +0200 Subject: [PATCH 261/288] Add Perl JSON module for openSUSE 15.5 Needed with all the machines generating SBOM (amends 5aec4aa15756191702712433d96bdf09370ad3e3 where this openSUSE 15.5 was missed) Task-number: QTQAINFRA-6871 Task-number: QTBUG-131434 Change-Id: I438b60a991703adb18bb533f254fff5e9601e31d Reviewed-by: Alexandru Croitor --- .../qtci-linux-openSUSE-15.5-x86_64/04-zypperpackages.sh | 3 +++ 1 file changed, 3 insertions(+) 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 8f524960a8a..3588081c1cc 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 @@ -82,6 +82,9 @@ sudo zypper -nq install cifs-utils # 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 8b143a76051e64f3118668f9cc50175946f1a845 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 3 Mar 2025 20:23:16 +0000 Subject: [PATCH 262/288] Update submodules on '6.8 in qt/qt5' Change-Id: Icb9c2e52b2880dbd5a88b1f006e9ba8982336ab0 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 4acdb74cb05..853dc45ee20 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 4acdb74cb0505e612fb587bd1d410c6bbad09f8d +Subproject commit 853dc45ee20477a7c6bb7cb9b926a30966371a04 diff --git a/qt5compat b/qt5compat index 144f848e057..2d690a846f8 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 144f848e057a0412d89971da6b656a5813171330 +Subproject commit 2d690a846f86af6954c39022ae0ae161e5f84fb4 diff --git a/qtactiveqt b/qtactiveqt index 3724cc8a5db..400d978e15e 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 3724cc8a5db58aa8e8ac5b9d8bc842bf6fe0d80a +Subproject commit 400d978e15ec3d4102cf7ce4483a7344f5dad250 diff --git a/qtbase b/qtbase index 5e5667da237..f55ea3271bc 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 5e5667da2376b155578246e85221dfbb71e2a65e +Subproject commit f55ea3271bcdf77c0bcca99984b39545aa328706 diff --git a/qtcharts b/qtcharts index cc2d00697b0..4d6eeb9c34c 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit cc2d00697b0da57a0bb05100ecbe8c02f2c68fed +Subproject commit 4d6eeb9c34c48a747bef8cd4a97681f0b06eabbb diff --git a/qtcoap b/qtcoap index fdba3ebffde..eb8fb6773d6 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit fdba3ebffde994d6f4d14f088f26658cf72f5354 +Subproject commit eb8fb6773d6164f96ce8de5f33c091006c7a721e diff --git a/qtconnectivity b/qtconnectivity index e3406d15651..3741c49e246 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit e3406d156519af8921c8aa8ad1dec690ec0e0bcd +Subproject commit 3741c49e246cd1efe880821c97a9d06a306a0331 diff --git a/qtdatavis3d b/qtdatavis3d index 808cfe9e73d..2b99ddd6e99 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 808cfe9e73dc63a0a0ecaf4b9f79da3da020a1ba +Subproject commit 2b99ddd6e99d9f827bf71945075978c144e17e99 diff --git a/qtdeclarative b/qtdeclarative index 72d314d1e51..7b4837d3e34 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 72d314d1e51709a71d856fa0bf1eb0d146013f8e +Subproject commit 7b4837d3e34a206ccbd3b921e65f1401b09066ee diff --git a/qtdoc b/qtdoc index be32cdc9edc..d4fd6fa9370 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit be32cdc9edcd53ab3954d94ce5cdce1463896076 +Subproject commit d4fd6fa9370bec962a320c6011ca78a5384f9ec4 diff --git a/qtgraphs b/qtgraphs index e34366571b4..de1f22159d9 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit e34366571b4a255ed2dbe52a46762c571d8e930e +Subproject commit de1f22159d90f7f842566d10fc26692eb07d1fac diff --git a/qtgrpc b/qtgrpc index 5a8d675bb6c..6be8fc5b241 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit 5a8d675bb6c3ac094a2ede8c8c0e75de4cecc9cd +Subproject commit 6be8fc5b2415d127c9dbb2eaa1199a3ca74294bb diff --git a/qthttpserver b/qthttpserver index 0c5bb56d5ba..e269617cd78 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit 0c5bb56d5ba8cb0bfcfd9b9a9b5a1da4321b3d73 +Subproject commit e269617cd78cdc3eb4ed231efa533eaf9b70d349 diff --git a/qtimageformats b/qtimageformats index 0f87de71514..9e7f0c0f465 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 0f87de7151473526e21e45b6c95149b88512095e +Subproject commit 9e7f0c0f4656a37c264b3b1ed22afe8684dfe288 diff --git a/qtlanguageserver b/qtlanguageserver index 938a0f83024..caeeb4301bb 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit 938a0f83024bc3ae71ea33c28769bbb0d44e8e3f +Subproject commit caeeb4301bb1bf7fbf6634b7b3cfe55ee8e4aef0 diff --git a/qtlocation b/qtlocation index f3215eb05b6..8d065094998 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit f3215eb05b6ae70602f6b2c6f84158c53ff10aee +Subproject commit 8d065094998e938a63711eb7927a546f5b4d821c diff --git a/qtlottie b/qtlottie index 0ccf5b3fb48..2980a418196 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 0ccf5b3fb488cbf784bc7e66b006b9cfdd4d0180 +Subproject commit 2980a418196bffa511cbfcd428d8e26bc909eb68 diff --git a/qtmqtt b/qtmqtt index b0f6adb76cf..03f00e0a118 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit b0f6adb76cf0a3341b61064e6f2e84f761962da2 +Subproject commit 03f00e0a118a289872c46fca2ff7a6343c4fb220 diff --git a/qtmultimedia b/qtmultimedia index acb778102e8..e750791a465 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit acb778102e8ef95cb2684161d22d3e28598e8c4b +Subproject commit e750791a465968d230235dd51b1b9371712a2699 diff --git a/qtnetworkauth b/qtnetworkauth index 1a60682c198..e477222ab93 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 1a60682c1987ff7bf45267deb543faf66fac8e19 +Subproject commit e477222ab93e6f32de88c107969733b4df7f7d7f diff --git a/qtopcua b/qtopcua index a2d1d70dd11..be1c77c0eda 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit a2d1d70dd11c9440e455ec4a0a93de645120a2c1 +Subproject commit be1c77c0eda592b86cab955018d2f376f45a8a34 diff --git a/qtpositioning b/qtpositioning index d439b858a90..83cc61df4af 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit d439b858a902e16f198a973ac605bdc13c171ad7 +Subproject commit 83cc61df4afb3b81da03c9ec6d3536b32d60b07d diff --git a/qtquick3d b/qtquick3d index 2b584b9347f..4b9b8b362ae 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 2b584b9347f7fd94f9756d283d00d8ea87ba2723 +Subproject commit 4b9b8b362ae512f2fec45771023f2a9f0dd9aba8 diff --git a/qtquick3dphysics b/qtquick3dphysics index 405a8ec30f0..e94713f2e20 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit 405a8ec30f0151831e34c59fdeed5c4edef4fa0d +Subproject commit e94713f2e20e937d923bff54833fcf9ab353cf9b diff --git a/qtquickeffectmaker b/qtquickeffectmaker index dd4f23dec6c..88b36c52093 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit dd4f23dec6c22b17226996b72c9c54e97efe8d5d +Subproject commit 88b36c52093a496937de6195edd1451c63d4d8f8 diff --git a/qtquicktimeline b/qtquicktimeline index 7c7a552ccc2..337c99f9c32 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 7c7a552ccc2cea1586e5df702ca9c61665d05021 +Subproject commit 337c99f9c32c3379c43d77f423f5bdbff46386f1 diff --git a/qtremoteobjects b/qtremoteobjects index cc386a36a4f..eb4e4c2cde0 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit cc386a36a4faab9fb22a96da0bbec1dcdf293785 +Subproject commit eb4e4c2cde0d6e57131e1a47e8a6069122f4d4ca 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 89e56688805..d832f2d3e6f 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 89e56688805a5d6d8b56c24b57afe17d40c9bb1e +Subproject commit d832f2d3e6f91f48a7158ce27bb155ff70215b25 diff --git a/qtsensors b/qtsensors index 88625df0301..ebeffe4e01e 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 88625df03018130933f7e38c022a974f355f029e +Subproject commit ebeffe4e01e9a6494002e49a697146e585afbd9e diff --git a/qtserialbus b/qtserialbus index a48f33460b5..af8847c84e1 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit a48f33460b5e80c9f6ca8c87ea63c200f9e91809 +Subproject commit af8847c84e1ece52631bcfd274edfd1c771c6f28 diff --git a/qtserialport b/qtserialport index 0b90ec86fd4..7fb269900fe 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 0b90ec86fd411152a3f40818490f62ae6d017f76 +Subproject commit 7fb269900fe8697b5732ac58d7ec068048426af6 diff --git a/qtshadertools b/qtshadertools index 09065b17d80..1ac1d7e42cb 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 09065b17d80c86ed94ffbd09ae44fd667514b50f +Subproject commit 1ac1d7e42cb548b8eb16a5c0f31bd494817e37ef diff --git a/qtspeech b/qtspeech index 4e7a2e8892d..266d03c4823 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 4e7a2e8892dc506171f8cea6a443f315f8a6e18a +Subproject commit 266d03c48236918aa1ae24d30ed68de970170fcc diff --git a/qtsvg b/qtsvg index d3a596a61a5..4422b48cb3c 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit d3a596a61a586714a728644e4a06656c31d8ba7b +Subproject commit 4422b48cb3cf12788a746768c63528b350e79f97 diff --git a/qttools b/qttools index 53798d1ceb1..feda5851ddc 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 53798d1ceb1ff9fa4fc1b291b49f656929f8059d +Subproject commit feda5851ddced220d26ce80624fca527dde0a0ea diff --git a/qttranslations b/qttranslations index 358ebfa2e91..b046f9e927d 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 358ebfa2e910878b80a4cf03fe2248ff0c49be40 +Subproject commit b046f9e927d0de7c9c2b8837b5b686bf7b96d3a6 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 429a5375c56..af9e779ff39 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 429a5375c5627889ed20d0b880819bff335f2164 +Subproject commit af9e779ff395f3dcabd2abf954cc9d10a6534d70 diff --git a/qtwayland b/qtwayland index 7745e3cc3bf..e5d19500902 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 7745e3cc3bf8ea6e29c0e4046a668e1007549ea6 +Subproject commit e5d195009025b7217a10b418f07591a2b6b2aeb0 diff --git a/qtwebchannel b/qtwebchannel index fcfe7c1a7d3..ca7d35059a0 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit fcfe7c1a7d3f841111bb6e5409411e46d0f5b116 +Subproject commit ca7d35059a0effe4fbdb57a1b5e604f3d815b12a diff --git a/qtwebengine b/qtwebengine index 17d252f02da..9ab8432ee9c 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 17d252f02da75a1e30349a2b3919b00a1a295bea +Subproject commit 9ab8432ee9c64668e7413a526309874410c5ee4e diff --git a/qtwebsockets b/qtwebsockets index 48f347ee9ff..2c7e41f767b 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 48f347ee9ff4ced2529717a8ebe4a7110618b405 +Subproject commit 2c7e41f767bbb76fa483269ee541048c2214b2ab diff --git a/qtwebview b/qtwebview index f1fbf3abdae..f966ce20ccf 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit f1fbf3abdaec2fe4eb47d06ea6cb50b348b3f238 +Subproject commit f966ce20ccffc6c89519d4fcd43557e0225ba9c9 From fe60ef1781f7c722d16d3a9823611aaa131b2c85 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 263/288] Provisioning: bump Android sdkApiLevel to 35 This patch bumps the sdkApiLevel used in Coin to 35. Task-number: QTBUG-129461 Task-number: QTBUG-130283 Pick-to: 6.5 Change-Id: Ia26248982a2807b2d3554d1a7a7394efcf13f834 Reviewed-by: Axel Spoerl (cherry picked from commit 345aae01f5e0c512d8eeada41bb69865904b6bc7) Reviewed-by: Jani Heikkinen --- 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 +- 9 files changed, 9 insertions(+), 9 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" From 39a95bbd9a6f1ff14b715506f7ec512edc4fe5c2 Mon Sep 17 00:00:00 2001 From: Rami Potinkara Date: Thu, 13 Feb 2025 09:39:37 +0200 Subject: [PATCH 264/288] Provisioning: bump Android sdkBuildToolsVersion to 35 This patch bumps the sdkBuildToolsVersion used in Coin to 35. Task-number: QTBUG-129461 Task-number: QTBUG-130283 Pick-to: 6.5 Change-Id: I2e1fbdfd23cb854ec50625ff29331adc61abc32c Reviewed-by: Assam Boudjelthia (cherry picked from commit 7228be7f72d69581ed8bcbdb656eda7e3ecd132f) Reviewed-by: Jani Heikkinen --- 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 +- 9 files changed, 9 insertions(+), 9 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" From 3068bcf3e20cf7b91cb1665cf49e1078cf730f40 Mon Sep 17 00:00:00 2001 From: Cristian Le Date: Wed, 12 Feb 2025 11:01:27 +0100 Subject: [PATCH 265/288] Remove `RunCMake` helpers from top-level repo These test helpers are moved to qtbase submodule. Change-Id: If8aa31fe1d9a93f2667249abd90ae9b8cb81d07a Reviewed-by: Alexandru Croitor (cherry picked from commit e552513c9f4d5cf3ab31be4a6bf72462a965b6e1) (cherry picked from commit faf67533c364716fe5bd0613f49311ca2e77739c) Reviewed-by: Qt Cherry-pick Bot --- 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 4e47d97d2835363248f6aa2c8a93aba4c974b04a Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 7 Mar 2025 09:32:11 +0100 Subject: [PATCH 266/288] Reapply "platform_configs: remove InsignificantTests for u2404 x11 non-dev" This reverts commit 7525c795e7ca03befa0830e9f4b40de340ef70d8. Task-number: QTQAINFRA-6898 Task-number: QTQAINFRA-6098 Change-Id: I74f3d4de45c6f4aa99ef397b19906fcef44c2a16 Reviewed-by: Tero Heikkinen (cherry picked from commit 7111a62bb1e8fa36ebbf673f84f296fb758385c3) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 6f01dea4d8a810f892b41bd3defd9186e0b337cd) --- 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 c3fafd0f8df..12009c873bd 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.5-developer-build' From 7b3e6b03dd74d57082e46b471c835994ca439393 Mon Sep 17 00:00:00 2001 From: Rami Potinkara Date: Sun, 23 Feb 2025 14:59:29 +0200 Subject: [PATCH 267/288] 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-6656 Pick-to: 6.5 Change-Id: Ic791cfd5d5dd2a439f96590b6f6f8ca0ac4fb5ae Reviewed-by: Assam Boudjelthia Reviewed-by: Rami Potinkara (cherry picked from commit a242bb2e3e810abc3c1b7fc4a3aa8cbedc7073e8) Reviewed-by: Jani Heikkinen (cherry picked from commit fb187295fcdb8882dd42b937503d3c360653146f) --- 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 +- 13 files changed, 22 insertions(+), 22 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 From cb3cb3802ad64918f4bb0315e4abaa2b45ac6a84 Mon Sep 17 00:00:00 2001 From: Tero Heikkinen Date: Tue, 4 Mar 2025 11:56:30 +0200 Subject: [PATCH 268/288] 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 Change-Id: Id0ef369b0d714b40b66117d6e62ddd6a787cae71 Reviewed-by: Simo Fält (cherry picked from commit 1144b145842a5e197a60d4f113bc88c7ec565e2d) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 42e0846a18af6d67838d93e963fb0cd0052f31ff) --- .../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 1ce01ced8f1..1daa9305f4e 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 4abf653f53a..c4ccf3b5894 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 7057c9f8a92..3bf25d4404a 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 de8b2017fa6..6afecfc65c8 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 14dec198219..ecefac8672e 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 77837171dec..fcca93e0d38 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 845cea5440e..a19077ac06c 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 71e7ad8274f..e726468382c 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 8e9d4f9e8896bcc5d62085e018b8702b0978f7bd Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 1 Apr 2025 02:45:32 +0000 Subject: [PATCH 269/288] Update submodules on '6.8 in qt/qt5' Change-Id: I34eac06ff1528ebfde1a799e4f21fc5b0836ccfb 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 853dc45ee20..e84853fc457 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 853dc45ee20477a7c6bb7cb9b926a30966371a04 +Subproject commit e84853fc4573260e098e187f2cefbb2d230d46d9 diff --git a/qt5compat b/qt5compat index 2d690a846f8..dc5d523663f 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 2d690a846f86af6954c39022ae0ae161e5f84fb4 +Subproject commit dc5d523663f379fa178b8b8142a0b010e5528d97 diff --git a/qtactiveqt b/qtactiveqt index 400d978e15e..dcd8bf64800 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 400d978e15ec3d4102cf7ce4483a7344f5dad250 +Subproject commit dcd8bf64800c61c23647d7c0d8472ddc0552e690 diff --git a/qtbase b/qtbase index f55ea3271bc..4040d22524d 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit f55ea3271bcdf77c0bcca99984b39545aa328706 +Subproject commit 4040d22524d2fd92fad62546309b206718c6fb91 diff --git a/qtcharts b/qtcharts index 4d6eeb9c34c..82e61532a88 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 4d6eeb9c34c48a747bef8cd4a97681f0b06eabbb +Subproject commit 82e61532a88c490e66df0f378e3327afe27cc453 diff --git a/qtcoap b/qtcoap index eb8fb6773d6..0a48ec94d97 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit eb8fb6773d6164f96ce8de5f33c091006c7a721e +Subproject commit 0a48ec94d979a47a3ea9c87804d2c9403b3766ce diff --git a/qtconnectivity b/qtconnectivity index 3741c49e246..2c60f90dbf2 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 3741c49e246cd1efe880821c97a9d06a306a0331 +Subproject commit 2c60f90dbf27e056b04b8427f47d6a5467c0ad53 diff --git a/qtdatavis3d b/qtdatavis3d index 2b99ddd6e99..34d302ed1a0 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 2b99ddd6e99d9f827bf71945075978c144e17e99 +Subproject commit 34d302ed1a0b29bffe8a796be6ccc861df070cdf diff --git a/qtdeclarative b/qtdeclarative index 7b4837d3e34..5a5b4e295b4 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 7b4837d3e34a206ccbd3b921e65f1401b09066ee +Subproject commit 5a5b4e295b433c7cf4b9f391eb1bc1b9623d83b0 diff --git a/qtdoc b/qtdoc index d4fd6fa9370..b0450b26ad4 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit d4fd6fa9370bec962a320c6011ca78a5384f9ec4 +Subproject commit b0450b26ad442958e27946d1e91119c431542a97 diff --git a/qtgraphs b/qtgraphs index de1f22159d9..26623a20aa5 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit de1f22159d90f7f842566d10fc26692eb07d1fac +Subproject commit 26623a20aa57f867b3134e4e068cc44ab5c0cb3a diff --git a/qtgrpc b/qtgrpc index 6be8fc5b241..615926a0f17 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit 6be8fc5b2415d127c9dbb2eaa1199a3ca74294bb +Subproject commit 615926a0f17492f1ed701f394f67c49e4a6dcf07 diff --git a/qthttpserver b/qthttpserver index e269617cd78..f71447ed45d 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit e269617cd78cdc3eb4ed231efa533eaf9b70d349 +Subproject commit f71447ed45d48d4a7aed0fecc07ebc514f4eb5cd diff --git a/qtimageformats b/qtimageformats index 9e7f0c0f465..5fe085ced86 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 9e7f0c0f4656a37c264b3b1ed22afe8684dfe288 +Subproject commit 5fe085ced860eb64ffc1b890a6e85780c61dbeef diff --git a/qtlanguageserver b/qtlanguageserver index caeeb4301bb..e9cb3dcd7bf 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit caeeb4301bb1bf7fbf6634b7b3cfe55ee8e4aef0 +Subproject commit e9cb3dcd7bf9097ecb811cb83406bb522b33388f diff --git a/qtlocation b/qtlocation index 8d065094998..2c073670ef3 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 8d065094998e938a63711eb7927a546f5b4d821c +Subproject commit 2c073670ef3ded984c34b15413958752aeedab76 diff --git a/qtlottie b/qtlottie index 2980a418196..305c0d0ea0d 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 2980a418196bffa511cbfcd428d8e26bc909eb68 +Subproject commit 305c0d0ea0dce6302d526985bc906dff471d7aba diff --git a/qtmqtt b/qtmqtt index 03f00e0a118..96c53c86515 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit 03f00e0a118a289872c46fca2ff7a6343c4fb220 +Subproject commit 96c53c86515289fbcd36978148dea5740ef108a2 diff --git a/qtmultimedia b/qtmultimedia index e750791a465..e82b1b5d98b 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit e750791a465968d230235dd51b1b9371712a2699 +Subproject commit e82b1b5d98bb7bc843a917043046241a56240b1e diff --git a/qtnetworkauth b/qtnetworkauth index e477222ab93..5faafbce7e0 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit e477222ab93e6f32de88c107969733b4df7f7d7f +Subproject commit 5faafbce7e01a75761c1b724ea42bca152686e22 diff --git a/qtopcua b/qtopcua index be1c77c0eda..6012ddd654c 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit be1c77c0eda592b86cab955018d2f376f45a8a34 +Subproject commit 6012ddd654c6eaea7177a2b37bf79cfac97a5a8e diff --git a/qtpositioning b/qtpositioning index 83cc61df4af..2f486d06d23 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit 83cc61df4afb3b81da03c9ec6d3536b32d60b07d +Subproject commit 2f486d06d23195263922f702cfdf4354eb5c5365 diff --git a/qtquick3d b/qtquick3d index 4b9b8b362ae..dd658756ebe 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 4b9b8b362ae512f2fec45771023f2a9f0dd9aba8 +Subproject commit dd658756ebecc4045c78bac416346968f457f984 diff --git a/qtquick3dphysics b/qtquick3dphysics index e94713f2e20..df04b537900 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit e94713f2e20e937d923bff54833fcf9ab353cf9b +Subproject commit df04b5379003e4316a9830e01a5599631d5bc53f diff --git a/qtquickeffectmaker b/qtquickeffectmaker index 88b36c52093..7d2101b41db 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit 88b36c52093a496937de6195edd1451c63d4d8f8 +Subproject commit 7d2101b41dbc899db2297126f1bb2c154dd8974e diff --git a/qtquicktimeline b/qtquicktimeline index 337c99f9c32..8d4e0cf752c 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 337c99f9c32c3379c43d77f423f5bdbff46386f1 +Subproject commit 8d4e0cf752c057a232945e715ae5dfe795bc85e8 diff --git a/qtremoteobjects b/qtremoteobjects index eb4e4c2cde0..584f3a3f42d 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit eb4e4c2cde0d6e57131e1a47e8a6069122f4d4ca +Subproject commit 584f3a3f42de311183032794b7a9d50aa7c32b15 diff --git a/qtrepotools b/qtrepotools index 0838a754346..557cbde5d11 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 0838a754346966c629c575158873fdc779e0060b +Subproject commit 557cbde5d1130fc9469cee46f21ea84c22237add diff --git a/qtscxml b/qtscxml index d832f2d3e6f..b46f2bfe632 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit d832f2d3e6f91f48a7158ce27bb155ff70215b25 +Subproject commit b46f2bfe6329adeb6bb67dc6c3a8fb0278b3b5fc diff --git a/qtsensors b/qtsensors index ebeffe4e01e..0d27287268b 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit ebeffe4e01e9a6494002e49a697146e585afbd9e +Subproject commit 0d27287268bd7b01a0ca3a91856aeffd0a47ed78 diff --git a/qtserialbus b/qtserialbus index af8847c84e1..fd8ed74bf81 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit af8847c84e1ece52631bcfd274edfd1c771c6f28 +Subproject commit fd8ed74bf81503d30f72c32fd6f72bf9648cc6de diff --git a/qtserialport b/qtserialport index 7fb269900fe..ae7a49e91fb 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 7fb269900fe8697b5732ac58d7ec068048426af6 +Subproject commit ae7a49e91fb418aaf9f83c60d81b1808534cdc1b diff --git a/qtshadertools b/qtshadertools index 1ac1d7e42cb..7a502603a59 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 1ac1d7e42cb548b8eb16a5c0f31bd494817e37ef +Subproject commit 7a502603a59dabecc770a3b1a15379f4d5936a38 diff --git a/qtspeech b/qtspeech index 266d03c4823..77fdbdd3759 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 266d03c48236918aa1ae24d30ed68de970170fcc +Subproject commit 77fdbdd37591fef4dfe8d94b0f6eb57d54fe73e8 diff --git a/qtsvg b/qtsvg index 4422b48cb3c..2a038a91b44 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 4422b48cb3cf12788a746768c63528b350e79f97 +Subproject commit 2a038a91b444343a2beb7220e29ccaec5ecfb803 diff --git a/qttools b/qttools index feda5851ddc..f8b263a8309 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit feda5851ddced220d26ce80624fca527dde0a0ea +Subproject commit f8b263a8309e0d1db742cec9df7eb39aae382ecb diff --git a/qttranslations b/qttranslations index b046f9e927d..fe665cbbbb8 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit b046f9e927d0de7c9c2b8837b5b686bf7b96d3a6 +Subproject commit fe665cbbbb85de0280694bbea8b29b40f0797349 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index af9e779ff39..b6c5816aaef 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit af9e779ff395f3dcabd2abf954cc9d10a6534d70 +Subproject commit b6c5816aaef6915dd745d4accb414fcd8b3ca820 diff --git a/qtwayland b/qtwayland index e5d19500902..fefdf9c9750 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit e5d195009025b7217a10b418f07591a2b6b2aeb0 +Subproject commit fefdf9c9750cafaeb2116548dfc63012af82a54a diff --git a/qtwebchannel b/qtwebchannel index ca7d35059a0..6d8d2689731 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit ca7d35059a0effe4fbdb57a1b5e604f3d815b12a +Subproject commit 6d8d2689731e9337c7362355bc166e7ec7ee8361 diff --git a/qtwebengine b/qtwebengine index 9ab8432ee9c..3e19092ef71 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 9ab8432ee9c64668e7413a526309874410c5ee4e +Subproject commit 3e19092ef719a5a25c350af0bf801eb00cb1bf1c diff --git a/qtwebsockets b/qtwebsockets index 2c7e41f767b..ce0274a9824 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 2c7e41f767bbb76fa483269ee541048c2214b2ab +Subproject commit ce0274a9824270430aa0915aad3ed4ef6cbab626 diff --git a/qtwebview b/qtwebview index f966ce20ccf..ea822b289f4 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit f966ce20ccffc6c89519d4fcd43557e0225ba9c9 +Subproject commit ea822b289f4651e553eaa787b2e6c6bdd4d6713a From 8652b31f986dc12249c5fa4cdf3da529df03299c Mon Sep 17 00:00:00 2001 From: Jukka Jokiniva Date: Wed, 19 Mar 2025 13:06:16 +0200 Subject: [PATCH 270/288] Pin nodejs version to 22 Latest nodejs (23.10.0) fails to install on arm Mac 12. Brew install doesn't add to path automatically, so set in the script after install. Change-Id: Ibad6c362e5633cc656e9e580cfe4bd5ef4e5af2a Reviewed-by: Jani Heikkinen (cherry picked from commit 61fab6d7303c845a26694009afad553000ad4ff3) Reviewed-by: Rami Potinkara Reviewed-by: Toni Saario --- coin/provisioning/qtci-macos-12-arm/30-nodejs.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/qtci-macos-12-arm/30-nodejs.sh b/coin/provisioning/qtci-macos-12-arm/30-nodejs.sh index 8f73b2d69a0..4d487cfc7db 100755 --- a/coin/provisioning/qtci-macos-12-arm/30-nodejs.sh +++ b/coin/provisioning/qtci-macos-12-arm/30-nodejs.sh @@ -2,7 +2,10 @@ #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 +# shellcheck source=../common/unix/SetEnvVar.sh +source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" -brew install nodejs +set -ex +brew install node@22 +SetEnvVar "PATH" "/opt/homebrew/opt/node@22/bin:\$PATH" From 289f10577907ae9a8a8128b44f48bcb6b5406b1c Mon Sep 17 00:00:00 2001 From: Tim Blechmann Date: Wed, 12 Mar 2025 15:15:43 +0800 Subject: [PATCH 271/288] provisioning: don't install openh264 and gstreamer for openSUSE 15.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There don't seem any publicly available binaries for openh264 for openSUSE 15.5 anymore. Removing gstreamer and openh264 headers will allow us to build binaries, at the cost of not being able to build the gstreamer plugin anymore. Pick-to: dev 6.9 Change-Id: Ief1e9eb3963e98a1e2b076c3a3bfd8bdeec21e3c Reviewed-by: Liang Qi Reviewed-by: Jøger Hansegård (cherry picked from commit 336fc07c80e6af5a3d8e19377dd63738cf187fd6) Reviewed-by: Jukka Jokiniva --- .../qtci-linux-openSUSE-15.5-x86_64/04-zypperpackages.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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 3588081c1cc..7938cd9cc7d 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 @@ -48,9 +48,8 @@ sudo zypper -nq install libxml2-devel libxslt-devel # yasm (for ffmpeg in multimedia) 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 +# pulseaudio (qtmultimedia) +sudo zypper -nq install libpulse-devel pipewire-devel # cups sudo zypper -nq install cups-devel From c1ae2a14baa3bd1a316ca40b68383c289d5dbc27 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 272/288] macOS: Set PostgreSQL_ROOT during provisioning rather than in each config Decouples provisioning from build configurations. Change-Id: I53b0983ab8b20c40568c1b5b9a24bfe3c62cf531 Reviewed-by: Joerg Bornemann (cherry picked from commit 7f51bdbd8df8eae8f9a6d2f081b762ec001056a5) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 77a614d592ed0da68324284a77cb70f85dd979de) --- 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 911ff9fb2d8..da28f5d03ff 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', 'Protobuf_ROOT=/usr/local/lib/cmake/protobuf' ] diff --git a/coin/platform_configs/macos.yaml b/coin/platform_configs/macos.yaml index 73a86201bad..a69b637358a 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', 'Protobuf_ROOT=/usr/local/lib/cmake/protobuf' ] 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 1845ae81d45312a74471c782d6daa31cd2e1bd0a Mon Sep 17 00:00:00 2001 From: Ville-Pekka Karhu Date: Tue, 1 Apr 2025 15:14:39 +0300 Subject: [PATCH 273/288] Add missing macOS 15 provisionings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I83878864bd87e54130b5cb098a27de8b455f394f Reviewed-by: Tor Arne Vestbø --- .../01-disable-app-reopen.sh | 6 ++ .../qtci-macos-15-arm/01-disable-net-lso.sh | 3 + .../01-disable-notifications_and_warnings.sh | 3 + .../qtci-macos-15-arm/01-disable-updates.sh | 7 ++ .../qtci-macos-15-arm/01-increase_limits.sh | 3 + .../01-mount-vcpkg-cache-drive.sh | 8 ++ .../01-set_tcc_permissions.sh | 6 ++ .../01-sha1sum-compatibility.sh | 10 +++ .../qtci-macos-15-arm/03-bashprofile.sh | 9 ++ .../qtci-macos-15-arm/05-systemsetup.sh | 80 ++++++++++++++++++ .../qtci-macos-15-arm/06-crashreporter.sh | 12 +++ .../qtci-macos-15-arm/06-disable_spotlight.sh | 7 ++ .../06-disable_update_downloads.sh | 6 ++ .../qtci-macos-15-arm/07-SSL_keychain.sh | 11 +++ coin/provisioning/qtci-macos-15-arm/15-xz.sh | 32 +++++++ .../provisioning/qtci-macos-15-arm/20-java.sh | 7 ++ .../qtci-macos-15-arm/20-xcode.sh | 22 +++++ .../21-install-commandlinetools.sh | 14 ++++ .../qtci-macos-15-arm/23-homebrew.sh | 12 +++ .../qtci-macos-15-arm/24-pyenv.sh | 49 +++++++++++ .../qtci-macos-15-arm/24-sccache.sh | 3 + .../qtci-macos-15-arm/25-cmake.sh | 8 ++ .../qtci-macos-15-arm/25-mysql.sh | 27 ++++++ coin/provisioning/qtci-macos-15-arm/25-pip.sh | 8 ++ .../qtci-macos-15-arm/25-postgresql.sh | 7 ++ .../qtci-macos-15-arm/25-python.sh | 21 +++++ .../qtci-macos-15-arm/26-freetype.sh | 7 ++ coin/provisioning/qtci-macos-15-arm/26-jq.sh | 5 ++ .../qtci-macos-15-arm/26-ninja.sh | 10 +++ .../provisioning/qtci-macos-15-arm/26-odbc.sh | 9 ++ .../qtci-macos-15-arm/26-p7zip.sh | 9 ++ .../qtci-macos-15-arm/26-pcre2.sh | 7 ++ .../qtci-macos-15-arm/27-libclang.sh | 9 ++ .../qtci-macos-15-arm/28-libclang-v100-dyn.sh | 8 ++ .../qtci-macos-15-arm/29-install-pkgconfig.sh | 6 ++ .../qtci-macos-15-arm/30-android.sh | 64 ++++++++++++++ coin/provisioning/qtci-macos-15-arm/30-fbx.sh | 9 ++ .../qtci-macos-15-arm/30-install-conan.sh | 8 ++ .../qtci-macos-15-arm/30-nodejs.sh | 8 ++ .../qtci-macos-15-arm/35-install-breakpad.sh | 8 ++ .../qtci-macos-15-arm/35-install_protobuf.sh | 9 ++ .../qtci-macos-15-arm/35-openssl.sh | 9 ++ .../qtci-macos-15-arm/36-emsdk.sh | 8 ++ .../qtci-macos-15-arm/36-install_grpc.sh | 10 +++ .../qtci-macos-15-arm/40-qnx700.sh | 25 ++++++ .../qtci-macos-15-arm/80-screenresolution.sh | 6 ++ .../qtci-macos-15-arm/81-bluetooth.sh | 10 +++ .../qtci-macos-15-arm/90-docker.sh | 9 ++ .../qtci-macos-15-arm/90-install-ffmpeg.sh | 2 +- coin/provisioning/qtci-macos-15-arm/90-vlc.sh | 8 ++ .../qtci-macos-15-arm/97-set-locale.sh | 8 ++ .../qtci-macos-15-arm/98-mimersql.sh | 5 ++ .../qtci-macos-15-arm/99-mac-version.sh | 8 ++ .../01-disable-net-lso.sh | 3 + .../01-disable-notifications_and_warnings.sh | 3 + .../01-disable-updates.sh | 7 ++ .../01-enable_zsh_history_and_viminfo.sh | 5 ++ .../01-increase_limits.sh | 3 + .../01-install_telegraf.sh | 3 + .../01-mount-vcpkg-cache-drive.sh | 8 ++ .../01-sha1sum-compatibility.sh | 10 +++ .../qtci-macos-15-x86_64/03-bashprofile.sh | 9 ++ .../qtci-macos-15-x86_64/05-systemsetup.sh | 84 +++++++++++++++++++ .../qtci-macos-15-x86_64/06-crashreporter.sh | 12 +++ .../06-disable_spotlight.sh | 7 ++ .../06-disable_update_downloads.sh | 6 ++ .../qtci-macos-15-x86_64/07-SSL_keychain.sh | 11 +++ .../qtci-macos-15-x86_64/15-xz.sh | 21 +++++ .../qtci-macos-15-x86_64/20-java.sh | 7 ++ .../qtci-macos-15-x86_64/20-xcode.sh | 22 +++++ .../21-install-commandlinetools.sh | 14 ++++ .../qtci-macos-15-x86_64/24-sccache.sh | 3 + .../qtci-macos-15-x86_64/25-cmake.sh | 8 ++ .../qtci-macos-15-x86_64/25-homebrew.sh | 12 +++ .../qtci-macos-15-x86_64/25-mysql.sh | 27 ++++++ .../qtci-macos-15-x86_64/25-pip.sh | 8 ++ .../qtci-macos-15-x86_64/25-postgresql.sh | 7 ++ .../qtci-macos-15-x86_64/25-python2.sh | 7 ++ .../qtci-macos-15-x86_64/25-python3.sh | 7 ++ .../qtci-macos-15-x86_64/26-freetype.sh | 7 ++ .../qtci-macos-15-x86_64/26-jq.sh | 5 ++ .../qtci-macos-15-x86_64/26-ninja.sh | 10 +++ .../qtci-macos-15-x86_64/26-odbc.sh | 9 ++ .../qtci-macos-15-x86_64/26-p7zip.sh | 9 ++ .../qtci-macos-15-x86_64/26-pcre2.sh | 7 ++ .../qtci-macos-15-x86_64/27-libclang.sh | 9 ++ .../28-libclang-v100-dyn.sh | 8 ++ .../qtci-macos-15-x86_64/28-patchelf.sh | 7 ++ .../29-install-pkgconfig.sh | 6 ++ .../qtci-macos-15-x86_64/29-libusb.sh | 9 ++ .../qtci-macos-15-x86_64/30-android.sh | 8 ++ .../qtci-macos-15-x86_64/30-fbx.sh | 9 ++ .../qtci-macos-15-x86_64/30-install-conan.sh | 8 ++ .../qtci-macos-15-x86_64/30-nodejs.sh | 7 ++ .../35-install-breakpad.sh | 8 ++ .../35-install_protobuf.sh | 9 ++ .../qtci-macos-15-x86_64/35-openssl.sh | 9 ++ .../qtci-macos-15-x86_64/36-emsdk.sh | 8 ++ .../50-openssl_for_android_darwin.sh | 7 ++ .../80-screenresolution.sh | 6 ++ .../qtci-macos-15-x86_64/81-bluetooth.sh | 10 +++ .../qtci-macos-15-x86_64/90-install-ffmpeg.sh | 2 +- .../qtci-macos-15-x86_64/90-squish.sh | 8 ++ .../qtci-macos-15-x86_64/90-vlc.sh | 8 ++ .../qtci-macos-15-x86_64/97-set-locale.sh | 8 ++ .../qtci-macos-15-x86_64/98-mimersql.sh | 5 ++ .../qtci-macos-15-x86_64/99-mac-version.sh | 8 ++ 107 files changed, 1191 insertions(+), 2 deletions(-) create mode 100755 coin/provisioning/qtci-macos-15-arm/01-disable-app-reopen.sh create mode 100755 coin/provisioning/qtci-macos-15-arm/01-disable-net-lso.sh create mode 100755 coin/provisioning/qtci-macos-15-arm/01-disable-notifications_and_warnings.sh create mode 100755 coin/provisioning/qtci-macos-15-arm/01-disable-updates.sh create mode 100755 coin/provisioning/qtci-macos-15-arm/01-increase_limits.sh create mode 100755 coin/provisioning/qtci-macos-15-arm/01-mount-vcpkg-cache-drive.sh create mode 100755 coin/provisioning/qtci-macos-15-arm/01-set_tcc_permissions.sh create mode 100755 coin/provisioning/qtci-macos-15-arm/01-sha1sum-compatibility.sh create mode 100755 coin/provisioning/qtci-macos-15-arm/03-bashprofile.sh create mode 100755 coin/provisioning/qtci-macos-15-arm/05-systemsetup.sh create mode 100755 coin/provisioning/qtci-macos-15-arm/06-crashreporter.sh create mode 100755 coin/provisioning/qtci-macos-15-arm/06-disable_spotlight.sh create mode 100755 coin/provisioning/qtci-macos-15-arm/06-disable_update_downloads.sh create mode 100755 coin/provisioning/qtci-macos-15-arm/07-SSL_keychain.sh create mode 100755 coin/provisioning/qtci-macos-15-arm/15-xz.sh create mode 100755 coin/provisioning/qtci-macos-15-arm/20-java.sh create mode 100755 coin/provisioning/qtci-macos-15-arm/20-xcode.sh create mode 100755 coin/provisioning/qtci-macos-15-arm/21-install-commandlinetools.sh create mode 100755 coin/provisioning/qtci-macos-15-arm/23-homebrew.sh create mode 100755 coin/provisioning/qtci-macos-15-arm/24-pyenv.sh create mode 100755 coin/provisioning/qtci-macos-15-arm/24-sccache.sh create mode 100755 coin/provisioning/qtci-macos-15-arm/25-cmake.sh create mode 100755 coin/provisioning/qtci-macos-15-arm/25-mysql.sh create mode 100755 coin/provisioning/qtci-macos-15-arm/25-pip.sh create mode 100755 coin/provisioning/qtci-macos-15-arm/25-postgresql.sh create mode 100755 coin/provisioning/qtci-macos-15-arm/25-python.sh create mode 100755 coin/provisioning/qtci-macos-15-arm/26-freetype.sh create mode 100755 coin/provisioning/qtci-macos-15-arm/26-jq.sh create mode 100755 coin/provisioning/qtci-macos-15-arm/26-ninja.sh create mode 100755 coin/provisioning/qtci-macos-15-arm/26-odbc.sh create mode 100755 coin/provisioning/qtci-macos-15-arm/26-p7zip.sh create mode 100755 coin/provisioning/qtci-macos-15-arm/26-pcre2.sh create mode 100755 coin/provisioning/qtci-macos-15-arm/27-libclang.sh create mode 100755 coin/provisioning/qtci-macos-15-arm/28-libclang-v100-dyn.sh create mode 100755 coin/provisioning/qtci-macos-15-arm/29-install-pkgconfig.sh create mode 100755 coin/provisioning/qtci-macos-15-arm/30-android.sh create mode 100755 coin/provisioning/qtci-macos-15-arm/30-fbx.sh create mode 100755 coin/provisioning/qtci-macos-15-arm/30-install-conan.sh create mode 100755 coin/provisioning/qtci-macos-15-arm/30-nodejs.sh create mode 100755 coin/provisioning/qtci-macos-15-arm/35-install-breakpad.sh create mode 100755 coin/provisioning/qtci-macos-15-arm/35-install_protobuf.sh create mode 100755 coin/provisioning/qtci-macos-15-arm/35-openssl.sh create mode 100755 coin/provisioning/qtci-macos-15-arm/36-emsdk.sh create mode 100755 coin/provisioning/qtci-macos-15-arm/36-install_grpc.sh create mode 100755 coin/provisioning/qtci-macos-15-arm/40-qnx700.sh create mode 100755 coin/provisioning/qtci-macos-15-arm/80-screenresolution.sh create mode 100755 coin/provisioning/qtci-macos-15-arm/81-bluetooth.sh create mode 100755 coin/provisioning/qtci-macos-15-arm/90-docker.sh create mode 100644 coin/provisioning/qtci-macos-15-arm/90-vlc.sh create mode 100755 coin/provisioning/qtci-macos-15-arm/97-set-locale.sh create mode 100755 coin/provisioning/qtci-macos-15-arm/98-mimersql.sh create mode 100755 coin/provisioning/qtci-macos-15-arm/99-mac-version.sh create mode 100755 coin/provisioning/qtci-macos-15-x86_64/01-disable-net-lso.sh create mode 100755 coin/provisioning/qtci-macos-15-x86_64/01-disable-notifications_and_warnings.sh create mode 100755 coin/provisioning/qtci-macos-15-x86_64/01-disable-updates.sh create mode 100755 coin/provisioning/qtci-macos-15-x86_64/01-enable_zsh_history_and_viminfo.sh create mode 100755 coin/provisioning/qtci-macos-15-x86_64/01-increase_limits.sh create mode 100755 coin/provisioning/qtci-macos-15-x86_64/01-install_telegraf.sh create mode 100755 coin/provisioning/qtci-macos-15-x86_64/01-mount-vcpkg-cache-drive.sh create mode 100755 coin/provisioning/qtci-macos-15-x86_64/01-sha1sum-compatibility.sh create mode 100755 coin/provisioning/qtci-macos-15-x86_64/03-bashprofile.sh create mode 100755 coin/provisioning/qtci-macos-15-x86_64/05-systemsetup.sh create mode 100755 coin/provisioning/qtci-macos-15-x86_64/06-crashreporter.sh create mode 100755 coin/provisioning/qtci-macos-15-x86_64/06-disable_spotlight.sh create mode 100755 coin/provisioning/qtci-macos-15-x86_64/06-disable_update_downloads.sh create mode 100755 coin/provisioning/qtci-macos-15-x86_64/07-SSL_keychain.sh create mode 100755 coin/provisioning/qtci-macos-15-x86_64/15-xz.sh create mode 100755 coin/provisioning/qtci-macos-15-x86_64/20-java.sh create mode 100755 coin/provisioning/qtci-macos-15-x86_64/20-xcode.sh create mode 100755 coin/provisioning/qtci-macos-15-x86_64/21-install-commandlinetools.sh create mode 100755 coin/provisioning/qtci-macos-15-x86_64/24-sccache.sh create mode 100755 coin/provisioning/qtci-macos-15-x86_64/25-cmake.sh create mode 100755 coin/provisioning/qtci-macos-15-x86_64/25-homebrew.sh create mode 100755 coin/provisioning/qtci-macos-15-x86_64/25-mysql.sh create mode 100755 coin/provisioning/qtci-macos-15-x86_64/25-pip.sh create mode 100755 coin/provisioning/qtci-macos-15-x86_64/25-postgresql.sh create mode 100755 coin/provisioning/qtci-macos-15-x86_64/25-python2.sh create mode 100755 coin/provisioning/qtci-macos-15-x86_64/25-python3.sh create mode 100755 coin/provisioning/qtci-macos-15-x86_64/26-freetype.sh create mode 100755 coin/provisioning/qtci-macos-15-x86_64/26-jq.sh create mode 100755 coin/provisioning/qtci-macos-15-x86_64/26-ninja.sh create mode 100755 coin/provisioning/qtci-macos-15-x86_64/26-odbc.sh create mode 100755 coin/provisioning/qtci-macos-15-x86_64/26-p7zip.sh create mode 100755 coin/provisioning/qtci-macos-15-x86_64/26-pcre2.sh create mode 100755 coin/provisioning/qtci-macos-15-x86_64/27-libclang.sh create mode 100755 coin/provisioning/qtci-macos-15-x86_64/28-libclang-v100-dyn.sh create mode 100755 coin/provisioning/qtci-macos-15-x86_64/28-patchelf.sh create mode 100755 coin/provisioning/qtci-macos-15-x86_64/29-install-pkgconfig.sh create mode 100755 coin/provisioning/qtci-macos-15-x86_64/29-libusb.sh create mode 100755 coin/provisioning/qtci-macos-15-x86_64/30-android.sh create mode 100755 coin/provisioning/qtci-macos-15-x86_64/30-fbx.sh create mode 100755 coin/provisioning/qtci-macos-15-x86_64/30-install-conan.sh create mode 100755 coin/provisioning/qtci-macos-15-x86_64/30-nodejs.sh create mode 100755 coin/provisioning/qtci-macos-15-x86_64/35-install-breakpad.sh create mode 100755 coin/provisioning/qtci-macos-15-x86_64/35-install_protobuf.sh create mode 100755 coin/provisioning/qtci-macos-15-x86_64/35-openssl.sh create mode 100755 coin/provisioning/qtci-macos-15-x86_64/36-emsdk.sh create mode 100755 coin/provisioning/qtci-macos-15-x86_64/50-openssl_for_android_darwin.sh create mode 100755 coin/provisioning/qtci-macos-15-x86_64/80-screenresolution.sh create mode 100755 coin/provisioning/qtci-macos-15-x86_64/81-bluetooth.sh create mode 100755 coin/provisioning/qtci-macos-15-x86_64/90-squish.sh create mode 100755 coin/provisioning/qtci-macos-15-x86_64/90-vlc.sh create mode 100755 coin/provisioning/qtci-macos-15-x86_64/97-set-locale.sh create mode 100755 coin/provisioning/qtci-macos-15-x86_64/98-mimersql.sh create mode 100755 coin/provisioning/qtci-macos-15-x86_64/99-mac-version.sh diff --git a/coin/provisioning/qtci-macos-15-arm/01-disable-app-reopen.sh b/coin/provisioning/qtci-macos-15-arm/01-disable-app-reopen.sh new file mode 100755 index 00000000000..382fb40ca40 --- /dev/null +++ b/coin/provisioning/qtci-macos-15-arm/01-disable-app-reopen.sh @@ -0,0 +1,6 @@ +#!/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 +BASEDIR=$(dirname "$0") +"$BASEDIR"/../common/macos/disable-app-reopen.sh diff --git a/coin/provisioning/qtci-macos-15-arm/01-disable-net-lso.sh b/coin/provisioning/qtci-macos-15-arm/01-disable-net-lso.sh new file mode 100755 index 00000000000..659ebe96f91 --- /dev/null +++ b/coin/provisioning/qtci-macos-15-arm/01-disable-net-lso.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/macos/disable_net_lso.sh diff --git a/coin/provisioning/qtci-macos-15-arm/01-disable-notifications_and_warnings.sh b/coin/provisioning/qtci-macos-15-arm/01-disable-notifications_and_warnings.sh new file mode 100755 index 00000000000..27efbb6280e --- /dev/null +++ b/coin/provisioning/qtci-macos-15-arm/01-disable-notifications_and_warnings.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/macos/disable-notifications_and_warnings.sh diff --git a/coin/provisioning/qtci-macos-15-arm/01-disable-updates.sh b/coin/provisioning/qtci-macos-15-arm/01-disable-updates.sh new file mode 100755 index 00000000000..a2b2a0f0997 --- /dev/null +++ b/coin/provisioning/qtci-macos-15-arm/01-disable-updates.sh @@ -0,0 +1,7 @@ +#!/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 + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/macos/system_updates.sh" diff --git a/coin/provisioning/qtci-macos-15-arm/01-increase_limits.sh b/coin/provisioning/qtci-macos-15-arm/01-increase_limits.sh new file mode 100755 index 00000000000..08669e524a9 --- /dev/null +++ b/coin/provisioning/qtci-macos-15-arm/01-increase_limits.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/macos/increase_limits.sh diff --git a/coin/provisioning/qtci-macos-15-arm/01-mount-vcpkg-cache-drive.sh b/coin/provisioning/qtci-macos-15-arm/01-mount-vcpkg-cache-drive.sh new file mode 100755 index 00000000000..2739f40fbac --- /dev/null +++ b/coin/provisioning/qtci-macos-15-arm/01-mount-vcpkg-cache-drive.sh @@ -0,0 +1,8 @@ +#!/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 + +# shellcheck source=../common/macos/mount-vcpkg-cache-drive.sh +source "${BASH_SOURCE%/*}/../common/macos/mount-vcpkg-cache-drive.sh" diff --git a/coin/provisioning/qtci-macos-15-arm/01-set_tcc_permissions.sh b/coin/provisioning/qtci-macos-15-arm/01-set_tcc_permissions.sh new file mode 100755 index 00000000000..da38f582c40 --- /dev/null +++ b/coin/provisioning/qtci-macos-15-arm/01-set_tcc_permissions.sh @@ -0,0 +1,6 @@ +#!/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/macos/set_tcc_permissions.sh" diff --git a/coin/provisioning/qtci-macos-15-arm/01-sha1sum-compatibility.sh b/coin/provisioning/qtci-macos-15-arm/01-sha1sum-compatibility.sh new file mode 100755 index 00000000000..e52367c8613 --- /dev/null +++ b/coin/provisioning/qtci-macos-15-arm/01-sha1sum-compatibility.sh @@ -0,0 +1,10 @@ +#!/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 + +#!/usr/bin/env bash + +set -ex + +# shellcheck source=../common/macos/sha1sum-compatibility.sh +source "${BASH_SOURCE%/*}/../common/macos/sha1sum-compatibility.sh" diff --git a/coin/provisioning/qtci-macos-15-arm/03-bashprofile.sh b/coin/provisioning/qtci-macos-15-arm/03-bashprofile.sh new file mode 100755 index 00000000000..4eed8433b6c --- /dev/null +++ b/coin/provisioning/qtci-macos-15-arm/03-bashprofile.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env 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 + +set -ex + +# Read .bashrc if exist +printf -- "# Get the aliases and functions\nif [ -f ~/.bashrc ]; then\n . ~/.bashrc\nfi\n" >> ~/.bash_profile + diff --git a/coin/provisioning/qtci-macos-15-arm/05-systemsetup.sh b/coin/provisioning/qtci-macos-15-arm/05-systemsetup.sh new file mode 100755 index 00000000000..1d8b7f097ff --- /dev/null +++ b/coin/provisioning/qtci-macos-15-arm/05-systemsetup.sh @@ -0,0 +1,80 @@ +#!/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 + +set -ex + +# This script modified system settings for automated use + +targetFile="$HOME/vncpw.txt" + +# Fetch password +curl --retry 5 --retry-delay 10 --retry-max-time 60 "http://ci-files01-hki.ci.qt.io/input/semisecure/vncpw.txt" -o "$targetFile" +shasum "$targetFile" |grep "a795fccaa8f277e62ec08e6056c544b8b63924a0" + +{ VNCPassword=$(cat "$targetFile"); } 2> /dev/null +NTS_IP=10.212.2.216 + +echo "Disable Screensaver" +# For current session +defaults -currentHost write com.apple.screensaver idleTime 0 + +echo "Disable sleep" +sudo pmset sleep 0 displaysleep 0 + +# For session after a reboot +mkdir -p "$HOME/Library/LaunchAgents" +sudo tee -a "$HOME/Library/LaunchAgents/no-screensaver.plist" < + + + + + Label + org.qt.io.screensaver_disable + ProgramArguments + + defaults + -currentHost + write + com.apple.screensaver + idleTime + 0 + + RunAtLoad + + KeepAlive + + + +EOT + +defaults write com.apple.screensaver askForPassword -int 0 + +echo "Set keyboard type rates and delays" +# normal minimum is 15 (225 ms) +defaults write -g InitialKeyRepeat -int 15 +# normal minimum is 2 (30 ms) +defaults write -g KeyRepeat -int 2 + +set +x +echo "Enable remote desktop sharing" +sudo /System/Library/CoreServices/RemoteManagement/ARDAgent.app/Contents/Resources/kickstart -activate -configure -access -on -clientopts -setvnclegacy -vnclegacy yes -clientopts -setvncpw -vncpw "$VNCPassword" -restart -agent -privs -all +set -x + +echo "Set Network Test Server address to $NTS_IP in /etc/hosts" +echo "$NTS_IP qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts + +sudo systemsetup settimezone GMT +sudo systemsetup setusingnetworktime on +sudo rm -f "$targetFile" + +# Enable automount for nfs shares +sudo sed -i'.orig' -e 's:^#/net:/net:' -e 's:hidefromfinder,nosuid:hidefromfinder,nosuid,locallocks,nocallback:' /etc/auto_master || sudo curl -o /etc/auto_master http://ci-files01-hki.ci.qt.io/input/mac/arm/auto_master +sudo automount -cv + +# Disable multicast advertisements +sudo defaults write /Library/Preferences/com.apple.mDNSResponder.plist NoMulticastAdvertisements -bool true + +# Enable Use keyboard navigation to move focus between controls +defaults write -g AppleKeyboardUIMode -int 2 diff --git a/coin/provisioning/qtci-macos-15-arm/06-crashreporter.sh b/coin/provisioning/qtci-macos-15-arm/06-crashreporter.sh new file mode 100755 index 00000000000..b66bbc38afa --- /dev/null +++ b/coin/provisioning/qtci-macos-15-arm/06-crashreporter.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env 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 + +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-arm/06-disable_spotlight.sh b/coin/provisioning/qtci-macos-15-arm/06-disable_spotlight.sh new file mode 100755 index 00000000000..ab85a26250e --- /dev/null +++ b/coin/provisioning/qtci-macos-15-arm/06-disable_spotlight.sh @@ -0,0 +1,7 @@ +#!/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 + +# shellcheck source=../common/macos/disable_spotlight.sh +source "${BASH_SOURCE%/*}/../common/macos/disable_spotlight.sh" diff --git a/coin/provisioning/qtci-macos-15-arm/06-disable_update_downloads.sh b/coin/provisioning/qtci-macos-15-arm/06-disable_update_downloads.sh new file mode 100755 index 00000000000..18cb98eaf0a --- /dev/null +++ b/coin/provisioning/qtci-macos-15-arm/06-disable_update_downloads.sh @@ -0,0 +1,6 @@ +#!/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 +BASEDIR=$(dirname "$0") +"$BASEDIR"/../common/macos/disable_update_downloads.sh diff --git a/coin/provisioning/qtci-macos-15-arm/07-SSL_keychain.sh b/coin/provisioning/qtci-macos-15-arm/07-SSL_keychain.sh new file mode 100755 index 00000000000..e14dcee9571 --- /dev/null +++ b/coin/provisioning/qtci-macos-15-arm/07-SSL_keychain.sh @@ -0,0 +1,11 @@ +#!/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 + +# shellcheck source=../common/unix/SetEnvVar.sh +source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" + +# Enables the usage of temporary keychains for SSL autotests +SetEnvVar "QT_SSL_USE_TEMPORARY_KEYCHAIN" "1" diff --git a/coin/provisioning/qtci-macos-15-arm/15-xz.sh b/coin/provisioning/qtci-macos-15-arm/15-xz.sh new file mode 100755 index 00000000000..b7e00a204a6 --- /dev/null +++ b/coin/provisioning/qtci-macos-15-arm/15-xz.sh @@ -0,0 +1,32 @@ +#!/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 + +# This script installs XZ-Utils + +# XZ-Utils are needed for uncompressing xz-compressed files + +# pkg was self builded. +# wget https://downloads.sourceforge.net/project/lzmautils/xz-5.2.5.tar.gz +# tar -xzf xz-5.2.5.tar.gz -C /tmp +# cd /tmp/xz-5.2.5 +# ./configure +# make +# ./configure prefix=/tmp/destination_root +# make install +# cd /tmp +# pkgbuild --root destination_root --identifier io.qt.xz.pkg xz-arm64.pkg + +set -ex + +# shellcheck source=../common/macos/InstallPKGFromURL.sh +source "${BASH_SOURCE%/*}/../common/macos/InstallPKGFromURL.sh" +PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/mac/macos_11.0_big_sur_arm/xz-arm64.pkg" +# SourceUrl="https://tukaani.org/xz/xz-5.2.5.tar.gz" + +SHA1="1afc327965d4af33399ae28f22c4b8e5a9e98dc2" +DestDir="/" + +InstallPKGFromURL "$PrimaryUrl" "$PrimaryUrl" "$SHA1" "$DestDir" + +echo "XZ = 5.2.5" >> ~/versions.txt diff --git a/coin/provisioning/qtci-macos-15-arm/20-java.sh b/coin/provisioning/qtci-macos-15-arm/20-java.sh new file mode 100755 index 00000000000..00c867f42b9 --- /dev/null +++ b/coin/provisioning/qtci-macos-15-arm/20-java.sh @@ -0,0 +1,7 @@ +#!/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 + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/macos/java_arm.sh" diff --git a/coin/provisioning/qtci-macos-15-arm/20-xcode.sh b/coin/provisioning/qtci-macos-15-arm/20-xcode.sh new file mode 100755 index 00000000000..ed8b4e9a426 --- /dev/null +++ b/coin/provisioning/qtci-macos-15-arm/20-xcode.sh @@ -0,0 +1,22 @@ +#!/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 installs Xcode +# Prerequisites: Have Xcode prefetched to local cache as xz compressed. +# This can be achieved by fetching Xcode_9.xip from Apple Store. +# Uncompress it with 'xar -xf Xcode_9.xip' +# Then get https://gist.githubusercontent.com/pudquick/ff412bcb29c9c1fa4b8d/raw/24b25538ea8df8d0634a2a6189aa581ccc6a5b4b/parse_pbzx2.py +# with which you can run 'python parse_pbzx2.py Content'. +# This will give you five files called "Content.part<00..05>.cpio.xz". +# Extract those that have the extension .xz with xz. +# "cat" together all the content files "cat file1, file2, file3, file4, file5 >file_new" +# Compress the new file with xz back to something like Xcode_9.xz +# Upload the file to temporary storage for this script to use. + +set -ex + +# shellcheck source=../common/macos/install_xcode.sh +source "${BASH_SOURCE%/*}/../common/macos/install_xcode.sh" + +InstallXCode /net/ci-files01-hki.ci.qt.io/hdd/www/input/mac/Xcode_16.xip 16 diff --git a/coin/provisioning/qtci-macos-15-arm/21-install-commandlinetools.sh b/coin/provisioning/qtci-macos-15-arm/21-install-commandlinetools.sh new file mode 100755 index 00000000000..3f7148c99b9 --- /dev/null +++ b/coin/provisioning/qtci-macos-15-arm/21-install-commandlinetools.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-commandlinetools.sh +source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh" +version="16" +packageName="Command_Line_Tools_for_Xcode_$version.dmg" +url="http://ci-files01-hki.ci.qt.io/input/mac/$packageName" +sha1="c6f1a7521d5da50c2bba3d83c0f3ee7df6d87d28" + +InstallCommandLineTools $url $url $sha1 $packageName $version diff --git a/coin/provisioning/qtci-macos-15-arm/23-homebrew.sh b/coin/provisioning/qtci-macos-15-arm/23-homebrew.sh new file mode 100755 index 00000000000..0c4ee4fc6a5 --- /dev/null +++ b/coin/provisioning/qtci-macos-15-arm/23-homebrew.sh @@ -0,0 +1,12 @@ +#!/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 + +INSTALLTYPE="PKG" + +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/24-pyenv.sh b/coin/provisioning/qtci-macos-15-arm/24-pyenv.sh new file mode 100755 index 00000000000..3a7a8f77de3 --- /dev/null +++ b/coin/provisioning/qtci-macos-15-arm/24-pyenv.sh @@ -0,0 +1,49 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2021 The Qt Company Ltd. +## Copyright (C) 2017 Pelagicore AG +## Contact: https://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see https://www.qt.io/terms-conditions. For further +## information use the contact form at https://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 3 as published by the Free Software +## Foundation and appearing in the file LICENSE.LGPL3 included in the +## packaging of this file. Please review the following information to +## ensure the GNU Lesser General Public License version 3 requirements +## will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +## +## GNU General Public License Usage +## Alternatively, this file may be used under the terms of the GNU +## General Public License version 2.0 or (at your option) the GNU General +## Public license version 3 or any later version approved by the KDE Free +## Qt Foundation. The licenses are as published by the Free Software +## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +## included in the packaging of this file. Please review the following +## information to ensure the GNU General Public License requirements will +## be met: https://www.gnu.org/licenses/gpl-2.0.html and +## https://www.gnu.org/licenses/gpl-3.0.html. +## +## $QT_END_LICENSE$ +## +############################################################################# + +# This script installs python3 + +# shellcheck source=../common/unix/SetEnvVar.sh +source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" + +# Try with default +/opt/homebrew/bin/brew install pyenv diff --git a/coin/provisioning/qtci-macos-15-arm/24-sccache.sh b/coin/provisioning/qtci-macos-15-arm/24-sccache.sh new file mode 100755 index 00000000000..358b23fbf45 --- /dev/null +++ b/coin/provisioning/qtci-macos-15-arm/24-sccache.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +source "${BASH_SOURCE%/*}/../common/macos/sccache.sh" diff --git a/coin/provisioning/qtci-macos-15-arm/25-cmake.sh b/coin/provisioning/qtci-macos-15-arm/25-cmake.sh new file mode 100755 index 00000000000..3309588000c --- /dev/null +++ b/coin/provisioning/qtci-macos-15-arm/25-cmake.sh @@ -0,0 +1,8 @@ +#!/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 + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/macos/cmake.sh" diff --git a/coin/provisioning/qtci-macos-15-arm/25-mysql.sh b/coin/provisioning/qtci-macos-15-arm/25-mysql.sh new file mode 100755 index 00000000000..0be1e6e8324 --- /dev/null +++ b/coin/provisioning/qtci-macos-15-arm/25-mysql.sh @@ -0,0 +1,27 @@ +#!/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 installs MySQL + +# MySQL is needed for Qt to be able to support MySQL + +set -ex + +# shellcheck source=../common/macos/InstallAppFromCompressedFileFromURL.sh +source "${BASH_SOURCE%/*}/../common/macos/InstallAppFromCompressedFileFromURL.sh" +# shellcheck source=../common/unix/SetEnvVar.sh +source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" + +PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/mac/macos_10.12_sierra/mysql-5.7.15-osx10.11-x86_64.tar.gz" +AltUrl="https://dev.mysql.com/get/Downloads/MySQL-5.7/mysql-5.7.15-osx10.11-x86_64.tar.gz" +SHA1="07949bd42f350b0504a1536b8830b809b4a34fca" +appPrefix="" +targetDir="/opt/mysql57/" + +sudo mkdir -p "/opt" + +InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix" "$targetDir" + +SetEnvVar "MYSQLBINPATH" "/opt/mysql57/bin" +echo "MySQL = 5.7.15" >> ~/versions.txt diff --git a/coin/provisioning/qtci-macos-15-arm/25-pip.sh b/coin/provisioning/qtci-macos-15-arm/25-pip.sh new file mode 100755 index 00000000000..3fc865d0e52 --- /dev/null +++ b/coin/provisioning/qtci-macos-15-arm/25-pip.sh @@ -0,0 +1,8 @@ +#!/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 + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/macos/pip.sh" diff --git a/coin/provisioning/qtci-macos-15-arm/25-postgresql.sh b/coin/provisioning/qtci-macos-15-arm/25-postgresql.sh new file mode 100755 index 00000000000..06cae6ef601 --- /dev/null +++ b/coin/provisioning/qtci-macos-15-arm/25-postgresql.sh @@ -0,0 +1,7 @@ +#!/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 + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/macos/postgresql.sh" diff --git a/coin/provisioning/qtci-macos-15-arm/25-python.sh b/coin/provisioning/qtci-macos-15-arm/25-python.sh new file mode 100755 index 00000000000..36bbc0e14ab --- /dev/null +++ b/coin/provisioning/qtci-macos-15-arm/25-python.sh @@ -0,0 +1,21 @@ +#!/usr/bin/env bash +# Copyright (C) 2021 The Qt Company Ltd. +# Copyright (C) 2017 Pelagicore AG +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only + +# This script installs python3 + +# shellcheck source=../common/unix/SetEnvVar.sh +source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" + +pyenv install 3.9.7 + +/Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user virtualenv wheel html5lib +/Users/qt/.pyenv/versions/3.9.7/bin/pip3 install --user -r ${BASH_SOURCE%/*}/../common/shared/sbom_requirements.txt + +SetEnvVar "PYTHON3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/" +SetEnvVar "PIP3_PATH" "/Users/qt/.pyenv/versions/3.9.7/bin/" +# Use 3.9 as a default python +SetEnvVar "PATH" "\$PYTHON3_PATH:\$PATH" + +echo "python3 = 3.9.7" >> ~/versions.txt diff --git a/coin/provisioning/qtci-macos-15-arm/26-freetype.sh b/coin/provisioning/qtci-macos-15-arm/26-freetype.sh new file mode 100755 index 00000000000..fa0790f840c --- /dev/null +++ b/coin/provisioning/qtci-macos-15-arm/26-freetype.sh @@ -0,0 +1,7 @@ +#!/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 + +brew install freetype diff --git a/coin/provisioning/qtci-macos-15-arm/26-jq.sh b/coin/provisioning/qtci-macos-15-arm/26-jq.sh new file mode 100755 index 00000000000..4dffcb969ac --- /dev/null +++ b/coin/provisioning/qtci-macos-15-arm/26-jq.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +set -ex + +brew install jq diff --git a/coin/provisioning/qtci-macos-15-arm/26-ninja.sh b/coin/provisioning/qtci-macos-15-arm/26-ninja.sh new file mode 100755 index 00000000000..4443eeb486f --- /dev/null +++ b/coin/provisioning/qtci-macos-15-arm/26-ninja.sh @@ -0,0 +1,10 @@ +#!/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 + +# shellcheck source=../common/macos/ninja.sh +source "${BASH_SOURCE%/*}/../common/macos/ninja.sh" + + diff --git a/coin/provisioning/qtci-macos-15-arm/26-odbc.sh b/coin/provisioning/qtci-macos-15-arm/26-odbc.sh new file mode 100755 index 00000000000..2b6b013a5ee --- /dev/null +++ b/coin/provisioning/qtci-macos-15-arm/26-odbc.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 +# Install libiodbc + +set -ex + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/macos/libiodbc.sh" --with-universal diff --git a/coin/provisioning/qtci-macos-15-arm/26-p7zip.sh b/coin/provisioning/qtci-macos-15-arm/26-p7zip.sh new file mode 100755 index 00000000000..8cdcd0c367d --- /dev/null +++ b/coin/provisioning/qtci-macos-15-arm/26-p7zip.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 +# Install 7z to be used from command line + +set -ex + +brew update +brew install p7zip diff --git a/coin/provisioning/qtci-macos-15-arm/26-pcre2.sh b/coin/provisioning/qtci-macos-15-arm/26-pcre2.sh new file mode 100755 index 00000000000..c10d6206b6d --- /dev/null +++ b/coin/provisioning/qtci-macos-15-arm/26-pcre2.sh @@ -0,0 +1,7 @@ +#!/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 + +brew install pcre2 diff --git a/coin/provisioning/qtci-macos-15-arm/27-libclang.sh b/coin/provisioning/qtci-macos-15-arm/27-libclang.sh new file mode 100755 index 00000000000..cc025e6e441 --- /dev/null +++ b/coin/provisioning/qtci-macos-15-arm/27-libclang.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 + +BASEDIR=$(dirname "$0") +# There is only one mac package and common script uses it as a default +"$BASEDIR/../common/unix/libclang.sh" diff --git a/coin/provisioning/qtci-macos-15-arm/28-libclang-v100-dyn.sh b/coin/provisioning/qtci-macos-15-arm/28-libclang-v100-dyn.sh new file mode 100755 index 00000000000..d95e7e00cd0 --- /dev/null +++ b/coin/provisioning/qtci-macos-15-arm/28-libclang-v100-dyn.sh @@ -0,0 +1,8 @@ +#!/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 + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/unix/libclang-v100-dyn.sh" diff --git a/coin/provisioning/qtci-macos-15-arm/29-install-pkgconfig.sh b/coin/provisioning/qtci-macos-15-arm/29-install-pkgconfig.sh new file mode 100755 index 00000000000..33e115801d5 --- /dev/null +++ b/coin/provisioning/qtci-macos-15-arm/29-install-pkgconfig.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +set -ex + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/macos/pkgconfig.sh" diff --git a/coin/provisioning/qtci-macos-15-arm/30-android.sh b/coin/provisioning/qtci-macos-15-arm/30-android.sh new file mode 100755 index 00000000000..acd2d4b9e88 --- /dev/null +++ b/coin/provisioning/qtci-macos-15-arm/30-android.sh @@ -0,0 +1,64 @@ +#!/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 + +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 diff --git a/coin/provisioning/qtci-macos-15-arm/30-fbx.sh b/coin/provisioning/qtci-macos-15-arm/30-fbx.sh new file mode 100755 index 00000000000..e991bc083a5 --- /dev/null +++ b/coin/provisioning/qtci-macos-15-arm/30-fbx.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 + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/macos/fbx_macos.sh" + diff --git a/coin/provisioning/qtci-macos-15-arm/30-install-conan.sh b/coin/provisioning/qtci-macos-15-arm/30-install-conan.sh new file mode 100755 index 00000000000..67a4f9116ec --- /dev/null +++ b/coin/provisioning/qtci-macos-15-arm/30-install-conan.sh @@ -0,0 +1,8 @@ +#!/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 + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/unix/install-conan.sh" diff --git a/coin/provisioning/qtci-macos-15-arm/30-nodejs.sh b/coin/provisioning/qtci-macos-15-arm/30-nodejs.sh new file mode 100755 index 00000000000..8f73b2d69a0 --- /dev/null +++ b/coin/provisioning/qtci-macos-15-arm/30-nodejs.sh @@ -0,0 +1,8 @@ +#!/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 + +brew install nodejs + diff --git a/coin/provisioning/qtci-macos-15-arm/35-install-breakpad.sh b/coin/provisioning/qtci-macos-15-arm/35-install-breakpad.sh new file mode 100755 index 00000000000..8a9dde56be4 --- /dev/null +++ b/coin/provisioning/qtci-macos-15-arm/35-install-breakpad.sh @@ -0,0 +1,8 @@ +#!/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 + +# shellcheck source=../common/unix/install-breakpad.sh +source "${BASH_SOURCE%/*}/../common/unix/install-breakpad.sh" diff --git a/coin/provisioning/qtci-macos-15-arm/35-install_protobuf.sh b/coin/provisioning/qtci-macos-15-arm/35-install_protobuf.sh new file mode 100755 index 00000000000..ecb5f835377 --- /dev/null +++ b/coin/provisioning/qtci-macos-15-arm/35-install_protobuf.sh @@ -0,0 +1,9 @@ +#!/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 + +set -ex + +# shellcheck source=../common/unix/install_protobuf.sh +source "${BASH_SOURCE%/*}/../common/unix/install_protobuf.sh" + diff --git a/coin/provisioning/qtci-macos-15-arm/35-openssl.sh b/coin/provisioning/qtci-macos-15-arm/35-openssl.sh new file mode 100755 index 00000000000..c86788db992 --- /dev/null +++ b/coin/provisioning/qtci-macos-15-arm/35-openssl.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 + +# shellcheck source=../common/unix/install-openssl.sh +source "${BASH_SOURCE%/*}/../common/unix/install-openssl.sh" "macos-universal" + diff --git a/coin/provisioning/qtci-macos-15-arm/36-emsdk.sh b/coin/provisioning/qtci-macos-15-arm/36-emsdk.sh new file mode 100755 index 00000000000..c8aec444d4c --- /dev/null +++ b/coin/provisioning/qtci-macos-15-arm/36-emsdk.sh @@ -0,0 +1,8 @@ +#!/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 + +# shellcheck source=../common/unix/emsdk.sh +source "${BASH_SOURCE%/*}/../common/unix/emsdk.sh" diff --git a/coin/provisioning/qtci-macos-15-arm/36-install_grpc.sh b/coin/provisioning/qtci-macos-15-arm/36-install_grpc.sh new file mode 100755 index 00000000000..d2860845100 --- /dev/null +++ b/coin/provisioning/qtci-macos-15-arm/36-install_grpc.sh @@ -0,0 +1,10 @@ +#!/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 + +set -ex + +# shellcheck source=../common/unix/install_grpc.sh +# Temporarily disabled due to OpenSSL linking errors +#source "${BASH_SOURCE%/*}/../common/unix/install_grpc.sh" + diff --git a/coin/provisioning/qtci-macos-15-arm/40-qnx700.sh b/coin/provisioning/qtci-macos-15-arm/40-qnx700.sh new file mode 100755 index 00000000000..48286a6799e --- /dev/null +++ b/coin/provisioning/qtci-macos-15-arm/40-qnx700.sh @@ -0,0 +1,25 @@ +#!/bin/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 installs QNX 7. + +targetFolder="/opt/" +sourceFile="/net/ci-files01-hki.ci.qt.io/hdd/www/input/qnx/qnx700-20190325-2-macos.tar.xz" +folderName="qnx700" + +sudo mkdir -p "$targetFolder" + +echo "Extracting QNX 7" +sudo tar -C "$targetFolder" -Jxf $sourceFile + +sudo chown -R qt:wheel "$targetFolder"/"$folderName" + +# Verify that we have last file in zip +if [ ! -f $targetFolder/$folderName/qnxsdp-env.sh ]; then + exit 1 +fi + +# Set env variables +echo "export QNX_700=$targetFolder/$folderName" >> ~/.bashrc +echo "QNX SDP = 7.0.0" >> ~/versions.txt diff --git a/coin/provisioning/qtci-macos-15-arm/80-screenresolution.sh b/coin/provisioning/qtci-macos-15-arm/80-screenresolution.sh new file mode 100755 index 00000000000..ed905a33d4b --- /dev/null +++ b/coin/provisioning/qtci-macos-15-arm/80-screenresolution.sh @@ -0,0 +1,6 @@ +#!/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 + +"$(dirname "$0")"/../common/macos/screenresolution.sh + diff --git a/coin/provisioning/qtci-macos-15-arm/81-bluetooth.sh b/coin/provisioning/qtci-macos-15-arm/81-bluetooth.sh new file mode 100755 index 00000000000..c58b9a34354 --- /dev/null +++ b/coin/provisioning/qtci-macos-15-arm/81-bluetooth.sh @@ -0,0 +1,10 @@ +#!/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 + +brew install blueutil + +#Disable Bluetooth +blueutil -p 0 diff --git a/coin/provisioning/qtci-macos-15-arm/90-docker.sh b/coin/provisioning/qtci-macos-15-arm/90-docker.sh new file mode 100755 index 00000000000..f03971a9f80 --- /dev/null +++ b/coin/provisioning/qtci-macos-15-arm/90-docker.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 + +# shellcheck source=../common/macos/docker.sh +source "${BASH_SOURCE%/*}/../common/macos/docker.sh" "arm64" + 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-arm/90-vlc.sh b/coin/provisioning/qtci-macos-15-arm/90-vlc.sh new file mode 100644 index 00000000000..4924fe5c42c --- /dev/null +++ b/coin/provisioning/qtci-macos-15-arm/90-vlc.sh @@ -0,0 +1,8 @@ +#!/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 + +# for QtMM streaming tests +brew install --cask vlc diff --git a/coin/provisioning/qtci-macos-15-arm/97-set-locale.sh b/coin/provisioning/qtci-macos-15-arm/97-set-locale.sh new file mode 100755 index 00000000000..bc966cbf8e6 --- /dev/null +++ b/coin/provisioning/qtci-macos-15-arm/97-set-locale.sh @@ -0,0 +1,8 @@ +#!/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 + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/macos/set-locale.sh" diff --git a/coin/provisioning/qtci-macos-15-arm/98-mimersql.sh b/coin/provisioning/qtci-macos-15-arm/98-mimersql.sh new file mode 100755 index 00000000000..70d5bc1d458 --- /dev/null +++ b/coin/provisioning/qtci-macos-15-arm/98-mimersql.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +set -ex + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/macos/mimersql.sh" "macos-universal" diff --git a/coin/provisioning/qtci-macos-15-arm/99-mac-version.sh b/coin/provisioning/qtci-macos-15-arm/99-mac-version.sh new file mode 100755 index 00000000000..b9b5aeb0c1c --- /dev/null +++ b/coin/provisioning/qtci-macos-15-arm/99-mac-version.sh @@ -0,0 +1,8 @@ +#!/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 + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/macos/macos-version.sh" diff --git a/coin/provisioning/qtci-macos-15-x86_64/01-disable-net-lso.sh b/coin/provisioning/qtci-macos-15-x86_64/01-disable-net-lso.sh new file mode 100755 index 00000000000..659ebe96f91 --- /dev/null +++ b/coin/provisioning/qtci-macos-15-x86_64/01-disable-net-lso.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/macos/disable_net_lso.sh diff --git a/coin/provisioning/qtci-macos-15-x86_64/01-disable-notifications_and_warnings.sh b/coin/provisioning/qtci-macos-15-x86_64/01-disable-notifications_and_warnings.sh new file mode 100755 index 00000000000..27efbb6280e --- /dev/null +++ b/coin/provisioning/qtci-macos-15-x86_64/01-disable-notifications_and_warnings.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/macos/disable-notifications_and_warnings.sh diff --git a/coin/provisioning/qtci-macos-15-x86_64/01-disable-updates.sh b/coin/provisioning/qtci-macos-15-x86_64/01-disable-updates.sh new file mode 100755 index 00000000000..a2b2a0f0997 --- /dev/null +++ b/coin/provisioning/qtci-macos-15-x86_64/01-disable-updates.sh @@ -0,0 +1,7 @@ +#!/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 + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/macos/system_updates.sh" diff --git a/coin/provisioning/qtci-macos-15-x86_64/01-enable_zsh_history_and_viminfo.sh b/coin/provisioning/qtci-macos-15-x86_64/01-enable_zsh_history_and_viminfo.sh new file mode 100755 index 00000000000..6004b1401fa --- /dev/null +++ b/coin/provisioning/qtci-macos-15-x86_64/01-enable_zsh_history_and_viminfo.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +set -ex + +# shellcheck source=../common/macos/enable_zsh_history_and_viminfo.sh +source "${BASH_SOURCE%/*}/../common/macos/enable_zsh_history_and_viminfo.sh" diff --git a/coin/provisioning/qtci-macos-15-x86_64/01-increase_limits.sh b/coin/provisioning/qtci-macos-15-x86_64/01-increase_limits.sh new file mode 100755 index 00000000000..08669e524a9 --- /dev/null +++ b/coin/provisioning/qtci-macos-15-x86_64/01-increase_limits.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/macos/increase_limits.sh diff --git a/coin/provisioning/qtci-macos-15-x86_64/01-install_telegraf.sh b/coin/provisioning/qtci-macos-15-x86_64/01-install_telegraf.sh new file mode 100755 index 00000000000..abd9ba0d5ad --- /dev/null +++ b/coin/provisioning/qtci-macos-15-x86_64/01-install_telegraf.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/macos/telegraf_install.sh diff --git a/coin/provisioning/qtci-macos-15-x86_64/01-mount-vcpkg-cache-drive.sh b/coin/provisioning/qtci-macos-15-x86_64/01-mount-vcpkg-cache-drive.sh new file mode 100755 index 00000000000..2739f40fbac --- /dev/null +++ b/coin/provisioning/qtci-macos-15-x86_64/01-mount-vcpkg-cache-drive.sh @@ -0,0 +1,8 @@ +#!/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 + +# shellcheck source=../common/macos/mount-vcpkg-cache-drive.sh +source "${BASH_SOURCE%/*}/../common/macos/mount-vcpkg-cache-drive.sh" diff --git a/coin/provisioning/qtci-macos-15-x86_64/01-sha1sum-compatibility.sh b/coin/provisioning/qtci-macos-15-x86_64/01-sha1sum-compatibility.sh new file mode 100755 index 00000000000..e31fe48ba29 --- /dev/null +++ b/coin/provisioning/qtci-macos-15-x86_64/01-sha1sum-compatibility.sh @@ -0,0 +1,10 @@ +#!/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 + +#!/usr/bin/env bash + +set -ex + +# shellcheck source=../common/macos/sha1sum-compatibility.sh +source "${BASH_SOURCE%/*}/../common/macos/sha1sum-compatibility.sh" diff --git a/coin/provisioning/qtci-macos-15-x86_64/03-bashprofile.sh b/coin/provisioning/qtci-macos-15-x86_64/03-bashprofile.sh new file mode 100755 index 00000000000..4eed8433b6c --- /dev/null +++ b/coin/provisioning/qtci-macos-15-x86_64/03-bashprofile.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env 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 + +set -ex + +# Read .bashrc if exist +printf -- "# Get the aliases and functions\nif [ -f ~/.bashrc ]; then\n . ~/.bashrc\nfi\n" >> ~/.bash_profile + diff --git a/coin/provisioning/qtci-macos-15-x86_64/05-systemsetup.sh b/coin/provisioning/qtci-macos-15-x86_64/05-systemsetup.sh new file mode 100755 index 00000000000..d7f079552c5 --- /dev/null +++ b/coin/provisioning/qtci-macos-15-x86_64/05-systemsetup.sh @@ -0,0 +1,84 @@ +#!/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 + +# This script modifies system settings for automated use + +targetFile="$HOME/vncpw.txt" + +# Fetch password +curl --retry 5 --retry-delay 10 --retry-max-time 60 \ + "http://ci-files01-hki.ci.qt.io/input/semisecure/vncpw.txt" \ + -o "$targetFile" +shasum "$targetFile" |grep "a795fccaa8f277e62ec08e6056c544b8b63924a0" + +{ VNCPassword=$(cat "$targetFile"); } 2> /dev/null +NTS_IP=10.212.2.216 + +echo "Disable Screensaver" +# For current session +defaults -currentHost write com.apple.screensaver idleTime 0 + +echo "Disable sleep" +sudo pmset sleep 0 displaysleep 0 + +# For session after a reboot +mkdir -p "$HOME/Library/LaunchAgents" +sudo tee -a "$HOME/Library/LaunchAgents/no-screensaver.plist" < + + + + + Label + org.qt.io.screensaver_disable + ProgramArguments + + defaults + -currentHost + write + com.apple.screensaver + idleTime + 0 + + RunAtLoad + + KeepAlive + + + +EOT + +defaults write com.apple.screensaver askForPassword -int 0 + +echo "Set keyboard type rates and delays" +# normal minimum is 15 (225 ms) +defaults write -g InitialKeyRepeat -int 15 +# normal minimum is 2 (30 ms) +defaults write -g KeyRepeat -int 2 + +set +x +echo "Enable remote desktop sharing" +sudo /System/Library/CoreServices/RemoteManagement/ARDAgent.app/Contents/Resources/kickstart \ + -activate -configure -access -on -clientopts -setvnclegacy -vnclegacy yes -clientopts \ + -setvncpw -vncpw "$VNCPassword" -restart -agent -privs -all +set -x + +echo "Set Network Test Server address to $NTS_IP in /etc/hosts" +echo "$NTS_IP qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts + +sudo systemsetup settimezone GMT +sudo systemsetup setusingnetworktime off +sudo rm -f "$targetFile" + +# Enable automount for nfs shares +sudo sed -i'.orig' -e 's:^#/net:/net:' -e 's:hidefromfinder,nosuid:hidefromfinder,nosuid,locallocks,nocallback:' /etc/auto_master +sudo automount -cv + +# Disable multicast advertisements +sudo defaults write /Library/Preferences/com.apple.mDNSResponder.plist NoMulticastAdvertisements -bool true + +# Enable Use keyboard navigation to move focus between controls +defaults write -g AppleKeyboardUIMode -int 2 diff --git a/coin/provisioning/qtci-macos-15-x86_64/06-crashreporter.sh b/coin/provisioning/qtci-macos-15-x86_64/06-crashreporter.sh new file mode 100755 index 00000000000..b66bbc38afa --- /dev/null +++ b/coin/provisioning/qtci-macos-15-x86_64/06-crashreporter.sh @@ -0,0 +1,12 @@ +#!/usr/bin/env 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 + +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-disable_spotlight.sh b/coin/provisioning/qtci-macos-15-x86_64/06-disable_spotlight.sh new file mode 100755 index 00000000000..ab85a26250e --- /dev/null +++ b/coin/provisioning/qtci-macos-15-x86_64/06-disable_spotlight.sh @@ -0,0 +1,7 @@ +#!/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 + +# shellcheck source=../common/macos/disable_spotlight.sh +source "${BASH_SOURCE%/*}/../common/macos/disable_spotlight.sh" diff --git a/coin/provisioning/qtci-macos-15-x86_64/06-disable_update_downloads.sh b/coin/provisioning/qtci-macos-15-x86_64/06-disable_update_downloads.sh new file mode 100755 index 00000000000..18cb98eaf0a --- /dev/null +++ b/coin/provisioning/qtci-macos-15-x86_64/06-disable_update_downloads.sh @@ -0,0 +1,6 @@ +#!/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 +BASEDIR=$(dirname "$0") +"$BASEDIR"/../common/macos/disable_update_downloads.sh diff --git a/coin/provisioning/qtci-macos-15-x86_64/07-SSL_keychain.sh b/coin/provisioning/qtci-macos-15-x86_64/07-SSL_keychain.sh new file mode 100755 index 00000000000..e14dcee9571 --- /dev/null +++ b/coin/provisioning/qtci-macos-15-x86_64/07-SSL_keychain.sh @@ -0,0 +1,11 @@ +#!/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 + +# shellcheck source=../common/unix/SetEnvVar.sh +source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" + +# Enables the usage of temporary keychains for SSL autotests +SetEnvVar "QT_SSL_USE_TEMPORARY_KEYCHAIN" "1" diff --git a/coin/provisioning/qtci-macos-15-x86_64/15-xz.sh b/coin/provisioning/qtci-macos-15-x86_64/15-xz.sh new file mode 100755 index 00000000000..9abb7f53936 --- /dev/null +++ b/coin/provisioning/qtci-macos-15-x86_64/15-xz.sh @@ -0,0 +1,21 @@ +#!/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 installs XZ-Utils + +# XZ-Utils are needed for uncompressing xz-compressed files + +set -ex + +# shellcheck source=../common/macos/InstallPKGFromURL.sh +source "${BASH_SOURCE%/*}/../common/macos/InstallPKGFromURL.sh" + +PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/mac/macos_10.12_sierra/XZ.pkg" +AltUrl="http://sourceforge.net/projects/macpkg/files/XZ/5.0.7/XZ.pkg" +SHA1="f0c1f82ebcffe0bd4b8b57b6a77805db56b2de67" +DestDir="/" + +InstallPKGFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$DestDir" + +echo "XZ = 5.0.7" >> ~/versions.txt diff --git a/coin/provisioning/qtci-macos-15-x86_64/20-java.sh b/coin/provisioning/qtci-macos-15-x86_64/20-java.sh new file mode 100755 index 00000000000..325fee6360d --- /dev/null +++ b/coin/provisioning/qtci-macos-15-x86_64/20-java.sh @@ -0,0 +1,7 @@ +#!/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 + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/macos/java.sh" diff --git a/coin/provisioning/qtci-macos-15-x86_64/20-xcode.sh b/coin/provisioning/qtci-macos-15-x86_64/20-xcode.sh new file mode 100755 index 00000000000..ed8b4e9a426 --- /dev/null +++ b/coin/provisioning/qtci-macos-15-x86_64/20-xcode.sh @@ -0,0 +1,22 @@ +#!/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 installs Xcode +# Prerequisites: Have Xcode prefetched to local cache as xz compressed. +# This can be achieved by fetching Xcode_9.xip from Apple Store. +# Uncompress it with 'xar -xf Xcode_9.xip' +# Then get https://gist.githubusercontent.com/pudquick/ff412bcb29c9c1fa4b8d/raw/24b25538ea8df8d0634a2a6189aa581ccc6a5b4b/parse_pbzx2.py +# with which you can run 'python parse_pbzx2.py Content'. +# This will give you five files called "Content.part<00..05>.cpio.xz". +# Extract those that have the extension .xz with xz. +# "cat" together all the content files "cat file1, file2, file3, file4, file5 >file_new" +# Compress the new file with xz back to something like Xcode_9.xz +# Upload the file to temporary storage for this script to use. + +set -ex + +# shellcheck source=../common/macos/install_xcode.sh +source "${BASH_SOURCE%/*}/../common/macos/install_xcode.sh" + +InstallXCode /net/ci-files01-hki.ci.qt.io/hdd/www/input/mac/Xcode_16.xip 16 diff --git a/coin/provisioning/qtci-macos-15-x86_64/21-install-commandlinetools.sh b/coin/provisioning/qtci-macos-15-x86_64/21-install-commandlinetools.sh new file mode 100755 index 00000000000..3f7148c99b9 --- /dev/null +++ b/coin/provisioning/qtci-macos-15-x86_64/21-install-commandlinetools.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-commandlinetools.sh +source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh" +version="16" +packageName="Command_Line_Tools_for_Xcode_$version.dmg" +url="http://ci-files01-hki.ci.qt.io/input/mac/$packageName" +sha1="c6f1a7521d5da50c2bba3d83c0f3ee7df6d87d28" + +InstallCommandLineTools $url $url $sha1 $packageName $version diff --git a/coin/provisioning/qtci-macos-15-x86_64/24-sccache.sh b/coin/provisioning/qtci-macos-15-x86_64/24-sccache.sh new file mode 100755 index 00000000000..358b23fbf45 --- /dev/null +++ b/coin/provisioning/qtci-macos-15-x86_64/24-sccache.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +source "${BASH_SOURCE%/*}/../common/macos/sccache.sh" diff --git a/coin/provisioning/qtci-macos-15-x86_64/25-cmake.sh b/coin/provisioning/qtci-macos-15-x86_64/25-cmake.sh new file mode 100755 index 00000000000..3309588000c --- /dev/null +++ b/coin/provisioning/qtci-macos-15-x86_64/25-cmake.sh @@ -0,0 +1,8 @@ +#!/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 + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/macos/cmake.sh" diff --git a/coin/provisioning/qtci-macos-15-x86_64/25-homebrew.sh b/coin/provisioning/qtci-macos-15-x86_64/25-homebrew.sh new file mode 100755 index 00000000000..0c4ee4fc6a5 --- /dev/null +++ b/coin/provisioning/qtci-macos-15-x86_64/25-homebrew.sh @@ -0,0 +1,12 @@ +#!/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 + +INSTALLTYPE="PKG" + +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-x86_64/25-mysql.sh b/coin/provisioning/qtci-macos-15-x86_64/25-mysql.sh new file mode 100755 index 00000000000..b9f0c0aea36 --- /dev/null +++ b/coin/provisioning/qtci-macos-15-x86_64/25-mysql.sh @@ -0,0 +1,27 @@ +#!/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 installs MySQL + +# MySQL is needed for Qt to be able to support MySQL + +set -ex + +# shellcheck source=../common/macos/InstallAppFromCompressedFileFromURL.sh +source "${BASH_SOURCE%/*}/../common/macos/InstallAppFromCompressedFileFromURL.sh" +# shellcheck source=../common/unix/SetEnvVar.sh +source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" + +PrimaryUrl="http://ci-files01-hki.ci.qt.io/input/mac/macos_10.12_sierra/mysql-5.7.15-osx10.11-x86_64.tar.gz" +AltUrl="https://dev.mysql.com/get/Downloads/MySQL-5.7/mysql-5.7.15-osx10.11-x86_64.tar.gz" +SHA1="07949bd42f350b0504a1536b8830b809b4a34fca" +appPrefix="" +targetDir="/opt/mysql57/" + +sudo mkdir -p "/opt" + +InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix" "$targetDir" + +SetEnvVar "MYSQLBINPATH" "/opt/mysql57/bin" +echo "MySQL = 5.7.15" >> ~/versions.txt diff --git a/coin/provisioning/qtci-macos-15-x86_64/25-pip.sh b/coin/provisioning/qtci-macos-15-x86_64/25-pip.sh new file mode 100755 index 00000000000..3fc865d0e52 --- /dev/null +++ b/coin/provisioning/qtci-macos-15-x86_64/25-pip.sh @@ -0,0 +1,8 @@ +#!/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 + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/macos/pip.sh" diff --git a/coin/provisioning/qtci-macos-15-x86_64/25-postgresql.sh b/coin/provisioning/qtci-macos-15-x86_64/25-postgresql.sh new file mode 100755 index 00000000000..06cae6ef601 --- /dev/null +++ b/coin/provisioning/qtci-macos-15-x86_64/25-postgresql.sh @@ -0,0 +1,7 @@ +#!/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 + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/macos/postgresql.sh" diff --git a/coin/provisioning/qtci-macos-15-x86_64/25-python2.sh b/coin/provisioning/qtci-macos-15-x86_64/25-python2.sh new file mode 100755 index 00000000000..4c88a413a30 --- /dev/null +++ b/coin/provisioning/qtci-macos-15-x86_64/25-python2.sh @@ -0,0 +1,7 @@ +#!/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 + +# shellcheck source=../common/macos/python2.sh +source "${BASH_SOURCE%/*}/../common/macos/python2.sh" diff --git a/coin/provisioning/qtci-macos-15-x86_64/25-python3.sh b/coin/provisioning/qtci-macos-15-x86_64/25-python3.sh new file mode 100755 index 00000000000..8fee606c917 --- /dev/null +++ b/coin/provisioning/qtci-macos-15-x86_64/25-python3.sh @@ -0,0 +1,7 @@ +#!/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 + +# shellcheck source=../common/macos/python3.sh +source "${BASH_SOURCE%/*}/../common/macos/python3.sh" diff --git a/coin/provisioning/qtci-macos-15-x86_64/26-freetype.sh b/coin/provisioning/qtci-macos-15-x86_64/26-freetype.sh new file mode 100755 index 00000000000..fa0790f840c --- /dev/null +++ b/coin/provisioning/qtci-macos-15-x86_64/26-freetype.sh @@ -0,0 +1,7 @@ +#!/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 + +brew install freetype diff --git a/coin/provisioning/qtci-macos-15-x86_64/26-jq.sh b/coin/provisioning/qtci-macos-15-x86_64/26-jq.sh new file mode 100755 index 00000000000..4dffcb969ac --- /dev/null +++ b/coin/provisioning/qtci-macos-15-x86_64/26-jq.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +set -ex + +brew install jq diff --git a/coin/provisioning/qtci-macos-15-x86_64/26-ninja.sh b/coin/provisioning/qtci-macos-15-x86_64/26-ninja.sh new file mode 100755 index 00000000000..4443eeb486f --- /dev/null +++ b/coin/provisioning/qtci-macos-15-x86_64/26-ninja.sh @@ -0,0 +1,10 @@ +#!/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 + +# shellcheck source=../common/macos/ninja.sh +source "${BASH_SOURCE%/*}/../common/macos/ninja.sh" + + diff --git a/coin/provisioning/qtci-macos-15-x86_64/26-odbc.sh b/coin/provisioning/qtci-macos-15-x86_64/26-odbc.sh new file mode 100755 index 00000000000..2b6b013a5ee --- /dev/null +++ b/coin/provisioning/qtci-macos-15-x86_64/26-odbc.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 +# Install libiodbc + +set -ex + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/macos/libiodbc.sh" --with-universal diff --git a/coin/provisioning/qtci-macos-15-x86_64/26-p7zip.sh b/coin/provisioning/qtci-macos-15-x86_64/26-p7zip.sh new file mode 100755 index 00000000000..8cdcd0c367d --- /dev/null +++ b/coin/provisioning/qtci-macos-15-x86_64/26-p7zip.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 +# Install 7z to be used from command line + +set -ex + +brew update +brew install p7zip diff --git a/coin/provisioning/qtci-macos-15-x86_64/26-pcre2.sh b/coin/provisioning/qtci-macos-15-x86_64/26-pcre2.sh new file mode 100755 index 00000000000..c10d6206b6d --- /dev/null +++ b/coin/provisioning/qtci-macos-15-x86_64/26-pcre2.sh @@ -0,0 +1,7 @@ +#!/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 + +brew install pcre2 diff --git a/coin/provisioning/qtci-macos-15-x86_64/27-libclang.sh b/coin/provisioning/qtci-macos-15-x86_64/27-libclang.sh new file mode 100755 index 00000000000..cc025e6e441 --- /dev/null +++ b/coin/provisioning/qtci-macos-15-x86_64/27-libclang.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 + +BASEDIR=$(dirname "$0") +# There is only one mac package and common script uses it as a default +"$BASEDIR/../common/unix/libclang.sh" diff --git a/coin/provisioning/qtci-macos-15-x86_64/28-libclang-v100-dyn.sh b/coin/provisioning/qtci-macos-15-x86_64/28-libclang-v100-dyn.sh new file mode 100755 index 00000000000..d95e7e00cd0 --- /dev/null +++ b/coin/provisioning/qtci-macos-15-x86_64/28-libclang-v100-dyn.sh @@ -0,0 +1,8 @@ +#!/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 + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/unix/libclang-v100-dyn.sh" diff --git a/coin/provisioning/qtci-macos-15-x86_64/28-patchelf.sh b/coin/provisioning/qtci-macos-15-x86_64/28-patchelf.sh new file mode 100755 index 00000000000..f60a7cdcbf0 --- /dev/null +++ b/coin/provisioning/qtci-macos-15-x86_64/28-patchelf.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/unix/install-patchelf.sh" diff --git a/coin/provisioning/qtci-macos-15-x86_64/29-install-pkgconfig.sh b/coin/provisioning/qtci-macos-15-x86_64/29-install-pkgconfig.sh new file mode 100755 index 00000000000..33e115801d5 --- /dev/null +++ b/coin/provisioning/qtci-macos-15-x86_64/29-install-pkgconfig.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +set -ex + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/macos/pkgconfig.sh" diff --git a/coin/provisioning/qtci-macos-15-x86_64/29-libusb.sh b/coin/provisioning/qtci-macos-15-x86_64/29-libusb.sh new file mode 100755 index 00000000000..e9e9e2383d3 --- /dev/null +++ b/coin/provisioning/qtci-macos-15-x86_64/29-libusb.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 + +BASEDIR=$(dirname "$0") + +"$BASEDIR/../common/macos/libusb.sh" diff --git a/coin/provisioning/qtci-macos-15-x86_64/30-android.sh b/coin/provisioning/qtci-macos-15-x86_64/30-android.sh new file mode 100755 index 00000000000..ddb3aec037d --- /dev/null +++ b/coin/provisioning/qtci-macos-15-x86_64/30-android.sh @@ -0,0 +1,8 @@ +#!/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 + +# shellcheck source=../common/macos/android.sh +source "${BASH_SOURCE%/*}/../common/macos/android.sh" diff --git a/coin/provisioning/qtci-macos-15-x86_64/30-fbx.sh b/coin/provisioning/qtci-macos-15-x86_64/30-fbx.sh new file mode 100755 index 00000000000..e991bc083a5 --- /dev/null +++ b/coin/provisioning/qtci-macos-15-x86_64/30-fbx.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 + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/macos/fbx_macos.sh" + diff --git a/coin/provisioning/qtci-macos-15-x86_64/30-install-conan.sh b/coin/provisioning/qtci-macos-15-x86_64/30-install-conan.sh new file mode 100755 index 00000000000..8d90ef37a97 --- /dev/null +++ b/coin/provisioning/qtci-macos-15-x86_64/30-install-conan.sh @@ -0,0 +1,8 @@ +#!/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 + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/unix/install-conan.sh" "macos" diff --git a/coin/provisioning/qtci-macos-15-x86_64/30-nodejs.sh b/coin/provisioning/qtci-macos-15-x86_64/30-nodejs.sh new file mode 100755 index 00000000000..a5cf7d4d264 --- /dev/null +++ b/coin/provisioning/qtci-macos-15-x86_64/30-nodejs.sh @@ -0,0 +1,7 @@ +#!/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 + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/macos/nodejs.sh" diff --git a/coin/provisioning/qtci-macos-15-x86_64/35-install-breakpad.sh b/coin/provisioning/qtci-macos-15-x86_64/35-install-breakpad.sh new file mode 100755 index 00000000000..8a9dde56be4 --- /dev/null +++ b/coin/provisioning/qtci-macos-15-x86_64/35-install-breakpad.sh @@ -0,0 +1,8 @@ +#!/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 + +# shellcheck source=../common/unix/install-breakpad.sh +source "${BASH_SOURCE%/*}/../common/unix/install-breakpad.sh" diff --git a/coin/provisioning/qtci-macos-15-x86_64/35-install_protobuf.sh b/coin/provisioning/qtci-macos-15-x86_64/35-install_protobuf.sh new file mode 100755 index 00000000000..b07613744dd --- /dev/null +++ b/coin/provisioning/qtci-macos-15-x86_64/35-install_protobuf.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 + +# shellcheck source=../common/unix/install_protobuf.sh +source "${BASH_SOURCE%/*}/../common/unix/install_protobuf.sh" + diff --git a/coin/provisioning/qtci-macos-15-x86_64/35-openssl.sh b/coin/provisioning/qtci-macos-15-x86_64/35-openssl.sh new file mode 100755 index 00000000000..c86788db992 --- /dev/null +++ b/coin/provisioning/qtci-macos-15-x86_64/35-openssl.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 + +# shellcheck source=../common/unix/install-openssl.sh +source "${BASH_SOURCE%/*}/../common/unix/install-openssl.sh" "macos-universal" + diff --git a/coin/provisioning/qtci-macos-15-x86_64/36-emsdk.sh b/coin/provisioning/qtci-macos-15-x86_64/36-emsdk.sh new file mode 100755 index 00000000000..c8aec444d4c --- /dev/null +++ b/coin/provisioning/qtci-macos-15-x86_64/36-emsdk.sh @@ -0,0 +1,8 @@ +#!/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 + +# shellcheck source=../common/unix/emsdk.sh +source "${BASH_SOURCE%/*}/../common/unix/emsdk.sh" diff --git a/coin/provisioning/qtci-macos-15-x86_64/50-openssl_for_android_darwin.sh b/coin/provisioning/qtci-macos-15-x86_64/50-openssl_for_android_darwin.sh new file mode 100755 index 00000000000..8cb78e85613 --- /dev/null +++ b/coin/provisioning/qtci-macos-15-x86_64/50-openssl_for_android_darwin.sh @@ -0,0 +1,7 @@ +#!/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 + +# shellcheck source=../common/unix/openssl_for_android.sh +source "${BASH_SOURCE%/*}/../common/unix/openssl_for_android.sh" diff --git a/coin/provisioning/qtci-macos-15-x86_64/80-screenresolution.sh b/coin/provisioning/qtci-macos-15-x86_64/80-screenresolution.sh new file mode 100755 index 00000000000..ed905a33d4b --- /dev/null +++ b/coin/provisioning/qtci-macos-15-x86_64/80-screenresolution.sh @@ -0,0 +1,6 @@ +#!/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 + +"$(dirname "$0")"/../common/macos/screenresolution.sh + diff --git a/coin/provisioning/qtci-macos-15-x86_64/81-bluetooth.sh b/coin/provisioning/qtci-macos-15-x86_64/81-bluetooth.sh new file mode 100755 index 00000000000..c58b9a34354 --- /dev/null +++ b/coin/provisioning/qtci-macos-15-x86_64/81-bluetooth.sh @@ -0,0 +1,10 @@ +#!/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 + +brew install blueutil + +#Disable Bluetooth +blueutil -p 0 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" diff --git a/coin/provisioning/qtci-macos-15-x86_64/90-squish.sh b/coin/provisioning/qtci-macos-15-x86_64/90-squish.sh new file mode 100755 index 00000000000..c2658d0e7c7 --- /dev/null +++ b/coin/provisioning/qtci-macos-15-x86_64/90-squish.sh @@ -0,0 +1,8 @@ +#!/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 + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/unix/squishInstall.sh" + diff --git a/coin/provisioning/qtci-macos-15-x86_64/90-vlc.sh b/coin/provisioning/qtci-macos-15-x86_64/90-vlc.sh new file mode 100755 index 00000000000..4924fe5c42c --- /dev/null +++ b/coin/provisioning/qtci-macos-15-x86_64/90-vlc.sh @@ -0,0 +1,8 @@ +#!/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 + +# for QtMM streaming tests +brew install --cask vlc diff --git a/coin/provisioning/qtci-macos-15-x86_64/97-set-locale.sh b/coin/provisioning/qtci-macos-15-x86_64/97-set-locale.sh new file mode 100755 index 00000000000..4ac0fd1337a --- /dev/null +++ b/coin/provisioning/qtci-macos-15-x86_64/97-set-locale.sh @@ -0,0 +1,8 @@ +#!/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 + +BASEDIR=$(dirname "$0") +"$BASEDIR"/../common/macos/set-locale.sh diff --git a/coin/provisioning/qtci-macos-15-x86_64/98-mimersql.sh b/coin/provisioning/qtci-macos-15-x86_64/98-mimersql.sh new file mode 100755 index 00000000000..70d5bc1d458 --- /dev/null +++ b/coin/provisioning/qtci-macos-15-x86_64/98-mimersql.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +set -ex + +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/macos/mimersql.sh" "macos-universal" diff --git a/coin/provisioning/qtci-macos-15-x86_64/99-mac-version.sh b/coin/provisioning/qtci-macos-15-x86_64/99-mac-version.sh new file mode 100755 index 00000000000..d145d1e99c6 --- /dev/null +++ b/coin/provisioning/qtci-macos-15-x86_64/99-mac-version.sh @@ -0,0 +1,8 @@ +#!/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 + +BASEDIR=$(dirname "$0") +"$BASEDIR"/../common/macos/macos-version.sh From 9070e879f8921dfc96162f2bf259854fc633d353 Mon Sep 17 00:00:00 2001 From: Rami Potinkara Date: Wed, 26 Feb 2025 12:04:59 +0200 Subject: [PATCH 274/288] 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.5 Change-Id: I076211baf896e65aae3b616a3d6286258c3d0640 Reviewed-by: Rami Potinkara Reviewed-by: Assam Boudjelthia (cherry picked from commit ed0dc6ad5a2cebbeb5fbe98dbe5603b41e309872) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 5393e187d349f7972777aa8bacebdd9bfc28e679) --- .../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 87684ff2996717049fd0337c09b52a07b0278f93 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 2 Apr 2025 15:59:06 +0000 Subject: [PATCH 275/288] Update submodules on '6.8 in qt/qt5' Change-Id: I81d218fbd08d9acea8712afd550f31b909487ea9 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 e84853fc457..7c2d57d87c1 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit e84853fc4573260e098e187f2cefbb2d230d46d9 +Subproject commit 7c2d57d87c1b2aaefd45317cba99d9eb103a6738 diff --git a/qt5compat b/qt5compat index dc5d523663f..c48e114ab3e 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit dc5d523663f379fa178b8b8142a0b010e5528d97 +Subproject commit c48e114ab3e6143190ecb5e91e45fe60c225464e diff --git a/qtactiveqt b/qtactiveqt index dcd8bf64800..505ac4695cf 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit dcd8bf64800c61c23647d7c0d8472ddc0552e690 +Subproject commit 505ac4695cfe7e0a7a17c3c48129ef66a1c8bef7 diff --git a/qtbase b/qtbase index 4040d22524d..5eb6c2ff05b 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 4040d22524d2fd92fad62546309b206718c6fb91 +Subproject commit 5eb6c2ff05b12f65a1290d175147e17cf57b11da diff --git a/qtcharts b/qtcharts index 82e61532a88..580ed499fc5 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 82e61532a88c490e66df0f378e3327afe27cc453 +Subproject commit 580ed499fc52f904885ab366eaf9cfbbefaef85f diff --git a/qtcoap b/qtcoap index 0a48ec94d97..f09fa2013b0 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit 0a48ec94d979a47a3ea9c87804d2c9403b3766ce +Subproject commit f09fa2013b00c0976b1ed8dbeb974158a463173c diff --git a/qtconnectivity b/qtconnectivity index 2c60f90dbf2..9530050402b 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 2c60f90dbf27e056b04b8427f47d6a5467c0ad53 +Subproject commit 9530050402bc8018b58b7c527cfc07ed4b889a6a diff --git a/qtdatavis3d b/qtdatavis3d index 34d302ed1a0..0ee06c192f9 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 34d302ed1a0b29bffe8a796be6ccc861df070cdf +Subproject commit 0ee06c192f9350b293bb38f50c42a9b3377e8516 diff --git a/qtdeclarative b/qtdeclarative index 5a5b4e295b4..3103d51986b 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 5a5b4e295b433c7cf4b9f391eb1bc1b9623d83b0 +Subproject commit 3103d51986b8b982267a768b7f29c249e942c81a diff --git a/qtdoc b/qtdoc index b0450b26ad4..a95cbb5cb85 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit b0450b26ad442958e27946d1e91119c431542a97 +Subproject commit a95cbb5cb8545f739461b5cecb684a67fbbbda27 diff --git a/qtgraphs b/qtgraphs index 26623a20aa5..756f708d860 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit 26623a20aa57f867b3134e4e068cc44ab5c0cb3a +Subproject commit 756f708d860e52fd8acd477c30d3284a4e83c368 diff --git a/qtgrpc b/qtgrpc index 615926a0f17..a046bd036b7 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit 615926a0f17492f1ed701f394f67c49e4a6dcf07 +Subproject commit a046bd036b7a0008c7a60c6608fb8f515b3ebc34 diff --git a/qthttpserver b/qthttpserver index f71447ed45d..907fed3793d 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit f71447ed45d48d4a7aed0fecc07ebc514f4eb5cd +Subproject commit 907fed3793d8c19b1ebe674d301ffc149c9e1ce9 diff --git a/qtimageformats b/qtimageformats index 5fe085ced86..5b211871f85 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 5fe085ced860eb64ffc1b890a6e85780c61dbeef +Subproject commit 5b211871f8560b13bb3f9fa989d8fb9b50e228e1 diff --git a/qtlanguageserver b/qtlanguageserver index e9cb3dcd7bf..996b3627e4e 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit e9cb3dcd7bf9097ecb811cb83406bb522b33388f +Subproject commit 996b3627e4e67f86032a310288a483736782b9fe diff --git a/qtlocation b/qtlocation index 2c073670ef3..043dda19dd1 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 2c073670ef3ded984c34b15413958752aeedab76 +Subproject commit 043dda19dd1171756168b0625b7c2027fff01635 diff --git a/qtlottie b/qtlottie index 305c0d0ea0d..14c51dd9b4a 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 305c0d0ea0dce6302d526985bc906dff471d7aba +Subproject commit 14c51dd9b4ac384fa640a5818b53337210d89591 diff --git a/qtmqtt b/qtmqtt index 96c53c86515..9ab20cc3abd 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit 96c53c86515289fbcd36978148dea5740ef108a2 +Subproject commit 9ab20cc3abd5f29240d36e15b1b0d6d3e2ddd125 diff --git a/qtmultimedia b/qtmultimedia index e82b1b5d98b..e27842a2141 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit e82b1b5d98bb7bc843a917043046241a56240b1e +Subproject commit e27842a2141db63bf601ee6f4b974494724d12ce diff --git a/qtnetworkauth b/qtnetworkauth index 5faafbce7e0..ea40da2606a 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 5faafbce7e01a75761c1b724ea42bca152686e22 +Subproject commit ea40da2606a854c0bfc50068aac7b624c10ae0a4 diff --git a/qtopcua b/qtopcua index 6012ddd654c..4f000690df3 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit 6012ddd654c6eaea7177a2b37bf79cfac97a5a8e +Subproject commit 4f000690df32b13b8335aa5169c9401cab20db67 diff --git a/qtpositioning b/qtpositioning index 2f486d06d23..e062e3457e7 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit 2f486d06d23195263922f702cfdf4354eb5c5365 +Subproject commit e062e3457e70fadee0e37ee4989b6f2fa693343f diff --git a/qtquick3d b/qtquick3d index dd658756ebe..c7877af8040 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit dd658756ebecc4045c78bac416346968f457f984 +Subproject commit c7877af804098acfc59bac6476ea39834994af9f diff --git a/qtquick3dphysics b/qtquick3dphysics index df04b537900..bff805ead5f 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit df04b5379003e4316a9830e01a5599631d5bc53f +Subproject commit bff805ead5f7a6b0df85dbcefcc9b5140b3cb040 diff --git a/qtquickeffectmaker b/qtquickeffectmaker index 7d2101b41db..943f83b7ba9 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit 7d2101b41dbc899db2297126f1bb2c154dd8974e +Subproject commit 943f83b7ba9a7de63083b532652267181f5123da diff --git a/qtquicktimeline b/qtquicktimeline index 8d4e0cf752c..cda898b4373 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 8d4e0cf752c057a232945e715ae5dfe795bc85e8 +Subproject commit cda898b43739a8bf10a99b918a9154ea57696bac diff --git a/qtremoteobjects b/qtremoteobjects index 584f3a3f42d..437c5330ac4 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 584f3a3f42de311183032794b7a9d50aa7c32b15 +Subproject commit 437c5330ac4ef48f47b4c58e7b6a1d044ca4a0b6 diff --git a/qtscxml b/qtscxml index b46f2bfe632..a10395d0d9e 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit b46f2bfe6329adeb6bb67dc6c3a8fb0278b3b5fc +Subproject commit a10395d0d9eb71088d4a4b6fd5540c908a63dfa1 diff --git a/qtsensors b/qtsensors index 0d27287268b..ec4f5a286e7 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 0d27287268bd7b01a0ca3a91856aeffd0a47ed78 +Subproject commit ec4f5a286e714d5e6776d3196a1ba578ceb8d690 diff --git a/qtserialbus b/qtserialbus index fd8ed74bf81..11d325d3cf5 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit fd8ed74bf81503d30f72c32fd6f72bf9648cc6de +Subproject commit 11d325d3cf56820585ab2122542fd8793c548ff2 diff --git a/qtserialport b/qtserialport index ae7a49e91fb..80763ebedac 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit ae7a49e91fb418aaf9f83c60d81b1808534cdc1b +Subproject commit 80763ebedac682569c4b520565db902c6391078b diff --git a/qtshadertools b/qtshadertools index 7a502603a59..f96276768da 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit 7a502603a59dabecc770a3b1a15379f4d5936a38 +Subproject commit f96276768dae58276f4316d0552c52d730f611d5 diff --git a/qtspeech b/qtspeech index 77fdbdd3759..d66c544fd9d 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 77fdbdd37591fef4dfe8d94b0f6eb57d54fe73e8 +Subproject commit d66c544fd9d7330b5bb10ebc9762e9a50e3c1cc3 diff --git a/qtsvg b/qtsvg index 2a038a91b44..737a3a8dd70 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 2a038a91b444343a2beb7220e29ccaec5ecfb803 +Subproject commit 737a3a8dd70483121df4e8eda9892badcac161ea diff --git a/qttools b/qttools index f8b263a8309..45cb129d38b 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit f8b263a8309e0d1db742cec9df7eb39aae382ecb +Subproject commit 45cb129d38b8025c7832320fa8ec3b54a286a07b diff --git a/qttranslations b/qttranslations index fe665cbbbb8..a2cda399e9c 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit fe665cbbbb85de0280694bbea8b29b40f0797349 +Subproject commit a2cda399e9c8cb3124e33b1f093a2d4f5618fef2 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index b6c5816aaef..0bc040f6742 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit b6c5816aaef6915dd745d4accb414fcd8b3ca820 +Subproject commit 0bc040f67427fa13856854647cb0eb36fd9692b3 diff --git a/qtwayland b/qtwayland index fefdf9c9750..c5f2e39af5b 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit fefdf9c9750cafaeb2116548dfc63012af82a54a +Subproject commit c5f2e39af5b80fb694b212cadbf5fd13fb78991e diff --git a/qtwebchannel b/qtwebchannel index 6d8d2689731..e6969f5c558 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 6d8d2689731e9337c7362355bc166e7ec7ee8361 +Subproject commit e6969f5c5585463f75066cd8ac20203767bb7d48 diff --git a/qtwebengine b/qtwebengine index 3e19092ef71..74930dda2ce 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 3e19092ef719a5a25c350af0bf801eb00cb1bf1c +Subproject commit 74930dda2ce4fff4bcd5914dde3d6f36412bccc2 diff --git a/qtwebsockets b/qtwebsockets index ce0274a9824..3383dbfc0d0 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit ce0274a9824270430aa0915aad3ed4ef6cbab626 +Subproject commit 3383dbfc0d0739ba62efab3f07561ef5ed0ff831 diff --git a/qtwebview b/qtwebview index ea822b289f4..dbea2678733 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit ea822b289f4651e553eaa787b2e6c6bdd4d6713a +Subproject commit dbea267873391040812f5dcb9fea2bb8559ed056 From 5fd1494a2512626a0f361e1511d0aa8946c90949 Mon Sep 17 00:00:00 2001 From: Timur Pocheptsov Date: Wed, 5 Mar 2025 13:02:53 +0100 Subject: [PATCH 276/288] 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. 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 (cherry picked from commit 999e66fb4ac72d7cc8d8620e4468af991df29f3b) --- 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 806a01f4185..f4b2187603e 100755 --- a/coin/provisioning/common/unix/install-ffmpeg-ios.sh +++ b/coin/provisioning/common/unix/install-ffmpeg-ios.sh @@ -55,18 +55,12 @@ 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-cross-compile \ --enable-shared \ --disable-static \ --install-name-dir='@rpath' \ - --enable-swscale \ - --enable-pthreads \ --disable-audiotoolbox sudo make install DESTDIR="$build_dir/installed" -j4 From 81536617813db295018326f1d284579bc1361131 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 277/288] 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. Task-number: QTQAINFRA-7034 Change-Id: Ie93cffba51924cd1d78651d20dec211817cb0cef Reviewed-by: Artem Dyomin (cherry picked from commit aa613ed85d48122bcb834749537284f8f8b91715) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 5df9315b1fc1a061895cb258c1929bac69c37e13) --- .../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 f4b2187603e..41521086de5 100755 --- a/coin/provisioning/common/unix/install-ffmpeg-ios.sh +++ b/coin/provisioning/common/unix/install-ffmpeg-ios.sh @@ -33,11 +33,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 libavdevice libavfilter 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 9f532fab921f6b81d3c5d5b467021b87bef2a2e0 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 278/288] 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. Change-Id: Ifa1904482f498d9b380d1ed19ab6b0104afda19b Reviewed-by: Artem Dyomin (cherry picked from commit c4315452cb376e3c6b4878bc98206529271da89b) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 68b4ef5b4efe8acf0637c0ca49bc708b5e39abfa) --- .../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 41521086de5..7eacb5c9a85 100755 --- a/coin/provisioning/common/unix/install-ffmpeg-ios.sh +++ b/coin/provisioning/common/unix/install-ffmpeg-ios.sh @@ -29,26 +29,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" @@ -58,9 +57,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-cross-compile \ From cd01a52a22c6c750192bd455c76315bd659db613 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 279/288] COIN: Add Debian packaging config for Debian 12 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ifaf0db9b9d39c6e66003e34e6c19957b60d0289f Reviewed-by: Jani Heikkinen (cherry picked from commit 9babd801690fea67028dcb1ee0be68c357f41b06) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 2035320e5789c9eeb5d98b921c03396dbc1a5a0e) Reviewed-by: Simo Fält --- coin/platform_configs/cmake_platforms.yaml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 12009c873bd..b903f78f8c5 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -289,3 +289,16 @@ 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', + ] From bdaed7e63cf018b1a63c627bb53a027cb884fb28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Thu, 6 Mar 2025 11:24:03 +0200 Subject: [PATCH 280/288] COIN: Fix Debian rules branch for Debian 12 config Change-Id: I0fad7926466696a18f25d73ffe6b5b56d228f2e3 Reviewed-by: Jani Heikkinen (cherry picked from commit adf7c5ab10b851154dbcb315dde67971ae1c8000) Reviewed-by: Matti Paaso --- 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 b903f78f8c5..b8c5ade9349 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -295,7 +295,7 @@ Configurations: Compiler: 'GCC' Features: ['Packaging','DebianPackaging','DisableTests', 'Insignificant'] Environment variables: [ - 'DEBIAN_RULES_REF=6.9_gles', + 'DEBIAN_RULES_REF=6.8_gles', 'COIN_TARGET_DIST=tqtc-bookworm', 'COIN_EXTRA_DEBIAN_PACKAGES={{.Env.HOME}}/debian_packages/', 'COIN_SBUILD_CHROOT=stable-arm64-sbuild', From be6842fcc68210eef9814617289329bc99cddd34 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 9 Apr 2025 10:05:20 +0000 Subject: [PATCH 281/288] Update submodules on '6.8 in qt/qt5' Change-Id: Ib31a3b502d2442da68482238c8cbe387f143471c 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 7c2d57d87c1..8305762c180 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 7c2d57d87c1b2aaefd45317cba99d9eb103a6738 +Subproject commit 8305762c180fb6debe28337863229a163ca7393e diff --git a/qt5compat b/qt5compat index c48e114ab3e..10054f8ac0f 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit c48e114ab3e6143190ecb5e91e45fe60c225464e +Subproject commit 10054f8ac0fe61aad4a6c45b22bd08247ca286d9 diff --git a/qtactiveqt b/qtactiveqt index 505ac4695cf..68362a51eda 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 505ac4695cfe7e0a7a17c3c48129ef66a1c8bef7 +Subproject commit 68362a51eda1dc23c8d12b388b09a335da275b8c diff --git a/qtbase b/qtbase index 5eb6c2ff05b..04ec5f144a6 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 5eb6c2ff05b12f65a1290d175147e17cf57b11da +Subproject commit 04ec5f144a6167ce5d29cf72da3e2de92205b4db diff --git a/qtcharts b/qtcharts index 580ed499fc5..110f613f14c 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 580ed499fc52f904885ab366eaf9cfbbefaef85f +Subproject commit 110f613f14c36ccb80c51fb5dcd450880d7f0a44 diff --git a/qtcoap b/qtcoap index f09fa2013b0..6cc7197b70f 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit f09fa2013b00c0976b1ed8dbeb974158a463173c +Subproject commit 6cc7197b70f29210656428eb69dc20e14ca5f447 diff --git a/qtconnectivity b/qtconnectivity index 9530050402b..15d58933c6a 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 9530050402bc8018b58b7c527cfc07ed4b889a6a +Subproject commit 15d58933c6a1ccd954d1fa123cbb8edd1a589fa3 diff --git a/qtdatavis3d b/qtdatavis3d index 0ee06c192f9..e00c02f5409 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 0ee06c192f9350b293bb38f50c42a9b3377e8516 +Subproject commit e00c02f5409fa73f6643c0c2115942785473a867 diff --git a/qtdeclarative b/qtdeclarative index 3103d51986b..32452675dc7 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 3103d51986b8b982267a768b7f29c249e942c81a +Subproject commit 32452675dc7661de32013969f9d2eb613da70096 diff --git a/qtdoc b/qtdoc index a95cbb5cb85..59bcdbfa8c0 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit a95cbb5cb8545f739461b5cecb684a67fbbbda27 +Subproject commit 59bcdbfa8c050a2e242a9f2fd0805b200cb73178 diff --git a/qtgraphs b/qtgraphs index 756f708d860..94f28609c95 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit 756f708d860e52fd8acd477c30d3284a4e83c368 +Subproject commit 94f28609c9538e1d9f0f5d9707d0c4b69e73c73b diff --git a/qtgrpc b/qtgrpc index a046bd036b7..b9a32e0aec0 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit a046bd036b7a0008c7a60c6608fb8f515b3ebc34 +Subproject commit b9a32e0aec0e5816d911e4987a720e2fc054da36 diff --git a/qthttpserver b/qthttpserver index 907fed3793d..29929d7bc4d 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit 907fed3793d8c19b1ebe674d301ffc149c9e1ce9 +Subproject commit 29929d7bc4dbffdb10ba7f23d4699447f5b03457 diff --git a/qtimageformats b/qtimageformats index 5b211871f85..c9dcdde82d0 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 5b211871f8560b13bb3f9fa989d8fb9b50e228e1 +Subproject commit c9dcdde82d0f3d83a86dd50ecdafdb08264030f0 diff --git a/qtlanguageserver b/qtlanguageserver index 996b3627e4e..bea5899d284 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit 996b3627e4e67f86032a310288a483736782b9fe +Subproject commit bea5899d2840dec38c1c7b917553618c20a7b546 diff --git a/qtlocation b/qtlocation index 043dda19dd1..e33bd271179 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 043dda19dd1171756168b0625b7c2027fff01635 +Subproject commit e33bd271179b3d8aa365e3c7799f010cfc8a410d diff --git a/qtlottie b/qtlottie index 14c51dd9b4a..92a0884da0a 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 14c51dd9b4ac384fa640a5818b53337210d89591 +Subproject commit 92a0884da0a3604b12bc9afa1b0ce838a0390f75 diff --git a/qtmqtt b/qtmqtt index 9ab20cc3abd..d48bd749f1f 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit 9ab20cc3abd5f29240d36e15b1b0d6d3e2ddd125 +Subproject commit d48bd749f1fa6a6dae6885346f30595c1885d213 diff --git a/qtmultimedia b/qtmultimedia index e27842a2141..88d40064a82 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit e27842a2141db63bf601ee6f4b974494724d12ce +Subproject commit 88d40064a827e23eaec060145bb644a902ffb073 diff --git a/qtnetworkauth b/qtnetworkauth index ea40da2606a..d029c89b9da 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit ea40da2606a854c0bfc50068aac7b624c10ae0a4 +Subproject commit d029c89b9daa2f6e0ee4eaca9103cf7eab92976b diff --git a/qtopcua b/qtopcua index 4f000690df3..f364b47fdcd 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit 4f000690df32b13b8335aa5169c9401cab20db67 +Subproject commit f364b47fdcdcb9947a5ffd9bd1b5b0c6d1c28e4b diff --git a/qtpositioning b/qtpositioning index e062e3457e7..73e77ed97a9 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit e062e3457e70fadee0e37ee4989b6f2fa693343f +Subproject commit 73e77ed97a9384eb73140b83a364d3866358e364 diff --git a/qtquick3d b/qtquick3d index c7877af8040..68474a13909 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit c7877af804098acfc59bac6476ea39834994af9f +Subproject commit 68474a13909091f74cde8bcdcc69afb9d00a1355 diff --git a/qtquick3dphysics b/qtquick3dphysics index bff805ead5f..699dffd6b21 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit bff805ead5f7a6b0df85dbcefcc9b5140b3cb040 +Subproject commit 699dffd6b215becf23d6391eff1000b342fad7a7 diff --git a/qtquickeffectmaker b/qtquickeffectmaker index 943f83b7ba9..8c6c5b4e420 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit 943f83b7ba9a7de63083b532652267181f5123da +Subproject commit 8c6c5b4e4205563a19f98f23125dfbb9374829d0 diff --git a/qtquicktimeline b/qtquicktimeline index cda898b4373..5f121ca967d 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit cda898b43739a8bf10a99b918a9154ea57696bac +Subproject commit 5f121ca967dab80f1fe5360a9685eaec74d19762 diff --git a/qtremoteobjects b/qtremoteobjects index 437c5330ac4..589cfeb1285 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 437c5330ac4ef48f47b4c58e7b6a1d044ca4a0b6 +Subproject commit 589cfeb1285adf6937bbf1b4fd7126b05dd09244 diff --git a/qtscxml b/qtscxml index a10395d0d9e..5ff53a3173d 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit a10395d0d9eb71088d4a4b6fd5540c908a63dfa1 +Subproject commit 5ff53a3173db81c8d52e49b193ff57b4e5d3426a diff --git a/qtsensors b/qtsensors index ec4f5a286e7..b3c6fa3e74c 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit ec4f5a286e714d5e6776d3196a1ba578ceb8d690 +Subproject commit b3c6fa3e74c992d1700b055b35e6192d13b129a0 diff --git a/qtserialbus b/qtserialbus index 11d325d3cf5..ed35bc6b721 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 11d325d3cf56820585ab2122542fd8793c548ff2 +Subproject commit ed35bc6b721d77db6e54711408d61645fc4c3460 diff --git a/qtserialport b/qtserialport index 80763ebedac..4497ff4b586 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 80763ebedac682569c4b520565db902c6391078b +Subproject commit 4497ff4b586b42dfd1c3c17240517d6e0cd44e39 diff --git a/qtshadertools b/qtshadertools index f96276768da..b32574d0307 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit f96276768dae58276f4316d0552c52d730f611d5 +Subproject commit b32574d0307e296a2604a83c4deae6ccb2ba1fa7 diff --git a/qtspeech b/qtspeech index d66c544fd9d..f667f8da63f 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit d66c544fd9d7330b5bb10ebc9762e9a50e3c1cc3 +Subproject commit f667f8da63fcf782e696da16b6b85ad3fbf4539b diff --git a/qtsvg b/qtsvg index 737a3a8dd70..e0e12caf535 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 737a3a8dd70483121df4e8eda9892badcac161ea +Subproject commit e0e12caf5353ddb9ff43a99913dcf36942648031 diff --git a/qttools b/qttools index 45cb129d38b..31ec5e9c0f3 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 45cb129d38b8025c7832320fa8ec3b54a286a07b +Subproject commit 31ec5e9c0f3388756d06aa8ffd1c59c5f097dbaa diff --git a/qttranslations b/qttranslations index a2cda399e9c..353b10b36c4 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit a2cda399e9c8cb3124e33b1f093a2d4f5618fef2 +Subproject commit 353b10b36c4a26775b204f24b23b47b9dcc00ce4 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 0bc040f6742..f9047a6d586 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 0bc040f67427fa13856854647cb0eb36fd9692b3 +Subproject commit f9047a6d586634ac4fcd2fc35f539f0c367683ed diff --git a/qtwayland b/qtwayland index c5f2e39af5b..3666e24b639 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit c5f2e39af5b80fb694b212cadbf5fd13fb78991e +Subproject commit 3666e24b63916d8af2d71243dcd821860e4f7d19 diff --git a/qtwebchannel b/qtwebchannel index e6969f5c558..5d51387a00a 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit e6969f5c5585463f75066cd8ac20203767bb7d48 +Subproject commit 5d51387a00af8cb76ca7e879583f398faef1f602 diff --git a/qtwebengine b/qtwebengine index 74930dda2ce..2a3d355db05 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 74930dda2ce4fff4bcd5914dde3d6f36412bccc2 +Subproject commit 2a3d355db0516e428594632ec94c46cd10d08332 diff --git a/qtwebsockets b/qtwebsockets index 3383dbfc0d0..8828435e455 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 3383dbfc0d0739ba62efab3f07561ef5ed0ff831 +Subproject commit 8828435e45582b002b324876125e626c52794448 diff --git a/qtwebview b/qtwebview index dbea2678733..3d044bf3207 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit dbea267873391040812f5dcb9fea2bb8559ed056 +Subproject commit 3d044bf320701781cc95fa36c2a0bd9bd93d518f From e2988174881348c8c0f65b17c2253a6ae5cfba36 Mon Sep 17 00:00:00 2001 From: Elias Toivola Date: Thu, 13 Mar 2025 12:59:12 +0200 Subject: [PATCH 282/288] 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. Change-Id: Ia401daf444fbc3e460477fd1f5397781b902cf9d Reviewed-by: Johanna Äijälä Reviewed-by: Matti Paaso (cherry picked from commit 6170adb71fee63beb6b868b492c6db404be05761) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 6d5955d1a57eefb16cda51fffdb2f483f02c4792) --- .../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 1774e09bdb23205a7938103aff9bacbfd8947a67 Mon Sep 17 00:00:00 2001 From: Elias Toivola Date: Thu, 13 Mar 2025 13:49:17 +0200 Subject: [PATCH 283/288] 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. Change-Id: Ia4420de72b26c7b4fd851f079fd4686624e5bf02 Reviewed-by: Matti Paaso (cherry picked from commit 078bd29e2498c779a0c344561fa6f1b3800aa025) Reviewed-by: Johanna Äijälä Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 7437ef45f9c76d102a182d8cbc6697de0b8ae525) --- .../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 7a1b153e5d4981dae01920b470df00daaaaf630f Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 11 Apr 2025 23:59:31 +0000 Subject: [PATCH 284/288] Update submodules on '6.8 in qt/qt5' Change-Id: I08ff733d3e58530674e8f12b9e03597aee813951 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 8305762c180..492a01125dc 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 8305762c180fb6debe28337863229a163ca7393e +Subproject commit 492a01125dcc0b4c709f80a8a4539aa9d6213b94 diff --git a/qt5compat b/qt5compat index 10054f8ac0f..d7a2e542761 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit 10054f8ac0fe61aad4a6c45b22bd08247ca286d9 +Subproject commit d7a2e5427616f9a2cef1e65c8736eea4c646b8a3 diff --git a/qtactiveqt b/qtactiveqt index 68362a51eda..849f644937a 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 68362a51eda1dc23c8d12b388b09a335da275b8c +Subproject commit 849f644937aec4f31188a4ff1ea44355fb884ff4 diff --git a/qtbase b/qtbase index 04ec5f144a6..73a74d440f0 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 04ec5f144a6167ce5d29cf72da3e2de92205b4db +Subproject commit 73a74d440f0b6356a2515c45e812859db4b160c7 diff --git a/qtcharts b/qtcharts index 110f613f14c..958ef7d5492 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 110f613f14c36ccb80c51fb5dcd450880d7f0a44 +Subproject commit 958ef7d54929a5aa9e4bdf962bdff3e4102c72cd diff --git a/qtcoap b/qtcoap index 6cc7197b70f..1d293e74ea1 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit 6cc7197b70f29210656428eb69dc20e14ca5f447 +Subproject commit 1d293e74ea11fd715098f950cadf4176f2273eb5 diff --git a/qtconnectivity b/qtconnectivity index 15d58933c6a..752735ba5a3 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 15d58933c6a1ccd954d1fa123cbb8edd1a589fa3 +Subproject commit 752735ba5a379d4e6139f82e98d6eaed0f555fc6 diff --git a/qtdatavis3d b/qtdatavis3d index e00c02f5409..07440eaff63 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit e00c02f5409fa73f6643c0c2115942785473a867 +Subproject commit 07440eaff63b7fb025c6d9ec37e2fee18700a0f0 diff --git a/qtdeclarative b/qtdeclarative index 32452675dc7..b206c4e687f 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 32452675dc7661de32013969f9d2eb613da70096 +Subproject commit b206c4e687f2c942cd429258b93be6aae245bb34 diff --git a/qtdoc b/qtdoc index 59bcdbfa8c0..61f9bf31e67 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 59bcdbfa8c050a2e242a9f2fd0805b200cb73178 +Subproject commit 61f9bf31e677e3e2887c5ea4bdfb365760377761 diff --git a/qtgraphs b/qtgraphs index 94f28609c95..445d1d7085e 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit 94f28609c9538e1d9f0f5d9707d0c4b69e73c73b +Subproject commit 445d1d7085e7bc043a4a0783f97c56106489762b diff --git a/qtgrpc b/qtgrpc index b9a32e0aec0..4d2c10ca02e 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit b9a32e0aec0e5816d911e4987a720e2fc054da36 +Subproject commit 4d2c10ca02e815a76a0882ad9f3d525cc15e3fb7 diff --git a/qthttpserver b/qthttpserver index 29929d7bc4d..6dcbf737459 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit 29929d7bc4dbffdb10ba7f23d4699447f5b03457 +Subproject commit 6dcbf73745942b9b1e13cf1c483ec305f40acd12 diff --git a/qtimageformats b/qtimageformats index c9dcdde82d0..0b25f0bd540 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit c9dcdde82d0f3d83a86dd50ecdafdb08264030f0 +Subproject commit 0b25f0bd5402b908ad9b111b58d0372d3e7f821d diff --git a/qtlanguageserver b/qtlanguageserver index bea5899d284..238955c97ab 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit bea5899d2840dec38c1c7b917553618c20a7b546 +Subproject commit 238955c97ab006c8e4e794044355fa7603cb1d77 diff --git a/qtlocation b/qtlocation index e33bd271179..351d9ce04ed 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit e33bd271179b3d8aa365e3c7799f010cfc8a410d +Subproject commit 351d9ce04eda5b83c48e240eeb7df10f5c85027b diff --git a/qtlottie b/qtlottie index 92a0884da0a..9a8468e7b48 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 92a0884da0a3604b12bc9afa1b0ce838a0390f75 +Subproject commit 9a8468e7b48bd8fc16213db981364b18d59c5edb diff --git a/qtmqtt b/qtmqtt index d48bd749f1f..f05c792624f 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit d48bd749f1fa6a6dae6885346f30595c1885d213 +Subproject commit f05c792624f9f54b71d1c529a80db077c4691173 diff --git a/qtmultimedia b/qtmultimedia index 88d40064a82..fc6224e1a42 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 88d40064a827e23eaec060145bb644a902ffb073 +Subproject commit fc6224e1a4222b931ded9b234298296e33c834d9 diff --git a/qtnetworkauth b/qtnetworkauth index d029c89b9da..78896a62e09 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit d029c89b9daa2f6e0ee4eaca9103cf7eab92976b +Subproject commit 78896a62e090eb4d53a75c24f5e22f5e9103c766 diff --git a/qtopcua b/qtopcua index f364b47fdcd..c54e24867b8 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit f364b47fdcdcb9947a5ffd9bd1b5b0c6d1c28e4b +Subproject commit c54e24867b894fcca1d7a2f1d39907e6cfe75b2f diff --git a/qtpositioning b/qtpositioning index 73e77ed97a9..82ba4ba2bf4 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit 73e77ed97a9384eb73140b83a364d3866358e364 +Subproject commit 82ba4ba2bf4dfcb582a91d75ba65eb01999c6276 diff --git a/qtquick3d b/qtquick3d index 68474a13909..479f9b07c97 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 68474a13909091f74cde8bcdcc69afb9d00a1355 +Subproject commit 479f9b07c970ca154626ee1ab4e7e04ea9c9de10 diff --git a/qtquick3dphysics b/qtquick3dphysics index 699dffd6b21..2a84e1d8781 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit 699dffd6b215becf23d6391eff1000b342fad7a7 +Subproject commit 2a84e1d878174b9ea788d2d1b219de0f8d66b2c2 diff --git a/qtquickeffectmaker b/qtquickeffectmaker index 8c6c5b4e420..5cb242b4798 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit 8c6c5b4e4205563a19f98f23125dfbb9374829d0 +Subproject commit 5cb242b47983fd8384e31e44cc1c83b72e2b525c diff --git a/qtquicktimeline b/qtquicktimeline index 5f121ca967d..4ff1b4a826a 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 5f121ca967dab80f1fe5360a9685eaec74d19762 +Subproject commit 4ff1b4a826a3c2d7f1b71f5e0cc9beac3697632b diff --git a/qtremoteobjects b/qtremoteobjects index 589cfeb1285..f215cf7f723 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 589cfeb1285adf6937bbf1b4fd7126b05dd09244 +Subproject commit f215cf7f723f0f96f0d899e6c2869a208d8d252b diff --git a/qtscxml b/qtscxml index 5ff53a3173d..6662649b35e 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 5ff53a3173db81c8d52e49b193ff57b4e5d3426a +Subproject commit 6662649b35e65ce117a7b047581ac5c46dd9d366 diff --git a/qtsensors b/qtsensors index b3c6fa3e74c..080c4cf8223 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit b3c6fa3e74c992d1700b055b35e6192d13b129a0 +Subproject commit 080c4cf8223d2855a68e9a5bd516a8759ace9ca2 diff --git a/qtserialbus b/qtserialbus index ed35bc6b721..84c0aaaaa11 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit ed35bc6b721d77db6e54711408d61645fc4c3460 +Subproject commit 84c0aaaaa1174f41599c11d8c28587713bc45044 diff --git a/qtserialport b/qtserialport index 4497ff4b586..b3659066d72 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 4497ff4b586b42dfd1c3c17240517d6e0cd44e39 +Subproject commit b3659066d72538efe22f0f0b7ba172ef9b9b7aa2 diff --git a/qtshadertools b/qtshadertools index b32574d0307..dd0b973f050 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit b32574d0307e296a2604a83c4deae6ccb2ba1fa7 +Subproject commit dd0b973f050d90e63288ffcd94a5d441603f8c06 diff --git a/qtspeech b/qtspeech index f667f8da63f..2a22c506219 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit f667f8da63fcf782e696da16b6b85ad3fbf4539b +Subproject commit 2a22c506219af53f4a8fbce86706b27dbfc31add diff --git a/qtsvg b/qtsvg index e0e12caf535..e03254d12c1 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit e0e12caf5353ddb9ff43a99913dcf36942648031 +Subproject commit e03254d12c1cb78bfcfd29398e2b7cc9d4c1dca8 diff --git a/qttools b/qttools index 31ec5e9c0f3..7176f0d188d 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 31ec5e9c0f3388756d06aa8ffd1c59c5f097dbaa +Subproject commit 7176f0d188d648293859e232854fd1858ae71694 diff --git a/qttranslations b/qttranslations index 353b10b36c4..d3780449415 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 353b10b36c4a26775b204f24b23b47b9dcc00ce4 +Subproject commit d37804494151c659b1ddde1f0037b9a39378e50b diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index f9047a6d586..6cdd69783b8 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit f9047a6d586634ac4fcd2fc35f539f0c367683ed +Subproject commit 6cdd69783b8f53f19ef87b5596ddb3c346768bea diff --git a/qtwayland b/qtwayland index 3666e24b639..dfb67e4a482 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 3666e24b63916d8af2d71243dcd821860e4f7d19 +Subproject commit dfb67e4a4821d438b528271beac80d71e1cb0426 diff --git a/qtwebchannel b/qtwebchannel index 5d51387a00a..f10f75ab8fa 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 5d51387a00af8cb76ca7e879583f398faef1f602 +Subproject commit f10f75ab8fa9fb6fdcb4a3d5182e9462c0ea258a diff --git a/qtwebengine b/qtwebengine index 2a3d355db05..fe932330413 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 2a3d355db0516e428594632ec94c46cd10d08332 +Subproject commit fe932330413d1965954a58d66001c28ce614432c diff --git a/qtwebsockets b/qtwebsockets index 8828435e455..d01c51a4662 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 8828435e45582b002b324876125e626c52794448 +Subproject commit d01c51a4662e8d8a2db5f4f3f150bad8a2571e10 diff --git a/qtwebview b/qtwebview index 3d044bf3207..9a009238df4 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 3d044bf320701781cc95fa36c2a0bd9bd93d518f +Subproject commit 9a009238df44b024fe92eb4ebb5c75418bb495d2 From dd369429fe29f227c9138df1cd4c8467ab1b6247 Mon Sep 17 00:00:00 2001 From: Tero Heikkinen Date: Tue, 14 Jan 2025 12:56:59 +0200 Subject: [PATCH 285/288] 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 Change-Id: I8ae65d0f8729e9dcf9147f45b09279fb805027ef Reviewed-by: Edward Welbourne Reviewed-by: Jukka Jokiniva (cherry picked from commit 8d0f126d853512ce6bc48a7142bfbb518a837904) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 1b6c7cfa1790c2fc144c8ff6d79834c916456b80) --- 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 b8c5ade9349..f92b25c695e 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-mysql' diff --git a/coin/platform_configs/cmake_platforms_static_tests.yaml b/coin/platform_configs/cmake_platforms_static_tests.yaml index b7fdcf26d32..59f20873caa 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: ['Sccache', 'MinimalStaticTests', 'UseConfigure'] Configure arguments: '-nomake examples -static -no-sql-mysql' From d775e67842732ba8dc209f6d5ce324ed711dba76 Mon Sep 17 00:00:00 2001 From: Axel Spoerl Date: Sun, 10 Nov 2024 17:14:10 +0100 Subject: [PATCH 286/288] Linux Provisioning: Turn off window animations Window animations change the physical geometry in relation to the geometry known in Qt. Windows may not be found by QGuiApplication::topLevelAt() as expected. Turn animations off in Linux provisioning. Task-number: QTBUG-130811 Pick-to: 6.8.1 6.5 Change-Id: Id0fa13f4dd38b21dd141f4b51308903ccaf40bba Reviewed-by: Volker Hilsheimer Reviewed-by: Liang Qi (cherry picked from commit d58d59693a878f0c5bb649ee4e37acf75690b73b) Reviewed-by: Qt Cherry-pick Bot --- .../qtci-linux-Debian-11.6-aarch64/01-systemsetup.sh | 2 ++ coin/provisioning/qtci-linux-RHEL-8.10-x86_64/01-systemsetup.sh | 2 ++ coin/provisioning/qtci-linux-RHEL-8.2-x86_64/01-systemsetup.sh | 2 ++ coin/provisioning/qtci-linux-RHEL-8.4-x86_64/01-systemsetup.sh | 2 ++ coin/provisioning/qtci-linux-RHEL-8.6-x86_64/01-systemsetup.sh | 2 ++ coin/provisioning/qtci-linux-RHEL-8.8-x86_64/01-systemsetup.sh | 2 ++ coin/provisioning/qtci-linux-RHEL-9.0-x86_64/01-systemsetup.sh | 2 ++ coin/provisioning/qtci-linux-RHEL-9.2-x86_64/01-systemsetup.sh | 2 ++ coin/provisioning/qtci-linux-RHEL-9.4-x86_64/01-systemsetup.sh | 2 ++ .../qtci-linux-SLES-15_SP4-x86_64/01-systemsetup.sh | 2 ++ .../qtci-linux-SLES-15_SP5-x86_64/01-systemsetup.sh | 2 ++ .../qtci-linux-Ubuntu-18.04-x86_64/01-systemsetup.sh | 2 ++ .../qtci-linux-Ubuntu-20.04-x86_64/01-systemsetup.sh | 2 ++ .../qtci-linux-Ubuntu-22.04-aarch64/01-systemsetup.sh | 2 ++ .../qtci-linux-Ubuntu-22.04-x86_64/01-systemsetup.sh | 2 ++ .../qtci-linux-Ubuntu-24.04-aarch64/01-systemsetup.sh | 2 ++ .../qtci-linux-Ubuntu-24.04-x86_64/01-systemsetup.sh | 2 ++ .../qtci-linux-openSUSE-15.3-x86_64/01-systemsetup.sh | 2 ++ .../qtci-linux-openSUSE-15.4-x86_64/01-systemsetup.sh | 2 ++ .../qtci-linux-openSUSE-15.5-x86_64/01-systemsetup.sh | 2 ++ 20 files changed, 40 insertions(+) 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 98744822c72..f0288905a2b 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 @@ -17,6 +17,8 @@ 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 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 8d43ace0785..1645670e613 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,6 +9,8 @@ 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" 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 434c0651381..b39fe793556 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,6 +8,8 @@ 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" 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 b4bbc865667..46b321dda8e 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,6 +8,8 @@ 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" 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 8d43ace0785..1645670e613 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,6 +9,8 @@ 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" 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 8d43ace0785..1645670e613 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,6 +9,8 @@ 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" 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 5e3ecb27f08..de6abd0a977 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 @@ -25,6 +25,8 @@ gsettings set org.gnome.desktop.session idle-delay 0 gsettings set org.gnome.desktop.interface enable-hot-corners false # 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 fbd00eef436..4fd0b9e71eb 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 @@ -25,6 +25,8 @@ gsettings set org.gnome.desktop.session idle-delay 0 gsettings set org.gnome.desktop.interface enable-hot-corners false # 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 fbd00eef436..4fd0b9e71eb 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 @@ -25,6 +25,8 @@ gsettings set org.gnome.desktop.session idle-delay 0 gsettings set org.gnome.desktop.interface enable-hot-corners false # 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 32c789bb3b1..834843897dc 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 @@ -17,6 +17,8 @@ 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 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 dcbbfea9c8b..4ecddc9d87c 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 @@ -17,6 +17,8 @@ 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 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 81b42211893..ecad2f9eef4 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 @@ -17,6 +17,8 @@ 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 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 98744822c72..f0288905a2b 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 @@ -17,6 +17,8 @@ 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 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 98744822c72..f0288905a2b 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 @@ -17,6 +17,8 @@ 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 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 98744822c72..f0288905a2b 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 @@ -17,6 +17,8 @@ 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 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 98744822c72..f0288905a2b 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 @@ -17,6 +17,8 @@ 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 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 98744822c72..f0288905a2b 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 @@ -17,6 +17,8 @@ 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 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 13e5c31d455..1108ba0276d 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 @@ -18,6 +18,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 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 f89ed0c62ad..d60ccd7f420 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 @@ -18,6 +18,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 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 f3334d07049..01c8a0483c2 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 @@ -17,6 +17,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 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 3d228cc6246e616b2df4fed8c0af0fe03a00a680 Mon Sep 17 00:00:00 2001 From: Tero Heikkinen Date: Fri, 10 Jan 2025 09:39:34 +0200 Subject: [PATCH 287/288] Linux: Add GCC versions visible in versions.txt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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.5 Change-Id: I9742c3151e074c503947018a0c7f7c2e0c1077bd Reviewed-by: Ville-Pekka Karhu (cherry picked from commit 5f627786ef640d72c1e71c0fa8c5ce870e8b1052) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 207ba9b6050d4ecc9b3fdabcbefb1bb6f3f7797c) Reviewed-by: Simo Fält --- .../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 +- 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 +- 17 files changed, 41 insertions(+), 5 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 1daa9305f4e..29415002977 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 @@ -179,6 +179,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 c4ccf3b5894..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 @@ -142,5 +142,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 3bf25d4404a..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 @@ -154,5 +154,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 6afecfc65c8..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 @@ -164,5 +164,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 ecefac8672e..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 @@ -179,6 +179,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 fcca93e0d38..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 @@ -168,5 +168,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 a19077ac06c..4f17d922ea9 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 e726468382c..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 @@ -202,6 +202,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 58a5a84ec3a..a9d12d4405b 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,7 +110,7 @@ sudo zypper -nq install cifs-utils # 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-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 395985387ea..ab7c893cdbe 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 @@ -261,5 +261,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 ff083309609..4f4cdc7a9b4 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 @@ -258,5 +258,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 4ba0c1db901..877542017ec 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 @@ -263,5 +263,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 7938cd9cc7d..cc68792bc09 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 @@ -84,7 +84,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 5d18cb403cc6f0335570a693cf7cde9092eb2f2b Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 17 Apr 2025 16:22:41 +0000 Subject: [PATCH 288/288] Update submodules on '6.8 in qt/qt5' Change-Id: Ia62dbf79931b6ba6a8c2a13abb5047a62eecfa90 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 492a01125dc..2a738b498c6 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 492a01125dcc0b4c709f80a8a4539aa9d6213b94 +Subproject commit 2a738b498c6143f381ba099b20dd928ec42d61a9 diff --git a/qt5compat b/qt5compat index d7a2e542761..16dd58372a2 160000 --- a/qt5compat +++ b/qt5compat @@ -1 +1 @@ -Subproject commit d7a2e5427616f9a2cef1e65c8736eea4c646b8a3 +Subproject commit 16dd58372a291ff24fbb5efe9714e6220bda9769 diff --git a/qtactiveqt b/qtactiveqt index 849f644937a..3c62ddb8abf 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 849f644937aec4f31188a4ff1ea44355fb884ff4 +Subproject commit 3c62ddb8abf4f8b9ead6254f69afe11ad85b4916 diff --git a/qtbase b/qtbase index 73a74d440f0..b93d9dc01a0 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 73a74d440f0b6356a2515c45e812859db4b160c7 +Subproject commit b93d9dc01a068d719e0f06b59b4b566cd6f00163 diff --git a/qtcharts b/qtcharts index 958ef7d5492..df07b220a54 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 958ef7d54929a5aa9e4bdf962bdff3e4102c72cd +Subproject commit df07b220a54bc2b3c8f62b1910a558700acc79e4 diff --git a/qtcoap b/qtcoap index 1d293e74ea1..cb090961fc1 160000 --- a/qtcoap +++ b/qtcoap @@ -1 +1 @@ -Subproject commit 1d293e74ea11fd715098f950cadf4176f2273eb5 +Subproject commit cb090961fc19bab648ef7e6e9bb99f38615adf9c diff --git a/qtconnectivity b/qtconnectivity index 752735ba5a3..9c1cda4fce1 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 752735ba5a379d4e6139f82e98d6eaed0f555fc6 +Subproject commit 9c1cda4fce114266fdd76e092950320ffe008963 diff --git a/qtdatavis3d b/qtdatavis3d index 07440eaff63..a3cad249b96 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 07440eaff63b7fb025c6d9ec37e2fee18700a0f0 +Subproject commit a3cad249b961e05fa15edc48a93d544872b1fd65 diff --git a/qtdeclarative b/qtdeclarative index b206c4e687f..f9e719687fe 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit b206c4e687f2c942cd429258b93be6aae245bb34 +Subproject commit f9e719687fe5160894203a5030bbb2e33ab0cf6f diff --git a/qtdoc b/qtdoc index 61f9bf31e67..31dde6c66c6 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 61f9bf31e677e3e2887c5ea4bdfb365760377761 +Subproject commit 31dde6c66c694bf305b30bde7c60e599f79ae647 diff --git a/qtgraphs b/qtgraphs index 445d1d7085e..535b3184ef0 160000 --- a/qtgraphs +++ b/qtgraphs @@ -1 +1 @@ -Subproject commit 445d1d7085e7bc043a4a0783f97c56106489762b +Subproject commit 535b3184ef0747eac38aaa7e0e83db8788253a9d diff --git a/qtgrpc b/qtgrpc index 4d2c10ca02e..d972d611395 160000 --- a/qtgrpc +++ b/qtgrpc @@ -1 +1 @@ -Subproject commit 4d2c10ca02e815a76a0882ad9f3d525cc15e3fb7 +Subproject commit d972d6113952064bc659de6dea2b85b00d12011c diff --git a/qthttpserver b/qthttpserver index 6dcbf737459..379ebe62abd 160000 --- a/qthttpserver +++ b/qthttpserver @@ -1 +1 @@ -Subproject commit 6dcbf73745942b9b1e13cf1c483ec305f40acd12 +Subproject commit 379ebe62abd97f6c2f0be654e5ac81fbbfd73c34 diff --git a/qtimageformats b/qtimageformats index 0b25f0bd540..a9a8cbbcdbf 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 0b25f0bd5402b908ad9b111b58d0372d3e7f821d +Subproject commit a9a8cbbcdbfda7e7e4d482bdf3fa28a9003b416e diff --git a/qtlanguageserver b/qtlanguageserver index 238955c97ab..1260ed909dd 160000 --- a/qtlanguageserver +++ b/qtlanguageserver @@ -1 +1 @@ -Subproject commit 238955c97ab006c8e4e794044355fa7603cb1d77 +Subproject commit 1260ed909ddfac44443dc9a3c19b6ecb50a1cd6f diff --git a/qtlocation b/qtlocation index 351d9ce04ed..d08bb041ff9 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 351d9ce04eda5b83c48e240eeb7df10f5c85027b +Subproject commit d08bb041ff989fba159b99ba089351b1306b9540 diff --git a/qtlottie b/qtlottie index 9a8468e7b48..fbd91fc9c99 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 9a8468e7b48bd8fc16213db981364b18d59c5edb +Subproject commit fbd91fc9c9999993ab0845da526882db009dd117 diff --git a/qtmqtt b/qtmqtt index f05c792624f..8a8a689ec05 160000 --- a/qtmqtt +++ b/qtmqtt @@ -1 +1 @@ -Subproject commit f05c792624f9f54b71d1c529a80db077c4691173 +Subproject commit 8a8a689ec0539d089a746a81ed99511d82f233e0 diff --git a/qtmultimedia b/qtmultimedia index fc6224e1a42..b99460983eb 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit fc6224e1a4222b931ded9b234298296e33c834d9 +Subproject commit b99460983eb3a0fae024a27ee7a31d290e0366bf diff --git a/qtnetworkauth b/qtnetworkauth index 78896a62e09..7a9d47fd31d 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 78896a62e090eb4d53a75c24f5e22f5e9103c766 +Subproject commit 7a9d47fd31d4e88ff3f5a1ad5aa1bae7ca8ab593 diff --git a/qtopcua b/qtopcua index c54e24867b8..acb7aa618a8 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit c54e24867b894fcca1d7a2f1d39907e6cfe75b2f +Subproject commit acb7aa618a8e654e9d8568d53d1e316aeab6351c diff --git a/qtpositioning b/qtpositioning index 82ba4ba2bf4..8277b8175e3 160000 --- a/qtpositioning +++ b/qtpositioning @@ -1 +1 @@ -Subproject commit 82ba4ba2bf4dfcb582a91d75ba65eb01999c6276 +Subproject commit 8277b8175e31ae6c81a79d8677a42c5e84db6261 diff --git a/qtquick3d b/qtquick3d index 479f9b07c97..f82379f34ec 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 479f9b07c970ca154626ee1ab4e7e04ea9c9de10 +Subproject commit f82379f34ec73a9c088d291523a8997e14d44b7e diff --git a/qtquick3dphysics b/qtquick3dphysics index 2a84e1d8781..c3ab0685b52 160000 --- a/qtquick3dphysics +++ b/qtquick3dphysics @@ -1 +1 @@ -Subproject commit 2a84e1d878174b9ea788d2d1b219de0f8d66b2c2 +Subproject commit c3ab0685b526ab8048935b9d2d9afe2fe071c127 diff --git a/qtquickeffectmaker b/qtquickeffectmaker index 5cb242b4798..22bb16e3540 160000 --- a/qtquickeffectmaker +++ b/qtquickeffectmaker @@ -1 +1 @@ -Subproject commit 5cb242b47983fd8384e31e44cc1c83b72e2b525c +Subproject commit 22bb16e3540e4f0d80027a46cefc527abbc0a19c diff --git a/qtquicktimeline b/qtquicktimeline index 4ff1b4a826a..a18a7090583 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 4ff1b4a826a3c2d7f1b71f5e0cc9beac3697632b +Subproject commit a18a7090583daea8943d141273dfb84e3f763d97 diff --git a/qtremoteobjects b/qtremoteobjects index f215cf7f723..7cc450c51b1 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit f215cf7f723f0f96f0d899e6c2869a208d8d252b +Subproject commit 7cc450c51b1c2b0a5a408e146ac0a388d63c7aea diff --git a/qtscxml b/qtscxml index 6662649b35e..003145fabdf 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 6662649b35e65ce117a7b047581ac5c46dd9d366 +Subproject commit 003145fabdf5c7e2f15177bbc235b553304dee50 diff --git a/qtsensors b/qtsensors index 080c4cf8223..7e479ce98ad 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 080c4cf8223d2855a68e9a5bd516a8759ace9ca2 +Subproject commit 7e479ce98adb8e6994610a0bdd24b0d2f49d9806 diff --git a/qtserialbus b/qtserialbus index 84c0aaaaa11..2266b01cc0b 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 84c0aaaaa1174f41599c11d8c28587713bc45044 +Subproject commit 2266b01cc0bcefbd8fd40fe00bcba1f635054498 diff --git a/qtserialport b/qtserialport index b3659066d72..856c383ba6e 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit b3659066d72538efe22f0f0b7ba172ef9b9b7aa2 +Subproject commit 856c383ba6ec02a470674b1a04b9968825d2dccd diff --git a/qtshadertools b/qtshadertools index dd0b973f050..45903247484 160000 --- a/qtshadertools +++ b/qtshadertools @@ -1 +1 @@ -Subproject commit dd0b973f050d90e63288ffcd94a5d441603f8c06 +Subproject commit 45903247484c4adb5802a0e36fd1a3b71d103aef diff --git a/qtspeech b/qtspeech index 2a22c506219..c26f7e8911c 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 2a22c506219af53f4a8fbce86706b27dbfc31add +Subproject commit c26f7e8911c6d69c4ef88b13455b8620bf6dc1ba diff --git a/qtsvg b/qtsvg index e03254d12c1..2cfc9d5ae5f 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit e03254d12c1cb78bfcfd29398e2b7cc9d4c1dca8 +Subproject commit 2cfc9d5ae5ffa663c5a632c67be12d4f3f718913 diff --git a/qttools b/qttools index 7176f0d188d..77db9c95047 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 7176f0d188d648293859e232854fd1858ae71694 +Subproject commit 77db9c950477d9aa89d583b025f01c9e13e3ae44 diff --git a/qttranslations b/qttranslations index d3780449415..74e6bfc5d0e 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit d37804494151c659b1ddde1f0037b9a39378e50b +Subproject commit 74e6bfc5d0e8913043677ee54ab19b7ce36beec3 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 6cdd69783b8..771e99e43a4 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 6cdd69783b8f53f19ef87b5596ddb3c346768bea +Subproject commit 771e99e43a4c20789df289dbedf98a201bfe06aa diff --git a/qtwayland b/qtwayland index dfb67e4a482..e98390fe0ec 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit dfb67e4a4821d438b528271beac80d71e1cb0426 +Subproject commit e98390fe0ec6ef8fca62645521aa30905b4ab75a diff --git a/qtwebchannel b/qtwebchannel index f10f75ab8fa..36e6623be61 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit f10f75ab8fa9fb6fdcb4a3d5182e9462c0ea258a +Subproject commit 36e6623be61e4d12376dcc1ed4c9ae059fa64bc3 diff --git a/qtwebengine b/qtwebengine index fe932330413..c36197b11e9 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit fe932330413d1965954a58d66001c28ce614432c +Subproject commit c36197b11e99d91f4f7dc56fb44f1457e3aea3bf diff --git a/qtwebsockets b/qtwebsockets index d01c51a4662..352369b04a9 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit d01c51a4662e8d8a2db5f4f3f150bad8a2571e10 +Subproject commit 352369b04a95cdebc6aaa346689f562401c09c78 diff --git a/qtwebview b/qtwebview index 9a009238df4..e070f3c5bd8 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 9a009238df44b024fe92eb4ebb5c75418bb495d2 +Subproject commit e070f3c5bd8d3069acdf0f0d2d820ecb4f80ea46