Commit Graph

4900 Commits

Author SHA1 Message Date
Jukka Jokiniva
fb43a90fd1 Add yaml file for Android Automotive
Change-Id: I1007453ba47e7a7be4fe60ef065695189eb44f98
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 06b5cd95e6)
2022-01-19 08:23:36 +00:00
Heikki Halmet
56a251d9a6 Provisioning: Install up-to-date google Chrome for Wasm auto tests
Task-number: QTBUG-99062
Change-Id: Ib9ebcad5d9700c09d01d1ba23fed716d3a3cae4b
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2022-01-12 09:07:46 +02:00
Heikki Halmet
9c5af22a53 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 <simo.falt@qt.io>
(cherry picked from commit 1e8939b4b2)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-01-11 22:00:07 +00:00
Qt Submodule Update Bot
5fe2c8489a Update submodules on '6.3 in qt/qt5'
Change-Id: Id6c006f1504e450276be4ba26b4f04f8f481d3ee
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
v6.3.0-alpha1
2022-01-08 22:22:55 +00:00
Toni Saario
d25830872e Provision conan on arm macOS
Change-Id: Ibf074c39b7bf3ac0f0f16a5a65d11022f9ec7e04
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
(cherry picked from commit 81dcae4f93)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-01-07 16:34:52 +00:00
Heikki Halmet
928414e328 Remove Insignificant flags from Creator, flashing-wizard and saferenderer
Change-Id: If4941f00f51281df4f2f233bd89bfaf0d0ed5a0d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 854e478223)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-01-04 15:38:31 +00:00
Heikki Halmet
c7bd8fc94a 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 <qt_ci_bot@qt-project.org>
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
(cherry picked from commit ebb9836451)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-01-04 07:40:42 +00:00
Heikki Halmet
a4850c0a7c Make macOS 12 on ARM developer build tests significant
Task-number: QTQAINFRA-4649
Change-Id: Ia12310a3439058f706d55242ece5ee185073f7ce
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 000691d833)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-01-03 13:08:39 +00:00
Tor Arne Vestbø
2ec7e5a365 coin: Move all builds over to macOS 12
Change-Id: Ief01ca81cda49d518e910e01f70f78a5c8430ed7
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
(cherry picked from commit b19b02173c)
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2021-12-23 11:13:10 +00:00
Heikki Halmet
2ef984eac1 Replace .ci.local suffix with .ci.qt.io
Plan is to terminate .ci.local soon

Change-Id: I8198ea744eeb91974569d47b2147f08b18f97f73
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit d4cb44ad71)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-12-23 08:56:10 +00:00
Tor Arne Vestbø
75f2419e5c coin: Make macOS 12 on ARM packaging tests significant
Change-Id: I6e89626e52f21d19e8665769b4d8f6ee9a54e537
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit ccf24d5f2a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-12-21 13:44:35 +00:00
Tor Arne Vestbø
72d28c6e0f Bump qtconnectivity
Change-Id: I8b9ea944ed95d70a41fb7abcef199b77cb15d353
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
(cherry picked from commit 649592deea)
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2021-12-21 12:00:38 +00:00
Toni Saario
dce7c48f58 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
Kai Köhne
efc8d985c6 Replace LGPL2.1 only header with LGPL3 one
This is in line with e.g. qtbase. Also remove outdated/unreferenced
license files.

Change-Id: I5d3370ab453610f9c8165ff9e57db7ad4a785370
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit becb423e80)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-12-20 04:26:48 +00:00
Ville-Pekka Karhu
dceadf3e76 macOS: Upgrade Xcode to 13.2
Task-number: QTQAINFRA-4607
Change-Id: Ice52c8f4199e124d92b994cab38151dd712986bf
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit fe35c4dbb0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-12-19 19:47:21 +00:00
Ville-Pekka Karhu
eb018be96e macOS provisioning: Disable bluetooth
Change-Id: Ia981b4ab37a6ca15a566feb2fdc176253b419193
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit 20c580e5db)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-12-19 19:47:21 +00:00
Heikki Halmet
8f409a0c71 Remove InsignificantTests flag from Windows 10 targets
Change-Id: Ib6ec59762f1188d1dc2a133fdf44628d47fd1b57
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit ccf269f5da)
2021-12-18 20:40:54 +02:00
Heikki Halmet
83d1af1b22 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: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-12-17 15:47:53 +00:00
Jani Heikkinen
9103f23a09 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
Heikki Halmet
808c16c866 Remove Rhel 8.2 targets
Rhel 8.4 is already in use

Task-number: QTQAINFRA-4515
Change-Id: I32bba97143adb5243e5ba500eceaad9723a7209e
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit b730181404)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-12-16 09:59:07 +02:00
Jani Heikkinen
bc9a03f7f6 Update qttools submodule
Change-Id: Ic538882d50ff40a94a7b05d8fbc10b52da61fdbf
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit f55b82ee1d)
2021-12-15 06:13:14 +00:00
Pasi Petäjäjärvi
8f783c41aa CI: Add image support for QNX qemu
Task-number: QTBUG-99168
Change-Id: If040af8d074e7e197449eb4be68507e83214d393
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 1cb9c1caef)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-12-15 03:23:40 +00:00
Pasi Petäjäjärvi
5d3ac77196 CI: Add timezone support for QNX qemu
Task-number: QTBUG-99168
Change-Id: Ie27f53fbf68c656dfdd7ddba72ef1c991416faeb
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 10a443c181)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-12-15 03:23:32 +00:00
Alexandru Croitor
fecfd6f771 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-14 10:48:59 +00:00
Heikki Halmet
1f2aef79bf Remove duplicate MinGW environment variables
Change-Id: I2018b0c46b9708f699e5da6155e95151a49394fb
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 5ce8c724d2)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-12-14 10:48:59 +00:00
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