Commit Graph
4893 Commits
Author SHA1 Message Date
Qt Submodule Update Bot 83eb2ab087 Update submodules on '6.2.3 in qt/qt5'
Change-Id: I9b0ef32e0a3e4bd6a9daa921bbf16f53e6955941
Reviewed-by: Qt Submodule Update Bot <[email protected]>
2022-01-18 04:28:58 +00:00
Heikki Halmet 414e0cf85a Provisioning: Change installation order between libicu and gtk3
Gtk3-devel includes dependency which conflicts with libicu-devel.
Changing installation order should solve it

Change-Id: Iaba3e1710c2a82ec2bab076c88a7afb33896d4bc
Reviewed-by: Simo Fält <[email protected]>
(cherry picked from commit 1e8939b4b2)
2022-01-12 13:36:04 +02:00
Jani Heikkinen fa46120600 Adjust submodule branches
Change-Id: Ib9c2460e8f6d54ce262b95c5a5e4606f6ba25791
2022-01-11 08:35:34 +02:00
Toni Saario fd0e5d85b0 Provision conan on arm macOS
Change-Id: Ibf074c39b7bf3ac0f0f16a5a65d11022f9ec7e04
Reviewed-by: Ville-Pekka Karhu <[email protected]>
(cherry picked from commit 81dcae4f93)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
2022-01-07 16:34:51 +00:00
Heikki Halmet 18a3cb62e8 Provisioning: Install up-to-date google Chrome for Wasm auto tests
Task-number: QTBUG-99062
Change-Id: Ib9ebcad5d9700c09d01d1ba23fed716d3a3cae4b
Reviewed-by: Qt CI Bot <[email protected]>
Reviewed-by: Ville-Pekka Karhu <[email protected]>
Reviewed-by: Morten Johan Sørvig <[email protected]>
Reviewed-by: Tony Sarajärvi <[email protected]>
(cherry picked from commit 71e7ed17a2)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
2022-01-07 07:24:49 +00:00
Heikki Halmet 034eb3d080 Provisioning: Install emsdk using emsdk.git
This will reduce the manual work when updating emsdk version
This requires also python certificates to be installed

Change-Id: Id33d73f67f3312a27e9660522e7ca7ce17a89dbc
Reviewed-by: Qt CI Bot <[email protected]>
Reviewed-by: Tony Sarajärvi <[email protected]>
(cherry picked from commit 7184b6b7b0)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
2022-01-07 07:24:48 +00:00
Heikki Halmet eca2eb1956 Add OPENSSL_ROOT_DIR for macOS Android targets
Enabling OpenSSL requires OPENSSL_ROOT_DIR environment variable.

Task-number: QTBUG-97243
Change-Id: I055c236d0f346ddc2e2aff873f2bd98cacfb5ec3
Reviewed-by: Qt CI Bot <[email protected]>
Reviewed-by: Ville-Pekka Karhu <[email protected]>
(cherry picked from commit ebb9836451)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
2022-01-07 07:24:47 +00:00
Heikki Halmet bc50344a8f Make macOS 12 on ARM developer build tests significant
Task-number: QTQAINFRA-4649
Change-Id: Ia12310a3439058f706d55242ece5ee185073f7ce
Reviewed-by: Qt CI Bot <[email protected]>
Reviewed-by: Tor Arne Vestbø <[email protected]>
Reviewed-by: Simo Fält <[email protected]>
(cherry picked from commit 000691d833)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
2022-01-07 07:24:45 +00:00
Qt Submodule Update Bot e6f6b691a5 Update submodules on '6.2 in qt/qt5'
Change-Id: I4f7184e22bf2cfab39859e88fc6a91a663cb8a3a
Reviewed-by: Qt Submodule Update Bot <[email protected]>
2022-01-05 04:34:37 +00:00
Heikki Halmet 9d0f6dd706 Remove Insignificant flag from qtbase for Rhel 8.4 Android target
Change-Id: I73fadd50bc363b46e8e651f5e8bbdfffdd32f760
Reviewed-by: Simo Fält <[email protected]>
2022-01-04 09:09:09 +02:00
Heikki Halmet 23b494221d Change Windows 11 targets Insignificant flag to cover only autotests
Change-Id: Ia841fec1fe4adcedf0af2ddfeeb9a19fd915baf7
Reviewed-by: Simo Fält <[email protected]>
2022-01-04 07:51:04 +02:00
Tor Arne Vestbø b5713b63c4 coin: Move all builds over to macOS 12
Change-Id: Ief01ca81cda49d518e910e01f70f78a5c8430ed7
Reviewed-by: Ville-Pekka Karhu <[email protected]>
Reviewed-by: Alexandru Croitor <[email protected]>
Reviewed-by: Timur Pocheptsov <[email protected]>
(cherry picked from commit b19b02173c)
Reviewed-by: Tor Arne Vestbø <[email protected]>
2021-12-30 12:55:23 +01:00
Heikki Halmet c34960c8bd Add pre-provisioning files for Windows 10 21H2
Change-Id: I9e6e1423b1e287aff0be8ea2b29c95838ed10de5
Reviewed-by: Ville-Pekka Karhu <[email protected]>
2021-12-29 08:42:22 +02:00
Heikki Halmet c38679a51e Replace .ci.local suffix with .ci.qt.io
Plan is to terminate .ci.local soon

Change-Id: I8198ea744eeb91974569d47b2147f08b18f97f73
Reviewed-by: Simo Fält <[email protected]>
(cherry picked from commit d4cb44ad71)
2021-12-28 11:26:50 +02:00
Heikki Halmet fd7880c4f4 Remove duplicate MinGW environment variables
Change-Id: I2018b0c46b9708f699e5da6155e95151a49394fb
Reviewed-by: Toni Saario <[email protected]>
(cherry picked from commit 5ce8c724d2)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
2021-12-26 09:48:10 +00:00
Heikki Halmet 85dbd4d141 Set ulimit also for grapchical login
Graphical login requires DefaultLimitNOFILE=4096
to be set in user.conf.

Task-number: COIN-699
Change-Id: Ia07e834ebcffa2ed24a7c211255a4c4c5a10ca10
Reviewed-by: Qt CI Bot <[email protected]>
Reviewed-by: Toni Saario <[email protected]>
(cherry picked from commit 8dcbfc526e)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
2021-12-24 08:01:26 +00:00
Tor Arne Vestbø df8e26ded3 coin: Make macOS 12 on ARM packaging tests significant
Change-Id: I6e89626e52f21d19e8665769b4d8f6ee9a54e537
Reviewed-by: Tor Arne Vestbø <[email protected]>
(cherry picked from commit ccf24d5f2a)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
2021-12-23 19:09:39 +00:00
Pasi Petäjäjärvi 3d96458ad1 CI: Add image support for QNX qemu
Task-number: QTBUG-99168
Change-Id: If040af8d074e7e197449eb4be68507e83214d393
Reviewed-by: Samuli Piippo <[email protected]>
(cherry picked from commit 1cb9c1caef)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
2021-12-23 05:33:15 +00:00
Pasi Petäjäjärvi a19921fb8f CI: Add timezone support for QNX qemu
Task-number: QTBUG-99168
Change-Id: Ie27f53fbf68c656dfdd7ddba72ef1c991416faeb
Reviewed-by: Samuli Piippo <[email protected]>
(cherry picked from commit 10a443c181)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
2021-12-23 05:33:10 +00:00
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 <[email protected]>
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 <[email protected]>
Reviewed-by: Tony Sarajärvi <[email protected]>
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 <[email protected]>
2021-12-20 16:21:07 +02:00
Toni Saario 26218265ce Add qt-conan-common platforms
Change-Id: I99c9b148d4a3b23acc8c4bbd36cd1ea9ad32eac9
Reviewed-by: Iikka Eklund <[email protected]>
(cherry picked from commit 099f184880)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
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 <[email protected]>
Reviewed-by: Oliver Wolff <[email protected]>
(cherry picked from commit 9d09f9cee9)
Reviewed-by: Tony Sarajärvi <[email protected]>
2021-12-19 09:39:35 +02:00
Jani Heikkinen 63232fcc3b Update latest qt license agreement
Change-Id: Iee3b30b298bac748133daf3f0e58f8dab195a2fe
Reviewed-by: Tarja Sundqvist <[email protected]>
(cherry picked from commit b9a59fe113)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
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ø <[email protected]>
(cherry picked from commit dbb4cd06aa)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
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 <[email protected]>
(cherry picked from commit 6e7de2b76c)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
2021-12-15 18:31:42 +00:00
Toni Saario 98394de5c9 Add tqtc-qtdigitaladvertising platforms
Change-Id: I839e0c2509dfac800a06d9c791b693dbc8681a52
Reviewed-by: Mateusz Ligocki <[email protected]>
Reviewed-by: Jani Heikkinen <[email protected]>
(cherry picked from commit 1a1028ea20)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
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 <[email protected]>
(cherry picked from commit 06edc60e1d)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
(cherry picked from commit e9258230f3)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
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 <[email protected]>
(cherry picked from commit 8f46d3ede3)
Reviewed-by: Qt CI Bot <[email protected]>
Reviewed-by: Tony Sarajärvi <[email protected]>
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 <[email protected]>
(cherry picked from commit 1e24a91028)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
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 <[email protected]>
(cherry picked from commit dfa50ed7c3)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
2021-12-07 12:44:05 +00:00
Toni Saario a281a7a4fe Enable conan revisions mode
Change-Id: Ic6e6070df62a45820e152123cf7bd82f51c226b2
Reviewed-by: Simo Fält <[email protected]>
(cherry picked from commit dcded49b88)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
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 <[email protected]>
(cherry picked from commit b2240d78cd)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
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 <[email protected]>
(cherry picked from commit 5cf68160c2)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
2021-12-07 12:44:05 +00:00
Jukka Jokiniva 7d1db6121a Add yaml file for Android Automotive
Change-Id: I1007453ba47e7a7be4fe60ef065695189eb44f98
Reviewed-by: Jani Heikkinen <[email protected]>
(cherry picked from commit 06b5cd95e6)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
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 <[email protected]>
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 <[email protected]>
(cherry picked from commit 19fbf58013)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
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 <[email protected]>
(cherry picked from commit d36a16584a)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
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 <[email protected]>
(cherry picked from commit d6fcea563f)
Reviewed-by: Toni Saario <[email protected]>
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 <[email protected]>
Reviewed-by: Heikki Halmet <[email protected]>
(cherry picked from commit 54c3a77fdf)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
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 <[email protected]>
Reviewed-by: Qt CI Bot <[email protected]>
Reviewed-by: Tony Sarajärvi <[email protected]>
(cherry picked from commit 4d617e24ee)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
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ø <[email protected]>
Reviewed-by: Qt CI Bot <[email protected]>
(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 <[email protected]>
Reviewed-by: Qt CI Bot <[email protected]>
(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ø <[email protected]>
Reviewed-by: Assam Boudjelthia <[email protected]>
(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 <[email protected]>
(cherry picked from commit 806685f6f7)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
2021-11-20 04:33:43 +00:00