Commit Graph

4875 Commits

Author SHA1 Message Date
Toni Saario
4e7f922835 Add tqtc-qtdigitaladvertising platforms
Change-Id: I839e0c2509dfac800a06d9c791b693dbc8681a52
(cherry picked from commit 1a1028ea20)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-12-14 10:48:59 +00:00
Pasi Petäjäjärvi
65a96ae8cf 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:03 +00:00
Jani Heikkinen
6f82a2fad6 Adjust submodule branches
Change-Id: Ibbcb381be98a3c20b12402266c4361f3f7531cfd
2021-12-13 07:46:50 +02:00
Ulf Hermann
ac1cd90010 Add qtlanguageserver
Change-Id: Ib920288cab4a5a8a73d3aafdf1759ad63e3d639c
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2021-12-13 03:51:11 +01:00
Ville-Pekka Karhu
dbb4cd06aa Provisioning: Enable keyboard navigation between controls on macOS
Task-number: QTQAINFRA-4660
Pick-to: 6.2
Change-Id: I12f2995c797e573d5072145c100ee64e98e133ce
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2021-12-11 19:31:16 +00:00
Marianne Yrjänä
e9258230f3 QNX: Update QNX toolchain
Timezone database added for tests

Pick-to: 6.2
Change-Id: I406e1ae0e9d1553f1588413d9cd20920674a907c
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@qt.io>
2021-12-11 17:33:21 +02:00
Morten Johan Sørvig
6f1ef4d3f6 Provisioning: Update emsdk to 3.0.0
emsdk 3.0.0 is the minimum/recommended version for
Qt 6.3.

The python/node/jre versions appear to be unchanged.
Remove the unused versionTag variable.

Change-Id: Ic7b72691295040f899a22c54066b0aea3995cd7a
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
2021-12-09 07:56:50 +01:00
Simo Fält
1e24a91028 Provisioning: Install addtional Python 3.10.0 for Windows 10
Pick-to: 6.2
Change-Id: Ied45a786c220a1a331e7546720d72db473ce504d
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
2021-12-08 07:36:26 +00:00
Heikki Halmet
1b725757f5 Change compiler MSVC2022_PREVIEW to MSVC2022
MSVC2022 official relase is already available in Windows 10 21H2

Pick-to: 6.2
Task-number: QTQAINFRA-4540
Change-Id: I7d7a480c4077026e7a48acf706baa62623c32c72
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-12-07 09:26:52 +02:00
Heikki Halmet
7184b6b7b0 Provisioning: Install emsdk using emsdk.git
This will reduce the manual work when updating emsdk version
This requires also python certificates to be installed

Pick-to: 6.2
Change-Id: Id33d73f67f3312a27e9660522e7ca7ce17a89dbc
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-12-04 12:36:10 +02:00
Heikki Halmet
4eaaaa7c7c Replace Windows 10 21H1 with Windows 10 21H2 in CI
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
Pick-to: 6.2
Change-Id: I738ac703d72620f84008ac8a5e5d57911d89d055
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-12-04 12:36:10 +02:00
Tor Arne Vestbø
19fbf58013 coin: Make macOS 12 on x86_64 developer build tests significant
Pick-to: 6.2
Change-Id: Ia148ae783006fb5b1b13f29879df78985cd75ecd
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-12-04 10:01:11 +01:00
Toni Saario
dfa50ed7c3 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.

Pick-to: 6.2
Change-Id: I9c0cb70ce3a194966594d48433763e5423e187f1
Reviewed-by: Simo Fält <simo.falt@qt.io>
2021-12-03 08:00:16 +00:00
Toni Saario
dcded49b88 Enable conan revisions mode
Pick-to: 6.2
Change-Id: Ic6e6070df62a45820e152123cf7bd82f51c226b2
Reviewed-by: Simo Fält <simo.falt@qt.io>
2021-12-03 08:00:16 +00:00
Toni Saario
b2240d78cd 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.

Pick-to: 6.2
Change-Id: I5adc1a42a4d620656767eb1418f341ef50232f91
Reviewed-by: Simo Fält <simo.falt@qt.io>
2021-12-03 08:00:16 +00:00
Toni Saario
5cf68160c2 Update conan on windows
This is required for the upcoming conan integrations.

Pick-to: 6.2
Change-Id: Id7d3390721e3521b8e6f1da8e7ab0aae5213c7af
Reviewed-by: Simo Fält <simo.falt@qt.io>
2021-12-03 08:00:16 +00:00
Tatiana Borisova
d36a16584a Include autotests compilation to CI build for INTEGRITY
- add minimal test for Integrity static build

Pick-to: 6.2
Change-Id: I0b73db0e6004718447c628ee63183c028be433ca
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-12-03 08:47:41 +02:00
Samuli Piippo
54c3a77fdf QEMU: update toolchains
Update qemu toolchains to include needed dependencies for QtWebEngine.

Pick-to: 6.2
Change-Id: Ia5cf09b3f94fe75d16304e717a9da04cb120ea79
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-11-26 14:21:09 +00:00
Heikki Halmet
8f46d3ede3 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>
2021-11-26 15:42:27 +02:00
Heikki Halmet
a9eed4e535 Add instructions how to create Windows 11 image with Virtio drivers
Change-Id: I9042667ed00ce6023168f501a2e695af3858780c
Reviewed-by: Simo Fält <simo.falt@qt.io>
2021-11-26 15:42:26 +02:00
Iikka Eklund
d6fcea563f 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.

Pick-to: 6.2
Task-number: QTQAINFRA-4619
Change-Id: If69e8c0c283655475671fcb0ca739087cd9d2567
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2021-11-25 09:12:47 +00:00
Toni Saario
0763fcc4fe Increase QNX VM size
Due to some patch the linking requires more memory than
currently available.

Task-number: QTQAINFRA-4669
Change-Id: I872c2c7421d9e40f5a3ff36caaa2e229ed105f5b
Reviewed-by: Simo Fält <simo.falt@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-11-25 09:12:42 +00:00
Samuli Piippo
547498cca1 QNX: add Packaging feature to QNX builds
Add Packaging feature so that builds are exported from coin.

Change-Id: I64d03b2b67bad36eb23cfe79b995c7bce17e5eee
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2021-11-25 11:12:40 +02:00
Allan Sandfeld Jensen
83b4afd584 Add python3 html5lib
Needed for qtwebengine in 6.3

Change-Id: I6dc941fabe4e28e3dce19db8f7812be034be8586
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-11-20 11:13:09 +01:00
Iikka Eklund
806685f6f7 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
  ./...

Pick-to: 6.2
Change-Id: I745a089b4e855c006e1a5f2f0995a73abbcebf2f
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-11-19 20:46:58 +03:00
Allan Sandfeld Jensen
e5d01ece3e Update RHEL 8 nodejs to 12
Pick-to: 6.2
Change-Id: Ia74d0226499d07cb7d893ddb8b07f066237d8e6f
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-11-19 12:27:46 +00:00
Heikki Halmet
278516d142 Provisioning: Change using GitHub package for MinGW 11.2.0
Pick-to: 6.2
Pick-to: 6.2.2
Change-Id: I094015202659cd5a5c3231e64a47bb1725e88327
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-11-17 18:19:39 +02:00
Heikki Halmet
249603dc4f Provisioning: bump Android platform sdk and build tools version to 31
Use latest platform and build tools with macOS 12

Pick-to: 6.2
Change-Id: If3021f8f727c1775ad14b16897c7e9db3ea08ad1
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2021-11-17 18:19:39 +02:00
Heikki Halmet
b37a42d381 Add InsignificantTests flag for macOS 12 developer build tests
Pick-to: 6.2
Change-Id: I3e325d1b8c7cf55b88876be9bcc33088fd28b4e9
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2021-11-17 18:19:39 +02:00
Tor Arne Vestbø
5de9c0fee3 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
Pick-to: 6.2 6.2.2
Change-Id: Ica8d0f8c8d1d497bf0172a5762ae2d419b0ffc95
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-11-17 17:19:39 +01:00
Tor Arne Vestbø
190c324d8f coin: Add missing platform dependency to macos-12-arm64-tests
Pick-to: 6.2
Change-Id: I507acf803a86a6b200e1bc5fb1599631deed3b40
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-11-17 17:19:39 +01:00
Tor Arne Vestbø
5733455993 coin: Align PostgreSQL provisioning between macOS 11 and macOS 12
Pick-to: 6.2
Change-Id: I48770c6c6a33375f621b228fc61b23a2c97f787c
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-11-17 11:13:48 +01:00
Tor Arne Vestbø
9358ab26ed 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>
2021-11-16 23:08:38 +00:00
Ville-Pekka Karhu
7e2882d0a7 Provisioning: Add macOS Monterey (12) x86 to CI
This will also upgrade Xcode to version 13.1

Task-number: QTQAINFRA-4508
Pick-to: 6.2
Change-Id: Idce56d429b4cd8c7eea3b75e8d91d2f281c0c871
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-11-16 14:52:03 +02:00
Ville-Pekka Karhu
1b1005038b Pre-provisioning: macOS Tier1 creation instructions
Change-Id: I17f6f55c4be878b74c80735e0101619730548056
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-11-16 10:05:07 +02:00
Heikki Halmet
8c06db541a Add targets for macOS 12 arm64
Task-number: QTQAINFRA-4508
Pick-to: 6.2
Change-Id: I3b53b0c0654519644d56df1ea935724f68964241
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
2021-11-15 16:00:12 +02:00
Jani Heikkinen
7294c6a80b Update target configurations for Qt QML Script Compiler
Reposity is nowdays tqtc-qmlcompilerplus, not tqtc-qmlcachegenplus

Change-Id: I4134e74e68184c15fc65c48da57e2523093a20e3
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 28d65ee09c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-11-15 07:08:13 +00:00
Heikki Halmet
ab7d990ec3 Add temporary emsdk_env.bat for webassembly
Let's use this temporary hack so that we can get support
for setting Emscripten environment for Webassembly through qtbase

This change will be removed when we start installing emsdk using
emsdk.git. That installation process will automatically set emsdk_env.bat

Change-Id: I6eb417b28c9ca0cd01a743dea2fa38540fd4dcc3
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-11-12 16:39:33 +02:00
Heikki Halmet
9e27a7d5e3 Remove Sccache flag from QNX targets
This might cause issues with compiler

Task-number: QTQAINFRA-4648
Pick-to: 6.2
Change-Id: I5971adc7fdafee4566d5c9c4efe808d72d170da6
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-11-12 13:14:05 +02:00
Tor Arne Vestbø
881738a01d coin: Add PostgreSQL 14 to macOS 11 images
Needed for universal build of the psql plugin.

Task-number: QTBUG-93204
Pick-to: 6.2 5.15
Change-Id: I2c2d4d0f5f019a0eb4069d7642a901db4cc69473
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-11-12 11:18:20 +01:00
Fawzi Mohamed
4abe5ad424 Add qtlanguageserver repository
Change-Id: If6f67fea02436e0000c0ae4b6f18c4c000504f88
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-11-11 09:31:35 +00:00
Qt Submodule Update Bot
6d94035b1c Update submodules on 'dev in qt/qt5'
Change-Id: I55fc97db5ad49383a1d16988fa315507b5ead634
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-11-11 07:41:54 +00:00
Tor Arne Vestbø
3c38cc22ce coin: Don't set CMAKE_C/CXX_COMPILER_LAUNCHER for sccache explicitly
The coin 'Sccache' feature will take care of it.

Pick-to: 6.2
Change-Id: Ibb9f79f2d7fc2d7fa2fcfbb24383b1f34fcf594c
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-11-09 12:25:21 +01:00
Ville-Pekka Karhu
478531ac2b 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>
2021-11-09 12:19:01 +02:00
Heikki Halmet
30a1ea30a6 Provisioning: Install OpenSSL 1.1.1k ARM64 for Windows
Task-number: QTBUG-93822
Pick-to: 6.2
Change-Id: If48dcc4e9542070a6d0303406b2b0544d35879d4
Reviewed-by: Simo Fält <simo.falt@qt.io>
2021-11-09 09:01:19 +02:00
Iikka Eklund
8ef536b79e Conan: Update build profiles
Remove mutually exclusive options.

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

Pick-to: 6.2
Change-Id: I40b139898d722583c0fc245f3f8c60657a42d26a
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-11-08 08:23:24 +00:00
Simo Fält
9011988e38 Provisioning: Install python3 on arm macOS
Change-Id: I9084429dfac5860643484b6c66fa4fb902b38ce2
Reviewed-by: Simo Fält <simo.falt@qt.io>
2021-11-05 10:30:54 +00:00
Tor Arne Vestbø
c273c5bc65 coin: Disable sccache for Integrity
The platform doesn't support sccache, and the "feature" was
likely cargo culted from some other config, as it was a noop
at the time.

Pick-to: 6.2 5.15
Change-Id: I792231b1bed8856e886eeca9ae37c2b824b1ea8e
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-11-04 10:18:02 +00:00
Tor Arne Vestbø
56daf9b4c0 coin: Build iOS on macOS 11 so we can use a recent Xcode and SDK
Change-Id: I925c040d93b6b0126fc892673abb11a8387d6f27
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-11-04 02:28:12 +01:00
Tor Arne Vestbø
296b7faaad coin: Enable warnings are errors for macOS builds
Pick-to: 6.2
Change-Id: I418c207a95a1cd1f827873a7f19178421fdfd10f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-11-03 11:45:03 +01:00