Commit Graph

5335 Commits

Author SHA1 Message Date
Qt Submodule Update Bot
2da4760c21 Update submodules on '6.6 in qt/qt5'
Change-Id: Id0c16cbb8ede64dd9053e91eb946768699ad14a5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
v6.6.0-beta2
2023-07-09 00:03:23 +00:00
Heikki Halmet
a4c0d0104b Upgrade MSVC 2022 and 2019 for Windows 10 22H2
Change upgrades also build tools for both visual studios

MSVC 2022: 17.6.4
MSVC 2019: 16.11.27

Task-number: COIN-1059
Change-Id: Id212d396a58827d5794158a4b314ec65ad5a3f47
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
(cherry picked from commit 6341108c6f)
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2023-07-09 02:03:22 +02:00
Allan Sandfeld Jensen
349d3e1a2f Fix SetEnvVar for Debian
Change-Id: I4152575cc071ea7f51e102a3807b05ed9f89d2fd
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
(cherry picked from commit 14f7603e91)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-07-06 06:41:47 +00:00
Amir Masoud Abdol
235cb3b7b0 Show an error when a submodule is missing, or misspelled
Stop the configuration and show an error if one of the submodules is
missing, or misspelled in `-submodules` option.

Fixes: QTBUG-114133
Change-Id: I890d4f5f0614288a2be422f839e04a0086a58403
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Alexandru Croitor (OOO) <alexandru.croitor@qt.io>
(cherry picked from commit bb13b7dadf)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-07-06 05:17:38 +00:00
Fredrik Ålund
33a76dfc57 Add missing provisioning scripts for Mimer SQL for RHEL 8.6 and RHEL 8.8
The provisioning scripts for Mimer SQL is missing in RHEL 8.6 and
RHEL 8.8 and therefore the Mimer SQL QtSql plugin is not built

Fixes: QTBUG-111219
Change-Id: I9c12b7d94ab7b047ed08b46043ad16586968ecfd
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit af7c74313d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-07-05 14:47:48 +00:00
Qt Submodule Update Bot
4986b4d90f Update submodules on '6.6 in qt/qt5'
Change-Id: I05f3cc9ba1f3a4d488c14d27b22c81944afe4bc5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-07-03 19:56:53 +00:00
Allan Sandfeld Jensen
52394ad84a Update node.js on Windows to 18.16.0
Needs to be at least 14.19 for Qt WebEngine 6.6

Change-Id: I1d4b8b241d18eeeffa1b2a9eed0e85cbf54e49ba
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit de0104b3ed)
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2023-07-03 14:25:14 +02:00
Simo Fält
6bedd9ec81 Add qtmultimedia as a recommended dependency for qt3d
Qt CI requires qtmultimedia binaries to create debian packages.

Pick-to: dev
Change-Id: Ib29cefe15db7f32fb9457320d899a4996bda6cba
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2023-06-30 04:03:05 +00:00
Tor Arne Vestbø
f624ee6402 Remove conan profiles
The conan experiment has ended, and the files are only bitrotting
nowadays.

Change-Id: Iefdc6fa1a48bb4062b15cf035f372a2d44bddda9
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 8214de5e0e)
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2023-06-28 10:59:35 +00:00
Tor Arne Vestbø
45e3f4a6d4 Remove CMake and Ninja version requirements from README
There are many details, as documented by the online documentation.

Task-number: QTBUG-114869
Change-Id: I3b5b6679264a7cb0f5deddad3385af9bd46693f8
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 2802d1debb)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-06-28 10:59:34 +00:00
Jøger Hansegård
55ca61922c Add CMakeUserPresets.json to .gitignore
The CMakeUserPresets.json file can be used to simplify configuring Qt,
particularly with tools such as Visual Studio and Visual Studio Code.

As opposed to the CMakePresets.json, the CMakeUserPresets.json should
only contain user specific configurations, and should never be checked
into source code management system. Therefore it makes sense to ignore
it globally.

Change-Id: I971d4505b302dc40e3dd33b6d4680c2067047c27
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit cf4eabc8c2)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-06-28 08:24:46 +00:00
Jøger Hansegård
24e23c04e5 Enable rebuilding FFMPEG for MSVC without deleting lib files first
To simplify testing modifications to the FFMPEG library, it is nice to
be able to rebuild FFMPEG without having to manually delete lib files
first. This change makes this possible because it uses powershell
Move-Item instead of Rename-Item to rename .o files to .lib files.
Move-Item's -Force argument allows renaming files to destination that
already exists.

Change-Id: I0a56776d38c37d38d1cd74b5186881fc955d51f0
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit c4d26fe1d2)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-06-27 10:12:19 +00:00
Piotr Wierciński
2a9e989c97 wasm: update emscripten to 3.1.37
Qt 6.6 will require emscripten 3.1.37

Change-Id: I24d172b9ba055c690274a99af109b50cd2f79b88
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Mikołaj Boc <Mikolaj.Boc@qt.io>
(cherry picked from commit 13c53ef79f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-06-27 10:12:17 +00:00
Assam Boudjelthia
9075653904 Coin:Android: unify and update OpenSSL provisioning scripts
Use the same prebuilt pacakges for all platforms since the prebuilt libs
are going to be used for the target and they are not tied to the host.

Task-number: QTBUG-110025
Change-Id: I2c79722989902b16883b31cbc6e140855239fcc8
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 4e59702b14)
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
2023-06-27 10:12:15 +00:00
Assam Boudjelthia
ba9dfd1769 Android: fix outdated target id names in tqtc-android-automotive target
Amends ef12163e25.

Task-number: QTQAINFRA-5431
Change-Id: Ifa8446b1432223924d8af15322b1982bc33fa29c
Reviewed-by: Toni Saario <toni.saario@qt.io>
Reviewed-by: Zoltan Gera <zoltan.gera@qt.io>
Reviewed-by: Petri Virkkunen <petri.virkkunen@qt.io>
(cherry picked from commit 501087faf6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-06-27 10:12:12 +00:00
Qt Submodule Update Bot
8c07ec9845 Update submodules on '6.6 in qt/qt5'
Change-Id: Ifff5f4ae7bf439080761fd4944ae7e63ea198ebd
Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
2023-06-27 10:11:11 +00:00
Simo Fält
3e7b47c402 COIN: Disable linux on arm config again
The only host is down for now.

Change-Id: I82cc9461a16d054da6611f2e2ee0be6426755660
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
(cherry picked from commit 82327bfc4d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2023-06-15 07:34:18 +00:00
Qt Submodule Update Bot
8528bcd555 Update submodules on '6.6 in qt/qt5'
Change-Id: If8c186c9cef7436b4434db82bed212ee98a641bc
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
v6.6.0-beta1
2023-06-09 19:37:17 +03:00
Jani Heikkinen
dd66d962bd Adjust submodule branches
Change-Id: I416489d90c9619ad8142d8fc83db34e7c1c0b667
2023-06-05 07:40:43 +03:00
Qt Submodule Update Bot
5dee3f7812 Update submodules on 'dev in qt/qt5'
Change-Id: I3975fc15037301d5e615fe777fd971541c3034ab
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-05-31 07:50:45 +00:00
Qt Submodule Update Bot
d53ea49973 Update submodules on 'dev in qt/qt5'
Change-Id: I741901fb948981d14fa1ee7944e5722076178430
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-05-27 08:15:50 +00:00
Samuli Piippo
2a8927e1ac Add more Yocto repository configs
Use common yaml config for all Yocto meta layers.

Change-Id: I72fcdf1bd4fbba81346629537ad748d8e7cd5249
Reviewed-by: Toni Saario <toni.saario@qt.io>
2023-05-26 12:15:36 +03:00
Qt Submodule Update Bot
1b6cab3295 Update submodules on 'dev in qt/qt5'
Change-Id: If1f0bb9e4abd2c9a50528b2e7c8cc7dd7038ba4f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-05-25 14:02:39 +00:00
Teemu Holappa
eb838ea957 Add Axivion support for Qt Safe Renderer
This commit adds Axivion build configuration for Qt Safe Renderer.

Change-Id: I61acecc79552534f1fa37bc40bfeea469c68e9b6
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
2023-05-24 06:55:54 +00:00
Qt Submodule Update Bot
78d15ca741 Update submodules on 'dev in qt/qt5'
Change-Id: I4455587c0b449f53ce19e4b84e3e70ac75f9f0b6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-05-23 11:02:06 +00:00
Qt Submodule Update Bot
85e1b5954b Update submodules on 'dev in qt/qt5'
Change-Id: Ie19cbdda4f31956a9d01ead2ccd4850cdb6c57ad
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-05-20 13:20:49 +00:00
Alexey Edelev
e1b7e865ec Disable openssl for ffmpeg library
Openssl library causes backward compatibility issues. We need to disable
it to make ffmpegmediaplugin work on all supported linux platforms.

Fixes: QTBUG-113324
Pick-to: 6.5 6.5.1
Change-Id: Ib266e2cf67e9336fb206735b8b2418fccd8f7b00
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2023-05-20 03:20:04 +02:00
Heikki Halmet
3d149e8ff1 Provisining: Disable auto upgrades for Ubuntu 22.04
Auto upgrade can lock apt which cause provisoning failure

Task-number: QTQAINFRA-3054
Pick-to: 6.5 6.2
Change-Id: I7d8b8b9baf8b48f00d62dba2f810bf12aaa3c8a0
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
2023-05-19 11:40:43 +00:00
Heikki Halmet
090ce999db Provisioning: Wait apt lock with Ubuntu 22.04
Task-number: QTQAINFRA-3054
Pick-to: 6.5 6.2
Change-Id: Ief47a92c063ed31f930394ade54418e8f50c8358
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2023-05-19 11:40:41 +00:00
Matti Paaso
376d7cea83 Add Axivion toolchain and platform config nightly builds
Task-number: QTQAINFRA-5244
Change-Id: I08e9bf2f2066addb112888f791f7c9f0bd2659d6
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2023-05-19 07:42:58 +03:00
Qt Submodule Update Bot
b5bea16752 Update submodules on 'dev in qt/qt5'
Change-Id: I48e7216331c8f6ed31c77e4c2e0d13e3e9570ee1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2023-05-18 11:17:14 +00:00
Jani Heikkinen
9aae493bc6 Update Appendix 9 in LICENSE.QT-LICENSE-AGREEMENT
Task-number: QTBUG-113132
Pick-to: 6.5 6.4 6.2 5.15
Change-Id: I1244bd0e7318120cf5ebde4daae38b9fba862237
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
2023-05-18 11:17:13 +00:00
Simo Fält
95d035a0e5 Revert "Remove arm on linux config for now"
This reverts commit dbbcf2fa3a.

Reason for revert: Host config should be ok again.

Change-Id: Iaf5d54f1ea16055f00b072bc18c5da1605be42a1
Reviewed-by: Toni Saario <toni.saario@qt.io>
2023-05-17 12:58:42 +00:00
Rami Potinkara
ef12163e25 Android: Android OS 13 API 33 to CI as maximum version
Android 13 replaces Android 12 as max version in CI.
Android 6 kept as minimum version of Android in CI.

Task-number: QTQAINFRA-5392
Task-number: QTQAINFRA-5431
Change-Id: If85c6f63d52055e2ba95f92c154b20a6b809c7dc
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2023-05-17 08:24:02 +03:00
Samuel Mira
2751db4d29 Fix FFmpeg provisioning for Android armv7a
Altered install-ffmpeg.ps1 script to build android armv7a archicture

Task-number: QTQAINFRA-5476
Pick-to: 6.5
Change-Id: I5179174c8676a3016df2922c00030e9d45a9009c
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
2023-05-16 18:35:23 +02:00
Alexey Edelev
84df93d37e Uninify MSVC version that is used in provisioning
We pick the oldest build tools we can find because there is lower
chance that the produced binaries will be incomaptible with the newer
version of MSVC.

With the current provisioning design we also cannot change the MSVC
version for the each package on demand. Once Enter-VsDevShell is called
it litters the powershell environment and blocks the use of
Enter-VsDevShell second time. It could be better to run each .ps1 file
in own instance of powershell to avoid mixing build environment.

Amends f58afd5476

Pick-to: 6.5
Change-Id: Ie752cfc8b69ed985e61ec16209007dd586611866
Reviewed-by: Samuel Mira <samuel.mira@qt.io>
Reviewed-by: Artem Dyomin <artem.dyomin@qt.io>
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
2023-05-16 18:35:23 +02:00
Qt Submodule Update Bot
fde60661d9 Update submodules on 'dev in qt/qt5'
Change-Id: Iab0c76e02211467342807c262c482f4826e15dc9
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
2023-05-16 17:32:15 +03:00
Heikki Halmet
47d4afa523 Fix platform dependecy for Android Automotive
Change-Id: I933adf7fd754dc17b177b404b8ed6b785cb04ae4
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
2023-05-16 05:55:33 +00:00
Teemu Holappa
a07826f70f Update qtsaferenderer build configurations
Task-number: QSR-2110
Task-number: QSR-2010
Pick-to: 6.5
Change-Id: Idbf265ba461d3b383e1bae8b41f00a8cf76e4d3a
Reviewed-by: Toni Saario <toni.saario@qt.io>
2023-05-15 09:13:48 +03:00
Heikki Halmet
f8cffcafbd Replace RHEL 8.4 with RHEL 8.6
This also includes support for OpenSSL 3 for RHEL 8.6.

Task-number: QTQAINFRA-5368
Change-Id: Ifeb87f840eaa0df227ae2b8c20a58c126f654d2e
Reviewed-by: Kai Köhne <kai.koehne@qt.io>
2023-05-11 19:57:22 +00:00
Jukka Jokiniva
0263bed848 Fix cpdb-libs provisioning script
New commits have been added to the cpdb-libs git repository. The commit
cannot be checked out anymore. Fixed by taking a full clone.

Change-Id: I69d5e77233a21c1e1c36b386e0dc25a26fadfce1
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
2023-05-11 17:08:19 +00:00
Tero Heikkinen
08ac268561 Provisioning: Upgrade Xcode version to 14.3 for macOS 13
Change also upgrades command line tools

Task-number: QTQAINFRA-5485
Pick-to: 6.5
Change-Id: I057e4c850c3c7ba938002a2ec444637ae9f51cf4
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Tero Heikkinen <tero.heikkinen@qt.io>
2023-05-05 11:13:16 +03:00
Samuel Mira
99afe7199e Fix FFmpeg provisioning for Android in arm64, x86 and x86_64
Added install-ffmpeg-android script for the android cross-compile
Removed android stuff from install-ffmpeg
Changed the yaml variables to include the target arch
Added the arm64 target arch

Task-number: QTQAINFRA-5476
Pick-to: 6.5
Change-Id: Id9609ed0427f2fc42f7f27e7787a81ad145f59be
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
Reviewed-by: Lars Knoll <lars@knoll.priv.no>
2023-04-26 22:44:30 +00:00
Simo Fält
dbbcf2fa3a Remove arm on linux config for now
The CI's host config is broken atm.

Change-Id: I5179174c8676a3016df2922c00030e9d45a9009f
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2023-04-21 15:28:47 +03:00
Eike Ziller
cb8e0553fe COIN/Qt Creator: Use macOS 11
Since Qt 6.5 doesn't support anything earlier

Pick-to: 6.5
Change-Id: Ia5c5b011c774c34311d1cdc2afda914d53d16429
Reviewed-by: David Schulz <david.schulz@qt.io>
2023-04-19 10:42:45 +02:00
Jani Heikkinen
912aa2eb46 Add qtgraphs submodule in qt5.git as preview module
Task-number: QTBUG-112800
Change-Id: I39384c20cdb2a83c70ea84628fa37472a62bbaf4
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2023-04-19 05:22:20 +00:00
Jani Heikkinen
7956c13d5c Enable CI for qtgraphs repository
Task-number: QTBUG-108162
Change-Id: I757dc1818bf62969ed4fab25ee9c4446d1201415
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
2023-04-19 08:22:16 +03:00
Dominik Holland
4bd1b6fad3 Provisioning: Make the dependencywalker available to python nuitka
nuitka needs the dependency walker to create standalone binaries. For
that nuitka downloads the dependency walker into its cache location.
If we copy our installation to this cache folder first, we don't need
to download it again.

Change-Id: Ib55e5ddc7cb6b482e9db0723fd015b36da01e555
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2023-04-18 12:20:12 +00:00
Simo Fält
e14434a7ea Provisioning: Install nodejs to enable qtwebengine on arm linux
Change-Id: Id39dd3474e0d5f8d214ecf74255073650c82ab47
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2023-04-18 03:48:05 +00:00
Simo Fält
89edadf3be CI: Enable packaging config on arm linux
Task-number: COIN-1029
Change-Id: I369ce20e24b9adf6b64274dfe07bdfc25888e46f
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2023-04-18 06:48:03 +03:00