Compare commits

...

30 Commits

Author SHA1 Message Date
Qt Submodule Update Bot
15b7e7434f Update submodules on '6.6.2 in qt/qt5'
Change-Id: Id64ae53929bcec2fcf6ebe552a8afbc9b879a867
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-02-10 05:36:44 +00:00
Qt Submodule Update Bot
92729bab22 Update submodules on '6.6.2 in qt/qt5'
Change-Id: Iffeb132a7c4ab5f2cc27ddffe18b8b7f027affe4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-01-31 16:50:41 +00:00
Qt Submodule Update Bot
2446534e21 Update submodules on '6.6.2 in qt/qt5'
Change-Id: I81e173769ae112ef36ef924a7ebda86d9f48b4cc
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-01-29 16:29:38 +00:00
Artem Dyomin
8c32eac8e2 Update ffmpeg n6.0 -> n6.1 on Windows
The update will go tohether with dynamic ffmpeg build on Windows.

Task-number: QTBUG-121441
Pick-to: 6.7 6.6 6.5 dev
Change-Id: I7a72d4009c8a8e4030899b526bad9cfedd6f45a7
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2024-01-29 12:28:40 +00:00
Artem Dyomin
a1de7aea70 Update ffmpeg to n6.1 for Linux, and macOS
FFmpeg version was between n6.0 and n6.1 due to some hotfix
for having it compilable on CI. Since n6.1 has been released,
we should update.

Task-number: QTBUG-121441
Pick-to: 6.7 6.6 6.5 dev
Change-Id: I0d88599be53748eeb038287abe8aad6c0f189933
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2024-01-29 12:28:37 +00:00
Jani Heikkinen
7e39dccbf7 Update commercial license agreement in src packages
Use new way to refer T&C in web pages instead of having exact license
text. This file is already removed from 6.7 -> so do this update for
6.6 and older releases.

Pick-to: 6.6 6.5 6.2 5.15
Change-Id: I2db6d9343a8b5c8fe69778a881559e0a1314390e
Reviewed-by: Tino Pyssysalo <tino.pyssysalo@qt.io>
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
2024-01-28 18:33:17 +00:00
Jani Heikkinen
1b3a5879d3 Adjust submodule branches
Change-Id: I26011090bc9e407895658766d17be1d16ca63487
2024-01-23 08:01:24 +02:00
Qt Submodule Update Bot
efe8f4a352 Update submodules on '6.6 in qt/qt5'
Change-Id: I8bec67916a162530d94c6b4838b6ec2ffc7964df
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2024-01-22 19:01:49 +00:00
Tero Heikkinen
676887cea7 Fix OpenSUSE 15.5 with new re-created Tier1 image
Task-number: QTQAINFRA-6065
Pick-to: 6.5
Change-Id: I24530bcca2a8f8e50686703d8cd8519c27195de2
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
(cherry picked from commit b6829751d2)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit a6a703153a)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2024-01-21 17:45:11 +00:00
Axel Spoerl
2af309adf5 COIN: Install dummy sound device on openSuSE Leap 15.5
Add missing dummy sound device, to prevent sound based tests from
failing / flaking.

Fixes: QTBUG-120655
Pick-to: 6.5
Change-Id: I555d1391b49892226732f36c6a67be7d8dae3d4b
Reviewed-by: Elias Toivola <elias.toivola@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 198cd69244)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 769e914ddc)
2024-01-12 13:29:13 +00:00
Matti Paaso
b7c53e2f70 Fix windows network adapter name for Windos 10 x86
Using the same solution as all the other Windows VMs

Pick-to: 6.5 6.2 5.15
Change-Id: I643f332c99e62ba8037e2db60fa69298a585b306
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 823f127bed)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit b2f16b7e43)
2024-01-10 19:51:41 +00:00
Toni Saario
5607e01280 Set resolution for newer qemu displays
Windows recognizes newer qemu as different display, which needs
to be handled as well.

Pick-to: 6.5 6.2 5.15
Task-number: QTQAINFRA-5987
Change-Id: I6819bfa6dd90a3f54cfcb0b5b885ba909052d375
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 349ce73bba)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit d497b98b02)
2023-12-30 08:02:38 +00:00
Assam Boudjelthia
481825822b Android: use Android emulator 32.1.15 to not break rhi tests
Currently CI doesn't cache specific Android Emulator version,
so after an update was availabe 33.1.23 is broke RHI tests on
Android 13 emulator. The last known emulator version to to work
was 32.1.15, so as a workaround we install this specific version.

Fixes: QTBUG-119884
Pick-to: 6.5
Change-Id: Iec56207b6142d97a9dfabc0fb07a920c868e58b1
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2023-12-30 08:02:32 +00:00
Heikki Halmet
521c2ca39a Add refresh support for all Red Hat versions
Pick-to: 6.5 6.2 5.15
Change-Id: I1fbfadf70a9b7dbf0f738aa41d627adfac6138c5
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 3c5d9cabf0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit f0fb226c19)
Reviewed-by: Simo Fält <simo.falt@qt.io>
2023-12-30 08:02:26 +00:00
Qt Submodule Update Bot
2cd6c783df Update submodules on '6.6 in qt/qt5'
Change-Id: Id848cf24511dea23b1ec68ab13d0f771b324e140
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-12-29 04:54:33 +00:00
Qt Submodule Update Bot
6de771af2e Update submodules on '6.6 in qt/qt5'
Change-Id: I619b1dd57cd74ad7e0ea0c05e6fbcae9dc82f690
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-12-22 20:09:13 +00:00
Lucie Gérard
1e71fe7ed6 Update remaining old style license header to SPDX style in coin
Task-number: QTBUG-108364
Change-Id: Ic36ce592d0ff698b30fbf2edab106d4af5d31bc2
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 3d065be1d0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 459151ae83)
2023-12-13 12:08:37 +00:00
Safiyyah Moosa
e4a4055c21 Doc: Create a CONTRIBUTING.md file
Many users push Qt contributions to the Github repository mirror(s), however we cannot accept these contributions. This file directs users
to Qt's contributing guidelines wiki page.

A .github/pull_request_template.md file has also been created for Qt
project.

Fixes: QTBUG-116663
Pick-to: 6.5
Change-Id: Iea4cba8e6cb90859bd364ae4480be0e000f9bae6
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
(cherry picked from commit baf7aacdac)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit a9df6ed369)
2023-12-12 15:50:33 +00:00
Lucie Gérard
9224150c6d Update license header to SPDX format
Pick-to: 6.5
Task-number: QTBUG-67283
Change-Id: Id3679318557c7611b040b155fe1c815e1093d8f9
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit a09d8e0ae6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 6affbbde90)
2023-12-12 15:50:32 +00:00
Qt Submodule Update Bot
1df17d4559 Update submodules on '6.6 in qt/qt5'
Change-Id: Id0aa5b408fbfcf554b3624f1c5e98afcefbd13be
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-12-08 23:11:46 +00:00
Aku Pietikäinen
4852bd216b Update webos tier 1 image
Increase Ubuntu 20.04 disk size to 1 TB to fix webos build.

Change-Id: Id1290bf7745f500097341bd8476dc5be45b69b0d
Task-number: QTQAINFRA-5898
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit cebd09e9ea)
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2023-12-08 11:48:34 +00:00
Antti Kokko
23b1604ee9 Add back RHEL 8.6 configuration for Qt Creator builds
Qt Creator uses Rhel8.6 from 6.6 branch in builds, bring back the
configuration.

Change-Id: Id0f51c4eb770404cc5fc18e372d6ff861a5e99cb
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2023-11-29 11:05:50 +00:00
Bartlomiej Moskal
f3a55f5892 Coin: Enable openssl for Android FFmpeg install script
The FFmpeg library should use dynamically linked OpenSSL. To make it
possible --enable-openssl flag need to be set. Additionally correct path
for OpenSSL need to be passed to FFmpeg configuration script.

Task-number: QTBUG-110805
Task-number: QTBUG-114954
Task-number: QTBUG-113980
Pick-to: 6.5
Change-Id: Id887c2c4083663a674123a0f0003b44661149116
Reviewed-by: Samuel Mira <samuel.mira@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 65101a61e6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-11-28 13:57:28 +00:00
Petri Virkkunen
0092324709 Upgrade Python on RHEL 8.8 from 3.8 to 3.11
In order to avoid installing packages to one version of python and then
trying to use them from another version, stop installing python 3.8 and
simply install Python 3.11, along with pip.

Change-Id: Id2f63a6d1aff0d3fd3a5934887fe82a642f6ab92
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
Reviewed-by: Zoltan Gera <zoltan.gera@qt.io>
(cherry picked from commit e9325a87a6)
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
2023-11-24 13:38:37 +00:00
Konrad Kujawa
7b0f3dcfef Add provisioning of gRPC on Windows machines
Enable native_grpc feature on msvc developer-builds.

Fixes: QTBUG-109072
Change-Id: I64914d4bf0f26b907a98508f88587cbc8cb947b3
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Tatiana Borisova <tatiana.borisova@qt.io>
(cherry picked from commit 9707535fc1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-11-24 05:45:00 +00:00
Tero Heikkinen
fb0b54a356 Remove RHEL 8.6 from yaml configurations
Removing RHEL 8.6 from yaml configurations at first
and scripts will be kept for some time, until removed later.

Task-number: QTQAINFRA-5768
Change-Id: I687f96de35b4bfa28d5a520717f29f059c4925c3
(cherry picked from commit 19cbccac87)
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Petri Virkkunen <petri.virkkunen@qt.io>
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
2023-11-23 10:04:07 +02:00
Qt Submodule Update Bot
4fc5a6b9aa Update submodules on '6.6 in qt/qt5'
Change-Id: I5058a0f5dd79efaa0b471046c0285d06bca03cd0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-11-18 03:04:03 +00:00
Tor Arne Vestbø
27294e0c4e Stop testing macOS developer builds on x86_64 hardware
Our x86_64 pool is overloaded, so we need to reduce jobs.

As we're testing our packaging (universal) builds (both the one built
on x86_64 and the one built on arm64) on x86_64 for all macOS platforms
we support, it should be fine to remove the x86_64 tests of the
developer builds. These developer builds are still tested on arm64,
so the only test coverage we're losing on x86_64 are the subset of
tests that depend on QT_BUILD_INTERNAL.

Change-Id: Ia83964cc77d04ba796e3a59389ce000a51dcac93
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 760cf59266)
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2023-11-16 16:18:31 +00:00
Alexandru Croitor
3967d3bdd0 CMake: Update provisioned CMake to version 3.27.7
We want access to the debugger, and also to be in sync with the CMake
shipped with the Qt SDK.

Task-number: QTBUG-118138
Change-Id: I4b43b9543e8e6ef23c9608a8e1c623ee16edfbd5
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit bae2268c47)
2023-11-16 11:05:32 +01:00
Allan Sandfeld Jensen
74b7265f64 Add libatomic to RHEL 8.8
Needed for qtwebengine 6.7

Pick-to: 6.5
Fixes: QTBUG-119109
Change-Id: I38d78731578dcb4ce5a8755d116e1326e6d6ffa4
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 23ab8c94b0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-11-14 21:07:33 +00:00
94 changed files with 314 additions and 2670 deletions

9
.github/pull_request_template.md vendored Normal file
View File

@@ -0,0 +1,9 @@
## Qt contribution guidelines
We welcome contributions to Qt!
Note that all contributions to the Qt project are exclusively handled through the [Gerrit code review system](https://codereview.qt-project.org).
Read the
[Qt Contribution Guidelines](https://wiki.qt.io/Qt_Contribution_Guidelines) to learn more.

84
.gitmodules vendored
View File

@@ -1,40 +1,40 @@
[submodule "qtbase"] [submodule "qtbase"]
path = qtbase path = qtbase
url = ../qtbase.git url = ../qtbase.git
branch = 6.6 branch = 6.6.2
status = essential status = essential
[submodule "qtsvg"] [submodule "qtsvg"]
depends = qtbase depends = qtbase
path = qtsvg path = qtsvg
url = ../qtsvg.git url = ../qtsvg.git
branch = 6.6 branch = 6.6.2
status = addon status = addon
[submodule "qtdeclarative"] [submodule "qtdeclarative"]
depends = qtbase depends = qtbase
recommends = qtimageformats qtshadertools qtsvg qtlanguageserver recommends = qtimageformats qtshadertools qtsvg qtlanguageserver
path = qtdeclarative path = qtdeclarative
url = ../qtdeclarative.git url = ../qtdeclarative.git
branch = 6.6 branch = 6.6.2
status = essential status = essential
[submodule "qtactiveqt"] [submodule "qtactiveqt"]
depends = qtbase depends = qtbase
path = qtactiveqt path = qtactiveqt
url = ../qtactiveqt.git url = ../qtactiveqt.git
branch = 6.6 branch = 6.6.2
status = addon status = addon
[submodule "qtmultimedia"] [submodule "qtmultimedia"]
depends = qtbase qtshadertools depends = qtbase qtshadertools
recommends = qtdeclarative qtquick3d recommends = qtdeclarative qtquick3d
path = qtmultimedia path = qtmultimedia
url = ../qtmultimedia.git url = ../qtmultimedia.git
branch = 6.6 branch = 6.6.2
status = addon status = addon
[submodule "qttools"] [submodule "qttools"]
depends = qtbase depends = qtbase
recommends = qtdeclarative qtactiveqt recommends = qtdeclarative qtactiveqt
path = qttools path = qttools
url = ../qttools.git url = ../qttools.git
branch = 6.6 branch = 6.6.2
status = essential status = essential
[submodule "qtxmlpatterns"] [submodule "qtxmlpatterns"]
depends = qtbase depends = qtbase
@@ -47,7 +47,7 @@
depends = qttools depends = qttools
path = qttranslations path = qttranslations
url = ../qttranslations.git url = ../qttranslations.git
branch = 6.6 branch = 6.6.2
status = essential status = essential
priority = 30 priority = 30
[submodule "qtdoc"] [submodule "qtdoc"]
@@ -55,7 +55,7 @@
recommends = qtmultimedia qtshadertools qtwebengine recommends = qtmultimedia qtshadertools qtwebengine
path = qtdoc path = qtdoc
url = ../qtdoc.git url = ../qtdoc.git
branch = 6.6 branch = 6.6.2
status = essential status = essential
priority = 40 priority = 40
[submodule "qtrepotools"] [submodule "qtrepotools"]
@@ -76,21 +76,21 @@
recommends = qtdeclarative recommends = qtdeclarative
path = qtlocation path = qtlocation
url = ../qtlocation.git url = ../qtlocation.git
branch = 6.6 branch = 6.6.2
status = preview status = preview
[submodule "qtpositioning"] [submodule "qtpositioning"]
depends = qtbase depends = qtbase
recommends = qtdeclarative qtserialport recommends = qtdeclarative qtserialport
path = qtpositioning path = qtpositioning
url = ../qtpositioning.git url = ../qtpositioning.git
branch = 6.6 branch = 6.6.2
status = addon status = addon
[submodule "qtsensors"] [submodule "qtsensors"]
depends = qtbase depends = qtbase
recommends = qtdeclarative recommends = qtdeclarative
path = qtsensors path = qtsensors
url = ../qtsensors.git url = ../qtsensors.git
branch = 6.6 branch = 6.6.2
status = addon status = addon
[submodule "qtsystems"] [submodule "qtsystems"]
depends = qtbase depends = qtbase
@@ -117,61 +117,61 @@
recommends = qtdeclarative recommends = qtdeclarative
path = qtconnectivity path = qtconnectivity
url = ../qtconnectivity.git url = ../qtconnectivity.git
branch = 6.6 branch = 6.6.2
status = addon status = addon
[submodule "qtwayland"] [submodule "qtwayland"]
depends = qtbase depends = qtbase
recommends = qtdeclarative recommends = qtdeclarative
path = qtwayland path = qtwayland
url = ../qtwayland.git url = ../qtwayland.git
branch = 6.6 branch = 6.6.2
status = addon status = addon
[submodule "qt3d"] [submodule "qt3d"]
depends = qtbase depends = qtbase
recommends = qtdeclarative qtshadertools qtmultimedia recommends = qtdeclarative qtshadertools qtmultimedia
path = qt3d path = qt3d
url = ../qt3d.git url = ../qt3d.git
branch = 6.6 branch = 6.6.2
status = addon status = addon
[submodule "qtimageformats"] [submodule "qtimageformats"]
depends = qtbase depends = qtbase
path = qtimageformats path = qtimageformats
url = ../qtimageformats.git url = ../qtimageformats.git
branch = 6.6 branch = 6.6.2
status = addon status = addon
[submodule "qtserialbus"] [submodule "qtserialbus"]
depends = qtbase depends = qtbase
recommends = qtserialport recommends = qtserialport
path = qtserialbus path = qtserialbus
url = ../qtserialbus.git url = ../qtserialbus.git
branch = 6.6 branch = 6.6.2
status = addon status = addon
[submodule "qtserialport"] [submodule "qtserialport"]
depends = qtbase depends = qtbase
path = qtserialport path = qtserialport
url = ../qtserialport.git url = ../qtserialport.git
branch = 6.6 branch = 6.6.2
status = addon status = addon
[submodule "qtwebsockets"] [submodule "qtwebsockets"]
depends = qtbase depends = qtbase
recommends = qtdeclarative recommends = qtdeclarative
path = qtwebsockets path = qtwebsockets
url = ../qtwebsockets.git url = ../qtwebsockets.git
branch = 6.6 branch = 6.6.2
status = addon status = addon
[submodule "qtwebchannel"] [submodule "qtwebchannel"]
depends = qtbase depends = qtbase
recommends = qtdeclarative qtwebsockets recommends = qtdeclarative qtwebsockets
path = qtwebchannel path = qtwebchannel
url = ../qtwebchannel.git url = ../qtwebchannel.git
branch = 6.6 branch = 6.6.2
status = addon status = addon
[submodule "qtwebengine"] [submodule "qtwebengine"]
depends = qtdeclarative depends = qtdeclarative
recommends = qtwebchannel qttools qtpositioning recommends = qtwebchannel qttools qtpositioning
path = qtwebengine path = qtwebengine
url = ../qtwebengine.git url = ../qtwebengine.git
branch = 6.6 branch = 6.6.2
status = addon status = addon
priority = 10 priority = 10
[submodule "qtcanvas3d"] [submodule "qtcanvas3d"]
@@ -185,28 +185,28 @@
recommends = qtwebengine recommends = qtwebengine
path = qtwebview path = qtwebview
url = ../qtwebview.git url = ../qtwebview.git
branch = 6.6 branch = 6.6.2
status = addon status = addon
[submodule "qtcharts"] [submodule "qtcharts"]
depends = qtbase depends = qtbase
recommends = qtdeclarative qtmultimedia recommends = qtdeclarative qtmultimedia
path = qtcharts path = qtcharts
url = ../qtcharts.git url = ../qtcharts.git
branch = 6.6 branch = 6.6.2
status = addon status = addon
[submodule "qtdatavis3d"] [submodule "qtdatavis3d"]
depends = qtbase depends = qtbase
recommends = qtdeclarative qtmultimedia recommends = qtdeclarative qtmultimedia
path = qtdatavis3d path = qtdatavis3d
url = ../qtdatavis3d.git url = ../qtdatavis3d.git
branch = 6.6 branch = 6.6.2
status = addon status = addon
[submodule "qtvirtualkeyboard"] [submodule "qtvirtualkeyboard"]
depends = qtbase qtdeclarative qtsvg depends = qtbase qtdeclarative qtsvg
recommends = qtmultimedia recommends = qtmultimedia
path = qtvirtualkeyboard path = qtvirtualkeyboard
url = ../qtvirtualkeyboard.git url = ../qtvirtualkeyboard.git
branch = 6.6 branch = 6.6.2
status = addon status = addon
[submodule "qtgamepad"] [submodule "qtgamepad"]
depends = qtbase depends = qtbase
@@ -219,27 +219,27 @@
depends = qtbase qtdeclarative depends = qtbase qtdeclarative
path = qtscxml path = qtscxml
url = ../qtscxml.git url = ../qtscxml.git
branch = 6.6 branch = 6.6.2
status = addon status = addon
[submodule "qtspeech"] [submodule "qtspeech"]
depends = qtbase depends = qtbase
recommends = qtdeclarative qtmultimedia recommends = qtdeclarative qtmultimedia
path = qtspeech path = qtspeech
url = ../qtspeech.git url = ../qtspeech.git
branch = 6.6 branch = 6.6.2
status = addon status = addon
[submodule "qtnetworkauth"] [submodule "qtnetworkauth"]
depends = qtbase depends = qtbase
path = qtnetworkauth path = qtnetworkauth
url = ../qtnetworkauth.git url = ../qtnetworkauth.git
branch = 6.6 branch = 6.6.2
status = addon status = addon
[submodule "qtremoteobjects"] [submodule "qtremoteobjects"]
depends = qtbase depends = qtbase
recommends = qtdeclarative recommends = qtdeclarative
path = qtremoteobjects path = qtremoteobjects
url = ../qtremoteobjects.git url = ../qtremoteobjects.git
branch = 6.6 branch = 6.6.2
status = addon status = addon
[submodule "qtwebglplugin"] [submodule "qtwebglplugin"]
depends = qtbase qtwebsockets depends = qtbase qtwebsockets
@@ -252,87 +252,87 @@
depends = qtbase qtdeclarative depends = qtbase qtdeclarative
path = qtlottie path = qtlottie
url = ../qtlottie.git url = ../qtlottie.git
branch = 6.6 branch = 6.6.2
status = addon status = addon
[submodule "qtquicktimeline"] [submodule "qtquicktimeline"]
depends = qtbase qtdeclarative depends = qtbase qtdeclarative
path = qtquicktimeline path = qtquicktimeline
url = ../qtquicktimeline url = ../qtquicktimeline
branch = 6.6 branch = 6.6.2
status = addon status = addon
[submodule "qtquick3d"] [submodule "qtquick3d"]
depends = qtbase qtdeclarative qtshadertools depends = qtbase qtdeclarative qtshadertools
recommends = qtquicktimeline recommends = qtquicktimeline
path = qtquick3d path = qtquick3d
url = ../qtquick3d.git url = ../qtquick3d.git
branch = 6.6 branch = 6.6.2
status = addon status = addon
[submodule "qtshadertools"] [submodule "qtshadertools"]
depends = qtbase depends = qtbase
path = qtshadertools path = qtshadertools
url = ../qtshadertools.git url = ../qtshadertools.git
branch = 6.6 branch = 6.6.2
status = addon status = addon
[submodule "qt5compat"] [submodule "qt5compat"]
depends = qtbase qtdeclarative depends = qtbase qtdeclarative
path = qt5compat path = qt5compat
url = ../qt5compat.git url = ../qt5compat.git
branch = 6.6 branch = 6.6.2
status = deprecated status = deprecated
[submodule "qtcoap"] [submodule "qtcoap"]
depends = qtbase depends = qtbase
path = qtcoap path = qtcoap
url = ../qtcoap.git url = ../qtcoap.git
branch = 6.6 branch = 6.6.2
status = addon status = addon
[submodule "qtmqtt"] [submodule "qtmqtt"]
depends = qtbase qtdeclarative depends = qtbase qtdeclarative
path = qtmqtt path = qtmqtt
url = ../qtmqtt.git url = ../qtmqtt.git
branch = 6.6 branch = 6.6.2
status = addon status = addon
[submodule "qtopcua"] [submodule "qtopcua"]
depends = qtbase qtdeclarative depends = qtbase qtdeclarative
path = qtopcua path = qtopcua
url = ../qtopcua.git url = ../qtopcua.git
branch = 6.6 branch = 6.6.2
status = addon status = addon
[submodule "qtlanguageserver"] [submodule "qtlanguageserver"]
depends = qtbase depends = qtbase
path = qtlanguageserver path = qtlanguageserver
url = ../qtlanguageserver.git url = ../qtlanguageserver.git
branch = 6.6 branch = 6.6.2
status = preview status = preview
[submodule "qthttpserver"] [submodule "qthttpserver"]
depends = qtbase depends = qtbase
recommends = qtwebsockets recommends = qtwebsockets
path = qthttpserver path = qthttpserver
url = ../qthttpserver.git url = ../qthttpserver.git
branch = 6.6 branch = 6.6.2
status = preview status = preview
[submodule "qtquick3dphysics"] [submodule "qtquick3dphysics"]
depends = qtbase qtdeclarative qtquick3d qtshadertools depends = qtbase qtdeclarative qtquick3d qtshadertools
path = qtquick3dphysics path = qtquick3dphysics
url = ../qtquick3dphysics.git url = ../qtquick3dphysics.git
branch = 6.6 branch = 6.6.2
status = addon status = addon
[submodule "qtgrpc"] [submodule "qtgrpc"]
depends = qtbase depends = qtbase
recommends = qtdeclarative recommends = qtdeclarative
path = qtgrpc path = qtgrpc
url = ../qtgrpc.git url = ../qtgrpc.git
branch = 6.6 branch = 6.6.2
status = preview status = preview
[submodule "qtquickeffectmaker"] [submodule "qtquickeffectmaker"]
depends = qtbase qtdeclarative qtshadertools depends = qtbase qtdeclarative qtshadertools
recommends = qtquick3d recommends = qtquick3d
path = qtquickeffectmaker path = qtquickeffectmaker
url = ../qtquickeffectmaker.git url = ../qtquickeffectmaker.git
branch = 6.6 branch = 6.6.2
status = addon status = addon
[submodule "qtgraphs"] [submodule "qtgraphs"]
depends = qtbase qtdeclarative qtquick3d depends = qtbase qtdeclarative qtquick3d
path = qtgraphs path = qtgraphs
url = ../qtgraphs.git url = ../qtgraphs.git
branch = 6.6 branch = 6.6.2
status = preview status = preview

8
CONTRIBUTING.md Normal file
View File

@@ -0,0 +1,8 @@
## Qt contribution guidelines
We welcome contributions to Qt!
Note that we cannot accept pull requests on GitHub. All contributions to the Qt project are exclusively handled through the [Gerrit code review system](https://codereview.qt-project.org).
Read the
[Qt Contribution Guidelines](https://wiki.qt.io/Qt_Contribution_Guidelines) to learn more.

File diff suppressed because it is too large Load Diff

View File

@@ -2,7 +2,7 @@ Version: 2
Configurations: Configurations:
- -
Id: 'opensuse-15.5-host-asan' Id: 'opensuse-15.5-host-asan'
Template: 'qtci-linux-openSUSE-15.5-x86_64-51' Template: 'qtci-linux-openSUSE-15.5-x86_64-52'
Compiler: 'GCC' Compiler: 'GCC'
Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure', 'UseAddressSanitizer'] Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure', 'UseAddressSanitizer']
Configure arguments: '-nomake examples -developer-build' Configure arguments: '-nomake examples -developer-build'

View File

@@ -40,7 +40,7 @@ Configurations:
Platform dependency: 'ubuntu-22.04' Platform dependency: 'ubuntu-22.04'
- -
Id: 'opensuse-15.5-developer-build' Id: 'opensuse-15.5-developer-build'
Template: 'qtci-linux-openSUSE-15.5-x86_64-51' Template: 'qtci-linux-openSUSE-15.5-x86_64-52'
Compiler: 'GCC' Compiler: 'GCC'
Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure'] Features: ['Sccache', 'WarningsAreErrors', 'UseConfigure']
Configure arguments: '-nomake examples -developer-build' Configure arguments: '-nomake examples -developer-build'
@@ -70,7 +70,6 @@ Configurations:
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}', 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DFEATURE_native_grpc=OFF', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DFEATURE_native_grpc=OFF',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
] ]
- -
Id: 'windows-11_22h2-msvc2019' Id: 'windows-11_22h2-msvc2019'
@@ -83,7 +82,6 @@ Configurations:
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DFEATURE_native_grpc=OFF', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DFEATURE_native_grpc=OFF',
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}', 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
] ]
- -
Id: 'windows-10_22h2-msvc2022' Id: 'windows-10_22h2-msvc2022'
@@ -93,10 +91,9 @@ Configurations:
Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib' Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib'
Environment variables: [ 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}}', '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}}', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DFEATURE_native_grpc=OFF',
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}', 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
] ]
- -
Id: 'windows-11_22h2-msvc2022' Id: 'windows-11_22h2-msvc2022'
@@ -106,10 +103,9 @@ Configurations:
Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib' Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib'
Environment variables: [ Environment variables: [
'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..', '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}}', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DFEATURE_native_grpc=OFF',
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}', 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
] ]
- -
Id: 'windows-10_22h2-msvc2019-developer-build' Id: 'windows-10_22h2-msvc2019-developer-build'
@@ -138,7 +134,6 @@ Configurations:
'OPENSSL_INCLUDE_x64={{.Env.OPENSSL_INCLUDE_x64_arm64}}', 'OPENSSL_INCLUDE_x64={{.Env.OPENSSL_INCLUDE_x64_arm64}}',
'OPENSSL_LIB_x64={{.Env.OPENSSL_LIB_x64_arm64}}', 'OPENSSL_LIB_x64={{.Env.OPENSSL_LIB_x64_arm64}}',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
] ]
- -
Id: 'windows-11_22h2-msvc2019-developer-build' Id: 'windows-11_22h2-msvc2019-developer-build'
@@ -164,17 +159,6 @@ Configurations:
'TARGET_CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON', 'TARGET_CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON',
'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF', 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
]
-
Id: 'rhel-8.6'
Template: 'qtci-linux-RHEL-8.6-x86_64-50'
Compiler: 'GCC'
Features: ['Packaging', '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}} -DFEATURE_native_grpc=OFF'
] ]
- -
Id: 'rhel-8.8' Id: 'rhel-8.8'
@@ -231,7 +215,6 @@ Configurations:
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}} -DFEATURE_native_grpc=OFF -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}} -DFEATURE_native_grpc=OFF -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}', 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_mingw}}', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_mingw}}',
'gRPC_ROOT={{.Env.gRPC_ROOT_mingw}}',
] ]
- -
Id: 'windows-10_22h2-llvm' Id: 'windows-10_22h2-llvm'
@@ -245,7 +228,6 @@ Configurations:
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_LLVM_MINGW}} -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_LLVM_MINGW}} -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
'LLVM_INSTALL_DIR=C:\llvm-mingw', 'LLVM_INSTALL_DIR=C:\llvm-mingw',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_llvm_mingw}}', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_llvm_mingw}}',
'gRPC_ROOT={{.Env.gRPC_ROOT_llvm_mingw}}',
] ]
- -
Id: 'windows-11_22h2-llvm' Id: 'windows-11_22h2-llvm'
@@ -259,7 +241,6 @@ Configurations:
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_LLVM_MINGW}} -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_LLVM_MINGW}} -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
'LLVM_INSTALL_DIR=C:\llvm-mingw', 'LLVM_INSTALL_DIR=C:\llvm-mingw',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_llvm_mingw}}', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_llvm_mingw}}',
'gRPC_ROOT={{.Env.gRPC_ROOT_llvm_mingw}}',
] ]
- -
Id: 'windows-10_22h2-mingw11-developer-build' Id: 'windows-10_22h2-mingw11-developer-build'
@@ -270,10 +251,9 @@ Configurations:
Environment variables: [ Environment variables: [
'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}', 'Path={{.Env.MINGW1120}}\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', 'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}} -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}} -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c -DFEATURE_native_grpc=OFF',
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}', 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_mingw}}', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_mingw}}',
'gRPC_ROOT={{.Env.gRPC_ROOT_mingw}}',
] ]
- -
Id: 'windows-11_22h2-mingw11-developer-build' Id: 'windows-11_22h2-mingw11-developer-build'
@@ -284,10 +264,9 @@ Configurations:
Environment variables: [ Environment variables: [
'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}', 'Path={{.Env.MINGW1120}}\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', 'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}} -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}} -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c -DFEATURE_native_grpc=OFF',
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}', 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}',
'Protobuf_ROOT={{.Env.Protobuf_ROOT_mingw}}', 'Protobuf_ROOT={{.Env.Protobuf_ROOT_mingw}}',
'gRPC_ROOT={{.Env.gRPC_ROOT_mingw}}',
] ]
- -
Id: 'focal-arm64-debian-pkg-packaging' Id: 'focal-arm64-debian-pkg-packaging'

View File

@@ -12,7 +12,7 @@ Configurations:
'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-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', 'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARMV7_TOOLCHAIN_FILE}} -DQT_FORCE_BUILD_TOOLS=ON',
'QT_YOCTO_ENVSETUP={{.Env.QEMUARMV7_TOOLCHAIN_ENVSETUP}}', 'QT_YOCTO_ENVSETUP={{.Env.QEMUARMV7_TOOLCHAIN_ENVSETUP}}',
"QT_CMAKE_DIR=/opt/cmake-3.24.2/bin", "QT_CMAKE_DIR=/opt/cmake-3.27.7/bin",
'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}', 'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}',
'GST_PLUGIN_SCANNER={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}/usr/libexec/gstreamer-1.0/gst-plugin-scanner', 'GST_PLUGIN_SCANNER={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}/usr/libexec/gstreamer-1.0/gst-plugin-scanner',
'QT_QUICK_BACKEND=software', 'QT_QUICK_BACKEND=software',
@@ -29,7 +29,7 @@ Configurations:
'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-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', 'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARM64_TOOLCHAIN_FILE}} -DQT_FORCE_BUILD_TOOLS=ON',
'QT_YOCTO_ENVSETUP={{.Env.QEMUARM64_TOOLCHAIN_ENVSETUP}}', 'QT_YOCTO_ENVSETUP={{.Env.QEMUARM64_TOOLCHAIN_ENVSETUP}}',
"QT_CMAKE_DIR=/opt/cmake-3.24.2/bin", "QT_CMAKE_DIR=/opt/cmake-3.27.7/bin",
'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}', 'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}',
'GST_PLUGIN_SCANNER={{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}/usr/libexec/gstreamer-1.0/gst-plugin-scanner', 'GST_PLUGIN_SCANNER={{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}/usr/libexec/gstreamer-1.0/gst-plugin-scanner',
'QT_QUICK_BACKEND=software', 'QT_QUICK_BACKEND=software',
@@ -46,7 +46,7 @@ Configurations:
'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-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', 'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUMIPS64_TOOLCHAIN_FILE}} -DQT_FORCE_BUILD_TOOLS=ON',
'QT_YOCTO_ENVSETUP={{.Env.QEMUMIPS64_TOOLCHAIN_ENVSETUP}}', 'QT_YOCTO_ENVSETUP={{.Env.QEMUMIPS64_TOOLCHAIN_ENVSETUP}}',
"QT_CMAKE_DIR=/opt/cmake-3.24.2/bin", "QT_CMAKE_DIR=/opt/cmake-3.27.7/bin",
'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUMIPS64_TOOLCHAIN_SYSROOT}}', 'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUMIPS64_TOOLCHAIN_SYSROOT}}',
'GST_PLUGIN_SCANNER={{.Env.QEMUMIPS64_TOOLCHAIN_SYSROOT}}/usr/libexec/gstreamer-1.0/gst-plugin-scanner', 'GST_PLUGIN_SCANNER={{.Env.QEMUMIPS64_TOOLCHAIN_SYSROOT}}/usr/libexec/gstreamer-1.0/gst-plugin-scanner',
'QT_QUICK_BACKEND=software', 'QT_QUICK_BACKEND=software',

View File

@@ -12,7 +12,7 @@ Configurations:
Environment variables: [ Environment variables: [
'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-dbus -nomake examples', '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', '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.24.2/bin', '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', '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',
] ]

View File

@@ -33,22 +33,6 @@ Configurations:
] ]
- -
Id: 'android-6-x86-on-linux' Id: 'android-6-x86-on-linux'
Template: 'qtci-linux-RHEL-8.6-x86_64-50'
Target os: 'Android_ANY'
Target arch: 'x86'
Compiler: 'GCC'
Target compiler: 'Clang'
Platform dependency: 'rhel-8.6'
Features: ['Packaging', 'Sccache', '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}} -DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
'ANDROID_EMULATOR=@emulator_x86_api_23',
'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}'
]
-
Id: 'android-6-RHEL-8.8-x86-on-linux'
Template: 'qtci-linux-RHEL-8.8-x86_64-50' Template: 'qtci-linux-RHEL-8.8-x86_64-50'
Target os: 'Android_ANY' Target os: 'Android_ANY'
Target arch: 'x86' Target arch: 'x86'
@@ -65,22 +49,6 @@ Configurations:
] ]
- -
Id: 'android-13-x86_64-on-linux' Id: 'android-13-x86_64-on-linux'
Template: 'qtci-linux-RHEL-8.6-x86_64-50'
Target os: 'Android_ANY'
Target arch: 'x86_64'
Compiler: 'GCC'
Target compiler: 'Clang'
Platform dependency: 'rhel-8.6'
Features: ['Packaging', 'Sccache', '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}} -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_64_api_33'
]
-
Id: 'android-13-RHEL-8.8-x86_64-on-linux'
Template: 'qtci-linux-RHEL-8.8-x86_64-50' Template: 'qtci-linux-RHEL-8.8-x86_64-50'
Target os: 'Android_ANY' Target os: 'Android_ANY'
Target arch: 'x86_64' Target arch: 'x86_64'

View File

@@ -2,7 +2,7 @@ Version: 2
Configurations: Configurations:
- -
Id: 'webassembly-linux-thread-asyncify' Id: 'webassembly-linux-thread-asyncify'
Template: 'qtci-linux-openSUSE-15.5-x86_64-51' Template: 'qtci-linux-openSUSE-15.5-x86_64-52'
Target os: 'WebAssembly' Target os: 'WebAssembly'
Compiler: 'GCC' Compiler: 'GCC'
Platform dependency: 'opensuse-15.5-developer-build' Platform dependency: 'opensuse-15.5-developer-build'

View File

@@ -23,11 +23,6 @@ Configurations:
Target arch: 'x86' Target arch: 'x86'
Features: ['Packaging', 'UseLegacyInstructions'] 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' 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.6-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.8-x86_64-50' Template: 'qtci-linux-RHEL-8.8-x86_64-50'
Compiler: 'GCC' Compiler: 'GCC'

View File

@@ -2,21 +2,6 @@ Version: 2
Configurations: Configurations:
- -
Id: 'android-x86-developer-build-testrun-on-linux' Id: 'android-x86-developer-build-testrun-on-linux'
Template: 'qtci-linux-RHEL-8.6-x86_64-50'
Target os: 'Android_ANY'
Target arch: 'x86'
Compiler: 'GCC'
Target compiler: 'Clang'
Platform dependency: 'rhel-8.6'
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=-DFEATURE_native_grpc=OFF',
'ANDROID_EMULATOR=@emulator_x86_api_23']
-
Id: 'android-x86-developer-build-testrun-on-linux-RHEL-8.8'
Template: 'qtci-linux-RHEL-8.8-x86_64-50' Template: 'qtci-linux-RHEL-8.8-x86_64-50'
Target os: 'Android_ANY' Target os: 'Android_ANY'
Target arch: 'x86' Target arch: 'x86'

View File

@@ -1,14 +1,14 @@
Version: 2 Version: 2
Configurations: Configurations:
- -
Id: 'rhel_8.4_android_multi' Id: 'rhel_8.8_android_multi'
Template: 'qtci-linux-RHEL-8.6-x86_64-50' Template: 'qtci-linux-RHEL-8.8-x86_64-50'
Target os: 'Android_ANY' Target os: 'Android_ANY'
Target arch: 'multi' Target arch: 'multi'
Compiler: 'GCC' Compiler: 'GCC'
Target compiler: 'Clang' Target compiler: 'Clang'
Platform dependency: [ Platform dependency: [
'rhel-8.6', 'rhel-8.8',
'android-6-x86-on-linux', 'android-6-x86-on-linux',
'android-13-x86_64-on-linux' 'android-13-x86_64-on-linux'
] ]
@@ -19,33 +19,9 @@ Configurations:
'InstallDepsPerPlatformSubdir' 'InstallDepsPerPlatformSubdir'
] ]
Environment variables: [ Environment variables: [
'QT_CI_ARTIFACT_ID_PATH_Android-host=QT_CI_ARTIFACT_ID_PATH_rhel-8.6', 'QT_CI_ARTIFACT_ID_PATH_Android-host=QT_CI_ARTIFACT_ID_PATH_rhel-8.8',
'QT_CI_ARTIFACT_ID_PATH_Android-x86=QT_CI_ARTIFACT_ID_PATH_android-6-x86-on-linux', 'QT_CI_ARTIFACT_ID_PATH_Android-x86=QT_CI_ARTIFACT_ID_PATH_android-6-x86-on-linux',
'QT_CI_ARTIFACT_ID_PATH_Android-x86_64=QT_CI_ARTIFACT_ID_PATH_android-13-x86_64-on-linux', 'QT_CI_ARTIFACT_ID_PATH_Android-x86_64=QT_CI_ARTIFACT_ID_PATH_android-13-x86_64-on-linux',
'COMMON_TARGET_TEST_CMAKE_ARGS=-DQT_ANDROID_ABIS="x86;x86_64"', 'COMMON_TARGET_TEST_CMAKE_ARGS=-DQT_ANDROID_ABIS="x86;x86_64"',
'ANDROID_EMULATOR=@emulator_x86_api_23' 'ANDROID_EMULATOR=@emulator_x86_api_23'
] ]
-
Id: 'rhel_8.8_android_multi'
Template: 'qtci-linux-RHEL-8.8-x86_64-50'
Target os: 'Android_ANY'
Target arch: 'multi'
Compiler: 'GCC'
Target compiler: 'Clang'
Platform dependency: [
'rhel-8.8',
'android-6-RHEL-8.8-x86-on-linux',
'android-13-RHEL-8.8-x86_64-on-linux'
]
Features: [
'Sccache',
'AndroidTestRun',
'MinimalAndroidMultiABITests',
'InstallDepsPerPlatformSubdir'
]
Environment variables: [
'QT_CI_ARTIFACT_ID_PATH_Android-host=QT_CI_ARTIFACT_ID_PATH_rhel-8.8',
'QT_CI_ARTIFACT_ID_PATH_Android-x86=QT_CI_ARTIFACT_ID_PATH_android-6-RHEL-8.8-x86-on-linux',
'QT_CI_ARTIFACT_ID_PATH_Android-x86_64=QT_CI_ARTIFACT_ID_PATH_android-13-RHEL-8.8-x86_64-on-linux',
'COMMON_TARGET_TEST_CMAKE_ARGS=-DQT_ANDROID_ABIS="x86;x86_64"'
]

View File

@@ -121,36 +121,18 @@ Configurations:
# Test on all supported macOS versions (deployment targets) # Test on all supported macOS versions (deployment targets)
-
Id: 'macos-11-x86_64-developer-build-tests'
Template: 'qtci-macos-11-x86_64-106'
Compiler: 'Clang'
Features: ['Sccache', 'TestOnly']
Platform dependency: 'macos-13-x86_64-developer-build'
- -
Id: 'macos-11-arm64-developer-build-tests' Id: 'macos-11-arm64-developer-build-tests'
Template: 'qtci-macos-11.0-arm64' Template: 'qtci-macos-11.0-arm64'
Compiler: 'Clang' Compiler: 'Clang'
Features: ['TestOnly'] Features: ['TestOnly']
Platform dependency: 'macos-13-arm64-developer-build' Platform dependency: 'macos-13-arm64-developer-build'
-
Id: 'macos-12-x86_64-developer-build-tests'
Template: 'qtci-macos-12-x86_64-106'
Compiler: 'Clang'
Features: ['Sccache', 'TestOnly']
Platform dependency: 'macos-13-x86_64-developer-build'
- -
Id: 'macos-12-arm64-developer-build-tests' Id: 'macos-12-arm64-developer-build-tests'
Template: 'qtci-macos-12-arm64' Template: 'qtci-macos-12-arm64'
Compiler: 'Clang' Compiler: 'Clang'
Features: ['TestOnly'] Features: ['TestOnly']
Platform dependency: 'macos-13-arm64-developer-build' Platform dependency: 'macos-13-arm64-developer-build'
-
Id: 'macos-13-x86_64-developer-build-tests'
Template: 'qtci-macos-13-x86_64-103'
Compiler: 'Clang'
Features: ['Sccache', 'TestOnly']
Platform dependency: 'macos-13-x86_64-developer-build'
- -
Id: 'macos-13-arm64-developer-build-tests' Id: 'macos-13-arm64-developer-build-tests'
Template: 'qtci-macos-13-arm64' Template: 'qtci-macos-13-arm64'

View File

@@ -13,7 +13,7 @@ Include: [
"windows-10_22h2-msvc2019", "windows-10_22h2-msvc2019",
"windows-10_22h2-msvc2022", "windows-10_22h2-msvc2022",
"windows-10_22h2-msvc2019-developer-build", "windows-10_22h2-msvc2019-developer-build",
"rhel-8.4", "rhel-8.8",
"windows-10_22h2-mingw11", "windows-10_22h2-mingw11",
"windows-10_22h2-mingw11-developer-build", "windows-10_22h2-mingw11-developer-build",
"windows-10_22h2-llvm", "windows-10_22h2-llvm",
@@ -42,7 +42,7 @@ Configurations:
'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 -qtlibinfix TestInfix', '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 -qtlibinfix TestInfix',
'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARM64_TOOLCHAIN_FILE}} -DQT_FORCE_BUILD_TOOLS=ON', 'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARM64_TOOLCHAIN_FILE}} -DQT_FORCE_BUILD_TOOLS=ON',
'QT_YOCTO_ENVSETUP={{.Env.QEMUARM64_TOOLCHAIN_ENVSETUP}}', 'QT_YOCTO_ENVSETUP={{.Env.QEMUARM64_TOOLCHAIN_ENVSETUP}}',
"QT_CMAKE_DIR=/opt/cmake-3.24.2/bin", "QT_CMAKE_DIR=/opt/cmake-3.27.7/bin",
'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}', 'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}',
'GST_PLUGIN_SCANNER={{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}/usr/libexec/gstreamer-1.0/gst-plugin-scanner', 'GST_PLUGIN_SCANNER={{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}/usr/libexec/gstreamer-1.0/gst-plugin-scanner',
'QT_QUICK_BACKEND=software', 'QT_QUICK_BACKEND=software',

View File

@@ -12,7 +12,7 @@ Include: [
"sles-15_sp5-static", "sles-15_sp5-static",
"windows-10_22h2-msvc2019", "windows-10_22h2-msvc2019",
"windows-10_22h2-msvc2022", "windows-10_22h2-msvc2022",
"rhel-8.4", "rhel-8.8",
"windows-10_22h2-mingw11", "windows-10_22h2-mingw11",
"windows-10_22h2-llvm", "windows-10_22h2-llvm",
"windows-11_22h2-msvc2019" "windows-11_22h2-msvc2019"
@@ -35,15 +35,6 @@ Configurations:
Environment variables: [ Environment variables: [
'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"' 'CMAKE_ARGS=-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"'
] ]
-
Id: 'Linux-RHEL_8_6_Static'
Template: 'qtci-linux-RHEL-8.6-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'
]
- -
Id: 'Linux-RHEL_8_8_Static' Id: 'Linux-RHEL_8_8_Static'
Template: 'qtci-linux-RHEL-8.8-x86_64-50' Template: 'qtci-linux-RHEL-8.8-x86_64-50'

View File

@@ -1,7 +1,6 @@
Version: 2 Version: 2
Include: [ Include: [
cmake_platforms.yaml: [ cmake_platforms.yaml: [
'rhel-8.6',
'rhel-8.8', 'rhel-8.8',
'windows-10_22h2-mingw11', 'windows-10_22h2-mingw11',
'ubuntu-22.04-documentation', 'ubuntu-22.04-documentation',
@@ -19,23 +18,7 @@ Include: [
] ]
Configurations: Configurations:
- -
Id: "automotive-android-12-x86_64-on-linux" Id: "automotive-android-13-x86_64-on-linux"
Template: 'qtci-linux-RHEL-8.6-x86_64-50'
Target os: 'Android_ANY'
Target arch: 'x86_64'
Compiler: 'GCC'
Target compiler: 'Clang'
Platform dependency: 'rhel-8.6'
Features: ['Packaging', 'Sccache', '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=-DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
'ANDROID_EMULATOR=@automotive_emulator_x86_64_api_31'
]
-
Id: "automotive-android-12-x86_64-on-linux-RHEL-8.8"
Template: 'qtci-linux-RHEL-8.8-x86_64-50' Template: 'qtci-linux-RHEL-8.8-x86_64-50'
Target os: 'Android_ANY' Target os: 'Android_ANY'
Target arch: 'x86_64' Target arch: 'x86_64'

View File

@@ -2,52 +2,52 @@ Version: 2
Module only: true Module only: true
Configurations: Configurations:
- Id: 'webos-emulator-build' - Id: 'webos-emulator-build'
Template: 'qtci-linux-Ubuntu-20.04-x86_64-51' Template: 'qtci-linux-Ubuntu-20.04-x86_64-52'
Compiler: 'GCC' Compiler: 'GCC'
Features: ['DoNotRunTests'] Features: ['DoNotRunTests']
Environment variables: ['BUILD_EMULATOR=enabled'] Environment variables: ['BUILD_EMULATOR=enabled']
- Id: 'webos-emulator-qtbase-tests' - Id: 'webos-emulator-qtbase-tests'
Template: 'qtci-linux-Ubuntu-20.04-x86_64-51' Template: 'qtci-linux-Ubuntu-20.04-x86_64-52'
Compiler: 'GCC' Compiler: 'GCC'
Features: ['TestOnly'] Features: ['TestOnly']
Environment variables: ['MODULE=qtbase'] Environment variables: ['MODULE=qtbase']
Platform dependency: 'webos-emulator-build' Platform dependency: 'webos-emulator-build'
- Id: 'webos-emulator-qtdeclarative-tests' - Id: 'webos-emulator-qtdeclarative-tests'
Template: 'qtci-linux-Ubuntu-20.04-x86_64-51' Template: 'qtci-linux-Ubuntu-20.04-x86_64-52'
Compiler: 'GCC' Compiler: 'GCC'
Features: ['TestOnly'] Features: ['TestOnly']
Environment variables: ['MODULE=qtdeclarative'] Environment variables: ['MODULE=qtdeclarative']
Platform dependency: 'webos-emulator-build' Platform dependency: 'webos-emulator-build'
- Id: 'webos-emulator-qtwayland-tests' - Id: 'webos-emulator-qtwayland-tests'
Template: 'qtci-linux-Ubuntu-20.04-x86_64-51' Template: 'qtci-linux-Ubuntu-20.04-x86_64-52'
Compiler: 'GCC' Compiler: 'GCC'
Features: ['TestOnly'] Features: ['TestOnly']
Environment variables: ['MODULE=qtwayland'] Environment variables: ['MODULE=qtwayland']
Platform dependency: 'webos-emulator-build' Platform dependency: 'webos-emulator-build'
- Id: 'webos-emulator-qtshadertools-tests' - Id: 'webos-emulator-qtshadertools-tests'
Template: 'qtci-linux-Ubuntu-20.04-x86_64-51' Template: 'qtci-linux-Ubuntu-20.04-x86_64-52'
Compiler: 'GCC' Compiler: 'GCC'
Features: ['TestOnly'] Features: ['TestOnly']
Environment variables: ['MODULE=qtshadertools'] Environment variables: ['MODULE=qtshadertools']
Platform dependency: 'webos-emulator-build' Platform dependency: 'webos-emulator-build'
- Id: 'webos-emulator-qtgraphicaleffects-tests' - Id: 'webos-emulator-qtgraphicaleffects-tests'
Template: 'qtci-linux-Ubuntu-20.04-x86_64-51' Template: 'qtci-linux-Ubuntu-20.04-x86_64-52'
Compiler: 'GCC' Compiler: 'GCC'
Features: ['TestOnly'] Features: ['TestOnly']
Environment variables: ['MODULE=qtgraphicaleffects'] Environment variables: ['MODULE=qtgraphicaleffects']
Platform dependency: 'webos-emulator-build' Platform dependency: 'webos-emulator-build'
- Id: 'webos-raspberry-build' - Id: 'webos-raspberry-build'
Template: 'qtci-linux-Ubuntu-20.04-x86_64-51' Template: 'qtci-linux-Ubuntu-20.04-x86_64-52'
Compiler: 'GCC' Compiler: 'GCC'
Features: ['DoNotRunTests'] Features: ['DoNotRunTests']
Environment variables: ['BUILD_RASPBERRY=enabled'] Environment variables: ['BUILD_RASPBERRY=enabled']
- Id: 'webos-ndk-installer-build' - Id: 'webos-ndk-installer-build'
Template: 'qtci-linux-Ubuntu-20.04-x86_64-51' Template: 'qtci-linux-Ubuntu-20.04-x86_64-52'
Compiler: 'GCC' Compiler: 'GCC'
Features: ['DoNotRunTests'] Features: ['DoNotRunTests']
Environment variables: ['BUILD_NDK_INSTALLER=enabled'] Environment variables: ['BUILD_NDK_INSTALLER=enabled']
- Id: 'webos-ndk-install' - Id: 'webos-ndk-install'
Template: 'qtci-linux-Ubuntu-20.04-x86_64-51' Template: 'qtci-linux-Ubuntu-20.04-x86_64-52'
Compiler: 'GCC' Compiler: 'GCC'
Features: ['TestOnly'] Features: ['TestOnly']
Platform dependency: ['webos-raspberry-build', 'webos-ndk-installer-build'] Platform dependency: ['webos-raspberry-build', 'webos-ndk-installer-build']

View File

@@ -0,0 +1,59 @@
### Ubuntu 20.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 grub2-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 './coin-setup'
Reboot

View File

@@ -1,6 +1,6 @@
### OpenSUSE Leap 15.5 ### ### OpenSUSE Leap 15.5 ###
## KDE ## ## KDE ##
## In qtci-linux-openSUSE-15.5-x86_64-51 > Graphics Platform: X11 (System default) ## ## In qtci-linux-openSUSE-15.5-x86_64-52 > Graphics Platform: X11 (System default) ##
# Installation # # Installation #
Language: English (US) Language: English (US)
@@ -17,19 +17,10 @@ Time Zone: UTC
## Configurations ## ## Configurations ##
Before coin-setup add 'qt ALL=NOPASSWD: ALL' to /etc/sudoers.d/qt Before coin-setup add 'qt ALL=NOPASSWD: ALL' to /etc/sudoers.d/qt
Download and run coin-setup binary - http://coin/coin/binary/linux_amd64/coin-setup Download and run coin-setup binary - http://10.215.100.35/coin/binary/linux_amd64/coin-setup
YaST - System - Services Manager - Firewalld - Stop - If IP has changed and Coin name not visible to VM, check from Coin logs which IP works for VMs
# enable ssh access
sudo rcsshd start
Workspace Behavior - Screen locking - Lock screen automatically - unselect options Workspace Behavior - Screen locking - Lock screen automatically - unselect options
Startup and Shutdown - Behavior - Login Screen - Select Automatically log in with session (System default) Startup and Shutdown - Behavior - Login Screen - Select Automatically log in with session (System default)
Add below to '$HOME/.config/autostart/coin-bootstrap-agent.desktop' if missing
[Desktop Entry]
Type=Application
Exec=/usr/bin/gnome-terminal -e "/home/qt/bootstrap-agent /dev/ttyS0"
Hidden=false
X-GNOME-Autostart-enabled=true
Name=Coin
Notifications Notifications
Critical notifications - unselect Critical notifications - unselect
Low priority notifications - unselect Low priority notifications - unselect
@@ -39,5 +30,6 @@ Notifications
Display and Monitor - Display Configuration - 1280x800 Display and Monitor - Display Configuration - 1280x800
Power Management: Screen Energy Saving - unselect Power Management: Screen Energy Saving - unselect
Suspend Session - unselect Suspend Session - unselect
YaST - Hardware - Sound - Add Dummy soundcard
Reboot Reboot

View File

@@ -155,6 +155,18 @@ echo "Android NDK = $ndkVersion" >> ~/versions.txt
cd "$sdkTargetFolder/cmdline-tools/tools/bin" cd "$sdkTargetFolder/cmdline-tools/tools/bin"
./sdkmanager --install "emulator" --sdk_root=$sdkTargetFolder \ ./sdkmanager --install "emulator" --sdk_root=$sdkTargetFolder \
| eval $sdkmanager_no_progress_bar_cmd | eval $sdkmanager_no_progress_bar_cmd
echo "Download and unzip Android Emulator version 32.1.15"
emulatorFileName="emulator-linux_x64-10696886.zip"
emulatorCiUrl="https://ci-files01-hki.ci.qt.io/input/android/$emulatorFileName"
emulatorUrl="http://dl.google.com/android/repository/$emulatorFileName"
emulatorTargetFile="$sdkTargetFolder/$emulatorFileName"
emulatorSha1="b78f4d2c22d6aa5ca83d26ccb68cbf885a273888"
DownloadURL "$emulatorCiUrl" "$emulatorUrl" "$emulatorSha1" "$emulatorTargetFile"
echo "Unzipping the Android Emulator to '$sdkTargetFolder'"
sudo unzip -o -q "$emulatorTargetFile" -d "$sdkTargetFolder"
rm "$emulatorTargetFile"
echo "y" | ./sdkmanager --install "system-images;android-23;google_apis;x86" | eval $sdkmanager_no_progress_bar_cmd echo "y" | ./sdkmanager --install "system-images;android-23;google_apis;x86" | eval $sdkmanager_no_progress_bar_cmd
echo "y" | ./sdkmanager --install "system-images;android-33;google_apis;x86_64" | eval $sdkmanager_no_progress_bar_cmd echo "y" | ./sdkmanager --install "system-images;android-33;google_apis;x86_64" | eval $sdkmanager_no_progress_bar_cmd

View File

@@ -48,11 +48,11 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
# shellcheck source=../unix/SetEnvVar.sh # shellcheck source=../unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
majorminorversion="3.24" majorminorversion="3.27"
version="3.24.2" version="3.27.7"
PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-$version-linux-x86_64.tar.gz" PrimaryUrl="http://ci-files01-hki.intra.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" AltUrl="https://cmake.org/files/v$majorminorversion/cmake-$version-linux-x86_64.tar.gz"
SHA1="12627c808674ee5f5bd3a6982176613bbd3ad9db" SHA1="83ab00c8432a71cfc81e933ee7b3c3e14d50ad6f"
targetFolder="/opt/cmake-$version" targetFolder="/opt/cmake-$version"
appPrefix="cmake-$version-linux-x86_64" appPrefix="cmake-$version-linux-x86_64"

View File

@@ -48,11 +48,11 @@ source "${BASH_SOURCE%/*}/InstallAppFromCompressedFileFromURL.sh"
# shellcheck source=../unix/SetEnvVar.sh # shellcheck source=../unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
majorminorversion="3.24.2" majorminorversion="3.27.7"
version="3.24.2" version="3.27.7"
PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-$version-macos-universal.tar.gz" PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-$version-macos-universal.tar.gz"
AltUrl="https://cmake.org/files/v$majorminorversion/cmake-$version-macos-universal.tar.gz" AltUrl="https://cmake.org/files/v$majorminorversion/cmake-$version-macos-universal.tar.gz"
SHA1="19b1473e6ded2d234256b6aac90eb22616c5ab5e" SHA1="75153b6c7a418bc7120c6217d4698c7d245d00e0"
appPrefix="cmake-$version-macos-universal" appPrefix="cmake-$version-macos-universal"
InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix" InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix"

View File

@@ -70,18 +70,23 @@ build_ffmpeg_android() {
sudo mkdir -p "$target_dir" sudo mkdir -p "$target_dir"
openssl_include="$OPENSSL_ANDROID_HOME_DEFAULT/include"
openssl_libs=""
if [ "$target_arch" == "x86_64" ]; then if [ "$target_arch" == "x86_64" ]; then
target_toolchain_arch="x86_64-linux-android" target_toolchain_arch="x86_64-linux-android"
target_arch=x86_64 target_arch=x86_64
target_cpu=x86_64 target_cpu=x86_64
openssl_libs="$OPENSSL_ANDROID_HOME_DEFAULT/x86_64"
elif [ "$target_arch" == "x86" ]; then elif [ "$target_arch" == "x86" ]; then
target_toolchain_arch="i686-linux-android" target_toolchain_arch="i686-linux-android"
target_arch=x86 target_arch=x86
target_cpu=i686 target_cpu=i686
openssl_libs="$OPENSSL_ANDROID_HOME_DEFAULT/x86"
elif [ "$target_arch" == "arm64" ]; then elif [ "$target_arch" == "arm64" ]; then
target_toolchain_arch="aarch64-linux-android" target_toolchain_arch="aarch64-linux-android"
target_arch=aarch64 target_arch=aarch64
target_cpu=armv8-a target_cpu=armv8-a
openssl_libs="$OPENSSL_ANDROID_HOME_DEFAULT/arm64-v8a"
fi fi
api_version=24 api_version=24
@@ -105,9 +110,10 @@ build_ffmpeg_android() {
strip=${toolchain_bin}/llvm-strip strip=${toolchain_bin}/llvm-strip
ffmpeg_config_options=$(cat "${BASH_SOURCE%/*}/../shared/ffmpeg_config_options.txt") 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-pthreads --enable-neon --disable-asm --disable-indev=android_camera" ffmpeg_config_options+=" --enable-cross-compile --target-os=android --enable-jni --enable-mediacodec --enable-openssl --enable-pthreads --enable-neon --disable-asm --disable-indev=android_camera"
ffmpeg_config_options+=" --arch=$target_arch --cpu=${target_cpu} --sysroot=${sysroot} --sysinclude=${sysroot}/usr/include/" ffmpeg_config_options+=" --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+=" --cc=${cc} --cxx=${cxx} --ar=${ar} --ranlib=${ranlib}"
ffmpeg_config_options+=" --extra-cflags=-I${openssl_include} --extra-ldflags=-L${openssl_libs}"
local build_dir="$ffmpeg_source_dir/build/$target_arch" local build_dir="$ffmpeg_source_dir/build/$target_arch"
sudo mkdir -p "$build_dir" sudo mkdir -p "$build_dir"

View File

@@ -11,12 +11,9 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
# shellcheck source=../unix/SetEnvVar.sh # shellcheck source=../unix/SetEnvVar.sh
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
# Commit c5039e158d20e85d4d8a2dee3160533d627b839a is the latest one in 6.0 branch. version="n6.1"
# When using the latest commit we will also get fix for https://fftrac-bg.ffmpeg.org/ticket/10405
# Should be changed to official release as soon as possible!
version="c5039e158d20e85d4d8a2dee3160533d627b839a"
url_public="https://github.com/FFmpeg/FFmpeg/archive/$version.tar.gz" url_public="https://github.com/FFmpeg/FFmpeg/archive/$version.tar.gz"
sha1="4e13a26d3be7ac4d69201a6aa0accd734b24b3c4" sha1="1feb946476f3076a9b38c97ca0d8b69e1826049c"
url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz" url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz"
ffmpeg_name="FFmpeg-$version" ffmpeg_name="FFmpeg-$version"

View File

@@ -39,8 +39,8 @@
. "$PSScriptRoot\helpers.ps1" . "$PSScriptRoot\helpers.ps1"
$majorminorversion = "3.24" $majorminorversion = "3.27"
$version = "3.24.2" $version = "3.27.7"
$zip = Get-DownloadLocation ("cmake-" + $version + "-windows-i386.zip") $zip = Get-DownloadLocation ("cmake-" + $version + "-windows-i386.zip")
$officialurl = "https://cmake.org/files/v" + $majorminorversion + "/cmake-" + $version + "-windows-i386.zip" $officialurl = "https://cmake.org/files/v" + $majorminorversion + "/cmake-" + $version + "-windows-i386.zip"
@@ -50,7 +50,7 @@ Write-Host "Removing old cmake"
Remove "C:\CMake" Remove "C:\CMake"
Download $officialurl $cachedurl $zip Download $officialurl $cachedurl $zip
Verify-Checksum $zip "97e6cdedded7a7522f4f4a64d7545d0454b4fad5" Verify-Checksum $zip "b6147215a5f9cd1138b012265229fbf2224d02c6"
Extract-7Zip $zip C: Extract-7Zip $zip C:
$defaultinstallfolder = "C:\cmake-" + $version + "-windows-i386" $defaultinstallfolder = "C:\cmake-" + $version + "-windows-i386"

View File

@@ -20,23 +20,20 @@ function build-install-grpc {
) )
$installPrefix = "C:\Utils\grpc" $installPrefix = "C:\Utils\grpc"
$installPath = "${installPrefix}-$Postfix" $installPath = "${installPrefix}-$Postfix"
$envVariableName = "Protobuf_ROOT_$Postfix"
$protobufRoot = (Get-Item -Path "Env:$envVariableName").Value
Write-Output "Configuring and building gRPC for $CXX" Write-Output "Configuring and building gRPC for $CXX"
$oldCC = $env:CC $oldCC = $env:CC
$oldCXX = $env:CXX $oldCXX = $env:CXX
$env:CC = $CC $env:CC = $CC
$env:CXX = $CXX $env:CXX = $CXX
$Protobuf_ROOT="C:\Utils\protobuf-$Postfix"
if (!(Test-Path $Protobuf_ROOT -ErrorAction SilentlyContinue)) {
throw "Protobuf is missing, expected at `"$Protobuf_ROOT`"."
}
$OPENSSL_ROOT_DIR="C:\openssl"
if (!(Test-Path $OPENSSL_ROOT_DIR -ErrorAction SilentlyContinue)) {
throw "OpenSSL is missing, expected at `"$OPENSSL_ROOT_DIR`"."
}
Remove build-grpc Remove build-grpc
mkdir build-grpc mkdir build-grpc
Push-Location build-grpc Push-Location build-grpc
$configureOptions = @( $configureOptions = @(
# add postfix for multi-config
"-DCMAKE_DEBUG_POSTFIX=d"
"-DCMAKE_RELWITHDEBINFO_POSTFIX=rd"
# plugins # plugins
"-DgRPC_BUILD_GRPC_CSHARP_PLUGIN=OFF" "-DgRPC_BUILD_GRPC_CSHARP_PLUGIN=OFF"
"-DgRPC_BUILD_GRPC_NODE_PLUGIN=OFF" "-DgRPC_BUILD_GRPC_NODE_PLUGIN=OFF"
@@ -48,12 +45,11 @@ function build-install-grpc {
"-DgRPC_BUILD_CSHARP_EXT=OFF" "-DgRPC_BUILD_CSHARP_EXT=OFF"
# general # general
"-DgRPC_BUILD_TESTS=OFF" "-DgRPC_BUILD_TESTS=OFF"
"-DgRPC_PROTOBUF_PROVIDER=`"package`"" "-DgRPC_PROTOBUF_PROVIDER=package"
"-DgRPC_SSL_PROVIDER=`"package`"" "-DgRPC_SSL_PROVIDER=package"
"-DOPENSSL_ROOT_DIR=`"$OPENSSL_ROOT_DIR`""
# protobuf # protobuf
"-DProtobuf_USE_STATIC_LIBS=ON" "-DProtobuf_USE_STATIC_LIBS=ON"
"-DProtobuf_ROOT=`"$Protobuf_ROOT`"" "-DCMAKE_PREFIX_PATH=$protobufRoot"
) )
cmake .. -G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="$BuildType" -DCMAKE_INSTALL_PREFIX="$installPath" $extraCMakeArgs $configureOptions cmake .. -G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="$BuildType" -DCMAKE_INSTALL_PREFIX="$installPath" $extraCMakeArgs $configureOptions
$result = $LASTEXITCODE $result = $LASTEXITCODE
@@ -66,7 +62,7 @@ function build-install-grpc {
} }
$env:CC = $oldCC $env:CC = $oldCC
$env:CXX = $oldCXX $env:CXX = $oldCXX
Set-EnvironmentVariable "gRPC_ROOT_$Postfix" "$InstallPath" Set-EnvironmentVariable "gRPC_ROOT_$Postfix" "$installPath"
Pop-Location Pop-Location
Remove build-grpc Remove build-grpc
if ($result -ne 0) { if ($result -ne 0) {
@@ -111,44 +107,15 @@ Verify-Checksum $targetFile $sha1
Extract-7Zip $targetFile $basedir Extract-7Zip $targetFile $basedir
Remove $targetFile Remove $targetFile
Push-Location $basedir Push-Location $targetDir
# Create a new top-level CMakeLists.txt file so we can set a modern policy ### gRPC supports only MSVC compiler
# for find_package calls
Write-Output "cmake_minimum_required(VERSION 3.5.1)`nproject(grpc LANGUAGES C CXX)`ncmake_policy(SET CMP0074 NEW)`nadd_subdirectory(grpc-$version)" | Out-File CMakeLists.txt -Encoding utf8
### MinGW
# Check if mingw is where we expect it to be and add it to path:
$mingwPath = "C:\MINGW1120\mingw64\bin"
if (!(Test-Path $mingwPath)) {
throw "Cannot find mingw in $mingwPath, something is configured wrong"
}
$oldPath = $env:Path
$env:Path = "$mingwPath;$env:Path"
build-install-grpc -CC "gcc" -CXX "g++" -BuildType "Release" -Postfix "mingw"
$env:Path = $oldPath
### LLVM MinGW
# $llvmMingwPath = "C:\llvm-mingw"
# if (!(Test-Path $llvmMingwPath)) {
# throw "Cannot find llvm-mingw in $llvmMingwPath, something is configured wrong"
# }
$oldPath = $env:Path
$env:Path = "$llvmMingwPath\bin;$env:Path"
# build-install-grpc -CC "clang" -CXX "clang++" -BuildType "Release" -Postfix "llvm_mingw"
$env:Path = $oldPath
### MSVC
EnterVSDevShell EnterVSDevShell
build-install-grpc -CC "cl" -CXX "cl" -BuildType "Release" -Postfix "msvc" # We pass along an extra argument to stop gRPC linking with the static runtime to match Protobuf config
build-install-grpc -CC "cl" -CXX "cl" -BuildType "Release;RelWithDebInfo;Debug" -Postfix "msvc" -ExtraArguments @("-DgRPC_MSVC_STATIC_RUNTIME=OFF")
$env:Path = $oldPath
Pop-Location Pop-Location
Remove $basedir Remove $basedir

View File

@@ -42,9 +42,9 @@
# This script will install FFmpeg # This script will install FFmpeg
$msys = "C:\Utils\msys64\usr\bin\bash" $msys = "C:\Utils\msys64\usr\bin\bash"
$version = "n6.0" $version = "n6.1"
$ffmpeg_name = "ffmpeg-" + $version; $ffmpeg_name = "ffmpeg-" + $version;
$sha1 = "5DDDE739FF966A7EEE810D65D7290860A52709D7" $sha1 = "3B4A853266BE923994256B2E4B41CB002E1D63D8"
$url_cached = "http://ci-files01-hki.intra.qt.io/input/ffmpeg/" + $version + ".zip" $url_cached = "http://ci-files01-hki.intra.qt.io/input/ffmpeg/" + $version + ".zip"
$url_public = "https://github.com/FFmpeg/FFmpeg/archive/refs/tags/" +$version + ".zip" $url_public = "https://github.com/FFmpeg/FFmpeg/archive/refs/tags/" +$version + ".zip"
@@ -158,11 +158,15 @@ function InstallAndroidArmv7 {
$ranlib="${toolchain_bin}/llvm-ranlib.exe" $ranlib="${toolchain_bin}/llvm-ranlib.exe"
$nm="${toolchain_bin}/llvm-nm.exe" $nm="${toolchain_bin}/llvm-nm.exe"
$strip="${toolchain_bin}/llvm-strip.exe" $strip="${toolchain_bin}/llvm-strip.exe"
$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 = Get-Content "$PSScriptRoot\..\shared\ffmpeg_config_options.txt"
$config += " --enable-cross-compile --target-os=android --enable-jni --enable-mediacodec --enable-pthreads --enable-neon --disable-asm --disable-indev=android_camera" $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 += " --arch=$target_arch --cpu=${target_cpu} --sysroot=${sysroot} --sysinclude=${sysroot}/usr/include/"
$config += " --cc=${cc} --cxx=${cxx} --ar=${ar} --ranlib=${ranlib}" $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 -buildSystem "android-arm" -msystem "ANDROID_CLANG" -ffmpegDirEnvVar "FFMPEG_DIR_ANDROID_ARMV7"
} }

View File

@@ -28,14 +28,16 @@ function build-install-protobuf {
$env:CXX = $CXX $env:CXX = $CXX
mkdir build mkdir build
Push-Location build Push-Location build
cmake .. -G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="$BuildType" -DCMAKE_INSTALL_PREFIX="$installPath" -Dprotobuf_BUILD_TESTS=OFF -Dprotobuf_WITH_ZLIB=OFF $ExtraArguments cmake .. -G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="$BuildType" -DCMAKE_INSTALL_PREFIX="$installPath" -Dprotobuf_BUILD_TESTS=OFF -Dprotobuf_WITH_ZLIB=OFF -DCMAKE_DEBUG_POSTFIX="d" -DCMAKE_RELWITHDEBINFO_POSTFIX="rd" $ExtraArguments
# ninja install:all # This is broken and does not work # ninja install:all # This is broken and does not work
foreach ($config in $BuildType.split(";")) { foreach ($config in $BuildType.split(";")) {
ninja -f "build-$config.ninja" install ninja -f "build-$config.ninja" install
} }
$env:CC = $oldCC $env:CC = $oldCC
$env:CXX = $oldCXX $env:CXX = $oldCXX
Set-EnvironmentVariable "Protobuf_ROOT_$Postfix" "$InstallPath" Set-EnvironmentVariable "Protobuf_ROOT_$Postfix" "$installPath"
# Set environment variable without "Machine" scope to be used by grpc.ps1 script
[Environment]::SetEnvironmentVariable("Protobuf_ROOT_$Postfix", "$installPath")
Pop-Location Pop-Location
Remove build Remove build
} }
@@ -87,7 +89,7 @@ if (!(Test-Path $mingwPath)) {
$oldPath = $env:Path $oldPath = $env:Path
$env:Path = "$mingwPath;$env:Path" $env:Path = "$mingwPath;$env:Path"
build-install-protobuf -CC "gcc" -CXX "g++" -BuildType "Release" -Postfix "mingw" build-install-protobuf -CC "gcc" -CXX "g++" -BuildType "Release;RelWithDebInfo;Debug" -Postfix "mingw"
$env:Path = $oldPath $env:Path = $oldPath
### LLVM MinGW ### LLVM MinGW
@@ -99,7 +101,7 @@ if (!(Test-Path $llvmMingwPath)) {
$oldPath = $env:Path $oldPath = $env:Path
$env:Path = "$llvmMingwPath\bin;$env:Path" $env:Path = "$llvmMingwPath\bin;$env:Path"
build-install-protobuf -CC "clang" -CXX "clang++" -BuildType "Release" -Postfix "llvm_mingw" build-install-protobuf -CC "clang" -CXX "clang++" -BuildType "Release;RelWithDebInfo;Debug" -Postfix "llvm_mingw"
$env:Path = $oldPath $env:Path = $oldPath
### MSVC ### MSVC
@@ -107,7 +109,7 @@ $env:Path = $oldPath
EnterVSDevShell EnterVSDevShell
# We pass along an extra argument to stop protobuf linking with the static runtime # We pass along an extra argument to stop protobuf linking with the static runtime
build-install-protobuf -CC "cl" -CXX "cl" -BuildType "Release" -Postfix "msvc" -ExtraArguments @("-Dprotobuf_MSVC_STATIC_RUNTIME=OFF") build-install-protobuf -CC "cl" -CXX "cl" -BuildType "Release;RelWithDebInfo;Debug" -Postfix "msvc" -ExtraArguments @("-Dprotobuf_MSVC_STATIC_RUNTIME=OFF")
$env:Path = $oldPath $env:Path = $oldPath
Pop-Location Pop-Location

View File

@@ -1,47 +1,10 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# Copyright (C) 2023 The Qt Company Ltd.
############################################################################# # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
##
## Copyright (C) 2020 The Qt Company Ltd.
## 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$
##
#############################################################################
set -e set -e
curl --retry 5 --retry-delay 10 --retry-max-time 60 http://ci-files01-hki.intra.qt.io/input/semisecure/redhat_ak.sh -o "/tmp/redhat_ak.sh" &>/dev/null curl --retry 5 --retry-delay 10 --retry-max-time 60 http://ci-files01-hki.intra.qt.io/input/semisecure/redhat_ak_all_versions.sh -o "/tmp/redhat_ak.sh" &>/dev/null
sudo chmod 755 /tmp/redhat_ak.sh sudo chmod 755 /tmp/redhat_ak.sh
/tmp/redhat_ak.sh /tmp/redhat_ak.sh

View File

@@ -5,7 +5,7 @@
set -e set -e
curl --retry 5 --retry-delay 10 --retry-max-time 60 http://ci-files01-hki.intra.qt.io/input/semisecure/redhat_ak.sh -o "/tmp/redhat_ak.sh" &>/dev/null curl --retry 5 --retry-delay 10 --retry-max-time 60 http://ci-files01-hki.intra.qt.io/input/semisecure/redhat_ak_all_versions.sh -o "/tmp/redhat_ak.sh" &>/dev/null
sudo chmod 755 /tmp/redhat_ak.sh sudo chmod 755 /tmp/redhat_ak.sh
/tmp/redhat_ak.sh /tmp/redhat_ak.sh

View File

@@ -5,7 +5,7 @@
set -e set -e
curl --retry 5 --retry-delay 10 --retry-max-time 60 http://ci-files01-hki.intra.qt.io/input/semisecure/redhat_ak.sh -o "/tmp/redhat_ak.sh" &>/dev/null curl --retry 5 --retry-delay 10 --retry-max-time 60 http://ci-files01-hki.intra.qt.io/input/semisecure/redhat_ak_all_versions.sh -o "/tmp/redhat_ak.sh" &>/dev/null
sudo chmod 755 /tmp/redhat_ak.sh sudo chmod 755 /tmp/redhat_ak.sh
/tmp/redhat_ak.sh /tmp/redhat_ak.sh

View File

@@ -5,6 +5,6 @@
set -ex set -ex
sudo yum -y install gcc-toolset-10 sudo yum -y install gcc-toolset-10 gcc-toolset-10-libatomic-devel
echo "source /opt/rh/gcc-toolset-10/enable" >> ~/.bashrc echo "source /opt/rh/gcc-toolset-10/enable" >> ~/.bashrc

View File

@@ -64,8 +64,9 @@ installPackages+=(libusbx-devel)
# speech-dispatcher-devel for QtSpeech, otherwise it has no backend on Linux # speech-dispatcher-devel for QtSpeech, otherwise it has no backend on Linux
installPackages+=(speech-dispatcher-devel) installPackages+=(speech-dispatcher-devel)
# Python 3.8 for pyside. Qt for Python support for Python 3.6 will be deprecated in within pyside6.3 # Python 3.8 for pyside. Qt for Python support for Python 3.6 will be deprecated in within pyside6.3
installPackages+=(python38) installPackages+=(python3.11)
installPackages+=(python38-devel) installPackages+=(python3.11-pip)
installPackages+=(python3.11-devel)
# WebEngine # WebEngine
installPackages+=(bison) installPackages+=(bison)
installPackages+=(flex) installPackages+=(flex)
@@ -78,6 +79,7 @@ installPackages+=(libxshmfence-devel)
installPackages+=(nspr-devel) installPackages+=(nspr-devel)
installPackages+=(nss-devel) installPackages+=(nss-devel)
installPackages+=(python3-html5lib) installPackages+=(python3-html5lib)
installPackages+=(libatomic)
# For Android builds # For Android builds
installPackages+=(java-11-openjdk-devel) installPackages+=(java-11-openjdk-devel)
# For receiving shasum # For receiving shasum
@@ -144,7 +146,7 @@ sudo /usr/bin/pip3 install dataclasses
sudo pip3 install --upgrade pip sudo pip3 install --upgrade pip
sudo pip3 install virtualenv wheel sudo pip3 install virtualenv wheel
# Just make sure we have virtualenv to run with python3.8 -m virtualenv # Just make sure we have virtualenv to run with python3.8 -m virtualenv
sudo python3.8 -m pip install virtualenv wheel sudo python3.11 -m pip install virtualenv wheel
sudo /usr/bin/pip3 install wheel sudo /usr/bin/pip3 install wheel

View File

@@ -1,47 +1,10 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# Copyright (C) 2023 The Qt Company Ltd.
############################################################################# # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
##
## Copyright (C) 2020 The Qt Company Ltd.
## 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$
##
#############################################################################
set -e set -e
curl --retry 5 --retry-delay 10 --retry-max-time 60 http://ci-files01-hki.intra.qt.io/input/semisecure/redhat_ak.sh -o "/tmp/redhat_ak.sh" &>/dev/null curl --retry 5 --retry-delay 10 --retry-max-time 60 http://ci-files01-hki.intra.qt.io/input/semisecure/redhat_ak_all_versions.sh -o "/tmp/redhat_ak.sh" &>/dev/null
sudo chmod 755 /tmp/redhat_ak.sh sudo chmod 755 /tmp/redhat_ak.sh
/tmp/redhat_ak.sh /tmp/redhat_ak.sh

View File

@@ -1,47 +1,10 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# Copyright (C) 2023 The Qt Company Ltd.
############################################################################# # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
##
## Copyright (C) 2023 The Qt Company Ltd.
## 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$
##
#############################################################################
set -e set -e
curl --retry 5 --retry-delay 10 --retry-max-time 60 http://ci-files01-hki.intra.qt.io/input/semisecure/redhat_ak.sh -o "/tmp/redhat_ak.sh" &>/dev/null curl --retry 5 --retry-delay 10 --retry-max-time 60 http://ci-files01-hki.intra.qt.io/input/semisecure/redhat_ak_all_versions.sh -o "/tmp/redhat_ak.sh" &>/dev/null
sudo chmod 755 /tmp/redhat_ak.sh sudo chmod 755 /tmp/redhat_ak.sh
/tmp/redhat_ak.sh /tmp/redhat_ak.sh

View File

@@ -1,43 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# Copyright (C) 2021 The Qt Company Ltd.
############################################################################# # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
##
## Copyright (C) 2021 The Qt Company Ltd.
## 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$
##
#############################################################################
# Setups sbuild environment # Setups sbuild environment

View File

@@ -1,42 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
############################################################################# # Copyright (C) 2023 The Qt Company Ltd.
## # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
## Copyright (C) 2023 The Qt Company Ltd.
## 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$
##
#############################################################################
# Get required deb files for sbuild to build qt debian packages for Ubuntu focal # Get required deb files for sbuild to build qt debian packages for Ubuntu focal
mkdir -p /home/qt/debian_packages mkdir -p /home/qt/debian_packages

View File

@@ -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
set -ex
# 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

View File

@@ -1,2 +1 @@
Disable-NetAdapterLso Ethernet . "$PSScriptRoot\..\common\windows\disable-netadapterlso.ps1"
Start-Sleep -s 15 # Give windows some time to adjust network settings

View File

@@ -22,4 +22,6 @@ Function ChangeResolution {
Write-Host "Changing the resolution to ${x_value}x${y_value}" Write-Host "Changing the resolution to ${x_value}x${y_value}"
ChangeResolution "MSBDD_NOEDID_1234_1111_00000000_00020000_0^E3701873EC28AFCFF631E725354CDC2D" ChangeResolution "MSBDD_NOEDID_1234_1111_00000000_00020000_0^E3701873EC28AFCFF631E725354CDC2D"
ChangeResolution "MSBDD_NOEDID_15AD_0405_00000000_000F0000_0^C13AE38966E73205F75BFACA84EB83A5" ChangeResolution "MSBDD_NOEDID_15AD_0405_00000000_000F0000_0^C13AE38966E73205F75BFACA84EB83A5"
ChangeResolution "MSBDD_RHT12340_2A_07DE_3D_1234_1111_00000000_00010000_0^4189234F4C5A30C0FE2E08AED7E5F516"
ChangeResolution "MSBDD_RHT12340_2A_07DE_3D_1234_1111_00000000_00020000_0^0E45B5CD7061674FC90A8064A6FE81F4"
ChangeResolution "MSNILNOEDID_1414_008D_FFFFFFFF_FFFFFFFF_0^030B4FCE00727AC1593E5B6FD18648D6" ChangeResolution "MSNILNOEDID_1414_008D_FFFFFFFF_FFFFFFFF_0^030B4FCE00727AC1593E5B6FD18648D6"

View File

@@ -22,4 +22,6 @@ Function ChangeResolution {
Write-Host "Changing the resolution to ${x_value}x${y_value}" Write-Host "Changing the resolution to ${x_value}x${y_value}"
ChangeResolution "MSBDD_NOEDID_1234_1111_00000000_00020000_0^E3701873EC28AFCFF631E725354CDC2D" ChangeResolution "MSBDD_NOEDID_1234_1111_00000000_00020000_0^E3701873EC28AFCFF631E725354CDC2D"
ChangeResolution "MSBDD_NOEDID_15AD_0405_00000000_000F0000_0^C13AE38966E73205F75BFACA84EB83A5" ChangeResolution "MSBDD_NOEDID_15AD_0405_00000000_000F0000_0^C13AE38966E73205F75BFACA84EB83A5"
ChangeResolution "MSBDD_RHT12340_2A_07DE_3D_1234_1111_00000000_00010000_0^4189234F4C5A30C0FE2E08AED7E5F516"
ChangeResolution "MSBDD_RHT12340_2A_07DE_3D_1234_1111_00000000_00020000_0^0E45B5CD7061674FC90A8064A6FE81F4"
ChangeResolution "MSNILNOEDID_1414_008D_FFFFFFFF_FFFFFFFF_0^030B4FCE00727AC1593E5B6FD18648D6" ChangeResolution "MSNILNOEDID_1414_008D_FFFFFFFF_FFFFFFFF_0^030B4FCE00727AC1593E5B6FD18648D6"

View File

@@ -0,0 +1 @@
. "$PSScriptRoot\..\common\windows\grpc.ps1"

View File

@@ -22,4 +22,6 @@ Function ChangeResolution {
Write-Host "Changing the resolution to ${x_value}x${y_value}" Write-Host "Changing the resolution to ${x_value}x${y_value}"
ChangeResolution "MSBDD_NOEDID_1234_1111_00000000_00020000_0^E3701873EC28AFCFF631E725354CDC2D" ChangeResolution "MSBDD_NOEDID_1234_1111_00000000_00020000_0^E3701873EC28AFCFF631E725354CDC2D"
ChangeResolution "MSBDD_NOEDID_15AD_0405_00000000_000F0000_0^C13AE38966E73205F75BFACA84EB83A5" ChangeResolution "MSBDD_NOEDID_15AD_0405_00000000_000F0000_0^C13AE38966E73205F75BFACA84EB83A5"
ChangeResolution "MSBDD_RHT12340_2A_07DE_3D_1234_1111_00000000_00010000_0^4189234F4C5A30C0FE2E08AED7E5F516"
ChangeResolution "MSBDD_RHT12340_2A_07DE_3D_1234_1111_00000000_00020000_0^0E45B5CD7061674FC90A8064A6FE81F4"
ChangeResolution "MSNILNOEDID_1414_008D_FFFFFFFF_FFFFFFFF_0^030B4FCE00727AC1593E5B6FD18648D6" ChangeResolution "MSNILNOEDID_1414_008D_FFFFFFFF_FFFFFFFF_0^030B4FCE00727AC1593E5B6FD18648D6"

View File

@@ -0,0 +1 @@
. "$PSScriptRoot\..\common\windows\grpc.ps1"

View File

@@ -22,4 +22,6 @@ Function ChangeResolution {
Write-Host "Changing the resolution to ${x_value}x${y_value}" Write-Host "Changing the resolution to ${x_value}x${y_value}"
ChangeResolution "MSBDD_NOEDID_1234_1111_00000000_00020000_0^E3701873EC28AFCFF631E725354CDC2D" ChangeResolution "MSBDD_NOEDID_1234_1111_00000000_00020000_0^E3701873EC28AFCFF631E725354CDC2D"
ChangeResolution "MSBDD_NOEDID_15AD_0405_00000000_000F0000_0^C13AE38966E73205F75BFACA84EB83A5" ChangeResolution "MSBDD_NOEDID_15AD_0405_00000000_000F0000_0^C13AE38966E73205F75BFACA84EB83A5"
ChangeResolution "MSBDD_RHT12340_2A_07DE_3D_1234_1111_00000000_00010000_0^4189234F4C5A30C0FE2E08AED7E5F516"
ChangeResolution "MSBDD_RHT12340_2A_07DE_3D_1234_1111_00000000_00020000_0^0E45B5CD7061674FC90A8064A6FE81F4"
ChangeResolution "MSNILNOEDID_1414_008D_FFFFFFFF_FFFFFFFF_0^030B4FCE00727AC1593E5B6FD18648D6" ChangeResolution "MSNILNOEDID_1414_008D_FFFFFFFF_FFFFFFFF_0^030B4FCE00727AC1593E5B6FD18648D6"

View File

@@ -0,0 +1 @@
. "$PSScriptRoot\..\common\windows\grpc.ps1"

View File

@@ -22,4 +22,6 @@ Function ChangeResolution {
Write-Host "Changing the resolution to ${x_value}x${y_value}" Write-Host "Changing the resolution to ${x_value}x${y_value}"
ChangeResolution "MSBDD_NOEDID_1234_1111_00000000_00020000_0^E3701873EC28AFCFF631E725354CDC2D" ChangeResolution "MSBDD_NOEDID_1234_1111_00000000_00020000_0^E3701873EC28AFCFF631E725354CDC2D"
ChangeResolution "MSBDD_NOEDID_15AD_0405_00000000_000F0000_0^C13AE38966E73205F75BFACA84EB83A5" ChangeResolution "MSBDD_NOEDID_15AD_0405_00000000_000F0000_0^C13AE38966E73205F75BFACA84EB83A5"
ChangeResolution "MSBDD_RHT12340_2A_07DE_3D_1234_1111_00000000_00010000_0^4189234F4C5A30C0FE2E08AED7E5F516"
ChangeResolution "MSBDD_RHT12340_2A_07DE_3D_1234_1111_00000000_00020000_0^0E45B5CD7061674FC90A8064A6FE81F4"
ChangeResolution "MSNILNOEDID_1414_008D_FFFFFFFF_FFFFFFFF_0^030B4FCE00727AC1593E5B6FD18648D6" ChangeResolution "MSNILNOEDID_1414_008D_FFFFFFFF_FFFFFFFF_0^030B4FCE00727AC1593E5B6FD18648D6"

View File

@@ -0,0 +1 @@
. "$PSScriptRoot\..\common\windows\grpc.ps1"

View File

@@ -1,42 +1,6 @@
#!/usr/bin/env perl #!/usr/bin/env perl
############################################################################# # Copyright (C) 2015 The Qt Company Ltd.
## # SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
## Copyright (C) 2015 The Qt Company Ltd.
## Contact: http://www.qt.io/licensing/
##
## This file is part of the utilities 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$
##
#############################################################################
use v5.8; use v5.8;
use strict; use strict;

2
qt3d

Submodule qt3d updated: 288524fc3d...a682a51c17

2
qtbase

Submodule qtbase updated: 6ac543c843...dec1863c7d

2
qtcoap

Submodule qtcoap updated: de4628726d...19fe949d12

2
qtdoc

Submodule qtdoc updated: c0dcac8e44...b94ad205cc

2
qtgrpc

Submodule qtgrpc updated: 7802f5b06c...140631df28

2
qtmqtt

Submodule qtmqtt updated: 4c7ce10ad3...c51ab1f9e9

Submodule qtopcua updated: 91f3983804...780b2169c6

2
qtqa

Submodule qtqa updated: 90f36f05f7...9133c01691

Submodule qtscxml updated: 1ba39b5fa4...e6c9f3f2b4

2
qtsvg

Submodule qtsvg updated: f31a1031b0...c5aacf55ee

Submodule qttools updated: e8e7c43864...3fae450efa