Commit Graph

4874 Commits

Author SHA1 Message Date
Heikki Halmet
b338b8a9be Add Windows 10 21H2 to 6.2 branch
Tier 1 image includes all configurations from
pre-provisioning folder.
E.g. these are pre-provisioned:
Visual Studio 2015 version 14.0.25420.1 Update 3
Visual Studio 2019 + build tools version 16.11.7
Visual Studio 2022 + build tools version 17.0.1

Task-number: QTQAINFRA-4651
Change-Id: Ib0160acaf4a560cf399dc4427c1495724900d0bf
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2021-12-22 11:19:23 +02:00
Heikki Halmet
18b13306ce Provisioning: Remove SLES 15 SP2 icc script
SLES 15 SP3 used instead of SP2

Change-Id: I9b7b687b32d81b7221d1fd879d2bde802ca4b50c
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-12-20 16:21:08 +02:00
Heikki Halmet
1fcfd8d0d9 Remove Windows 10 21H1 unused mingw script
Windows 10 21H1 is not in 6.2 branch.
Windows 10 21H2 will be the next Windows 10 upgrade:
https://codereview.qt-project.org/c/qt/qt5/+/385048

Change-Id: I4f9fad1d06df6f65618674120c09bcd0f0060a41
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-12-20 16:21:07 +02:00
Toni Saario
26218265ce Add qt-conan-common platforms
Change-Id: I99c9b148d4a3b23acc8c4bbd36cd1ea9ad32eac9
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
(cherry picked from commit 099f184880)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-12-20 08:28:19 +00:00
Heikki Halmet
18e18f46be Upgrade MSVC 2019 and build tools versions to 16.11.8
Task-number: QTQAINFRA-4704
Change-Id: I77e83f392869e81b20cdc11e970f24448bb66420
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
(cherry picked from commit 9d09f9cee9)
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-12-19 09:39:35 +02:00
Jani Heikkinen
63232fcc3b Update latest qt license agreement
Change-Id: Iee3b30b298bac748133daf3f0e58f8dab195a2fe
Reviewed-by: Tarja Sundqvist <tarja.sundqvist@qt.io>
(cherry picked from commit b9a59fe113)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-12-17 15:47:53 +00:00
Ville-Pekka Karhu
90db0de169 Provisioning: Enable keyboard navigation between controls on macOS
Task-number: QTQAINFRA-4660
Change-Id: I12f2995c797e573d5072145c100ee64e98e133ce
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit dbb4cd06aa)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-12-16 08:29:48 +00:00
Alexandru Croitor
4dab0e5514 Coin:Android: set ANDROID_SDK_ROOT explicitly in macOS 12 config
... and remove ANDROID_{SDK,NDK}_HOME as they are
deprecated and might not work even.

Amends 7e2882d0a7

Augments d59825d250

Task-number: QTBUG-97002
Change-Id: I96fb543521d70784d75e524d8b48ac72c42e6815
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 6e7de2b76c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-12-15 18:31:42 +00:00
Toni Saario
98394de5c9 Add tqtc-qtdigitaladvertising platforms
Change-Id: I839e0c2509dfac800a06d9c791b693dbc8681a52
Reviewed-by: Mateusz Ligocki <mateusz.ligocki@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 1a1028ea20)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-12-15 07:30:21 +00:00
Pasi Petäjäjärvi
976aa2f9d2 CI: Add inotify support for QNX
Adds Filesystem event manager server to image and also add HOME env
varbiable for root user.

Task-number: QTBUG-99168
Change-Id: I4df10f17f4e274dc0d21fea1a767c351ba3c8362
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 06edc60e1d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-12-14 07:04:08 +00:00
Qt Submodule Update Bot
6bd4005677 Update submodules on '6.2 in qt/qt5'
Change-Id: I7f4aadf6b8f36411c73c4184178bc9f25f7027dc
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-12-14 04:58:27 +00:00
Heikki Halmet
51a3872d85 Remove MinGW 8 targets and provisioning scripts
MinGW 11 is already in use

Task-number: QTBUG-93479
Change-Id: Ibdb356831c2b1e458d17059be9bff323e814c6e3
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-12-13 16:09:17 +02:00
Qt Submodule Update Bot
6ba9bb865f Update submodules on '6.2 in qt/qt5'
Change-Id: I23165d59db00a68dadc077eef6ff773417a01715
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-12-12 11:41:36 +00:00
Marianne Yrjänä
21a5b4cb18 QNX: Update QNX toolchain
Timezone database added for tests

Change-Id: I406e1ae0e9d1553f1588413d9cd20920674a907c
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
(cherry picked from commit e9258230f3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-12-11 19:31:21 +00:00
Heikki Halmet
5ebe4f3188 Add Windows 11 targets and provisioning scripts
Tier 1 image includes all configurations from
pre-provisioning folder.
E.g. these are pre-provisioned:
Visual Studio 2015 version 14.0.25431.1 Update 3
Visual Studio 2019 + build tools version 16.11.5
Visual Studio 2022 + build tools version 17.0.0 preview 7.0
Visual Studio 2022 + build tools version 17.0.1

Task-number: QTQAINFRA-4512
Change-Id: Ieceff236a9c12f34dc772c89cb93ad99d38d7fe5
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 8f46d3ede3)
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-12-09 09:12:27 +02:00
Simo Fält
df9448d946 Provisioning: Install addtional Python 3.10.0 for Windows 10
Change-Id: Ied45a786c220a1a331e7546720d72db473ce504d
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
(cherry picked from commit 1e24a91028)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-12-09 06:06:40 +00:00
Toni Saario
c7ca7a645c Set Conan V2 mode
V2 mode causes conan to raise error when an feature that is being
deprecated in conan V2 is used. This allows maintaining V2 compatibility.

Change-Id: I9c0cb70ce3a194966594d48433763e5423e187f1
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit dfa50ed7c3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-12-07 12:44:05 +00:00
Toni Saario
a281a7a4fe Enable conan revisions mode
Change-Id: Ic6e6070df62a45820e152123cf7bd82f51c226b2
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit dcded49b88)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-12-07 12:44:05 +00:00
Toni Saario
fd3f33165b Remove existing conan settings file
Due to existing conan file new versions of compilers etc. cannot
be used. Forcing Conan to generate a new one will allow using the
new versions in profile files.

Change-Id: I5adc1a42a4d620656767eb1418f341ef50232f91
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit b2240d78cd)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-12-07 12:44:05 +00:00
Toni Saario
3354c21ce0 Update conan on windows
This is required for the upcoming conan integrations.

Change-Id: Id7d3390721e3521b8e6f1da8e7ab0aae5213c7af
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 5cf68160c2)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-12-07 12:44:05 +00:00
Jukka Jokiniva
7d1db6121a Add yaml file for Android Automotive
Change-Id: I1007453ba47e7a7be4fe60ef065695189eb44f98
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 06b5cd95e6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-12-07 10:44:57 +00:00
Tor Arne Vestbø
c72edd2a35 coin: Sync iodbc and postgresql provisioning with dev
Missed when cherry-picking 8b8265e81b

Change-Id: I2eb4169677104e4ce1f129452aefa1a7a1190408
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-12-07 09:58:43 +01:00
Tor Arne Vestbø
bd46535087 coin: Make macOS 12 on x86_64 developer build tests significant
Change-Id: Ia148ae783006fb5b1b13f29879df78985cd75ecd
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 19fbf58013)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-12-04 10:36:16 +00:00
Tatiana Borisova
4a303eb955 Include autotests compilation to CI build for INTEGRITY
- add minimal test for Integrity static build

Change-Id: I0b73db0e6004718447c628ee63183c028be433ca
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit d36a16584a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-12-03 08:00:22 +00:00
Iikka Eklund
2f89f40bd2 Conan: Provide separate build profiles for end users and CI
The CI uses e.g. "sccache" which is rarely used outside CI systems.
Also openssl install directories in the build profiles are specific to
CI build agents. Also headersclean option should be CI specific.

Split the current profiles in two: the CI specific profile defines only
the CI related details and includes the matching profile for the end
users.

The profile which includes other profile(s) will override the Settings
or Options if redefined.

Task-number: QTQAINFRA-4619
Change-Id: If69e8c0c283655475671fcb0ca739087cd9d2567
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
(cherry picked from commit d6fcea563f)
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-11-27 15:49:12 +02:00
Samuli Piippo
347bccf893 QEMU: update toolchains
Update qemu toolchains to include needed dependencies for QtWebEngine.

Change-Id: Ia5cf09b3f94fe75d16304e717a9da04cb120ea79
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 54c3a77fdf)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-11-27 07:46:50 +00:00
Heikki Halmet
8b8265e81b Add provisioning scripts for macOS 11.0 ARM
Task-number: QTQAINFRA-4263
Task-number: QTQAINFRA-4012
Change-Id: Ia862ac2582912f6faa96667880fb605861c770c6
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 4d617e24ee)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-11-22 10:41:28 +00:00
Ville-Pekka Karhu
10e7aa7647 Provisioning: Add macOS Monterey (12) ARM scripts
Task-number: QTQAINFRA-4508
Change-Id: Ia93e534b6911b6aaef2a0107b067c1ba5e6a6224
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
(cherry picked from commit 478531ac2b)
2021-11-21 18:22:11 +02:00
Heikki Halmet
cc596a54e1 Provisioning: Change using GitHub package for MinGW 11.2.0
Change-Id: I094015202659cd5a5c3231e64a47bb1725e88327
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
(cherry picked from commit 278516d142)
2021-11-21 11:46:56 +02:00
Heikki Halmet
283a46b54f Provisioning: bump Android platform sdk and build tools version to 31
Use latest platform and build tools with macOS 12

Change-Id: If3021f8f727c1775ad14b16897c7e9db3ea08ad1
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 249603dc4f)
2021-11-21 11:46:55 +02:00
Iikka Eklund
67d6e3a209 Conan: Add a recipe to pack build profiles in a Conan package
We want to distribute the used build profiles as well. For this we
can put the profiles in a separate Conan package that can be
installed easily.

This is a "header only" recipe which merely packs the profiles inside
the Conan package which the consumers can install with "conan install"
command:

  $conan install qtbuildprofiles/6.2.0@qt/everywhere --build=always

Result:

  ./windows-x86_64-mingw
  ./linux-x86_64-gcc
  ./macos-ios-universal-clang
  ./...

Change-Id: I745a089b4e855c006e1a5f2f0995a73abbcebf2f
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 806685f6f7)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-11-20 04:33:43 +00:00
Allan Sandfeld Jensen
cd8a69a4c2 Update RHEL 8 nodejs to 12
Change-Id: Ia74d0226499d07cb7d893ddb8b07f066237d8e6f
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit e5d01ece3e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-11-20 04:33:43 +00:00
Tor Arne Vestbø
c474dd17ec coin: Don't set CMAKE_C/CXX_COMPILER_LAUNCHER for sccache explicitly
The coin 'Sccache' feature will take care of it.

Change-Id: Ibb9f79f2d7fc2d7fa2fcfbb24383b1f34fcf594c
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 3c38cc22ce)
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2021-11-19 17:30:22 +01:00
Tor Arne Vestbø
2b652e1ecb coin: Align PostgreSQL provisioning between macOS 11 and macOS 12
Change-Id: I48770c6c6a33375f621b228fc61b23a2c97f787c
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 5733455993)
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2021-11-19 16:30:20 +00:00
Tor Arne Vestbø
71910cefbc Build iODBC library as universal binary on macOS 11+
As per instructions here:

  https://github.com/openlink/iODBC/blob/develop/README_MACOSX.md

Task-number: QTBUG-93204
Change-Id: Ica8d0f8c8d1d497bf0172a5762ae2d419b0ffc95
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 5de9c0fee3)
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2021-11-19 16:30:17 +00:00
Tor Arne Vestbø
ed9970c92d coin: Disable PostgreSQL on macOS 12 builds
The provisioning doesn't support it yet.

Change-Id: Icf0cea1b58813a1e0037c00c726f4cc9096d0ac8
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit 9358ab26ed)
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-11-18 12:05:41 +02:00
Heikki Halmet
0b5b8030a1 Add InsignificantTests flag for macOS 12 developer build tests
Change-Id: I3e325d1b8c7cf55b88876be9bcc33088fd28b4e9
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit b37a42d381)
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-11-18 12:05:40 +02:00
Ville-Pekka Karhu
39b34476c7 Provisioning: Add macOS Monterey (12) x86 to CI
This will also upgrade Xcode to version 13.1

Task-number: QTQAINFRA-4508
Change-Id: Idce56d429b4cd8c7eea3b75e8d91d2f281c0c871
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 7e2882d0a7)
2021-11-17 17:43:00 +02:00
Heikki Halmet
1bd401b52c Replace Rhel 8.2 with Rhel 8.4
Task-number: QTQAINFRA-4514
Change-Id: Idaa28bf61d0ae7498fc019589a168b45e693594b
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-11-17 17:43:00 +02:00
Iikka Eklund
6cc9c921cb Conan: Update build profiles
Remove mutually exclusive options.

Set the 'build_type' correctly so that it reflects the used build
Options.

Change-Id: I40b139898d722583c0fc245f3f8c60657a42d26a
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 8ef536b79e)
2021-11-17 09:34:39 +02:00
Iikka Eklund
26c981f41f Conan: Scope qtbase related options to qtbase recipe only
Some option names supported by qtbase Conan build recipe conflict with
other Conan package recipes, e.g. ICU which also supports 'shared'
option but with different supported option values.

Scope all qtbase related options in profiles to qtbase only.

Change-Id: I4c8bc2b7f5ee7cb69f3b83ef209ddda809719d73
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 3fea4fc3c6)
2021-11-17 09:34:33 +02:00
Iikka Eklund
b63c7662fe Add Conan profiles
Create conan profile per packaging configuration. Profiles will
carry configuration information to the builds conan does.

Profiles allow users to replicate identical configurations
to the packaging configurations and reuse existing binaries.

Change-Id: I50a2a4edbedbf56774bd4ceaae268928f8ed00e0
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit d68e108b94)
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-11-16 10:54:33 +02:00
Heikki Halmet
08a0a1ce46 Add targets for macOS 12 arm64
Task-number: QTQAINFRA-4508
Change-Id: I3b53b0c0654519644d56df1ea935724f68964241
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
(cherry picked from commit 8c06db541a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-11-15 17:35:37 +00:00
Heikki Halmet
6bd3c8ed27 Remove Sccache flag from QNX targets
This might cause issues with compiler

Task-number: QTQAINFRA-4648
Change-Id: I5971adc7fdafee4566d5c9c4efe808d72d170da6
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 9e27a7d5e3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-11-15 14:40:32 +00:00
Heikki Halmet
6cda40d952 Replace MinGW 8.1 with MinGW 11.2.0 in CI
Note! MinGW version is 9.0.0 but the GCC version
is 11.2 which is used with the naming of MinGW

In 6.2 branch Packaging targets needs to be as parallel
first. MinGW 8.1 can be removed ones Releasing team has
done needed script changes

Task-number: QTBUG-93479
Change-Id: I318a898c49bded60bb891b73109de829cb975750
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
(cherry picked from commit ce9ef40366)
2021-11-15 09:24:18 +02:00
Tor Arne Vestbø
70c27d6e69 coin: Add PostgreSQL 14 to macOS 11 images
Needed for universal build of the psql plugin.

Task-number: QTBUG-93204
Change-Id: I2c2d4d0f5f019a0eb4069d7642a901db4cc69473
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 881738a01d)
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2021-11-13 01:14:47 +00:00
Heikki Halmet
954f29898d Provisioning: Install OpenSSL 1.1.1k ARM64 for Windows
Task-number: QTBUG-93822
Change-Id: If48dcc4e9542070a6d0303406b2b0544d35879d4
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 30a1ea30a6)
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-11-12 11:47:20 +02:00
Jani Heikkinen
28d65ee09c Update target configurations for Qt QML Script Compiler
Reposity is nowdays tqtc-qmlcompilerplus, not tqtc-qmlcachegenplus

Pick-to: dev
Change-Id: I4134e74e68184c15fc65c48da57e2523093a20e3
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-11-10 10:01:30 +02:00
Qt Submodule Update Bot
898076adf7 Update submodules on '6.2 in qt/qt5'
Change-Id: I65f53c16b3a8a9af1898671648ddfee4d78da871
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-11-09 17:03:39 +00:00
Tor Arne Vestbø
23ade45981 coin: Enable warnings are errors for macOS builds
Change-Id: I418c207a95a1cd1f827873a7f19178421fdfd10f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 296b7faaad)
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2021-11-05 10:49:57 +00:00