Commit Graph

1202 Commits

Author SHA1 Message Date
Pasi Petäjäjärvi
9afeb8539a CI: Add QtCoap network testservers for QNX QEMU
Change-Id: Ibc18edaf4a1d9dec309396eb80744b6a21738382
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 45a92d5f26)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-03-31 12:39:08 +00:00
Heikki Halmet
479360397e Provisioning: Install Chromedriver Chromium
This is needed by WebAssembly

Change-Id: I3e828d643d2780308514b2939db5a1b4032c66ac
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Reviewed-by: David Skoland <david.skoland@qt.io>
(cherry picked from commit f8311eaadf)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-03-31 06:39:43 +00:00
Pasi Petäjäjärvi
47e1dd34df CI: Add dns entry for network test server (not docker)
Servername qt-test-server is still used as local server name in tests
like networkselftest.

Change-Id: Iadda2254d4a45e95f90523cae90518fa74b24d6c
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
(cherry picked from commit 6f5c0fbdf0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-03-27 00:42:26 +00:00
Pasi Petäjäjärvi
beb606c9cb CI: Add current directory to PATH because security update for QProcess
Because of 29fceed2ffb41954a63001414bd042611f2d4980 now all tests that
use binaries local to test folder will fail. Add current directory to
ssh connection PATH to fix this. On other platforms than QNX, this
happens to work as function qt_internal_collect_command_environment
sets the absolute directory path of external binary to PATH. Still tests
would fail when running directly tst_* binary instead via ctest.

Change-Id: I670d78a2a4362dc8d6faf271f2ad2a90ce2a8aa9
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit c1e7cf5c25)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-03-26 14:56:27 +00:00
Heikki Halmet
5f28d0680c Add prebuilt Android OpenSSL package for OpenSSL 1.1.1m
Used OpenSSL source package 1.1.1m was changed little bit. All
ANDROID_NDK_HOME strings were replaced with ANDROID_NDK_ROOT in
Configurations/15-android.conf file

Task-number: QTQAINFRA-4864
Task-number: QTBUG-101863
Change-Id: Ia3d82005734ba69f1cc85708c867ae1955938739
Reviewed-by: Andreas Buhr <andreas.buhr@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 686481f48c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-03-24 04:51:10 +00:00
Cristian Adam
65eac15d8b Update MinGW 11.2.0 to rev3
Revision 3 updates gdb to version 11.2.0.

This is not necessarily needed for building, but I think it's better to
have the same toolchain as the Qt SDK.

Task-number: QTBUG-101653
Change-Id: I92a319a943d18ec10e5e0da3cd770ba7cde26f13
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit c76e26a5fa)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-03-21 22:40:24 +00:00
Heikki Halmet
e978441df6 Remove protobuf scripts for Windows
Script is currently failing in windows and no one has noticed this.
So apparently script is not needed by any module. If this will be needed
in the future then script needs to be fixed and merged back to
provisioning.

Change-Id: Ia3deb3011b0cb6a9e145d0f126d4ab6723ce79f3
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 1cc99e61dd)
2022-03-17 15:03:21 +02:00
Pasi Petäjäjärvi
694a559c91 CI: Add ssl certificates for QNX
Expects Ubuntu 20.04 LTS with ca-certificates package installed

Change-Id: I9b439e9e049b93c3bba77573b491c336aee4af5a
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 339a47b4ed)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-03-14 22:04:42 +00:00
Pasi Petäjäjärvi
08e40460b7 CI: Add network autotests support for QNX
Add regular UNIX network related files to configure
used test network based around QEMU and docker
services. IP address 172.31.1.1 is bridge interface
address in host which QNX tool mkqnximage set
(hard coded intool, cannot be changed).
Docker service hostnames are configured statically
as mDNS does not work from QEMU.

Change-Id: Id7be7867e5bea1f354456e8d440f9979c402e977
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 477877352a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-03-14 22:04:21 +00:00
Pasi Petäjäjärvi
4c219f7118 CI: Remove installation of QNX toolchain from linux platforms
These linux platforms are not used when building for QNX

Change-Id: I071834053b09b1cea962796076bb0cd2fc6e0fff
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit c4869161b6)
2022-03-14 20:14:17 +02:00
Assam Boudjelthia
285249f452 Rename the Android emulator to be more descriptive
Because we want to add Android 12 emulator for testing, it's important
to have a more descriptive emulator name. For this one, it includes
api_23 part.

Task-number: QTBUG-88846
Change-Id: I5b8ca276b1bad41bb61272585a4fc4f064e65d71
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit a4cc949b8d)
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
2022-03-11 19:30:34 +02:00
Heikki Halmet
6f0e2bb5f2 Fix Openssl android installation
Current provisioning installation is broken. Current package replaced
the old openssl-android-master-1.1.1m.zip and shasum changed.

Task-number: QTQAINFRA-4848
Change-Id: Id5e3bc1a81f8b634668d189c7647eac7c612020a
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 96fe74b540)
Reviewed-by: Simo Fält <simo.falt@qt.io>
2022-03-11 00:36:37 +02:00
Heikki Halmet
abc643a6cf Provisioning: Update OpenSSL to version 1.1.1m
Change-Id: I93702b9faac5abc9fc01a5725cf34a17a94f0bea
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 8732165461)
2022-03-11 00:36:33 +02:00
Toni Saario
5c95c956be Update git
Older git version does not allow fetching single specific sha1.

Change-Id: Ib795659a597042876a5c7b6fab3875fe1e39873d
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit a2393b5882)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-03-08 08:56:54 +00:00
Heikki Halmet
7ba1b4a454 Provisioning: Run msvc 2019 update at the beginning of provisioning
When script was run with prefix 99 the installation process wasn't
finished before machine got rebooted. Moving the script at
beginning of provisioning seems to help with the situation. This is
not a proper fix but the best we have right now.
We can change this later if/when we find the root cause for this.

Task-number: QTQAINFRA-4813
Change-Id: Icbc2b0b33905990df611bdb494ed9b22801633fd
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
(cherry picked from commit 1597f43512)
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2022-02-22 08:04:21 +02:00
Heikki Halmet
d542683972 Set correct Emscripten environment variables
Needed environment variables are set during emsdk installation when
installation is done using emsdk.git. But those are not set
as permanently. To have correct values we need to get them from
install environment and set them permanently for build environment.

Change-Id: Ifb80aa4a93608b79faffc8c59002c89804f60570
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 88cde9e500)
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
2022-02-22 08:04:19 +02:00
Heikki Halmet
07c40ad25b Provisioning: Install addtional Python 3.10.0 for Windows 10 21H2
Change-Id: Ic65b3b5b8dcea2ed918b005dbc8d4ea75daba61f
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 6c0950edf8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-02-22 06:04:18 +00:00
Heikki Halmet
ac512afa0c Provisioning: Install OpenSSL 1.1.1k ARM64 for Windows
Task-number: QTBUG-93822
Change-Id: I461a26cf258a3e5c62faf719612f643507662f72
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
(cherry picked from commit 73295cc05c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-02-22 06:04:18 +00:00
Heikki Halmet
1e7f16d6be Move bluetooth script under correct platform folder
Change-Id: If1c873bb3334639477e43f8d5d83d62338f6f4c0
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
(cherry picked from commit 3f263aa742)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-02-05 14:38:33 +00:00
Heikki Halmet
922b5f48b6 Upgrade Xcode and Command Line Tools version to 13.2
Xcode 13.2 works only in macOS 11.3/12.0 or newer

Task-number: QTQAINFRA-4607
Change-Id: Ic2034a2091a041a6daa0f342e5820641488c068b
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit 72997d7039)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-02-04 17:36:47 +02:00
Heikki Halmet
9715f5ce56 Provisioning: Start using latest macOS 11 version 11.6
New tier 1 image's name format is qtci-macos-11-x86_64

Change-Id: Ieb23b64a0981bdd282d2ae482dd5ccda3f7ecaed
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
(cherry picked from commit 1865d70ef8)
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2022-02-04 17:36:47 +02:00
Pasi Petäjäjärvi
10062a348f CI: Increase size of QNX qemu image for data partition
Some of the autotest require more free space to pass

Task-number: QTBUG-99168
Change-Id: Iff4a4493e75d2770d691b936547143518a80e315
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 4a5550cc03)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-02-03 08:22:35 +00:00
Pasi Petäjäjärvi
4b8067f33a CI: Update libraries because of new QNX toolchain
QNX toolchain provides newer libfreetype which depends on new libbz2
library (qnx710-20211207-linux.tar.xz).

Task-number: QTBUG-99168
Change-Id: I4bcb0b536ace594dd95faeed8e5a8d99e53afadd
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 2592bbe8c4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-02-03 08:22:27 +00:00
Pasi Petäjäjärvi
3a57e6e12e CI: Add font support for QNX qemu
Task-number: QTBUG-99168
Change-Id: I4f216a06f04f544214a016b61365ec216b2d77a5
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 848a7d5fa3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-02-03 08:22:20 +00:00
Ville-Pekka Karhu
1fbd7191be 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>
2022-01-17 07:03:35 +00:00
Ville-Pekka Karhu
5a8ae6b3e8 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>
2022-01-13 15:07:12 +00:00
Heikki Halmet
afa2f46691 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 13:47:32 +00:00
Toni Saario
fd0e5d85b0 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: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 <qt_ci_bot@qt-project.org>
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 71e7ed17a2)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
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 <qt_ci_bot@qt-project.org>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 7184b6b7b0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-01-07 07:24:48 +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 <qt_ci_bot@qt-project.org>
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 8dcbfc526e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-12-24 08:01:26 +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 <samuli.piippo@qt.io>
(cherry picked from commit 1cb9c1caef)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
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 <samuli.piippo@qt.io>
(cherry picked from commit 10a443c181)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
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 <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
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
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
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
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
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
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
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