Compare commits

...

2747 Commits

Author SHA1 Message Date
Tarja Sundqvist
e7333fb8db Merge Qt 6.2.11 opensource release
Change-Id: I61a76c375328ec4859e5256feabd2864e69660fd
2025-01-16 14:53:57 +02:00
Tarja Sundqvist
0c6cbc73d1 Merge Qt 6.2.10 opensource release
Change-Id: I866acba45a949fea985cff6c39dd9ce767b1d020
2024-10-09 18:36:31 +03:00
Tarja Sundqvist
322d47d25d Merge Qt 6.2.9 opensource release
Change-Id: Icc77894d5ec0f156d6ab38a717b7231bfb808d24
2024-07-03 21:56:44 +03:00
Tarja Sundqvist
dccab84d90 Merge Qt 6.2.8 opensource release
Change-Id: I61132f961d0287f499c4528b20bbaf51d51902cc
2024-04-15 11:40:59 +03:00
Tarja Sundqvist
48b9855b1a Merge Qt 6.2.7 opensource release
Change-Id: I6c90c68aad50fb5c7b60d9dd21837f33369515a1
2023-12-20 09:16:18 +02:00
Tarja Sundqvist
7bba03e629 Merge Qt 6.2.6 opensource release
Change-Id: I7880027f964e94c3571f3beb5cb3a3fd5731448d
2023-09-26 11:34:36 +03:00
Tarja Sundqvist
4575d6ac6c Merge Qt 6.2.5 opensource release
Change-Id: I1aefe27ca741fb891d88808a42426ac35d5537f1
2023-07-14 19:18:53 +03:00
Mikko Gronoff
eacf5ace62 Remove duplicate MinGW environment variables
...amends commit fd7880c4f4

Change-Id: I670fe4aca3bcaf396822a322135655d4ed319c9b
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2022-10-11 05:23:10 +00:00
Heikki Halmet
8744698c15 Fix rmt client setup to repo-clones
Change-Id: I36d8f24b19135345a2829e7521585c0cba9fc41f
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit f794796984)
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2022-08-29 10:53:16 +00:00
Heikki Halmet
188bfa777e Provisioning: Update MSVC 2019 version to 16.11.18 in Tier 1
Older version seems to have issues with installer when updating
the visual studio and buildtools versions through installer via
command line.

Task-number: QTQAINFRA-5090
Change-Id: Iaec5391ed7bc9780374a7f971624522dae2feee6
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
(cherry picked from commit 0507008ff6)
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2022-08-29 10:53:09 +00:00
Alexandru Croitor
1704223e00 CMake: Switch an OpenSUSE config to build with CMake 3.16.8
To ensure we don't introduce regressions building Qt with the lowest
version of CMake that we support.

Task-number: QTQAINFRA-4844
Task-number: COIN-823
Change-Id: I59b6a0ed6851a5fbed701c4f6ea050062bddb773
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit 0cfa1fa561)
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
2022-04-12 18:34:14 +02:00
Alexandru Croitor
34a878536b CMake: Provision minimum supported CMake version 3.16 on OpenSUSE
This will allow us to switch one of the Linux OpenSUSE platform
configurations to build with an older version of CMake, to ensure
we don't introduce regressions.

Task-number: QTQAINFRA-4844
Change-Id: I2aa51175e3c393af079ab1d2b4648ced1fdf6a4a
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
(cherry picked from commit 75bab52bb9)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-04-12 16:34:12 +00:00
Qt Submodule Update Bot
5d542203f2 Update submodules on '6.2 in qt/qt5'
Change-Id: I5fd8db257637a7b8866f1bc223abc6dfd2746753
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-04-12 01:28:22 +00:00
Alexandru Croitor
641b56e52c coin: Allow using configure instead of cmake for top-level builds
This is the qt5 counterpart to the qtbase instructions to allow
using configure instead of cmake when configuring a top-level build.

Task-number: QTQAINFRA-4357
Task-number: QTQAINFRA-4815
Change-Id: Ie5af31f9349a6dd88fa7699d40dad659180814e2
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 2ee43055ed)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-04-11 19:44:00 +00:00
Heikki Halmet
dcf2680219 Provisioning: Install Android 11 automotive emulator
This is needed after moving from internal tqtc-qt5 branches to qt5.
Android 11 image was built internally.

Task-number: QTQAINFRA-4343
Change-Id: Ie0c4c5853079303ef9d4537f3b7b06ab62f14e3b
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 12a87cba0a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-04-09 13:41:49 +00:00
Jani Heikkinen
a39240b38d Update LA 4.4.1
Task-number: QTBUG-101714
Change-Id: I4b9a88be5bfda3b542d9c10c51cc94f36dade932
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
Reviewed-by: Santtu Ahonen <santtu.ahonen@qt.io>
(cherry picked from commit 1734139bf4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-04-06 16:49:53 +00:00
Eike Ziller
8e4c990b20 COIN/QtCreator: Remove old Windows 10 targets
We don't need two 64bit Windows targets.

Partial cherry-pick of ac2bdfb93a
which was applied to dev and 6.3, but not to 6.2

Change-Id: Ide3225a1a7a09bf97306ca8250e3d6f567d04111
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2022-04-06 17:10:19 +02:00
Heikki Halmet
26b43a7b28 Make Windows 11 21H2 significant
Task-number: QTQAINFRA-4673
Change-Id: I7eebc889dbc9ecc7c741147a2703575b5bfeb04d
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit d6a7527384)
2022-04-05 08:17:35 +03:00
Pasi Petäjäjärvi
c74b05790c CI: Add env variable to indicate we are running tests in CI
Some tests change what they test depending if this env variable is set.
This was left out from 6.2 and 6.3 branches accidentally as it was added
only for dev branch at fba918784f as part
of bigger cleanup which introduced usage of qt-testrunner.py insted.

Change-Id: I0f55e42a6ae5b64132d13812ae0567975aedaa0e
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
(cherry picked from commit fccc912655)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-04-01 20:11:13 +00:00
Eike Ziller
898ca8ab98 COIN/QtCreator: Add machine for Qt 5 based build
Since we still support Qt 5 based builds of Qt Creator, we'd like
to have that combination as part of the precheck.

Change-Id: I8f752f6e2aff4bebd644a87a1f51255ca482d337
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
(cherry picked from commit e2b2c06558)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-04-01 13:08:35 +00:00
Qt Submodule Update Bot
e22ba1c8f0 Update submodules on '6.2 in qt/qt5'
Change-Id: Icb10a8d455dc45330e55fa5695ddad5c26a1d186
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-04-01 02:39:04 +00:00
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
Assam Boudjelthia
401aaa045b Add Android tests to Qt modules - part 2
The following modules are passing CI, so enabling them is possible
now; qt3d, qtconnectivity, qtmqtt, qtquicktimeline, qtsensors,
qtserialbus, qt5compat, qtpositioning, qtscxml, qttranslations.

Task-number: QTBUG-88846
Change-Id: Ic1048d0fadd551f42ef2d074b3b905cf3c8da339
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 807b259ea4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-03-30 05:48:24 +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
Qt Submodule Update Bot
db513056e3 Update submodules on '6.2 in qt/qt5'
Change-Id: I3f4104b11ebf5142ee35a7cb5ed63429b468d597
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-03-24 21:14:56 +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
Qt Submodule Update Bot
1415259122 Update submodules on '6.2 in qt/qt5'
Change-Id: I5010887347ef91189f2b7aafe70be1d82fb95809
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-03-23 05:06:29 +00:00
Heikki Halmet
ea4c99fee7 Add passing targets as significant
There is still autotests failures in one Windows 11 target

Task-number: QTQAINFRA-4673
Change-Id: I2f7958a6da358069799db18143789c99bb3f4dac
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
(cherry picked from commit 6cea45bfb8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-03-22 08:00:09 +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
Fabian Kosmale
f015cace95 Set QT_SUPERBUILD early
That will allow qtbase's .cmake.conf to check whether it is meant to be
used in a superbuild or only for qtbase.

Task-number: QTBUG-101640
Change-Id: I035c86f32497004cc1b8441456604106bacadad4
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 14e486a8c4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-03-21 16:10:27 +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
Assam Boudjelthia
f9ef0b811b Add Android tests to Qt modules - part 1
This enables testing for Android for the modules:
qtdeclarative, qtsvg, qtshadertools, qtimageformats.

Also replace the qtbase Android test target with
linux_android_tests.yaml.

Task-number: QTBUG-88846
Change-Id: Ibe0dcbdc5d468e884570bf4908f8ddee0793103c
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 523eb8e1ea)
2022-03-15 21:31:52 +02:00
Qt Submodule Update Bot
4534f8f953 Update submodules on '6.2 in qt/qt5'
Change-Id: I8a4f06261797dd93c0ddb717c5950d16860c5470
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-03-14 23:52:58 +00: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
Qt Submodule Update Bot
fadad113bc Update submodules on '6.2 in qt/qt5'
Change-Id: Id631dfdd858b3cb662dd04670818514d10e42146
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-03-12 04:52:01 +00: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
Assam Boudjelthia
96c4854fbe Coin: Fix Documentation target on tqtc/android-automotive
The Documentation target in tqtc-android-automotive.yaml has
-DFEATURE_cxx20=ON and 'TestDocs' flags which is not present in the main
cmake_platforms.yaml on this branch, this might have been the cause for
failing docs build under qtinterfaceframework.

Pick-to: 6.2.4
Change-Id: Ife84d424673cd7ccf82d0046839ebefa71305f0e
Reviewed-by: Simo Fält <simo.falt@qt.io>
2022-03-09 09:59:12 +00:00
Qt Submodule Update Bot
142870e283 Update submodules on '6.2 in qt/qt5'
Change-Id: I2a15e3188cac5d331c820ed4b837ed9578a8f02c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-03-08 19:05:06 +00: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
Qt Submodule Update Bot
3a7099ce84 Update submodules on '6.2 in qt/qt5'
Change-Id: Ic3eadb1a0499d97f014acfbb5046e2a0e6849604
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-03-05 06:17:11 +00:00
Alexandru Croitor
e821ee8320 coin: Split top-level build instructions
Makes it a bit cleaner to follow.

Change-Id: I063581126b6d09f98fb38862c8af5531dc513aca
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit a9c9418c8a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-03-02 16:38:40 +00:00
Jani Heikkinen
e8d2407930 Update LICENSE.QT-LICENSE-AGREEMENT
Newest version is 4.4 so update it in the git as well

Task-number: QTBUG-98971
Change-Id: I55f06da7778fe8ce9c7c449cb2b011d37b97244c
Reviewed-by: Tino Pyssysalo <tino.pyssysalo@qt.io>
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
(cherry picked from commit cbeea07854)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-03-01 08:11:28 +00:00
Heikki Halmet
6db8e9dc71 Add instructions how to create Windows 11 image with Virtio drivers
Change-Id: I9042667ed00ce6023168f501a2e695af3858780c
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit a9eed4e535)
2022-02-22 08:04:22 +02: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
Assam Boudjelthia
e59ea7c673 Mark QtAA Android test as insignificant until proven to work
Make sure this doesn't block the repo, untill we have the whole
Android Automotive pipeline working.

Change-Id: I1aaef98cb724c8e299b2adacce36d8e3f786b432
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
(cherry picked from commit 2fd91cfe5d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-02-21 09:48:16 +00:00
Assam Boudjelthia
ea75e3c046 Add Documentation tatget to tqtc-android-automoitve
Amends 69536e4b45.

Fixes: QAA-1026
Change-Id: Ieed387fb20ec4ebf1a4fbd2633da9c9e98b0a60b
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
(cherry picked from commit c36ce3dd49)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-02-21 09:48:08 +00:00
Heikki Halmet
667a95565c Add missing OPENSSL_ROOT_DIR configure argument for macOS Android arm64
Task-number: QTBUG-97243
Change-Id: Ie9ad23d54ebe0e2cb40e850db2e0db23bec4bae0
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2022-02-18 13:57:34 +02:00
Qt Submodule Update Bot
02bfb3faed Update submodules on '6.2 in qt/qt5'
Change-Id: I5d7d413aa6f03a9d15b423749a2cc4d629968139
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-02-18 05:20:58 +00:00
Qt Submodule Update Bot
749b2356a9 Update submodules on '6.2 in qt/qt5'
Change-Id: I718b68cd2d696c7b911d2b19f75b181333203290
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-02-10 17:23:30 +00:00
Assam Boudjelthia
71c74eb08c Update tqtc-android-automotive targets and add test target
The module is android specific and thus tests need to be disabled
for platforms other than Android Automotive.

Change-Id: If7528bc0845c6266d77f94e8e6c7d0ba67075d1a
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 69536e4b45)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-02-10 16:14:19 +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
Toni Saario
3b0940f1e1 Increase QNX VM size
Due to some patch the linking requires more memory than
currently available.

Task-number: QTQAINFRA-4669
Task-number: QTQAINFRA-4792
Change-Id: I872c2c7421d9e40f5a3ff36caaa2e229ed105f5b
Reviewed-by: Simo Fält <simo.falt@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 0763fcc4fe)
2022-02-04 14:04:36 +02:00
Alexandru Croitor
e8c61b653d CMake: Pass QT_BUILD_EXAMPLES instead of BUILD_EXAMPLES
BUILD_EXAMPLES was the old way to disable building examples, which is
not used anymore. This should remove the warning about an unused
BUILD_EXAMPLES variable.

Fixes: COIN-762
Change-Id: Icf88d617e564939bcff5047f83d029e93df16401
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Toni Saario <toni.saario@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
(cherry picked from commit ec6e186d10)
2022-02-04 11:18:48 +01:00
Pasi Petäjäjärvi
4f0730d4a4 CI: Enable developer build for QNX x86_64
Task-number: QTBUG-99168
Change-Id: I119f47ba0ee36a19a6daca05383c90304b34e97a
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 7486226c7a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2022-02-03 08:22:42 +00: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
Qt Submodule Update Bot
d9cd912e88 Update submodules on '6.2 in qt/qt5'
Change-Id: I01cf6ed1ee9447204d79804b849e680253dd0d7e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-02-01 17:28:05 +00:00
Qt Submodule Update Bot
acfb888033 Update submodules on '6.2 in qt/qt5'
Change-Id: I77669e2263a34a568028f76f14337e2db0e56810
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2022-01-20 00:39:43 +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
dc05a9ead6 Remove old Windows 10 targets
Windows 10 21H2 is now significant in and can replace older windows 10
version. Also packaging side is already using the latest version

Task-number: QTQAINFRA-4539
Change-Id: Ieec69d64d7feaad8c926e07ed1785c741bafd885
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2022-01-12 11:59:56 +02: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
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 <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-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 <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-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 <qt_submodule_update_bot@qt-project.org>
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 <simo.falt@qt.io>
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 <simo.falt@qt.io>
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 <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-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 <ville-pekka.karhu@qt.io>
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 <simo.falt@qt.io>
(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 <toni.saario@qt.io>
(cherry picked from commit 5ce8c724d2)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
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 <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
Tor Arne Vestbø
df8e26ded3 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-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 <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
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
Tony Sarajärvi
a80c835333 Replace SLES 15 SP2 with SP3
Task-number: QTQAINFRA-4498
Change-Id: I248a0ea19a7e2af59350ba66b55983c20927fff3
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 426bab28a8)
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-11-04 18:47:43 +02:00
Assam Boudjelthia
5893f0d3df Coin: bump Android platform sdk and build tools version to 31
Use latest platform and build tools.

Change-Id: I8ddfe79706470918d956a97876a5d140a57ec87b
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
(cherry picked from commit 286a294daf)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-11-04 12:52:49 +00:00
Tor Arne Vestbø
eefe05467d 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.

Change-Id: I792231b1bed8856e886eeca9ae37c2b824b1ea8e
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit c273c5bc65)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-11-04 11:10:59 +00:00
Ivan Solovev
409931d897 Update qtlocation dependencies
This commit amends 6af22246cf.
qtlocation now depends on qtpositioning, but does not require
qtserialport anymore.

Change-Id: I1bda34020f7bc3683cf5038f2e1226d5209dfcc4
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
(cherry picked from commit 70a8080f54)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-11-01 21:26:09 +00:00
Heikki Halmet
0d35051d65 Provisioning: Update Integrity toolchain to fix GHS error
Task-number: QTQAINFRA-4601
Change-Id: Ica32904ef6e76bc9f9f972f8c6bf02822980f888
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit f4f80d1b0f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-10-31 18:38:29 +00:00
Pasi Petäjäjärvi
0b680fb549 CI: Update QNX ICU libraries for QEMU
New QNX toolchain has updated ICU libraries

Task-number: QTBUG-87628
Change-Id: I36806c815410877998eb44bef60614bf824f15f9
Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 8d7f2db3a0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-10-30 11:22:54 +00:00
Assam Boudjelthia
f4903d61e8 Coin:Android: set ANDROID_SDK_ROOT explicitly
... and remove ANDROID_{SDK,NDK}_HOME as they are
deprecated and might not work even.

Task-number: QTBUG-97002
Change-Id: Ie6fe93eb91fad0153aee795b73a43e84e37c8127
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit d59825d250)
Reviewed-by: Andreas Buhr <andreas.buhr@qt.io>
2021-10-30 09:58:43 +00:00
Heikki Halmet
91c20d709a Provisioning: Change cache url suffix ci.local to intra.qt.io
Change-Id: Ifaa84ddb6b8b3bdbada2a7af26df92e151792532
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit ba32df291c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-10-29 14:57:32 +00:00
Heikki Halmet
5bffe4c688 Provisioning: Change locale and language settings
Let's script this so we can be sure which language settings are in use

Change-Id: Ibf9ee047ede78535d39e707fd669b8a0f407cf1e
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 8fac7c92c9)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-10-29 14:57:31 +00:00
Heikki Halmet
082500cb93 Provisioning: Remove unused code from JDK installation script
Amends abd2e0b381

Change-Id: Ica9078571cfc9851bada36474cc80e1fcc642dbb
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 36a58374d6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-10-29 14:57:31 +00:00
Pasi Petäjäjärvi
8a0f13d7ae CI: Move QNX qemu specific configurations to own file
Task-number: QTBUG-87628
Change-Id: Ifc360071a08304270d75a505eecbd9c2da635c00
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 0b97c457a8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-10-28 11:52:53 +00:00
Pasi Petäjäjärvi
1c7bb0892a CI: Add QNX QEMU image build package
* Define env variables needed
* Add build files only to create qemu image

Task-number: QTBUG-87628
Change-Id: I26fd10b3e7950c7226c3c66f0b385b1acf0ac118
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit fe0b819588)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-10-28 06:48:49 +00:00
Pasi Petäjäjärvi
f30c29dd88 CI: Add NFS export
Export work directory via NFS for QNX qemu

Task-number: QTBUG-87628
Change-Id: I57a2f612cf268bef4582726c9b0a1b953e74034b
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit ffc3ef20a3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-10-28 06:48:42 +00:00
Pasi Petäjäjärvi
27db125230 Provisioning: Install NFS support required by QNX QEMU
Task-number: QTBUG-87628
Change-Id: I9100dd7eda11a9a6ebf35aa6100c6bf983402b64
Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit b580128093)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-10-28 06:48:34 +00:00
Ivan Solovev
eb874192c9 Add qtpositioning as a submodule
The new qtpositionig repo is created to split QtLocation and
QtPositioning development.
This patch adds the new repo as a submodule to qt5.git
It also marks the qtlocation module as ignored and removes
it from dependencies, using qtpositioning instead.

Task-number: QTBUG-97188
Change-Id: I7adb9fc405119f865cd6b25a6ce9eff40d693b14
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
(cherry picked from commit 6af22246cf)
2021-10-26 09:54:56 +02:00
Heikki Halmet
e3a457f60d Provisioning: Upgrade Java JDK to version 11
Task-number: QTQAINFRA-4596
Change-Id: I5c67f220b5a1f3115032eb509d1d391cf1e520a6
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit abd2e0b381)
Reviewed-by: Andreas Buhr <andreas.buhr@qt.io>
2021-10-22 07:27:25 +03:00
Heikki Halmet
deaf7dddca Provisioning: Upgrade Vulkand SDK to the latest version
Update Vulkand version to 1.2.182
Include fetching from official location if cache is not available and
checking the shasum

Task-number: QTQAINFRA-4532
Change-Id: I3c43b08170a1756f1ca896bd606af1a2f349d93c
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 3de398e6eb)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-10-21 19:14:27 +00:00
Johanna Äijälä
b749b2689a Provisioning: update Squish on linux and macOS
Custom Squish 6.7.1 for Qt6.2, macOS package back in the original form
without separate Squish server for Qt6.2.
Pick to: 6.2

Change-Id: I1edb9625f1d2891047d24676019448e8dd0fbaeb
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 5271d9f1cf)
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-10-21 07:56:02 +03:00
Dominik Holland
daf76912b8 Provisioning: Update Python packages to the latest version
Change-Id: I31f3eb4f2d633015105b2915eb8e385c1c2aa6cf
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 308584fbfd)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-10-20 22:08:48 +00:00
Ivan Solovev
94cd0802f3 Enable CI for qtpositioning repo
Task-number: QTBUG-97187
Change-Id: I46cab4dffa8ede6a28f479ee693e2296e8a7c535
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit d0de34c4e1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-10-20 22:08:40 +00:00
Simo Fält
76b0e26e7a Provisioning: Update Python in macOS to 3.9.6
Change-Id: I092513727642b34cc71034dab96c78eaecfe72f1
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
(cherry picked from commit ea89779e22)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-10-20 22:08:40 +00:00
Heikki Halmet
309c6694df Provisioning: Add OpenSSL for Android to macOS
Task-number: QTBUG-97243
Change-Id: Ibf67b7d713904edb9f8ee83b35eb096e2d3f1eb1
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit 2aa8303236)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-10-20 12:34:00 +03:00
Samuli Piippo
d7944ea8c6 Add zstd to Ubuntu 20.04
Needed for bitbake.

Change-Id: Ib7be3a971b970311adca25f46238d3fae838cba9
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 663ebcb102)
2021-10-15 12:01:54 +03:00
Marianne Yrjänä
3a8ccd8bad Update QNX toolchain
Change-Id: I6edd66365d73996ca4d02ee82ab86e63bb190fa7
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 153c7680cd)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-10-14 08:40:54 +00:00
Qt Submodule Update Bot
4d90a09487 Update submodules on '6.2 in qt/qt5'
Change-Id: Ib8a94b52cf2e0854bed30d93ae8b6014eeafc9c6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-10-13 06:50:15 +00:00
Joerg Bornemann
31610bf8c0 CI: Turn dbus support off for QNX_710
QtDBus is built even if system dbus is not found, and QtGui depends
on QtDBus.  To link a consumer of QtGui, the -rpath-link option must
be passed to the linker.  That is not done at the moment, due to
QTBUG-86533.

Fixes: QTBUG-96791
Task-number: QTBUG-86533
Change-Id: I381747f15135fe65777985742dca0fd102583941
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 420adf322a)
2021-10-11 09:21:27 +00:00
Qt Submodule Update Bot
ae8b953343 Update submodules on '6.2' in qt/qt5
Change-Id: I6368ed7114d701c5ca31fda39a8d6f1f14cfde2d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-10-07 13:03:48 +03:00
Qt Submodule Update Bot
2e91316fa3 Update submodules on '6.2' in qt/qt5
Change-Id: If9157e50a35e57e9d59ee34b2eccea6ac73286e9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-10-06 00:59:30 +03:00
Heikki Halmet
ed724f842b Provisioning: Re-install ca-certificates for Ubuntu 20.04
This makes sure that needed ca-certificates are installed during
provisioning

Change-Id: I39289f237a54ca0805b1d9116ee899aecf02e72f
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 3b09730b44)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-10-05 18:15:19 +00:00
Qt Submodule Update Bot
564fddd1aa Update submodules on '6.2' in qt/qt5
Change-Id: Icdc8dd2095e2e0a5636f8c89181d39e0936e0c7f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-10-04 20:57:41 +03:00
Qt Submodule Update Bot
8df89f1f84 Update submodules on '6.2' in qt/qt5
Change-Id: Id05b4bef885c7115694077c9db0bf6ee9cd7d761
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-10-02 06:55:56 +03:00
Qt Submodule Update Bot
e5f7eb075f Update submodules on '6.2' in qt/qt5
Change-Id: Ia0d34014d08a282844b5c46aaa75fb62d71ff0c1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-10-01 20:49:39 +03:00
Qt Submodule Update Bot
cf4464c133 Update submodules on '6.2' in qt/qt5
Change-Id: Ib70902bbd55a4a4d1c28d5e147c3d088d931381d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-10-01 08:50:26 +03:00
Qt Submodule Update Bot
887d4032fa Update submodules on '6.2' in qt/qt5
Change-Id: I62741b04194baab1baf0162995fc74c5cd777220
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-09-30 14:12:08 +03:00
Dan Ackers
7b9448f2b9 Rename new file for clarity
Change-Id: I83428ef280cef73c3c0530feabb116973632ccd9
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 96269c2d01)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-09-29 13:05:02 +00:00
Qt Submodule Update Bot
403f9d56e7 Update submodules on '6.2' in qt/qt5
Change-Id: I49239b6f4b59f19513a91a52208a25c73806f9c9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-09-29 09:57:13 +03:00
Dan Ackers
8504d78c96 Make QNX-toolchain files git-tracked
Also, qnx now builds only using toolchain
packages, ignoring host mahcine.

Task-number: QTQAINFRA-4502
Change-Id: Ifd2f3cf1260b92cee8040e1d2213809bad1b3fc1
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 80d0b2a91b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-09-28 22:32:01 +00:00
Dan Ackers
04f7a70291 Integrity: git track toolchain file
Also make cmake find libraries only from toolchain

Task-number: QTQAINFRA-4580
Change-Id: I5eabaa3b6915e16db6ce152591d3b88bc7483d29
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit cae9a1e8ef)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-09-28 22:32:01 +00:00
Qt Submodule Update Bot
5f06a16be9 Update submodules on '6.2' in qt/qt5
Change-Id: I1cc372fc1771c6720dab93b9fe3be646c6de8555
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-09-28 20:09:26 +03:00
Qt Submodule Update Bot
f5c6dde718 Update submodules on '6.2' in qt/qt5
Change-Id: I351a637e8d09c01b6bb7155d518603431a7b6fd2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-09-28 08:48:40 +03:00
Alexandru Croitor
53779c4fa1 wasm: Don't include debug info in Qt for WebAssembly packages
This substantially decreases the package sizes. It's also what we
currently do for Qt 5.15.x WebAssembly builds.

See also f44dfe9c34 which did not enable
debug information for iOS builds because there's no implementation for
separating the debug info from static libraries yes.

Task-number: QTBUG-96793
Change-Id: I743946c9e1367e88c7dd6dafec57648d9dbf2e9c
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 551c838bad)
2021-09-27 11:56:56 +02:00
Qt Submodule Update Bot
c2a8760db7 Update submodules on '6.2' in qt/qt5
Change-Id: I69b166a88acd1773d8e74ad192a8974044052e10
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-09-25 10:47:18 +03:00
Qt Submodule Update Bot
77e75866a2 Update submodules on '6.2' in qt/qt5
Change-Id: Ibbf01a3d74121d12dc806adecdf045e3c8c0b6e4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-09-24 23:03:14 +03:00
Qt Submodule Update Bot
a193212edd Update submodules on '6.2' in qt/qt5
Change-Id: I0ddd5d9e9ead853ff437799c3e1d41bfdd9955eb
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-09-21 04:26:39 +03:00
Qt Submodule Update Bot
21092f1a60 Update submodules on '6.2' in qt/qt5
Change-Id: Ia68b201a8f1ed988995574f4ff18dd946cac70f8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-09-20 17:01:55 +03:00
Qt Submodule Update Bot
33b1a3a319 Update submodules on '6.2' in qt/qt5
Change-Id: I41240201c1c2c55df8ad429eb3d926a16bb730bf
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-09-20 07:16:32 +03:00
Qt Submodule Update Bot
8f77aad620 Update submodules on '6.2' in qt/qt5
Change-Id: I84d860988a29673b3e6acdb2c97a06d4f175d9f6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-09-15 12:29:27 +03:00
Qt Submodule Update Bot
606219e8ae Update submodules on '6.2' in qt/qt5
Change-Id: Ic29a3336f09138631bbdd3204fd62aa45677242d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-09-15 03:10:28 +03:00
Qt Submodule Update Bot
ce0a3d708c Update submodules on '6.2' in qt/qt5
Change-Id: I0f9ae16e27e01b35036ed1ce079cb49cb7fa9c4f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-09-14 14:55:17 +03:00
Qt Submodule Update Bot
bb898b6cc0 Update submodules on '6.2' in qt/qt5
Change-Id: I0331b379dd023e74dc59a6e40e9aae43cff75f85
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-09-09 20:49:02 +03:00
Qt Submodule Update Bot
21e86307ed Update submodules on '6.2' in qt/qt5
Change-Id: I7e124fb9c53ed512f6f581170a256ca20dccef17
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-09-09 04:42:19 +03:00
Heikki Halmet
e5679646b5 Provisioning: Update the Integrity toolchain version
Task-number: QTQAINFRA-3555
Change-Id: I2a1f25024862b0b96bb7675376520d2e3a679d0b
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit f320433979)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-09-08 05:28:19 +00:00
Qt Submodule Update Bot
833372c809 Update submodules on '6.2' in qt/qt5
Change-Id: I986062980c44c646e92924d94dc8092a1cd65726
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-09-07 19:25:16 +03:00
Jani Heikkinen
2fd650b973 Add '-DFEATURE_gds=OFF' as a non-qtbase configure argument for macOS packaging host
We need to disable GDS feature to solve OpenSSL library linking issue

Fixes: QTBUG-93759
Pick-to: dev
Change-Id: I3625c06b14c633d77f1628ae0cda3092284eabd6
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
2021-09-07 16:58:57 +03:00
Heikki Halmet
b94cc9cc28 Make Integrity significant
Task-number: QTQAINFRA-4285
Change-Id: I131e6af26a28012228178192e60e2a91d33959fe
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-09-07 08:01:09 +03:00
Simo Fält
2fe9652422 COIN: Fix integrity target configure arguments
Change-Id: I624feea29eb70dadb9e959d6056eaccd73b7169a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 9385d5d687)
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-09-06 05:45:10 +00:00
Qt Submodule Update Bot
963b169394 Update submodules on '6.2' in qt/qt5
Change-Id: I9b6f54949bcafcf8026e51e799d2492dc3f4a317
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-09-04 00:05:41 +03:00
Kimmo Ollila
da33061d66 Add Integrity target for other modules
QtDeclarative, QtImageFormats and QtShaderTools

Change-Id: I24906d833d364a80025663928650f032a8618c22
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit dd24bc25c9)
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-09-03 09:48:22 +03:00
Kimmo Ollila
1d7d4a7603 Add Integrity target for QtSvg
Change-Id: Ic677c932151aeed9f72e49baba9038bf122e5b5b
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 401ef8a8b3)
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-09-03 06:48:19 +00:00
Heikki Halmet
9fd1d19465 Add Insignificant flag for Integrity
We will add new module targets for Integrity. Those are not tested
during Qt5 integration. Let's remove the flag after we are sure that
nothing will break on those new targets

Change-Id: Ifdcecc869a931897e377281618dfce744353b47e
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-09-03 09:48:13 +03:00
Simo Fält
433f106d31 Make Integrity platform config as a cross compile target
While there was no target os value, COIN thinks that it is a normal
desktop target. This causes the host and target artifacts being copied
to wrong location.

Change-Id: Ie478f66e424859fbbf51d3f2d9d7efba032b30c5
Reviewed-by: Kimmo Ollila <kimmo.ollila@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit b5c4effe7e)
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-09-03 09:48:09 +03:00
Qt Submodule Update Bot
4de7f2fd54 Update submodules on '6.2' in qt/qt5
Change-Id: Ibc0860c74a72a87dd3a6215649bc5cd756e4eaad
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-09-03 07:37:54 +03:00
Qt Submodule Update Bot
3a4502ae3d Update submodules on '6.2' in qt/qt5
Change-Id: Icb82129f238d41a99cc59c6b53d0aab37a04f0d1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-09-02 12:40:52 +03:00
Robert Griebl
33988e12ac Add a platform config file for Qt Application Manager
Change-Id: I59013a841e96eb679798e906af4c1af09884dc45
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
(cherry picked from commit 2b22f80725)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-09-02 09:19:01 +02:00
Alexandru Croitor
51155b7bf8 Build minimal subset of tests in qtdeclarative desktop static builds
Task-number: QTBUG-87580
Change-Id: I417dbfc9b9b3092c9c14227907db4f1c16124ef1
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit f0c7664195)
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2021-08-27 14:42:00 +02:00
Alexandru Croitor
26e43959e1 iOS: Build a subset of tests when targeting iOS
Currently will only build tests/auto/cmake projects in qtbase.
More work is needed for the other repos.

Task-number: QTBUG-95839
Change-Id: Ie1aa6deb202c9b84ce0c14b0f851f38a3a71fe7b
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit 4fea3be3af)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-08-27 08:09:25 +00:00
Assam Boudjelthia
8ab13223a5 Coin: bump Android build tools and platform sdk level from 29 to 30
Google requires target SDK level 30 for apps that can be accepted to
the Play Store. This change goes together with bumping the default
target sdk in qtbase (from 29 to 30 as well).

Ideally, build tools should be kept up to date as well anyway.

Change-Id: Iac58b7250d7cb639a4d760cf12e7630c9d0b77cc
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
(cherry picked from commit 6ac98447b5)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-08-26 18:17:13 +00:00
Heikki Halmet
86a34fb5d7 Upgrade Xcode and Command line tools to the latest version for Big Sur
Latest version is 12.5.1

Change-Id: I86111d5fdab6e06201f1184bbd23806d25eed192
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 f824365cb5)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-08-24 07:14:39 +00:00
Samuli Piippo
5f7bb79fd9 qdp: remove system dependencies
Use more of the same arguments as RHEL-8.2-host to limit
the unnecessary dependencies to the system libraries.

Task-number: QTBUG-95882
Change-Id: Ibc5b1755aca7bfef42fd7ca3db0d19ebd49b8e4e
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-08-23 13:51:44 +03:00
Qt Submodule Update Bot
69197946f0 Update submodules on '6.2' in qt/qt5
Change-Id: I729fb6acd74ad1d366a12c6919868654d8df7218
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-08-20 06:26:23 +03:00
Eike Ziller
3c2fca6bb1 COIN: Re-add qtsdk.yaml
That is used by our Jenkins setup for packaging.
To keep things simple, just include the cmake_platforms and
Qt Creator's config.

Change-Id: I13425f08c2f51a1522da25804fc7883f8d817059
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
(cherry picked from commit bbd31689ec)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-08-19 12:29:12 +00:00
Qt Submodule Update Bot
bed102a587 Update submodules on '6.2' in qt/qt5
Change-Id: I85d2b2185329ec189baac4a7b5c93bdb63484c43
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-08-19 09:33:14 +03:00
Allan Sandfeld Jensen
1f452fd479 Update node.js to 12
For Ubuntu it means using an alternative packages, for
openSUSE not using an alternative package.

Change-Id: I09085428db083adc1ff1d68f384cd19c83605bfd
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit c4b8c908b6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-08-18 19:19:46 +00:00
Eike Ziller
aaf0fad6b5 Provisioning: Install 32bit version of Ninja on Windows
So it also runs on 32bit Windows. Ninja upstream switched their
binary builds to 64bit with Ninja 1.7, so we need to provide our own.

Amends e8b0be7711

Change-Id: Id3329ca481b7743b4d40dad8faaa62285dbe53b0
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit f945fdc735)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-08-17 15:59:58 +00:00
Qt Submodule Update Bot
04ad2b6523 Update submodules on '6.2' in qt/qt5
Change-Id: I89c18397efc86bdf62a11c439a99627b03033b32
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-08-17 17:34:49 +03:00
Qt Submodule Update Bot
2ef340e02d Update submodules on '6.2' in qt/qt5
Change-Id: Iae77e867f60ba639acde4187708786611d5b5a4c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-08-17 07:59:27 +03:00
Joerg Bornemann
384bff22f7 Remove qtgraphicaleffects from .gitmodules
This repository has been merged into qt5compat.

Change the 'recommends' field of qtquickcontrols2 from
qtgraphicaleffects to qt5compat.

Fixes: QTBUG-95228
Change-Id: I07ad4302c874e25673b7644cc9b7f2b24cca3833
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit cec25d2ac6)
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-08-16 12:47:23 +02:00
Mitch Curtis
76741ceaa5 Remove qtquickcontrols2.yaml from platform_configs
Task-number: QTBUG-95173
Change-Id: If7470b3d5cd5721def97fd5b41e46e037cec2286
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 9b3411da8d)
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
2021-08-14 11:59:02 +02:00
Alexandru Croitor
92b188ef62 CMake: Update provisioned CMake to version 3.21.1
Task-number: QTBUG-95018
Task-number: QTBUG-95229
Change-Id: Ibed6ff323ca1633444ed29423ce1e94c99e68f77
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
(cherry picked from commit 9218d50a6e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-08-14 09:58:51 +00:00
Tor Arne Vestbø
3344530eaa Improve OpenSSL provisioning on macOS
- Make the script idempotent
  - Use local architecture instead of hard-coding x86_64
  - Set deployment target to 10.14
  - Improve logging by not building with --silent
  - Don't install manual pages
  - Allow custom install prefix (for testing)

Change-Id: I728a2595987db0568568bbb8ca8117effca73997
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit f8fab3be9b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-08-13 16:55:47 +00:00
Daniel Smith
aebf8f743a Update submodules on '6.2' in qt/qt5
Change-Id: I9f2c3a616edae0ed4f033e76a85a00ea7ab7c40f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
2021-08-13 08:26:00 +00:00
Mitch Curtis
98fddae379 Recommend qtimageformats for qtdeclarative
qtquickcontrols2 uses it.

Task-number: QTBUG-95173
Change-Id: I6a721f34545656069e91bde9c69b0af976b07e60
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit 204d92c244)
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-08-13 10:25:59 +02:00
Mitch Curtis
a3f580b0ab Remove qtquickcontrols2 submodule
It's now a part of qtdeclarative.

Fixes: QTBUG-95416
Change-Id: I2e308914aa0c97608534187737b6d5ea596f100c
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit ed7a7e75ff)
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-08-13 10:25:58 +02:00
Heikki Halmet
939c7e7f57 Change locale to en_US and install all available language packages
These are needed for Android tests

Task-number: COIN-727
Change-Id: Id12a75da2b4485ba5d655ceb0b7c7d6426f2b4cd
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit beb8fcca5f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-08-12 18:47:27 +00:00
Alexandru Croitor
bdfbd4ff3f Remove qtgraphicaleffects.yaml from platform_configs
Task-number: QTBUG-95757
Change-Id: Ia83795bbc2ddef9532fd196d64776571e50c1d6c
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit 1256b4d504)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-08-12 15:44:50 +00:00
Joerg Bornemann
8e07b4271b Remove qtquickcontrols from .gitmodules
This repository is not available in Qt6.

Every repository that recommended qtquickcontrols already recommends
qtquickcontrols2.

Change-Id: I30980bbbe9ca495f12dc591a693ebc3a4a6a01bc
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
(cherry picked from commit 149cc2ebc0)
2021-08-10 16:46:31 +02:00
Qt Submodule Update Bot
a0721ffc10 Update submodules on '6.2' in qt/qt5
Change-Id: I0c36c5156827e4751ba4a9ff12c6a16894a8e5f5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-08-03 13:21:32 +03:00
Qt Submodule Update Bot
fa08d846df Update submodules on '6.2' in qt/qt5
Change-Id: I54aedf453b786db519e77da9a314545f08a37266
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-07-29 10:13:35 +03:00
Qt Submodule Update Bot
d1e747e9c2 Update submodules on '6.2' in qt/qt5
Change-Id: I3bbb725876e9f8f5acd9f651a771f28cc55f063b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-07-28 07:07:03 +03:00
Simo Fält
ad7211e014 Manually update qtwebengine to unlock CI for pyside-setup
Change-Id: I95862a0e46f44de94dc3926e805a2bf7df3a6e9a
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-07-27 13:53:41 +03:00
Alexandru Croitor
abed2215b2 CMake: Remove CMake minimum version check in top-level project
The check is done in qtbase instead.

Trying to do it in the top-level project is cumbersome due to needing
to know whether it will be a static or shared Qt build.

It's also cumbersome because the top-level build used to use qtbase's
minimum cmake version values and that can get awkward to handle with
submodule dependency updates.

Replace the check with a regular minimum required call.
The minimum version is 3.16 and the upper range value for NEW policy
assignments is 3.20, while 3.21.0 is still kind of fresh and has some
AUTOUIC issues.

As a drive-by, add a clarifying comment about QtAutoDetect.cmake.

Task-number: QTBUG-95018
Change-Id: Ifb4ec0b4ed7f56ab0179feb79072c93d1d66ce63
Reviewed-by: Craig Scott <craig.scott@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 4180e9c511)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-07-27 09:31:19 +00:00
Qt Submodule Update Bot
97baab98fa Update submodules on '6.2' in qt/qt5
Change-Id: I12fe7bb75d07e89d4c25ac5d366bb011ec76e872
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-07-25 05:26:56 +03:00
Qt Submodule Update Bot
3875da7f7a Update submodules on '6.2' in qt/qt5
Change-Id: I3b34c0b29ce2daba3433e5daa9ef3379a4087fa7
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-07-24 18:27:13 +03:00
Alexandru Croitor
200542194a Provisioning: Install ninja 1.10.2 for Windows and macOS
To avoid error 'too many path components' when building Qt on Windows.

Task-number: QTBUG-95286
Change-Id: I122cfddc8c19201f4c04fde94d051c5e1278c040
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit e8b0be7711)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-07-23 16:41:21 +00:00
Qt Submodule Update Bot
3c8e55904b Update submodules on '6.2' in qt/qt5
Change-Id: I66530634e78280ed50b2036428df0f29176788c2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-07-23 04:35:17 +03:00
Qt Submodule Update Bot
7c6987f5f2 Update submodules on '6.2' in qt/qt5
Change-Id: I1fbf348a2ce336d230c67cc8ed03fae05d725f29
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-07-22 10:57:22 +03:00
Qt Submodule Update Bot
07ba2084de Update submodules on '6.2' in qt/qt5
Change-Id: I91aab3d9a572326775c0a2c37383d77918984893
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-07-21 23:25:48 +03:00
Qt Submodule Update Bot
6742cfecb7 Update submodules on '6.2' in qt/qt5
Change-Id: Ic85a2785a837d73507e866a2f3a3b1b29f21ea54
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-07-21 04:05:10 +03:00
Qt Submodule Update Bot
8711116396 Update submodules on '6.2' in qt/qt5
Change-Id: Idc0e457695645fc8fed9a93ca83ee5437f25a1d0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-07-20 12:55:19 +03:00
Qt Submodule Update Bot
b3efc246b3 Update submodules on '6.2' in qt/qt5
Change-Id: I5e0d932100ae441de15fa7346311b9165c4ed4c6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-07-20 02:41:20 +03:00
Ulf Hermann
d50ea75346 Coin: Add tqtc-qmlcachegenplus configuration file
Change-Id: Ie66b837e95339ff6837ebfa83797716233bb8145
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit fab470c190)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-07-14 11:09:04 +00:00
Qt Submodule Update Bot
90d85dae7d Update submodules on '6.2' in qt/qt5
Change-Id: I7e358268f00769e5acd31546a31df315bab4908d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-07-13 16:47:34 +03:00
Alexandru Croitor
d0583b0388 CMake: Update provisioned CMake to version 3.20.5
Change-Id: Id09eedf75b02b28dd94b0e3f858a05ebe8875679
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit d7c2951de0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-07-09 18:50:43 +00:00
Allan Sandfeld Jensen
c0c484278d Add qtwebengine dependencies to provisioning
Change-Id: If2cc949ce0669281d65995175480ac7cbd9fad74
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
(cherry picked from commit 3f551fedd6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-07-06 10:28:27 +00:00
Assam Boudjelthia
e3e388d76c Remove qtpurchasing submodule from qt5
Qt purchasing was not part of Qt 6, and will be moved as a demo/example
under qtdoc, thus we don't need it here.

Task-number: QTBUG-84776
Change-Id: Ie6f704e72914072e7e105763ffaeae1d13cff086
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
(cherry picked from commit eb16fe519f)
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2021-07-01 17:26:24 +00:00
Heikki Halmet
675c9ad6c6 Add correct version for prebuilt OpenSSL Android
Script was pointing to incorrect version and the prebuilt version
was missing from cache. OpenSSL Android is now rebuilt and cached.

Pick-to: dev
Pick-to: 6.1
Pick-to: 6.0
Pick-to: 5.15
Pick-to: 5.12
Task-number: QTQAINFRA-4501
Change-Id: I31db800fa6814c3e7c1e649e2bbe3e3c80b9f4ce
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-07-01 12:34:51 +03:00
Qt Submodule Update Bot
fad3ce0574 Update submodules on '6.2' in qt/qt5
Change-Id: I47b98b1e84927a50f99dbda1832d14d2a70a7345
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-06-30 16:47:05 +03:00
Qt Submodule Update Bot
6dd1b85fd6 Update submodules on '6.2' in qt/qt5
Change-Id: I83f3659feace8cd95ef1208886602b4a0734059c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-06-30 02:39:13 +03:00
Assam Boudjelthia
9d47c22900 Remove qtandroidextras.yaml from platform_configs
Following qtandroidextras removal in the commit
912fdda4a4, coin's  platform
config yaml file has to be removed.

Task-number: QTBUG-84382
Change-Id: I8c3bc89938315ae8361d8d89ec6543d3699440ed
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
(cherry picked from commit f1fcb89f26)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-06-29 09:53:39 +00:00
Qt Submodule Update Bot
8cecbd9e8b Update submodules on '6.2' in qt/qt5
Change-Id: I2a38867ad47eb01b5f1a1e65988469ac13aa3089
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-06-29 10:48:37 +03:00
Samuli Piippo
bb95d19ca8 Build QDB without icu or system doubleconversion
... to avoid unnecessary dependencies.

Pick-to: dev
Change-Id: I607f034d5b092e69e7d2aead4c0747268b690a5d
Reviewed-by: Toni Saario <toni.saario@qt.io>
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2021-06-28 14:59:36 +03:00
Qt Submodule Update Bot
6ada10bf35 Update submodules on '6.2' in qt/qt5
Change-Id: Ic310607b215a1ca819f2145ffd965f282f05507b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-06-26 18:44:15 +03:00
Lars Knoll
9a2aba6192 Make QtMultimedia depend on shadertools and recommend qtquickcontrols2
Multimedia needs shadertools for building, so make that explicit.
Some examples use Qt Quick Controls, so we recommend that as well

Change-Id: If067defe371dc9584634d1c1aa7c5eae74c9af25
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
(cherry picked from commit 4131439fb9)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-06-25 22:17:30 +00:00
Jani Heikkinen
ea62a47c56 Add missing wasm target build for windows and macOS hosts
Based on wasm maintainer these should work already

Change-Id: Ifa9606546e6d04be824d5507306a8c6fb5f2d035
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit bae9580da1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-06-25 13:16:27 +00:00
Qt Submodule Update Bot
ca5bc70a3b Update submodules on '6.2' in qt/qt5
Change-Id: I82c549410e7c80d76975e9faaf5966d29cd75e28
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-06-23 16:09:16 +03:00
Tanja Remes
e2877a3e5b Provisioning: update Squish packages
Custom packages for Qt6.2. macOS:use custom build Qt5.15 package
with separate Squish server adjusted for Qt6.2

Change-Id: I25ed60f8ec9e3fdf919e5003f52a58cdca14e633
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 1c17b656e0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-06-22 14:14:08 +00:00
Qt Submodule Update Bot
eea5f47027 Update submodules on '6.2' in qt/qt5
Change-Id: I05b348aa027e333e47301ad9186368c8cb9a16ab
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-06-22 08:24:28 +03:00
Heikki Halmet
34d0ca0f39 Update Yocto toolchains
Pick-to: dev
Task-number: QTQAINFRA-4459
Change-Id: I0a6144db1ca1ceb35791749bf5b056ced2307ab9
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-06-18 12:43:41 +03:00
Heikki Halmet
e216d829ff Switch back to RedHat 8.2 for Android target
Timeout increased so this should be ok to move back to Redhat 8.2

Pick-to: dev
Task-number: QTQAINFRA-4415
Change-Id: Iece9aefcbfdade2e29f495039de1f1fcafec2caf
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2021-06-18 12:42:44 +03:00
Toni Saario
91030b897c Archive global and config from qtbase in doc build
Copy the global and config folder from under qtbase to directory from
which the documentation.tar.gz is created. This is similar to how these
are added in qmake builds.

Task-number: QTBUG-94443
Change-Id: I1dfd6dd05057bb1bfdaeec9cf5d03fbfe474a5d1
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 7ed6d04410)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-06-16 22:22:31 +00:00
Alexandru Croitor
6276e48226 WoA: Build both release and debug configs for Windows on ARM
The config is marked as Packaging, but it didn't specify the list of
CMake configurations to build and defaulted only to Debug.

Task-number: QTQAINFRA-4492
Change-Id: If75eaf76d386442355c45e4705fe2f4c0eeaa086
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
(cherry picked from commit 52eebe8a89)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-06-16 14:43:33 +00:00
Samuli Piippo
e40315c22d Add static platform targets for qdb
Static host platforms with packaging enabled.

Change-Id: I137bde6ccefb960282c5a830eb3862f03ee2f5f5
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-06-16 12:17:01 +03:00
Assam Boudjelthia
a0f6a60fb7 Remove qtandroidextras submodule
Remove qtandroidextras from the submodules list of qt5 since it's
not part of Qt 6.

Task-number: QTBUG-84382
Pick-to: dev
Change-Id: Ib95fa4c759c1135b7e0cde9b54ddd334a2f7d382
Reviewed-by: Simo Fält <simo.falt@qt.io>
2021-06-15 13:20:22 +00:00
Tor Arne Vestbø
b90fef29dc coin: Make macOS on ARM developer-build tests significant
Pick-to: dev
Change-Id: I2cc95e955fb313131dbef56028332b611d5dba7d
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-06-15 08:01:11 +03:00
Heikki Halmet
0a5e63dce9 Remove Insignificant flag from Windows ARM target
Pick-to: dev
Task-number: QTQAINFRA-4452
Change-Id: I049dfb8df259fed40438ee08b339507bda3ed768
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-06-14 13:49:54 +03:00
Jani Heikkinen
a1ee8408ff Fix qtmultimedia status
It has to be addon

Pick-to: dev
Change-Id: Ideafe810c032be9fdff6fae8cefb438204f61be8
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-06-14 08:52:20 +00:00
Jani Heikkinen
4d67b1e1fd Restore qtmultimedia as a addon in qt5.git
According to plan Qt Multimedia will be back in Qt 6.2 so let's add
it in official builds

Task-number: QTBUG-93129
Pick-to: dev
Change-Id: I57363932aa461210cac806fa24cc2fe9b6951391
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2021-06-12 00:39:12 +03:00
Jani Heikkinen
00be2755b8 Update submodules on '6.2' manually
Submodule update bot didn't do this because of some reason so try this
manually instead

Change-Id: Iaaad962fec9e56f0a46ab7934c9172eefd328322
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-06-11 07:31:03 +03:00
Simo Fält
80d999890d Add 'Packaging' feature for Mac TestOnly CI configs
This will allow exporting the testlogs for release.

Task-number: QTBUG-94111
Change-Id: Ib0db2b8ba0814539f235ddff412653e797b3f3e2
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 9673311626)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-06-09 14:52:55 +00:00
Inho Lee
90e313538c Quick3D : Add optional dependency to QtQuickTimeline
Quick3D's runtime asset animation needs QuickTimeline module.
This is an optional module just for the animation feature.

Change-Id: I080b23e2f8f73277a92ef6207829fd3e3fc6d1b5
Reviewed-by: Christian Strømme <christian.stromme@qt.io>
(cherry picked from commit 6069cf9a84)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-06-09 13:01:37 +00:00
Jani Heikkinen
cad3bd7c94 Adjust submodule branches 2021-06-09 07:23:53 +03:00
Dominik Holland
92f423c06d Provisioning: Install libdlt-dev
Fixes: COIN-217
Change-Id: I3ce5da4d6b8e79a766ad90715462a9c8b7c50294
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-06-08 11:18:57 +02:00
Dominik Holland
30e02f32fb Add a platform config file for Qt DLT Logging
Change-Id: I6ad13ba724158719c463d1e64e9aa21e59cd89c9
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
2021-06-07 22:47:24 +02:00
Dominik Holland
632997a94e Add a platform config file for Qt Interface Framework
Task-number: AUTOSUITE-1633
Change-Id: Ie960510ac3c7e53c6e1b8cdbac26a339b72d31d5
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-06-07 22:47:19 +02:00
Tony Sarajärvi
d9be0951b4 Replace openSUSE 15.2 with 15.3
Task-number: QTQAINFRA-4477
Change-Id: Ie8ce60c4e6d9b948be2ff813b599a2d8f6d75099
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-06-07 18:40:13 +03:00
Tor Arne Vestbø
ab78fc3c52 coin: Provision OpenSSL as universal build for macOS
Fixes: QTBUG-93205
Change-Id: Ic1f4d7709139da06cdd05605613602c1b28306b6
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-06-07 16:08:20 +02:00
Tor Arne Vestbø
f5dbd9b4f0 Remove qtwinextras submodules
It's no longer part of Qt (as of Qt 6)

Task-number: QTBUG-89564
Change-Id: I302c58f1b6a55797cf1f6722eafe936561bf456f
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2021-06-07 11:17:58 +02:00
Jani Heikkinen
d71ae6f832 Restore qtwebview as a addon in qt5.git
According to plan Qt Webview will be back in Qt 6.2 so let's add
it in official builds

Task-number: QTBUG-93222
Change-Id: I20a20e74f08327a15d6c3985a42efc01b01a5848
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
2021-06-07 10:22:27 +03:00
Michal Klocek
b28866f7b1 Switch webview builds to cmake
Task-number: QTBUG-88620
Change-Id: I77bc7ad283d6b33590cc27e23dead7aac301fec9
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2021-06-04 16:33:29 +02:00
Heikki Halmet
ba869e1975 Add Integrity target for QtBase including provisioning changes
At this point let's add only target for QtBase. Target for
QtDeclarative, QtQuick3d and QtQuickcontrols2 will be
added later when we have all required fixes.

Task-number: QTQAINFRA-3555
Task-number: QTQAINFRA-4285
Change-Id: I59ef76079e98ba428cdb7abcb2560f434c37f517
Reviewed-by: Kimmo Ollila <kimmo.ollila@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-06-04 11:25:05 +03:00
Heikki Halmet
c399c02fe7 Use CentOS 8.3 when running tests with Android emulator
Rhel 8.2 with Android emulator seems to be unstable

Change-Id: Ibd858b25959b397d68e3242df0bf49eda3ca9445
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2021-06-02 07:20:58 +03:00
Assam Boudjelthia
53220710f5 Update build tools and platforms API level to 29
Windows and macOS hosts were still using 28 while Linux uses 29.

Change-Id: I36afd17277605b6478bf840340c0341a7f327caa
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-06-01 07:50:45 +03:00
Li Xinwei
4450693ac0 Fix --mirror option for init-repository
If submodule url is absolute, don't use mirror, don't set
remote.gerrit.url and remote.gerrit.fetch.

To avoid error when passing "--mirror git://github.com/qt/":
fatal: remote error: qt/https://code.qt.io/playground/qlitehtml
is not a valid repository name
Visit https://support.github.com/ for help

amends 7374ef8e38

Change-Id: Ifb4e1c8de57c7729f2965c16388f1acd763a150f
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2021-05-31 10:58:48 +00:00
Eike Ziller
3b2dd1560c COIN: Remove unused parameters from qt-creator.yml
We are not using them for the Qt Creator build, since for us it makes
more sense to define these things in the Qt Creator branches. They
create additional noise (and confusion) in the COIN interface though, so
remove them.

Pick-to: 6.1
Change-Id: Iadcb9570f88fa0245996d8e7c112dc8b54dfe80d
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
2021-05-28 10:27:32 +02:00
Allan Sandfeld Jensen
a6c5f0e918 Add nodejs to RHEL 8.2
Change-Id: I325a1df169b9055af78d3579df1370f7c3a17852
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-05-27 21:06:34 +02:00
Heikki Halmet
b1a3ccb99c Remove InsignificantTests flag from Windows developer build
This patch only affects to dev branch.
Separate patch will handle 6.1 and 6.0 branches

Task-number: QTQAINFRA-4427
Change-Id: Ibaf6422061e9cd66a3458922fae7a4533f80c40f
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-05-27 11:33:50 +03:00
Lars Knoll
dff3eab96c Add a platform config file for Qt Multimedia
Change-Id: I56460067682dd221756266513ec994ebb4794209
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-05-27 10:32:54 +02:00
Qt Submodule Update Bot
bb5f9f5a3c Update submodules on 'dev' in qt/qt5
Change-Id: Ica870b71d996427281b817bf7f64b0e20fd3e541
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-05-27 09:33:17 +03:00
Kai Köhne
7374ef8e38 Support absolute submodule urls
This is needed for qttools.

Fixes: QTBUG-93850
Change-Id: I59a7f8a56d8d7143521b67d0c385150e62338209
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-05-27 06:32:24 +00:00
Jani Heikkinen
7cda9fd97b Restore qtwebengine as a addon in qt5.git
According to plan Qt Webengine will be back in Qt 6.2 so let's add
it in official builds

Task-number: QTBUG-93195
Change-Id: If7e0406bb66033e110f16518a73a2579721cb0c0
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2021-05-26 12:54:40 +03:00
Qt Submodule Update Bot
8a791ec5a1 Update submodules on 'dev' in qt/qt5
Change-Id: I5917bc2c7d73d0f94db88c0e5b86707b26763e94
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-05-26 06:20:10 +03:00
Tor Arne Vestbø
565ca05254 coin: Make macOS ARM packaging config test significant for all modules
Change-Id: Icc30025a33de602e6677b47f131b0557a4d2eabd
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-05-25 09:37:04 +02:00
Qt Submodule Update Bot
4d5e420009 Update submodules on 'dev' in qt/qt5
Change-Id: If12af41e8c677af16f92e59f713ab4e7fecd9fc7
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-05-25 07:50:50 +03:00
Simo Fält
ce66a83485 Fix used Ubuntu version for Pyside6 license check
Pick-to: 6.1
Change-Id: I9f966089818559178d6e1e2c286da25bbd8219e1
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
2021-05-24 10:21:29 +00:00
Michal Klocek
f0ec54c6fb Switch qtwebengine to cmake
Add defaults for now. Later this should get customized
to avoid unnecessary targets.

Task-number: QTBUG-91760
Change-Id: I72d3f11e117abeecf6c8c5fefac16fe951d3a9da
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2021-05-22 14:36:00 +02:00
Qt Submodule Update Bot
3be01a1c13 Update submodules on 'dev' in qt/qt5
Change-Id: I6b3c078d08b56578cdd8b0e0ddc4a8f68f6d7516
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-05-20 19:29:39 +03:00
Dan Ackers
2cee9da977 Libusb coin provisioning
Include libusb to linux, macos and windows

Pick-to: 6.1
Task-number: QTBUG-90951
Change-Id: I633e731d84cc60064bc2d1942f6a1ce129240711
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-05-20 10:57:03 +03:00
Qt Submodule Update Bot
5892947306 Update submodules on 'dev' in qt/qt5
Change-Id: I041374600ca52e2f024d94c465bd6798fa8242e9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-05-20 07:36:35 +03:00
Alexandru Croitor
b2fc30956b wasm: Enable sccache for wasm configurations
Change-Id: I564348482511b472940d6c75623d90809a6693a9
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2021-05-19 19:14:18 +02:00
Joerg Bornemann
43f3795125 wasm: Add WebAssembly platform to Coin
Change-Id: Ia377ad7ff8a675e80ead78eaf47848cc0f235247
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-05-19 19:14:15 +02:00
Qt Submodule Update Bot
a79dc991e0 Update submodules on 'dev' in qt/qt5
Change-Id: Ia3383cfb2dfd5258ce59db5b064a92ba321a7c8e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-05-19 18:08:01 +03:00
Jani Heikkinen
66ce587c46 Restore qtwebchannel as a addon in qt5.git
According to plan Qt Webchannel will be back in Qt 6.2 so let's add
it in official builds

Task-number: QTBUG-93212
Change-Id: Iea137a18d8c635210ee56e2ebfa1f485b4a791a8
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2021-05-18 17:18:41 +03:00
Tor Arne Vestbø
2cca3aa049 Add qt5 macOS ARM packaging insignificant tests
Change-Id: I62847257a0e8dcb3e48714cb1140a09bebcb53c2
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-05-18 13:48:22 +02:00
Tor Arne Vestbø
16a03d48a6 coin: Make macOS on ARM packaging tests significant for a few modules
Not all modules pass yet, but we want to at least make the ones that
do blocking.

Change-Id: Ic3270bab8825c79d3315e6241d62af1bf7f62435
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-05-18 12:37:32 +02:00
Allan Sandfeld Jensen
c4fb89196c Add qtwebchannel config
Change-Id: Ida06681db4cceac72c7cc5b8dcad34457399d756
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-05-18 10:27:00 +02:00
Jani Heikkinen
82f2b64659 Restore qtwebsockets as a addon in qt5.git
According to plan Qt Web Sockets will be back in Qt 6.2 so let's add
it in official builds

Task-number: QTBUG-93684
Change-Id: Idbbc0e5c553bcd863f4b8ad21b9aee6057fe139e
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2021-05-18 10:13:38 +03:00
Jani Heikkinen
6056d3be5f Change 'Target arch' for macOS universal build
This build containing both x86_64 and arm64 architectures. The 'Target
arch' ends up in the binary package names and needs to be changed
because '+' is illegal character in Amazon S3 file names so replace the
'+' with '-' in the 'Target arch' section.

Fixes: QTBUG-93778
Change-Id: I325210d51115ae0b1eda056636b69421f68fabd8
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-05-18 05:06:47 +00:00
Heikki Halmet
ca1894acaa Remove CentOS 8.3 targets
Provisioning scripts will be removed later

Task-number: QTQAINFRA-4415
Change-Id: I71da9743066a81638518f44dc663324246a2ce8c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-05-17 20:40:58 +03:00
Qt Submodule Update Bot
ba2c43b731 Update submodules on 'dev' in qt/qt5
Change-Id: Ib3de299c8f75105e8df3e6d78c58ecb05649ad0a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-05-12 10:36:24 +03:00
Heikki Halmet
99a81d0c6c Provisioning: Temporary fix for installing Conan packages in Windows
Pick-to: 6.1
Pick-to: 6.0
Pick-to: 5.15
Pick-to: 5.12
Task-number: QTQAINFRA-4443
Change-Id: Iba4b240edaf4a3ec8732ddbe1ae4ac5c1166b676
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-05-12 09:17:40 +03:00
Tor Arne Vestbø
d85ff1e934 Remove qtmacextras and qtx11extras submodules
They are no longer part of Qt (as of Qt 6), and the modules themselves
have been wiped (9d99db029613d9cd847407085c5de7f310cd0937, and
6037ece5e4c0d290ae4ebf75c0d9bce0de55ed85).

Task-number: QTBUG-83251
Change-Id: Ie3acfc6d31bda0fcc1c6189e08171dbdf3c50ff7
Reviewed-by: Liang Qi <liang.qi@qt.io>
2021-05-11 10:04:16 +02:00
Jani Heikkinen
da632b95d2 Restore qtremoteobjects as a addon in qt5.git
According to plan Qt Remote Objects will be back in Qt 6.2 so let's add
it in official builds

Task-number: QTBUG-93139
Change-Id: Ia4c9feae94b69f01a3c36872b346aa872f0e6654
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
2021-05-07 10:33:55 +03:00
Jani Heikkinen
3916c0bbac Switch qtconnectivity from additional library to addon
And at same time bump qtconnectivity sha1 in qt5.git

Change-Id: I1a9cfdbc95157715bf7b76870d918add76009e4e
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
2021-05-06 13:50:28 +03:00
Qt Submodule Update Bot
7a79c16814 Update submodules on 'dev' in qt/qt5
Change-Id: Ie7555c2f5c1eacde17e2bee06a496c723025e34e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-05-05 20:52:42 +03:00
Simo Fält
2a4635379c Add ci config for Windows 10 on Arm
Task-number: QTBUG-85820
Change-Id: I145cbfbd39fe164bc57d4106e58c50add51fe976
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-05-05 20:52:42 +03:00
Tor Arne Vestbø
e1c8cf2d39 Add test configuration of macOS universal builds on ARM
Change-Id: I8dec178343978b36dce3e9d262a7f6f234513892
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-05-05 11:45:50 +02:00
Qt Submodule Update Bot
80b5b60a5a Update submodules on 'dev' in qt/qt5
Change-Id: Ibb59bafe553eb0ca055d8d4275f476d87b4c46c9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-05-05 10:06:13 +03:00
Qt Submodule Update Bot
f32e311b13 Update submodules on 'dev' in qt/qt5
Change-Id: I0cc9ad6d4dae1049b5d5ccba84afa4ea1ff7dbc2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-05-05 02:16:11 +03:00
Qt Submodule Update Bot
c94ae9ad53 Update submodules on 'dev' in qt/qt5
Change-Id: I32545ca7ab23266ecbf9ce26593a40bbac9a87cc
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-05-04 11:29:13 +03:00
Qt Submodule Update Bot
1b00e13ec8 Update submodules on 'dev' in qt/qt5
Change-Id: I76b03c8a5e6fdd3da47e35de6ea37b5f7579970a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-05-04 03:59:53 +03:00
Qt Submodule Update Bot
97f41c2fef Update submodules on 'dev' in qt/qt5
Change-Id: I2d83b0da164cfea2694b51f32069698d0c6780af
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-05-03 19:38:04 +03:00
Qt Submodule Update Bot
2fc400fed7 Update submodules on 'dev' in qt/qt5
Change-Id: Ifb8d58ff4677c73e5b2a0ac381a99f9bc4351dff
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-05-01 15:21:46 +03:00
Qt Submodule Update Bot
453cf99c90 Update submodules on 'dev' in qt/qt5
Change-Id: I727a0d4b9c1cc665acf9aaf5c03d168f63646398
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-05-01 10:02:16 +03:00
Qt Submodule Update Bot
d38a5d0044 Update submodules on 'dev' in qt/qt5
Change-Id: I8774af63fd1e96cd2e95288170a4510c3799f3ba
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-30 20:24:36 +03:00
Cristian Adam
c653958301 Update QDoc libclang to 12.0
Task-number: QTBUG-93203
Change-Id: I58b9af361b8e02b7210286ff3cfd6ca07ebb9610
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2021-04-30 14:37:00 +02:00
Heikki Halmet
6ae5052d57 Provisioning: Upgrade python 3.6 version to 3.6.2
typing.NoReturn is not included in python 3.6.1 version. We need at
least 3.6.2 version

Pick-to: 6.1
Pick-to: 6.0
Task-number: QTQAINFRA-4433
Change-Id: I040e72e253852c7789d4f9e781d18e6b9a431a50
Reviewed-by: Dan Ackers <dan.ackers@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-04-28 12:47:10 +03:00
Qt Submodule Update Bot
81bb861060 Update submodules on 'dev' in qt/qt5
Change-Id: Ia193a750ec32f83192170066c2da078f31d583c2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-28 08:43:14 +03:00
Alexandru Croitor
b3a0469100 CMake: Re-add Linux static config to keep build coverage
We want at least one config that ensures static host Qt builds
work in the CI, even if no tests are built.

Amends bead5e8720

Task-number: QTBUG-87580
Change-Id: I091e85ca40faef30ddad57e2a392d65197a47027
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2021-04-27 20:09:30 +02:00
Alexandru Croitor
bead5e8720 Build minimal subset of tests in desktop static builds
New cmake_platforms_static_tests.yaml file will be included in repos
that support building and running a minimal subset of tests built
against a static Qt.

Currently it's limited to qtbase.

Moved existing 'linux-SLES static' config into this new file and
also added a macOS and Windows config.

Skipped specifying the PostgreSQL lib path for Windows and macOS because
the plugin gets automatically linked into tst_moc, but the test build
phase doesn't actually call find_package for PostgreSQL and the build
system generation fails.

Similary skipped specifying the openssl lib location for macOS,
because the module_includes cmake auto test fails to find the
WrapOpenSSLHeaders package.

Explicitly tag iOS static config with DisableTests. The instructions
already skipped building tests for iOS, but it's better to be explicit
and update the instructions not to do that anymore.

Pick-to: 6.1
Task-number: QTBUG-87580
Change-Id: I0d38a0ad055c92646609202691aeb8db29689f5a
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2021-04-27 15:18:22 +02:00
Heikki Halmet
9e0334389b Provisioning: Fix nodejs installation
Pick-to: 6.1
Pick-to: 6.0
Pick-to: 5.15
Pick-to: 5.12
Task-number: QTBUG-93178
Change-Id: I27f4b1aa6f382cb6c9cc97f960fe1d0b81e47fbd
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-04-27 12:36:38 +03:00
Qt Submodule Update Bot
efe7e1f958 Update submodules on 'dev' in qt/qt5
Change-Id: Iabc6447679ee0bd1729c36457c6e5b585be9fcf4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-27 10:56:59 +03:00
Qt Submodule Update Bot
1da070930a Update submodules on 'dev' in qt/qt5
Change-Id: I99095f78c24e7e33390357962b60674139186403
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-27 05:06:11 +03:00
Qt Submodule Update Bot
e8dbbafd1d Update submodules on 'dev' in qt/qt5
Change-Id: I69ea8bbff2881cdcb0cb4776c8dfec950773c46d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-26 23:08:57 +03:00
Qt Submodule Update Bot
2b371b2920 Update submodules on 'dev' in qt/qt5
Change-Id: I6cd6e5bed9d386758d69877a090b272b1e27f007
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-26 15:56:01 +03:00
Heikki Halmet
0e9f489192 Provisioning: Upgrade OpenSSL version to 1.1.1k
Pick-to: 6.1
Pick-to: 6.0
Pick-to: 5.15
Pick-to: 5.12
Change-Id: I539d6da1953a40190fbfc8ff80f8e8332d797b1f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2021-04-26 12:56:01 +00:00
Heikki Halmet
2d47450e69 Provisioning: Fix gcc toolset source path
Pick-to: 6.1
Pick-to: 6.0
Change-Id: I4e81894648c25ce629914bc4bd9ffa65681ad004
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-04-26 13:10:14 +03:00
Qt Submodule Update Bot
d142a10dd5 Update submodules on 'dev' in qt/qt5
Change-Id: I2765de991ac8c2fed865506d44a3ca9eea2188b7
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-24 12:03:39 +03:00
Qt Submodule Update Bot
c9cc27815c Update submodules on 'dev' in qt/qt5
Change-Id: I02823722e7c8c24a682e8c8a63520ff0f69a64a2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-24 05:44:38 +03:00
Qt Submodule Update Bot
dcdc29133d Update submodules on 'dev' in qt/qt5
Change-Id: Ib358c3ed83afff5162f39f76a689e348bbb6d821
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-23 19:29:48 +03:00
Heikki Halmet
1ebec86732 Remove packaging flag from CentOS targets
This will also remove CentOS target under QtCreator
and RHEL's Insignificant flags from submodules

Task-number: QTQAINFRA-4416
Change-Id: I2e6d910dfbba7a7903b149f5cf0bc3386cd4e3e2
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-04-23 14:32:45 +03:00
Toni Saario
0d3d17d388 Add target arch for universal macOS target
This makes the field to reflect reality as otherwise it will be
resolved from the template and excludes the arm64.

Change-Id: I39972e47ba2a0ab9fe4322c844b60383187a762b
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2021-04-23 06:02:47 +00:00
Jani Heikkinen
5f38d6aa61 Update additional library sha1's to qt5.git
Change-Id: I92078b3664cee04c3ad9e96d02072933a21b904c
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2021-04-22 11:39:14 +03:00
Jani Heikkinen
e574441847 Drop unnecessary qttools dependency from m2m protocols
Change-Id: I5b8a169e4c96e76bc34806a8befdc83784106413
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
2021-04-22 11:39:14 +03:00
Jani Heikkinen
a8a17646ab Change all (except qtconnectivity) additional libraries to addons
It has been decided to *not* ship source-only Conan packages in Qt 6.1,
but revert back to delivering the additional libraries similarly as with
Qt 5.

That's why we need to switch all additional libraries to addon to start
building binaries for those as well in qt5.git integration.

qtconnectivity will be changed when QTBUG-92990 is fixed.

Task-number: QTBUG-91796
Change-Id: Ia154b62d5c1a997575d844aaf21f399a24626748
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
(cherry picked from commit 55874781a1)
2021-04-22 11:39:14 +03:00
Heikki Halmet
4e09a6db79 Provisioning: Remove mac certificates and signing tools
Those will be provided by Coin

Pick-to: 6.1
Pick-to: 6.0
Change-Id: Id38b99b11d8b7988d743fc8a302760c3286087ff
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-04-22 08:44:07 +03:00
Qt Submodule Update Bot
3062f5127d Update submodules on 'dev' in qt/qt5
Change-Id: I496885d1367ef141b14f45577fe01fb0a34c8eb6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-22 00:59:08 +03:00
Juha Vuolle
76e9d4bfbb Mark QtSensors as an addon
The QtSensors is headed to Qt 6.2 and initial cmake port has been merged

Task-number: QTBUG-92502
Change-Id: I9ff7062677040fd35d285373cca19515a0cb921f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-04-20 17:25:43 +03:00
Juha Vuolle
f690a5b5d7 Add coin platform config for QtSensors
QtSensors shall be released in Qt 6.2. The cmake port for the QtSensors
is in the making and initial version should be ready soon.

Task-number: QTBUG-92502
Change-Id: I0006d24447334474ae5578ce05a6dcb195e8ad49
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-04-20 16:25:40 +02:00
Toni Saario
02cc128cdc Enable macOS target on ARM HW on all modules
Change-Id: I3528a2bca79f20345926e61f3eef715fc63d84e8
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-04-20 17:25:36 +03:00
Alexandru Croitor
1306da8f92 macOS: Build universal Qt for macOS
Build a universal macOS targeting Intel x86_64 and Apple Silicon
arm64 using the fat library technique. It will be our new Packaging
configuration for macOS.

Rename the Id of the configuration to
'macos-latest-xcode-universal-packaging-build'.

x86_64 is the main config test architecture.

The arm64 slice of the Qt build lacks certain functionality:
 - no qdoc, lupdate, etc due to missing arm64 llvm packages
 - no postgresql and odbc sql plugins due to missing
   arm64 3rd party libraries
 - no openssl due to missing arm64 library
 - no JIT support in QtQml, due to limitations in the current fork
   of the javascript engine

Task-number: QTBUG-85447
Change-Id: If2a70f192a54d6f98137e05e5b938d118b6d1d1d
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2021-04-20 13:32:31 +02:00
Qt Submodule Update Bot
c9eba7d99f Update submodules on 'dev' in qt/qt5
Change-Id: I5768d7983e6c75a9be576ab91c8fdebe0367b836
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-20 14:32:14 +03:00
Heikki Halmet
aa5112af99 Add Red Hat 8.2 to CI
Red Hat 8.2 is the latest version with extended update
support. In the end Red Hat 8.2 will replace CentOS 8.3

Task-number: QTQAINFRA-4322
Change-Id: Iaa2ef452e7e6608349ba7438bbc5d25ddb35fa2a
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-04-20 08:38:20 +03:00
Johanna Äijälä
03821e82a5 Provisioning: Fix Squish for Qt6 on macOS
Add correct Squish package to the 'squish_for_qt6' location.

Pick-to:6.1
Pick-to:6.0

Change-Id: Ib997092a5d6350d9b7298d7cc8baf5a2afaca702
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-04-20 04:44:11 +00:00
Qt Submodule Update Bot
2737415067 Update submodules on 'dev' in qt/qt5
Change-Id: I6ab6399438dca0ad9e1957e0055159a069912e4e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-20 05:09:23 +03:00
Qt Submodule Update Bot
f3fafc2591 Update submodules on 'dev' in qt/qt5
Change-Id: I3ee4027abb4f1571ce9a66a4c7e8beebccdf68ef
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-19 21:04:53 +03:00
Heikki Halmet
9200ee7384 Provisioning: Upgrade MSVC 2019 version to 16.9.4
Pick-to: 6.1
Pick-to: 6.1.0
Pick-to: 6.0
Task-number: QTQAINFRA-4117
Change-Id: Iefb5c8b97b3f56d9cdb358dbbf70d4c9de1b7d1b
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-04-19 13:01:38 +03:00
Heikki Halmet
a4b61379ca Provisioning: Resize ulimit value for open files
Linker for Qt Webengine builds needs to open multiple files.
Without this it will hit the limit

Pick-to: 6.1
Pick-to: 6.1.0
Pick-to: 6.0
Task-number: COIN-699
Change-Id: I53b8c38a4f719714971ca6a4b65349716a873170
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-04-19 13:01:22 +03:00
Qt Submodule Update Bot
e468db267a Update submodules on 'dev' in qt/qt5
Change-Id: I0c79807c5172b19ea9698c3c85ef41d3b8d1c170
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-16 20:52:15 +03:00
Alexandru Croitor
002b6f075c CMake: Use qtbase's version as the top-level project version
This avoids the need to bump the qt5.git project version when
branching the next minor Qt version.

Pick-to: 6.1 6.0
Task-number: QTBUG-92861
Change-Id: Ib20ab614caefece00bd9e0172d9269077239ba6a
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2021-04-15 13:27:10 +02:00
Qt Submodule Update Bot
cfd7838615 Update submodules on 'dev' in qt/qt5
Change-Id: Ic52240c1f49a55a0bff0f01965dc942dbde8cc4d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-15 07:31:36 +03:00
Qt Submodule Update Bot
29f45fdb25 Update submodules on 'dev' in qt/qt5
Change-Id: I081ea134beb3d1f4ca3abfeee9b6cbe620860e8a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-14 14:43:51 +03:00
Jani Heikkinen
bba6c1bd70 Revert "Add qttools as additional dependency to additional libraries"
This reverts commit 919aa17249.

Reason for revert: additional libraries will be part of qt5.git build -> we don't need to have qttools as dependency there anymore

Change-Id: If77278c030be961d2282ff5c049d5ec6b03a578b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
2021-04-14 09:19:30 +00:00
Qt Submodule Update Bot
7a7c685f3b Update submodules on 'dev' in qt/qt5
Change-Id: I62923f0c4d5f70d57a709c787052a1cb7109e958
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-14 06:24:19 +03:00
Qt Submodule Update Bot
7193f979a9 Update submodules on 'dev' in qt/qt5
Change-Id: Ic5526cfb4a09bb2a36e524c817a8513a30fe34f7
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-13 22:27:59 +03:00
Assam Boudjelthia
53fc7d424d Update NDK to r22b
Qt quick 3D apps crash because of a bug caused by NDK r21
https://github.com/android/ndk/issues/1148, NDK r22b solves
the problem.

Pick-to: 6.1 6.1.0
Task-number: QTBUG-91782
Task-number: QTBUG-92075
Change-Id: I92098c26f3bd9fcfc342ced42c9a81f1e34af8d6
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-04-13 12:19:04 +00:00
Heikki Halmet
ca14882321 Provisioning: Install prebuilt OpenSSL Android
OpenSSL 1.1.1 can't be build against Android NDK 22. Current OpenSSL
prebuilt was made against NDK 21.

Pick-to: 6.1.0
Pick-to: 6.1
Task-number: QTBUG-92075
Change-Id: I0e8a3017a9482ef269d736a8702b29b6bec1c2b2
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2021-04-13 12:19:04 +00:00
Tor Arne Vestbø
4a9d291ca6 Cache list of submodules
Otherwise running cmake with QT_BUILD_SUBMODULES set in the environment
would not persist for later cmake runs without the environment set,
resulting in trying to reconfigure with every single available module.

Change-Id: I85e57b16fdc8e51cae8fff083c7a7536b0ed16f1
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-04-13 14:19:04 +02:00
Heikki Halmet
027f8ccb08 Provisioning: Add Vulkan installation for Ubuntu 20.04
Vulkan is needed by examples

Pick-to: 6.1
Pick-to: 6.1.0
Pick-to: 6.0
Task-number: QTBUG-92545
Change-Id: I2f814e452c88c04919b26eb42e90bac18356bbe7
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
2021-04-13 10:02:22 +00:00
Qt Submodule Update Bot
546c9fb3c1 Update submodules on 'dev' in qt/qt5
Change-Id: I0a0c782c38eccf3bc83e8c4372011a7f366c0f80
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-13 10:34:06 +03:00
Toni Saario
00069e6eaa Add a ARM64 macOS target
This patch adds a macOS target that is run on the ARM64 macs.

Task-number: QTQAINFRA-4012
Change-Id: I255a288551846ae3328f614b64668fdc5ede2391
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-04-13 09:34:00 +03:00
Qt Submodule Update Bot
00e5688e28 Update submodules on 'dev' in qt/qt5
Change-Id: I901b17a762cfaee88c47a6125b23f761ad5a7b93
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-13 06:20:10 +03:00
Matti Paaso
2140c07299 Fix qt-creator license check
Pick-to: 6.1
Change-Id: I7c9df1313075294ddfbfa8ceb14be267eacc3d2b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-04-12 07:21:29 +00:00
Toni Saario
32579bc3c4 Add conan to path
Pick-to: 6.1
Change-Id: I90e028409f606a703fd9b567a221f3f946f11d61
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-04-12 06:49:25 +00:00
Toni Saario
3802e21afe Enable conan revisions mode
Pick-to: 6.1
Change-Id: I0fb9d6943cf0e6e54f631314a67348f703c31e41
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-04-12 06:49:23 +00:00
Toni Saario
7381cbeca8 Update windows git version
Older git version does not allow fetching specific revisions.
This makes it impossible to fetch the integrations revision of
the repository.

Pick-to: 6.1
Change-Id: I513b0d1abb097d139f730ef0cdf2577b9d02e9f8
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-04-12 06:49:22 +00:00
Toni Saario
f83567b7f5 Provision conan on ubuntu 18 and macos 11
Pick-to: 6.1
Change-Id: Ie11e8bb2b39acd3ab6229cb211c37500cbb7ed77
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-04-12 06:49:19 +00:00
Heikki Halmet
26c97222c1 Provisioning: Install Nodejs using pkg instead of Brew
Openssl is one of Nodejs dependencies when installing it via
Homebrew which is causing issues with actual openssl source build during
provisioning

Pick-to: 6.1
Pick-to: 6.0
Pick-to: 6.1.0
Pick-to: 5.12
Task-number: QTQAINFRA-4402
Change-Id: I711c0f2bb7faebb3e5cbe2f415f34b2ac2d38a66
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-04-11 15:28:55 +00:00
Jani Heikkinen
9980240e33 Drop Ubuntu 18.04 target from qtbase.yaml as well
Pick-to: 6.1
Change-Id: I033d8aa10b69a110fb1f51fd0620deba7ac559a9
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-04-09 14:42:15 +03:00
Jani Heikkinen
7a8094dc9d Drop unnecessary ci and packaging configurations
- Drop Ubuntu 18.04 from CI; we aren't supporting it as development host
in Qt6. And we aren't using its prebuild binaries anywhere
- Drop 'Packaging' feature from QNX builds; we aren't packaging those
- Drop 'Packaging' feature from openSUSE builds; we aren't packaging those

Pick-to: 6.1
Change-Id: Ic5c6e0e1c480946380cbcf4b01133caffe7a71e0
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-04-09 10:42:15 +03:00
Matti Paaso
9ad3578bc2 Add qt-creator platform configurations
Pick-to: 6.1
Task-number: COIN-491
Change-Id: I18b70a7157931f9fe0d42abf71f1bab6de6199c3
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2021-04-09 05:07:57 +00:00
Qt Submodule Update Bot
b3db9e5263 Update submodules on 'dev' in qt/qt5
Change-Id: I7ade10e3498aeaf121d1da1a066ceda3a0d05669
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-09 05:26:11 +03:00
Qt Submodule Update Bot
453ba56e32 Update submodules on 'dev' in qt/qt5
Change-Id: I9ee482e880e8e3d44a7b2c273b15156df0badda9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-08 23:53:26 +03:00
Marianne Yrjänä
50962fb204 Make QNX builds significant
All components now pass QNX builds so they can be made significant.
Old QNX6.6 removed from provisioning.

Task-number: QTQAINFRA-4286
Pick-to: 6.1
Change-Id: Idb6abcc1d61030e1edba9467044fe59d17ee9d82
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-04-08 20:55:04 +02:00
Qt Submodule Update Bot
a2372433e7 Update submodules on 'dev' in qt/qt5
Change-Id: Iea10f45a41e3e781ab954ad0b779e0be62b83d1e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-08 17:07:55 +03:00
Toni Saario
6f4acb8746 Disable sccache on QNX targets
There appears to be issues with sccache on q++/qcc compiler that
lead tha false positive cache hit and build failures.

Task-number: QTQAINFRA-4391
Pick-to: 6.1
Change-Id: I84f38242e6de4094933300bd535686206c849960
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-04-08 10:30:14 +00:00
Samuli Piippo
5fba592288 Remove old QNX provisionings
QNX 6.6 and 7.0 are not needed since they don't support Qt6.

Change-Id: I56d71bbebf421d1a5d952815878217b0bfdc85b2
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-04-08 07:18:50 +02:00
Heikki Halmet
c84925c512 Provisioning: Reset Time Zone for macOS 10.14
Setting Time Zone for macOS 10.14 seems to be flaky. Let's reset it. If
it still fails to set it then exit the script execution.

Task-number: QTBUG-92174
Change-Id: I07b28d0511d8fc097a1da43b78de9a5131f6bfa7
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit ba149a162b)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-04-06 04:36:07 +00:00
Heikki Halmet
61d69b068f Provisioning: Upgrade Xcode to version 11.3.1 for macOS 10.14
Xcode 11.3.1 is the latest supported version for macOS 10.14
It seems that in macOS 10.14 xip-package can't be expanded
through mount. It need to be fetched first.

Pick-to: 6.0
Pick-to: 6.1
Change-Id: I8c53787a2edde6b50abc7ec099ecc10b7515df2e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-04-06 06:36:01 +02:00
Qt Submodule Update Bot
a5c2a8655d Update submodules on 'dev' in qt/qt5
Change-Id: I76ef126ba99f51109bdcfe66316d5930355f8dce
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-06 06:31:44 +03:00
Qt Submodule Update Bot
fd1a836a6a Update submodules on 'dev' in qt/qt5
Change-Id: I45ce4cb8046a62d3c62445430c9c091579f67cd5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-02 03:17:51 +03:00
Qt Submodule Update Bot
6dea0af932 Update submodules on 'dev' in qt/qt5
Change-Id: Ide971d150a18a0f4a5e417806a0193ed60e34cf8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-01 23:48:24 +03:00
Qt Submodule Update Bot
e50abbb346 Update submodules on 'dev' in qt/qt5
Change-Id: I8590d46c07f2239de0a2ee0c3392271c8e7ead01
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-01 19:52:54 +03:00
Qt Submodule Update Bot
1333aec43d Update submodules on 'dev' in qt/qt5
Change-Id: Icb1d3320be25f12fa914f1d338221c98079bc38a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-01 13:57:15 +03:00
Joerg Bornemann
cdc79cdfb9 provisioning: Make generated .emscripten look more natural
The WASM CMake port of Qt reads .emscripten and parses its content to
locate the emscripten root. We must bring our generated .emscripten
closer to what emsdk generates to prevent the parser from choking.

Change-Id: I5d17fb7679627ab3a7145f539f5a911fd227a6ac
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
2021-04-01 09:05:20 +02:00
Qt Submodule Update Bot
3e2ba4d7bf Update submodules on 'dev' in qt/qt5
Change-Id: I3d86c1e7e616e54a3652a592e9a9a7f5a4b8fc99
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-01 07:17:04 +03:00
Qt Submodule Update Bot
19c21f1399 Update submodules on 'dev' in qt/qt5
Change-Id: I68e65f3507c0e5566e83a071c25ec816e5fa61e1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-01 02:35:17 +03:00
Qt Submodule Update Bot
1d02960ae1 Update submodules on 'dev' in qt/qt5
Change-Id: I443734e7439c4acf33e36cb8ac767ed56ccf2fa5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-03-31 20:18:07 +03:00
Qt Submodule Update Bot
278e0ce66e Update submodules on 'dev' in qt/qt5
Change-Id: Id4479eaf614d90dd13a6220dd3583a3e9f4246f7
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-03-31 14:27:13 +03:00
Kai Köhne
1397f8c123 Fix ignored submodules if a submodule does not have a dependency.yaml
If a subdirectory has a CMakeLists.txt file, but no dependency.yaml file
qt_internal_add_module_dependencies will bail out early, with
out_module_dependencies being empty.

Pick-to: 6.1
Fixes: QTBUG-92257
Change-Id: I024e812e9debd3c83b24bf306ff0375b2cb08659
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2021-03-31 10:56:39 +02:00
Tor Arne Vestbø
c746f27e17 cmake: Allow specifying list of submodules using environment
The variable now has a QT prefix to make it less likely to
clash with other environment variables. For simplicity we
use the same variable name internally.

Change-Id: I4c8b1a43ae1facc2e33ae3cd21a8f6b43a437a9b
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-03-30 13:19:56 +01:00
Alexandru Croitor
15e37e994d macOS: Don't specify OpenSSL path for macOS configurations
Currently the qtbase configure system always chooses to use
SecureTransport on macOS configurations, even if a usable OpenSSL is
found.
As it is, there's no point to pass the OpenSSL location as a
configure argument because one might get confused to think that Qt
will be built with OpenSSL support (it won't).

There is work in progress to allow building Qt Network with support
for multiple ssl backends, but until that work is finished, remove the
configure argument to avoid confusion.

Change-Id: Ib91f0b85edc580145a78ab38aba7718e90a95240
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-03-29 15:10:49 +01:00
Lorn Potter
46918ee092 wasm: fix linux node path
Change-Id: I445f5c44dfa4de4d1f0825c3218c7975780134b8
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-03-29 08:02:42 +00:00
Johanna Äijälä
02d4c34b7d Provisioning: update Squish packges
Still using unreleased custom snapshot packages from Froglogic.
macOS: use custom build Qt5.15 package with separate Squish server
adjusted for Qt6.

Pick-to: 6.1
Pick-to: 6.0
Change-Id: I8605204118015feb347268c335ef731ff99e3c68
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-03-28 16:31:34 +02:00
Heikki Halmet
066964d275 Provisioning: Install GCC toolset for CentOS
GCC toolset provides upgraded GCC version for CentOS.

Pick-to: 6.0
Pick-to: 6.1
Change-Id: Ia62c7abf21eeed5d65c6b2e35fe1013d839cfa24
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-03-26 07:53:38 +02:00
Heikki Halmet
7a027b4dfd Provisioning: Upgrade Xcode to version 12.4 for macOS 10.15 and 11.0
Pick-to: 6.0
Pick-to: 6.1
Task-number: QTQAINFRA-4230
Change-Id: Id3de8771e18da5d40cf62ad501a23fce89e845c4
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-03-26 05:53:25 +00:00
Paul Wicking
ed139ea47e Update documentation for init-repository
There's no mention of additionalLibrary status.

Pick-to: 6.1 6.0
Change-Id: I3ebf8fdc6dcfc01392b1ab5a42734cef81d6fc61
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2021-03-25 15:39:05 +01:00
Qt Submodule Update Bot
03c61efaed Update submodules on 'dev' in qt/qt5
Change-Id: I924b1429f816e1505a09183e736d32ad797465aa
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-03-24 09:09:46 +02:00
Qt Submodule Update Bot
d38d0ea0cf Update submodules on 'dev' in qt/qt5
Change-Id: I480f185647ff5944110b5fcd39ee8e96565198a2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-03-24 04:53:35 +02:00
Heikki Halmet
152a80ec1d Provisioning: Remove libclang from Windows 10 x86
Libclang static is not needed by Qt Creator. Also x86 package is not
available in download.qt.io or in cache.
Qt Creator is the only one using Windows 10 x86 at the moment.

Pick-to: 6.1
Change-Id: I983db655c497105c3154ab64b170a8ed8739a59c
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
2021-03-23 08:39:19 +02:00
Heikki Halmet
fb65f86083 Add Packaging target for openSUSE 15.2
With current approach we need to make two different linux installers.
One for SUSE and one for other linux targets we support. This is because
current CentOS version have newer GLIBC version than what we have in SUSE.
This means that installer made with CentOS won't work in SUSE versions
we support

Task-number: QTBUG-91873
Change-Id: If65d66093bf8dcb5fe46812e06d6b9194fdedac2
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-03-22 06:13:12 +00:00
Qt Submodule Update Bot
64a559a848 Update submodules on 'dev' in qt/qt5
Change-Id: I43fb1c9928f0a08594e8e1a231f32f470bffc8f1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-03-19 06:46:54 +02:00
Tor Arne Vestbø
eaed67d307 configure: Let shell deal with errexit and xtrace
Change-Id: I9ae6d6003885607d2300d4d84e8629d7891420db
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2021-03-18 12:45:24 +01:00
Qt Submodule Update Bot
c1f24b99db Update submodules on 'dev' in qt/qt5
Change-Id: Ic94b0d9938311e6390bbc9c16deb3c66285a4f84
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-03-18 08:50:48 +02:00
Toni Saario
823b0234c7 Fix emscripten windows sha1
The target has changed on the remote. This time it will be cached
on the ci-files01.

Change-Id: Ibff640f889aa55f322c11bcf6a4a4893fb41b234
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-03-17 12:33:38 +02:00
Qt Submodule Update Bot
3b35cf20bd Update submodules on 'dev' in qt/qt5
Change-Id: I8dab99b0d2a21d0029bca9cf1b38c85315bf7540
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-03-16 17:28:15 +02:00
Tor Arne Vestbø
4b194617a2 Remove qt.pro
Qt does no longer support being built with qmake.

Change-Id: I01598605b491e3c477553c6cc60118a9639b6dd0
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2021-03-16 11:15:08 +01:00
Qt Submodule Update Bot
644d718f92 Update submodules on 'dev' in qt/qt5
Change-Id: Ica26fc80bed66baaa566e8e294aaa517413527cc
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-03-15 08:45:39 +02:00
Laszlo Agocs
7ac5d86de5 Add qtshadertools as recommends dep to qtdeclarative
Change-Id: Ic0d11b3b1312a8d82f6c3421af51bdea2a692b40
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
2021-03-12 17:40:11 +01:00
Joerg Bornemann
a949aa5591 Remove unused TopologicalSort.cmake
Commit da25b7f149 removed the usage of
TopologicalSort.cmake. Remove that file and its associated attribution
data and license.

Change-Id: I2dd34764c4343ac9ae0ce6fdcff5adcc3b70d299
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-03-12 16:03:17 +01:00
Joerg Bornemann
81096b44bb Do not error out on missing optional repository dependencies
Read the 'required' value from dependencies.yaml and store all required
dependencies of repository 'qtfoo' in a global property
QT_REQUIRED_DEPS_FOR_qtfoo.

Check this property in the top-level CMakeLists.txt and only print
informational messages instead of errors for optional dependencies.

Fixes: QTBUG-91144
Change-Id: I0e1b84a70221857cebba1b9a27456ad3667bfe3a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-03-12 16:03:03 +01:00
Dominik Holland
174a511460 Enable all cmake targets for qtivi
Task-number: AUTOSUITE-1633
Change-Id: Iffbaaa1e5141f92d85b1daa80f3dbbdd0bc83bac
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-03-10 14:14:59 +01:00
Qt Submodule Update Bot
1938e370e9 Update submodules on 'dev' in qt/qt5
Change-Id: I661da92ce4c05377134c5dbd46ac479487e88fd0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-03-10 09:35:44 +02:00
Karsten Heimrich
baaca594ca Add QtSerialBus as additional library
This patch adds QtSerialBus to be updated by submodule udpate bot.

Change-Id: I9b51118d21ee4309315d36cab5bf9721b34067f7
Reviewed-by: Ivan Solovev <ivan.solovev@qt.io>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
2021-03-09 09:16:10 +01:00
Ivan Solovev
66e8759c66 Add QtLocation to addon modules
This patch adds QtLocation to be updated by submodule update bot.
Also removes unused dependencies.

Task-number: QTBUG-90864
Change-Id: Ia54234ad26907129932d76be11a3402cd8bddec9
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
2021-03-05 18:16:04 +01:00
Qt Submodule Update Bot
688615aa59 Update submodules on 'dev' in qt/qt5
Change-Id: I46198fa3f3a6a133ab9a08720b229446b3696cee
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-03-05 12:09:19 +02:00
Qt Submodule Update Bot
009a4a7d21 Update submodules on 'dev' in qt/qt5
Change-Id: If401533ab8648b6dcdf245677ec1968e8d1d6a3d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-03-05 07:35:18 +02:00
Ivan Solovev
c8981696df Add QtSerialPort as addon module
This patch adds QtSerialPort to be updated by submodule udpate bot

Task-number: QTBUG-90864
Change-Id: Ic029157a7b6e88f8c8899f9f5b075943d2767810
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
2021-03-04 09:46:01 +01:00
Heikki Halmet
8843f51866 Change GCC version to 8.3.0 for Ubuntu 18.04
We need to use gcc 8 instead of 9 so that the Qt installer
will work with CentOS 8.3 which have gcc 8 in the system.
If we use newer gcc version with the binaries there will be issues
with libstdc++.
Using gcc-toolset-9 in CentOS won't help either because it will link
libstdc++ against the one in system.

Pick-to: 6.1
Task-number: QTBUG-91352
Change-Id: I2a3d186bc04b1f54f14ed95f0588d18bd63814c4
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
2021-03-03 07:51:46 +02:00
Qt Submodule Update Bot
91dc70dba9 Update submodules on 'dev' in qt/qt5
Change-Id: Ib9683d8e6e1530d1df10704cd2c8663934532371
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-03-02 08:04:02 +02:00
Heikki Halmet
7d2e13da10 Provisioning: Remove squish script call under Windows 10 x86
RTA don't use squish with Windows 10 x86 in Qt6

Change-Id: Ib1c27e53310506f2c91ab8b65404caba8fcfcaf8
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 26bffd2fab)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-02-25 14:33:48 +00:00
Topi Reinio
8ebf0095c3 init-repository: Fix incorrect use of 'or' operator
This fixes the warning 'Useless use of a constant ("qt5") in void
context at ./init-repository line 649.'

Pick-to: 6.1 6.0 5.15
Change-Id: I12133b30b504e536eaf68e4260df5aed28543eb6
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2021-02-25 15:14:58 +01:00
Heikki Halmet
0a6511c1e7 Change configuration arguments for Ubuntu 18.04 to match CentOS target
We shouldn't change configuration parameters when whiching to use
Ubuntu 18.04 instead of CentOS 8.3

Pick-to: 6.1
Change-Id: Icfce35acec8baa4488089e555c311a063455c24b
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-02-25 08:41:24 +02:00
Qt Submodule Update Bot
ef50922df5 Update submodules on 'dev' in qt/qt5
Change-Id: Ideaffabe09bb7b9fe57db79c4090f8d1deac928e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-02-24 05:20:07 +02:00
Lorn Potter
7c26fecfaf Provisioning: Bump Emscripten version to 2.0.14
Change-Id: I6345cdc3ffef7f17fa75406a3816d1b59451a05a
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
2021-02-24 09:10:08 +10:00
Qt Submodule Update Bot
b5f60885e5 Update submodules on 'dev' in qt/qt5
Change-Id: Icda990c681e1ba746c0d29a8904aa36893650e11
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-02-23 03:27:57 +02:00
Samuli Piippo
b6c8b8f470 Make QEMU builds significant
All tests pass, remove InsignificantTests from QEMU builds.

Task-number: QTBUG-86238
Pick-to: 6.1
Change-Id: Ia3d2b9ef3ce06cbdf67c99bcbe64f36f7bbdb1ec
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-02-22 10:09:49 +02:00
Heikki Halmet
c8a55fece5 New images with accessibility for squish for macOS 10.15 and 11.0
Pick-to: 6.1
Task-number: QTQAINFRA-3559
Change-Id: I9a9d4c4f01f883c83adbd097d8045012e198c4fe
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-02-22 07:20:02 +00:00
Qt Submodule Update Bot
63714587d1 Update submodules on 'dev' in qt/qt5
Change-Id: Ia53290df5328114f63a041d99d37b2cb52e8eb12
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-02-20 08:37:26 +02:00
Qt Submodule Update Bot
282ede27ff Update submodules on 'dev' in qt/qt5
Change-Id: I636964d279e2e1e777842c8fa41e8a4d6b116ae5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-02-20 04:53:58 +02:00
Qt Submodule Update Bot
73c6f378a0 Update submodules on 'dev' in qt/qt5
Change-Id: I011f614855d4278e7c2fbbc4752ea0d84cb8625e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-02-19 22:54:15 +02:00
Qt Submodule Update Bot
9278f5b56b Update submodules on 'dev' in qt/qt5
Change-Id: I0da0b9b0a50449f3795e84a97a74e9e9bacc2eab
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-02-19 16:22:14 +02:00
Andreas Buhr
f730c5b88d Add QtConnectivity and QtAndroidExtras to addon modules
To have QtAndroidExtras and QtConnectivity updated by
submodule update bot, this patch marks both of them as
addon instead of ignore.

Change-Id: Ibf34848978ef1f39273f71c99c6b1f7e18bf2fe6
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-02-19 13:40:51 +01:00
Samuli Piippo
7b3e2f369d Update platform configs for qdb
Use cmake platforms to build qdb.

Pick-to: 6.1
Change-Id: I9d7e452bf70699799527ea38c97ec64a8fa0fc10
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-02-19 04:43:46 +00:00
Samuli Piippo
cd888a07fe Add platform configs for qtdeviceutilities
Pick-to: 6.1
Change-Id: Ica3aa46e3302dc9b46c64bbef222e3e958f56a35
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-02-19 04:43:38 +00:00
Heikki Halmet
3444b91634 Provisioning: Disable RunTime broker
On some cases RunTime broker might eat huge amount of CPU

Pick-to: 6.1
Pick-to: 5.15
Pick-to: 5.12
Change-Id: Ie01b4e1a48e2f9e7e0deb9970160ffc92854d79b
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-02-18 07:48:56 +02:00
Heikki Halmet
36f1125927 Add Insignificant flag for qtbase Android target with Ubuntu 18.04
Can't start emulator with Ubuntu 18.04

Pick-to: 6.1
Task-number: QTBUG-91180
Change-Id: I33bbbe47d3f0861778b295ccf797b5a99a99c58a
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-02-17 13:25:13 +02:00
Tor Arne Vestbø
56e4095765 coin: Make macOS 11 packaging and developer build tests significant
All tests should pass now.

Change-Id: Iaa4c21d86ef9d6c733ea10b81feb0b26a6b6e8ca
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-02-17 11:24:30 +01:00
Qt Submodule Update Bot
c508f4f506 Update submodules on 'dev' in qt/qt5
Change-Id: I87ed11e8badff75b7a625a7655b9025896183e51
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-02-17 06:28:29 +02:00
Tor Arne Vestbø
2e9951ff03 coin: Make macOS 10.15 packaging and developer-build tests significant
All tests should pass now. The ones that may turn up are flaky,
and should be blacklisted.

Fixes: QTQAINFRA-4116
Change-Id: I1a57227d544bfb2db812b92ddf8616764e424c33
Reviewed-by: Simo Fält <simo.falt@qt.io>
2021-02-16 19:13:16 +01:00
Qt Submodule Update Bot
58b1dbbc2f Update submodules on 'dev' in qt/qt5
Change-Id: I0424c407688da27a819dbd23902d63561c77c71b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-02-16 18:42:38 +02:00
Heikki Halmet
b64b4b169e Add Ubuntu 18.04 for Qt6 binary packages
We need to start using Ubuntu 18.04 with Qt6 binary package
targets. Ubuntu 18.04 includes older GLIBC version which
shouldn't cause any problems with linux distributions supported
by Qt6

Tests will be executed with Ubuntu 20.04.

Task-number: QTQAINFRA-4193
Change-Id: Icb189c509351ff080a2c6431299cc0be6ba8adc1
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-02-16 08:18:52 +01:00
Qt Submodule Update Bot
49b08bef3f Update submodules on 'dev' in qt/qt5
Change-Id: I547975c463030a6605383227a3c5a3d8e45f3aa8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-02-13 08:59:45 +02:00
Qt Submodule Update Bot
8e1b21ec77 Update submodules on 'dev' in qt/qt5
Change-Id: I6cd0964af8f87fa66545f02970fbbc8d1fe0b798
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-02-13 05:16:48 +02:00
Qt Submodule Update Bot
64f867b935 Update submodules on 'dev' in qt/qt5
Change-Id: Ic16ac63f949886d3fc014deb4bc43a4d332456b1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-02-13 00:56:09 +02:00
Qt Submodule Update Bot
64a38f62f4 Update submodules on 'dev' in qt/qt5
Change-Id: Ic6a62da04b699f1c0935a9cac58b0bca5f3fb689
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-02-12 12:03:15 +02:00
Heikki Halmet
ee5f8fa6cb Provisioning. Set Wayland enable as false for CentOS 8.3
In CentOS 8.3 seems to be bug with setting Wayland instead of x-session.

Task-number: QTQAINFRA-4246
Pick-to: 6.1
Change-Id: I1099ca7ef5425f7383ab8a2e9988efeb42a858e8
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-02-12 07:23:00 +02:00
Topi Reinio
6f7f1cd550 init-repository: Allow 'tqtc-' prefix for qt5 repository
Pick-to: 6.1 6.0 5.15
Change-Id: Ic4b14e4e6efd43e54a241000e090981ce8b6c651
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2021-02-11 09:35:59 +01:00
Qt Submodule Update Bot
389b911400 Update submodules on 'dev' in qt/qt5
Change-Id: I78cccca518359ff9bd7f0f5d38fdc05e766f240c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-02-11 04:59:15 +02:00
Qt Submodule Update Bot
28de2d9c2d Update submodules on 'dev' in qt/qt5
Change-Id: If90dba9866451267c235754cdce0898fff6d2982
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-02-10 21:21:10 +02:00
Qt Submodule Update Bot
a315e8c589 Update submodules on 'dev' in qt/qt5
Change-Id: Ic8425134c1b164a960e8ff2249625a6dee70dbf7
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-02-10 10:15:53 +02:00
Qt Submodule Update Bot
e02e2a445b Update submodules on 'dev' in qt/qt5
Change-Id: I2e7769e10d7f3429f24efa8c29e29a395ab4ea4c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-02-10 03:12:40 +02:00
Qt Submodule Update Bot
19b79edbbe Update submodules on 'dev' in qt/qt5
Change-Id: I915d5c6e8897166f296888570cedde6866669c94
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-02-09 20:40:02 +02:00
Qt Submodule Update Bot
421f03ffd2 Update submodules on 'dev' in qt/qt5
Change-Id: Id07a0afa1b405a1c413ed82472c79f5abf1dd946
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-02-09 11:36:11 +02:00
Paul Wicking
414165e366 Fix init-repository
Introducing additionalLibrary to .gitmodules
broke init-repository. Add the new state also
here.

Task-number: QTBUG-90669
Pick-to: 6.1
Change-Id: I3ac9960427ef2fd8fe39b508b69459f4fcf81ca7
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
2021-02-09 06:43:18 +01:00
Qt Submodule Update Bot
a36ec0c66b Update submodules on 'dev' in qt/qt5
Change-Id: I5dfeca1d8b8bed8b0978a0d14da3c4c8d8c35267
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-02-09 00:21:48 +02:00
Marianne Yrjänä
036729ed05 Add QNX7.1 to CI
Task-number: QTQAINFRA-3768
Change-Id: I9c0aa78fad9c6a1263e75b06fa954c335f4b6ec2
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-02-08 19:32:25 +02:00
Tor Arne Vestbø
100cfb3310 coin: Write provisioning environment variables to ~/.zshrc as well
The default shell on macOS 10.15+ changed to zsh, so we need to ensure
the environment variables are picked up by that as well.

Change-Id: Ib8c8d8017c0d22fdbbf429936876824d386d4f4c
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-02-08 11:29:32 +01:00
Jani Heikkinen
919aa17249 Add qttools as additional dependency to additional libraries
qttools is needed to be able to build documentation

Pick-to: 6.1
Fixes: QTBUG-90996
Change-Id: I27f101dc4294f830b9915e1530d660cfe12aeabe
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-02-08 09:08:32 +02:00
Jani Heikkinen
dba2b570b9 Add Qt 6.1.0 Additional libraries
Set status to additionalLibrary to ones already in .gitmodules as ignore status
Add missing ones with status = additionalLibrary

Task-number: QTBUG-90669
Pick-to: 6.1
Change-Id: I5f7518c516d10ae68fb5cf20851b36bde4fbc0b2
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-02-07 12:14:27 +02:00
Tor Arne Vestbø
4ad4befe4e coin: Set up region and language settings on macOS to match United States
The tst_qlocale::macDefaultLocale() test was failing on macOS 11 because
the VM images had been set up with Finland as the region, resulting in
a different number separator than what the test expected.

Fixes: QTBUG-90696
Change-Id: Ia2f68adc1401f21721d1786c5279aa0918a311a8
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2021-02-05 17:49:51 +00:00
Toni Saario
db7926c715 Disable network LSO/TSO on linux and macOS VMs
LSO/TSO causes problems handling network packets and deteriorates the
network speed to below 1MB/s.

Task-number: QTQAINFRA-4241
Change-Id: Ib999035668eefe51d59715c9a18f42c9e3dfdf21
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-02-05 17:49:51 +00:00
Cristian Adam
d3406fedd1 Update QDoc libclang to 11.0
Pick-to: 6.1
Change-Id: I1cc74a1efb702d32d99749ec681e37345579c5b7
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
2021-02-05 18:49:51 +01:00
Qt Submodule Update Bot
09391e9e63 Update submodules on 'dev' in qt/qt5
Change-Id: Ida99d55ecae481e2f4613a0e1c2c30af36366755
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-02-04 14:47:53 +02:00
Heikki Halmet
a3c798e76a Provisioning: Disable multicast advertisements
To get rid of the computer name notification multicat
advertisements needs to be disabled. This notification seems to
affect to autotest by causing misleading failures.

Task-number: QTBUG-89746
Pick-to: 6.0
Change-Id: I2365092ee05cc731b78e17c56eee7c4370a9f0a7
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-02-03 12:02:14 +02:00
Johanna Äijälä
d86303a561 Provisioning: Update Squish for Qt6
These are snapshot packages from Froglogic, not available for macOS yet,
thus it will still use Qt5.15 based Squish. Only Linux and Win packages
are updated now.
Along with the Squish for Qt6 we need the Squish for Qt5 to be able to
run Creator tests (since Creator is still Qt5 based).

Change-Id: Iec0294e1de036db004633ee6b95e1e68a6dd23a5
Pick-to: 6.0
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-02-02 07:38:13 +02:00
Joerg Bornemann
c45c7617f6 Fix missing .qch files when building documentation in the CI
We need to build the target "docs", not "generate_docs". The latter only
creates html documentation.

Creating .qch files is done with qhelpgenerator, and qhelpgenerator
needs proper platform plugins and the sqlite plugin. To keep things
simple, we build all the platform plugins and SQL plugins.

Fixes: COIN-659
Change-Id: Ief8f71f27836e7667e3a96e0b2654bdd45647ed4
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-02-01 21:14:16 +01:00
Qt Submodule Update Bot
ca70f218e0 Update submodules on 'dev' in qt/qt5
Change-Id: I2b24cd357a952ae173719dc12566c7eaf27fb219
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-02-01 18:46:47 +02:00
Heikki Halmet
e6ecc001f6 Replace CentOS 8.1 with CentOS 8.3 in CI
Task-number: QTQAINFRA-3964
Change-Id: I368e59867e8061ed25d4d3f10de7e995e56bd676
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-02-01 15:23:31 +02:00
Jani Heikkinen
268283a7c5 Enable all cmake targets for qtdatavis3d
Task-number: QTBUG-90428
Change-Id: I36dee95a407d9b16dce8af326e581d47a0e69d8e
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-01-29 12:33:26 +02:00
Heikki Halmet
1d9d454474 Add --ignore-signature to ICC installation also for openSUSE 15.2
This was missing from fea422c0a6

Task-number: QTQAINFRA-4174
Change-Id: Id829e4a1ccc23890ed53618c8a5c200b1dda8100
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-01-26 14:15:15 +02:00
Heikki Halmet
e67fa087db Provisioning: Install Conan package manager
Conan package manager is need for addtional libraries

Task-number: QTQAINFRA-4190
Change-Id: I5cb07a137505f15d536989c6d5127f607735a17e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-01-26 14:15:15 +02:00
Volker Hilsheimer
6531f112e4 Enable Qt Lottie in Coin
Fixes: QTBUG-89970
Change-Id: Ia4bb20bff62bbe1ab1da9500c0783493408a1f22
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-01-26 09:13:17 +01:00
Oliver Wolff
7af7a89d4e Add CMake platform config for qtactiveqt
Task-number: QTBUG-90417
Change-Id: I67d511b6b7bfc8aaec4361b68dbd3c852494981d
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-01-26 07:02:41 +01:00
Heikki Halmet
6d20944daf Provisioning: get-pip.py address changed for python 2.7
For python27 get-pip file's location has been changed and we
need to use two different get-pip files for different python
versions.
Let's also cache these python files and use cache as primary
url.

Pick-to: 6.0
Pick-to: 5.15
Pick-to: 5.12
Task-number: QTQAINFRA-4210
Change-Id: Iebc00f6f319bb914f7548d4737e13fed9ac2b292
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-01-24 22:44:24 +02:00
Toni Saario
f4fa7d40fe Update iOS platform dependency
Change-Id: I91b2807861027542f3208cc9a1ac2fcf9b6300d7
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-01-23 15:52:22 +02:00
Toni Saario
66ead0a685 Update macOS android targets platform dependency
Change-Id: I4dcedfe812178d2ce01f3fa35c5f0e24e01c60f8
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-01-23 15:52:09 +02:00
Toni Saario
b57b2358cb macOS: Split building and testing stages
We now build with the latest Xcode available, and then run the tests
on all the supported deployment target (10.14, 10.15, 11).

At this point we have the following build/test coverage:

  - Packaging build, all modules tested on:
    - 10.14 (significant)
    - 10.15 (insignificant)
    - 11.x (insignificant)

  - Developer build, qtbase/declarative tested on:
    - 10.14 (significant)
    - 10.15 (insignificant)
    - 11.x (insignificant)

Change-Id: I309bbf5ace7b22b768203f579e29f7a9e2b589b9
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-01-23 14:51:46 +01:00
Andreas Buhr
b22c2c5757 Add qtserialbus cmake platform config
Task-number: QTBUG-90399
Change-Id: Ic472def797af69d6050f7eb1df9f4dd6c9c6a870
Reviewed-by: Juha Vuolle <juha.vuolle@insta.fi>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-01-22 18:37:11 +01:00
Simo Fält
c149644775 Provisioning: Install dynamic libclang to macOS 10.15
Pick-to: 6.0
Change-Id: I8e0917b15eba79e3a616a096722f68088859f0c7
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-01-22 16:25:56 +02:00
Simo Fält
31e212d12f Provisioning: Install dynamic libclang to macOS 11
Change-Id: I27a6ed1e230ae71b339d0198be07469db3b1bf32
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-01-22 16:25:56 +02:00
Heikki Halmet
f6b0b21ba2 Add Big Sur macOS 11.0 to CI
Only one target is added because current HW capasity is minor.

Task-number: QTQAINFRA-3967
Change-Id: Iae2ac0e02b38b45a219a78e046fb21338ff9cd97
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-01-22 10:35:11 +02:00
Juha Vuolle
d538d7a2ef Add qtscxml cmake platform config
Task-number: QTBUG-89828
Change-Id: Idee8c678d64e47c613fa7035faa9a2c4880b9a2a
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-01-21 16:45:18 +02:00
Tony Sarajärvi
5162bcdffb Update qdb to build on 10.14 and remove 10.13 scripts
Change-Id: I6533ae5a674961b39978d5b716cbe6a176a0c564
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-01-21 10:34:14 +00:00
Tony Sarajärvi
94dd55aaea Remove needless target from CI
Change-Id: I8d55018c0a5485d7063abada5df21b319aac849e
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-01-21 10:34:09 +00:00
Ivan Solovev
0e99350c54 Coin: enable QtLocation build in the CI
Task-number: QTBUG-89854
Change-Id: I14d6563be5c6749f5bcb78d58e34d7ae49cd4ab3
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
2021-01-21 09:45:48 +01:00
Heikki Halmet
8c32c1dcd7 Provisioning: Add libclang packages to cache
Both static and dynamic libclang packages are missing from our local
cache. Dynamic and static packages need to be in different folders
because package names are identicals

Pick-to: 6.0
Pick-to: 5.15
Change-Id: I0d4c0c776f1c5f318417cae6c16d683b31a10710
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-01-21 08:47:49 +02:00
Heikki Halmet
fea422c0a6 Provisioning: Add --ignore-signature to ICC installation
ICC installation fails when checking digital signature

Task-number: QTQAINFRA-4174
Change-Id: Idcbca27a852abbd0824938f825807121a4f60c3e
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit d238c03742)
2021-01-21 08:47:47 +02:00
Tor Arne Vestbø
7b68a0021f coin: Don't pass macOS SDK sysroot to configure
It's handled by the provisioning scripts that install Xcode and make
it the default via xcode-select --switch.

Change-Id: I788a3672f554112517619f55d5cc810351c56bff
Reviewed-by: Simo Fält <simo.falt@qt.io>
2021-01-19 11:08:40 +01:00
Tor Arne Vestbø
cad93542fd coin: Don't pass macOS deployment target to configure
It's handled automatically by the build system, and set to the
lowest macOS version Qt supports at any point in time.

Change-Id: I7dc7b9f7fe5961ad4d4383590077d7990a84f850
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2021-01-19 11:08:38 +01:00
Qt Submodule Update Bot
9ab5968c18 Update submodules on 'dev' in qt/qt5
Change-Id: Idbab19a0c3f0a211fa7b023f98f6d0d55ec979a7
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-01-18 15:53:19 +02:00
Samuli Piippo
ca8a34f687 QEMU: update toolchains
Update yocto toolchains and use qemu from the toolchain.
Using GCC 10.2.0 and QEMU 5.1.0

Task-number: QTQAINFRA-3836
Task-number: QTQAINFRA-3741
Task-number: QTBUG-84167
Change-Id: I5bfa2c67100299c1c910cae2453b93dbc37cbb55
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2021-01-18 11:26:11 +02:00
Qt Submodule Update Bot
78f7193bdd Update submodules on 'dev' in qt/qt5
Change-Id: I25ab09e198e3827ffaa344c4cd1094e9f28a83f4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-01-18 11:07:48 +02:00
Qt Submodule Update Bot
5c8ed2840e Update submodules on 'dev' in qt/qt5
Change-Id: I41b2407339b4995bd9fa6e4af20b487926165f85
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-01-18 07:47:11 +02:00
Qt Submodule Update Bot
3dc9568df5 Update submodules on 'dev' in qt/qt5
Change-Id: Ie85c736a9f8870fbf92cc14983724ce8eabd3f44
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-01-15 16:28:03 +02:00
Karsten Heimrich
665dfa1706 Add qtserialport cmake platform config, update submodule
Task-number: QTBUG-89878
Change-Id: I054fee8d4c874ea7d31238bd4f13083bede3d379
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2021-01-15 14:16:07 +01:00
Heikki Halmet
25dbd78d3f Provisioning: Use prebuilt Android openssl if available
Android openssl configuration is flaky. Some cases it can't find perl.
Let's use prebuilt package from local cache. If not available then
download sources and configure it.

Pick-to: 6.0
Pick-to: 5.15
Pick-to: 5.12
Task-number: QTQAINFRA-3993
Change-Id: I4b15cba763d88d85dfe7908fa22c2ce5f461f5cc
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-01-15 13:40:46 +02:00
Johanna Äijälä
af8f88606a Add tqtc-qt-rta.yaml for RTA
Needed for coin_cloner to be able to create virtual machines for
macOS10.15 targets in RTA tests.

Pick-to: 6.0
Change-Id: I499a54a249a8295e014d7fa08bc32284dc8c73a3
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
2021-01-13 16:34:46 +02:00
Assam Boudjelthia
68e2872e50 Add qtspeech cmake platform config
Change-Id: I97fca6c6e2bbcebdb25ad7075a51288ed7d6ee9d
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2021-01-13 13:07:08 +02:00
Kai Köhne
fac571494b Make README a proper Markdown file
It was already using Markdown-alike syntax. Let's just go the full length,
and make it a proper Markdown file.

Change-Id: I6b0dcbc9118e9b31aebef30db85a244a100f6eff
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2021-01-13 08:53:39 +01:00
Qt Submodule Update Bot
51cc4bd531 Update submodules on 'dev' in qt/qt5
Change-Id: I2fd0421704b1c26c911321a64916d5e467e1a9ec
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-01-12 11:35:17 +02:00
Assam Boudjelthia
c657dbee63 Revert "Mark Android test config as InsignificantTests"
This reverts commit b8ae74d78a.

Reason for revert: Emulator startup issue is fixed now with
86a655387c26cd25dde69cebd18b5ff9379fbe3e.

Pick-to: 6.0
Change-Id: Id5d8f4db7bfcf194076385c6271bb324c126e268
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-01-12 08:47:05 +00:00
Qt Submodule Update Bot
3b8341006f Update submodules on 'dev' in qt/qt5
Change-Id: I6de32f17461ab48ba98466a25e74b4b2c9ec324a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-01-12 09:21:00 +02:00
Qt Submodule Update Bot
7994e5fee0 Update submodules on 'dev' in qt/qt5
Change-Id: I18c01f0aaf735ff2beb490b539ff995f0c1a8429
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-01-12 05:24:12 +02:00
Joerg Bornemann
d42ba5289c Update README for Qt6
Fixes: QTBUG-89912
Change-Id: I9e96d57d0de8eb3c10fdfa762a009e30aab93e87
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
2021-01-08 14:41:12 +01:00
Joerg Bornemann
2ade76fecd Remove qtdocgallery
It's dead, Jim.

This revives 1117d4da2c which was reverted
in 66ed87fc67 to make a resurrection
easier. However, there was no revival attempt for many years now, and
it's unlikely that this is going to change.

Pick-to: 6.0 5.15
Task-number: QTBUG-89664
Change-Id: I55134f407ec870ab25824e352ac77bff28a5f0f0
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2021-01-08 11:54:51 +01:00
Heikki Halmet
a4d03dbc19 Provisioning: Upgrade Xcode and Command Line Tools to version 12.3
Xcode 12.3 is currently supported in macOS 10.15.4 and 11.1

Task-number: QTQAINFRA-3962
Change-Id: Id919e63cd792e4c35b4bb625a574009fd044f440
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-01-08 12:06:21 +02:00
Eskil Abrahamsen Blomfeldt
9be91e74a4 Add Qt Declarative as requirement for Qt 5 Compat
Since Qt 5 Compat now also includes Qt Graphical Effects,
it depends on this repository.

Change-Id: I5f55958d774e17434946470fd7dc65bb305805c3
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2021-01-08 08:47:55 +01:00
Qt Submodule Update Bot
301ddcc75c Update submodules on 'dev' in qt/qt5
Change-Id: I1ec547177f497319bab757b10e7274e7ba9bc10a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-01-08 04:17:49 +02:00
Qt Submodule Update Bot
09a48699cb Update submodules on 'dev' in qt/qt5
Change-Id: Ia219009b3b92735db630ed7e9550cd85a6816981
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-01-08 00:21:16 +02:00
Qt Submodule Update Bot
c9b515a9fd Update submodules on 'dev' in qt/qt5
Change-Id: I13cda66236d0998bb40b67952951ce1a54f7eac8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-01-07 20:27:25 +02:00
Qt Submodule Update Bot
dc1d95f232 Update submodules on 'dev' in qt/qt5
Change-Id: Ied1c5a0ce0e5477ad8caeb2b63537b5a5d16ff22
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-01-07 15:40:15 +02:00
Paul Wicking
b0325dc0eb Bump version
Task-number: QTQAINFRA-4126
Change-Id: Iafa83105ecceaa1c520c941314cb33449ef8ed54
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-01-07 14:30:11 +01:00
Qt Submodule Update Bot
2423f0846a Update submodules on 'dev' in qt/qt5
Change-Id: Id26c6f2b0bad82ea76260881380b769e98b58c27
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-01-07 12:37:39 +02:00
Tony Sarajärvi
61e28c4e57 Add MinGW developer build with testing and build of examples
Pick-to: 6.0
Task-number: QTQAINFRA-3758
Change-Id: I8f1fc88175b91848b47ab8e794ac252c88221aa5
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
2021-01-07 05:37:51 +00:00
Qt Submodule Update Bot
372306a5ea Update submodules on 'dev' in qt/qt5
Change-Id: I6a6795d49edece1393bfdcce4c7f4b55d585697d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-01-07 06:52:43 +02:00
Qt Submodule Update Bot
6f7b14a3f3 Update submodules on 'dev' in qt/qt5
Change-Id: Ie53dde6d8474b53b87d3d2cd7292fb5f42e2e81c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-01-07 03:05:39 +02:00
Qt Submodule Update Bot
bc9a790126 Update submodules on 'dev' in qt/qt5
Change-Id: I56c910b47239d2b58c8b5b7c74ec182ebcbfda1f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-01-06 23:15:23 +02:00
Qt Submodule Update Bot
72042d9441 Update submodules on 'dev' in qt/qt5
Change-Id: Ibb6a5d9fcba3e94a2784e1c6388cf750ec862019
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-01-06 18:56:03 +02:00
Joerg Bornemann
f79742edb1 Build Linux packages against legacy OpenGL libs
Do not link against the GLVND OpenGL libs (libOpenGL.so.0), because
those might not be available on target systems.

In order to do that, we set OpenGL_GL_PREFERENCE to LEGACY.

Pick-to: 6.0
Fixes: QTBUG-89754
Change-Id: I28e8c62b137f17cf6692b84f438a8ae60ebe0e91
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
2021-01-06 14:58:04 +01:00
Michal Klocek
27c87ecec6 Add charts cmake platform config
Task-number: QTBUG-89091
Change-Id: I7644db4e6b1af01fb5043e6413784111e8850589
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2021-01-06 13:37:49 +00:00
Qt Submodule Update Bot
5de8c70c45 Update submodules on 'dev' in qt/qt5
Change-Id: I98f4194f1bdeffe4bf12a07c7366ba9caf8c8292
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-01-06 13:55:48 +02:00
Qt Submodule Update Bot
7714f29464 Update submodules on 'dev' in qt/qt5
Change-Id: Ia80d6edaa0e158ce4f4681a33f5e55f2ac0d7ec1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-01-06 09:37:03 +02:00
Qt Submodule Update Bot
cf3239347a Update submodules on 'dev' in qt/qt5
Change-Id: I32db7f370dea77c74c3fbe5aaad5b7481dd83c31
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-01-06 05:28:58 +02:00
Qt Submodule Update Bot
710c59cfd2 Update submodules on 'dev' in qt/qt5
Change-Id: Ic5e23c84dd1d81311bdf6e119ef11aec6c1e658e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-01-06 01:39:31 +02:00
Qt Submodule Update Bot
83766e1501 Update submodules on 'dev' in qt/qt5
Change-Id: Ia15de87bb90d00f1f8bdc54f2dae20bd87e8d397
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-01-05 21:13:32 +02:00
Qt Submodule Update Bot
ab05df0194 Update submodules on 'dev' in qt/qt5
Change-Id: I78411e54e2072bf59555428dd7878de9a98583e6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-01-04 20:19:24 +02:00
Qt Submodule Update Bot
beb670a391 Update submodules on 'dev' in qt/qt5
Change-Id: I709ce5afc407c62f2d1da66ed4c56bfdb612d79a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-01-04 16:33:58 +02:00
Qt Submodule Update Bot
8383635261 Update submodules on 'dev' in qt/qt5
Change-Id: I045fbed2db9f5ef360d7f4a19cf038044f9c4b71
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-01-04 05:29:56 +02:00
Qt Submodule Update Bot
04645bf0ff Update submodules on 'dev' in qt/qt5
Change-Id: If8480c24a3ef7096e04bb39e1d47a6b320c832e9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-01-04 02:07:06 +02:00
Qt Submodule Update Bot
ae01600c41 Update submodules on 'dev' in qt/qt5
Change-Id: Ib91b5e608c56ce46d73d664237629c73962b264a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-01-01 09:03:29 +02:00
Qt Submodule Update Bot
1a02082c73 Update submodules on 'dev' in qt/qt5
Change-Id: I44061b4563faf8645fe59cdc5cc66802eb567dfe
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-01-01 05:12:09 +02:00
Antti Jaakkola
68a183324d Use Parallels for macOS 10.15 builds and tests
Pick-to: 5.15
Pick-to: 6.0
Change-Id: I875cf12afafae5389f8c974cd40789c5183d4cb2
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2020-12-31 06:08:19 +00:00
Qt Submodule Update Bot
ce27bd8f0e Update submodules on 'dev' in qt/qt5
Change-Id: I0e8f3d7532f57f8128be4b12adcb908831aaf63f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-31 04:06:26 +02:00
Qt Submodule Update Bot
1ae018e519 Update submodules on 'dev' in qt/qt5
Change-Id: I35e63e9d430e29caa0e22b68d6f2bced8b0df3cf
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-31 01:12:30 +02:00
Qt Submodule Update Bot
05a4401802 Update submodules on 'dev' in qt/qt5
Change-Id: I6f2e8183ed824884e6c83e64695a5586de8cb7da
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-30 22:07:40 +02:00
Qt Submodule Update Bot
1d7b7d38ae Update submodules on 'dev' in qt/qt5
Change-Id: I6d23de9b0e5d71de31b16888cc970dccdedb7a01
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-30 18:28:35 +02:00
Qt Submodule Update Bot
3150d4887b Update submodules on 'dev' in qt/qt5
Change-Id: Ica7597cfcb7321f3fff02d14f6e1828560816f64
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-24 04:06:29 +02:00
Qt Submodule Update Bot
d0ac083c6a Update submodules on 'dev' in qt/qt5
Change-Id: I3929caf97a0cae390bf4d35aca8fc142f68487fe
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-24 00:16:58 +02:00
Cristian Adam
eff3b74d3b CMake: Enable PCH for all builds
With CMake 3.19.2 provisioned, iOS will be able to compile with PCH.

Pick-to: 6.0
Change-Id: Ic9c9eef98d229a7cb8d87fa1e4555cdbeac1f7cf
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-12-23 15:13:14 +00:00
Qt Submodule Update Bot
8e1e656af2 Update submodules on 'dev' in qt/qt5
Change-Id: Ic39b0215b9d7ec6ea455c061c4cb4164d899db7d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-23 16:22:49 +02:00
Toni Saario
dddb69b6eb Update sccache to 0.2.14
This makes windows binaries available from remote url and brings
some fixes to the sccache itself.

Change-Id: Ie108cbef783dbd4d7665964cdc00f0b05b062763
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-12-23 14:18:29 +02:00
Qt Submodule Update Bot
1742705215 Update submodules on 'dev' in qt/qt5
Change-Id: I85abb1f050db67088c11acdb388536756bf77285
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-23 13:39:15 +02:00
Simo Fält
b792fd56db Provisioning: Install libClang 10 with dynamic libs
As Qt uses only static archives of libclang, we have to install
dynamic version as an additional package. Libclang is required
for example QtForPython.

Pick-to: 5.15
Pick-to: 6.0
Change-Id: Ic9d70398113defe3561f261aee369b423c18686a
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-12-23 08:02:32 +02:00
Qt Submodule Update Bot
00f940b4e2 Update submodules on 'dev' in qt/qt5
Change-Id: Ic30b13e4b91aae153613e7aee132abf9832eff5e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-23 05:12:15 +02:00
Volker Hilsheimer
d850eaed21 Use Extract-7zip helper to extract msys
The helper makes sure that all questions for confirmation are answered
with yes, which unblocks a second provisioning run.

Change-Id: I33b58a98ceed3f736eabde90e15e959a7139923e
Reviewed-by: Toni Saario <toni.saario@qt.io>
2020-12-23 00:50:26 +01:00
Cristian Adam
5f4bd8911d CMake: Update provisioned CMake to version 3.19.2
Pick-to: 6.0
Change-Id: I9544eb3ba08b60d027e895031b93731c1e8d00af
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-12-22 19:03:33 +01:00
Simo Fält
0350263a07 Provisioning: Remove deprecated brew call
Pick-to: 5.15
Pick-to: 6.0
Change-Id: If956d0f77cd5c6763fc2314277c346d8f27e6eee
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-12-22 13:22:57 +00:00
Tony Sarajärvi
8aa15f4bbd Add a no-opengl build on Ubuntu 20.04
This reverts commit 9a8fb868ec
partially.

See also d494d76c26.

Task-number: QTQAINFRA-2577
Task-number: QTQAINFRA-3407
Change-Id: I6a01bea15002efe140c022a79e7f3f2f5a47c202
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-12-22 06:40:08 +00:00
Qt Submodule Update Bot
ccac1dc652 Update submodules on 'dev' in qt/qt5
Change-Id: Ie10a31794a022ffe538b2fa31ea3c86ef0e285ba
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-22 08:36:54 +02:00
Qt Submodule Update Bot
2c20fac6ad Update submodules on 'dev' in qt/qt5
Change-Id: I2e892e5046d92489be6bde2ead91f60017878a26
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-22 05:12:09 +02:00
Ville-Pekka Karhu
966760de03 Provisioning: SLES 15 SP2 now uses our local repo clone
Task-number: QTQAINFRA-3895
Change-Id: Ied30afb03543659f66f7b1eedae5249e09c40ae8
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-12-21 10:04:22 +02:00
Qt Submodule Update Bot
450fef08e8 Update submodules on 'dev' in qt/qt5
Change-Id: I414a3a4ed442a2912fe0d14b8b6abe194f2f5fa9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-21 06:23:11 +02:00
Qt Submodule Update Bot
c322db0c99 Update submodules on 'dev' in qt/qt5
Change-Id: I1f6e5d311292b75ad37af2fe5ff7e72118202ea4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-19 01:23:30 +02:00
Qt Submodule Update Bot
24ade60b40 Update submodules on 'dev' in qt/qt5
Change-Id: Id2c9d83622d6e8a71624292d02f629f97e2d314b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-18 22:22:45 +02:00
Qt Submodule Update Bot
68558a37a7 Update submodules on 'dev' in qt/qt5
Change-Id: I745135f3ceae14cd8a9e53afae0d0257f48dfc82
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-18 17:48:35 +02:00
Qt Submodule Update Bot
e2e28e7764 Update submodules on 'dev' in qt/qt5
Change-Id: I2de196be36ee1218b5c6835830c7fd8dbfdc0c7e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-18 08:29:05 +02:00
Qt Submodule Update Bot
d49cd07d9f Update submodules on 'dev' in qt/qt5
Change-Id: Ice82cf158c7b2ede55268c2f32f1994ef43ee120
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-18 05:12:11 +02:00
Heikki Halmet
5d7dae8dcb Provisioning: Remove signing tools script
Tools aren't needed anymore

Pick-to: 5.15
Pick-to: 5.12
Change-Id: Iac4dd282dbbd67b62d843925751903e57c934000
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-12-17 13:01:18 +02:00
Heikki Halmet
6a9193ef40 Provisioning: Set time zone to UTC on CentOS 8.1
Pick-to: 6.0
Change-Id: Id1747661b10fb24e2dd3aaa9af4dedafafbf764e
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-12-17 13:00:59 +02:00
Tony Sarajärvi
7f0113ef9e Build Qt with llvm-mingw
Task-number: QTQAINFRA-2139
Task-number: QTQAINFRA-2039
Change-Id: I4958b3c1b069d6052bccace2d0b21cb27b7b54d1
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-12-17 06:05:33 +00:00
Qt Submodule Update Bot
96d3431ccb Update submodules on 'dev' in qt/qt5
Change-Id: I014ff68c0050aaf9abca7dcc1dee525bf3de3862
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-12 05:26:11 +02:00
Qt Submodule Update Bot
fef1cd938d Update submodules on 'dev' in qt/qt5
Change-Id: I8110afa5841034788766521f341dbc7c0363d550
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-12 01:41:17 +02:00
Qt Submodule Update Bot
1499e48c4c Update submodules on 'dev' in qt/qt5
Change-Id: I584bf8fdcfdbb4e147ee7d6d1cf417fe5978269f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-11 21:47:45 +02:00
Allan Sandfeld Jensen
e38fc45740 Fix nodejs installation on windows
Was unpacked into a subdirectory with the same name as the archive

Pick-to: 5.15 6.0
Fixes: QTQAINFRA-4055
Change-Id: Ic11d2d926a1d2250b963010729d70bd00b992f89
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-12-11 15:26:12 +01:00
Allan Sandfeld Jensen
d5eeee1cd2 Add glproto-devel to openSUSE for webengine
We now need glxtokens.h

Pick-to: 5.15 6.0
Change-Id: I55bc2d195cb27b53ff0a2573e558e4cd40e67451
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-12-11 13:44:19 +01:00
Heikki Halmet
4aa14ea9d7 Provisioning: Fix GCC installation for linux
Pre-built package was missing from cache and source package
was named as pre-built package

Pick-to: 6.0
Change-Id: I6d14b198ab7e3795e5f70986c9a50662225ac666
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2020-12-11 10:35:20 +02:00
Qt Submodule Update Bot
acd57540e3 Update submodules on 'dev' in qt/qt5
Change-Id: I7e0081020e11d438e9a35906fc36a6cdfda5ae2b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-11 10:00:51 +02:00
Qt Submodule Update Bot
1aa6819016 Update submodules on 'dev' in qt/qt5
Change-Id: I30893e50f9a4e9fdfefef461d66c844091620d68
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-11 05:38:02 +02:00
Qt Submodule Update Bot
602d23304d Update submodules on 'dev' in qt/qt5
Change-Id: I5d18f19ff4d4ae064e0fc9ddbf7b162094242c6f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-11 01:08:50 +02:00
Liang Qi
51bc500098 CI: remove InsignificantTests flag for openSUSE build
Change-Id: Icea91c6ff4ff85451df08e74a937cbfb9eb1c0cd
Reviewed-by: Liang Qi <liang.qi@qt.io>
2020-12-10 21:03:38 +01:00
Qt Submodule Update Bot
cf8c35e562 Update submodules on 'dev' in qt/qt5
Change-Id: I19d52821fa51bb24e3b8fc35c1d9a0742ae3636b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-10 20:53:55 +02:00
Qt Submodule Update Bot
5f6935b88c Update submodules on 'dev' in qt/qt5
Change-Id: Iff16f6fe08c31f0ea4aeeca64df07b5080953ea3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-10 15:58:15 +02:00
Alexandru Croitor
b619ed1ba6 CMake: Remove CI qmake configs for Qt 6.1
Qt 6.0 is now built with CMake successfully in the CI and we have
most of the coverage we had with qmake CI configurations. Apart
from platforms and modules we deemed not part of 6.0 release.

We didn't have enough time to disable qmake configurations for
6.0.0, but we should be able do it now for 6.1.

We can also consider removing qmake configurations for 6.0.x
sometime later.

Remove all CI configurations that use qmake to build Qt.

Keep the default.yaml license check UseLegacyInstructions
configuration, because license checking hasn't been ported to use new
Coin instructions.

One consequence of this is that developers that are working on
platforms and modules not yet ported to CMake (like WebAssembly or
qtwebengine), will no longer have coverage in CI until they are ported
to CMake.

If there are repo owners that wish to retain CI coverage for building
their repo with qmake (until a CMake port is done), they can do so by
creating a product_dependencies.yaml file in the root of their repo
and specifying an older qt5.git sha1 (so before this change is merged)
which still contains qmake CI configurations.

Task-number: QTBUG-88741
Task-number: QTBUG-86053
Change-Id: I985cf0597d6d3e1717fdff8b654397a5f9236a6e
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2020-12-10 14:19:03 +01:00
Qt Submodule Update Bot
84257dc4b9 Update submodules on 'dev' in qt/qt5
Change-Id: Idecb4c2602c368692227dea6030b48a5bb2a453a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-10 07:28:28 +02:00
Qt Submodule Update Bot
2479d6c2da Update submodules on 'dev' in qt/qt5
Change-Id: Icfaa989a2d590b29aa42863686b6b25a063ee0d0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-10 00:56:27 +02:00
Qt Submodule Update Bot
0592ccadc2 Update submodules on 'dev' in qt/qt5
Change-Id: I3ee6dfcb6f57765a300ced02bda3f03786bf79cc
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-09 19:30:29 +02:00
Qt Submodule Update Bot
5efeea3b47 Update submodules on 'dev' in qt/qt5
Change-Id: I8fc605f65ec891f41de10ea83de29c06d85392b3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-09 08:08:15 +02:00
Qt Submodule Update Bot
88c9dee48c Update submodules on 'dev' in qt/qt5
Change-Id: Ieb1d647a6c147eb682902be4f991c23f5cb0b8c5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-09 01:51:12 +02:00
Qt Submodule Update Bot
6202850d62 Update submodules on 'dev' in qt/qt5
Change-Id: I6d941f53a6816ee15032a725efdba107db05a819
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-08 19:15:45 +02:00
Qt Submodule Update Bot
2bfbdc419b Update submodules on 'dev' in qt/qt5
Change-Id: I9b833f3460153aa5e3445ccb466e0b2bf45e2040
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-08 13:39:17 +02:00
Tony Sarajärvi
1015211da7 Disable LSO regardless of network interface name
Pick-to: 6.0
Pick-to: 5.15
Change-Id: Ie439e11d9de6f71f4562b014b80a32fbf7660883
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-12-08 07:44:40 +02:00
Qt Submodule Update Bot
6b80f49efe Update submodules on 'dev' in qt/qt5
Change-Id: I3bb6c0167460d39410d99fa26014b400949ba51e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-08 06:35:35 +02:00
Alexandru Croitor
aa79f38529 CMake: Try to build qmake examples on more configs
Add qmake example builds to
- macOS Desktop non-framework builds
- qemu

Task-number: QTBUG-85986
Change-Id: Icfcf9883fa5ac33906a358c9347a1776eaac7696
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-12-07 18:20:29 +01:00
Heikki Halmet
bb4606c5c8 Change network adapter name for Windows 10 x86
Different Windows versions seems to use different name
for network adapter. Let's move this from common scripts
folder to Windows 10 platform folder

Pick-to: 6.0
Change-Id: I6a4a15ead41aef2e79b1b7782f1c5ffa6e46cae1
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-12-07 12:16:14 +02:00
Qt Submodule Update Bot
93f7472fac Update submodules on 'dev' in qt/qt5
Change-Id: I4d5bc4501ac21e53aee305ced81a3f208d016e8d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-07 11:06:28 +02:00
Qt Submodule Update Bot
4a0fe8680e Update submodules on 'dev' in qt/qt5
Change-Id: I04b4fc171ad24ba36dd9f2bdcd72e5a959b9d653
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-07 05:12:09 +02:00
Qt Submodule Update Bot
aff94d55ff Update submodules on 'dev' in qt/qt5
Change-Id: I475765758db11bad98ba2670829bfa5a0f6ba031
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-05 13:12:50 +02:00
Liang Qi
d3fc95535c CI: remove InsignificantTests flag for win10 msvc2019 developer build
Task-number: QTQAINFRA-3949
Change-Id: I3e39a082fe5d2a22f7e263185b5032fd4f0928e5
Reviewed-by: Liang Qi <liang.qi@qt.io>
2020-12-04 19:12:34 +01:00
Kai Koehne
478c779baf Mark 'CMake Topological Sort' attribution as tools related
The code is only used for building Qt, and not shipped by customers.

Pick-to: 6.0
Change-Id: I0e255fe674b1703160608ab6b208918ea511baa4
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-12-04 11:25:00 +00:00
Heikki Halmet
420d7f809c Update Windows 10 x86_64 version to 20H2
Windows 10 Enterprise 20H2, OS build 19042.508
Additional SW:
MSVC 2019 version 16.8.1
MSVC 2019 Build Tools version 16.8.1
MSVC 2015 14.0.25420.1
Virtio driver
Virtio Balloon driver
NetKVM driver
Vioserial driver
Guest-agent qemu-ga-x86_64

Pick-to: 6.0
Task-number: QTQAINFRA-3961
Change-Id: I8abc7ac011c58ad13db433fc86a1327afceafc68
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-12-04 12:17:14 +02:00
Qt Submodule Update Bot
68a07c69f1 Update submodules on 'dev' in qt/qt5
Change-Id: I80c49877609ef86b750c076598b34ba694c8b23c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-04 08:35:03 +02:00
Qt Submodule Update Bot
1232340ad7 Update submodules on 'dev' in qt/qt5
Change-Id: I149513a984d205ee85aa79941ba37eef0da95b33
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-04 04:11:46 +02:00
Qt Submodule Update Bot
e252349c44 Update submodules on 'dev' in qt/qt5
Change-Id: Ifa0b282f397e7073695394c5b97e7b0e44b6f76c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-03 23:30:21 +02:00
Qt Submodule Update Bot
abec558476 Update submodules on 'dev' in qt/qt5
Change-Id: Ib72d869dd2fb127f8ab36079231e9b64a43bfaf4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-03 14:56:36 +02:00
Alexandru Croitor
45ce639a62 CMake: Add headersclean feature to the packaging configs
Task-number: QTBUG-86053
Task-number: QTBUG-82615
Pick-to: 6.0
Change-Id: I89ed5b80b1c6fb793cfec5921b489cbd7693db20
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2020-12-03 11:06:41 +01:00
Heikki Halmet
cdea442a3a Provisioning: Install Azure tool
Pick-to: 6.0
Pick-to: 5.15
Pick-to: 5.12
Task-number: QTQAINFRA-4042
Change-Id: I8e29190f4caf8b766cced40042bfe60ec2601a8e
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-12-03 10:50:49 +02:00
Heikki Halmet
8846d0d52d Provisioning: Install Dotnet SDK 2.1
Dotnet is needed for Azure installation

Pick-to: 6.0
Pick-to: 5.15
Pick-to: 5.12
Task-number: QTQAINFRA-4042
Change-Id: I6dd9d965f536d28554bbce6e76b19a3861f55ff2
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-12-03 10:50:48 +02:00
Qt Submodule Update Bot
94715a71ef Update submodules on 'dev' in qt/qt5
Change-Id: Ia566b4fc0f62cc3e025f372cde0cf211bda84c38
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-03 07:05:26 +02:00
Qt Submodule Update Bot
c416896e62 Update submodules on 'dev' in qt/qt5
Change-Id: I50ef73c1ecabf32117318b5c36b10177200c12f8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-03 01:49:45 +02:00
Volker Hilsheimer
6e619b06d7 Checkout as detached if checking out branch fails
Having several toplevel worktrees for the same branch is problematic, but
but we do want to be able to have one toplevel worktree synchronized to
e.g. one submodule's dev and another with all submodules at the respective
dev heads.

So fall back to detached checkout if regular checkout fails, and generate
a warning.

Change-Id: I13981ab931cbbd8b56187979708bfe63f7373718
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-12-02 10:37:19 +01:00
Volker Hilsheimer
5bbec95c48 Add worktrees as detached
Since we later check the worktree out to the revision specified
in the dependency file, add it as detached to avoid conflicts
with already existing worktrees for the default branch.

As a drive-bye, fix a typo in a comment.

Pick-to: 6.0
Change-Id: I81c30c1fa3cfc9831fe7884a103746b43478dd8e
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-12-02 10:37:16 +01:00
Volker Hilsheimer
21fea13125 Initialize missing submodules if a supermodule is present
When fetching dependencies, the submodule directory might not exist
or might be empty. If so, try to initialize the submodule before trying
to add the worktree.

Pick-to: 6.0
Change-Id: Ie4d6ec483ac9ea3f9207d5ab4cea34d6e0fb2921
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-12-02 10:37:13 +01:00
Qt Submodule Update Bot
2218bf230b Update submodules on 'dev' in qt/qt5
Change-Id: I5ddff3a16be5862f7385a06c32b4b376a0512f99
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-01 23:32:51 +02:00
Volker Hilsheimer
b6dfb5e295 Support absorbed and unabsorbed submodules
Modern git usage for submodules is that the git object storage is absorbed
into the supermodule (see git submodule absorbgitdirs).

Handle both cases when trying to locate the gitdir for the target module.

Pick-to: 6.0
Change-Id: Icddbae3a4d9a8823551106f089dbbff2c935ff35
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-12-01 20:11:39 +01:00
Qt Submodule Update Bot
a60501e35b Update submodules on 'dev' in qt/qt5
Change-Id: I26693607c5ef084536c35192fbd729236ae85cb0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-01 16:37:14 +02:00
Alexandru Croitor
b8ae74d78a Mark Android test config as InsignificantTests
The qtbase Android test job often times hangs, causing other
integrations to fail. Until the issue is fixed, mark the config as
InsignificantTests.

Pick-to: 6.0
Change-Id: I4921d5a830bf49cb144a6e93bd4e3a6ee34f216f
Reviewed-by: Toni Saario <toni.saario@qt.io>
2020-12-01 12:48:50 +01:00
Joerg Bornemann
0167a01022 CMake: Adapt to new QT_BUILD_TESTS variable
Change-Id: Ib35e164a8628ffc7d1429ba4756a27d4b98977e2
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 87269f4353)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2020-12-01 07:33:41 +00:00
Qt Submodule Update Bot
315ad7e5b6 Update submodules on 'dev' in qt/qt5
Change-Id: Iad7ee2d960e7104e213130bd5ac317b94f0b0573
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-12-01 09:33:39 +02:00
Simo Fält
f7659f5c7b Add platform configs for Pyside-setup
While default.txt contains configs with UseLegacyInstructions it can't
be used by pyside-setup, while it falls back to COIN's legacy
module class.

Change-Id: I5d2856344b817f6085ba66643f47803ccee29b06
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 32d8d76755)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2020-11-30 20:33:56 +00:00
Ville-Pekka Karhu
cb1df1dd5e Provisioning: Repo-clones taken into use in openSUSE 15.2
Task-number: QTQAINFRA-3894
Change-Id: Ie14ec072f41ae1c5ee185e2f73cb8fc5c86307f4
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-11-30 09:44:49 +02:00
Toni Saario
395fe976be Add upload for the documentation artifact
The upload for the documentation was missing.

Change-Id: I9f1df81ecee3bbf6dd1128d24ae4fd2717bb3dcb
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 0848b04307)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2020-11-27 11:29:12 +00:00
Tony Sarajärvi
e472db17f3 Replace openSUSE 15.1 with openSUSE 15.2
Task-number: QTQAINFRA-4035
Change-Id: I11746ab2d6447dd5d33846bff68f6983670adbbe
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-11-26 10:02:04 +00:00
Ville-Pekka Karhu
ace087df68 Provisioning: Move Centos 8 EPEL repos
Change-Id: I73ec04443a6edca2bf2add60b8df021ba1e8d4aa
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-11-25 10:14:14 +02:00
Assam Boudjelthia
9b5c3f0a6d Android: update build tools and SDK level to 29 in CI
Pick-to: 5.15 6.0
Change-Id: I6f831882f1e4c2ba68cbd70d03b72a9337211fbf
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2020-11-24 13:23:31 +02:00
Ville-Pekka Karhu
64f21fd0cc Repo-clones taken into use in Centos 8
Task-number: QTQAINFRA-3896
Change-Id: Id559af7421d592d75c91fe57060f8787ec4fd742
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-11-24 11:52:35 +02:00
Tony Sarajärvi
2ea6fd2eb2 Adjust order of provisioning scripts to solve a lock situation
01-enable-modules.sh was run before packagekit was disabled
causing lock situations where packagekit is still holding on to
System Management.

Task-number: QTQAINFRA-3959
Change-Id: Id9995bbe140055af323093b58225d85b2e116bab
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-11-24 07:52:10 +00:00
Simo Fält
1468849b30 Add CI config to run Android x86 test in emulator
Task-number: QTQAINFRA-3867
Pick-to: 6.0
Change-Id: Icabb8e5cd880087abcf1d2c68ac126a4d8bf8687
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2020-11-23 16:30:42 +00:00
Heikki Halmet
4a37ec2dd5 Provisioning: Use Remove function when removing items in Windows
Sometimes items are locked by some windows process so that they can't be
removed. This will fail provisioning instantly.

Let's give the removing process more time by retrying if it will fail
on first attempt

Change-Id: Ic5c16c0d920ed0625d0c6830323d0bc6ba2cd608
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-11-21 10:35:55 +02:00
Heikki Halmet
ed8cddd726 Provisioning: Install python-xml for RTA tests
RTA tests requires python 2 xml modules, e.g. xml.etree.ElementTree

Task-number: QTQAINFRA-3990
Change-Id: I9db41280a73ae97b0698198afea5fc5d48dec563
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-11-21 10:35:51 +02:00
Heikki Halmet
c20aba6f04 Provisioning: Remove rogue RHEL 7.4 provisioning file
RedHat 7.4 isn't supported in 6.0 or in 5.15 branches

Pick-to: 5.15
Change-Id: Ia3ad450a944884035ec3a822e09f73c6970450d0
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-11-21 08:35:47 +00:00
Volker Hilsheimer
302548040c Be less quiet when cloning or adding worktrees
Since doing either for qtbase and qtdeclarative can take a long time,
and since it's a relevant change to the local file system, log what's
going on.

Swallow output from most git commands unless cmake runs in VERBOSE
mode.

Pick-to: 6.0
Change-Id: I984915689247d6372240744b5bc9183660046084
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-11-21 04:20:17 +01:00
Alexandru Croitor
6b46bc3b7b CMake: Update provisioned CMake to version 3.19.0
Pick-to: 6.0.0 6.0
Change-Id: I9c5be93146882d5593bbe46811a653d6b2a88aee
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2020-11-20 19:25:56 +01:00
Qt Submodule Update Bot
d2b637469f Update submodules on 'dev' in qt/qt5
Change-Id: Ida3ecbf5f525c5ab0714de729983d260612c8f80
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-11-20 16:45:33 +02:00
Qt Submodule Update Bot
c0b8c8254c Update submodules on 'dev' in qt/qt5
Change-Id: I9118f5e1b1bd85773d01055d2b24f9b462de48b9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-11-20 08:44:05 +02:00
Qt Submodule Update Bot
8c984b9fb0 Update submodules on 'dev' in qt/qt5
Change-Id: I03c1da4b91fce866eb2f68a7baabd3aee51544ee
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-11-20 03:50:52 +02:00
Qt Submodule Update Bot
f1ed0045c9 Update submodules on 'dev' in qt/qt5
Change-Id: I10a79f6fa3316d8e373aedc9b770cad4b042f890
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-11-19 21:02:23 +02:00
Alexey Edelev
0393017610 CMake: Fix fuzzer-no-link check for super builds
Add platform detection before report enties evaluation in root
CMakeLists.txt. QtPlatformSupport.cmake defines required
platform-specific variables line CLANG before
qt_configure_eval_commands call.

Fixes: QTBUG-88496
Change-Id: I13afdbe29f2bffeb2c36c17e231b98b2aa2b41e6
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Andreas Buhr <andreas.buhr@qt.io>
2020-11-19 12:57:58 +01:00
Qt Submodule Update Bot
85e32ebcb4 Update submodules on 'dev' in qt/qt5
Change-Id: If0f3226d32bc0fdd58072f91d94ba37829799d3d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-11-19 13:16:26 +02:00
Qt Submodule Update Bot
fdbe2867cf Update submodules on 'dev' in qt/qt5
Change-Id: I96b4e23179003371db3c2f0bab69858a466fe09e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-11-18 21:33:41 +02:00
Qt Submodule Update Bot
768edb9eeb Update submodules on 'dev' in qt/qt5
Change-Id: Ia116b16307f6234996bb79c703a94ed6aff1b2eb
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-11-18 15:28:47 +02:00
Volker Hilsheimer
c47432eda3 Make syncing script capable of setting up new worktrees and clones
For missing dependencies, create worktrees from existing clones if
found, otherwise clone from the same remote.

Change-Id: Ie624e6c1b3f621dce43ee8cc7f06ce469851285b
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-11-17 16:40:45 +01:00
Volker Hilsheimer
f8b8a9a59f Add a script to synchronize the repo to a consistent (sub)set
Make a few modifications to the dependency evaluation to include the
revision of each dependency, and a method that checks each dependency
out to the revision necessary to create a consistent set for the
requested module.

If the requested module is ".", check all modules out to the given
revision.

Can be called (ideally from a git-sync-to alias script):

cmake -DSYNC_TO_MODULE="$1" -DSYNC_TO_BRANCH="$2" \
      -P cmake/QtSynchronizeRepo.cmake

Change-Id: I007e9f9023bae949907b64e264ae7869dff1da2e
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-11-17 16:40:41 +01:00
Tony Sarajärvi
c4c11e016f Remove icu provisioning from 32 bit Windows 10
Fixes 2fb5125e5b which was incomplete

Change-Id: I80392c63fff1de53780416fa8e3e04ef2990323d
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
2020-11-17 12:28:33 +00:00
Tony Sarajärvi
66b345fdbb Swap static builds between openSUSE and SLES
By moving the static build to SLES, we can run autotests on openSUSE.
It also makes sense to move the developer build at the same time.

Change-Id: I5e0c4b0caf2bbd5a0d419555b1e270673adfc890
Reviewed-by: Liang Qi <liang.qi@qt.io>
2020-11-17 13:19:53 +01:00
Ville-Pekka Karhu
dac8188d90 Provisioning: Install QEMU Guest Agent to Linux
Task-number: QTQAINFRA-2462
Change-Id: I1d74a886a3056d3d8b7ca7bce676701c15e67c6f
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-11-16 15:13:21 +02:00
Tony Sarajärvi
2fb5125e5b Clean up unused provisioning scripts
Change-Id: Id6c5de28bde4a7870eb33d685c948bfcf48cb367
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-11-16 12:29:22 +00:00
Alexey Edelev
c7c8d1e064 CMake: Check module dependency before configure
Move all modules dependency check before actual configuration of
any module.

Change-Id: I40838ab59de1be1cd8ca3a006e195455f2692982
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-11-16 12:56:01 +01:00
Heikki Halmet
b34fa5f9cf Remove RedHat 7.6 from CI
CentOS 8.1 is now in CI without Insignificant flags so
Rhel 7.6 can be removed.

Task-number: QTQAINFRA-2760
Change-Id: Id797a6ea5bf9c4d64929b4d6e183d0c7146309ca
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
2020-11-16 07:38:21 +02:00
Heikki Halmet
4a435f6012 Move coredump script under SLES 15 SP2
SLES 15 was replaced by SLES 15 SP2

Change-Id: Ia15e59ecb5407b9432ea82171c73a4576b162c35
Reviewed-by: Toni Saario <toni.saario@qt.io>
2020-11-16 07:38:19 +02:00
Heikki Halmet
268fda09d8 Provisioning: Update MSVC 2015 version number
Add correct version for Visual Studio 2015 and also
update the script name to point to MSVC 2015

Change-Id: Ice9b8359fbdcd885227eb94f6ef8cbbb5a02f099
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-11-16 08:38:16 +03:00
Qt Submodule Update Bot
4913a6d9b9 Update submodules on 'dev' in qt/qt5
Change-Id: I6d4c4249e8e77112e3a691c89453755f8d98716f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-11-16 06:31:31 +02:00
Alexey Edelev
a2683113e2 CMake: Fix dependency handling when module is skipped
Put dependencies of all modules to top-level variables and
check for unmet dependencies before module configuring.

Fixes: QTBUG-88214
Change-Id: I089feb474687652f3f8fd1bb1959179ea1114983
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-11-14 13:10:30 +00:00
Qt Submodule Update Bot
4e2e65c7f1 Update submodules on 'dev' in qt/qt5
Change-Id: I0179edf47aef1e48f6a6b8dafb8ba05a1344b22d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-11-14 11:46:04 +02:00
Qt Submodule Update Bot
a18871f371 Update submodules on 'dev' in qt/qt5
Change-Id: Ibce70929d2ab0fde99a642742eb777aad4ce9622
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-11-14 06:37:08 +02:00
Qt Submodule Update Bot
027f659e44 Update submodules on 'dev' in qt/qt5
Change-Id: I4f4bf3edf52471d2e424d2191be5e592435e2d6e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-11-13 19:56:01 +02:00
Alexandru Croitor
b6fa6cada0 CMake: Mirror missing -no-gui Ubuntu config
Amends 57ae486e36

Fixes: QTBUG-88343
Task-number: QTBUG-86053
Change-Id: Icabf4cda23a61845b7f21b4d9f2e70e05ced0256
Reviewed-by: Toni Saario <toni.saario@qt.io>
2020-11-13 13:07:00 +01:00
Alexandru Croitor
dc84140127 CMake: Update provisioned CMake to version 3.19.0-rc2
We want to be able to build qdoc and lupdate on MSVC with
Ninja Multi-Config.

Task-number: QTBUG-85411
Task-number: QTBUG-88139
Task-number: QTBUG-87315
Change-Id: I53b705535981b67c817f4d49d435e8f2a0553f74
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2020-11-12 18:21:53 +01:00
Qt Submodule Update Bot
4b97dafe86 Update submodules on 'dev' in qt/qt5
Change-Id: I53ce2d70cfe5cd1f07f5d24590cba5f0502844a2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-11-12 05:31:01 +02:00
Tony Sarajärvi
fd4264aa63 Update Strawberry Perl to 5.32.0.1
Change-Id: I79f1f65af473f4925342267ab000d6261d3a7e42
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-11-11 19:55:57 +00:00
Liang Qi
919253da5c CI: remove InsignificantTests flag for Ubuntu 20.04 hosts
Change-Id: I50ee36c93e084d5bd8cf97a29a44c66698cc4f5a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-11-11 17:12:48 +01:00
Liang Qi
4cbe441322 Update submodules on 'dev' in qt/qt5 manually
Change-Id: I94ee49436645e1831050d80e3ccdf6f4b966bbae
Reviewed-by: Liang Qi <liang.qi@qt.io>
2020-11-11 17:12:46 +01:00
Volker Hilsheimer
da25b7f149 Use dependencies.yaml to order sub modules
Don't rely on .gitmodules, instead parse the dependencies.yaml file from
every subdirectory with a CMakeLists.txt, and sort all projects based
on that data. Projects with no dependencies are added last.

This allows us to get rid of the duplication of dependency information
in .gitmodules, and makes each module the authoritative source of its
own dependencies.

Change-Id: Ib1ec6c63bde2aa1852399d598dac5b8e1efda31d
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-11-11 11:44:25 +01:00
Maurice Kalinowski
9a82a87954 Update MQTT test broker
Latest additions of CentOS cause troubles due to
- Updated SSL to set up tls servers
- Updated Python version, which removed API calls

For the latter, we only need to update the broker. TLS test servers
are not used in our setup. However, qtmqtt.git requires on further
update to load a different configuration.

Task-number: QTBUG-88189
Change-Id: I2d6e559a21dff41deca94aeec8c5db6fdf72a0ac
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
2020-11-11 07:59:22 +01:00
Tony Sarajärvi
64eecbf317 Upgrade GCC from 7 to 9 in openSUSE
Task-number: QTQAINFRA-4006
Change-Id: I2cfce8fbae5974474e349342450d91e29314a8f1
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2020-11-10 13:15:09 +00:00
Qt Submodule Update Bot
5dc2c5d94f Update submodules on 'dev' in qt/qt5
Change-Id: Idaaed4151eebe32797fbc53ee4a1d230ac893e75
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-11-09 17:31:59 +02:00
Toni Saario
54ffdc3f2f Change sccache provisioning priority
With value 100 the sccache would provision between 10 and 20, which
might lead to unexpected behavior.

Change-Id: I3143d2102ff03c744476910dffdb924ca3164d26
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-11-09 17:11:10 +02:00
Qt Submodule Update Bot
2f3fb49637 Update submodules on 'dev' in qt/qt5
Change-Id: Ic83483978c86b85e7b709b3174598f97a64bf2c0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-11-09 12:09:58 +02:00
Qt Submodule Update Bot
a6c3df1ae8 Update submodules on 'dev' in qt/qt5
Change-Id: Ieff76e7d9c500f37687f83204792c1d8846eef05
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-11-09 08:08:55 +02:00
Qt Submodule Update Bot
63a27753cf Update submodules on 'dev' in qt/qt5
Change-Id: Iefc90b0d1bedf2d84663203ecd07bde80b4a2df3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-11-09 04:13:07 +02:00
Kai Koehne
c7e8d91332 Windows: Fix lookup of LLVM_INSTALL_DIR environment variables
"_ARCH_" was dynamically replaced by either 32 or 64 in
qttools/configure.pri. Anyhow, this is not supported by the
CMake build, and not needed, since we only build with 64
toolchains on Windows.

the qmake builds can still automatically select the "right"
toolchain by either loading LLVM_INSTALL_DIR_msvc,
LLVM_INSTALL_DIR_mingw. But for CMake builds
we now explicitly set LLVM_INSTALL_DIR in each configuration.

Fixes: QTBUG-87215
Change-Id: Iaa7e6eab676c03b34ea723d9f71888ca9ee7bb1f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-11-08 16:57:21 +01:00
Kai Koehne
f19703b0d8 Provisioning: Do not install llvm 32 bit anymore
Task-number: QTBUG-87215
Change-Id: Idf0f06fa91e7a9e5e23c1395a90e0733622064d3
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-11-08 16:57:18 +01:00
Qt Submodule Update Bot
fa410e3f5a Update submodules on 'dev' in qt/qt5
Change-Id: Ic4bb0dbbaafc156532d1b05967eb811b9c86fc6d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-11-08 12:46:20 +02:00
Qt Submodule Update Bot
43291fd110 Update submodules on 'dev' in qt/qt5
Change-Id: I4b38af69da0ac6c5880aee6d4940bc3f00d7d62e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-11-06 19:33:03 +02:00
Alexandru Croitor
992cbdfd01 CMake: Add documentation building CI instructions
Replicate the instructions that Coin does for qmake configurations.
Build all of qttools and its dependencies and then build the top-level
docs.

Task-number: QTBUG-87012
Change-Id: Iac70172cf13d8943e60c26a1f2ee3ddf5bae6667
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-11-06 17:26:00 +01:00
Alexandru Croitor
187b80e140 CMake: Mirror missing -no-widgets Ubuntu config
Task-number: QTBUG-86053
Change-Id: I791a84b5dc2c159007b2a122ea4c35c97a180c7a
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-11-06 17:18:13 +01:00
Alexandru Croitor
cb0a002ba3 CMake: Adjust qemu configs to include qmake specific settings
Task-number: QTBUG-86053
Change-Id: Idb43b9c847f42d1a576fea1c3b2775fd4acbde7f
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2020-11-06 17:17:55 +01:00
Alexandru Croitor
605e0b3996 CMake: Enable usage of bundled xinput sources like in qmake configs
Task-number: QTBUG-86053
Change-Id: I888b557626146460d1734c04fae8bb819ebf266c
Reviewed-by: Simon Hausmann <hausmann@gmail.com>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2020-11-06 17:17:49 +01:00
Alexandru Croitor
28be349bd7 CMake: Bump the minimum required CMake version to 3.18
This is the top-level counterpart change that uses the infra
introduced in qtbase.

Task-number: QTBUG-88086
Change-Id: I2524cd88da43cffb2b3742caedd1cd2f3130dff5
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-11-06 17:17:21 +01:00
Alexandru Croitor
7ccc1420f2 CMake: Deduplicate qtbase source path references
Change-Id: I857d97c3844ab0a9fe728a499aac1ecd07a1c779
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-11-06 17:17:21 +01:00
Qt Submodule Update Bot
22d80b5489 Update submodules on 'dev' in qt/qt5
Change-Id: I310004ae9e8895f9f936c13098b1f73bbd17d66a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-11-06 18:17:21 +02:00
Qt Submodule Update Bot
f5aa1b2957 Update submodules on 'dev' in qt/qt5
Change-Id: If31d3e48baab2785da242b2b3058de7f801f3bdc
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-11-06 02:13:29 +02:00
Edward Welbourne
cd48b6f971 Fix breakage in Coin caused by -verbose going to cmake configure
Fixes commit 57ae486e36

Change-Id: I6a20580c27c9474c9507c5f346b78a2a3f793169
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2020-11-05 17:07:03 +01:00
Heikki Halmet
013e6972ce Change Insignificant flag to InsignificantTests for MSVC developer build
Builds are passing, but tests still failing

Task-number: QTQAINFRA-3949
Change-Id: Ieca2512e06ca09cabf042ee3c966dae65c9e5e86
Reviewed-by: Simo Fält <simo.falt@qt.io>
2020-11-05 18:07:03 +02:00
Tony Sarajärvi
57ae486e36 Bring back the -no-gui build in the CI
Task-number: QTQAINFRA-3999
Change-Id: Ifd1c76fc1eadf34a1024e7591f14ab6ab2c4bb56
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2020-11-05 10:29:17 +00:00
Liang Qi
01f0e37b48 CI: remove InsignificantTestsflag for two CentOS 8.1
Task-number: QTQAINFRA-2760
Task-number: QTQAINFRA-3065
Change-Id: Ic221b9c63ddfe5b5f62e3900f11fa0a27371e401
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-11-05 09:48:04 +01:00
Liang Qi
f641b7112e Update submodules on 'dev' in qt/qt5 manually
Change-Id: If7e047d3054a2a1816372c1350d0664d10f62e63
Reviewed-by: Liang Qi <liang.qi@qt.io>
2020-11-04 15:05:32 +01:00
Liang Qi
47b8427b15 coin: guard Ubuntu 20.04 for qtbase first
Task-number: QTBUG-86187
Change-Id: I677eec9b80ae7389fe63adc58a38979556654a8a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2020-10-30 21:34:54 +01:00
Heikki Halmet
134c2a1cb0 Upgrade msys2 package and the installation script
This change will upgrade the msys2 package

Change also updates the script to use cached
prebuilt package if available.

This will also remove unneeded x86 installation

Pick-to: 5.15
Pick-to: 5.12
Task-number: QTQAINFRA-3986
Change-Id: Ia6299f9d4750376676276a75613e7f1098de4102
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-10-30 16:14:37 +02:00
Liang Qi
4e39bfd760 Update submodules on 'dev' in qt/qt5 manually
Need to include a fix in qtquick3d for cmake developer build on
Ubuntu 20.04.

Change-Id: I18b87aef320fc3b36d1383ff58efff51a605bc71
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
2020-10-30 12:35:00 +01:00
Heikki Halmet
c2db17d220 Change Insignificant flag to InsignificantTests for Ubuntu 20.04
Builds are passing now with Ubuntu 20.04, but tests are still failing.
Let's set Insignificant flag to affect only to test phase.

Change-Id: Ib9b4d652c9518d59d6a36c58b3a11f40ce777a74
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-10-30 12:34:57 +01:00
Heikki Halmet
1051fdbba2 Change Insignificant flag to InsignificantTests for CentOS 8.1
Builds are passing now and almost all autotests. Let's set insignificant
flag to affect only test phase for now.

Task-number: QTQAINFRA-3065
Change-Id: Icd233ef58bf92ec9ebfb6b56e163c16aad045bbd
Reviewed-by: Toni Saario <toni.saario@qt.io>
2020-10-30 07:30:59 +00:00
Heikki Halmet
efd24d2c41 Provisioning: Remove Network Managers secret key
Ipv6 link local becomes tentative and dadfailed if two systems
has the same secret_key. New unique secret key will be generated
automatically during boot up

Task-number: QTBUG-84254
Change-Id: Ic229c4e0ffd5bb708894131238a70c04eb1b5b98
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-10-28 15:26:56 +02:00
Alexandru Croitor
96eb6a5f2c CMake: Add DebugAndRelease feature to Ninja Multi-Config configs
This doubles the amount of processor power given to the VMs. This
mirrors what Coin does when it detects a -debug-and-release flag in
the configure flags when doing a qmake Qt build.

Change-Id: I33a5c6a50a4ac279d097664d145439c856f132ec
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
2020-10-28 10:40:24 +01:00
Joerg Bornemann
c4a012ba3d Use the -qmake configure argument for UseLegacyInstructions configs
...to prepare switching the default from qmake to CMake.

Task-number: QTBUG-87049
Change-Id: I0f17e65cead99d2b7bf3191b1bfc96cee7d089e9
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-10-23 16:52:19 +02:00
Edward Welbourne
9521eee18b Fix permissions on power-shell scripts and the shbang in a bash script
The power-shell scripts don't need to be executable (MS-Win doesn't
care and we don't run them on Unix).

The shbang line in a shell script only works if it's at the start of
the file, not after a blank line.

Change-Id: I12a927f414621187f867864617276528a59652e5
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
2020-10-23 11:32:57 +02:00
Toni Saario
3a076ad2f8 Provision libstdc++-static library to CentOS
Needed by webengine which broke from the switch from RHEL to CentOS.

Change-Id: I1f0b855b73716e0e2133be895e55000d72658962
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
2020-10-23 11:09:45 +03:00
Qt Submodule Update Bot
df20d2caea Update submodules on 'dev' in qt/qt5
Change-Id: I0d887b14ccb1b3a0e46ea3e3562924c66ba0aa31
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-10-23 04:12:10 +03:00
Toni Saario
ef0baf1ce9 Replace SLES with SLES-SP2 for qtwebengine
This was missed in f1e911e344.

Change-Id: I67ef590ab26d760b26da5e26ebd3a58262564b45
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
2020-10-22 10:38:44 +03:00
Heikki Halmet
586856e180 Provisioning: Enable access to SMB server in Windows 10 x64
Windows don't allow insecure guest login anymore by default. It need
to be enabled through Group Policy restrictions

Pick-to: 5.15
Pick-to: 5.12
Task-number: QTQAINFRA-3980
Change-Id: I767e9c87ca3ee4737e312142ecefb94ee2b2b828
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
2020-10-21 21:44:27 +03:00
Qt Submodule Update Bot
12463fae48 Update submodules on 'dev' in qt/qt5
Change-Id: I0cdfc581c788cbcca39e3635649c8de3caf53225
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-10-21 14:10:53 +03:00
Alexandru Croitor
b442b699db CMake: Mirror -qtlibinfix from the qmake CI config
Also disable warnings_are_errors. That's the way it is in the qmake CI
config. It was probably an oversight.

Fixes: QTBUG-85438
Change-Id: Id6e6a778dca1bfc5c13289e3f55048ce515e923f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-10-21 10:34:22 +02:00
Heikki Halmet
c7b4e6a19a Provisioning: Print system OpenSSL version to versions.txt
Task-number: QTQAINFRA-3971
Change-Id: I6b2c616be39d893963a9dab51f3635d65799cf60
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-10-21 08:36:15 +03:00
Heikki Halmet
c053e70593 Provisioning: Install colorlog
Needed by packaging scripts

Pick-to: 5.15
Pick-to: 5.12
Task-number: QTQAINFRA-3918
Change-Id: I30861ecb5f12f79683ad2fec58484b97dee31d7f
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-10-21 08:36:12 +03:00
Alexandru Croitor
94d91d2a6a Move rest of qt5.yaml platform configs to default.yaml
Change-Id: Ica5f3e6875caccd0553ce5a8376bcf30e7f953ad
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-10-20 20:00:00 +02:00
Heikki Halmet
90a6ab728f Provisioning: Enable access to SMB server
Windows don't allow insecure guest login anymore by default. It need
to be enabled through Group Policy restrictions

Pick-to: 5.15
Pick-to: 5.12
Task-number: QTQAINFRA-3974
Change-Id: I5fd918882c51c01985cd4c1b9f9ed4dec62e07dd
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-10-20 15:27:47 +03:00
Alexandru Croitor
3490d00ce5 CMake: Enable sccache for MSVC configs
Pass -DFEATURE_msvc_obj_debug_info=ON to enable the /Z7 flag
compilation flag, which will embed debug info into the .obj files,
thus enabling usage of sccache for MSVC CI configs.

Task-number: QTQAINFRA-3934
Change-Id: I151eece0e35ebee8df0c58641727219ee40a7409
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Toni Saario <toni.saario@qt.io>
2020-10-20 13:29:41 +02:00
Heikki Halmet
6ec71c345a Provisioning: Use system OpenSSL in linux instead of self built version
Task-number: QTQAINFRA-3863
Change-Id: I98fc2d787956bb23d2e50b618fdae0a094e4eeed
Reviewed-by: Toni Saario <toni.saario@qt.io>
2020-10-16 15:57:07 +03:00
Heikki Halmet
e98b85be22 Add CentOS 8.1 to CI
Insignificant flag is added for two targets. RedHat 7.6
will be kept as parallel until insignificant flag can be
removed from CentOS

Task-number: QTQAINFRA-2760
Task-number: QTQAINFRA-3065
Change-Id: If124600309644e6a066805cd728bf12862006a21
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-10-16 15:57:06 +03:00
Dimitrios Apostolou
1dd03fc165 Ubuntu 20.04 now resolves test dockers like vsftpd.test-net.qt.local
Task-number: QTBUG-86187
Change-Id: I050a915cb72f91374f40d3db5ee2d417181eda8a
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-10-16 12:46:49 +02:00
Alexandru Croitor
f44dfe9c34 CMake: Build iOS in a release and debug configuration
To ensure that examples can be built with an xcode project
generated by qmake, we have to ship both debug and release
libraries.

So use Ninja Muli-Config to build both configs.

Note we build Release and not RelWithDebInfo on purpose, so we
don't inflate the package size too much due to the embedded debug
information.

We can probably switch to RelWithDebInfo once we implement the
separate_debug_info feature for static builds.

Fixes: QTBUG-87638
Change-Id: I3e26cd0e47fc96fbdee8b3b0177f78fa266b8cc4
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-10-16 12:12:02 +02:00
Qt Submodule Update Bot
e9e821038c Update submodules on 'dev' in qt/qt5
Change-Id: I4f15c08e1169408e001af516ef421c994f5b8f68
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-10-16 08:23:04 +03:00
Cristian Adam
9251571a53 Qdoc_libclang: Install perl-Digest-MD5
While building Clang 11 for Qt the tests failed due to missing Perl
Digest-MD5 package.

Pick-to: 5.15
Change-Id: Iba4156db65ec53bf465ca5b132e6983f1176bc41
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2020-10-16 01:16:38 +02:00
Qt Submodule Update Bot
30eefe1877 Update submodules on 'dev' in qt/qt5
Change-Id: I32b601f60d996b456a8df68d087b35632e05a832
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-10-15 21:08:22 +03:00
Qt Submodule Update Bot
8ce3f74ad0 Update submodules on 'dev' in qt/qt5
Change-Id: Ib2c25ac40a076d7a76fe39ee76185d43ab00bed8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-10-15 12:02:55 +03:00
Heikki Halmet
93a167e28e Remove Android multi qmake for linux
Target are already ported to cmake and qmake
target is failing with CentOS which will replace
Redhat

Change-Id: I792ae826c96012a10050ca07a071e01780f54f0c
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2020-10-15 09:08:41 +03:00
Qt Submodule Update Bot
f753ca6c30 Update submodules on 'dev' in qt/qt5
Change-Id: I758524da0aa87f2bc2c08c1b25b904fd72f5e7e8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-10-13 18:03:09 +03:00
Alexandru Croitor
6eea6ae689 CMake: Add missing qtbase macOS developer build configuration
Task-number: QTBUG-86053
Change-Id: I4fa4c03599e1a455eb1337d9980c2bda09cfd374
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-10-13 09:50:46 +02:00
Heikki Halmet
f1e911e344 Provisioning: Replace SLES-15 with SLES-15 SP2
Task-number: QTQAINFRA-3921
Change-Id: I325a4b8f272dda80168aed1389e647bbd525b10f
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-10-12 19:28:28 +03:00
Jani Heikkinen
a892a2ca19 Remove unnecessary add-ons from .gitmodules
qt3d, qtimageformats and qtnetworkaut will be delivered via package
manager so those shouldn't be in qt5.git integrations from Qt 6.0 ->

Task-number: QTBUG-87255
Change-Id: I2ddaf561123153b78b4bd972c22a90ba1309a91d
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
2020-10-12 19:28:10 +03:00
Qt Submodule Update Bot
eb2295498f Update submodules on 'dev' in qt/qt5
Change-Id: I292664713d16d1c149c5f65d23dab3dc29adce25
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-10-12 19:28:10 +03:00
Joerg Bornemann
eaf64a222f CMake: Run auto-detection routines before any project command
This is needed to ensure that the auto-detection runs before any
toolchain file is loaded, like in a stand-alone qtbase build.

This fixes the issue that we had to specify ANDROID_STL=c++_shared in a
top-level build, even though it's properly defaulted in
QtAutoDetect.cmake.

Task-number: QTBUG-87309
Change-Id: I8ced2213ca2e5a877bfd210e59da4ef4d6c8ac74
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-10-12 18:28:10 +02:00
Joerg Bornemann
70dc8438fc CMake: Fix find_package puzzle piece of top-level cross-builds
The subdirectories, the top-level CMakeLists.txt adds, contain
find_package(Qt6 COMPONENTS ...) calls. When cross-compiling to Android,
the toolchain file sets CMAKE_FIND_ROOT_PATH and
CMAKE_FIND_ROOT_PATH_MODE to ONLY. That means, the packages that are
created in qtbase can never be found by other Qt repositories, e.g.
qtdeclarative.

Append the qtbase build dir to CMAKE_FIND_ROOT_PATH to find the Qt
packages of the build dir when cross-compiling. Because of some CMake
idiosyncracy, we need to append "${QtBase_BINARY_DIR}/lib/cmake" to
CMAKE_PREFIX_PATH and not just "${QtBase_BINARY_DIR}". See
qtbase/ec90f9013b4c6b63d7e03a964f66f97329be7885 for details.

Task-number: QTBUG-85080
Change-Id: I799f851316538c310d73f5ab59c809229e16e8a8
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-10-12 18:28:10 +02:00
Joerg Bornemann
643172a8df CMake: Remove ${CMAKE_BINARY_DIR} from CMAKE_PREFIX_PATH
This is a left-over from before the bin, lib, ... directories were moved
to the qtbase build directory.

Change-Id: I24bfa36289648288b2b44cc809e0c390cd2c043b
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-10-11 14:26:59 +02:00
Cristian Adam
ca02358af2 Provision RedHat libclang packages only for RedHat
While bulding on CentOS with Red Hat libclang packages we end up with
linker errors due to differences in C++ ABI used.

Ubuntu 18.04 package works fine with CentOS 8.1.

Task-number: QTBUG-86968
Change-Id: Idf0435a06046fb791b8ca1086e6465521ba6006a
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2020-10-11 14:10:42 +02:00
Heikki Halmet
aee06febca Provisioning: Install Ninja binary
Install Ninja binary without using brew

Pick-to: 5.15
Pick-to: 5.12
Task-number: QTQAINFRA-3954
Change-Id: I2f50814e26e756bbf5cf3d74a4a1c5c00426ab4a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2020-10-08 21:31:29 +03:00
Qt Submodule Update Bot
3c27956017 Update submodules on 'dev' in qt/qt5
Change-Id: Ic08739697c44645ff8aa168a3d1aefe5de9262d6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-10-07 15:08:37 +03:00
Tony Sarajärvi
04d7a43cd6 Add a Windows 10 developer build for MSVC2019
Task-number: QTQAINFRA-3759
Change-Id: I46cf3056f79c03dd3f6e62b8901a737d52c4e058
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-10-06 12:52:00 +00:00
Alexandru Croitor
ab23bc2ecf Disable warnings are errors for qemu configs
To get at least some build coverage in CI, otherwise it fails to build
in qtbase.

Task-number: QTBUG-83968
Change-Id: Ifc67d3e98c0a00ad94211f8d73efa30a35eb0e14
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Toni Saario <toni.saario@qt.io>
2020-10-05 10:52:10 +02:00
Alexandru Croitor
758ea825b9 Disable usage of forkfd_pidfd in qemu configurations
qemu can't emulate the feature properly, and that causes many tests
that use QProcess to fail. Use the newly introduced feature in qtbase
to disable the feature for qemu configurations.

Task-number: QTBUG-86285
Task-number: QTBUG-86187
Task-number: QTBUG-86198
Change-Id: Iecd5c64f6f2e98e5c5ab893b50a1fee2bc10108f
Reviewed-by: Toni Saario <toni.saario@qt.io>
2020-10-05 10:52:07 +02:00
Alexandru Croitor
b7d0021d4f CMake: Add qemu arm64 and mips64 configurations
Task-number: QTBUG-83968
Change-Id: I80a8214890f61a879b0c83acb63cef2b7958f4e9
Reviewed-by: Toni Saario <toni.saario@qt.io>
2020-10-05 10:52:05 +02:00
Alexandru Croitor
94f091907e CMake: Enable qemu armv7 configuration for all repos
Task-number: QTBUG-83968
Change-Id: I0aca9b5ff53b8383001030dc7f7555cc5aaf2be8
Reviewed-by: Toni Saario <toni.saario@qt.io>
2020-10-05 10:52:02 +02:00
Qt Submodule Update Bot
61d6a120dc Update submodules on 'dev' in qt/qt5
Change-Id: I6d79eea017bc417156db129d996408ed1bd0bae1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-10-02 13:34:15 +03:00
Heikki Halmet
b9158ca889 Provisioning: Update MSVC 2019 to version 16.7.5
Visual Studio 2019 can be updated with version specific online installer

Change-Id: I1ec1f96e68e8e3440d85240d09eec59a421708db
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-09-30 10:26:12 +03:00
Heikki Halmet
dff15e0a71 Provisioning: Add system GCC versions to versions.txt
Currently GCC versions which comes with the system are missing from
versions.txt. This change will add those

Task-number: QTQAINFRA-3933
Change-Id: I1934e6257acf92d72dcb382884aad60503b7b32f
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-09-30 10:25:50 +03:00
Alexandru Croitor
eff43863fc CMake: Enable separate debug info for the macOS packaging config
Task-number: QTBUG-86053
Change-Id: I9e8c7bceaab781bbe8f1ea507145b3521f17bbdd
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-09-29 11:41:41 +02:00
Alexandru Croitor
87b043139e CMake: Partially mirror Ubuntu developer build config
Still missing the -qtlibinfix TestInfix and Documentation feature.

Task-number: QTBUG-86053
Change-Id: Ie0acc5bbdd9b2eb4fb070c59bd0e359f40b45d72
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-09-29 11:41:38 +02:00
Alexandru Croitor
87889aa18d CMake: Mirror missing default.yaml non-framework macOS config
Task-number: QTBUG-86053
Change-Id: I7e8138a64c1f13ee8be2995579575de1fe1e6a7f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-09-29 11:41:35 +02:00
Alexandru Croitor
5a7736264e CMake: Mirror missing qtdeclarative macOS config
Task-number: QTBUG-86053
Change-Id: I43712ca086e3b0e09af70f74c7199117c3678815
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-09-29 11:41:32 +02:00
Kai Koehne
0f7c2c3739 Change license of top-level configure, configure.bat
The license should be GPLv3-EXCEPT, like for the same file in qtbase.

Pick-to: 5.15
Change-Id: I59c63c0a693394dc9f8de4706c2e113fe2ea4130
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2020-09-28 12:39:17 +02:00
Toni Saario
7ca4c85774 Enable sccache for test building
The sccache can also be used to speed up building tests. Test related
Environment variables are read by instructions and appended to tests
CMake call by: 7545511e37d69a119bbec861226700832799331f

Change-Id: I9b350f73b89e15d6b372417335acbf2312b67691
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-09-25 14:31:38 +00:00
Toni Saario
c56874a0fe Update open-vm-tools during provision
The open-vm-tools causes segfault during boot and dumping the core
freezes agent execution for the time being causing failures on
commands with short timeout.

Change-Id: Iff8807d1332b7a6d046b5a5d7d606552ebe48807
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-09-25 14:14:53 +03:00
Toni Saario
779ed5074f Disable coredump on SLES15
This causes VM slowness during the boot and the agent initialization.

Change-Id: I08ab4d56131f12af85847802230a5446a5e6fa29
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-09-25 14:14:52 +03:00
Toni Saario
cc913ca25a Enable sccache for compatible platforms
Android targets, QEMU and the Ubuntu are capable of caching artifacts.

Change-Id: I417b7e9b7bd85fb21cce6dfbb2ac8985faba58eb
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-09-25 14:14:51 +03:00
Cristian Adam
74f29a622a CMake: Update provisioned CMake to version 3.18.3
This version should fix the iOS PCH builds and Ninja Multi-Config,
as well as the issues with AUTOMOC and Ninja.

Temporarily explicitly disable the pkg_config feature on Windows
hosts, because otherwise the configuration will break. The
FindPkgConfig module in 3.18 has some additional behavior for checking
if the found pkg-config works, and that's not handled by our
qt_build_internals_disable_pkg_config_if_needed function in qtbase.

Fixes: QTBUG-86862
Change-Id: I80514d3d7896ae09ab252aed10e86725fae0cc9c
Reviewed-by: Toni Saario <toni.saario@qt.io>
2020-09-25 08:58:20 +02:00
Heikki Halmet
2076163c5e Provisioning: Install STM32CubeProgrammer
This will install STM32CubeProgrammer to Windows 10 needed by
MCU RTA

Task-number: UL-3091
Change-Id: I97f7df33af9bf4c56849c1cf3c93b3a413ba6f44
Reviewed-by: Milla Pohjanheimo <milla.pohjanheimo@qt.io>
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
2020-09-24 10:12:54 +03:00
Allan Sandfeld Jensen
6928140325 Update qtwebengine.yaml
Based on default with a few unsupported platforms removed

Change-Id: I8edfa83f3cc09172c041e8dd6adaf96666d0238d
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-09-23 10:43:30 +02:00
Heikki Halmet
08c253a625 Provisioning: Install MCUXpresso
MCUXpresso IDE provides the tools for flashing and onboard debugging

Task-number: UL-3091
Change-Id: I05224af4ae7528f219f1b682ecd14bd0e331e3bf
Reviewed-by: Milla Pohjanheimo <milla.pohjanheimo@qt.io>
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2020-09-22 14:27:46 +03:00
Samuli Piippo
370586a9d9 Add platform configs for Boot2Qt docs
Change-Id: Id0f2cdaa04d73d8f68ac8dc97ec865b80568473a
Reviewed-by: Toni Saario <toni.saario@qt.io>
2020-09-22 11:00:06 +03:00
Heikki Halmet
af9db93238 Provisioning: Change default stable-secret to based on MAC
Cloned VM generate same IPv6 link local addresses as the original host.
The approach of generating link-local IPv6 address can be changed
per-interface from stable-secret to based on MAC. This change will
remove IPV6_ADDR_GEN_MODE line which should be enough to change
default stable-secret to based on MAC.

Task-number: QTBUG-84254
Change-Id: I9455a8b11902d35517f43228b4ef63a884ca7522
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-09-18 11:32:25 +03:00
Alexandru Croitor
4c4bc9352d Re-add macOS host Android target qmake configuration
Partially reverts 37cb787dc1

Change-Id: Ida0d4095502ffc219cc290e3247b3dfb57dbd4bb
Reviewed-by: Liang Qi <liang.qi@qt.io>
2020-09-17 15:07:58 +02:00
Alexandru Croitor
195a8210c1 CMake: Add Windows10 x64 MinGW 8.1 host Android CMake targets
Adds the missing Windows host Android target configurations.

Each android architecture we support is re-added as a separate
configuration, because CMake builds currently don't support multi-abi
builds as tracked in QTBUG-80943.

Task-number: QTBUG-86053
Task-number: QTBUG-85911
Change-Id: I421c6fc726a4813dbab5fcd67961ae4124eccb13
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2020-09-17 12:48:32 +02:00
Alexandru Croitor
89dc32b516 CMake: Add macOS host Android target configs
This partially reverts 37cb787dc1
because it reintroduces the macOS host Android configs which were
removed due to qtbase std::pair shenanigans.

Each android architecture we support is re-added as a separate
configuration, because CMake builds currently don't support multi-abi
builds as tracked in QTBUG-80943.

Task-number: QTBUG-84924
Task-number: QTBUG-86053
Change-Id: Iac48ab41a1eb9cf1e4219f62683355d1bb9a9891
Reviewed-by: Liang Qi <liang.qi@qt.io>
2020-09-17 12:48:29 +02:00
Alexandru Croitor
9ad520eba2 CMake: Add missing Linux host Android x86_64 target config
It wasn't added before, because it didn't build due to an issue
in qtbase regarding qdrawhelper.cpp and avx2, which is now fixed
in ff1a44be33f4bc05d502a2ca49171e0408992f61 in qtbase.

Task-number: QTBUG-86053
Change-Id: I425e6a81840276a850bd95db45d5ecdfae5487a8
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2020-09-17 12:48:26 +02:00
Jani Heikkinen
67618e9138 Update submoduls on 'dev'
Change-Id: Ic6c369fe658b74f0fbc739f145b858999e679179
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2020-09-17 07:06:09 +03:00
Konstantin Tokarev
f73fa57088 Provisioning: Update Conan to 1.29.0
Task-bumber: QTQAINFRA-3916
Change-Id: I52d8a0255efcc7b4b139ec5050cf3d59003f12a9
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-09-16 08:58:35 +03:00
Konstantin Tokarev
c79904c463 Provisioning: Update Conan packages
* Update libjpeg-turbo to 2.0.5
* Replace MinGW 7 packages with MinGW 8
* Remove zlib packages as Qt is consistently built with -qt-zlib now

Task-bumber: QTQAINFRA-3916
Change-Id: Ib3355265dc35326d30eacb60d0e3c97f06e6f9be
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-09-16 08:58:33 +03:00
Heikki Halmet
dd2111cf9f Provisioning: Disable daily cron jobs from SLES 15
Task-number: QTQAINFRA-3919
Change-Id: Iabf03aeadb3f0fa7091428ef3ea6075b199d9c77
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-09-15 18:44:46 +03:00
Heikki Halmet
51fc48896c Provisioning: Disable btrfs balance jobs
Btrfs use lot's of CPU while running

Task-number: QTQAINFRA-3919
Change-Id: I08b89b57c92d90f752dde76375711e61ed173c2c
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-09-15 18:44:41 +03:00
Heikki Halmet
031bc19ae6 Provisioning: Disable fstrim.timer
fstrim scans the filesystem and sends 'UNMAP' commands for each
unused block it finds. Let's disable it so it won't cause unexpected
situations.

Task-number: QTQAINFRA-3919
Change-Id: I20c97441fd47728a3063ae50f87fe6347186bdbd
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-09-15 18:44:12 +03:00
Johanna Äijälä
b43c199d4a Add missing Squish installation to win10 x86 Squish archive
Win10 x86 archive was missing msvc142 x86 package.

Pick-to: 5.15
Change-Id: I532c3a1129d75968c22b721390ff474548e642bf
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-09-11 08:05:30 +00:00
David Edmundson
c416b79407 Cmake: Include 3rdparty cmake dependencies in CMAKE_MODULE_PATH
QtWayland looks for WaylandScanner. If QtBase is installed our CMake
find files will be installed and everything will work correctly.

If QtBase is not installed yet or out of date, we need to add our source
cmake files to the search path. We currently add one of the 3rd party
directories, but not the subdirectories.

Change-Id: I53ce26b5b21b7e5e74752c730bca90295147f851
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-09-10 09:54:47 +01:00
Alexandru Croitor
572aadf1fb Android: Fix typo in ANDROID_SDK_HOME Windows host env var
Apparently qmake doesn't actually use the env var, but this failed
the WIP CMake Android configurations.

Amends e3600116b3

Change-Id: I30866af0eb63efefe72b709182f8cb5ba3250b12
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-09-09 13:58:17 +02:00
Heikki Halmet
e3600116b3 Provisioning: Update Android ndk and build tools
Task-number: QTQAINFRA-3846
Change-Id: I5d3c0efce86e3b8bc3c6070ed4a9e438647bb955
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2020-09-08 14:52:22 +03:00
Alexandru Croitor
bfe83a7ea2 CMake: Add SLES config to mirror qmake one
Task-number: QTBUG-86053
Change-Id: Ia4159d2293597542f34a9fe847f29acc4743551c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-09-08 13:52:05 +02:00
Alexandru Croitor
9c2db89a83 CMake: Provision CMake on SLES to allow building Qt
Task-number: QTBUG-86053
Change-Id: Icbc882ed6011373c14f47f559b4370baa37fbb7e
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-09-08 13:52:05 +02:00
Alexandru Croitor
465e18ee10 CMake: Add some missing Linux host Android target architectures
In Qt 5 times, qmake was able to build libraries for multiple Android
ABIs in one build tree.

In Qt 6.0 + CMake we can't do that yet, which is tracked in
QTBUG-80943.

We still need to build and ship libraries for all the ABIs, so use the
old style approach of one configuration per ABI.

Add some of the missing ABIs for the Linux host case:
arm64-v8a, armeabi-v7a, x86.

The x86_64 ABI will be added in a separate change, due to a bug in
qtbase regarding Gui's qdrawhelper.cpp and avx2.

Because it's a lot of copy pasting, move the configs into a separate
yaml file so it's easier to search and replace in the future.

Task-number: QTBUG-86053
Change-Id: If8419ce20ac033b644c49c0bac70196cd30fd679
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Toni Saario <toni.saario@qt.io>
2020-09-08 13:52:05 +02:00
Alexandru Croitor
4da335cfda CMake: Remove superfluous host configure arguments on target configs
Now that we reuse host artifacts, there's no point in specifying host
configure arguments on target configurations, they aren't used.
Remove them to avoid confusion.

Change-Id: I176fe421bc36772cb29929c082ea76946210f98b
Reviewed-by: Toni Saario <toni.saario@qt.io>
2020-09-08 13:52:05 +02:00
Alexandru Croitor
a87493aede CMake: Switch Linux host Android target build to RelWithDebInfo
Change-Id: I9e96339019e56b847ddf1125cc7465cfc9506eae
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-09-08 13:52:05 +02:00
Heikki Halmet
6e3cb240df Provisioning: Retry python installation if failure occurs
Python installation is flaky and we haven't be able to determine the
root cause for it. Re-running the installation might help.
(Might) because we can't reproduce this manually.

Task-number: QTQAINFRA-3875
Change-Id: Id46d250a02e01007f03dfbb886d75b23c23a6216
Reviewed-by: Toni Saario <toni.saario@qt.io>
2020-09-04 08:19:15 +03:00
Johanna Äijälä
91c267a677 Provisioning: update Squish to 6.6.1 based on Qt5.15.0
Add Squish for Web installation, update Squish license.

Pick-to:5.15

Change-Id: Id418830e82718afc20ac7390400342a6b0401a64
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-09-03 10:39:41 +03:00
Samuli Piippo
be4e07e534 provisioning: add diffstat for yocto builds in Ubuntu 20.04
Change-Id: I912021e4533fcad0ac45a86bb31f8cf01e176172
Reviewed-by: Toni Saario <toni.saario@qt.io>
2020-09-02 17:28:06 +03:00
Samuli Piippo
077a8080a2 Make meta-qt6 platform configs module-only
Don't use configs from default.yaml

Change-Id: Ic86ef0e3b7ed764bd1df9703385194ee364aada6
Reviewed-by: Toni Saario <toni.saario@qt.io>
2020-09-02 17:28:06 +03:00
Samuli Piippo
a882d44fe1 Add platform configs for meta-qt6
Uses same configs as meta-boot2qt

Change-Id: I78e385aa6b69dc99d956a5b50dc1b5671d1872a5
Reviewed-by: Toni Saario <toni.saario@qt.io>
2020-09-01 15:02:28 +03:00
Heikki Halmet
9028eb10a5 Revert "Print all error messages during Python provisioning"
This reverts commit 59f141ec3c.

Reason for revert: Provisioning will continue even if python installation fails

Change-Id: Iaa0a48a2179c2198a32fb9a4feb55266cc64c396
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-09-01 09:00:36 +00:00
Heikki Halmet
59f141ec3c Print all error messages during Python provisioning
Print verbose, debugging and error messages to log in case of installer
failure.

Task-number: QTQAINFRA-3875
Change-Id: I2a701a655bd5e9b434011d3c68a2d8a31e119103
Reviewed-by: Toni Saario <toni.saario@qt.io>
2020-08-27 15:02:55 +03:00
Simo Fält
6d4d1e3501 Fix qt rta platform configs
Invalid syntax prevents listing for configs.

Change-Id: I15ba9dab57ed63c7949f3625a4e89adf4af3df89
Reviewed-by: Toni Saario <toni.saario@qt.io>
2020-08-27 11:41:23 +00:00
Tony Sarajärvi
6f255f9a69 Provision ssh into Ubuntu 20.04
Change-Id: Id417bf80d6de4181cbdad86b0208010c39f01ac7
Reviewed-by: Toni Saario <toni.saario@qt.io>
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
2020-08-26 09:02:57 +00:00
Tony Sarajärvi
7a5069e979 Update QDoc libclang to 10.0
Change-Id: Ic4899f188c92502c6f6808dcc05922d4980cadfd
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
2020-08-25 21:39:00 +02:00
Alexandru Croitor
22af804aee CMake: Reuse host artifacts for all our cross-builds
Add a new Ubuntu 20.04 host to be used for the qemu configs.
We might be able to use the RHEL 7.6 host artifacts for qemu target
configs, but i'd rather we test on the same distro / OS for both
host and target.

Use the macOS host for iOS builds.

Task-number: QTBUG-85623
Change-Id: I6305f924b843a5a832bd94e5060211583c9c7f98
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2020-08-25 17:39:34 +02:00
Toni Saario
2920b36fa7 CMake: Build Android with artifacts from host RHEL build
Task-number: QTBUG-85623
Change-Id: I93bdbc9fda00fbe2b65d6e4e8ac5fa407f3469db
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2020-08-25 17:39:28 +02:00
Daniel Smith
01d5c84c16 Update submodules on 'dev' in qt/qt5
Change-Id: I9079dc4c1f0922786870ab1bc7b84ddd52b54521
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2020-08-25 09:55:10 +00:00
Heikki Halmet
99a15a2cd4 Provisioning: Install Java for SLES 15
Java is needed by RTA jenkins

Change-Id: Ibe6c7fa211eb83b431dc3ee79ed93300796154b0
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-08-23 11:30:05 +00:00
Heikki Halmet
48dd29987f Provisioning: Add more sleep to msys2 installation
Latest Windows 10 v2004 needs more sleep for msys2 installation so that
gpg-agent will be killed after the installation process is finished.
Otherwise the provisioning won't continue and it will fail to timeout.

Task-number: QTQAINFRA-3691
Change-Id: I8b214415e777845e9ff711c1de9b09553b715d92
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-08-23 14:30:04 +03:00
Tor Arne Vestbø
e8dcff8a25 Bump qtqa to version that includes BIC test fix
Change-Id: Icd7dc7e73e98043e52034922cb90cf63ba66dd92
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2020-08-22 16:27:03 +02:00
Toni Saario
8f15d5af86 Mark module specific ubuntu20.04 configs insignificant
These are missing from the initial patch:
  716144073c
And currently block qtbase integrations.

Change-Id: Ife192aebf93b6344ff0341aed275ea2e104c6799
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-08-21 18:45:53 +03:00
Alexandru Croitor
177b0b0ea4 CMake: Update provisioned CMake version to 3.17.4
This CMake version among other things, fixes a bug with
Ninja Multi-Config writing into the same response file
on Windows, which can cause wrong libraries to be linked
(mixing Debug and Release libs).

Also disable PCH for iOS configs, because that seems to be broken
again.

We can't upgrade to 3.18.2 because that breaks iOS PCH in a different
way than 3.17.4, and because of an AUTOMOC regression introduced when
using Ninja Multi-Config.

Fixes: QTBUG-85586
Change-Id: I04c08d3a8bfb88433f2d50f4d41d11fc0df3d7ec
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-08-21 17:45:48 +02:00
Tony Sarajärvi
716144073c Mark some Ubuntu 20.04 confs as Insignificant due to failing tests
Task-number: QTBUG-86187
Change-Id: I5354cc6a9ca3970c1dffe6bef97996e5aba5e09b
Reviewed-by: Toni Saario <toni.saario@qt.io>
2020-08-21 11:32:29 +00:00
Alexandru Croitor
d44a1dafcc CMake: Add configuration flags to build sql plugins
Add various CMake configuration flags to enable building of the same
sql plugins that the qmake configurations do.

While qmake has various introspection mechanisms for finding plugins
inside
qtbase/src/plugins/sqldrivers/configure.json and configure.pri,
in CMake-land we sometimes need to be explicit and pass 3rd party lib
paths, so that the FindFoo.cmake modules successfully find the
libraries.
Sometimes it's not necessary because the find modules also do some
introspection in default paths like looking /usr on Linux, or
'C:\Program Files' on Windows.

While some qmake configs provide mysql path hints (like on Windows),
the plugin is actually disabled on purpose due to licensing issues
as per a05bd71ede and QTBUG-76081.

Also the qmake configs specifying arguments like -plugin-sql-sqlite
and -plugin-sql-odbc is redundant. These switches force enable the
corresponding features in src/plugins/sqldrivers/configure.json,
but it's actually not necessary because all the features (except
system sqlite3) are auto-detected and enabled if the actual 3rd party
library is found. The same is the case for the CMake build, so there's
no need to manually enable the features.

While the qmake qemu configs don't explicitly disable the mysql plugin
and actually provide a Yocto SDK mysql path via -mysql_config,
the library does not end up being found. It's unclear whether this is
a bug (despite the licensing issue mentioned above) or on purpose.
But the CMake build doesn't find it either, so it's consistent.

And I suppose -psql_config /dev/null is meant to disable the
postgresql plugin on QEMU configs. The QEMU CMake build doesn't find
the postgresql library by default anyway, so the result is also
consistent.

Sql plugins built per packaging config:

macOS: odbc, postgres, bundled sqlite
RHEL: odbc, postgres, bundled sqlite
Win10 MSVC x64: odbc, postgres, bundled sqlite
Win10 MinGW x64: odbc, postgres, bundled sqlite
Android any arch: bundled sqlite
iOS: bundled sqlite
QEMU any arch: bundled sqlite

Task-number: QTBUG-86053
Change-Id: Ic759eb29fc5350cbdfe2825817af74767c4fb12a
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-08-21 10:05:46 +02:00
Joerg Bornemann
a42797851e Remove deprecated configure argument from CI configs
The -no-qpa-platform-guard configure argument is deprecated and has no
effect.

Pick-to: 5.15
Change-Id: I132ccdf036c52baf54cf0c789fa063cc0455ce09
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-08-21 10:05:46 +02:00
Tony Sarajärvi
a509883207 Replace Ubuntu 18.04 with 20.04
Task-number: QTQAINFRA-3699
Change-Id: Id8c2bc2160d6805339c29961cec784d64c5f0c4d
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-08-20 21:44:32 +00:00
Jędrzej Nowacki
015c86534c Enable use of sccache in the CI
The sccache may significantly reduce build times.
We need to evaluate real cases to see how much is to gain.

This patch enables sccache only on cmake, exluding one msvc target
with debug flag -Zi, which creates separate debug symbols.
Related sccache issue:
  https://github.com/mozilla/sccache/issues/242

Task-number: COIN-130
Done-with: Aapo Keskimolo <aapo.keskimolo@qt.io>
Change-Id: Ic1f599c5194bcdee9528a548dabead1097821cd1
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-08-19 12:59:16 +03:00
Heikki Halmet
ba4eb4929e Provisioning: Update Windows 10 x86_64 to version 2004
MSVC 2019 version 16.6.2
MSVC 2019 Build Tools version 16.6.2
Virtio driver
Virtio Balloon driver
NetKVM driver

Task-number: QTQAINFRA-3818
Task-number: QTQAINFRA-3817
Change-Id: Id0edee66d4eb42730a70495dbb063a0d379f026c
Reviewed-by: Toni Saario <toni.saario@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2020-08-18 04:35:50 +00:00
Heikki Halmet
c1b06ec3e5 Provisioning: Renew iPhone signing tools
Task-number: QTQAINFRA-3434
Change-Id: I53665bf4e0799da7a23ba60aff37e26052d0374a
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
2020-08-14 09:39:03 +03:00
Jani Heikkinen
202e189233 Adjust Qt6.0.0 modules
Statuses etc are based on https://wiki.qt.io/Checklist_for_Qt_6.0_inclusion

Change-Id: If59d26cd2e9f381bef81308292675c5300672c25
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2020-08-13 15:53:01 +00:00
Jannis Voelker
ace639471b Enable CMake builds for Qt OPC UA
Change-Id: Id0762f82a1493163f253f4512f23e80a375b2093
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-08-10 08:35:38 +02:00
Heikki Halmet
163c23f97c Provisioning: Upgrade GCC version from 9.2 to 9.3
Task-number: QTQAINFRA-3858
Change-Id: I5266162d1c144b117e3a61988f3348f2cd3d3c0a
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2020-08-07 08:29:30 +03:00
Alexandru Croitor
5c1792eb8d CMake: Enable CMake builds for qtmqtt
Change-Id: I7f47fea8a15751d8367747a32bc211e25524e376
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-08-06 14:17:36 +02:00
Jani Heikkinen
0d6b74083e Add 'Packaging' feature for mingGW build as well
We will ship pre-built binaries for minGW in Qt6 as well so add
packaging feature in it as well

Change-Id: I7b506fd0c8227cef478f461e02ae1d4549f0a507
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-08-05 12:55:41 +03:00
Simo Fält
969acbce6e Provisioning: Fix PYTHON3_WHEEL_CACHE pointing to wrong dir
Earlier we set the env variable point to latest Python install. It
did work by accident, while the default python was installed as last.
Now each python install has its own matching ENV variable that can
be used buildtime. The PYTHON3_WHEEL_CACHE will now point to 64 bit
default Python3, while the variable is already used in Qt codebase.

Pick-to: 5.15
Change-Id: I6a67936c06ed0209ef9e903120f2416aaa8eb3ff
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2020-07-30 21:27:48 +03:00
Alexandru Croitor
e1da3e7ee4 CMake: Add qemu armv7 qtsvg builds
Move the configuration from qtbase into a new
cmake_platforms_qemu.yaml file, and include it in qtbase and qtsvg.

Also enable CMAKE_AUTOGEN_VERBOSE to see what moc is being called
and with what parameters.

Task-number: QTBUG-83968
Change-Id: Ib893c6f8cb498b9b5c7da79218de22a28ffdb83f
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-07-27 11:16:48 +02:00
Toni Saario
3271bb2fe2 Provisioning: Add delay after network setting change
In many cases without waiting, next script would be missing network
and fails.

Pick-to: 5.15
Change-Id: Iab50945716860618b495029ce179183d844dc98a
Reviewed-by: Simo Fält <simo.falt@qt.io>
2020-07-22 05:33:26 +00:00
Simo Fält
bdea3c8164 Provisioning: Fix Python3 install in 32 bit win10
There is no 32 bit win10 configurations in CI, so we do not verify
any of the provisioning changes on it.

Pick-to: 5.15
Change-Id: I1c1e183908ffb09be4e2992ccbd1da7af2640181
Reviewed-by: Toni Saario <toni.saario@qt.io>
2020-07-21 09:43:32 +03:00
Simo Fält
607b33aab2 Provisioning: Install Python 3.8 for testing Qt for Python
This installs Python 3.8.1 to be used with Qt for Python. It keeps
the old 3.6 as a default python3.

Pick-to: 5.15
Change-Id: I8ea121514f6a4092f700688363c282cbea37a75b
Reviewed-by: Toni Saario <toni.saario@qt.io>
2020-07-16 10:10:23 +03:00
Alexandru Croitor
a97bdde4d4 CMake: fix tst_qtiff on MinGW
CMake is picking up libtiff from the provisioned Strawberry Perl location.
Specify -DFEATURE_system_tiff=OFF in the NON_QTBASE_CONFIGURE_ARGS to
disable usage of that library, and thus fix the crashing test.

Amends 4b4f0be08d

Task-number: QTBUG-84886
Change-Id: Iecc880d367db76e91f8c5f92b0849f1ad43382a3
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-07-13 15:57:07 +02:00
Alexandru Croitor
b2014f2eff CMake: Add non-qtbase configure argument placeholders
The qtbase Coin instructions will start reading the values of the
environment variables NON_QTBASE_CONFIGURE_ARGS and
NON_QTBASE_TARGET_CONFIGURE_ARGS.
These are used to pass configure args to repositories other
than qtbase to allow disabling certain features per-repo.

Unfortunately we have to explicitly set the env var values to empty
strings so that the instructions work correctly, otherwise Coin
replaces them with a '<no value>' token, which breaks the
CMake configuration phase.

For some reason the issue only happens on the Windows MSVC
configuration, but we set them for the other configurations as well
to avoid any future breakages.

Task-nunber: QTBUG-84886
Change-Id: I4b095f71c6e484a0e67a53eb6ea9d5ca4f2a6a0c
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-07-13 15:57:01 +02:00
Tony Sarajärvi
35b431cb9e Remove Windows 7 builds from Qt6
Task-number: QTQAINFRA-3750
Change-Id: Iea7ccca4695ce3f72547044ee2371c761f026eb4
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-07-07 12:05:14 +00:00
Oliver Wolff
dafcb7edb4 add cmake qtconnectivity
Change-Id: Ia9c3bf065b51aeea3cd789673103c609a362034c
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
2020-07-05 12:20:40 +00:00
Qt Submodule Update Bot
331fa17a71 Update submodules on 'dev' in qt/qt5
Change-Id: Ieb8a21e50924f8eed9bcecddf37fd3c4a8696c64
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-07-04 15:11:41 +03:00
Qt Submodule Update Bot
549b594549 Update submodules on 'dev' in qt/qt5
Change-Id: I90b87267ff456c536e188ca61132f06adcac9117
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-07-03 13:09:18 +03:00
Liang Qi
10cc4b07cb Merge "Merge remote-tracking branch 'origin/5.15' into dev" 2020-07-02 11:34:45 +02:00
Liang Qi
029cabb729 Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
	coin/platform_configs/default.yaml
	coin/platform_configs/qt5.yaml
	coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh

Change-Id: I57f8a62c4f146cd1eda26885ce1507c072cb107f
2020-07-02 11:22:30 +02:00
Allan Sandfeld Jensen
a0cda005ef Update qtwebengine.yaml
Updated to match new default configurations.

Change-Id: I536454b5c3de4a4917cb8d1f0b391fbb20e6f8d1
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-07-02 10:42:53 +02:00
Qt Submodule Update Bot
67ff8eb958 Update submodules on 'dev' in qt/qt5
Change-Id: Ia30e89934e7d8cc7f7bdb5af6180bba8a8d5f10f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-07-02 00:00:53 +03:00
Alexandru Croitor
7d60bb1349 CMake: Enable CMake builds for qtremoteobjects
Change-Id: I597110ee3378ed46ce74a0ceb4bdb4d297c5f9bd
Reviewed-by: Simon Hausmann <hausmann@gmail.com>
2020-06-30 10:14:15 +02:00
Heikki Halmet
7143d018dc Provisioning: Update OpenSSL to version 1.1.1g
Task-number: QTQAINFRA-3819
Change-Id: Ie7d0f3a0c73d123c3f3536e6b2dd2eb8608eb9cd
(cherry picked from commit 2ac3dd2d6f)
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-06-30 07:00:46 +00:00
Toni Saario
5fb198a159 Use same tier 2 template for all windows 10 targets
The cmake platform was not updated when other platform were updated
to use -17 image.

Change-Id: Ide69d7d6119f472529570960021de9f05e53d8bd
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-06-29 12:38:02 +03:00
Tony Sarajärvi
75ae2c8579 Disable LSO from the network adapters on Windows
Disabling LSO from the adapter gives us huge performance boosts
on Windows. In our tests 2 VMs within the same hosts had transfer
speeds of 30 Mbit/s with this enabled, and 2Gbit/s with this disabled.

Change-Id: Id794e7559c9e9005043361289a3db246a8528dd4
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 97aa7a0031)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2020-06-29 05:21:35 +00:00
Qt Submodule Update Bot
e40b12af18 Update submodules on 'dev' in qt/qt5
Change-Id: I195fa0ce77f1dd176c74cdf7d8b34f88fd8def42
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-06-26 18:41:30 +03:00
Tony Sarajärvi
97aa7a0031 Disable LSO from the network adapters on Windows
Disabling LSO from the adapter gives us huge performance boosts
on Windows. In our tests 2 VMs within the same hosts had transfer
speeds of 30 Mbit/s with this enabled, and 2Gbit/s with this disabled.

Pick-to: 5.15
Pick-to: 5.12
Change-Id: Id794e7559c9e9005043361289a3db246a8528dd4
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-06-26 10:22:54 +00:00
Alexandru Croitor
36bd8972ad CMake: Build and run tests for qtbase on armv7 configuration
Remove the DisableTests feature to force the qtbase instructions
to build and run the tests.

Task-number: QTBUG-84423
Task-number: QTBUG-83968
Change-Id: Ic904c7b0f3d6d6ab8a546d683b0110b0704bf42c
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-06-25 17:16:55 +02:00
Alexandru Croitor
1f52b8f8e5 CMake: Change armv7 configuration to prepare for building tests
Switch the configuration to have release + developer-build similar
to the qmake configurations.

Add debug info for extra spiciness.

Specify a new env variable called QT_SYSROOT_FOR_RUNNING_TESTS which
will be used by the qtbase instructions to set QEMU_LD_PREFIX, which
is needed to run the tests via qemu.

Specify the QT_QUICK_BACKEND=software env var as well as the
GST_PLUGIN_SCANNER env var, because the qmake configurations do it.

Make sure to cross-build tools, because some of the tests like
tst_uic and tst_rcc expect the tools to be there.

Note that DisableTests feature is left on purpose, so we can decouple
the building from the testing in 2 different steps.

Task-number: QTBUG-84423
Task-number: QTBUG-83968
Change-Id: Icf6b12e6942c6ae6a0445eeac3f88704ca797148
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-06-25 17:16:53 +02:00
Alexandru Croitor
55c1953288 CMake: Switch the MinGW config to 64 bit and Windows 10
Change-Id: I45e60289bc508b5e82167d5c5be1e27506729833
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2020-06-25 13:25:38 +02:00
Cristian Adam
4b4f0be08d CMake: fix tst_qtiff, tst_qrawfont on MinGW x86
CMake was picking up libtiff and libfreetype from Strawberry Perl
MinGW distribution. By specifying -DFEATURE_system_tiff=OFF and
-DFEATURE_system_freetype=OFF we should fix these problems.

-DFEATURE_system_jpeg=OFF was also added, even though tests are
not failing.

Task-number: QTBUG-84886
Change-Id: I324304bfbf8fcdb2de04ad0481eca1c7534a3cfd
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-06-24 21:05:50 +02:00
Heikki Halmet
2ac3dd2d6f Provisioning: Update OpenSSL to version 1.1.1g
Pick-to: 5.15
Pick-to: 5.12
Task-number: QTQAINFRA-3819
Change-Id: Ie7d0f3a0c73d123c3f3536e6b2dd2eb8608eb9cd
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-06-23 06:36:38 +00:00
Qt Submodule Update Bot
cd021169a1 Update submodules on '5.15' in qt/qt5
Change-Id: I23e14120044d3d165bdd6fb516b207471c090faf
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-06-22 23:46:29 +02:00
Qt Submodule Update Bot
bc437dd773 Update submodules on '5.15' in qt/qt5
Change-Id: Ic137eafef1116252f2ed4317463713b9bdfd9d67
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-06-20 23:47:34 +02:00
Qt Submodule Update Bot
1095b1abc6 Update submodules on '5.15' in qt/qt5
Change-Id: I136877d3881f9288086f4ef34a8768ca4333adf3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-06-19 23:46:35 +02:00
Qt Submodule Update Bot
de3cffca04 Update submodules on '5.15' in qt/qt5
Change-Id: Ia61caaf7838df31baa1ed53abce2de3f4d514b05
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-06-19 11:02:41 +02:00
Alexandru Croitor
43b7a3693e CMake: Fix parsing of .gitmodules to be more robust
Fix empty lines in .gitmodules, rather than failing to configure
with an error message that the line is malformed.

Quote all relevant values, to avoid errors that string REGEX does
not have enough arguments in cases when the parsed content is
malformed.

Remove some dead code.

Change-Id: I300a76f82fe174290442c659ca2e84391db361a1
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-06-18 12:57:51 +02:00
Qt Submodule Update Bot
ac489d92a3 Update submodules on '5.15' in qt/qt5
Change-Id: I2c3da4ef65c9a669a54ada33c2760f541585fd8d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-06-17 23:46:52 +02:00
Qt Submodule Update Bot
da578e2b17 Update submodules on '5.15' in qt/qt5
Change-Id: I276a28fe36ae88d770bd8385810a17149ac7f6ee
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-06-17 19:29:47 +02:00
Alexandru Croitor
4a0429a82f CMake: Use CMake configurations as packaging ones
Remove the "Packaging" feature from the qmake configurations in
qt5.yaml and default.yaml.
Note that "Packaging" configurations in other .yaml files are not
touched yet, because there are no CMake ports for those. These are
qdb.yaml, qtwebkit.yaml. qtwebengine.yaml, etc.

Assign the "Packaging" feature to the closest equivalent CMake
configurations we have.

MinGW is not tagged with Packaging for now, because a decision needs
to be made what will the Windows7 32 bit configuration be replaced
with.

At the moment, not every qmake configuration will have an equivalent
CMake configuraiton. As a result WebAssembly goes away as a
Packaging configuration for Qt 6.0.

Task-number: QTBUG-85047
Change-Id: I09b6956b6b9c7393b5e095f826d72e92b81594d0
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-06-17 15:44:17 +02:00
Laszlo Agocs
b5ab804efd Set QT_QUICK_BACKEND=software in QEMU configs
In Qt 6 things get more complicated because we have Vulkan, Metal and
D3D in addition to OpenGL. Qt Quick will only default to the software
backend when no graphics API was available at build time - and this
not true for the QEMU configs because the Ubuntu env has both OpenGL
and Vulkan headers, so they both are enabled, but are not usable at run
time. To simplify life, just state the Qt Quick backend we want the
tests run with.

Change-Id: I63cd9534bc8cd5d0568235bc2035f5613d29ced4
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-06-17 15:43:44 +02:00
Alexandru Croitor
ae1cf52b64 CMake: Add a Qt namespace build
Change the ubuntu developer build to a namespace build.
We need to have namespace build coverage in CMake configurations
like in the qmake ones.

Task-number: QTBUG-84881
Change-Id: I429a11486bd9a0c60a3d0423a9a41dc436f32f1e
Reviewed-by: Simon Hausmann <hausmann@gmail.com>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2020-06-16 18:04:02 +02:00
Alexandru Croitor
349bd02173 CMake: Update instruction file to accept cross-compiling configs
This is needed for consistency.

Previously if you scheduled a test build for a qt5.git change, the
cmake cross compiling configurations would not appear and not be
tested.

But when staging the change, each repo WOULD start building the
cross-compiling configurations, except for the qt5.git top-level
builds.

The current change will make sure that configurations is done both
during scheduled test builds and actual staged builds.

Change-Id: Ia2cbb08cee97414c39287a2ab9ff8d312dcd813a
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2020-06-16 15:46:53 +02:00
Toni Saario
0cc1973ba8 CMake: Deduplicate the cmake platforms
After Coin commit 60a6f795f5923c7c206b3fec4ebad991ce30d633 it is
possible to include other intermediate configuration files.

Create a new cmake_platforms.yaml file which will contain the default
list of platform configurations to be tested in all cmake-enabled
repos and qt5.git.

Task-number: QTBUG-85044
Change-Id: I10e4dff8793a1ffb5776e00dac80f43394d18578
Reviewed-by: Toni Saario <toni.saario@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-06-16 15:46:50 +02:00
Alexandru Croitor
6fd1d05b08 CMake: Align the CMake Packaging configurations with the qmake ones
For releasing purposes, we should align the configure arguments
(actually CMake arguments) of the Packaging configurations with the
ones we used for Qt 5.15.x releases.

In particular for linux builds this means disabling the use of a few
system libraries (a new one that needs to be disabled is
double-conversion, it was not provisioned for Qt 5.15.x builds, but
was installed for dev builds).

Apply the changes across all repos, to be consistent and build the
same for qt5.git and per-repo builds.

Task-number: QTBUG-85047
Change-Id: I784abc6367bcda574691758942f89257e891647e
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2020-06-16 09:57:53 +02:00
Qt Submodule Update Bot
dc15442a43 Update submodules on 'dev' in qt/qt5
Change-Id: I7b7b1bff3b511d684d682604be7b80e0909fd54b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-06-15 20:32:07 +03:00
Mike Krus
df53ff5f85 Add Qt3D back to addon list and update submodule
Getting ready for Qt 6 inclusion.

Change-Id: I5e823ba5c9c0e42cb9afc3ce32d68fa44322f21a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-06-13 20:41:58 +01:00
Mike Krus
5eb89fa898 Add Qt3D Coin config file
Change-Id: I65f7fc2bd972484e82e0479311a41b364ace908c
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-06-13 20:41:54 +01:00
Qt Submodule Update Bot
95ac2d82ae Update submodules on '5.15' in qt/qt5
Change-Id: I1bc988ae72c7c6127740c5ecca9179e9108db200
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-06-12 23:46:30 +02:00
Alexandru Croitor
3b7da852e6 CMake: Fix a lot of failing tests on MinGW 32bit due to debug symbols
When building a RelWithDebInfo configuration, the debug symbols for
the libraries are embedded into the .dlls. This causes the file size
to be really big (around 400MB for libQt6Gui.dll). On a 32-bit system,
the Windows loader failed to map such big libraries into memory,
and thus certain tests failed with exit code 0xc0000017
which means STATUS_NO_MEMORY.

The solution is to enable the separate debug info feature, to split
the debug files into separate files, just making they dlls nice and
small.

This should fix quite a few of the failing MinGW 32-bit tests for
qtdeclarative, qtquickcontrols2, etc.

Task-number: QTBUG-84886
Change-Id: I10ae0acca5d7d5523d3ae2f0c49587ace239f301
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2020-06-12 19:28:53 +02:00
Alexandru Croitor
b4d6eed112 CMake: Replace all Windows configurations with Ninja Multi-Config
All the qmake MSVC Windows configurations are debug_and_release ones,
so the equivalent CMake configurations should be the same for all
repositories.

Task-number: QTBUG-80900
Task-number: QTBUG-84883
Change-Id: I083d7a355558666a5f66efdffb592f5e93705547
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2020-06-12 19:28:48 +02:00
Alexandru Croitor
849fe06871 CMake: Enable CMake builds for qtandroidextras
Everyone forgot to enable it after finishing the port.
We should enable it, so it's tested for per-repo integrations as well.

Task-number: QTBUG-78171
Change-Id: I8e024809b4ece5d0775817e072968b7162d7a38c
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-06-12 19:28:45 +02:00
Alexandru Croitor
7dd0a8c1d4 CMake: Fix qtcoap configuration to use simulator_and_device iOS builds
Just to be consistent with the rest of the files.

Amends 803eb987ad

Task-number: QTBUG-80899
Change-Id: I26212c5367da7b8bf14e4a7d46b96ffb82bf9aab
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-06-12 19:28:42 +02:00
Alexandru Croitor
32ccf2a0cd CMake: Enable qt5.git CMake top-level / super builds
Add simple instructions to only configure and not build top-level
builds, similar to what the qmake configurations do.

The CMake configurations need to be copy-pasted again into qt5.yaml.
We can't use default.yaml because that would enable CMake
configurations for repositories that are not ported to CMake, and
thus break the integrations.

Update qtqa sha1 to a dev branch one which contains the
module_config.yaml instructions to build qtqa with CMake.

Task-number: QTBUG-84874
Task-number: QTBUG-84918
Change-Id: I8c64f5e0acc96e14a4952abb6c77fe5c8e27a0ec
Reviewed-by: Liang Qi <liang.qi@qt.io>
2020-06-12 14:36:39 +02:00
Alexandru Croitor
803eb987ad CMake: Enable iOS simulator_and_device builds
Coin now has CMake 3.17, so iOS multi-arch builds should
successfully build.
Switch the iOS CMake configurations to simulator_and_device ones.

Task-number: QTBUG-80899
Change-Id: I9c8bde9f1a3c483ea296f3d9d06f089cbfdf2416
Reviewed-by: Liang Qi <liang.qi@qt.io>
2020-06-12 14:36:38 +02:00
Alexandru Croitor
25f154199a CMake: Enable CMake builds for qtcoap
Change-Id: I89bc9162203069a61367763b0b9a482a96da87e0
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
2020-06-12 13:59:48 +02:00
Qt Submodule Update Bot
d301750df7 Update submodules on 'dev' in qt/qt5
Change-Id: I8417277ae8f5ac6c269a98feace48d30fa688e23
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-06-12 14:52:06 +03:00
Heikki Halmet
5be3dc5f60 Provisioning: Change mounting folder for Squish installation
Sometimes some process is locking the mounted folder (/tmp) so that
it can't be unmounted untill the process has been ended.
Let's create squish folder under tmp and use that for mounting
instead

Task-number: QTQAINFRA-3709
Change-Id: I49ab8fd90af37a670e45764a176b62d7a732cc6c
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit c671c2352e)
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
2020-06-12 08:33:24 +03:00
Liang Qi
37cb787dc1 Temporarily remove two broken platforms in qt5.yaml
We can re-add them later when issue got fixed.

Task-number: QTBUG-84924
Task-number: QTBUG-84925
Change-Id: I2545e5fe03fd44a6016305723b57db8c0d6e9470
Reviewed-by: Liang Qi <liang.qi@qt.io>
2020-06-12 00:22:27 +02:00
Qt Submodule Update Bot
92a11b3e47 Update submodules on 'dev' in qt/qt5
Change-Id: I0a12271af90aea12288614abcb0bd912d5c3384e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-06-12 01:22:23 +03:00
Tony Sarajärvi
3bd4b2760e Update ICC 18 to ICC 19.1
Task-number: QTQAINFRA-3241
Change-Id: I9259a9f602e8cdec29720178331dd7b833e52f81
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-06-11 10:40:20 +00:00
Alexandru Croitor
947802bea3 Revert "Revert "CMake: Enable CMake builds for qtqa""
There's a new dev branch for qtqa, so we can re-enable CMake builds
of qtqa using that branch, without breaking builds of other branches.

This reverts commit 33e8275ee5.

Task-number: QTBUG-84233
Change-Id: I1e4ca39717768303eca8435d175aa562fcd6f0f5
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-06-11 12:08:06 +02:00
Heikki Halmet
30714c7cb7 Provisioning: Install Node.js
Node.js is needed by QtWebengine

Task-number: QTQAINFRA-3729
Change-Id: I23ece8567c569d8376eff52b7845589c60d069b8
Reviewed-by: Toni Saario <toni.saario@qt.io>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
(cherry picked from commit 122cf4cc0e)
2020-06-10 20:50:30 +03:00
Heikki Halmet
2c0816aa99 Provisioning: Change mounting folder for Squish installation
Sometimes some process is locking the mounted folder (/tmp) so that
it can't be unmounted untill the process has been ended.
Let's create squish folder under tmp and use that for mounting
instead

Task-number: QTQAINFRA-3709
Change-Id: I49ab8fd90af37a670e45764a176b62d7a732cc6c
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit c671c2352e)
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2020-06-10 07:24:41 +03:00
Heikki Halmet
122cf4cc0e Provisioning: Install Node.js
Node.js is needed by QtWebengine

Pick-to: 5.15
Task-number: QTQAINFRA-3729
Change-Id: I23ece8567c569d8376eff52b7845589c60d069b8
Reviewed-by: Toni Saario <toni.saario@qt.io>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2020-06-09 20:58:09 +03:00
Heikki Halmet
a7654f4a03 Provisioning: Change resolution for Windows 10 x86_64
Currently we have wrong resolution (1024x768) for 64-bit Windows.
Correct one is 1280x800

Change-Id: Ifc17933a5901681a917f973cab4d7c1ca1dfbd9f
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit fa58a227cd)
Reviewed-by: Toni Saario <toni.saario@qt.io>
2020-06-09 17:57:20 +00:00
Heikki Halmet
c4e49e7464 Provisioning: Use signed opengl32 package
Task-number: QTBUG-80252
Change-Id: Ife9942796ed64c4e2894fb3342259c674cf5d7ed
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
(cherry picked from commit 9c33fe844a)
2020-06-09 20:57:19 +03:00
Heikki Halmet
5279f32fdf Provisioning: Fetch pre-installed squish from local cache
Squish installation is flaky so the installation phase has been
moved from provisioning to Jenkins. Jenkins job will install the
squish to target VM and copy it to local cache. This change only
fetch the installed squish packages from local cache and
uncompress those to VMs.

Task-number: QTQAINFRA-3510
Task-number: QTQAINFRA-3107
Change-Id: I862da3250120dc6a43d9c04d973a25a691ca66a1
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit b0286d6cd6)
Reviewed-by: Toni Saario <toni.saario@qt.io>
2020-06-09 17:57:17 +00:00
Heikki Halmet
4ca819a713 Provisioning: Fetch pre-installed squish from local cache
Squish installation is flaky so the installation phase has been
moved from provisioning to Jenkins. Jenkins job will install the
squish to target VM and copy it to local cache. This change only
fetch the installed squish packages from local cache and
uncompress those to VMs.

Task-number: QTQAINFRA-3510
Task-number: QTQAINFRA-3107
Change-Id: I862da3250120dc6a43d9c04d973a25a691ca66a1
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit b0286d6cd6)
Reviewed-by: Toni Saario <toni.saario@qt.io>
2020-06-09 06:09:45 +00:00
Allan Sandfeld Jensen
a0ea975b98 Remove SLES configuration
Mostly duplicate anyway, and not currently possible to install node.js
on.

Change-Id: I23a81ddb45b0597f31b1402e362f83957b5be8ae
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-06-08 11:00:58 +02:00
Heikki Halmet
9c33fe844a Provisioning: Use signed opengl32 package
Task-number: QTBUG-80252
Change-Id: Ife9942796ed64c4e2894fb3342259c674cf5d7ed
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
2020-06-05 13:22:07 +03:00
Liang Qi
a4b68d6b7d Set Boot2Qt arm builds to release and developer build
Task-number: QTBUG-63152
Change-Id: Id6f2411d6339b7bd1ccb261cf5d9bebe1d0ada1c
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2020-06-04 14:35:23 +02:00
Alexandru Croitor
33e8275ee5 Revert "CMake: Enable CMake builds for qtqa"
Revert the change because the qtqa instructions have been
temporarily removed to unblock other branches.

This reverts commit a10584e57c.

Change-Id: I76646026b099d3b039eec6cdaecfbbce6df43aa2
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-06-04 10:13:24 +02:00
Tony Sarajärvi
4c7fe602cb Fix compiler mentioned for host tool building in RHEL
This is only a cosmetic fix. That value is not used anywhere anymore.

Task-number: QTQAINFRA-3757
Change-Id: Iabba6202e7ddbb08e58901a591ba0171e8dd1fc9
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-06-04 06:51:45 +00:00
Jean-Michaël Celerier
3f95e2b019 qt3d: add shadertools to "recommends" modules
This is needed for Qt3D's RHI support.

Change-Id: I416ee986db06479775a4dd4251261ecaac805b73
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-06-03 07:22:22 +00:00
Alexandru Croitor
a10584e57c CMake: Enable CMake builds for qtqa
Only includes one MinGW configuration, to mirror what Coin does
with the qmake builds of qtqa.

Switching the Coin instructions to do license checking and binary
compatibility testing using CMake will require a different change.
Most likely this change will have to wait until all of qt5.git/dev
is moved to use yaml instructions for building, rather than the
hardcoded instructions provided by Coin.

Besides, the binary compatibility test still depends on finding
qmake to run its test, which might have to be changed in the future.

Task-number: QTBUG-84233
Change-Id: I5ab7120e965f7729968697abf9e0db602c216cd9
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-06-02 21:19:42 +02:00
Alexandru Croitor
91a164b838 CMake: Enable CMake builds for qtquicktimeline
Task-number: QTBUG-82967
Change-Id: I94324d4ef7d9d393e06a04e2eb1bfb0f9caab971
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-06-02 14:49:21 +02:00
Qt Submodule Update Bot
32595beb43 Update submodules on '5.15' in qt/qt5
Change-Id: If098f9985eba623be0b8a1c1f4213fe529058fb8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-05-31 23:46:57 +02:00
Qt Submodule Update Bot
a8e64fec51 Update submodules on '5.15' in qt/qt5
Change-Id: I9f93151930b634d7dcccd717d516717ccd2f4ef1
Reviewed-by: Liang Qi <liang.qi@qt.io>
2020-05-30 08:58:43 +02:00
Tony Sarajärvi
b0d9b22f53 Combine two macOS targets that are nearly the same
Change-Id: I1c094f02d1cee059272680941b355e4fb2bbdd31
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2020-05-29 09:21:21 +00:00
Liang Qi
c1c44574f6 Merge remote-tracking branch 'origin/5.15.0' into 5.15
Conflicts:
	coin/provisioning/common/linux/qnx_700.sh
	coin/provisioning/qtci-macos-10.13-x86_64/40-qnx700.sh
	coin/provisioning/qtci-macos-10.14-x86_64/40-qnx700.sh
	coin/provisioning/qtci-windows-10-x86_64/05-qnx_700.ps1

Change-Id: Ic7ed52251573824595821c53025323287d60b536
2020-05-28 10:22:03 +02:00
Joerg Bornemann
4d99fb00cc Fix CMake provisioning for Ubuntu 18.04 x86_64 QEMU armv7
This amends 68134db4.

Change-Id: I2eed240464f1b29c119ca0119001997aefdecd41
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2020-05-27 08:06:16 +02:00
Qt Submodule Update Bot
9a4fc7074c Update submodules on '5.15' in qt/qt5
Change-Id: Iaf309cc8b2404cd9a34a6b5b04331a3acc33794f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-05-27 06:26:07 +02:00
Alexandru Croitor
68134db435 Update provisioned CMake version to 3.17.2
This should fix the ninja deps issue we had on Windows with the
Ninja Multi-Config generator, where calling ninja a second time to
rebuild the project failed.

More details at https://gitlab.kitware.com/cmake/cmake/-/issues/20723

Change-Id: I0029e57fbc704120d2241499a87cad0ad40c2e50
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-05-26 21:57:20 +02:00
Alexandru Croitor
0685312d2e CMake: Add MinGW config to all cmake enabled repositories
Task-number: QTBUG-75578
Change-Id: I4957efff9f3438c85f9e653130898d4b60a555ba
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-05-25 21:04:48 +02:00
Alexandru Croitor
5cd8e9576d CMake: Switch qtbase Windows config to use Ninja Multi-Config
And configure with two configurations, RelWithDebInfo and Debug.
This is equivalent to qmake's
--debug-and-release --force-debug-info

This should give us minimal coverage for debug-and-release builds,
as well as avoid regressions with NMC aka multiple configurations.

If the qtbase builds successfully, we can try to extend the rest of
the repositories to also build with NMC on Windows.

We can't add such a configuration to macOS for now, because it
requires CMake 3.18, which is not released yet.

Disable PCH because it seems to fail the build when used together
with Ninja Multi-Config.

Task-number: QTBUG-80900
Change-Id: I71a9584ddb1d48ed22925f67b50891e102036c97
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-05-25 13:41:38 +02:00
Tasuku Suzuki
598f82300a Remove the qtquickcontrols2 dependency on qtgraphicaleffects
The Material style uses its own shader effects, and
recent patches did the same for the Imagine style.
There were some auto tests that have been made to only
run if qtgraphicaleffects is available.

Change-Id: Ifcfcad9591d2a0a8d5ebed505566cd0103dd9176
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2020-05-23 00:47:42 +00:00
Heikki Halmet
16ca898568 Provisioning: Update QNX7 SDP to include OpenSSL 1.1.1
Still includes ICU 58

Task-number: QTQAINFRA-3537
Change-Id: I2f532ff32157e09eeec9a2196d075d4ec6347df5
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2020-05-22 14:09:47 +03:00
Heikki Halmet
fa58a227cd Provisioning: Change resolution for Windows 10 x86_64
Currently we have wrong resolution (1024x768) for 64-bit Windows.
Correct one is 1280x800

Change-Id: Ifc17933a5901681a917f973cab4d7c1ca1dfbd9f
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-05-22 12:23:34 +03:00
Qt Submodule Update Bot
4f504b9e3f Update submodules on '5.15' in qt/qt5
Change-Id: I2cc7f7cd47bbf116a3cc01b42c58d0e09162ac3e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-05-20 23:46:57 +02:00
Alexandru Croitor
afc08c23ca CMake: Enable CMake builds for qttranslations
Fixes: QTBUG-82969
Change-Id: I17e7df82f578338d6c1e3dbc41677d4302d9689b
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-05-20 14:48:59 +02:00
Liang Qi
434e2712aa Update submodules on 'dev' in qt/qt5
Change-Id: Idd8c485848379879aa3d870ddf9740eab2fb95d3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2020-05-20 13:37:23 +02:00
Qt Submodule Update Bot
cbb4768052 Update submodules on '5.15' in qt/qt5
Change-Id: Ia54db5b603a3e31c570d1c7e4ab4cd409b9bd53e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-05-18 23:46:40 +02:00
Qt Submodule Update Bot
f4b02da372 Update submodules on '5.15' in qt/qt5
Change-Id: I6e5027ff7b70605a77f35b42f07a0e3ad9bb2f12
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-05-15 12:10:57 +02:00
Alexandru Croitor
71a559e748 CMake: Enable CMake builds for qtdoc
Change-Id: Idca63aef8951a4a104b816e4aac710225d1279c2
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-05-14 13:25:23 +02:00
Lars Knoll
688187773b Explicitly enable -headersclean on some configs
This is in preparation to turning this off by default in configure,
as it increases build times significantly.

Change-Id: I2d601595ce8c093765194f36ec5235f79dd4dd7d
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-05-13 22:17:58 +02:00
Alexandru Croitor
3384823666 Revert "Temporarily ignore qtnetworkauth"
The qtnetworkauth test was fixed, so we can re-enable the module.

Bump the sha1 to the latest version of qtnetworkauth.

This reverts commit a8d3591327.

Task-number: QTBUG-84071
Change-Id: I68c953fa97cf0f28a391b496fb321aefe9d8e7d6
Reviewed-by: Liang Qi <liang.qi@qt.io>
2020-05-13 11:47:37 +02:00
Tony Sarajärvi
38139878ff Install GCC 10 on SLES 15
Task-number: QTQAINFRA-3444
Change-Id: Iaf9b3ea5331cfc0b3d19a09f55aa4df1de93fbb2
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-05-12 16:40:28 +00:00
Alexandru Croitor
e4d60dd117 CMake: Enable CMake builds for qtvirtualkeyboard
Task-number: QTBUG-78185
Change-Id: Ie8a120aa3425edf6ae18f4a43dcd3f6aa697cd9f
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-05-12 13:18:00 +02:00
Alexandru Croitor
29c9ba1835 CMake: Switch to MinGW 8.1 configuration for the qtbase CMake build
Change-Id: I974d34a33370ece9f9e240ba6e5106cc50d8bf84
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-05-12 13:02:52 +02:00
Qt Submodule Update Bot
bca97664c6 Update submodules on '5.15' in qt/qt5
Change-Id: Id17a8894c6eb326e68a5cad454ee193fb4b0381e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-05-12 10:12:31 +02:00
Heikki Halmet
69342bb5b7 Revert "Provisioning: Disable windows defender firewall"
This reverts commit 48ff0140de.

Reason for revert: QtBase WinRT test qcoreapplication needs mpssvc service to be enabled

Change-Id: I523b668d9d7292aaaf7462585dc03819a3973010
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-05-12 05:42:53 +00:00
Qt Submodule Update Bot
717364e3e1 Update submodules on '5.15.0' in qt/qt5
Change-Id: I5d348235045f06b87d3cef2752e87bfb5486ab50
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-05-12 04:06:03 +00:00
Qt Submodule Update Bot
ca2d7b6a5b Update submodules on '5.15' in qt/qt5
Change-Id: I4d55ef3f569169b96dbc7b88c9bfd877499e0921
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-05-11 12:44:36 +00:00
Qt Submodule Update Bot
d20eaafc5c Update submodules on '5.15.0' in qt/qt5
Change-Id: I7237b1851b031f6b6ec8e949be1b2326228d379d
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2020-05-09 11:32:43 +00:00
Qt Submodule Update Bot
b3777f0703 Update submodules on '5.15' in qt/qt5
Change-Id: I77cfc30c6202b776fc20813f5e71162b6f46c04e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-05-08 23:45:59 +02:00
Qt Submodule Update Bot
d913a868d4 Update submodules on '5.15.0' in qt/qt5
Change-Id: Ia3881b1668420fed08caf6a4fb8a8b957ac98789
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2020-05-08 12:12:34 +00:00
Qt Submodule Update Bot
cb2293ae0a Update submodules on '5.15' in qt/qt5
Change-Id: I4c98f9f6176d4b2c657880ea3d8e106501fc8906
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-05-07 23:46:03 +02:00
Liang Qi
a8d3591327 Temporarily ignore qtnetworkauth
Task-number: QTBUG-84071
Change-Id: I8486c55dc7062f50e7722b03031750b58be23a1f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-05-07 21:52:26 +02:00
Alexandru Croitor
3652f77aa3 Provisioning: Set macOS locale to "en_US.UTF-8"
The 419f42903154489e2dace8d1eba183036275448b commit in qtbase
introduced a regression where the tst_fusion test in qtqtuickcontrols2
hits a deadlock while trying to print a warning about a non-UTF-8
locale.

The warning is due to the fact that the agent executed in Coin's VM
does not have an explicit locale set, and thus it defaults to "C".
There is no explicit locale set in any .bashrc (or similar files),
and neither in any launchd configuration (because the agent is
executed at macOS startup via launchd).

The deadlock is due to trying to acquire the same lock twice while
trying to write output to stdout.

The test only deadlocks on CMake configurations, and not qmake
configurations, because Coin has a hardcoded instruction to set the
locale to UTF-8 when running qmake tests.

Until the deadlock situation is addressed in another change, the issue
can be fixed by setting the macOS configuration locale to UTF-8
explicitly, by assigning the LANG environment variable
into ~/.bashrc at provisioning time, like we do with other environment
variables like PATH.

Fixes: COIN-578
Change-Id: Ib6a5849a6868c1776dd425aeb8b5e7d6faa8cde0
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2020-05-07 21:52:16 +02:00
Qt Submodule Update Bot
826d95df85 Update submodules on '5.15' in qt/qt5
Change-Id: I1d5374eb04e8bb23af1581c4f091503ccc1fe310
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-05-06 23:46:05 +02:00
Heikki Halmet
48ff0140de Provisioning: Disable windows defender firewall
Service is still running. It need to be disabled.

Change-Id: I4742f97c93d118a1a98b4107f1597d332c3f1391
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-05-06 14:44:31 +03:00
Qt Submodule Update Bot
e85c0e88cf Update submodules on '5.15' in qt/qt5
Change-Id: I95cc4f3c7d2b6d745e50c4fe5405527a06423c24
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-05-05 19:53:44 +02:00
Qt Submodule Update Bot
db44923e30 Update submodules on '5.15.0' in qt5
Change-Id: I9e83c1d5063f0e6013bd1667987cea949e77809a
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2020-05-05 08:30:54 +00:00
Qt Submodule Update Bot
2bc89aec9b Update submodules on '5.15' in qt/qt5
Change-Id: I9d169c17ce5772771e51bc58463919ed7c8ed0a8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-05-04 23:46:00 +02:00
Alexandru Croitor
9f4a39356a CMake: Switch host macOS configurations to framework release builds
Also include debug info. This is the equivalent of qmake's
--release --framework --force-debug-info --separate-debug-info

Change-Id: I2778b4998890146c82552f9c721a48174a764839
Reviewed-by: Simon Hausmann <hausmann@gmail.com>
2020-05-04 22:50:17 +02:00
Alexandru Croitor
4dace06297 CMake: Enable a MinGW 7.3 CMake qtbase configuration
It should be a developer build, but due to some features
that are not ported in src/gui/configure.cmake (directwrite)
there are compilation errors due to unused arguments in
static bool QWindowsFontDatabaseBase::init(QSharedPointer)
in platformsupport/fontdatabases/windows/qwindowsfontdatabasebase.cpp

So it's not a developer build for now.

Task-number: QTBUG-75578
Change-Id: Ieb6daca45473ea42748a39f3e9e33a9db087a0e0
Reviewed-by: Simon Hausmann <hausmann@gmail.com>
2020-05-04 18:01:22 +02:00
Liang Qi
9deba571f9 Temporarily disable QNX builds because license expiry issue
Task-number: QTQAINFRA-3708
Change-Id: I676ad2e519ab527e079648d41a1ff015a2a17657
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-05-04 15:16:19 +02:00
Heikki Halmet
8f653ce4f8 Provisioning: Add sleep before killing gpg-agent in msys installation
Task-number: QTQAINFRA-3691
Change-Id: If84fd2d0d1cd6dccadf21cbf688aca6182cdd920
(cherry picked from commit 5f03b84e65)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2020-05-04 14:42:03 +03:00
Heikki Halmet
71043ca243 Provisioning: Update expired QNX license
Task-number: QTQAINFRA-3708
Change-Id: Id2d6d10d88fc50c9985014c44df0b1cf51cc3410
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2020-05-04 14:41:54 +03:00
Qt Submodule Update Bot
e2d2d25a57 Update submodules on '5.15.0' in qt5
Change-Id: I4e92a9fdd0602c41477345169899623c036e5edb
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2020-04-30 17:43:46 +00:00
Liang Qi
54c94ae681 Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
	.gitmodules
	coin/platform_configs/default.yaml
	coin/platform_configs/qt5.yaml
	coin/platform_configs/qtbase.yaml
	coin/platform_configs/qtwebkit.yaml
	coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh

Change-Id: If6b0f7a671a69d6a2444ee4d26b324e4d269970c
2020-04-30 18:35:08 +02:00
Qt Submodule Update Bot
ff4a1141f2 Update submodules on 'dev' in qt/qt5
Change-Id: I96f194ffeecc40522b5ed69b0bd2d2e03045cfd9
Reviewed-by: Liang Qi <liang.qi@qt.io>
2020-04-30 15:44:59 +02:00
Simon Hausmann
3265e93168 Try to build qtbase with cmake against Yocto
This adds the basic armv7 configuration and passes through two
additional variables for use in the build instructions:

    * QT_YOCTO_ENVSETUP points to the environment-setup script that the
    Yocto SDK expects to be sourced before building against the target
    sysroot.

    * QT_CMAKE_DIR points to the directory that contains our cmake
    installation. Since the environment-setup prepends the Yocto host
    bin dir to the PATH, we'd end up picking the wrong cmake.

Also the choice of system Harfbuzz is disabled as Qt does not build
against the version shipping in Yocto.

Change-Id: I8d657e773143c4db0e2437d029d62372f7b7e638
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-04-30 12:02:42 +02:00
Heikki Halmet
5f03b84e65 Provisioning: Add sleep before killing gpg-agent in msys installation
Task-number: QTQAINFRA-3691
Change-Id: If84fd2d0d1cd6dccadf21cbf688aca6182cdd920
Reviewed-by: Simo Fält <simo.falt@qt.io>
2020-04-30 11:05:15 +03:00
Qt Submodule Update Bot
d937578404 Update submodules on '5.15.0' in qt/qt5
Change-Id: I2fe48b7e734bdf86f159af47cd2b6f613172afa2
Reviewed-by: Liang Qi <liang.qi@qt.io>
2020-04-29 12:14:01 +02:00
Alexandru Croitor
4aa9c4df11 CMake: Enable CMake builds for qtquick3d
Change-Id: I9547c73e8a632754d043bff8c72c29c18449bfd9
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-04-27 10:04:09 +02:00
Qt Submodule Update Bot
20668c9233 Update submodules on '5.15' in qt/qt5
Change-Id: Ia0fb6c1f5f1ae1dafaf0999fdc7c1cc5ba765bf2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-04-26 23:45:55 +02:00
Qt Submodule Update Bot
d88858d98b Update submodules on '5.15.0' in qt/qt5
Change-Id: Id2db92b9b2928ea7452edb313cc673581bf12b35
Reviewed-by: Liang Qi <liang.qi@qt.io>
2020-04-25 08:30:51 +02:00
Qt Submodule Update Bot
230e99400c Update submodules on '5.15' in qt/qt5
Change-Id: I6dd7a38815ff1bd13b3b8d1c9a4042c3b0981784
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-04-24 23:46:00 +02:00
Liang Qi
3050559262 Merge remote-tracking branch 'origin/5.15' into 5.15.0
Conflicts:
	.gitmodules

Change-Id: I72e0314fbc563a2386f2389239b927f57124c511
2020-04-24 22:34:43 +02:00
Liang Qi
5b018f96af Update submodules on '5.15' in qt/qt5
Change-Id: I06f83013c085e342e8391a705ba5ecf156bd5159
Reviewed-by: Liang Qi <liang.qi@qt.io>
2020-04-24 15:59:44 +02:00
Liang Qi
cc4fdea014 Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
	.gitmodules
	coin/platform_configs/qt5.yaml
	coin/platform_configs/qtsdk.yaml
	coin/platform_configs/tqtc-qt-rta.yaml
	coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh

Change-Id: I2221262edc024e0aa11b9dab4d08c2df3a0b53b0
2020-04-24 15:31:01 +02:00
Qt Submodule Update Bot
ac8b28db57 Update submodules on '5.14' in qt/qt5
Change-Id: I919625c0e3a2fdd5dea9dab691c9bc96f62161fa
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-04-24 09:48:03 +02:00
Liang Qi
882294edc3 Merge remote-tracking branch 'origin/5.14.2' into 5.14
Conflicts:
	.gitmodules

Change-Id: I950588f85d1b39ba6ce994821db9f340b72fa6d2
2020-04-23 12:27:46 +02:00
Qt Submodule Update Bot
10e07c7877 Update submodules on '5.14' in qt/qt5
Change-Id: Ibdc80d4d7abad334e96f6c5d7c602e42a9d1b31f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-04-23 10:32:55 +02:00
Qt Submodule Update Bot
767711b44a Update submodules on '5.15.0' in qt/qt5
Change-Id: Iba9ab3074ef49a9060ce594a0d30083891338e28
Reviewed-by: Liang Qi <liang.qi@qt.io>
2020-04-23 08:13:47 +02:00
Qt Submodule Update Bot
285f2c5690 Update submodules on '5.15' in qt/qt5
Change-Id: I62fa79986a2ccbf3ee4e000f4f767731bf31fd2e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2020-04-23 06:02:52 +02:00
Qt Submodule Update Bot
4d435697fa Update submodules on '5.15' in qt/qt5
Change-Id: I0c4e65146b752463190fc98e9f670c3b00eac283
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-04-21 23:46:35 +02:00
Allan Sandfeld Jensen
ca914bdbf3 Fix qtwebwengine.yaml
Missing an initial separator

Change-Id: I1f447963fbaa93027cfffd7c320efc69ea4a1107
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-04-21 16:46:47 +02:00
Qt Submodule Update Bot
133403b829 Update submodules on '5.15' in qt/qt5
Change-Id: Ic1acfd2ae08a13f88e45e822a34b673e7470aa72
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-04-21 10:57:24 +02:00
Allan Sandfeld Jensen
9b7a95964d Add qtwebengine.yaml
We can't build the wasm version of qtbase any longer

Change-Id: I7436640941702ba2479c7e73f3d1d9ccaf2e7709
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-04-21 10:02:36 +02:00
Volker Hilsheimer
82ed571cde Add Pick-to footer for cherry-pick bot to commit template
Change-Id: Idec00573bdbebda4d3b3481eee480c91c5d8d1de
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2020-04-20 11:04:27 +02:00
Qt Submodule Update Bot
30b0878b18 Update submodules on '5.15' in qt/qt5
Change-Id: I53ce054fd386e55c6b9b0954c8636716a4ae08b3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-04-17 23:46:29 +02:00
Qt Submodule Update Bot
cafd0f0019 Update submodules on '5.14' in qt/qt5
Change-Id: Ifdae4eace5516c6b2886560c7c5da46954b8e712
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-04-17 22:31:06 +02:00
Qt Submodule Update Bot
908afb868a Update submodules on '5.15' in qt/qt5
Change-Id: I9c627825712c1c2bc196a8e0d3259189aa43d71b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-04-16 23:46:26 +02:00
Kari Oikarinen
f008144b88 Adjust submodule branches 2020-04-16 09:14:58 +03:00
Qt Submodule Update Bot
4d3751fe3b Update submodules on '5.15' in qt/qt5
Change-Id: I2229401bd16f8f5a5f99f0b92c1ea29d03a661d9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-04-15 23:46:40 +02:00
Mårten Nordheim
176d9ce09c Don't manually rerun conan Run-Conan-Install
Modern conan will retry downloads on its own. Change default number of
attempts to 5 for more reliability.

Change-Id: Iafd4845b31c3e5fb296ba0b897cbf2030c412b04
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2020-04-15 09:53:44 +03:00
Rami Potinkara
08b99e8def qdb building for mac
Modified qdb.yaml and created and pkgconfig and libusb relates .sh
files so that QDB can be build for Mac OS due to USB Ethernet CDCECM enabling.

Task-number: QTBUG-82531
Change-Id: Ia5f970e5940b7d9116831c8174db0ea1b9231234
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2020-04-15 08:28:12 +03:00
Heikki Halmet
61267a7a78 Provisioning: Remove notifications and warnings from macOS
Notifications and warnings in UI might affect RTA and autotests results

Change-Id: I447dab3ba839d2c577f633cbf96fc7f3e5fdfe25
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
2020-04-14 14:21:19 +03:00
Qt Submodule Update Bot
8a5938bd22 Update submodules on '5.15' in qt/qt5
Change-Id: Ie44a49c9f1d432865b37297323418c0a831b502c
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-04-14 10:16:53 +03:00
Heikki Halmet
bb13978b01 Provisioning: Disable Connected User Experiences and Telemetry service
Task-number: QTQAINFRA-3609
Change-Id: Ie4df9a3b47cf9adcfc0afa1eaf75386e9452fd42
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-04-11 08:33:29 +03:00
Qt Submodule Update Bot
606bbd68c4 Update submodules on '5.14' in qt/qt5
Change-Id: Ic9e8123184a04c43ad06aee8cabc2f97006ca694
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-04-10 22:31:14 +02:00
Heikki Halmet
5148639647 Provisioning: Activate subscriptions
Task-number: QTQAINFRA-3638
Change-Id: Ide5599a45b918dcbd44a7d60a78c3a4811d80943
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-04-09 14:08:24 +03:00
Qt Submodule Update Bot
f63b095561 Update submodules on 'dev' in qt/qt5
Change-Id: Ie35c05cb101d3a5e44ec2fbe5cb8bad2e16f785a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-04-09 08:08:51 +02:00
Qt Submodule Update Bot
93f50f13fe Update submodules on 'dev' in qt/qt5
Change-Id: I67165031f648c6e4f662e832635c4e55265a0c5e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-04-09 00:00:09 +02:00
Qt Submodule Update Bot
2c10dd3510 Update submodules on '5.15' in qt/qt5
Change-Id: I820f8ebf9e428fe2b71b0aa64e5c6aeca744b82e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-04-08 23:46:27 +02:00
Qt Submodule Update Bot
26526c4560 Update submodules on '5.14' in qt/qt5
Change-Id: I4c3ec2af33f0fccb8b5864340ba27187028f8a1d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-04-08 22:31:17 +02:00
Qt Submodule Update Bot
ae846322ea Update submodules on 'dev' in qt/qt5
Change-Id: Ib9c73befcbb68f5dbf4abb8931bfee41827c8e05
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-04-08 00:00:23 +02:00
Alexandru Croitor
da26e954de CMake: Pass location to custom OpenSSL 1.1 directory in Coin
Needed for enabling all the various OpenSSL classes in Qt.

Change-Id: Ic20ab464552317a2753ae0e35043e16cc6c60ab3
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2020-04-07 17:42:51 +02:00
Qt Submodule Update Bot
d241778ce9 Update submodules on 'dev' in qt/qt5
Change-Id: I915cc1d265b84df6bf8b01012f8ff4e37a1c0860
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-04-07 15:16:07 +02:00
Alexandru Croitor
a86d895287 CMake: Enable CMake builds for qt5compat
Change-Id: I939f42e03cb76ccf8d984ee0f856c44049679794
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-04-07 14:09:09 +02:00
Qt Submodule Update Bot
be31c59312 Update submodules on '5.15' in qt/qt5
Change-Id: I831f980c63a715420a664171546fad03667862bc
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-04-07 06:33:32 +02:00
Qt Submodule Update Bot
06f9c8cc3a Update submodules on 'dev' in qt/qt5
Change-Id: I96c17784a1c9cf24552a68de4e3995095fb14999
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-04-04 23:59:58 +02:00
Qt Submodule Update Bot
861e942481 Update submodules on '5.14' in qt/qt5
Change-Id: Ib6d80439b2c9dca1c76c0810769d991db8ee3d58
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-04-04 22:31:38 +02:00
Heikki Halmet
8101b54714 Provisioning: Update Windows 10 x86_64 to version 1909
These are also updated to tier1 image:
msvc 2017: Not installed
msvc 2019: version 16.4.4
msvc 2019 build tools: version 16.4.4

Task-number: QTQAINFRA-3623
Task-number: QTQAINFRA-3417
Change-Id: I006204ca090c4e2cf0d2ffc2309ab6b94f9b7d47
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-04-04 17:13:43 +03:00
Lorn Potter
f5862a11f4 Provisioning: Bump emscripten version to 1.39.8 on Windows
(cherry picked from commit 939c014039)

Task-number: QTQAINFRA-3577
Change-Id: I5842158c0a11b29791fcb97d4523467de899e1e2
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-04-04 08:15:38 +02:00
Morten Johan Sørvig
922cca96bf Provisioning: Bump Emscripten version to 1.39.8
(cherry picked from commit 10e843566e)

The upstream URLs have changed:
 - emscripten packages now at github.com/emscripten-core/emscripten/archive/
 - binaries (llvm/binaryen/node) now at storage.googleapis.com/webassembly/emscripten-releases-builds/

Add support for unpacking tbz2 files. Keep caching as
before, update .emscripten config file with new paths.

Task-number: QTQAINFRA-3577
Change-Id: I239aaf89bc199e5f6267519861f9b2ab54f10b0f
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-04-04 08:15:13 +02:00
Qt Submodule Update Bot
b6f12a0c33 Update submodules on 'dev' in qt/qt5
Change-Id: If5d70aa1a51eb7b8481cae5659e7cd2d9d66d45c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-04-04 03:23:30 +02:00
Qt Submodule Update Bot
38f80e73f6 Update submodules on 'dev' in qt/qt5
Change-Id: I8d07db2c521517a5770fae17dbda59abb5510019
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-04-03 22:04:30 +02:00
Qt Submodule Update Bot
c63db0ef02 Update submodules on 'dev' in qt/qt5
Change-Id: I1c2002fdb706af67581b2030119c894db89dcc24
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-04-03 00:00:30 +02:00
Qt Submodule Update Bot
941c3e487f Update submodules on 'dev' in qt/qt5
Change-Id: I6eb97a9587376a9d7bc96933825c2cdde0841197
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-04-02 17:29:45 +02:00
Alexandru Croitor
e1a4d6bf17 CMake: Enable CMake builds for qtwayland
Change-Id: I2f8e762a7e440e1f59591569910a2f68cf0e7c3e
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-04-02 10:00:33 +02:00
Qt Submodule Update Bot
e94816937f Update submodules on 'dev' in qt/qt5
Change-Id: Iaf5efa53ddb01205d73bd6bf37f06e62abffa39c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-04-02 00:00:06 +02:00
Qt Submodule Update Bot
b3f626f83d Update submodules on '5.15' in qt/qt5
Change-Id: Ibb6f659e59b861066d1e2b0c3e11574785268b93
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-04-01 23:45:55 +02:00
Lars Knoll
a3e33df7f6 Completely remove QtScript from qt5.git
It doesn't even compile against c++17 anymore (uses auto_ptr),
and the JavaScript engine is now more than 10 years outdated.

Change-Id: I56cc36aa5aeb4dfa6b19b699886f6e34fe1eecbd
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-04-01 22:36:01 +02:00
Qt Submodule Update Bot
81ab1ffb89 Update submodules on '5.14' in qt/qt5
Change-Id: I1f9e9a31a313577ddb9325b9485f26dc782e4284
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-04-01 22:31:15 +02:00
Qt Submodule Update Bot
3a64559f68 Update submodules on 'dev' in qt/qt5
Change-Id: Iea05dbac28cd0c96da47ac2647c65ba3c9639d79
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-04-01 00:00:10 +02:00
Qt Submodule Update Bot
a9d743de49 Update submodules on 'dev' in qt/qt5
Change-Id: I696f0591917930f910c50833601d482b70f2a2d1
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-03-31 14:42:51 +02:00
Leander Beernaert
c5c56d2548 CMake: Add missing quote in qt_attribution.json
Change-Id: I360f5311373265843234c45bd8dd24f6499a5b99
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-03-31 11:30:05 +02:00
Heikki Halmet
657413a101 Pre-provisioning: Install MSVC 2015 update 3 to Tier1
Task-number: QTQAINFRA-3626
Change-Id: I7f2077af4f399c1ba607bbd3f772856c953029f4
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-03-30 14:55:40 +03:00
Heikki Halmet
5403d3259c Provisioning: Add git installation for Windows 10 x86
RTA needs git

Change-Id: I1b295b364376aff2e548b2376e920cc513fac30c
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
2020-03-30 14:55:40 +03:00
Heikki Halmet
5cf6725dbe Provisioning: Disable notifications
Having notifications enabled will eat VM resources (CPU).

Change-Id: I2af7fbc7afeb9436164915353998abf219d495ed
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-03-30 13:55:40 +02:00
Qt Submodule Update Bot
0e0cba3eb9 Update submodules on 'dev' in qt/qt5
Change-Id: Iadfcc815e03910d54f5839655773a5a30567c409
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-03-29 09:14:12 +02:00
Qt Submodule Update Bot
2aeffc21fa Update submodules on 'dev' in qt/qt5
Change-Id: Iab567fb530e5e7e0aa04e601c90bed0aca55291f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-03-28 12:27:58 +01:00
Qt Submodule Update Bot
2e7ba38d18 Update submodules on '5.14.2' in qt/qt5
Change-Id: Id700b8f69bc185d9a6fff4298409126c27b88448
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2020-03-28 06:30:29 +00:00
Qt Submodule Update Bot
6c21c209c4 Update submodules on 'dev' in qt/qt5
Change-Id: Idcdae073b28e5208904f077bf897d9759703e885
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-03-26 15:23:50 +01:00
Alexandru Croitor
9837c866ab CMake: Enable CMake builds for qttools
Change-Id: I84a48022882623c09278de34dd4a0be92e05143e
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-03-26 13:20:14 +01:00
Alexandru Croitor
570fcd9c4b CMake: Enable CMake builds for qtshadertools
Change-Id: Iaa9ff0490fee0eb31ddc304a0e9df5c1432f412d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-03-26 13:03:53 +01:00
Heikki Halmet
704e5d5635 Update Windows 10 x86 to version 1909
These are also updated to tier1 image:
msvc 2017: 15.9.21
msvc 2017 build tools: 15.0 (26228.10)
msvc 2019: 16.4.6
msvc 2019 build tools: 16.4.6

Change-Id: I41ae0e287ccf74183438d7a7bff639fd78e86e7a
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-03-26 11:37:38 +02:00
Qt Submodule Update Bot
e5452d315b Update submodules on 'dev' in qt/qt5
Change-Id: I67f4a48809b4801cd2d9ec2caa7f3f6e61525ed2
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-03-25 23:17:27 +01:00
Qt Submodule Update Bot
2d524e4bcc Update submodules on '5.14.2' in qt/qt5
Change-Id: I6035e0ffe3afafe50b623637324c83e507bee771
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2020-03-25 18:09:48 +00:00
Qt Submodule Update Bot
f2e6ef53fb Update submodules on 'dev' in qt/qt5
Change-Id: I41e1ac0b9a6f2ee59d9600c858e0743ef052970c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-03-25 15:33:47 +01:00
Qt Submodule Update Bot
7264214147 Update submodules on '5.14' in qt/qt5
Change-Id: Ic3049794ed566ef0bb889d2312a358c07c0e4328
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-03-25 09:55:50 +01:00
Qt Submodule Update Bot
1670345722 Update submodules on 'dev' in qt/qt5
Change-Id: I6627f77845a2aa44752bc1d26c540920a85e6ba6
Reviewed-by: Liang Qi <liang.qi@qt.io>
2020-03-25 09:43:41 +01:00
Alexandru Croitor
1b69f59fb7 CMake: Enable CMake builds for qtnetworkauth
Change-Id: I9a3defc794d899e7f381452050485661011ef881
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-03-24 23:05:27 +01:00
Alexandru Croitor
ad31ece050 CMake: Enable CMake builds for qtwebsockets
Change-Id: I53a73461a8a93e33f07b8853a3ff8aa4ca27b573
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-03-24 23:05:27 +01:00
Qt Submodule Update Bot
8bd018cd77 Update submodules on 'dev' in qt/qt5
Change-Id: Ibd108ff2bcbe20e8553ac28d271339943b7add0b
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-03-24 07:12:09 +01:00
Qt Submodule Update Bot
bee6bf85d9 Update submodules on '5.15' in qt/qt5
Change-Id: I5219e3ecc5c3dc4d7c5c396e423f376c7f488c5d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-03-23 23:46:45 +01:00
Tony Sarajärvi
2b7355e69c Update MinGW 7.3.0 to Mingw 8.1.0
Task-number: QTQAINFRA-3304
Change-Id: I4a962c112f4925224e91c08117c7324112d70729
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2020-03-23 14:53:02 +00:00
Qt Submodule Update Bot
f164974aef Update submodules on '5.14' in qt/qt5
Change-Id: I1b90e5a2092976a5c6e5ad6e0dffef1f365790c3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-03-22 22:31:00 +01:00
Qt Submodule Update Bot
2bf281229a Update submodules on '5.15' in qt/qt5
Change-Id: I5a592a5d5d5fe83b710eee6d591dc60d0207c943
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-03-22 14:12:25 +01:00
Qt Submodule Update Bot
e514b5913a Update submodules on '5.15' in qt/qt5
Change-Id: Id62752c7cfc871751d9320460bb2fdca55639d5e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-03-21 17:20:26 +01:00
Qt Submodule Update Bot
e90ca63f94 Update submodules on '5.14.2' in qt5
Change-Id: I8da2e10658ec25db0822eba56ccfe1e12b1868f9
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2020-03-21 10:04:19 +00:00
Kai Koehne
58f8324458 Do not pass -qt-zlib to cross-builds
Commit 89fceff6a4 added -qt-zlib to all Windows configure lines.
This also affected QNX. Instead, only pass -qt-zlib to native builds.

Fixes: QTBUG-82254
Change-Id: I116cae82ab971170e633b5a8602dd573407be96f
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-03-21 08:05:56 +01:00
Qt Submodule Update Bot
79e164fc72 Update submodules on '5.14.2' in qt5
Change-Id: I4ba4dfe103d1875b04507f463e780db680d1e17a
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2020-03-21 07:05:50 +00:00
Alexandru Croitor
37326dac27 CMake: Enable CMake builds for qtquickcontrols2
Change-Id: I0357d9c3a166eb0679d6dd36c84537397eeda212
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-03-20 18:08:15 +01:00
Lorn Potter
939c014039 Provisioning: Bump emscripten version to 1.39.8 on Windows
Task-number: QTQAINFRA-3577
Change-Id: I63b06a8ac0b4a7233ed9031c7354f3b355c9f8ad
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
2020-03-20 08:09:48 +10:00
Simon Hausmann
00b3c634cf Update Yocto SDKs to Warrior
This is needed to include various fixes to allow building the CMake port
against the contained sysroots.

Change-Id: I42fc055a0e1e2abe5567b9ac3e1bc5e20fcd9900
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-03-19 21:52:59 +01:00
Qt Submodule Update Bot
4ad5f4ad49 Update submodules on 'dev' in qt/qt5
Change-Id: Ia8f970fbeab7ec1bbe05b68f6b645cbf7be883b4
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-03-19 19:03:12 +01:00
Qt Submodule Update Bot
ee12ff9881 Update submodules on '5.15' in qt/qt5
Change-Id: Ib79d685a5235bf1963b04ada786295221a83b1ca
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-03-18 22:18:19 +00:00
Leander Beernaert
0739a54a4b Read module list from .gitmodules
This patch mimics the behavior of qt.pro, where the module list is
extracted from the .gitmodules file and then topologically sorted
based on the modules dependencies.

This patch also introduces a small check to make sure all the required
dependencies are met and will be built.

Change-Id: Idd3df9b618805ca0b2347eac57aaa39c1bcdb3dd
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit b01225fb32)
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
2020-03-18 21:26:26 +01:00
Kevin Funk
a59826003e Start the CMake superbuild
Also import and use ECMOptionalAddSubdirectory.cmake to add other
module's as subdirectories, in case the directories exist. Additionally
this module allows to disable the build of submodules by passing e.g.
BUILD_qtsvg=OFF.

This probably needs more though on how to hande the intermodule dependencies,
but it's a start.

Task-number: QTBUG-75582
Change-Id: Ic3de9711d9b865b2d96bdaee0089f570408b9693
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
(cherry picked from commit 7509458d5f)
Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-03-18 21:26:20 +01:00
Alexandru Croitor
34bbbedb78 CMake: Enable CMake builds for qtimageformats and qtgraphicaleffects
Change-Id: I21415e0ec7a0dfdd4f2b61d2add1adb71095bd16
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-03-18 21:26:05 +01:00
Jani Heikkinen
da2fcb2958 Update qtwebengine
Task-number: QTBUG-82894
Change-Id: I40cb18037a10cbf4205d6c2a6fbbefbcc259bc91
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2020-03-17 07:18:47 +02:00
Alexandru Croitor
7c0b475ca6 Enable CMake builds for qtdeclarative
Change-Id: I89654288e6d459f7bd7d9e4c2dac09ecfb0f3a95
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2020-03-13 19:25:52 +01:00
Qt Submodule Update Bot
08c21b092d Update submodules on '5.14.2' in qt5
Change-Id: I4ac85047efe6589405a96ceb9bcf42b9ef79b2d1
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2020-03-13 04:57:53 +00:00
Morten Johan Sørvig
10e843566e Provisioning: Bump Emscripten version to 1.39.8
The upstream URLs have changed:
 - emscripten packages now at github.com/emscripten-core/emscripten/archive/
 - binaries (llvm/binaryen/node) now at storage.googleapis.com/webassembly/emscripten-releases-builds/

Add support for unpacking tbz2 files. Keep caching as
before, update .emscripten config file with new paths.

Task-number: QTQAINFRA-3577
Change-Id: I53e72f19d3eefa0e2155493db4f93c8730c60334
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
2020-03-12 20:05:18 +01:00
Qt Submodule Update Bot
fd2b713a87 Update submodules on '5.15' in qt5
Change-Id: I9c8617253ea6355c42b04cea4018e5ddf239f64f
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2020-03-12 19:05:13 +00:00
Jani Heikkinen
fe45a4ea86 Merge remote-tracking branch 'origin/5.14' into 5.14.2
Change-Id: Id4db926300c54fc5fed9d48584766addc5813833
2020-03-10 10:22:49 +02:00
Alexandru Croitor
e9c2be7b6a Update provisioned CMake version to 3.17.0-rc2
We want to test debug_and_release builds with CMake as soon
as possible.

Change-Id: I7d4c0a4e33adc26129844ff34ea8df6b149e184f
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-03-09 23:42:21 +01:00
Alexandru Croitor
6ff1dcfbd3 CMake: Change iOS builds to build in Release configuration
Apparently standalone Debug iOS builds are not supported in qmake
at the moment as per QTBUG-71990.

While we keep the same configure.json error reports for both qmake and CMake
it's simpler to switch the config to Release.
Once we get Ninja Multi-Config in Coin working, we can switch to
debug_and_release.

Change-Id: I406012918fd402ad0ff29bbdc151e247699eea72
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
2020-03-09 21:15:04 +01:00
Alexandru Croitor
dbd18fc0c5 Re-enable iOS CMake builds
This reverts commit dad8e600bd.

Change-Id: I6aab4d5818e4cbd3ec83ad6d57fa0bdd2348bf35
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-03-09 13:00:29 +01:00
Tony Sarajärvi
3b264301b0 Update openSUSE to 15.1
Task-number: QTQAINFRA-3455
Change-Id: Ie795f19c26ab0c42693388696edb344b4fa121a6
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2020-03-09 10:50:38 +00:00
Qt Submodule Update Bot
bdaa28c45f Update submodules on '5.14' in qt/qt5
Change-Id: I216fbf259c1b29d5526131e061bcd40a2b7673e6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-03-07 22:31:16 +01:00
Alexandru Croitor
e1bc1c4885 Remove vcpkg provisioning and configure arguments
Now that qtbase supports building bundled 3rd party libraries, we
should have no need for vcpkg in Coin anymore.

Change-Id: I7aa7b0323416b60ffb0cd70eec287e5f25963d9a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-03-06 06:25:50 +01:00
Liang Qi
2a405a8df3 Update submodules on 'dev' in qt/qt5 manually
which is based on the last qtqc2 dev integration,
https://testresults.qt.io/coin/integration/qt/qtquickcontrols2/tasks/1583152923

Change-Id: Ide29e6d8e83e2e6afe9a2305039e6c8e9d1eecd9
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2020-03-05 08:56:44 +01:00
Konstantin Tokarev
4c880b3aff Provisioning: install dwz 0.13 to RHEL 7.6
It is used for compression of QtWebKit debug info, saving
about 1Gb (~40%) for non-compressed debug file of
libQt5WebKit.so, and ~50% of 7z-compressed debug package.

Version 0.12 provided in RedHat devtoolset exposes a bug
when applied to QtWebKit debug info:

https://sourceware.org/bugzilla/show_bug.cgi?id=24251

Change-Id: I0395aadfb7babbbc150f367f8b5dd296dc6d2064
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-03-05 04:12:22 +03:00
Konstantin Tokarev
7ba8c15d79 Update platform_configs for QtWebKit
* Add 64-bit MinGW config
* Don't use DisableTests for 64-bit MinGW, as it's necessary for at
least for the purpose of JS engine smoke check
* Sync configure flags with qt5.yaml, but not enable forced debug info
which causes build issues for both 32-bit and 64-bit configs

Change-Id: Iad5ff1459f8b39f17223da75b3319ab0cfc033d8
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-03-05 04:12:11 +03:00
Konstantin Tokarev
b7b6e31d47 Provisioning: Install QtWebKit dependencies on Ubuntu 18.04
Change-Id: Ib9a142ed6641436669c31ae8489ab9c89576e77a
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-03-05 04:12:01 +03:00
Konstantin Tokarev
b263f0a2d1 Provisioning: Install Conan packages for VS2019
Change-Id: Ibbee96ea7ad9e054e1521c897206c9863acc9c08
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-03-05 04:11:50 +03:00
Qt Submodule Update Bot
d3c777f18e Update submodules on '5.14' in qt/qt5
Change-Id: I716a8496b64c70be454ff36edb936bc9f11a3df5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-03-04 22:31:21 +01:00
Qt Submodule Update Bot
b601579dda Update submodules on '5.15' in qt/qt5
Change-Id: I14c3b2f4040378851ed9f7995c57ddf77948aa94
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-03-04 09:11:28 +01:00
Qt Submodule Update Bot
fd23ab598e Update submodules on '5.14' in qt/qt5
Change-Id: I0800d3bc95f5010ce0045f6fa1115288a3009bee
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-03-01 22:31:01 +01:00
Heikki Halmet
9e97db2714 Add missing -qt-zlib configuration parameters for MSVC2019
Change-Id: Ic0b6842b879ecc2951ae5aab3380c5d6e8343f97
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-02-28 15:52:52 +02:00
Liang Qi
08e63423e2 Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
	.gitmodules
	coin/platform_configs/default.yaml
	coin/platform_configs/flashing-wizard.yaml
	coin/platform_configs/qt5.yaml
	coin/platform_configs/qtbase.yaml
	coin/platform_configs/qtconnectivity.yaml
	coin/platform_configs/tqtc-qt-config-gui.yaml
	coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh

Change-Id: I7af8a52d8b4452211982d86105dafacdd3d845c0
2020-02-28 13:49:10 +01:00
Kari Oikarinen
3c0578e0bf Adjust submodule branches 2020-02-28 09:17:28 +02:00
Heikki Halmet
97aa53410e Add MSVC 2019 as packaging target and remove msvc2017 verification
Change will enable tests for MSVC 2019 and replace MSVC2017 as packaging
target.

Task-number: QTQAINFRA-2875
Task-number: QTQAINFRA-3432
Change-Id: Ifef3bd02b5fae6225a6c0ecdc412edbb488e25b1
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-02-27 20:06:22 +02:00
Andy Shaw
8a4f808649 Set qtgraphicaleffects essential as qtquickcontrols2 depends on it
Change-Id: I0a157f71ed8d5132b8238691cbb0f4aa57b04976
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2020-02-25 13:09:06 +00:00
Liang Qi
4ade81d4dd Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Ib51a6d362bf9cc5f6e6f56feadfe264216e24223
2020-02-25 09:51:20 +01:00
Qt Submodule Update Bot
c36c046f1a Update submodules on '5.15' in qt/qt5
Change-Id: If1114ea254b242d6b0f5e0dbdb1bd66155716f31
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-02-25 08:24:28 +01:00
Qt Submodule Update Bot
1b71d3f62e Update submodules on '5.14' in qt/qt5
Change-Id: I1c6dda72bc12d36c95867cfd6f89df057c8b128b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-02-24 17:50:37 +01:00
Qt Submodule Update Bot
35e71e9d2c Update submodules on '5.14' in qt/qt5
Change-Id: I85b462d5ac666754ccd789ad4c8b7be4ee3e1e4e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-02-23 09:21:26 +01:00
Konstantin Tokarev
b73e61a458 Provisioning: update Conan and Conan packages to latest versions
Task-number: QTQAINFRA-3556
Change-Id: If9c600a6bb3aae893924f9372c8b248d3e58f887
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-02-22 12:01:44 +03:00
Heikki Halmet
7e126af82f Provisioning: Update GCC to version 9.2 for Ubuntu 18.04
GCC bug which breaks Webengine build should be fixed in GCC 9.2

Task-number: QTQAINFRA-3534
Change-Id: Ie0df7c67e0e96cca5632bcd0e6a3db822fcbffbe
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-02-19 11:01:15 +02:00
Liang Qi
769362560f Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I604824d346aed06b2e4e62b401fdc1d7040145c2
2020-02-16 12:04:36 +01:00
Liang Qi
e3bbc27500 Only update qtquickcontrols2 in this round
Change-Id: I779f3d0e1534a65e11ec33ea78b8621760f4e319
Reviewed-by: Liang Qi <liang.qi@qt.io>
2020-02-16 10:53:27 +01:00
Heikki Halmet
fdb88edba0 Provisioning: Make sure that Perl's Data:Dumper is installed
Data:dumper is critical for release script build.pl. Currently data:dumper
is installed by devtoolset as a dependency for autoconf. But, it seems,
that in earlier version of devtoolset the autoconf wasn't installed by
devtoolset which caused the failure with build.pl.

Change-Id: I487a17ca0eb37c5984eb2f195e1024ed019b80d2
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-02-15 09:03:00 +00:00
Dimitrios Apostolou
d757c6d0ec Try to catch all errors when sdkmanager installs
Task-number: QTQAINFRA-3531
Change-Id: I008c31a824287c60e67a665d0c2a3aebec863929
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-02-15 07:39:06 +01:00
Dimitrios Apostolou
0d208f77ec Update python3 version on SLES-15
We update to the latest 3.7.x maintenance release for security/stability.

Change-Id: Ic2c251ab8e0db2c5e622f685e54e5cdd715723fc
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-02-15 07:39:04 +01:00
Dimitrios Apostolou
5d431ecc97 Refactor python3 installation in SLES-15 provisioning
+ Use DownloadURL to download from local cache
+ Verify download SHA
+ Silence the tarball extraction
+ Install some generic packages in 02-zypper.sh
+ Use some other generic facilities from common.sourced.sh
+ Other minor changes

Task-number: QTQAINFRA-3528
Change-Id: Ic085d43381e220a0a4a52ef6d5bb0cf8a9bf7032
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-02-15 07:39:02 +01:00
Dimitrios Apostolou
b2d3df3553 Exclude monitoring of some filesystems on macos
For a short time after boot, macos sometimes mounts a filesystem of type
"msdos" at the unique path /Volumes/firmwaresyncd.XXXXXX.

Telegraf [inputs.disk] plug-in stores records to InfluxDB, with the unique
mount path under "path" tag. The uniqueness of the path blows up the
cardinality of the database.

So exclude "msdos" filesystems from being monitored by telegraf.  Additionally
exclude "cd9660" filesystems that appear always as 100% full.

Change-Id: I4cdd3fca57b3db6157df168cc8a5314e64528b2d
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-02-15 07:39:01 +01:00
Dimitrios Apostolou
150f6277e0 Update telegraf version
Change-Id: I1a023e4f1de860a03a135f3b10f2c99d5309dd8b
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-02-15 07:38:58 +01:00
Dimitrios Apostolou
d84b366d55 Silence the sdkmanager progress bar on macos
The exact same method is already in use on all Linux provisions,
it was just copied to macos.

Change-Id: I873f6efd99b147c5364e0dda6c26c7dad7dee480
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-02-15 07:38:57 +01:00
Dimitrios Apostolou
27e42b7a3c Silence sdkmanager on Windows
sdkmanager is already silenced on the other OSes, as it prints thousands
of lines of progress bars in the logfiles.

Change-Id: I4a2aa422a83cfe5fc6a3a7ba7be69e1e9c01acc0
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-02-15 07:38:54 +01:00
Dimitrios Apostolou
47b74fb0ab Print filesystem information at the end of each provisioning
Change-Id: I549a917126954fae62dcdebb5c45a4f6aeb07551
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-02-15 07:38:52 +01:00
Dimitrios Apostolou
de2b280ad8 Windows now report versions.txt and df info at the end of provisioning
Change-Id: Ic2b299c04c91eb498822aca110cea774fdb7cf17
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-02-15 07:38:50 +01:00
Dimitrios Apostolou
5dda5f374f Mask PackageKit on SUSE
Fixes a flaky conflict between zypper and packagekitd.

packagekit is a *static* unit, that means it is missing an [Install] section,
so it can't be enabled or disabled. It is started as a dependency by other
units, or by dbus activation.

We *mask* the unit to make it impossible to start in any way.

For that we had replace a few occurrences of "pkcon" with the native package
manager.

Finally the package "libpython3_4m1_0" is not being installed any longer
because it never was: this package does not exist. It's just that pkcon does
not fail on invalid package names.

Fixes: QTQAINFRA-3523
Change-Id: I6ff580afb05aa508042c444b2ce777c3a9443dfe
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-02-15 07:38:47 +01:00
Dimitrios Apostolou
db23c64876 08-pythondev build should not execute external script
The important bits of the script were copied and modified.

NOTE that we no longer build openssl from source, the distro (SLES15) provides
a version that works well.

Task-number: QTQAINFRA-3528
Change-Id: Iad63d75055a7efc3e104789e4a515b8511cf0880
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-02-15 07:38:45 +01:00
Dimitrios Apostolou
2693e482b6 Extract archive directly to destination filesystem
Save some seconds or even minutes during provisioning, by avoiding copying
many files across filesystems, from /tmp to /usr/local. We now install
directly to /usr/local.

Change-Id: I3a8f545f1400995095193c4eb337f9dd8534ef72
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-02-15 07:38:43 +01:00
Dimitrios Apostolou
fc2d0b5150 Create more meaningful temporary file names
Change-Id: I4bbc94993e51502ea08109a4c99f3e212349ab24
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-02-15 07:38:41 +01:00
Dimitrios Apostolou
b018b841c1 Do not complain about existing empty files
Sometimes we pre-create the target filename using mktemp. In that case of
course the hash will not match, so avoid comparing.

Change-Id: Id0feb0178d659e03f5ceb000f738167cdc28a3ec
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-02-15 07:38:39 +01:00
Dimitrios Apostolou
25fcda6ff3 Alias expansion is not working reliably in non-interactive shells
It happened that old bash version on macOS the alias was not being expanded
for non-interactive shells running under "bash" but was being expanded fine
when under "sh". Using functions is the recommended way.

Here we define a function conditionally.

Change-Id: I607b265cb9e88b2b529ed170121e5a0833003acd
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-02-15 07:38:37 +01:00
Dimitrios Apostolou
c0033df4b9 Execute a specific version of homebrew install script
Also first try to download it from local mirror.

This install script appears to be doing a lot of git-cloning and downloading
itself though, so it is still far from the ideal solution: to only download
from locally cached endpoints.

Task-number: QTQAINFRA-3134
Change-Id: I32131045d6e62f302ec666b4ac055ca5ee9662d5
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-02-15 07:38:35 +01:00
Dominik Holland
7b4b2f86a0 Provisioning: Update jinja2 to 2.10.3
This makes sure we don't run into CVE-2019-10906 when using
jinja2 in QtIvis Autogenerator.

Change-Id: If51bf54bd26858c6b5faa3dd6a6627f2979b862d
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2020-02-15 07:38:32 +01:00
Alexandru Croitor
aa977addd2 Bump CMake CMAKE_OSX_DEPLOYMENT_TARGET to 10.14
To hopefully get proper macOS C++17 support.

Change-Id: Icd7fcf49de319e4d20693db356e85f3c5332581e
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2020-02-14 11:29:00 +01:00
Liang Qi
d6d9806883 Merge remote-tracking branch 'origin/5.14' into 5.15
Disable a no-gui build on Ubuntu 18.04 for 5.15.

 Conflicts:
	coin/platform_configs/default.yaml

Task-number: QTQAINFRA-3406
Change-Id: Ida5271d29b89375c045de0c4e6dc20840a0bc748
2020-02-14 09:49:03 +01:00
Heikki Halmet
fd7bfcc0c5 Provisioning: Update signing tools for macOS
Update expired certificates

Task-number: QTQAINFRA-3540
Change-Id: I21e718901cb3f5c901273c0c122430f5caaea3d0
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2020-02-14 05:08:31 +02:00
Alexandru Croitor
dad8e600bd Disable iOS CMake builds until vcpkg is provisioned on macOS
It will be reinstated later once confirmed that all the necessary
bits are there.

Change-Id: I04ca0dda3f9feece8acc9039c8372d346b4f3cd4
Reviewed-by: Liang Qi <liang.qi@qt.io>
2020-02-13 12:54:44 +01:00
Jani Heikkinen
bb39b8730a Remove 'TP' status from submodules
From Qt 5.15 ->
   - QtQuick3D will be officially supported
   - QtLottie will be officially supported
   - QtQuickTimeline will be officially supported

Task-number: QTBUG-81818
Task-number: QTBUG-81834
Task-number: QTBUG-81922
Change-Id: I5e6efd5ccaf0bb25c83c9b88cc6cc2f8146993e2
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2020-02-13 13:26:46 +02:00
Simon Hausmann
dfb773505c Prospective fix for macOS CMake builds
Adjust the SDK root path to match what's on the system. This should
ideally not be hardcoded here but detected, but for now fixing the build
is highest priority.

Change-Id: I317fe9a4e038cb62cf6cdf06f10a60aa9d975e15
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2020-02-13 09:48:00 +01:00
Qt Submodule Update Bot
59a1bcec4e Update submodules on '5.15' in qt/qt5
Change-Id: I3b32b99876b25e76319a4ed90770c54256649958
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-02-13 07:08:54 +01:00
Simon Hausmann
4d0a52ddbf Prospective fix for broken cmake builds on 10.14
Add missing dependencies that were there on 10.13.

Change-Id: I1d81e9f50a83486784bef02bf904e3e8c53c4f11
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-02-12 22:32:15 +01:00
Alexandru Croitor
de86e584d5 Add iOS CMake builds for qtbase and qtsvg
Change-Id: I8a14aefd0d28f13cb3fe9e80aac2d480a4ad16af
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-02-12 19:19:39 +01:00
Alexandru Croitor
f246adc1bd Add CMake builds for qtsvg
Change-Id: Ia219be907e44f3e5ab9cb79cf9bd57ca15b11587
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-02-12 19:19:35 +01:00
Samuli Piippo
fe84957439 Change meta-boot2qt platform configs to Module only
This is a workaround for Coin issues where it combines both
Legacy instruction platforms from default.yaml and module_config.yaml
platforms from meta-boot2qt.yaml.

Task-number: COIN-508
Change-Id: I970400cd7d326788ec274c38789d61b4a524989b
Reviewed-by: Toni Saario <toni.saario@qt.io>
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
2020-02-12 16:38:39 +00:00
Alexandru Croitor
431eb132a9 Provision Ninja for macOS 10.14 template
Change-Id: I62ad67561de3459fe1a09e645dcc9b40dd2dbb1d
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-02-12 13:11:03 +01:00
Alexandru Croitor
cd2ac9df6b Fix template name for CMake macOS builds
Change-Id: I5709145b8a1642e27b1de14c37a6d8ccee89107a
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2020-02-12 13:10:43 +01:00
Simon Hausmann
c802afc31b Remove ICC also for cmake
Switch the static build to GCC instead.

Amends commit 4c55e1cfa7

Change-Id: Id752dcd86c2bda8811427a7bf7b756eee7247992
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2020-02-12 08:50:34 +01:00
Simon Hausmann
68419bc36c Switch the cmake build also to macOS 10.14
We've switched the qmake configs as well, so cmake should follow.

Change-Id: Ib0cf4b3ade56714b4437afd5ce301204e5b31d24
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2020-02-12 07:47:14 +00:00
Qt Submodule Update Bot
e01ec6d6f5 Update submodules on '5.15' in qt/qt5
Change-Id: I558493f1e9f079824cd1a0e3752dbd1e498c6a27
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-02-12 03:48:05 +01:00
Alexandru Croitor
04e09db02a Enable CMake Coin configurations
This change enables building a few CMake configurations of qtbase in
Coin.
It should only be merged once qtbase wip/cmake -> dev change is
merged.

Change-Id: I7542af91c7f0004219d0155cad485582883e8e95
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-02-11 16:11:42 +01:00
Samuli Piippo
d4eac1cc92 Don't use legacy instructions for meta-boot2qt project
meta-boot2qt is already using module_config.yaml to define
the CI instructions.

Change-Id: I67e4f8005dce55aea0143236c4aad0bbedaa8def
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2020-02-11 14:36:47 +02:00
Qt Submodule Update Bot
5f01869f16 Update submodules on '5.15' in qt/qt5
Change-Id: I9b97f5ba649f7deb44c27080f8e5ea7f06ee0df6
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-02-11 06:28:19 +01:00
Qt Submodule Update Bot
e47c4ab772 Update submodules on '5.14' in qt/qt5
Change-Id: Ia508250715b673a2d9e7719b82bd4c6032ef7bda
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-02-10 05:48:25 +01:00
Qt Submodule Update Bot
cf13f18a1f Update submodules on '5.14' in qt/qt5
Change-Id: I11fe2e6c9403823cca54d8ec2cd8c7b79e28170d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-02-07 08:47:40 +01:00
Qt Submodule Update Bot
704ef6207d Update submodules on '5.15' in qt/qt5
Change-Id: Ib241a47a09ff3a86e3bc1c942e266269e0854950
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-02-07 08:12:38 +01:00
Dimitrios Apostolou
eee60c0824 Fix openssl build in SLES-15
Upstream changes of binutils or elfutils broke the build. Error was:

/usr/lib64/gcc/x86_64-suse-linux/7/../../../../x86_64-suse-linux/bin/ld: /usr/lib64/libc_nonshared.a(elf-init.oS): unable to initialize decompress status for section .debug_info
/usr/lib64/gcc/x86_64-suse-linux/7/../../../../x86_64-suse-linux/bin/ld: /usr/lib64/libc_nonshared.a: error adding symbols: file format not recognized
collect2: error: ld returned 1 exit status

Task-number: QTQAINFRA-3527.
Change-Id: I50b677598b4415a281abbf0ddb2db39613646b36
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-02-05 22:25:34 +01:00
Qt Submodule Update Bot
24cb0b8afe Update submodules on '5.14' in qt/qt5
Change-Id: I4849b30f1eff5a005d69b68337d7997e38f9e950
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-02-05 18:00:09 +01:00
Sona Kurazyan
601c1bd79b Add qt5compat to submodules list in dev
Task-number: QTBUG-81630
Change-Id: I85f3d4a5ddbef28c217903816568e0420902f694
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2020-02-04 20:01:02 +01:00
Simon Hausmann
2a64418358 Transition to macOS 10.14 step 1
We want to run all tests on macOS 10.14, which requires some more fixes
in qtquickcontrols2. That however isn't passing due to unrelated changes
in base/declarative blocking us from moving forward. So to decouple the
two, this change limits macOS tests to qtbase and declarative but on
10.14. This will allow us to switch qtbase over to C++17 and once we've
got qqc2 updated in qt5.git, we can globally re-enable tests for 10.14.

Task-number: QTQAINFRA-3108
Change-Id: I0f835a1da87187c6bb69e3d4019196e1411095fd
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2020-02-04 16:54:05 +01:00
Jani Heikkinen
eaf196219b Update qtwebengine
Update QtWebengine for Qt 5.15 Alpha: We need to have
4455081eabc8610112d1cce56a6f6fc64c0be236 in alpha

Task-number: QTBUG-81128
Change-Id: I0030bb44bbb24813e6bb57d8c4b05c83defb6d57
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
2020-02-04 13:00:39 +02:00
Qt Submodule Update Bot
f8ab18df91 Update submodules on '5.15' in qt/qt5
Change-Id: I9852c8b494db112d0db24f4d14e355c169b3fecf
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-02-04 09:27:34 +01:00
Qt Submodule Update Bot
8405c73f8e Update submodules on '5.14' in qt/qt5
Change-Id: I8d193d3412712550cf1c3b6beec32365c89185bb
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-02-04 06:16:42 +01:00
Alexandru Croitor
25e0073720 Use legacy instructions when building all qmake configurations
This change is preparation for merging qtbase wip/cmake -> dev,
because that will bring in the new yaml instructions on how
to build the CMake configurations, which means that legacy
instructions provided by Coin itself need to be used for all
the existing qmake configurations.

Change-Id: I7005835719b83b7186138292a2e1baf4d2a4a3e0
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2020-02-03 14:15:33 +01:00
Tuomas Heimonen
eb3d2ed68b Provisioning: Remove unistd.h from postreSQL from 64 bit Windows
PostreSQL 9.6 version creates emtpy unistd.h file which will cause
failure in Qt Safe Renderer' MinGW build. By removing it the system
should use the one from the MinGW environment.

Task-number: COIN-488
Change-Id: I76d3f34dd9726dc4f0aac06c410f306dffc8f365
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-02-02 10:57:42 +02:00
Simon Hausmann
486139715b Disable warnings-are-errors for the doc build
We're not really interested in catching the C++ warnings at this late
stage (Qt5 build), especially not for building documentation.

Change-Id: I48c621ce6de199de61fab8de6517f4c0b099bf11
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2020-01-31 12:38:45 +01:00
Lars Knoll
a23bc16dcc Remove wasm on windows for now
The compiler fails to pass the c++14 configure test.

Change-Id: I2253d1654eda19351154467cd3b076ba726c10d7
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-01-31 12:38:45 +01:00
Qt Submodule Update Bot
09a78c7e84 Update submodules on 'dev' in qt/qt5
Change-Id: I16a797f24169c42eb1b11f9d62905c687af7da4f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-01-31 12:38:45 +01:00
Laszlo Agocs
5b56192bc1 Add qtshadertools as a submodule in dev
Task-number: QTBUG-78589
Change-Id: I64da5b9f46ace924e3dd24a1ea062379450f8ca3
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-01-31 12:38:45 +01:00
Qt Submodule Update Bot
311e9abd1e Update submodules on '5.14' in qt/qt5
Change-Id: Ie3c04cf02a3cf7daeb20408bc7afc7c42c88453f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-01-31 06:45:02 +01:00
Jani Heikkinen
89fceff6a4 Add '-qt-zlib' as a configure argument for windows builds
This is needed to use the bundled zlib in windows builds. In Qt 5.14.0
windows packages were using bundled one but in Qt 5.14.1 not anymore. So
this change is to restore same behavior than in Qt 5.14.0.

Linux and macOS packages seems to use system zlib also in 5.14.0; that's
why no changes needed there

Task-number: QTBUG-81724
Change-Id: Ife531d96c8438491e5d7b1f97f5338c4627be7e8
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2020-01-31 05:43:18 +00:00
Simon Hausmann
3c6f8b1af5 Re-add qtimageformats
Qt Quick Controls 2 styles use webp, which in turn is instantiated by
tests.

Change-Id: I7a9a98f96beecb1f214e9e2caef0062a5716d31e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2020-01-30 09:26:13 +01:00
Simon Hausmann
24d977a188 Reduce the set of modules for Qt6 development
Change the amount of modules that are tested together by the CI (and
then used for initial Qt 6 snapshots) to the core essential modules. All
others are set to "ignore" and the objective is to bring them back later
when qtbase/declarative/quick3d development has settled.

Notable exceptions are svg and graphicaleffects due to their strong
dependency from qtvirtualkeyboard as well as qtquickcontrols2.

Change-Id: I972d7b353add1f5dbad5104ce84c4cc5b8c6f616
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2020-01-29 10:39:01 +01:00
Heikki Halmet
e7cf4b21f1 Provisioning: Remove unistd.h from postreSQL
PostreSQL 9.6 version creates emtpy unistd.h file which will cause
failure in Qt Safe Renderer' MinGW build. By removing it the system
should use the one from the MinGW environment.

Task-number: COIN-488
Change-Id: Id7f2f5024998cc5fbeb61e144bcd87f6e09b2bb1
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2020-01-28 17:07:16 +02:00
Liang Qi
eee24c15d7 Merge remote-tracking branch 'origin/5.14.1' into 5.14
Change-Id: Ie43351d7e64b121137e9a923c79a0f26ae7e086a
2020-01-28 13:14:41 +01:00
Lars Knoll
4c55e1cfa7 Remove ICC from our list of tested platforms for now
ICC 18 doesn't support C++17, so let's remove it.

Change-Id: If87010fe73111324f78ccd26f25e55ec7e6afbca
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-01-28 12:23:36 +01:00
Qt Submodule Update Bot
0e336aea87 Update submodules on '5.14' in qt/qt5
Change-Id: I35cf6c5d4c63ed0dddda80ac85cd7e675334992b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-01-28 10:53:05 +01:00
Qt Submodule Update Bot
9d78f3bd2b Update submodules on '5.15' in qt/qt5
Change-Id: I0efd7bb24f4cc36c39ff8ef08083fcca235c9e93
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-01-28 06:36:11 +01:00
Lars Knoll
4e4e7a9679 Update macOS WebAssembly and Android builds to use 10.14
macOS 10.13 doesn't support C++17, and will get removed soon.

Change-Id: I5ed50df99d8582349adfd04e59ce89dd49701f76
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2020-01-27 15:41:37 +01:00
Lars Knoll
b2f62bb906 Remove QNX configs from CI
Those configurations don't support a C++17 compliant compiler.

Fixes: QTBUG-81576
Change-Id: I87499e21e7532856fdd4c41b1e162e3566d5f130
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
2020-01-27 15:41:26 +01:00
Simon Hausmann
0363e5f7de Run tests on macOS 10.14
Also bump qtbase to pull in the latest fixes for 10.14 testing.

Task-number: QTQAINFRA-3108
Change-Id: I7a198c74a4f7e537d95053bfad25a905029aa2db
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-01-27 15:15:40 +01:00
Qt Submodule Update Bot
f908a069d9 Update submodules on '5.15' in qt/qt5
Change-Id: I089e1ccd046ff13407656a53d2d3b1026cf4b16b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-01-26 19:26:56 +01:00
Qt Submodule Update Bot
fb0c74c862 Update submodules on '5.14' in qt/qt5
Change-Id: Ie981929db31c1508ac575727fb8f1e812392c9c9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-01-26 14:20:56 +01:00
Qt Submodule Update Bot
eac5e8f5c8 Update submodules on '5.14.1' in qt5
Change-Id: Id83b5a1d21fc124b8c4b45780f8701ba0d2e8849
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2020-01-24 04:08:02 +00:00
Heikki Halmet
d42e5bda88 Provisioning: Install needed packages for Python build
For Conan python needs to be built from sources.

Task-number: QTBUG-81014
Change-Id: I8d14d65ce2f1c57a7fa370b93aa61bc156d617ca
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
2020-01-23 08:59:12 +02:00
Qt Submodule Update Bot
cc4cbd241b Update submodules on '5.14' in qt/qt5
Change-Id: I72d90f7fb1b0dc136081537cbc250d6f8e79c069
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-01-23 07:18:27 +01:00
Simon Hausmann
0b32ba9924 Re-remove WinRT configurations
They were originally removed in commit
5677a43a25 but re-added through a merge.

Change-Id: I821fb955745dfc5e982cdbf2264af3345ec03252
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2020-01-22 15:39:32 +01:00
Qt Submodule Update Bot
72175ca334 Update submodules on '5.14' in qt/qt5
Change-Id: Id9f85623e58958a3dfc09515c21c68941257f436
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-01-21 06:56:15 +01:00
Samuli Piippo
154ae1ebef Remove default hostname from ubuntu
Removing the default hostname makes system create unique hostname
based on the IP address. This is needed to make NFS operations
reliable.

Task-number: QTQAINFRA-3257
Change-Id: I9e4dc4950f5d1a1b7f85372674f79d1701d1eab6
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-01-20 20:04:48 +00:00
Qt Submodule Update Bot
1c924f425b Update submodules on '5.14.1' in qt5
Change-Id: Ibd71afb2637aa413f5ff3dfd1769b04abe6793b8
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2020-01-20 04:12:33 +00:00
Qt Submodule Update Bot
0948f301a2 Update submodules on '5.14' in qt/qt5
Change-Id: I62815a13f92c52c164c196c221fc5fc8d2dbc7e8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-01-18 22:31:00 +01:00
Kai Koehne
a0e5b4b466 MinGW: Do not ship host tools with debug information
Follow the approach for Linux (see 269387), and do set the -s ln flag to
make sure the linker does not include debug information in host tools.

From ld documentation:
  -s: Omit all symbol information from the output file.

Fixes: QTBUG-81301
Change-Id: I21f828adec4a93855331d8b833cfa708b73baafd
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2020-01-17 12:32:09 +00:00
Jani Heikkinen
1382e42ef9 Update submodules on '5.14.1' in qt5
Change-Id: Ied51c426c5bf7b5ee85c346c1de471da11aa86fe
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2020-01-17 14:32:05 +02:00
Jani Heikkinen
bbcacb9957 Merge remote-tracking branch 'origin/5.14' into 5.14.1
Change-Id: Ia832d6cf790e6eb23e54fd2377ae24efa4e7a950
2020-01-16 07:25:19 +02:00
Qt Submodule Update Bot
75192dee07 Update submodules on '5.15' in qt/qt5
Change-Id: Ic2818ff944b945fad346ea5f4de96368c25c6413
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-01-15 07:08:43 +01:00
Qt Submodule Update Bot
e6f8ec714d Update submodules on '5.14' in qt/qt5
Change-Id: Icf5f7c37fda5852f54265abf8b815858f9ac50c9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-01-14 22:31:57 +01:00
Heikki Halmet
5d027444b5 Provisioning: Update postgresql
Apparently libpq version 9.1.9 is no longer supported.
Let's use version 9.6 to keep maximum compatibility and align
the version with MacOS.

Task-number: QTBUG-79555
Change-Id: Iea98a1eb821f103e3a610ed602746407bfe5ea97
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-01-14 14:35:06 +02:00
Qt Submodule Update Bot
5bdb2a0300 Update submodules on '5.14' in qt/qt5
Change-Id: I7cb77e9e0c3cca65ca7dd723b5775f89ce9e71fd
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-01-14 09:14:44 +01:00
Dimitrios Apostolou
fe4a724a3e Use internal mirror repositories for Ubuntu docker containers
Depending on different external URLs makes our provisioning scripts flaky,
because they can fail if any one of the external servers goes down.
In this patch

* the docker images qt_ubuntu_16.04 and qt_ubuntu_18.04 are being built first,
  they apt-get from the internal ubuntu mirror

* all the existing docker images have been rebased to these two images, so
  they inherit this behavior

* images that fetch files from the internet have been modified to not do the
  fetching themselves; insted URLs are fetched in advance using "DownloadURL"
  which accepts internal mirrored URLs, and the downloaded files are ADDed to
  the images with a local copy

* previously existing git clone commands have been modified to fetch
  internally mirrored tarballs

Task-number: QTQAINFRA-3343
Change-Id: Ic4640a4f7776e38623edba90f0eba7cb68631223
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-01-13 19:44:45 +01:00
Dimitrios Apostolou
302b228c7a Do not try to double-install docker-ce-cli
That happened because docker-ce* was installing both docker-ce and
docker-ce-cli, so apt was printing a warning.

Change-Id: I0cad82243c8c3d5c0b9f26fc7b24673268259aa4
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2020-01-13 19:44:45 +01:00
Qt Submodule Update Bot
14ad9b1387 Update submodules on '5.14' in qt/qt5
Change-Id: Idb52a57c9c72c1424629a9ae2ed06584b5b8d068
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-01-13 06:39:07 +01:00
Qt Submodule Update Bot
cfa998544d Update submodules on '5.15' in qt/qt5
Change-Id: I5a22e3929eaefa4efe1cbfc3eed10954bc32e2c7
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-01-12 23:46:00 +01:00
Qt Submodule Update Bot
ee690d1533 Update submodules on '5.14' in qt/qt5
Change-Id: Id5f66e3cb581fd880851fb61d901060a8232be2e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-01-11 22:31:18 +01:00
Qt Submodule Update Bot
4a0e64744f Update submodules on '5.15' in qt/qt5
Change-Id: I5def23e806a8193bb20c4444c8c4a800bbbdbf0c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-01-11 11:13:58 +01:00
Qt Submodule Update Bot
b0b93acc7d Update submodules on '5.14' in qt/qt5
Change-Id: I5b18577a73d6c807ef3dd6a849e849594d016ffa
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-01-11 10:56:54 +01:00
Qt Submodule Update Bot
59a9940d94 Update submodules on '5.14' in qt/qt5
Change-Id: Ieac8e850bd8a6692a6ae71af6ad6160d6b7a5cd5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-01-10 15:06:10 +01:00
Dimitrios Apostolou
4d7f6c711c Remove unused script
Change-Id: Ic3c57966c78fd8158a2467956fd31eaa4374412d
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-01-10 16:06:07 +02:00
Qt Submodule Update Bot
a9633efe67 Update submodules on '5.15' in qt/qt5
Change-Id: I9965f7277a859698cbbc70f66f1a352cab63436a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-01-10 09:37:04 +01:00
Qt Submodule Update Bot
fd9e7634de Update submodules on '5.14' in qt/qt5
Change-Id: I4bd71f764c88db41229a068753b59255905f4381
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-01-09 07:26:18 +01:00
Kari Oikarinen
a0c08969b0 Adjust submodule branches 2020-01-08 17:57:47 +02:00
Qt Submodule Update Bot
eb425b3dff Update submodules on '5.14' in qt/qt5
Change-Id: Ia736aeb90faaee12600944d54376db1876809bc0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-01-07 10:44:31 +01:00
Tony Sarajärvi
7286bd9f7a Remove WatchOS and tvOS from the CI
Task-number: QTQAINFRA-3430
Change-Id: I3e6696db80312cbc14373ad623291e58017c6083
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2020-01-06 10:47:44 +00:00
Qt Submodule Update Bot
b272190213 Update submodules on '5.14' in qt/qt5
Change-Id: I58a16e8a9ff1d1ca307c22ce012a6a9e088ef09f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-01-06 10:12:47 +01:00
Qt Submodule Update Bot
2dc0539847 Update submodules on '5.15' in qt/qt5
Change-Id: I44e262601d39cabe1a29858d3fada7e8115a1df4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-01-06 09:01:05 +01:00
Qt Submodule Update Bot
3ae7991090 Update submodules on '5.15' in qt/qt5
Change-Id: I64956bc9216b5afe7f85f74267492e9c549acb4a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-01-04 23:45:59 +01:00
Heikki Halmet
9e834b7651 Provisioning: Update Xcode to 11.3 for macOS 10.14
Task-number: QTQAINFRA-3189
Change-Id: If16062254b33579b14f141d1db4aca2ad1e23afb
Reviewed-by: Liang Qi <liang.qi@qt.io>
2020-01-04 19:48:32 +00:00
Liang Qi
f09dbf65e1 Enable a no-gui build on Ubuntu 18.04 for 5.14
Task-number: QTQAINFRA-3406
Change-Id: Idb3e828f851fe00e76b0f3db1badb336062cd20a
Reviewed-by: Liang Qi <liang.qi@qt.io>
2020-01-04 18:03:26 +01:00
Qt Submodule Update Bot
e6fd7bcd26 Update submodules on '5.14' in qt/qt5
Change-Id: Ibbf7352f6dc6fd2ce5601c2d0be2811b5e84c101
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-01-04 15:31:26 +01:00
Assam Boudjelthia
51417379f7 Install QEMU from .deb package from internal cache
QEMU cloning and building with each provisioning takes
time, thus installing it from a prebuilt installable package
can save lots of time in provisioning.

Task-number: QTQAINFRA-3396
Change-Id: I3e9b0fedeecb6ddbae3997742827552ce9419399
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2020-01-03 17:33:24 +02:00
Qt Submodule Update Bot
c926819387 Update submodules on '5.14' in qt/qt5
Change-Id: Ic2c372266dcb55741918dfc756328aae9cc72008
Reviewed-by: Liang Qi <liang.qi@qt.io>
2020-01-03 10:50:14 +01:00
Qt Submodule Update Bot
cac62e47fe Update submodules on '5.15' in qt/qt5
Change-Id: I8f0be41a7d699b881d77bade00e6668992253818
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-01-03 08:26:49 +01:00
Qt Submodule Update Bot
63f9bfd6f9 Update submodules on '5.14' in qt/qt5
Change-Id: I483e96010677a18ac89577cb35f72d42e2544853
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-01-02 13:29:36 +01:00
Qt Submodule Update Bot
a626d59af1 Update submodules on '5.15' in qt/qt5
Change-Id: I799197cc0d39360e2410005873330a73e9fbbe72
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2020-01-01 23:45:59 +01:00
Qt Submodule Update Bot
1def8bb62c Update submodules on '5.15' in qt/qt5
Change-Id: Iab73ab91d8e449f851dcf46cfd169632e9c244fe
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-12-29 23:45:59 +01:00
Qt Submodule Update Bot
60a556268c Update submodules on '5.14' in qt/qt5
Change-Id: Id466f85a6e2f1e79ec35836be1ea7f9ca4216666
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-12-29 22:31:00 +01:00
Qt Submodule Update Bot
af7cf0fc3f Update submodules on '5.15' in qt/qt5
Change-Id: Ie54bc40cf2b0fdbe80313a5c17eeca8129e9619d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-12-26 23:45:59 +01:00
Qt Submodule Update Bot
450e5f4d7c Update submodules on '5.14' in qt/qt5
Change-Id: Ic3b07bb0ffca1ec66adc762238a61f613bb24ee0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-12-26 22:31:00 +01:00
Qt Submodule Update Bot
c48c756bb9 Update submodules on '5.15' in qt/qt5
Change-Id: I53604693e5430dfc4f5bb56043bbe71df82d2c0f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-12-22 23:45:59 +01:00
Qt Submodule Update Bot
02ee6e571f Update submodules on '5.14' in qt/qt5
Change-Id: I835657ea69a413b2c08073cdf565140642987f70
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-12-22 22:31:00 +01:00
Qt Submodule Update Bot
db55667668 Update submodules on '5.14' in qt/qt5
Change-Id: If43145e8009a9a6a278a57aebf3dff91a928c9c8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-12-20 06:19:03 +01:00
Paul Wicking
bd0943bf50 Update _clang-format definition
Add indentation for preprocessor directives if/ifdef/endif
as this is commonly used across Qt.

Change-Id: I0ce9851cc0861b8d18cb3717d695c871169db239
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2019-12-18 09:55:55 +01:00
Jani Heikkinen
62d75f883c Update enterprise license agreement v4.2.1
Task-number: QTBUG-80661
Change-Id: Icc3a1408b104ad2f08cd6959ee4bcb8da2fb69cf
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2019-12-18 07:20:13 +02:00
Qt Submodule Update Bot
812a8b0e1a Update submodules on '5.14' in qt/qt5
Change-Id: I0cbcbc227db09a2d6fad6390d00ef95148edbcd7
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-12-17 07:34:43 +01:00
Liang Qi
14174482be Update submodules on '5.15' in qt/qt5
Change-Id: I9729f4621df730a8e62a5b8b8c8147b73e772f3b
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-12-16 11:02:38 +01:00
Qt Submodule Update Bot
96594fef87 Update submodules on '5.14' in qt/qt5
Change-Id: I47e1f77b3953df5defdc14b7f200bdd0c46191c3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-12-15 22:31:17 +01:00
Qt Submodule Update Bot
f6e9fc2ba5 Update submodules on '5.14' in qt/qt5
Change-Id: I0fbad0d790ea54f08bd71c8a558646e4c0711294
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-12-15 14:02:20 +01:00
Liang Qi
ee2798641b Merge remote-tracking branch 'origin/5.14.0' into 5.14
Change-Id: I5c3bfd31d2489bcf1a44f694532afbe92b9d3074
2019-12-14 20:58:11 +01:00
Qt Submodule Update Bot
86848c1298 Update submodules on '5.14' in qt/qt5
Change-Id: I778e48468a05708269960018a3e70e45f7295149
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-12-14 13:13:09 +01:00
Simon Hausmann
68c8693e5b Merge remote-tracking branch 'origin/wip/cmake' into dev
This merges merely the provisioning changes needed to perform cmake
builds in the CI. The platform configuration changes will be applied
incremental as we merge support in the individual modules.

 Conflicts:
	coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh

Added ninja to
coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh
just to force re-provisioning.

Removed module_config.yaml because that breaks license check in
qmake builds.

Change-Id: Ic074c0c881404f4361e61f66130c0cb07f5e8b84
2019-12-13 14:58:08 +01:00
Alexandru Croitor
3aef268464 Update vcpkg snapshot
The snapshot uses the previous snapshot as a based. It was rebased
on latest master as of 2019-12-05, and also contains cherry-picked
patches to target iOS.

Change-Id: I9fc0c39856fdb255533f6c71d27f5749894b6bea
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-12-11 20:58:03 +00:00
Qt Submodule Update Bot
bbe2ca1f14 Update submodules on 'wip/cmake' in qt/qt5
Change-Id: Ia8dbab68e5a7dd4f136e6345d6c1da9705d4be69
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-12-11 02:31:30 +00:00
Tony Sarajärvi
11ded96d6e Remove SLES 12 provisioning scripts, as the platforms is already removed
Change-Id: I52ded9be93b65b74ac4d42434f82a44831e3ec48
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-12-10 17:17:51 +00:00
Heikki Halmet
a7c5f204bc Provisioning: New Tier1 image for Windows 10 x86_64
Change will upgrade Visual studios to the latest ones. Also MSVC 2019
build tools are installed for RTA.

MSVC 2019 version 16.3.10
MSVC 2017 version 15.9.17
MSVC 2019 build tools version 16.3.10

Task-number: QTQAINFRA-3389
Change-Id: Ic21645f96f8d4e6abc38951bd6bab519b4864418
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-12-10 09:48:42 +02:00
Qt Submodule Update Bot
d47213e974 Update submodules on 'wip/cmake' in qt/qt5
Change-Id: I8a50e284b785b7441826ed4f199a5db4c2be6f6e
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-12-10 05:06:00 +00:00
Qt Submodule Update Bot
26ef6f7c13 Update submodules on '5.14.0' in qt5
Change-Id: Ic2d754b6f873b051472b3fd9ff2b8e7ee27d7dfb
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-12-08 14:43:07 +00:00
Qt Submodule Update Bot
f38665a06a Update submodules on 'wip/cmake' in qt/qt5
Change-Id: I0c29a5b3944a20d6652c0c8cb1199abae9683f93
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-12-07 21:58:23 +00:00
Jani Heikkinen
ad52452416 Update QT LICENSE AGREEMENT Agreement version 4.2 in qt5 root
There seems to be own copy of QT LICENSE AGREEMENT in qt5 root as well.

That's why we need to update it to currently used version (4.2). At same
time let's remove version from file name to make update easier in the
future

Task-number: QTBUG-80485
Change-Id: I286390a0754dcba79927f4d74abaf06d761bedc1
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2019-12-06 15:28:17 +02:00
Qt Submodule Update Bot
bd37983a8d Update submodules on '5.14.0' in qt5
Change-Id: I814b6e4b94291414b1a8e227095d2742de175985
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-12-06 13:28:07 +00:00
Liang Qi
2d6f569ee9 Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Ia67f4be8c51a2bd0a8a03cb3857dfd57d7eea806
2019-12-06 10:25:21 +01:00
Liang Qi
4282752c19 Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: If0f14c514b3c7ce7abf6b27221a26f921fef7f7f
2019-12-05 14:47:57 +01:00
Dimitrios Apostolou
e4f9ac5607 Tag the docker images as "latest"
We will use this tag in qtbase to refer to the image to run, because
with the current sha1tree() tag, every minor change in the docker images
requires synchronized changes between repositories.

Task-number: QTBUG-79867
Change-Id: If94eb6dd8b97526b589e58064837bc6554fed79c
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2019-12-05 09:13:39 +01:00
Qt Submodule Update Bot
ec79fbe5ec Update submodules on 'wip/cmake' in qt/qt5
Change-Id: I45dd7a0b0a93a35aa3f528617efeaa2859f9ce6e
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-12-04 08:41:15 +00:00
Alexandru Croitor
8c94279a59 Update submodules on 'wip/cmake' in qt/qt5
Change-Id: Id725f04bc4753fc68a9bbb2762beb2c5f4eb9d84
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-12-03 16:48:34 +00:00
Heikki Halmet
7c1c98e123 Provisioning: Install libpoppler
Poppler test requires this package

Task-number: QTQAINFRA-3253
Change-Id: Ifc0904ca020a8606b06a4032d5145fbf2f8063f1
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
2019-12-03 17:51:21 +02:00
Qt Submodule Update Bot
d7a4a50e2d Update submodules on 'wip/cmake' in qt/qt5
Change-Id: Ia5837cb7f71ea98b280b66998f7a3624750dde6e
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Qt CMake Build Bot
2019-12-03 05:52:31 +00:00
Qt Submodule Update Bot
b1de0fedcf Update submodules on '5.14.0' in qt5
Change-Id: I8b4b971563492f853f802337af7489e2d6323362
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-12-03 05:14:56 +00:00
Liang Qi
4b6c05815a Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I4dd840681bd84f7aeed58602b0c998c0e5807e10
2019-12-02 10:27:23 +01:00
Qt Submodule Update Bot
b3da333101 Update submodules on '5.14' in qt/qt5
Change-Id: I7a09d7b24e5feb97ec891f0a92d35b12dcebde91
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-12-01 22:30:59 +01:00
Jani Heikkinen
827bdae8ef Update submodules on '5.14.0' in qt5
Update submodules on '5.14.0' in qt5

Change-Id: Ifd79795cba5a9b58f7c89e35f75f6fc6a4e57950
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-12-01 09:21:01 +02:00
Qt Submodule Update Bot
096fd23eb8 Update submodules on 'wip/cmake' in qt/qt5
Change-Id: I0a261abad505b2f2724f0a15a10708b67129ffbf
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-11-29 17:43:05 +00:00
Liang Qi
bdaf92aa41 Correct branches for .gitmodules
This amends eabc1ed5bd.

Change-Id: Ifbcf5dc593d25d210b652b72e5563fb8e1a1ec5f
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-11-29 15:55:39 +00:00
Liang Qi
61ffa2778f Update submodules on 'wip/cmake' in qt/qt5
Change-Id: Id0fb114e7d4e4bc66d8a51e91ebc8de166229fb6
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-11-29 15:44:24 +00:00
Liang Qi
95c7b90309 Update CMake to version 3.16.0-rc4
Change-Id: I4fc1f412888e1915ae2110320c18fb39a9600b94
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-11-29 10:00:50 +00:00
Liang Qi
63c515a6cb Merge remote-tracking branch 'origin/dev' into wip/cmake
Also update the Windows config to use MSVC2019 instead of 2017
to circumvent the issue that vcpkg is building libraries with the
latest compiler it finds (MSVC 2019), but Qt is building with 2017.

 Conflicts:
	coin/platform_configs/default.yaml
	coin/platform_configs/qt5.yaml
	coin/platform_configs/qtsaferenderer.yaml

Change-Id: I88deb114e171046b50fc617ab6bc18b707d61486
2019-11-28 19:44:30 +01:00
Qt Submodule Update Bot
56ad797f42 Update submodules on '5.14' in qt/qt5
Change-Id: Iaeaf6014ff94eef81ebba7db5ae3de5fa1c4cc2f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-11-27 06:34:45 +01:00
Liang Qi
0d6ae070f4 Update submodules on 'dev' in qt/qt5
Only qtwebengine and qtmultimedia this round.

Change-Id: If5f67c96d26d7721fdb350bb27fbea82aced8e14
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-11-27 06:10:06 +01:00
Jani Heikkinen
2e66078b5e Merge remote-tracking branch 'origin/5.14' into 5.14.0
Change-Id: Ied8894925be2d31333b99638b480b950128d2e22
2019-11-27 07:03:16 +02:00
Liang Qi
f064a5b9d2 Update submodules on '5.14' in qt/qt5
Change-Id: I75cd18c8c09c47c2eee8dd0629d1cccb3b5838e0
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-11-26 19:25:29 +01:00
Leander Beernaert
3ba8bdeda0 Update qt5.git
Change-Id: Ie922b8e2989215de4efd3596e6532b201a3e7d0c
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2019-11-25 16:40:40 +00:00
Simo Fält
9cf8af5248 Provisioning: Remove sudo when installing pip packages for Qt user
There is no need to install as sudo for qt user. Using sudo will
change the cache dir's permissions preventing us from
installing anything with pip as normal user.

Change-Id: Id45bf3805ce4d772a6c82e429d4e1948289f076e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
2019-11-25 13:15:51 +00:00
Liang Qi
86b9edca68 Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
	coin/platform_configs/default.yaml
	coin/platform_configs/qtbase.yaml
	coin/platform_configs/qtconnectivity.yaml

Change-Id: I1f6b8dff622c3899b2d655108f638404b3bc2189
2019-11-22 17:26:28 +01:00
Liang Qi
b5c9819be2 Update submodules on '5.15' in qt/qt5
Only qtmultimedia this round.

Change-Id: I00a94d159457f50a70a9b9eddedd3efd56870e51
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-11-21 18:42:57 +01:00
Johanna Äijälä
08ded9e2f8 Provisioning: update Squish
Update with custom build of Squish to be able to launch Qt5.14
applications in RTA tests.

Change-Id: Ic420656852ae885b057de937baabf01135526764
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-11-21 11:26:11 +03:00
Liang Qi
f9183e71bf Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I03ba6455b8789eefb87a844d5fdbe0998cb02337
2019-11-20 07:29:43 +01:00
Heikki Halmet
dcfef7226f Provisioning: Change JDK script to use 'Remove' function from helpers
Task-number: QTQAINFRA-3369
Change-Id: I2e873eb50d9129c48d92370af80fe121039d172e
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-11-20 08:08:10 +02:00
Heikki Halmet
0335e9c4e5 Provisioning: Remove shell scripts under windows
Change-Id: I3d7a949e95bab39adc349c25d267b7fc28e676cf
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-11-20 09:08:04 +03:00
Heikki Halmet
601a9d39b2 Provisioning: Install python modules needed by packaging
Needed by packaging scripts

Task-number: COIN-214
Change-Id: I3ac719800c3afd183996379f6c23fbe3f8bcf7cb
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
2019-11-20 08:07:58 +02:00
Liang Qi
edb5ebfb7e Update submodules on '5.14' in qt/qt5
Change-Id: Ia052f103935e8451e10258315370009b9b24f596
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-11-20 07:07:48 +01:00
Liang Qi
6d7ae7ebe1 Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
	coin/provisioning/common/linux/docker.sh

Change-Id: Ic5c3fcaa856137de46c6f3830ca75cedb084927d
2019-11-18 19:21:53 +01:00
Heikki Halmet
d8eaed9b09 Provisioning: Update Android NDK version to r20 for macOS 10.14
Task-number: QTQAINFRA-3337
Change-Id: Ib14e3cc484198bb23bb611262b205144f8a8ac70
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
2019-11-18 14:23:08 +02:00
Qt Submodule Update Bot
a72db33bfc Update submodules on 'wip/cmake' in qt/qt5
Change-Id: Ia7d77b5f456e4e6196cacc179952e104476d968f
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-11-16 21:42:42 +00:00
Alexandru Croitor
eabc1ed5bd Add a few more ported repos to qt5.git wip/cmake
Change-Id: I9f7215d3df0ba07af337262dd5e43bfc79e0a97a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-11-15 13:02:52 +00:00
Jani Heikkinen
5d5ef9c32b Enable dSYM files for release builds in macOS
Same flag is used in windows and linux ones and it seems that is needed
to enable dSYM files for release builds

Task-number: QTBUG-3934
Change-Id: I3f60ea68ba0f4d755e411215efa4cec1d0a46d83
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2019-11-15 06:22:55 +02:00
Tor Arne Vestbø
6bf7a970e7 Use Xcode 11 on macOS 10.14
Fixes: QTQAINFRA-3261
Change-Id: Ibec6b156e030b2a1b91010321178612efc0bd06b
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-11-14 20:04:33 +00:00
Tor Arne Vestbø
40cca42c39 Use macOS 10.14 to build iOS/tvOS/watchOS
Allows us to (as a follow-up) use Xcode 11.

Change-Id: I799732eee35eea3db83e568d26ded6e7ae1df53d
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-11-14 20:08:00 +01:00
Qt Submodule Update Bot
3903c2a72d Update submodules on 'wip/cmake' in qt/qt5
Change-Id: I28901d350b1f16b9a6b3d9776ee8055ea3356ade
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2019-11-14 14:55:50 +00:00
Qt Submodule Update Bot
4728ffb620 Update submodules on '5.13' in qt/qt5
Change-Id: I7ba7a20377d5fbe2b390ec1aeed82e74eb974eba
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-11-14 08:46:24 +01:00
Dimitrios Apostolou
ef7481b9cd Workaround broken local apt mirror
Local mirror is mirroring a public mirror, and for some reason there is
a mismatch of file sizes and file hashes for the dep-11 metadata files.

More info:
https://askubuntu.com/questions/823329/how-do-i-disable-fetching-of-dep-11-files

Task-number: QTQAINFRA-3351
Change-Id: Ia48936e7d0b9efb2f86fbe001f22f2bd28a7ea3d
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-11-14 08:46:22 +01:00
Dimitrios Apostolou
33d2547817 Keep debug trace off to avoid polluting the logs
Change-Id: I8a2d878a52b5e0a818d7f80fff495feca84d0e9c
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-11-14 08:46:20 +01:00
Dimitrios Apostolou
a270bcdb6b Docker installation: do not depend on external repositories
Also updated the docker-compose binary to the latest one.

Task-number: QTQAINFRA-3279
Change-Id: Ie09a772ca8247aa5f5bd6d36774b68b6bb846386
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-11-14 08:46:18 +01:00
Dimitrios Apostolou
fafd3d655d Fix cache URL for telegraf windows package
Fixes: QTQAINFRA-3340
Change-Id: Ie7bad3666094e3f8f8e8971c2bfe05457ca6cd45
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-11-14 08:46:16 +01:00
Dimitrios Apostolou
6cc2215b8c DownloadURL last argument (targetFile) is now optional
Change-Id: I0864bcb052cddcc9753c056758b6e65fd561d928
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-11-14 08:46:14 +01:00
Kari Oikarinen
f1cbe1e3b6 Adjust submodule branches 2019-11-14 09:23:14 +02:00
Qt Submodule Update Bot
df8310ced1 Update submodules on 'wip/cmake' in qt/qt5
Change-Id: I26274b1707fd4d12a4da5503b9a414414f29148b
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-11-13 21:25:12 +00:00
Simon Hausmann
1aa25c1084 Bump vcpkg to a new snapshot
Some patches were upstreamed and this beings the version in line with
what we need for Android. This patch also centralizes the version into a
shared file, for future use.

Change-Id: I90973f9bfcbc1bfeb2d11e2ee7a7fa4e4f6a58a2
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-11-13 09:57:53 +00:00
Leander Beernaert
8eab11f696 Update CMake to version 3.15.5
Update required as there's a bug with setting the CXX_STANDARD on
android. Updating to this version fixes the issue.

Change-Id: I50b0bc2941e0919232b46bbf5b28133149878649
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-11-12 13:27:23 +00:00
Heikki Halmet
569fd1dabc Provisioning: Install pre-builded openssl for Windows 7
Task-number: QTQAINFRA-3224
Change-Id: I972b497e1a98f2ebbb6633158714409313cf0506
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-11-12 07:09:49 +02:00
Simon Hausmann
c85543f88d Merge remote-tracking branch 'origin/dev' into wip/cmake
Conflicts:
	coin/platform_configs/default.yaml
	coin/platform_configs/qt5.yaml
	coin/platform_configs/qtbase.yaml
	coin/platform_configs/qtdeclarative.yaml
	coin/platform_configs/qtsaferenderer.yaml
	coin/platform_configs/qtsdk.yaml
	coin/provisioning/common/linux/cmake_linux.sh
	coin/provisioning/common/windows/cmake.ps1

Change-Id: I37bb513e3be19e4de4003679f8528677e57c09ee
2019-11-11 10:52:16 +01:00
Liang Qi
ae27f21d26 Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
	coin/platform_configs/default.yaml

Change-Id: Id4af2d72bb409b6851758a726677c2f2235fc0af
2019-11-08 09:10:04 +01:00
Liang Qi
e4cb75c5ae Update submodules on '5.14' in qt/qt5
Only qtwebengine this round.

Change-Id: Ib8ec9d5d290245917892cf2585e80a422dfc8daf
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-11-07 20:59:36 +01:00
Heikki Halmet
f1276acf5c Provisioning: Add MSVC 2019 and upgrade MSVC 2017 to the latest version
Under coin/pre-provisioning can be found information what have been
provisioned to tier1 image

Visual studios are updated to versions:

MSVC 2019: version 16.3.1
MSVC 2017: version 15.9.16

Task-number: QTQAINFRA-2875
Change-Id: I3a9748296dcf088bb312dec8f78bdc59dfb281d1
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-11-07 21:59:25 +02:00
Qt Submodule Update Bot
4e5a86d2bb Update submodules on 'wip/cmake' in qt/qt5
Change-Id: I140d2692932cc10d4bedd45e149c804ec7329885
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-11-07 08:08:51 +00:00
Liang Qi
b3f160bc39 Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: I61d236e3d97ffd6e1cea460fba3d0eb2dac1d045
2019-11-07 08:08:49 +01:00
Qt Submodule Update Bot
ebc02c3265 Update submodules on '5.15' in qt/qt5
Change-Id: Id30b6ed350ca34593be6649e3671c6d57d99c8d1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-11-07 07:31:11 +01:00
Liang Qi
68189ab965 Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
	coin/provisioning/qtci-macos-10.12-x86_64/05-systemsetup.sh

Change-Id: Ie9eae2144868cbe4a6c5ff9472c1a0e8fd53ed08
2019-11-06 14:19:45 +01:00
Qt Submodule Update Bot
98cb5fa965 Update submodules on '5.14' in qt/qt5
Change-Id: I2d08d87f917232a79ebd9d7691610d61b82727b2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-11-06 13:35:27 +01:00
Qt Submodule Update Bot
d148d7b0f7 Update submodules on '5.15' in qt/qt5
Change-Id: I13014018eac8b9bb5fd769e82e987030fc08ad6a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-11-06 07:12:09 +01:00
Tony Sarajärvi
b34681bf02 Remove macOS 10.12 from CI
Task-number: QTQAINFRA-3342
Change-Id: If617a762b4d65983d2d823ef035d4e5f9e5bc432
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2019-11-05 13:56:46 +00:00
Qt Submodule Update Bot
d939b369d2 Update submodules on 'wip/cmake' in qt/qt5
Change-Id: I41c2406329c56d6c82a3d7c27b364adae366b79f
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-11-05 06:09:25 +00:00
Qt Submodule Update Bot
8287111e7b Update submodules on '5.15' in qt/qt5
Change-Id: I2f00c0e3534f76108e7de3f072cf3ff9bb301a54
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-11-05 06:28:59 +01:00
Matti Paaso
f178318d2f Add new target for installer framework
Task-number: QTQAINFRA-3284
Change-Id: I3945160f212921b2b30cd39982a808cfc164a1b1
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2019-11-04 14:46:22 +02:00
Qt Submodule Update Bot
d690f84fd4 Update submodules on '5.13' in qt/qt5
Change-Id: Ibe25a3e99d09aea840c9e86a403dc1577701eb0a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-11-04 08:42:38 +01:00
Qt Submodule Update Bot
db4e91ce90 Update submodules on '5.15' in qt/qt5
Change-Id: I0afddd8ede21a9693d9630f8d4ac848dc4d8b091
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-11-03 10:39:08 +01:00
Heikki Halmet
39a42f0abd Provisioning: Hide password with /dev/null
Change-Id: Ic60ba668764c928977c826e02686a0cd341b995f
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-11-02 19:41:50 +03:00
Heikki Halmet
8bdabd9901 Provisioning: Remove Red Hat 6.6 from provisioning
Task-number: QTQAINFRA-3260
Change-Id: If6078a36e9ab7730cacb81a9c417c87455db89cd
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-11-02 19:41:41 +03:00
Heikki Halmet
52fe759eba Provisioning: Upgrade OpenSSL version to 1.1.1d
Plus removing unused file install_openssl_111a.sh

Task-number: QTQAINFRA-3224
Change-Id: If5f9ee12e118e0329eb27f8d3ca9829011874382
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-11-02 19:41:33 +03:00
Heikki Halmet
5b752460bc Provisioning: Update Xcode package for macOS 10.14
Apple's certification was expired so Xcode 10.2.1 package needs to be
updated from the Apple's download server. Old one causing problems with
RTA tests.

Task-number: QTQAINFRA-3317
Change-Id: I5006f95ab420e26523d2621800d80322a52bb9a2
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-11-02 18:41:24 +02:00
Qt Submodule Update Bot
7c563fc662 Update submodules on 'wip/cmake' in qt/qt5
Change-Id: Ie50bc298a4743b348ad91d9f4efee97482ec55a4
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-11-02 07:16:06 +00:00
Tony Sarajärvi
2eab420e80 Remove more of update notifiers
Change-Id: I507f584ef82b5f41f6b1cbc22fdd4ff6eff5e911
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-11-01 08:14:27 +00:00
Tony Sarajärvi
5b77e74a5e Change local Ubuntu repo mirror in provisioning
The old mirror host Qt company used to sync their local mirror
from, stopped syncing from Ubuntu in October 2018.
The mirror mechanism was changed so that in the future if
addresses change, we don't have to touch the provisioning scripts
as the address is more general. Also a duplicate entry was removed.

Task-number: QTQAINFRA-3279
Change-Id: I65ada052d308eaef0411eb9caad893304eb05ab6
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-11-01 08:14:27 +00:00
Qt Submodule Update Bot
a25f221e07 Update submodules on 'wip/cmake' in qt/qt5
Change-Id: Ifd37d952b51fe8c37d4ff2b99efec21c87d52f8c
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-11-01 05:52:22 +00:00
Liang Qi
3fb1ba5db8 Update submodules on '5.14' in qt/qt5
Change-Id: I6c26e0dadf6aafd228abb860a431f96629811e38
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-10-31 12:15:00 +01:00
Qt Submodule Update Bot
83ae62a099 Update submodules on 'wip/cmake' in qt/qt5
Change-Id: I84f7dfd1bcbfe889c5f3e4861297f661d50aa393
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-10-31 06:21:28 +00:00
Qt Submodule Update Bot
eaa76d4db8 Update submodules on 'wip/cmake' in qt/qt5
Change-Id: I51d0e6deeb53b1eabe2796dc958ebf9cf536e8f7
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-10-30 05:05:44 +00:00
Jani Heikkinen
464c4c8147 Drop unnecessary android builds
From 5.14 -> we will have combined android builds for all android
targets. So remove all separate android builds as those are covered by
multi ones.

Task-number: QTQAINFRA-3310
Change-Id: Ia00222cf56e85ed207ad01d5d00a81849196176d
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2019-10-29 19:46:26 +00:00
Heikki Halmet
eb0ef419ec Add allowUntrusted parameter for command line tools and refresh Xcode
Apple has signed their packages with certificate which has been
expired 24.11.2019. Packages are unusable without allowUntrusted
parameter

Also Xcode package for macOS10.13 needs to be refetched from
Apple's download to local cache

Task-number: QTQAINFRA-3317
Change-Id: Iebbe81ee0c360e5f0b49d422b38fe1a148424891
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-10-29 19:37:09 +02:00
Simon Hausmann
0fb525f9ef Add x11extras to the qt5 build
Change-Id: Iac7273717b7dff510c79cd6151349e6ddb6a5e56
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Qt CMake Build Bot
2019-10-29 12:12:54 +00:00
Qt Submodule Update Bot
010595af45 Update submodules on 'wip/cmake' in qt/qt5
Change-Id: I23f2cf4a7577df02e3e7b8590aede4d755117cb1
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-10-29 11:39:35 +00:00
Qt Submodule Update Bot
12a647fbe5 Update submodules on 'wip/cmake' in qt/qt5
Change-Id: Ib2187b662c55268f101640b32c98cf9cd325a66e
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Qt CMake Build Bot
2019-10-28 05:57:10 +00:00
Tony Sarajärvi
d406ff6398 Build examples on the no-widgets builds
Task-number: QTQAINFRA-1975
Task-number: QTBUG-63908
Change-Id: I0279fd4ca58ab389855e1152e9a8cee3ac97d502
Reviewed-by: Rolf Eike Beer <eb@emlix.com>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-10-26 14:11:07 +00:00
Tony Sarajärvi
17550319e5 Provision gnuwin32's path
By provisioning the path to gnuwin32, we can remove the
hard coded paths from Coin.

Task-number: QTBUG-73422
Change-Id: Ice96fcd992e22ed39b66496403b9eaa99a6865a0
Reviewed-by: Toni Saario <toni.saario@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-10-26 14:10:50 +00:00
Qt Submodule Update Bot
2a5f8edda6 Update submodules on 'dev' in qt/qt5
Change-Id: I31c4601a3e46eb8f1a6cef89547796a2d8ddb4e1
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-10-26 14:01:00 +02:00
Qt Submodule Update Bot
d7f90cf379 Update submodules on 'dev' in qt/qt5
Change-Id: Ia5db1b78b32450b1990c6e7a6e9b6991923f6a08
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-10-25 21:01:05 +02:00
Qt Submodule Update Bot
3693303aa5 Update submodules on 'wip/cmake' in qt/qt5
Change-Id: Iad5169b8d1b2a00105df7a4ac2fc0fb6e3537832
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-10-25 05:25:28 +00:00
Simon Hausmann
bf87526ff0 Add QtConnectivity
Now that the cmake port landed

Change-Id: I5218a23fffd8de736ffcf5e039d369aec0827f42
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Qt CMake Build Bot
2019-10-24 15:49:17 +00:00
Qt Submodule Update Bot
edf6851875 Update submodules on 'wip/cmake' in qt/qt5
Change-Id: Ice21b858ec75f6319bee745c47790293e0f3d4d1
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-10-24 15:10:34 +00:00
Qt Submodule Update Bot
a331d9e655 Update submodules on 'wip/cmake' in qt/qt5
Change-Id: I083e08e3c24c1d29d7fedc69490187765a651b12
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-10-23 12:41:46 +00:00
Qt Submodule Update Bot
d5f83783f6 Update submodules on '5.14' in qt/qt5
Change-Id: Ieb58c167d34716afddfb3ecc83d1333b8dbc0bbb
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-10-22 06:59:11 +02:00
Qt Submodule Update Bot
595a45dd1d Update submodules on '5.14' in qt/qt5
Change-Id: I666a0eefd0216eace1e1cfa302e48a5dec7cd4f5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-10-20 22:30:58 +02:00
Heikki Halmet
60befd7508 Provisioning: Disable automatic cleanup from windows
Task-number: QTQAINFRA-3238
Change-Id: Ie64086b650016adb7129bd4c4592ca987cc1453b
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
Reviewed-by: Dimitrios Apostolou <jimis@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-10-18 13:53:05 +03:00
Simon Hausmann
33d9eb2b99 Work around cmake issue breaking C++ feature detection on Android
As per https://gitlab.kitware.com/cmake/cmake/issues/19515, the version
of CMake we're currently using in the CI has an issue detecting clang as
GNU compatible C++ frontend and thus fails to convert the values in the
CMAKE_C/CXX_STANDARD variables to compiler flags correctly. Work around
this for now as suggested in the upstream ticket. We can remove this
when upgrading to a newer cmake version.

Change-Id: I0ea37503c086ff86e05c50b812474522a7737b20
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2019-10-17 15:15:09 +00:00
Samuli Piippo
2b58935efd QNX: Use extprefix for the host path
Use extprefix instead of prefix, so that the target deployment
path won't contain host paths. Especially needed to avoid Windows
host paths on target. Prefix will default to /usr/local/Qt-x.x.x

Task-number: COIN-48
Change-Id: Ie888dace694294b72a32913b65a191b4bcb78371
Reviewed-by: James McDonnell <jmcdonnell@blackberry.com>
2019-10-16 10:02:09 +03:00
Dimitrios Apostolou
72111504ea Update epel package to latest version
The online repo only contains the latest version.

Change-Id: I2dfbc3c2a873ed3758672682b09c0205bfa19549
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-10-15 12:41:05 +02:00
Dimitrios Apostolou
518e114dc7 Fix for DownloadURL to try alternative URL
Change-Id: I7e9a77815ef8f4c258dda44bda6fdd4eb3736ef4
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-10-15 12:41:04 +02:00
Dimitrios Apostolou
482552d813 First try cached URL before hitting the official repo
Change-Id: Id0cf89090155459fd660d55ce427cd34bf3136f5
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-10-15 12:41:02 +02:00
Dimitrios Apostolou
c6a9b3cd68 Update previously committed patch to match the branch's platforms
Task-number: QTQAINFRA-3092
Change-Id: I598759f0624e478a07cfe3256cbeba2f2b8bfe02
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-10-15 12:41:00 +02:00
Toni Saario
9ee61892d0 Add platform_configurations for StaticHostOnly targets
Configuring modules in specific files removes their dependency for
coin creating their configurations.

Task-number: COIN-259
Task-number: QTBUG-78942
Change-Id: I8f2a9a5672ca2261c8949baf49f2d0d093bf1c5b
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
2019-10-15 13:40:58 +03:00
Heikki Halmet
3f9673d109 Provisioning: Update Cmake to version 3.7.2
QtCreator requires Cmake minimal version to be at least 3.7.0

Task-number: QTQAINFRA-3272
Change-Id: Id7f2d38ad0581c1aead4b5bac860ac193488ae1b
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2019-10-15 13:40:55 +03:00
Qt Submodule Update Bot
c118fe5fd5 Update submodules on 'dev' in qt/qt5
Change-Id: I8280b33c68cdfa4f3276a49804b629525d277dbe
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-10-12 07:47:50 +02:00
Liang Qi
0c687679c7 platform_configs: add Android arm64 build on RHEL 7.6 host
* install vcpkg and for android
* a remaining issue in vcpkg: https://github.com/microsoft/vcpkg/issues/8506

Task-number: QTBUG-78945
Change-Id: I484612e2157bf1c1142934cc4f27729e8be37b89
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot
2019-10-11 18:56:33 +00:00
Frederik Gladhorn
c8765fc306 Update qtrepotools for clang-format
This now fixes the hook, so that it can actually be used.

Change-Id: Ib47ae7df580eb21654f634be387d44d2f8ad0148
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-10-11 13:25:41 +02:00
Liang Qi
ecf2f4f38c provisioning: update python to 3.7 on macos
Task-number: QTQAINFRA-3271
Change-Id: Ic1645a8b5bc94b0ce6ff58352891af0beabd7649
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-10-11 07:23:46 +00:00
Simon Hausmann
97f5eca381 Add separate debug info for MinGW packaging release builds
Since we stopped the separate debug builds for MinGW in 5.14, we should
include debug symbols for the release libraries as separate files to
give our users something.

Change-Id: Idf8a6748056cd9da03eddc37aebd77b4c190aedf
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2019-10-10 21:39:29 +02:00
Frederik Gladhorn
697fad19a7 Update qtrepotools
This makes git-hooks/clang-format-pre-commit available which is needed
for accc0af6e4 .

Change-Id: I9674b737fb32031552d51129be5541fbd1624c6a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-10-10 17:02:34 +02:00
Qt Submodule Update Bot
37244913d3 Update submodules on '5.15' in qt/qt5
Change-Id: I75e624335c96d4812e47fd841db5145bb1523659
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-10-10 08:38:22 +02:00
Liang Qi
9e3b3c838c platform_configs: add a RHEL 7.6 build
A preparing for having android build later.

* install gcc 7.x
* install git 2.x
* install a few other dependencies

Change-Id: I18f05bdfb78c92b7f05f67609613b5271b400f91
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot
2019-10-10 05:34:27 +00:00
Heikki Halmet
d02f0a913e Provisioning: Hide windows squish installation output from the log
This will prevent the output of unwanted information

Change-Id: I5f1824a6bbe98c673ef04dc2daa0db0536d27828
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-10-09 11:50:32 +03:00
Heikki Halmet
e4ae752c0d Provisioning: Make sure that Configure and Make will pass
During powershell process error is not caught and provisioning
continues even if the exitcode is something else that '0'

Task-number: QTQAINFRA-3214
Change-Id: I91116a78d0c4defe6ba4287913c2394e199be958
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2019-10-09 11:50:32 +03:00
Qt Submodule Update Bot
41fa18a06b Update submodules on '5.15' in qt/qt5
Change-Id: I6653f10b3662a8d4f6a90330a22ebaa38194a905
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-10-09 10:46:44 +02:00
Liang Qi
6df365e0b2 Add qtserialbus to qt5
Change-Id: Ie3ad2a734b1f7ba341a93ff7f3cd96fee56c62c6
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Qt CMake Build Bot
2019-10-09 08:27:00 +00:00
Qt Submodule Update Bot
bcdb9ba4dd Update submodules on '5.14' in qt/qt5
Change-Id: I30d07a8ee13b9cd8aa17bae8d4e4c7f9c6057401
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-10-09 06:51:12 +02:00
Qt Submodule Update Bot
beb62ece41 Update submodules on 'wip/cmake' in qt/qt5
Change-Id: I9b900f788ada06c5aa163464b467d41bdc4f9a4e
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-10-09 04:47:19 +00:00
Qt Submodule Update Bot
660a81feda Update submodules on 'wip/cmake' in qt/qt5
Change-Id: I243f87e1f922a604ac473a22c38a2fcb97bed583
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-10-08 18:08:37 +00:00
Qt Submodule Update Bot
714686610e Update submodules on 'wip/cmake' in qt/qt5
Change-Id: Ia7dadd5ba374c17a9de0a0a0fe5cf71349b2dcf6
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-10-08 13:13:37 +00:00
Gatis Paeglis
1430513438 platform_configs: add -bundled-xcb-xinput to RHEL-7.6:Packaging
All libs, expect xcb-xinput have been dropped from 3rd party sources
in qtbase. When building default binaries for releases we used to have
"qt-xcb" switch to reduce dynamic depenendies of the binary. We still
need to do that for xcb-xinput (via -bundled-xcb-xinput) as this library
is not available on some of the supported distributions.

Change-Id: Iece12bc38978ddb66f84928f661924f076c3647e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-10-08 10:18:55 +02:00
Dimitrios Apostolou
dd9a3883aa Ensure provisioning works even without the secrets
Change-Id: I3869e881341a719da8a351095c3bf314c2fa2f34
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2019-10-08 08:26:34 +02:00
Dimitrios Apostolou
869a9b3ae7 Fix shell function is_script_executed
It used to return error when tested inside a login shell, because $0 is
"-bash" and `basename` was trying to interpret -b as an option.

Change-Id: I5faa2dc01e50c7d5bcfc0ab1fcfd910b2538afc2
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-10-08 08:26:34 +02:00
Dimitrios Apostolou
d97d1af1ee Fix provisioning script for RHEL 6
It seems RHEL 6.6 does not provide /etc/os-release.

Change-Id: I01ba2bb17b89c01f9991944a11eeaa9c2eba6f20
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-10-08 08:26:34 +02:00
Qt Submodule Update Bot
91a1add070 Update submodules on 'wip/cmake' in qt/qt5
Change-Id: I1a4c4dbd484521019d7c31b524110e24402ac96c
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-10-08 06:21:10 +00:00
Qt Submodule Update Bot
ab732c6ab7 Update submodules on '5.14' in qt/qt5
Change-Id: I945832ea3c2a88f427cb3c73e50f4592095e0ad6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-10-07 22:31:22 +02:00
Liang Qi
991ba62180 Update submodules on 'dev' in qt/qt5
Only qtquick3d and qtwayland this round.

Change-Id: I79da5206cec8ef7a1e70dad95249fd7b5384803f
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-10-06 21:49:44 +02:00
Liang Qi
ac2054a633 Add macOS 10.14 to the CI again
Task-number: QTQAINFRA-2938
Change-Id: Idd331fcb29752386b95463de8bdaeb0dd6b0ac08
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-10-06 21:49:35 +02:00
Liang Qi
3813848266 Merge "Merge remote-tracking branch 'origin/5.15' into dev" 2019-10-06 21:49:30 +02:00
Qt Submodule Update Bot
c69c92ba37 Update submodules on 'wip/cmake' in qt/qt5
Change-Id: Ib9ca071946f1fa578543802707388cf67f1a842b
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-10-06 11:35:29 +00:00
Qt Submodule Update Bot
37e43d23fc Update submodules on '5.15' in qt/qt5
Change-Id: I5da2826877d73da02e854724976afef44c303ebc
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-10-06 13:34:53 +02:00
Qt Submodule Update Bot
37b2f54919 Update submodules on '5.13' in qt/qt5
Change-Id: I1e4a3f0a9ec8280b5a6801096f283435c1f0f855
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-10-05 23:31:02 +02:00
Qt Submodule Update Bot
5d90df08c2 Update submodules on '5.14' in qt/qt5
Change-Id: I21c5bafb841524f3dbc0cef748d3a959d3866369
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-10-05 22:31:01 +02:00
Qt Submodule Update Bot
1735600d57 Update submodules on '5.14' in qt/qt5
Change-Id: I3e4f0c43898daceb419957702e31f1611de6c502
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-10-05 09:28:00 +02:00
Simon Hausmann
68fdf9c0be Remove WinRT from the configurations for qtconnectivity
WinRT was tested by default and removed in commit
5677a43a25 globally.

Change-Id: I4878266cd25a05b74a4a3427840c3aaef0029032
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2019-10-04 17:29:31 +00:00
Liang Qi
44cf8f65a2 Merge remote-tracking branch 'origin/5.15' into dev
Conflicts:
	.gitmodules
	coin/platform_configs/default.yaml

Change-Id: I6adccbdcd3a4b794380a2e202e567146e663c15f
2019-10-04 12:55:57 +02:00
Qt Submodule Update Bot
c79a9570da Update submodules on 'wip/cmake' in qt/qt5
Change-Id: Id1a1a1a7ab7f8280221fa824ddb775691444c3d8
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-10-04 10:11:49 +00:00
Qt Submodule Update Bot
689eab5c35 Update submodules on '5.13' in qt/qt5
Change-Id: I47edb51a61cc8b9e7d7e4ec9ff1c9057e9d126fc
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-10-04 09:16:48 +02:00
Qt Submodule Update Bot
ace315a1f9 Update submodules on '5.14' in qt/qt5
Change-Id: Iebe9c33fa630b46cdedb994b8daf002f5d20b082
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-10-04 09:16:38 +02:00
Frederik Gladhorn
f963556794 Remove gnuwin32 - it is provided through provisioning
Having a few windows specific tools in qt5.git was always strange. We
now provision the utilities to the machines, so remove them from
qt5.git.

[ChangeLog][General] GnuWin32 is no longer part of the Qt source code repositories.
Instead it can be downloaded from the upstream project at https://gnuwin32.sourceforge.net .
For convenience we also make a copy available here:
https://download.qt.io/development_releases/gnuwin32/gnuwin32.zip
The GnuWin32 tools are needed for building Qt from source on Windows.
Binary package downloads are not affected.

Task-number: QTBUG-73424
Change-Id: I9212cc2923343f4f84bcba9d1444a90e446dfb8a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-10-03 19:49:48 +00:00
Qt Submodule Update Bot
4f903d0139 Update submodules on '5.15' in qt/qt5
Change-Id: I823e6b4d3a4561603b2c57ff5c0ecd6738fd056d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-10-03 14:43:27 +02:00
Liang Qi
2d577a83ec Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
	.gitmodules
	coin/platform_configs/default.yaml

Change-Id: I34cf4fb6818c17872e55f36149e8f91871d2aea1
2019-10-03 14:40:41 +02:00
Liang Qi
52068b49e8 Update submodules on '5.15' in qt/qt5
Change-Id: I2eafa1386aeb6356e4696bbee830330eeddefe9e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-10-03 13:39:47 +02:00
Qt Submodule Update Bot
65dcf13a10 Update submodules on 'wip/cmake' in qt/qt5
Change-Id: I402e989617238940b5c11b4eac1b76f37e89536f
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-10-03 09:34:25 +00:00
Liang Qi
1478b607d6 Provisioning: install libsdl2 on ubuntu
Change-Id: I3c547c1e44ebc734fd9908db2828440bc13f55f5
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2019-10-03 08:15:51 +00:00
Liang Qi
ec7bf6356c Merge "Merge remote-tracking branch 'origin/5.13' into 5.14" 2019-10-03 06:12:24 +02:00
Qt Submodule Update Bot
7cd2473966 Update submodules on '5.14' in qt/qt5
Change-Id: I97f37b6418a58b0546b7a8b7b91229db5229a81e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-10-03 06:12:11 +02:00
Frederik Gladhorn
accc0af6e4 Add clang-format-pre-commit hook
Change-Id: I762b85b96f7ab87e6c11426607165d4f1b8dbae5
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2019-10-02 23:32:53 +02:00
Liang Qi
bd3b4ef170 Add qtgamepad and qtscxml to qt5
Change-Id: I7267704b048aae8cdd634d47c7ae4040272298ea
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Qt CMake Build Bot
2019-10-02 15:55:08 +00:00
Qt Submodule Update Bot
8e0249218f Update submodules on 'wip/cmake' in qt/qt5
Change-Id: Ifcd9682f77549feada64323c6b7ee668962cbf2c
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-10-01 18:54:30 +00:00
Liang Qi
29befcc995 Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
	coin/platform_configs/default.yaml
	coin/platform_configs/qt5.yaml

Change-Id: I48b1e814dd6328dfb2827d0898a277b81ec25e55
2019-10-01 11:37:07 +02:00
Qt Submodule Update Bot
b5ae486a0d Update submodules on 'wip/cmake' in qt/qt5
Change-Id: Iaf43abe04e52a56cb5a3d1f7d62868c5b5f009d1
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-10-01 06:51:39 +00:00
Dimitrios Apostolou
cfef857815 Reduce noise in the provision logs
Reduce verbosity in order to shorten logs and make them more readable.

In two cases we just remove the verbose flag.

In one other case we undo inlining of a huge script in the command line.
Because we run the provisioning scripts in trace mode, this caused the
script to be logged, and it was rather long and meaningless since it
comes from an external project.

Change-Id: I078ee3b3ab2db9425204375deb5815b6526a4466
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-10-01 06:11:48 +02:00
Qt Submodule Update Bot
f4e7c08e82 Update submodules on '5.13' in qt/qt5
Change-Id: I328c1cb350e067765b0f05e75179cf178dd2b14e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-10-01 06:11:41 +02:00
Qt Submodule Update Bot
b90dc27784 Update submodules on '5.14' in qt/qt5
Change-Id: I66ac39a88c5164d2feed7215029e621c122f90ee
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-10-01 06:10:51 +02:00
Frederik Gladhorn
53f93876cb Update qtnetworkauth
In that module tests were broken since oauthbin.com is gone.
See 639800ccfe85daecd4432f8b7f64b258e7d2e6dc in qtnetworkauth.
This unblocks qt5.git.

Change-Id: I475a43c5b2ec3ce2021199c37bec4e10d8c1bb0e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-30 16:04:31 +02:00
Alexandru Croitor
cba04eb531 Build examples on at least one configuration
Ubuntu Linux in this case.

Change-Id: Ic17b3f4880105e639340ffc07c52de27245612d7
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-09-30 09:14:06 +00:00
Qt Submodule Update Bot
317fbf9243 Update submodules on '5.13' in qt/qt5
Change-Id: I0738664f8f0129431b7e5c212fe1615b09792aec
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-09-30 06:48:30 +02:00
Qt Submodule Update Bot
1a4d0a9534 Update submodules on '5.14' in qt/qt5
Change-Id: I1a1e2430d47476de5271b9278e84f53743bdbcee
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-09-30 06:26:37 +02:00
Qt Submodule Update Bot
ec613d93e5 Update submodules on '5.13' in qt/qt5
Change-Id: I1e6126cbe20e293bc4ec88a492c0bf9ebfffd766
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-09-28 07:03:22 +02:00
Qt Submodule Update Bot
6cb7171397 Update submodules on '5.14' in qt/qt5
Change-Id: I5575a3cf1dd9cecf5162b077e64b28eec15bcffd
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-09-28 07:03:09 +02:00
Qt Submodule Update Bot
c97967de98 Update submodules on 'wip/cmake' in qt/qt5
Change-Id: Ib89a5977eef689938a8e3ac12141204b733aa79d
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-27 16:39:54 +00:00
Qt Submodule Update Bot
cc733ed0ca Update submodules on 'wip/cmake' in qt/qt5
Change-Id: Ie4ae842e78078a4779e22f68889a211d1980411a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Qt CMake Build Bot
2019-09-27 14:26:20 +00:00
Qt Submodule Update Bot
33e0c2b54f Update submodules on '5.14' in qt/qt5
Change-Id: I79b9eeb90afc56baae339b6598dd01840d6918ee
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-09-27 09:20:43 +02:00
Dimitrios Apostolou
842b72e080 Move telegraf install to start of provisioning macos
Change-Id: Ied2b7a415abe5e101b6bfb60472b74070debe9e9
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-09-27 08:43:06 +02:00
Dimitrios Apostolou
c4e14a59ec Move telegraf install to start of provisioning linux
Change-Id: Ia42b0c21f6e341a941e98d3abbda512cfb0fda92
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-09-27 08:43:00 +02:00
Dimitrios Apostolou
de56775c32 Move telegraf install to start of provisioning windows
Change-Id: Icf4f213be5a33ec2ad89d514b9bba5d4a3587117
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-09-27 08:42:54 +02:00
Dimitrios Apostolou
4e3a0f79fb DownloadURL now works with either wget or curl
The reason is that Ubuntu does not have curl at the very beginning of
provisioning scripts, and also does not have the repositories configured
in order to install it.

Change-Id: Ia485c1672f894bc800f199b742d238b2945938e5
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-09-27 08:42:49 +02:00
Dimitrios Apostolou
8f4c12bc03 Install 7-zip at the beginning of provisioning Windows
so that we can extract zip files early and install telegraf.

Also moved disabling Windows defender, to keep it at
the very beginning of provisioning.

Change-Id: I6c2039ebd20e541bdd7d437dd56ccb06a1619a5f
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-09-27 08:42:43 +02:00
Dimitrios Apostolou
89f6db8c22 Adjust pre-existing script to use the new common.sourced.sh
Change-Id: Icf7829d3499110a76b90679ba2d067f80d189e69
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-09-27 08:42:37 +02:00
Dimitrios Apostolou
fbe3a8d84e Install telegraf on all provisioned VMs
Install binaries as early as possible in the provisioning process, and
start them, in order to monitor provisioning too.

To achieve this, some OS auto-detection logic is introduced in shell
script common.sourced.sh. The script can be sourced and used in all kind
of other generic scripts.

ioping is also installed from custom-compiled binaries in order to
monitor the disk latency of the VMs. Reason we don't use ioping from the
repositories, is that the units differ between ioping versions (new
ioping reports latencies in nanoseconds, old in microseconds).

Fixes: QTQAINFRA-3092
Change-Id: I9d9afb791955725d4bd0b32dae97dfc0bd4a76a3
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-09-27 08:42:31 +02:00
Liang Qi
0a0ec7ffe3 Merge "Merge remote-tracking branch 'origin/5.13.1' into 5.13" 2019-09-27 07:50:25 +02:00
Liang Qi
076fb6bd6d Merge remote-tracking branch 'origin/5.13.1' into 5.13
Conflicts:
	coin/platform_configs/qt5.yaml

Change-Id: Iaeec542042807c00e4c2597b546b00ce0f267b48
2019-09-27 07:27:28 +02:00
Qt Submodule Update Bot
bc77f3ca14 Update submodules on 'wip/cmake' in qt/qt5
Change-Id: Idee08dbe60f6abae4495f31b66a74702788f809f
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-27 04:46:08 +00:00
Dimitrios Apostolou
c0fce7a3b3 Refactor DownloadURL.sh
Auto-detects and verifies all kinds of hashes, not only SHA1.
Hash verification is now an autonomous function.
If the file is found at the destination, skip redownloading it if the
hash is OK.
Runs on POSIX sh, not requiring bash.
Retain compatibility with previous version.

Change-Id: I9930336030aa776f49dc460fe766f3e831700255
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-09-26 20:12:31 +02:00
Dimitrios Apostolou
c7f87acb37 Do not silence standard error
Provisioning was failing and the logs did not provide any useful
information because of the silenced squish install command. So I went
through all the scripts and I re-enabled stderr logging where I found it
silenced (with the exception of where it was purposeful or harmless).

Change-Id: I5fa0b0ba4362970b214c150d399b6720b1780e1e
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-09-26 20:12:25 +02:00
Dimitrios Apostolou
b8eb110c81 Increase open files and processes limit on macOS
Change-Id: If93bbe067f76168a7c131c6ced187f00a8d908e1
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-09-26 20:12:20 +02:00
Dimitrios Apostolou
b97df21bef Brew update only once
Change-Id: I6c2650574b6b62ceedfc95a9caab7ca26a6fa10b
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-09-26 20:12:15 +02:00
Dimitrios Apostolou
bdc5dae67b Speed up provisioning on Linux
Change-Id: I6e4e5621ed0b063215476ef51d61ef1f38198d0c
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-09-26 20:12:11 +02:00
Dimitrios Apostolou
acfc7ad18d Fix message "RPMDB altered outside of yum"
yum install supports a local filename on RHEL 6 or newer.

Change-Id: I873ab3dfab56003ded45bc6c4099aae150f423dd
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-09-26 20:12:06 +02:00
Dimitrios Apostolou
c87a6e9c6d Fix delays caused by PackageKit locking RPMDB
It seems that disabling it is not enough, it has to be fully removed.
It is also removed later in the scripts but it wasn't enough apparently,
so no harm done removing it twice.

Change-Id: If1a4f032240e66100b68bca3196a700cb570701e
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-09-26 20:12:02 +02:00
Dimitrios Apostolou
e6fccbf240 Remove the progress bar from the sdkmanager output
Cleans up many thousands of useless lines from the logs.

Change-Id: I2673f65b713996637d2161da4db726823e17c0df
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-09-26 20:11:56 +02:00
Qt Submodule Update Bot
5c79b8cf52 Update submodules on 'wip/cmake' in qt/qt5
Change-Id: I4ceab395f4a906627970b67486ac6f91842873af
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-26 06:33:44 +00:00
Qt Submodule Update Bot
cb8e769cf6 Update submodules on '5.13' in qt/qt5
Change-Id: I2c212ec01df2fa67cad4d9e84988d0b31678e6fe
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-09-26 07:13:56 +02:00
Qt Submodule Update Bot
d1a81a8e1c Update submodules on '5.14' in qt/qt5
Change-Id: I15e5942e323d9315fc92d3a907106367f7710d09
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-09-26 06:13:53 +02:00
Qt Submodule Update Bot
a21de5f32a Update submodules on 'wip/cmake' in qt/qt5
Change-Id: I10025657bc7887680bfc442be6d1ce5f4dc920f8
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-25 15:33:18 +00:00
Liang Qi
1605059e87 platform_configs: remove CMAKE_VERBOSE_MAKEFILE option
which is not in use when ninja got selected.

Change-Id: I1841471dee0f58e4a54cd05f33f4ba7c3a1a8251
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2019-09-25 10:54:34 +00:00
Qt Submodule Update Bot
ad2113fd23 Update submodules on '5.14' in qt/qt5
Change-Id: Ia3abeacaa4604fecfa0024e1db901d08510d60c6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-09-25 09:23:23 +02:00
Qt Submodule Update Bot
29376716fd Update submodules on 'wip/cmake' in qt/qt5
Change-Id: Ib983c826d9a62d0ca506fb238c4e08981729a211
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-09-25 05:08:07 +00:00
Qt Submodule Update Bot
41ef5a706d Update submodules on '5.13' in qt/qt5
Change-Id: I239abc4de7cec9c5366d177933a4b16c85067971
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-09-24 23:31:06 +02:00
The Qt Project
dc22e0dba7 Merge "Merge remote-tracking branch 'origin/dev' into wip/cmake" into wip/cmake 2019-09-24 16:50:50 +00:00
Jani Heikkinen
2cec2c5f8c Add build for combined android targets
From 5.14 -> android builds are done by default at one go. Add new builds
for doing that.

Removing old, separate builds will be removed in a follow-up patch to
give time for packaging to adapt that new system

Change-Id: I42f094c7940f3914d7e00feda71cc74f7a26655f
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
2019-09-24 12:08:17 +03:00
Qt Submodule Update Bot
f60588ee72 Update submodules on '5.14' in qt/qt5
Change-Id: I2a4d65f7cd94f3a6ce7036f20b8a545a160434d8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-09-24 10:57:29 +02:00
Qt Submodule Update Bot
1760acb17d Update submodules on '5.13' in qt/qt5
Change-Id: I5405348497e527dc5b4b1ff411736ffebeedb246
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-09-24 10:06:00 +02:00
Qt Submodule Update Bot
9bc8a3e458 Update submodules on 'wip/cmake' in qt/qt5
Change-Id: Iff018927681934d6bf06271d5a2d3ad8008bbcc3
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-24 07:30:37 +00:00
Qt Submodule Update Bot
00bafec768 Update submodules on 'wip/cmake' in qt/qt5
Change-Id: I8f67a3299fc118d337141ad680507015e41e31d4
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-23 15:37:00 +00:00
Liang Qi
44073f5563 Merge remote-tracking branch 'origin/dev' into wip/cmake
Conflicts:
	.gitmodules
	coin/platform_configs/default.txt

Change-Id: I78eb6b6522c678fb40f1202c0040c1c87ff890a6
2019-09-23 16:38:06 +02:00
Liang Qi
3b335077f7 Update submodules on '5.14' in qt/qt5
Change-Id: Ic0e53050e8a7c0928e0ca9ee17f30a303957ea84
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-23 12:31:09 +02:00
Qt Submodule Update Bot
a4ca20dfce Update submodules on '5.13' in qt/qt5
Change-Id: I75182fb8b231e3086a77c1778320cf0f2590cf92
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-09-22 12:58:05 +02:00
Qt Submodule Update Bot
709e687c84 Update submodules on 'wip/cmake' in qt/qt5
Change-Id: I3a5377e9b1f3365596e25985504342a041371886
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-22 06:50:40 +00:00
Qt Submodule Update Bot
b2fe8b2f09 Update submodules on 'wip/cmake' in qt/qt5
Change-Id: If30c3b1b176d07ad273205f3f7b9a9fa30cae4f6
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-21 04:26:39 +00:00
Qt Submodule Update Bot
5d3b2413d0 Update submodules on '5.13' in qt/qt5
Change-Id: Id1259c1907605ad33cbe7f3be3041b26c01f3387
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-09-20 09:32:54 +02:00
Qt Submodule Update Bot
48d218a86f Update submodules on 'wip/cmake' in qt/qt5
Change-Id: Ie505de6df9bf42d96f4dec88ecedb1347f74f401
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-20 06:13:19 +00:00
Simon Hausmann
5c1656826b Add qtserialport to qt5
The module has received its initial port

Change-Id: Ie5814be1f52965cb2393ec331e12751472890abc
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Qt CMake Build Bot
2019-09-19 14:42:13 +00:00
Qt Submodule Update Bot
5560b7eced Update submodules on 'wip/cmake' in qt/qt5
Change-Id: Ie983c915a2cc472c87b02934700a7219c2b0b359
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-09-19 13:20:57 +00:00
Qt Submodule Update Bot
de26b29c33 Update submodules on '5.13' in qt/qt5
Change-Id: I42016698eb34b06de2ef9ee268b4b59e9af38f54
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-09-18 07:34:15 +02:00
Simon Hausmann
fd87ff83aa Merge "Merge remote-tracking branch 'origin/wip/qt6' into dev" 2019-09-17 13:28:52 +02:00
Simon Hausmann
91108b602f Merge remote-tracking branch 'origin/wip/qt6' into dev
Change-Id: I46d0ce36d9168a0a2fe2229ff94fc6e4a82b5308
2019-09-17 13:08:12 +02:00
Assam Boudjelthia
ddc99482eb Cherry-pick a QEMU fix for "core dumped" during tests
Task-number: QTBUG-63152
Change-Id: Iac803ca67537eeb9085fb87625103fdde0bfd904
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-09-17 11:57:28 +03:00
Heikki Halmet
0cf3fdabe3 Provisioning: Upgrade Python pip version for Windows machines
Task-number: QTQAINFRA-2564
Change-Id: I10402bb3169b483c71e44db7ecba443eb4f46dc1
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-17 08:57:18 +00:00
Heikki Halmet
a3136bdbfe Provisioning: Disable or delete unneeded tasks and services
Windows have lot's of tasks and services running which are slowing
the performance of build machine. Also 'windows' and 'windows
defender' updates need's to be "permanently" disabled.

Task-number: QTQAINFRA-3182
Change-Id: I8f6b237fcdc6e38fa9a06836d349821d86c58afc
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-09-17 11:57:11 +03:00
Liang Qi
e62df66bac Update submodules on '5.14' in qt/qt5
Change-Id: Ic4dacbe6f7f964d10b1cd5569ddf933c0f638126
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-17 08:02:58 +02:00
Liang Qi
c22758cc1e Merge "Merge remote-tracking branch 'origin/5.13' into 5.14" 2019-09-17 08:02:50 +02:00
Simon Hausmann
afa801cd31 Re-add QtWebSockets
Maurice ported the module and we can add it to the Qt5 set now.

Change-Id: I146e60f6f18dcf7a00775e532e715e3718644edc
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2019-09-16 15:18:13 +00:00
Qt Submodule Update Bot
5df688ef3a Update submodules on 'wip/cmake' in qt/qt5
Change-Id: I4464812c569599cad5d6d4a2b2cce0c628799b81
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-14 05:01:07 +00:00
Qt Submodule Update Bot
d696902904 Update submodules on 'wip/cmake' in qt/qt5
Change-Id: I210881714fd91a65d8016198c9b23c382d69494c
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-13 14:49:27 +00:00
Liang Qi
b2febbfbc7 Update submodules on 'wip/qt6' in qt5
Only qtmultimedia and qtwebengine in this round.

Change-Id: I82a7b1db76aa0074cd42eeaea96e4e0e4539a564
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-09-13 14:05:59 +02:00
Liang Qi
a2151b9c7f Merge "Merge remote-tracking branch 'origin/dev' into wip/qt6" 2019-09-13 14:05:49 +02:00
Liang Qi
14d2852597 Merge remote-tracking branch 'origin/dev' into wip/qt6
Conflicts:
	.gitmodules
		Ignore qtquick3d for now.
	coin/platform_configs/default.txt
	coin/platform_configs/default.yaml
	coin/platform_configs/qtbase.txt
	coin/platform_configs/qtbase.yaml
		We use yaml files for configurations now.
		Adjust the configurations for Qt6 as it was
		    done before in the .txt files.

Done-With: Alexandru Croitor <alexandru.croitor@qt.io>
Change-Id: Ica164f8865aed011c550ba7e1e8137e2bf9fdda9
2019-09-13 14:04:47 +02:00
Liang Qi
01ad208333 Merge remote-tracking branch 'origin/5.13' into 5.14
This change partially reverts 24f0367a60.

 Conflicts:
	coin/platform_configs/default.yaml
		SLES 12 got removed temporarily.

Task-number: QTQAINFRA-2851
Change-Id: Ib12a6e5ced3c89a5c8c9c2b1548a1c9d23d159d9
2019-09-13 13:04:25 +02:00
Qt Submodule Update Bot
b83b16277d Update submodules on '5.13' in qt/qt5
Change-Id: Icc4380912fc6d1cbb35b2282c37a180641186f60
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-09-13 10:55:14 +02:00
Heikki Halmet
fa03dbce1f Platform configurations: Move Android_ANY (clang-x86) to default
Arm targets from default change places with clang-x86 from qt5

Task-number: QTQAINFRA-3153
Change-Id: I642f5c07fd5c36bf675676d82f5f200bce4beccf
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-09-12 20:51:28 +03:00
Qt Submodule Update Bot
6762ccb186 Update submodules on '5.14' in qt5
Change-Id: Ib6d7eb8b580702724369ac7c81df16688b2b87ec
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-12 11:40:43 +02:00
Qt Submodule Update Bot
39a9e58888 Update submodules on '5.13' in qt5
Change-Id: I07251a5915fb85153fb81d05dc16c7ed8eba5dcf
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-12 06:16:17 +02:00
Qt Submodule Update Bot
bcdfcd2668 Update submodules on '5.13' in qt5
Change-Id: Id18e857d3312854344f5ffa01cf7666107803a0b
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-11 09:03:16 +02:00
Liang Qi
677412dcbe Move the developer build from static suse to ubuntu
Because we don't run tests on static build.

Change-Id: I10c7851ecebcfa3691690c6bc26a352fd5799965
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-09-11 05:56:37 +00:00
Qt Submodule Update Bot
7e78bd1efd Update submodules on '5.14' in qt5
Change-Id: Ifa16f5ec4558b490dd775598b269ef6699cceb91
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-10 21:49:51 +02:00
Qt Submodule Update Bot
c62fcdea06 Update submodules on 'wip/cmake' in qt5
Change-Id: I37d9b32566af41419e1bb64c0cf94c66fb3e6c4f
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-10 14:24:29 +00:00
Assam Boudjelthia
d8a384f03f Provisioning: Use correct sysroot path for QEMU armv7 in qtdeclarative
Task-number: QTQAINFRA-2808
Change-Id: Ia0caf7003a5bd67dc220f0a3a1da06646ca6b657
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-09-10 10:49:01 +03:00
Qt Submodule Update Bot
4909f4a765 Update submodules on '5.13' in qt5
Change-Id: I201b65701b7f9f58422ba1bcdbd42c6278d9e604
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-10 09:48:47 +02:00
Liang Qi
66ea34668a Merge "Merge remote-tracking branch 'origin/5.12' into 5.13" 2019-09-10 09:48:42 +02:00
Liang Qi
8c00a4f011 Add webAssembly build for windows again
This reverts commit 9a8fb868ec
partially.

See also 38e416be66.

Task-number: QTBUG-63917
Task-number: QTQAINFRA-2835
Change-Id: I6a63c2c437bd1568d88ffae0b565b99c15188770
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-10 06:13:18 +02:00
Liang Qi
bbc7794b64 Update submodules on '5.14' in qt5
Change-Id: I98f238f0dbe8cb3537808457b448c7e61ac533a0
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-10 06:13:09 +02:00
Qt Submodule Update Bot
8e6a3321df Update submodules on 'wip/cmake' in qt5
Change-Id: Iac966615b9f25dc4be021d1db59f8c933646231d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-09 19:33:32 +00:00
Liang Qi
1bb7d2d0c9 Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Iffcf9b199df17a50acf03e29b9deae033396dfcb
2019-09-09 20:57:09 +02:00
Tuomas Heimonen
d4e3d3cac3 Saferenderer: Update qtci-linux-RHEL-7.4-x86_64 static build
Add build flag '-no-opengl' to remove xcb from static build
Add build flag '-no-vulkan' to disable vulkan

Task-number: QSR-517
Change-Id: I7d6f5c507bd96aed024d3cf74029feb12ad77bca
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2019-09-09 16:53:05 +03:00
Qt Submodule Update Bot
6402cb61b8 Update submodules on '5.12' in qt5
Change-Id: Ia09d245958bf1e24ba9f95e033dc3803d14edab4
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-09 08:45:11 +02:00
Heikki Halmet
ad93109d92 Provisioning: Add emsdk to macOS 10.14
Task-number: QTQAINFRA-3191
Change-Id: I46a72db63966804b33996d8bc3babe50cd2a41dd
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-09 08:35:24 +03:00
Qt Submodule Update Bot
0c0ed734ef Update submodules on '5.13' in qt5
Change-Id: I23ec6312d3bb028effe1f60d2266c5bb212050f5
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-08 11:11:40 +02:00
Liang Qi
f76c553d75 Update submodules on '5.15' in qt5
Change-Id: I9044304787288e600236d0793c1165cfb540b2a7
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-07 21:32:01 +02:00
Liang Qi
aceecad75d Merge "Merge remote-tracking branch 'origin/5.12.5' into 5.12" 2019-09-07 18:34:12 +02:00
Liang Qi
e56e0f699d Merge remote-tracking branch 'origin/5.12.5' into 5.12
Change-Id: I693eeef79b21804e2a0871bdd759271f8a97fcb4
2019-09-07 18:33:02 +02:00
Qt Submodule Update Bot
1d956e93d0 Update submodules on '5.12' in qt5
Change-Id: I7059a96dccad04c8647443c8b8e13c2ca88fc5b3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-07 13:06:51 +02:00
Qt Submodule Update Bot
15b4e146e5 Update submodules on '5.13' in qt5
Change-Id: Ic653e56614712c8e7dcd5095b8d32f08dea61731
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-07 09:09:30 +02:00
Assam Boudjelthia
d581d86fc5 Provisioning: update QEMU toolchains
* Update QEMU toolchains to Yocto thud(2.6) release(DC Qt 5.13.0) with
GCC 8.2.0.
* Suppress QEMU "Unsupported syscall" and "Unsupported ioctl" logs,
set environment variable QEMU_SYSCALL_DEBUG to show them.

Task-number: QTQAINFRA-2808
Change-Id: I987353b0f3aff87a02ea3bf96ace8de32d6f557b
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-09-07 07:09:24 +00:00
Liang Qi
1eae3c4185 Update submodules on 'dev' in qt5
Change-Id: I87be62d19a3aee1fae16cdf27fd35ec67e30130d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-07 09:04:49 +02:00
Qt Submodule Update Bot
bd4774f690 Update submodules on 'wip/cmake' in qt5
Change-Id: I72c047067aee2006aedfb97fa8d7e3fc214ee590
Reviewed-by: Qt CMake Build Bot
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-07 05:14:59 +00:00
Simon Hausmann
8b7c454d35 Update submodules on 'wip/cmake' in qt/qt5
Change-Id: I9ab957cbe9f81f266ec590e9fb8100608f77f55d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot
2019-09-06 14:53:22 +00:00
Simon Hausmann
016016b64e Really add qttools to the build
... and not qtscript accidentally, like in the previous change.

Change-Id: Ic8cd85ef7b149ffee7bc85ffa3fc9075f8a77c1b
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-09-06 13:32:03 +00:00
Simon Hausmann
01b083ca8e Disable qtscript for the cmake build
The module has not been ported.

Change-Id: I99041e00fb30b2a9799ee3e948f255422bbc6976
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2019-09-06 09:23:52 +00:00
Liang Qi
f0a89a32da Update submodules on '5.14' in qt5
Change-Id: Ice4211fcc08fa25a55d6a5be1b236b3bdc12c9e1
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-06 11:06:00 +02:00
Simon Hausmann
f99d5e8b78 Re-enable qttools for use with cmake
Change-Id: I040b8769af22290a986ccac476f30e7eed78b3e4
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-06 09:04:50 +00:00
Assam Boudjelthia
0d273deeef Provisioning: Fix version of libiodbc on MacOs
libiodbc latest version (3.52.13) was automatically installed causing
qt-config-gui to fail build, this installs version 3.52.12.

Task-number: QTQAINFRA-3188
Change-Id: I5b87ff04c2301a5471cc9abfa0849b6073a1bdd4
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-09-06 06:05:40 +00:00
Tuomas Heimonen
be97b9ad72 Saferenderer: Update qtci-linux-RHEL-7.4-x86_64 static build
Add build flag '-no-xcb' to remove xcb from static build

Task-number: QSR-517
Change-Id: I9b77cd0ada41490233ec2aedb877a37bf2648a1b
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2019-09-06 07:11:51 +03:00
Tor Arne Vestbø
14c31bf8db Remove un-needed configure arguments for Apple OSes
Change-Id: I18bab0c70bbb9486eef815f9310dd807ae5cde83
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
2019-09-05 23:40:29 +02:00
Simon Hausmann
e4259942ff Add empty build instructions to allow for qt5 integrations
The build shall be empty for now, but this allow testing module wide
updates.

Change-Id: I47bcdae274edb2ec000bb57480d74614d3b55833
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2019-09-05 14:34:12 +00:00
Simon Hausmann
2b42c7d383 Update qtbase manually to pull in build fix for qttools
Change-Id: I223b8c2f10bc05a5eacd103b65a061365e58ab46
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-09-05 13:38:20 +00:00
Qt Submodule Update Bot
a30c79bcfb Update submodules on 'wip/cmake' in qt5
Change-Id: I90667c3b7b1920d129cc8821059a56a9d9f70766
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-05 11:58:23 +00:00
Liang Qi
5bd6aa7c26 Include qtimageformats and qtnetworkauth in wip/cmake
Change-Id: I9f451ef08663a635ca05427735a31da895a68607
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-09-05 11:56:43 +00:00
Liang Qi
30d78feb0c Include qtgraphicaleffects in wip/cmake
Change-Id: Ie8fd5d478caa1d16cdea3c06a9b7cfeeb7dcd0cc
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-09-05 07:45:36 +00:00
Qt Submodule Update Bot
1c5e02896c Update submodules on '5.12.5' in qt5
Change-Id: Ife588e41d563bf4246ed7eff14186aa7583b3397
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-09-04 19:29:15 +00:00
Liang Qi
651b050e13 Include qtdeclarative in wip/cmake
Change-Id: I9d23a60fbd88e30ee688532dbe5112dd3245b9a7
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-09-04 17:52:10 +00:00
Simon Hausmann
bd8feeb6b2 Update qtbase manually
Hopefully this pulls in the last fixes to make declarative work.

Change-Id: I7c4765be631b917ee51e200977a01a913bc619b2
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2019-09-04 13:59:53 +00:00
Qt Submodule Update Bot
9eefc9213e Update submodules on 'wip/cmake' in qt5
Change-Id: Id515390a8b8af0d989609d44fcc1e4d113190bca
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-04 13:19:25 +00:00
Heikki Halmet
30e7bf5745 Provisioning: Add Android NDK ROOT to environment variable
Task-number: QTQAINFRA-3181
Task-number: QTBUG-74952
Change-Id: I4cc6936c3b3eef32a1013888ced3950cd1f39407
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
2019-09-04 12:27:26 +03:00
Heikki Halmet
7fd2796b00 Provisioning: Update Android NDK version to macOS 10.14
Currently we are provisioning older Android NDK version than the one
used in macOS 10.13. Let's keep these sync even though we don't currently
make Android builds with macOS 10.14

Change-Id: I6c284d50bac395eb474c0f7e34cd90eda3f180c3
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
2019-09-04 12:27:09 +03:00
Liang Qi
700540f77a Merge "Merge remote-tracking branch 'origin/5.13.1' into 5.14" 2019-09-04 09:42:18 +02:00
Liang Qi
f9801f90f6 Merge remote-tracking branch 'origin/5.13.1' into 5.14
Conflicts:
	coin/platform_configs/qt5.yaml
		5.14 is using NDK r20 for android.

Change-Id: I483a628abd154c40937a44e196643a2be2552987
Fixes: QTBUG-77999
2019-09-04 09:41:19 +02:00
Qt Submodule Update Bot
f3c4f6edeb Update submodules on '5.13' in qt5
Change-Id: I653ae34a4544c7a9beb59cced2ce91d6512c67a8
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-04 06:56:17 +02:00
Qt Submodule Update Bot
c398a50e2d Update submodules on '5.12' in qt5
Change-Id: I3467f8edbbd5c52f53ed786c2c0f185e8558c1f6
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-04 06:56:00 +02:00
Tuomas Heimonen
5035d38525 Saferenderer: Update qtci-linux-RHEL-7.4-x86_64 static build
Add build flag '-qpa offscreen' to remove dependency to xcb libraries

Task-number: QSR-510
Change-Id: Icc87face742abe775147d9bf931dbbdaee81fab1
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2019-09-03 21:37:50 +03:00
Qt Submodule Update Bot
885e662082 Update submodules on '5.13' in qt5
Change-Id: I30e7dbbbc47d26fcd8d7f802b7f46b635c14a858
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-03 18:07:22 +02:00
Qt Submodule Update Bot
4259affdb7 Update submodules on 'wip/cmake' in qt5
Change-Id: Ibf9eb43c66e2bb4d3c8e17d2ff99794408df9b9e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-03 11:51:34 +00:00
Qt Submodule Update Bot
34dd42b9f8 Update submodules on 'wip/cmake' in qt5
Change-Id: I989dc05dc59095f47defb8cf4af20b40060ac2ab
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-03 09:27:51 +00:00
Qt Submodule Update Bot
ae3f765798 Update submodules on '5.12.5' in qt5
Change-Id: I22bbce6e60cc835a5dc9f88737e04ecc7a1fc3e0
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-03 06:44:29 +02:00
Jukka Jokiniva
80791b03ee Update qtbase submodule on 5.13.1 in qt5
Change-Id: Ia5d9429b6cfc0804355a2161a18f030db6fa6dae
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2019-09-02 19:48:24 +03:00
Qt Submodule Update Bot
580d5fcc32 Update submodules on 'wip/cmake' in qt5
Change-Id: Id663bfb78313de014c8412396321253a505f80c7
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-09-02 13:24:15 +00:00
Qt Submodule Update Bot
9ba0de3708 Update submodules on 'wip/cmake' in qt5
Change-Id: Iee3299d179b8dfcdc7b69dd683c4be685610605a
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-08-31 06:10:32 +00:00
Qt Submodule Update Bot
4c65509d24 Update submodules on '5.12' in qt5
Change-Id: I1c5b9f51ed5a4dcb4469aa90439da993bc133319
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-08-30 22:02:37 +02:00
Qt Submodule Update Bot
27bbc46848 Update submodules on '5.13' in qt5
Change-Id: I5c1cc1e7edced0c2b62643b40769d84ebdeb3611
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-08-30 14:17:51 +02:00
Liang Qi
4bf048f7a7 Include qtsvg in wip/cmake
Change-Id: I6df7b31637e9512dc7fe92819741d01af3f87310
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2019-08-30 10:40:25 +00:00
Tuomas Heimonen
5752c0d4bc Saferenderer: Update qtci-linux-RHEL-7.4-x86_64 static build
Add build flag '-no-icu' to remove dependency to icu libraries

Task-number: QSR-499
Change-Id: I788de8dfdeb9845e9135e83a424468d2f5ca20d2
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2019-08-30 13:34:06 +03:00
Qt Submodule Update Bot
91e7e78e63 Update submodules on 'wip/cmake' in qt5
Change-Id: I30bfbcd5e25391613bc5c7219446d0bc336894cb
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-08-30 08:41:25 +00:00
Qt Submodule Update Bot
314d3efaf0 Update submodules on '5.14' in qt5
Change-Id: I0f5fdbd9f369dc42dd4c97dad1cb933753220e58
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-08-29 18:20:58 +02:00
Qt Submodule Update Bot
9828fd1d7b Update submodules on 'wip/cmake' in qt5
Change-Id: If619405e5fb6aed8b4c2e9829514825e785d37b5
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-08-29 05:53:46 +00:00
Liang Qi
136639b445 Merge "Merge remote-tracking branch 'origin/5.12' into 5.13" 2019-08-29 07:06:54 +02:00
Liang Qi
f58935ebea Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
	coin/platform_configs/default.yaml
	coin/provisioning/common/linux/disable-ntp_linux.sh
	coin/provisioning/qtci-linux-SLES-12-x86_64/55-emsdk.sh
	coin/provisioning/qtci-linux-SLES-15-x86_64/55-emsdk.sh
		emsdk.sh was moved from linux to unix, see
		38e416be66

Change-Id: I5b06dde2860a4e4869960ae2a5be1d6a1396e957
2019-08-28 20:28:11 +02:00
Qt Submodule Update Bot
097b013183 Update submodules on '5.13' in qt5
Change-Id: Ibdf69fb6840da0ddcbe5e8623c19d0ce1c34f844
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-08-28 19:37:29 +02:00
Tuomas Heimonen
163bd8006e Update Saferenderer static builds
qtci-windows-10-x86_64-10 static build: remove flag '-developer-build'
qtci-linux-RHEL-7.4-x86_64 static build: add flags '-no-fontconfig'
and '-qt-freetype', remove flag '-developer-build'

Task-number: QSR-491
Change-Id: I886ffbe9900ee63cd35e845b591086397c572abc
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2019-08-28 09:53:18 +00:00
Qt Submodule Update Bot
90d59cb4c7 Update submodules on '5.12' in qt5
Change-Id: I7f044a3d3a1aed8d1f9b97a1e73871ea91e9719e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-08-27 09:02:26 +02:00
Kari Oikarinen
97afb2ce08 Adjust submodule branches
Change-Id: Id5eb73617e7c5783724910b58df6c991615a5caa
2019-08-27 09:31:36 +03:00
Liang Qi
e6e51c07f5 Merge "Merge remote-tracking branch 'origin/dev' into 5.14" 2019-08-27 00:39:02 +02:00
Gatis Paeglis
8f87412708 platform_configs: replace -qt-xcb with -xcb
... as we are removing -qt-xcb switch from qtbase as part of
stopping to bundle xcb sources.

Change-Id: I33d58b78a1d7f53d5941ebda7131bf35a71cc8e6
Reviewed-by: Simo Fält <simo.falt@qt.io>
2019-08-26 23:07:06 +02:00
Tuomas Heimonen
11d6401d98 Update Saferenderer static builds
DisableTests on qtci-windows-10-x86_64-10
Add flag '-qt-libpng' to qtci-linux-RHEL-7.4-x86_64

Task-number: QSR-432
Change-Id: I3efc7f84f6c2eed49602e491f20f5a4f47512524
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
2019-08-26 20:47:05 +03:00
Liang Qi
6f3f8913d8 Merge remote-tracking branch 'origin/dev' into 5.14
Conflicts:
	.gitmodules

Change-Id: Idd7160b4c1aeb43a2c9580e93627eae118b742a3
2019-08-26 18:31:59 +02:00
Christian Strømme
ff75bd5297 Add QtQuick3D as a submodule in qt5.git
Adds QtQuick3D as a preview module in dev

Task-number: QTBUG-77724
Change-Id: I53d45bf5e823e3dac1acab9390121cbd1ad6352a
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
2019-08-26 12:43:06 +03:00
Qt Submodule Update Bot
54e8d38972 Update submodules on '5.12.5' in qt5
Change-Id: If4b169a8c53ffb6857cc43d6e1dd5f7d639db45f
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-08-26 07:47:12 +02:00
Qt Submodule Update Bot
21bcce41eb Update submodules on 'wip/cmake' in qt5
Change-Id: I45e93ee3d0f5e0ada30608cc9d3b459b9c594a56
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-08-24 08:22:32 +00:00
Qt Submodule Update Bot
98d9e2ebaa Update submodules on '5.12' in qt5
Change-Id: I0fafe70aa1dcb74cd6e06eb37dca1175a50c568e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-08-24 08:32:33 +02:00
Qt Submodule Update Bot
5f8a9b15de Update submodules on 'dev' in qt5
Change-Id: If400cccb49bb5d470ba79077b2e9e78e8410194d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-08-23 06:55:03 +02:00
Tony Sarajärvi
0414df3e2e Build MIPS64 with b2qt toolchain - again
This configuration verifies big endian builds.

The build was accidentally removed in merge
a94696ccd5.

See also 9b84c7135b.

Task-number: QTQAINFRA-2492
Change-Id: I2616f918591758b4cfee244a0a5414a61322f7d3
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2019-08-22 11:30:56 +00:00
Liang Qi
c9a0797a11 Update qtdatavis3d only
Change-Id: Ic100c7bac6fd7155203e2c16a2f855423b52cc5e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-08-22 13:30:49 +02:00
Qt Submodule Update Bot
9b0ff12595 Update submodules on '5.13' in qt5
Change-Id: I3c4c289580c3a5200989e76502c43a9ef293afed
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-08-22 09:02:00 +02:00
Qt Submodule Update Bot
bbf5272c81 Update submodules on 'wip/cmake' in qt5
Change-Id: I1fef265d608fd7729f8f3493d11660dce0502406
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-08-22 05:15:42 +00:00
BogDan Vatra
9dd4451234 Android: Update Android NDK to version r20
Fixes: QTQAINFRA-3152
Change-Id: Ieee56346dd4e29754f259d71465edc8c2a0db2e5
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
2019-08-22 06:55:47 +02:00
Qt Submodule Update Bot
54be78024d Update submodules on '5.12' in qt5
Change-Id: I82c4484938c958901bbc961b76a4012e0e925b9c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-08-22 04:42:50 +02:00
Assam Boudjelthia
8a5d86d888 Suppress QEMU syscall and ioctl debug messages
Compile QEMU with "Unsupported syscall" and "Unsupported ioctl" messages
suppressed, those can be shown by set/unset environment variable QEMU_SYSCALL_DEBUG.

Task-number: QTQAINFRA-2808
Change-Id: If0b28c47f2599c4ebca9cae6a6d38f9a4fd00458
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-08-21 12:00:57 +03:00
Liang Qi
3631a12b84 Merge "Merge remote-tracking branch 'origin/dev' into 5.14" 2019-08-21 08:31:18 +02:00
Liang Qi
04f8b0619d Merge remote-tracking branch 'origin/dev' into 5.14
Change-Id: Iaccaf809372bc6132af4e25af2ca8b163b810e0a
2019-08-21 08:26:49 +02:00
Qt Submodule Update Bot
e27c7adda7 Update submodules on '5.13.1' in qt5
Change-Id: I6a801fd43a71d5ba772e71dae4101a6edbbcac95
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-08-21 04:09:06 +00:00
Liang Qi
eb7370a7af Merge "Merge remote-tracking branch 'origin/5.13' into dev" 2019-08-21 05:56:56 +02:00
Liang Qi
9a8fb868ec Merge remote-tracking branch 'origin/5.13' into dev
This reverts commit d494d76c26.

 Conflicts:
        coin/platform_configs/default.yaml
                Temporarily remove the -no-opengl build.
        coin/platform_configs/meta-boot2qt.yaml
        coin/platform_configs/qt5.yaml
                Temporarily remove the webassembly build on windows.
        coin/platform_configs/qtwebkit.yaml

Task-number: QTQAINFRA-2577
Task-number: QTBUG-63917
Task-number: QTQAINFRA-2835
Done-With: Samuli Piippo <samuli.piippo@qt.io>
Change-Id: Ia7972b481a5ce33febe26c6589db24578614b2fd
2019-08-20 14:10:00 +02:00
Qt Submodule Update Bot
6e601907b9 Update submodules on '5.12' in qt5
Change-Id: Icd7419b3717c164db5f978610a2e821b683d8b22
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-08-20 07:09:40 +02:00
Qt Submodule Update Bot
acafe0ad49 Update submodules on '5.13.1' in qt5
Change-Id: I0f321007da9f236c069703125d5529a54ad27c9c
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-08-19 14:04:16 +00:00
Paul Wicking
2e9314967c Adjust submodule branches 2019-08-19 15:11:54 +02:00
Heikki Halmet
61acd9e95d Provisioning: Update iOS signing tools
new apple id is required with notarization

Task-number: QTBUG-77359
Change-Id: I2aafda37d40608296d598b1d9ade83a025bcac8d
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
2019-08-19 13:31:38 +03:00
Paul Wicking
7c691c4622 Adjust submodule branches 2019-08-19 09:43:00 +02:00
Qt Submodule Update Bot
b959cb5359 Update submodules on '5.13.1' in qt5
Change-Id: I4f319b0afe7e7369eb7db168f66ec57ed867c267
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-08-18 23:00:57 +02:00
Qt Submodule Update Bot
9656531361 Update submodules on '5.12' in qt5
Change-Id: I8de6a77d460db6497b76dac92be674fe9e790b7d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-08-18 11:21:34 +02:00
Qt Submodule Update Bot
b03790e34d Update submodules on '5.13.1' in qt5
Change-Id: I6c95fa658c52571ce1e0588eac1b9763f0bae549
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-08-16 23:01:16 +02:00
Qt Submodule Update Bot
48b228f728 Update submodules on 'wip/cmake' in qt5
Change-Id: Id919678e8e69dfe3c80d43fa9dbd10df7f02462d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-08-16 07:44:25 +00:00
Tuomas Heimonen
9d69ef09e3 Add Packaging to Saferenderer static builds
Task-number: QSR-432
Change-Id: I6e1c52a52dd5a6b92eceb13aa8f650bcce0e1fa3
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
2019-08-15 09:05:43 +03:00
Qt Submodule Update Bot
53c6c8a1ba Update submodules on '5.12' in qt5
Change-Id: Id2425a28299ca3653bc7d217855c276493bbccfe
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-08-15 05:40:13 +02:00
Qt Submodule Update Bot
3277628d62 Update submodules on '5.13.1' in qt5
Change-Id: Ic89472db863aedd92db57dbaaf2dd5fd10efa96f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-08-15 05:39:39 +02:00
Liang Qi
63181db03e Enable a no-gui build on Ubuntu 18.04 for 5.13
Task-number: QTQAINFRA-2576
Change-Id: I4bc96802b5fe940408158734b01f7b9b01361235
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-08-14 22:57:35 +02:00
Qt Submodule Update Bot
42366fd740 Update submodules on '5.13' in qt5
Change-Id: I082dbfe9cd927aa112760db67e4657868289c4e2
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-08-14 22:25:00 +02:00
Qt Submodule Update Bot
8d90ddd531 Update submodules on '5.13.1' in qt5
Change-Id: I2324f8a205f5e7fcb4cfea9e7e845ef9f4f867e4
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-08-14 16:20:11 +02:00
Alexandru Croitor
8c2ecdbc27 Update qt5 wip/qt6
Bump qtwebengine sha1 and re-enable qtwebengine and qtwebview to
be built.

Change-Id: I5f9f57b1083629e4294b4a34b74780a862d9e873
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-08-14 13:08:44 +02:00
Liang Qi
2fd2a9d268 Merge "Merge remote-tracking branch 'origin/5.13.1' into 5.13" 2019-08-14 07:02:19 +02:00
Tony Sarajärvi
8e32f46764 Add Suse Linux Enteprise Server 15 to the CI
Task-number: QTQAINFRA-3123
Change-Id: I725c58c7d319945f7470118dec99b5360385da7b
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-08-14 03:45:39 +00:00
Jani Heikkinen
4175af18f8 Add Android x86_64 architecture
It seems those build targets were accidentally deleted when
yaml change was merged in. Targets were there in Qt 5.13.0 release
(before yaml change)

This amends a94696ccd5.

See also ebcfcbe69a.

Task-number: QTBUG-47672
Change-Id: If2c22a8b995fdaa967f81062d0fae6dc725829dd
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2019-08-13 22:11:31 +00:00
Tony Sarajärvi
24f0367a60 Add Suse Linux Enteprise Server 12 to the CI
Task-number: QTQAINFRA-2851
Change-Id: Ia421a5e35f8a0515d7f761ca0c52a54a93dcee5c
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-08-13 11:03:52 +00:00
Liang Qi
82e0fe1664 Merge remote-tracking branch 'origin/5.13.1' into 5.13
Change-Id: Ifc39acfc1a0ba6019091a194088e99e451f99bde
2019-08-13 10:49:03 +02:00
Qt Submodule Update Bot
b96719cb80 Update submodules on '5.12' in qt5
Change-Id: I465bd3b417d3412d7d8d62d868aa8ccb338127f2
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-08-13 07:45:27 +02:00
Qt Submodule Update Bot
c63dd0ddfd Update submodules on 'dev' in qt5
Change-Id: I912e43550293e17b22e1401d50e7a4a06ee4c3b3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-08-12 23:02:33 +02:00
Simo Fält
d19f60d745 Provisioning: Append the emscripten to path instead of prepend
Having it first in path seems to cause some confusion when detecting
libc++ in darwin.

Change-Id: I841e7f169e4771d3818cf156d9d78fc242e9995c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-08-12 21:01:55 +00:00
Qt Submodule Update Bot
19cc6b2b80 Update submodules on '5.13.1' in qt5
Change-Id: Ibe04f05d2195953f6ab7305472d1700ec1c73312
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-08-12 21:25:08 +02:00
Qt Submodule Update Bot
af7097ed42 Update submodules on 'wip/cmake' in qt5
Change-Id: Ie79c40427bf35051b853df9209cee16ad15de0fd
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-08-11 21:47:43 +00:00
Alexandru Croitor
621c18b60b Update qt5 wip/qt6
Point qt3d, qtdeclarative, qtgraphicaleffects, qtimageformats,
qtnetworkauth, qtquickcontrols2, qtsvg to latest wip/qt6.
Also re-enable the qt3d build.

Change-Id: If9d122e064021b500a423376b991edbb5c1903fc
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2019-08-11 13:42:14 +02:00
Qt Submodule Update Bot
edf6149a5b Update submodules on '5.13' in qt5
Change-Id: Id153f5c742637fe66bb9010fa41cb62645fb4e4d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-08-11 12:04:31 +02:00
Joni Jäntti
3b0fbe7213 Provisioning: Ubuntu 18.04: Add required packages for b2qt
These packages are required for building b2qt module.

Needed also on 5.12 branch as meta-qt5 follows Qt branching
and will take provisionings from here.

Change-Id: Ia6c5ffd95d4f778b23f381a6f1f5473aa11971e3
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit ee9dd0d860)
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-08-11 09:37:41 +03:00
Alexandru Croitor
f46f85b0c7 Update qt5 wip/qt6
Point qtbase to latest wip/qt6.
Temporarily disable building qt3d because it fails with the new qtbase
version, but updating it with old SHA1 of qtbase is also not possible.

Change-Id: I232920be48f01608f196c24370c684eccbd3994f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-08-10 00:17:47 +02:00
Qt Submodule Update Bot
fbec569aea Update submodules on '5.12' in qt5
Change-Id: I363647bd417426f6f3629f42bbd1f6e83570c47e
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-08-09 15:37:35 +00:00
Qt Submodule Update Bot
8ede8851f4 Update submodules on '5.13' in qt5
Change-Id: If3fe6bab310eb0e403c040ea465ac8197a7059a2
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-08-09 16:22:39 +02:00
Liang Qi
1f79ae5d86 Merge "Merge remote-tracking branch 'origin/5.13.1' into 5.13" 2019-08-09 16:22:09 +02:00
Alexandru Croitor
3e396d5ef1 Update qt5 wip/qt6
Point qtbase to wip/qt6.

And use new sha1s for other repositories when needed.
And update .gitmodules branch to point to wip/qt6.

Change-Id: Ic12a106d1b491f77277419a27b61396ba07f1737
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-08-09 15:59:54 +02:00
Qt Submodule Update Bot
4230f4ac54 Update submodules on 'dev' in qt5
Change-Id: Ic8e437d68ed59391f9a0c5c73cc57298a109b02f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-08-09 13:00:53 +02:00
Liang Qi
49c808befb Merge remote-tracking branch 'origin/5.13.1' into 5.13
Conflicts:
	.gitmodules

Change-Id: I9b4e8807941f49ed930372cc3466c97110794849
2019-08-09 09:02:41 +02:00
Qt Submodule Update Bot
9e370453bb Update submodules on '5.13' in qt5
Change-Id: Ibcdd2991705555bda542b60c25dbdb0e3dd572cf
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-08-08 23:13:30 +02:00
Liang Qi
f32c9f755e Include QtWebEngine again
This reverts commit a94696ccd5 partially.

Task-number: QTBUG-77304
Task-number: QTBUG-77305
Change-Id: Iae17b2358d39a1d22271b2eb5c73b272a43adb28
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-08-08 22:51:04 +02:00
Qt Submodule Update Bot
0f89c02328 Update submodules on '5.13.1' in qt5
Change-Id: I73c133a6ae2e6a84cd21f3d4f19803d510d23e04
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-08-08 22:50:57 +02:00
Liang Qi
9b186a9d36 Merge "Merge remote-tracking branch 'origin/5.12' into 5.13.1" 2019-08-08 22:50:52 +02:00
Liang Qi
03d4a54e34 Merge remote-tracking branch 'origin/5.12' into 5.13.1
Conflicts:
	.gitmodules
	coin/platform_configs/qtbase.yaml

Change-Id: I964ffb430436c62ad675fabc853642800499ade3
2019-08-08 15:31:47 +02:00
Jani Heikkinen
9929aff99e Add QMAKE_LFLAGS_APP+=-s as configure argument in linux desktop build
After adding "-force-debug-info" and "-separate-debug-info" debug information
is going in the binaries accidentally & so on exploding binary size.

Debug symbols are wanted for libraries and adding QMAKE_LFLAGS_APP+=-s as
configure argument will prevent debug information not to go inside binaries.

Task-number: QTBUG-69767
Change-Id: Ieec205402b34870901aeb26d9ca98fa9edb159c6
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-08-08 16:21:20 +03:00
Liang Qi
42bfac5bf8 Include qtvirtualkeyboard again
This partially reverts commit 452e0d94d4.

Task-number: QTBUG-76371
Change-Id: Ic45690899c0fc0a7fd38d1c348481fdec09cccf8
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2019-08-08 14:19:46 +02:00
Tony Sarajärvi
b88acae7a8 Partially revert 'Do DeveloperBuild for Boot2Qt'
This partially reverts commit 8f073cea69.

Autotests slow down way too much still, so we can't run developers
builds eveywhere.

Task-number: QTBUG-63152
Task-number: QTBUG-77304
Task-number: COIN-326
Change-Id: I04b673c2ebfae6c0f6cbc09242cce2e273c7111c
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-08-08 12:19:38 +00:00
Qt Submodule Update Bot
f08bd26eeb Update submodules on '5.12' in qt5
Change-Id: If3c40151c06c593327eee7a2394e7495bc11bb55
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-08-08 11:45:10 +02:00
Qt Submodule Update Bot
b326a502db Update submodules on '5.13' in qt5
Change-Id: If03f5533dcfb83ac2002f109118b5bfa8a4bad5e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-08-08 00:45:02 +02:00
Qt Submodule Update Bot
30ca64e65b Update submodules on 'wip/cmake' in qt5
Change-Id: I85cbd5003e89b2b2af2237dd6a5489b45057e3c2
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-08-07 12:38:55 +00:00
Qt Submodule Update Bot
f511a2d74f Update submodules on '5.13.1' in qt5
Change-Id: I6073c33388af514d7eb0f014b13cb6694235f650
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-08-07 12:14:24 +02:00
Qt Submodule Update Bot
2b738468de Update submodules on '5.13.1' in qt5
Change-Id: Ia6d7873072055e86c1aea5c33694ba376a867fa3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-08-07 10:35:33 +02:00
Liang Qi
f8439ea42c Merge "Merge remote-tracking branch 'origin/5.13' into 5.13.1" 2019-08-07 10:35:16 +02:00
Liang Qi
13b206662b Merge remote-tracking branch 'origin/5.13' into 5.13.1
Notice - qtvirtualkeyboard and qtwebengine got ignored
temporarily due to issues on QEMU.

 Conflicts:
	.gitmodules

Change-Id: Iefab0fa5172c976ca06b3f33772c4c4bc10763c2
2019-08-06 11:46:15 +02:00
Qt Submodule Update Bot
b41a217f35 Update submodules on 'dev' in qt5
Change-Id: Ic29d83fa0488cc77726adde23f21c68f0d7fecc3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-08-06 06:15:27 +02:00
Qt Submodule Update Bot
2fb0e4f352 Update submodules on '5.13' in qt5
Change-Id: I9498fe9045d23ec400d9437f375d547f054909b8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-08-06 06:12:03 +02:00
Qt Submodule Update Bot
2970d3660c Update submodules on '5.13' in qt5
Change-Id: If5c6d3363438d613e5ea96bc84018ef913067296
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-08-05 11:28:51 +02:00
Liang Qi
1e476b01fd Merge "Merge remote-tracking branch 'origin/5.12' into 5.13" 2019-08-05 11:28:39 +02:00
Qt Submodule Update Bot
cb14d29efe Update submodules on 'dev' in qt5
Change-Id: I72ceb9f1c47f5786a8a061b744e085aadb5e17a2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-08-04 23:01:00 +02:00
Qt Submodule Update Bot
139e8e4701 Update submodules on 'wip/cmake' in qt5
Change-Id: I5440f3860baca1ca151a0e35f835103c596a1e1c
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-08-04 09:55:52 +00:00
Liang Qi
58977376e1 Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Ie49f7e5ff9ca02522c6611922b47870aba2c152e
2019-08-04 11:51:40 +02:00
Tony Sarajärvi
9da27c5808 Add macOS 10.14 to the CI
Task-number: QTQAINFRA-2938
Change-Id: Id25c6c3203a07985c9ef1cc914c4398ac7db615c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-08-03 23:01:34 +03:00
Liang Qi
689ed30f2a Merge "Merge remote-tracking branch 'origin/5.12' into 5.13" 2019-08-03 00:08:09 +02:00
Liang Qi
a94696ccd5 Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
	.gitmodules
		ignore QtWebEngine on QEMU temporarily.
	coin/platform_configs/default.yaml
		no-gui build was removed temporarily.
	coin/platform_configs/qt5.yaml
	coin/platform_configs/qtbase.yaml
	coin/platform_configs/qtconnectivity.yaml
	coin/platform_configs/qtsaferenderer.yaml

Task-number: QTQAINFRA-2576
Task-number: QTBUG-77304
Task-number: QTBUG-77305
Done-With: Tony Sarajärvi <tony.sarajarvi@qt.io>
Change-Id: If7cf75791677eace762374b92382a2ce15f17f55
2019-08-03 00:02:43 +02:00
Samuli Piippo
fde090e4b5 Add targets for yocto builds
Add empty linux targets that are used by the yaml file from
meta-boot2qt and meta-qt5

Fixes: COIN-320
Change-Id: I574185345a3c3dec0a033e7faed45091b89d4959
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
2019-08-02 09:19:13 +00:00
Qt Submodule Update Bot
4c609c4db3 Update submodules on 'dev' in qt5
Change-Id: I83e4cfe7c9598e4454b2007c993413d85f7a3785
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-08-02 09:12:07 +02:00
Qt Submodule Update Bot
4c5d3f2e43 Update submodules on '5.13' in qt5
Change-Id: Ia8f240a565043822fec60ce29b348bb79846919e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-08-01 22:31:04 +02:00
Qt Submodule Update Bot
1fbba6d1ce Update submodules on 'dev' in qt5
Change-Id: Ifa9d7423aeb8bbc179dd31b38c5b1368c8f54146
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-08-01 14:52:08 +02:00
Konstantin Tokarev
125c5e6528 Provisioning: update conan_manifests for libxslt packages
Package recipe was improved, as a result packages were rebuilt and
checksums need update.

Change-Id: I33bd30b44cbe48b3550cb42eeb995ef8588fcce7
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-08-01 14:24:56 +03:00
Konstantin Tokarev
b521ad483c Update platform_configs for QtWebKit
* Remove redundant MSVC2017 configuration
* Synchronize Mingw73 configuration with qt5.txt

Change-Id: I05557ecbf57206fe56ff113f893c37a65f503bf0
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-08-01 14:24:48 +03:00
Jani Heikkinen
30b0d05343 Remove 'Packaging' feature from WinRT_10 x86
We don't deliver binaries for that target anymore -> do not export that
either

Change-Id: Iccf408adeaed071294e10774a5a0c21ec8bd8014
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2019-08-01 12:31:28 +03:00
Qt Submodule Update Bot
72f1742097 Update submodules on '5.13' in qt5
Change-Id: I6f218e6cc6c7de9a4f87f63814e01079a7ab1b02
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-08-01 10:48:34 +02:00
Qt Submodule Update Bot
d3fbd2ed1a Update submodules on '5.12' in qt5
Change-Id: Ie88f0f640e5cd5ad3e3bb159e0b2c248fddc4d40
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-07-31 23:31:05 +02:00
Qt Submodule Update Bot
b7cf9cc257 Update submodules on 'wip/cmake' in qt5
Change-Id: I1db600010615f24d6b35c5d6740494422cb917f6
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-07-31 11:24:26 +00:00
Liang Qi
488415a9c5 Update submodules on 'dev' in qt5
Change-Id: I2927de7c1c756d0c2645308e8cdfecce01533bc0
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-07-31 10:14:05 +02:00
Juha Karjalainen
38e416be66 Add webAssembly build for windows and macos
Provision emsdk and its dependecies to windows and macos.

Task-number: QTBUG-63917
Task-number: QTQAINFRA-2835
Done-with: Juha Karjalainen <juha.karjalainen@qt.io>
Change-Id: I24ea9cbc4f7cc95e6952765099d5e46247470011
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-07-31 09:44:53 +03:00
Qt Submodule Update Bot
e6823acbc7 Update submodules on '5.13' in qt5
Change-Id: I78f3250367bf544dd8a5b5f1a0cd91c20655e065
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-07-30 20:08:39 +02:00
Alexandru Croitor
0b2f4d57e4 Update qt5 wip/qt6
qtbase pointing to dev branch, and other repos pointing to
wip/qt6.

qtwebengine and qtwebview are not built at the moment. The build of
the mentioned repos will be restored after bumping qtbase version
to 6.0.0, and after the subsequent qt/qt5 wip/qt6 integration is
merged.

Change-Id: I9b6b8136b2f58b181ae2d2dadb8a96b9c1103225
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-07-29 15:24:06 +00:00
Frederik Gladhorn
a268fb4689 Adjust submodule branches
Change-Id: I65388af02c1ab3608abf7e18a89966020e213d10
2019-07-29 14:26:43 +02:00
Simon Hausmann
ddbebe9dac Stop building debug-and-release packages for MinGW
The requirement to separate debug and release DLLs on Windows stems from
the Visual Studio C run-time library appearing in two different variants
(debug and release) and not mixing well. It's possible to perform builds
without optimzations and with debug symbols while linking against the
release version of the C run-time, but at the same time the debug
version of the run-time brings other developer visible advantages.

MinGW on the other hand does not have this distinction, does not ship
with separate DLLS and does also not require the VS C runtime library.
Therefore we do not need this separation for MinGW, which means that our
packages can be reduced in size and application developers wishing to
debug their applications do not have to use debug builds of the Qt
libraries or run into Qt internal debug code.

This change is in preparation for turning off debug-and-release in qtbase.
Since coin overrides the Qt defaults, this change needs to be applied first.

Change-Id: I2ed6e2c0ae54cf23f78119d115f8d21906859e35
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
2019-07-29 10:39:08 +00:00
Friedemann Kleint
abfbc0668c Disable tests for MSVC2015/Win32/64bit
Frequent crashes of tst_QDir have been again observed recently in the
dev branch with MSVC2015. It should be sufficient to test MSVC2017;
MSVC2015 should only be compile-tested.

Task-number: QTBUG-58654
Change-Id: I0eb5a1294432a24548468c993418bc18671547bb
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Dimitrios Apostolou <dimitrios.apostolou@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2019-07-29 09:35:08 +02:00
Qt Submodule Update Bot
f84c90706d Update submodules on '5.12' in qt5
Change-Id: I2a96915081171e92e91e5a595e87cd2e0b991a51
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-07-28 23:30:53 +02:00
Qt Submodule Update Bot
ac2a57b1c3 Update submodules on '5.13' in qt5
Change-Id: I0f92c902424fc5e58158921235b582ef7a7ddc91
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-07-28 22:31:07 +02:00
Qt Submodule Update Bot
71e9322862 Update submodules on '5.13' in qt5
Change-Id: If1822246b0553ed5d550c766a8e3700fd7c14068
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-07-27 22:31:00 +02:00
Konstantin Tokarev
716640a477 Provisioning: update Conan and Conan packages
[*] Update Conan to 1.17.0, adjust to change in command line arguments
[*] Update Conan packages to up-to-date versions, add libjpeg-turbo and
    packages for 64-bit MinGW
[*] Rename 03-conan.ps1 to 11-conan.ps1 so that it is installed after
    Python 3 and MinGW
[*] Add license header to conan.ps1

Change-Id: Ibc451ddc54a7227eb6d3a007a20351e77a46875f
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2019-07-26 19:52:45 +03:00
Konstantin Tokarev
4bf0ba2ba1 Provisioning: Add CompilerException and CompilerThreads settings for Conan
Change-Id: I3a52101056bce4d3d4ac9124dbfd566adf47cf80
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2019-07-26 19:52:37 +03:00
Konstantin Tokarev
2666f3b216 Provisioning: rename 03-conan.ps1 to conan.ps1 to follow naming convention
Change-Id: If24541709d4675498bc4af296e05ce3c62d5045a
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2019-07-26 19:52:24 +03:00
Konstantin Tokarev
535dbcfe96 Conan: Suppress output of New-Item
Change-Id: I3d62fffa08d38a383187726e08743512236bb859
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2019-07-26 19:52:18 +03:00
Qt Submodule Update Bot
caf72a3e61 Update submodules on 'wip/cmake' in qt5
Change-Id: I4314ca80f344975b9cb01dbd7d26a2b66149f8d8
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-07-26 08:41:51 +00:00
Qt Submodule Update Bot
41abae4367 Update submodules on '5.12' in qt5
Change-Id: I0b682ebd4643a85f04cb2192efb97e8c5230759a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-07-26 09:59:29 +02:00
Konstantin Tokarev
f12c226463 Provisioning: install-msys2.ps1 must run its commands synchronously
[*] Using bash instead of msys2_shell.cmd allows Start-Process to actually
    wait for the end of command execution.
[*] cpan requires "yes" to be typed by user when it's run first time,
    otherwise it hangs indefinitely waiting for input.
[*] Stop gpg-agent and dirmngr started in the background to prevent
    CI session from hanging.

Change-Id: I4d4c1f36d215cb7578d1e7059217e34375de96c6
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2019-07-26 07:50:43 +03:00
Konstantin Tokarev
22c427b369 Use msiexec to install Strawberry Perl from msi package
Currently provisioning fails with following error:  "This command cannot
be run due to the error: %1 is not a valid Win32 application."

Change-Id: I59290d394f231c37af10f27d07dbb9f5d2d2470a
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2019-07-26 07:50:41 +03:00
Konstantin Tokarev
645bd71404 Provisioning: Run-Executable should print stdout and stderr to log
Task-number: QTQAINFRA-3085
Change-Id: I5343753f75157a2a894bb3ac50d416ab044d86fb
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
2019-07-26 07:50:38 +03:00
Konstantin Tokarev
cb8d38fd9c Provisioning: don't re-run Conan 5 times if there is no error
Change-Id: Ia348ebbc4fc3a2503cc426c011e68b7a410c4a08
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-07-26 07:50:35 +03:00
Qt Submodule Update Bot
f470b8eabe Update submodules on '5.13' in qt5
Change-Id: I0ba5aab5d93df54742604eca6a893cea11cf19c0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-07-25 22:31:11 +02:00
Qt Submodule Update Bot
c31548830f Update submodules on '5.13' in qt5
Change-Id: Ia71bd5cb97367e0a750e090bfbcacfc89ef41490
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-07-25 13:45:26 +02:00
Qt Submodule Update Bot
dd7a80d757 Update submodules on '5.12' in qt5
Change-Id: Ife94a7c6264fbb4525ba2cd0370bdf1ba454b7c6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-07-25 10:15:39 +02:00
Qt Submodule Update Bot
7001f15765 Update submodules on '5.13' in qt5
Change-Id: Ib6e8c649e6e2f6a9c1fd60a459687426aec1a149
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-07-23 11:11:30 +02:00
Qt Submodule Update Bot
2237ea6d0c Update submodules on '5.12' in qt5
Change-Id: I09887cc4b1e103b9341f096c4c9164f4a96bd431
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-07-23 09:59:39 +02:00
Liang Qi
5a16472559 Update submodules on '5.13' in qt5
Change-Id: I5a1af05df086b2ba86dc736714a2eae9db299248
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-07-23 09:43:03 +02:00
Qt Submodule Update Bot
483aff91d5 Update submodules on 'wip/cmake' in qt5
Change-Id: I3026b396baf1de58d44335c72d94fa42ef11e2ae
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-07-22 10:38:00 +00:00
Qt Submodule Update Bot
cfe2c097e9 Update submodules on '5.12' in qt5
Change-Id: Ib0b559d638d7ae6df4129b97f433b168af757443
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-07-14 23:30:51 +02:00
Michael Brüning
57ea35cace Un-ignore qtwebengine in dev
Change-Id: I72da39c8bfba31fc366b2757f759a4aba070e960
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2019-07-12 21:48:32 +02:00
Qt Submodule Update Bot
e8c8c94278 Update submodules on '5.12' in qt5
Change-Id: Ieb1b3ec8ae527fe13bd1980045f721511ef579a7
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-07-07 23:30:56 +02:00
Alexandru Croitor
9f1feaf3a0 Merge remote-tracking branch 'origin/dev' into wip/qt6
Fixes the qtdeclarative quoting around DISTRO_OPTS.
Brings in qtquicktimeline submodule.

Change-Id: I7a6a5ae92a196389aff612b7b0dd98a2d31ff4d0
2019-07-07 13:41:22 +02:00
Sona Kurazyan
e4b596fcfe Add the docker images for CoAP test servers
This change includes:
- Docker image for the test server to test non-secure and PSK-based
  CoAP security modes.
- Docker image for the test server to test X.509 certificate-based
  CoAP security mode.

Change-Id: Ice661917591ecaee8ebc3500209bcffc08981f65
Reviewed-by: Ryan Chu <ryan.chu@qt.io>
2019-07-07 11:36:16 +02:00
Alexandru Croitor
84e57b1fb0 Try to update sha1s of submodules to get a working qt5 wip/qt6 branch
qtbase, qtremoteobjects, qtquickcontrols, qtquickcontrols2
qtlocation and qttools are updated to latest dev HEAD.
qtimageformats, qtnetworkauth, qtsvg, qtdeclarative are updated to
point to latest wip/qt6 HEAD.

Change-Id: I70938d0d258208670c7d3e3f73fe3e3b274c2eb2
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-07-06 20:33:23 +00:00
Qt Submodule Update Bot
b769633c2e Update submodules on '5.12' in qt5
Change-Id: I4c21b50f87410c4c253f510604e3ec80d6b6f929
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-07-06 17:46:42 +02:00
Liang Qi
bd7b28582f Merge "Merge remote-tracking branch 'origin/5.13.0' into 5.13" 2019-07-06 06:02:12 +02:00
Liang Qi
a319bc5f5f Merge remote-tracking branch 'origin/5.13.0' into 5.13
Change-Id: I97c42bef6632a4aeccefab008e0f615f7a9e9f78
2019-07-05 20:05:17 +02:00
Qt Submodule Update Bot
231a5b777c Update submodules on '5.13' in qt5
Change-Id: I39a42574427b32d1d5c73ea96713913674ca7303
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-07-05 19:27:39 +02:00
Ryan Chu
d49ae7020c Revert "Revert "Provisioning: disable docker test servers on Windows 10 (x86_64)""
This reverts commit 84ff024609.

Reason for revert: <Some VM crashed again when running docker tests>

Change-Id: Iad753c1c4728c6eddc53816e2c51947ce724bf6b
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2019-07-05 08:43:14 +00:00
Qt Submodule Update Bot
bf78588505 Update submodules on '5.12' in qt5
Change-Id: Ief716d10e9e1efcb655f96cc297a3a22ff67839b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-07-05 09:45:54 +02:00
Qt Submodule Update Bot
3d257d4469 Update submodules on 'wip/cmake' in qt5
Change-Id: I30e47f20800449cf0e808dc467f88c56a106a7ee
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-07-04 11:57:35 +00:00
Qt Submodule Update Bot
e41646897c Update submodules on '5.12' in qt5
Change-Id: I039e035c56bd14a86eb1b309d0372c90b5d737cf
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-07-04 06:04:31 +02:00
Qt Submodule Update Bot
ff74cdbe96 Update submodules on 'dev' in qt5
Change-Id: I2bbb20be92c15de518f3c361cffbe2a2f0150c4c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-07-04 06:02:29 +02:00
Qt Submodule Update Bot
c6669046b4 Update submodules on 'dev' in qt5
Change-Id: Ib8778d70ad087c95d92998ae533c6e3fb2412d6a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-07-03 08:58:28 +02:00
Liang Qi
59891119e7 Update submodules on '5.13' in qt5
Skip qtbase in this round.

Change-Id: I49b70268be1be3d29fca34af87d376dc51154aec
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-07-02 23:02:59 +02:00
Qt Submodule Update Bot
084bc8e03d Update submodules on 'wip/cmake' in qt5
Change-Id: I982d2416a488f18dc672089e9618db04422cf49f
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-07-02 20:59:38 +00:00
Jędrzej Nowacki
caacdfc3e1 Remove "-DBUILD_TESTING=OFF" from default configs
It is not needed. QtBase build instructions add it explicitly, as
the tests are build with a separate cmake call (to compile tests
against differently installed Qt).

Change-Id: I22fe26d4bdb9dd237df76246607d823f4b4fa315
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-07-02 13:47:59 +00:00
Jędrzej Nowacki
8e54519b75 Do not specify compiler binary name directly
We have a code that handles that implicitly so it is not needed anymore.

Change-Id: I4aea2f55f9efd24ec7cf22cb8b413789ec3e7fea
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-07-02 13:47:52 +00:00
Toni Saario
107fb06016 Fix extra file and missing library in platform configurations
Missing libraries in no-gui platform.
Default.txt was supposed to be removed by
    439a1eb220

Change-Id: I91c7802634f69f9e5475921b3610185b386b1b1f
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
2019-07-02 06:47:59 +00:00
Toni Saario
439a1eb220 Change configuration files into yaml format
Change-Id: I252908e9eae3a254f32a286608734b5728cd60b8
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
2019-07-01 10:28:29 +02:00
Qt Submodule Update Bot
3ce3dae19b Update submodules on 'dev' in qt5
Change-Id: If2c839bcc7d8fd40f832854d0e729bd811187d85
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-07-01 09:17:20 +02:00
Qt Submodule Update Bot
7eb00bc2c8 Update submodules on 'dev' in qt5
Change-Id: I48275cb9607bc5f7f7f4d50c5c17f2bf537b9538
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-06-30 03:15:07 +02:00
Qt Submodule Update Bot
1d5641087a Update submodules on 'dev' in qt5
Change-Id: I780c4c7d8894a4933aa908b2a90f2d1d7d069677
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-06-29 09:19:40 +02:00
Qt Submodule Update Bot
e2fa816df4 Update submodules on '5.12' in qt5
Change-Id: I1bdf6510557ffbc7b3bfd292d18a0f27cb0cee23
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-06-28 16:21:45 +02:00
Tony Sarajärvi
8c4ac28b0d Add correct openSSL arguments to no-gui builds
Change-Id: Ida58ff76bf154dbaf4ffb4cb18005874e10a9c46
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-06-28 11:43:45 +03:00
Qt Submodule Update Bot
3473922cb4 Update submodules on 'dev' in qt5
Change-Id: I2ede3578fe5d37a8df920fb9736994d25e7da47c
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-06-28 04:27:58 +02:00
Liang Qi
03969bfe23 Update submodules on 'dev' in qt5
Change-Id: Ie0b1c3abcaea4a74279a7001cadecac70c1f853b
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-06-27 14:46:39 +02:00
Qt Submodule Update Bot
36c9379e07 Update submodules on 'wip/cmake' in qt5
Change-Id: Ic264dee2452ffc8b58609f5114444b49488d951b
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-06-27 07:55:01 +00:00
Qt Submodule Update Bot
d3e2f494fd Update submodules on 'wip/cmake' in qt5
Change-Id: Ia666fc2c946e00b901bd225e06c455474591f7f1
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-06-26 09:00:56 +00:00
Qt Submodule Update Bot
daf8327b2c Update submodules on '5.13' in qt5
Change-Id: I40b83973a9cab06f068c8a61f51fded3eddebeef
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-06-25 20:16:42 +02:00
Konstantin Tokarev
3a940903c0 Make header line in qtwebkit.txt longer to prevent parsing error
Change-Id: I0531f91af397d09cfa7eae96c0d779d3055b0456
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-06-25 10:47:00 +03:00
Qt Submodule Update Bot
1ba5e3b0b9 Update submodules on '5.13' in qt5
Change-Id: I6f19903a3a7cdcf8fb2579b710ccda23427fb91b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-06-24 22:30:58 +02:00
Qt Submodule Update Bot
0ec119a442 Update submodules on 'wip/cmake' in qt5
Change-Id: Id5266aa8146f6d870fdddedc106d7ef1add5d5c6
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-06-24 11:42:50 +00:00
Liang Qi
245f5afd71 Remove DisableTests in features
At least we can get tests built now.

Change-Id: I7830f495002083023651ca5da3c6c39e745f920f
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2019-06-24 11:42:34 +00:00
Konstantin Tokarev
35c1c88749 Update platform_configs for QtWebKit
* Remove redundant MSVC2017 configuration
* Synchronize Mingw73 configuration with qt5.txt

Change-Id: I02f6649b77e89b9acb3bdd516419aa12817caaa3
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-06-24 13:02:11 +03:00
Liang Qi
19894d279f Update submodules on 'dev' in qt5
Skip qttools in this round.

Temporarily ignore qtwebengine due to QTBUG-76549.

Change-Id: I93afa1bedb18392a3f6c7ae676690b87f07aeaf9
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-06-24 09:31:56 +02:00
Jędrzej Nowacki
61d838e4f0 Move ICC compiler name setup to instructions level
That way we can simplify product level configuration.

Change-Id: Ib855c1873d3b4566b437845ab18182a0db8e45b9
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-06-24 06:25:02 +00:00
Qt Submodule Update Bot
e7f8eeb30d Update submodules on '5.13' in qt5
Change-Id: I567e22dba0fc0b4c3dd377aa3d37ba0985855ba1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-06-22 22:30:55 +02:00
Simon Hausmann
5464a31c61 Enable freetype on the Windows build
With the newer vcpkg this works now.

Change-Id: I8408041b338ffbe74aaec9afbb1cf8cbf3bb1d92
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-06-21 11:59:51 +00:00
Simon Hausmann
9d7437859b Update vcpkg installation
Use the latest snapshot, fetch the package set from the repo itself and
set the VCPKG_ROOT environment variable as that's the vcpkg documented
interface.

The qt specific triplet defaults to static linkage, which allows
removing the %PATH% handling and resembles the same setup as in Qt 5
where we linked the 3rd-party code statically into qt.

Change-Id: I789d61b5c7258674c2dd80403efaeb891c8f75c7
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-06-21 11:59:42 +00:00
Qt Submodule Update Bot
6131434bdf Update submodules on '5.13' in qt5
Change-Id: I62f02ca85e035aa26dc0f9a0ebb4d78e4abc2363
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-06-20 22:31:38 +02:00
Qt Submodule Update Bot
b53dfe6a86 Update submodules on 'wip/cmake' in qt5
Change-Id: If09d644bb84c83a515a68bada24ab0203a6c6003
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-06-20 07:48:12 +00:00
Qt Submodule Update Bot
dedbec30d1 Update submodules on '5.13' in qt5
Change-Id: Ia2ae5b47bc7e4aa094c6ed72d0a7be3bef090387
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-06-19 22:30:48 +02:00
Qt Submodule Update Bot
a04751c10e Update submodules on '5.13' in qt5
Change-Id: I216600c90956b5716b1ce1a787b21417dbc4089a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-06-18 22:31:30 +02:00
Thomas Hartmann
a0b69977c6 Add qtquicktimeline as a submodule in qt5.git#dev
Task-number: QDS-54
Change-Id: Ic92eb39b8bd9fced3b4a701f4d40364a2d8f9e95
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-06-18 11:20:22 +02:00
Liang Qi
d869c671b5 Update submodules on 'dev' in qt5
Skip qtbase in this round.

Change-Id: Idd621fa568f01f4e4481da61a4e2fb8fe1bdcaba
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-06-18 10:06:49 +02:00
Qt Submodule Update Bot
6f6b43593e Update submodules on '5.13' in qt5
Change-Id: Ifb6609089d41976f649b73df26e9214ab3b49fd4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-06-17 22:32:31 +02:00
Liang Qi
cd8c1032c3 Update qtbase on 'wip/cmake' in qt5
Change-Id: Ibe0281f5558efb8e0c1f00b17af367173331e30a
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-06-17 11:34:24 +00:00
Jędrzej Nowacki
b62c39f49f Increase CI test coverage by changing GCC to ICC
There is already other place in which we compile with GCC on Linux.

As we use ninja now, it has to be installed on open suse too.
Cmake port depends on system libraries therefore pcre2 needs to be
installed.

Change-Id: I92e16cc31fa60b4c591e71b58cd7235540065ac6
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-06-17 10:56:43 +00:00
Qt Submodule Update Bot
dcb1c8b41c Update submodules on '5.13' in qt5
Change-Id: Id806418087800e313ee9a14c0a99fcf7215579c0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-06-14 22:31:34 +02:00
Heikki Halmet
644f8b7006 Fix openssl 1.1 library configurations
Change-Id: Idcb919e5f388b509e4215cf5515c8716490d5872
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>

(cherry picked from commit de41591477)
Change-Id: Ifbb5ecc4613319265a3378b60959fffc7301ae46
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-06-13 22:47:35 +03:00
Qt Submodule Update Bot
09180d3f95 Update submodules on '5.13.0' in qt5
Change-Id: I8883876f4360b207000d7635838fd26adb6a2f73
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-06-13 14:04:22 +00:00
Qt Submodule Update Bot
305278ff93 Update submodules on '5.13' in qt5
Change-Id: I4363311b5e75dd00eb5c869d013b701a2ef7ef49
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-06-12 22:31:12 +02:00
Alexandru Croitor
cfd35cc498 Add a new Linux config that builds a static developer build
Change-Id: I8e40ed674cf0a72223a0180296db8eaa6eb6da06
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2019-06-12 14:42:31 +00:00
Liang Qi
8f2b2dba78 Enable windows and macOS builds for yaml and cmake
Change-Id: I91aea0fe59e77cf95f7441c646e95d038f0e0032
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2019-06-12 11:17:32 +00:00
Jani Heikkinen
fd1f34192a Fix qt5.git builds
some '-' is missing from qt5.txt causing coin to ignore all configurations
from that file. So adding enough '-' in title column to solve the issue.

Change-Id: I0b8fa6c98efeece1bf93592bbb60ca627962ceee
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
2019-06-12 13:39:26 +03:00
Qt Submodule Update Bot
d063074b0f Update submodules on '5.13.0' in qt5
Change-Id: I0070b9d562cfb57bab5b6fad913e9dbdf2090b48
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-06-12 10:41:11 +00:00
Qt Submodule Update Bot
7b36e44d7a Update submodules on '5.13' in qt5
Change-Id: Ic3abd12e65592ae218e47b96bf5e80ccf92807e3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-06-11 22:31:13 +02:00
Qt Submodule Update Bot
0d7a64fd8c Update submodules on '5.13' in qt5
Change-Id: I8a94229ad71e5ee71e77bbe27641239f6a6940dc
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-06-10 22:30:57 +02:00
Qt Submodule Update Bot
67ba0e70a1 Update submodules on '5.13.0' in qt5
Change-Id: I499cced655cbac696eb8343c1f01bdf00c7dcc9c
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-06-10 11:56:07 +00:00
Qt Submodule Update Bot
bb18b48251 Update submodules on '5.13' in qt5
Change-Id: I07ecded02a10f0d0849de89e36569e88c2d0cf8d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-06-09 22:30:57 +02:00
Qt Submodule Update Bot
f4bbadba41 Update submodules on '5.13' in qt5
Change-Id: I4dae0c7ec72588d61f479074307bbe9515aeb895
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-06-08 22:31:05 +02:00
Qt Submodule Update Bot
14adbe74dd Update submodules on '5.13' in qt5
Change-Id: Id5b714f25384e8b6db9d314d63344440fa459b17
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-06-07 22:31:13 +02:00
Qt Submodule Update Bot
5bba104a41 Update submodules on '5.13' in qt5
Change-Id: I7bb7197fced3470b41e8d2b77f0af4617607ce97
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-06-06 22:31:14 +02:00
Jędrzej Nowacki
2e5b5cc075 Update cmake sha1 for Windows
It amends a6d159c9e7. Seems that I
computed sha1 for a wrong file.

Change-Id: Ie524b2c825189a91cd6b809ff7991af20bd301b1
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2019-06-06 13:54:00 +00:00
Qt Submodule Update Bot
50bd689155 Update submodules on '5.13.0' in qt5
Change-Id: I093500e5ebc9e53766233919eaf66dd223529300
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-06-06 11:39:44 +00:00
Jędrzej Nowacki
a6d159c9e7 Bump cmake to 3.15-rc1 on Windows
Same as for the recent Linux and macOS change.

Change-Id: Ic7ae30333f8cd58925f697c19ca046ceac49cd32
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-06-06 07:56:27 +00:00
Jędrzej Nowacki
7df4f93cb1 Fix provisioning of cmake on macOS
The script contains a bit of data duplication, one of the fields was
not updated.

This amends 463235a0bc.

Change-Id: Idb9e88eba1f1415a0ca29f2c3a003c8a844bb024
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2019-06-06 07:39:02 +00:00
Jędrzej Nowacki
36d634a7dd Fix paths when installing cmake on macOS
This ammends d44a7a5f14.

Change-Id: I8e8644a1f8677e6e62fb6356cc6c3533ec40e454
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2019-06-06 07:38:52 +00:00
Simon Hausmann
716cb8185a Fix path to cmake installation script
Amends commit d44a7a5f14

Change-Id: I52926a8e8c488beaeb70c9bf0222c7caa0ccfe9c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-06-06 06:58:55 +00:00
Qt Submodule Update Bot
220097d10c Update submodules on '5.13' in qt5
Change-Id: Iad275ca3305f834c0ff484df8c6469931fbcb3d1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-06-05 22:31:55 +02:00
Simon Hausmann
463235a0bc Bump cmake to 3.15-rc1
Same as for the recent Linux change.

Change-Id: I073411bcfa8cbd692a7770cdaad3a368c6f7108d
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2019-06-05 12:54:18 +00:00
Simon Hausmann
d44a7a5f14 Install cmake from binaries instead of from source
The from-source installation originates from a point in time where there
was no cmake release with binaries that were sufficient. That is not the
case with 3.15-rc1.

Change-Id: I385016969f21c194b25334e3af8af7283fc5873f
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2019-06-05 12:47:18 +00:00
Heikki Halmet
a05bd71ede Disable MySQL from packaging builds
We can't link against 3rd party GPL libraries

Task-number: QTBUG-76081
Change-Id: Ia78c58b14349078259488eafb592c2f70dbf7241
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-06-05 13:25:23 +03:00
Qt Submodule Update Bot
81f478b533 Update submodules on '5.13.0' in qt5
Change-Id: Ib895ddc3b6d81039e6661864d03f1c586a78dbba
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-06-05 11:55:31 +00:00
Jean-Michaël Celerier
086439b018 Upgrade CMake to 3.15.0-rc1
Change-Id: I374631637a6521621dfa702aa2390998ef124d24
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-06-05 09:21:01 +00:00
Qt Submodule Update Bot
c15485df43 Update submodules on '5.13.0' in qt5
Change-Id: Ie903e4f8177b324ec981a1d57e7c2e0b4f76d585
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-06-03 10:59:12 +00:00
Ryan Chu
84ff024609 Revert "Provisioning: disable docker test servers on Windows 10 (x86_64)"
This reverts commit 577d01e9df.

Reason for revert: force vmx instructions to Coin level B virtual machine

Change-Id: I54a97fb6dc96315768c8047d487f1ed354ab4aac
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-05-31 07:30:23 +00:00
Qt Submodule Update Bot
02404b0cec Update submodules on '5.13.0' in qt5
Change-Id: Idc487281a4293ad8cc5ad494b79fd941efc820ce
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-05-31 04:08:58 +00:00
Liang Qi
dae67b28ab Update submodules on 'dev' in qt5
Skip qtbase in this round.

Change-Id: Id1f988ef49bc35a1d230480af14fc90d4efa86b8
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-05-28 22:15:01 +02:00
Qt Submodule Update Bot
f22f1007f4 Update submodules on '5.13.0' in qt5
Change-Id: I1d1d7dd6d259b26f0c0216efd1976ac79b500e78
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-05-27 06:08:44 +00:00
Liang Qi
5d3976765c Update submodules on 'dev' in qt5
Skip qtbase in this round.

Change-Id: Icc5ee34380c08b8365128c4f2e18240c6d50a90c
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-05-26 20:49:48 +02:00
Heikki Halmet
247b429c3c Install prebuilded OpenSSL 1.1.1b for Windows 7
Change-Id: Ie1ec2d6aaeea8432a654741ed7969cc66c3da7f5
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-05-26 08:14:11 +03:00
Heikki Halmet
ebcfcbe69a Add Android x86_64 architecture
Task-number: QTBUG-47672
Change-Id: If5044e601ceedcd47a1ab9299f6a8e5721314ecc
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-05-25 08:47:52 +03:00
Liang Qi
aabcc8128c Provisioning: Add ninja to the list of installed packages
Change-Id: I018e7812fc95c1db841720294a700a391246251d
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2019-05-24 09:58:03 +00:00
Jędrzej Nowacki
79bc4f0771 Move some configure arguments to qtbase instructions
These arguments are specific to the build and changes to them are _not_
affecting configuration.

Change-Id: I701b7d83511c5f80b88c5aab09eae3ecb6df74a1
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-05-22 15:35:44 +00:00
Juha Karjalainen
3e838f2a34 Provisioning: Change openssl version to 1.1.1b
Use newest LTS version of openssl as support for 1.0.2 series
will end at end of 2019.

For windows 7 x86 openssl 1.0.2 will be used until all need fixed
are made to submodule tests

Task-number: QTQAINFRA-2327
Change-Id: I930d239cd139b6202ebdfb5cdc8068ff2ad0b8a3
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-05-22 15:34:04 +03:00
Qt Submodule Update Bot
b7c0e2db78 Update submodules on '5.13.0' in qt5
Change-Id: I51a93793234d86494580ec6a9d53b7cd414c888b
Reviewed-by: Katja Marttila <katja.marttila@qt.io>
2019-05-23 04:17:14 +00:00
Liang Qi
47225925c5 Update submodules on 'dev' in qt5
Skip qtbase in this round.

Change-Id: I3434ffc21f21f953f0538e86e0d554ae5e82b331
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-05-22 14:01:42 +02:00
Liang Qi
20e8121c77 Use yaml configuration file for cmake support
It is needed by new coin to support cmake build as only
there configuration arguments are separated from features.

Change-Id: I960ec693f80803fd86de472efc953a38358ae14e
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2019-05-20 12:37:44 +00:00
Allan Sandfeld Jensen
edc39be08b Fix qtdeclarative boot2qt CI config
DISTRO_OPTS was missing quotes.

The same thing is also done in 3e6a04c09d.

Change-Id: Ibb237b791fedea4edde2ca0ef152553502462129
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
(cherry picked from commit 04fa1bf4ef)
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-05-16 10:42:41 +00:00
Frederik Gladhorn
5677a43a25 Remove platforms from Qt 6
Get to a smaller set to reduce load on the CI and have faster
turnaround times while developing. Remove some older compilers
that do not support the minimum C++ feature set we want to require
for Qt 6.

We'll need to revisit and probably expand this set when we get closer
to releasing Qt 6.

Change-Id: I6afba8b3caca0fac5bbf80efdcde7714b8d1ab76
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-05-16 08:33:58 +00:00
Juha Karjalainen
230a73409a Provision sed for windows 10
Sed is needed by webassembly build. Cannot use sed from msys as
having msys bin folder in path breaks webassembly build.

Task-number: QTQAINFRA-2835
Change-Id: I6ad06f0a952a0d8bc5d21e62f8c2cef70f40c618
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-05-16 04:14:35 +00:00
Ulf Hermann
3e6a04c09d qtdeclarative platform config: Add missing quotes
Change-Id: Ib8c0a2aad21718dba25728d3ac869c23f314554a
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-05-16 04:14:30 +00:00
Qt Submodule Update Bot
991500dc85 Update submodules on '5.13.0' in qt5
Change-Id: Ibb7ad97a0fb6cbc2d7d8d77d0fd115c1d602ee07
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-05-16 04:14:23 +00:00
Liang Qi
2e028e620d Bring qt3d back
Task-number: QTBUG-75384
Change-Id: Ia7cf50e3567bf01cce9dcc167253d76cdd963d4d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-05-13 14:20:06 +00:00
Qt Submodule Update Bot
e6c0dc1d60 Update submodules on 'dev' in qt5
Change-Id: I370770bdc8179075f4e5e01e54a29591fd7caa16
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-05-13 05:30:49 +00:00
Liang Qi
faf54c4cec Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I3eb42ce8a43418919c9bb8d0ac4d3714aea94fac
2019-05-12 20:36:18 +02:00
Qt Submodule Update Bot
7d1d1aa2d2 Update submodules on '5.13' in qt5
Change-Id: I0e6e46b247198ce68668222e555e3ebf256729bc
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-05-12 15:51:20 +00:00
Liang Qi
6fbaba5d52 Merge remote-tracking branch 'origin/5.13.0' into 5.13
Change-Id: Ib80ac156ec8ce5690d5ec784c671bd706afe0b4e
2019-05-12 11:12:36 +02:00
Aapo Keskimolo
9c49284978 Remove redundant windows configuration
The windows configuration was added by commit

 8cdf60fe64

which was unintended and caused breakages due to wrong library paths.

Regression was introduced by 65d4cea3ac12a5d585da7ee1ba2933a3c23051b8 which
allowed sharing storage paths with builds with different configure arguments.

Change-Id: I18d12c4ff86a5bb28484c7b39ca38ff4f6f590d8
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-05-12 07:29:17 +00:00
Qt Submodule Update Bot
494d10fb73 Update submodules on '5.13' in qt5
Change-Id: Ieb925882ea0c8b536bde7f9a1d63aecdf6213632
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-05-09 20:44:40 +00:00
Liang Qi
192372bb56 Update submodules on 'dev' in qt5
Change-Id: I085f25a148ddc404f399e79924968acfd6b7de07
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-05-09 19:50:49 +00:00
Liang Qi
f557e0634f Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: Ie76cb93e16a98f3b2aae0e6785ccca539e5c5f2e
2019-05-09 15:27:08 +02:00
Liang Qi
a66a54035c Update submodules on 'dev' in qt5
Temporarily ignore qt3d until it got fixed correctly.

Task-number: QTBUG-75384
Change-Id: Ib9aec0681b9ca1660f47216e0057600ba4736ce8
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-05-09 12:57:41 +00:00
Liang Qi
0a1e27b33e Merge remote-tracking branch 'origin/5.13.0' into 5.13
Change-Id: Ibab4a9d55ce371259f52edb1819a397c1f2d7d9e
2019-05-09 12:04:02 +02:00
Liang Qi
073dfc6457 Update submodules on 'wip/cmake' in qt5
Change-Id: I437150950324ad3734ad895b6cbc4ad7bf6139a1
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2019-05-08 14:19:22 +00:00
Tony Sarajärvi
8cdf60fe64 Split features list between Coin and qt
Start using configure args as configure string instead of flags.

Task-number: QTQAINFRA-2744
Change-Id: I2ce189531df7ba805d18b36615259bf0303e7175
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-05-08 09:18:56 +00:00
Qt Submodule Update Bot
819362c5d6 Update submodules on '5.13.0' in qt5
Change-Id: I6e14f7f3fedc1ce69e3cedaf8a5b2251d12fae45
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-05-08 06:47:41 +00:00
Liang Qi
8f63da629a Merge remote-tracking branch 'origin/5.13' into 5.13.0
Change-Id: If2321aae395ea99c0fb4cf4ef7b3c5a580d3357e
2019-05-07 14:58:36 +02:00
Tony Sarajärvi
049eb21a1d Replace RHEL 7.4 with 7.6 in the CI
Task-number: QTQAINFRA-2942
Change-Id: I4186a2961ce81eed7a7fd8994c4a10f35b8fad1c
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-05-07 07:15:58 +00:00
Qt Submodule Update Bot
c6b018a925 Update submodules on '5.13' in qt5
Change-Id: Ib948b49eccead6649f228a3d7acc83a2f6522660
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-05-06 06:56:28 +00:00
Liang Qi
aeea2c8425 Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Ia93633ae4ef9677ede751467a70e8f91799829a2
2019-05-04 11:04:32 +02:00
Qt Submodule Update Bot
4c4595b93b Update submodules on '5.13.0' in qt5
Change-Id: I637151d097b4f311f86004c2eb26f8a1d8b80ef0
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-05-03 09:15:06 +00:00
Liang Qi
21604cf7da Provisioning: install vcpkg and some packages on Windows 10
Change-Id: Ib8ba5b30ebcfb5e66ce5de65c9287807943d7166
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2019-05-03 08:37:10 +00:00
Liang Qi
4c655a140b Provisioning: install latest cmake - 3.14.1 on Windows
Change-Id: I461589be02c26e048d5975d59600376022d728fd
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2019-05-03 08:37:05 +00:00
Liang Qi
ad2f91e414 Provisioning: Add Windows 10+MSVC2017 to test cmake build
Change-Id: I7acd16f12ed0e5d0fb7a9961c9099b9e4f1a2401
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2019-05-03 08:37:02 +00:00
Liang Qi
cb860d794d Provisioning: Add freetype to the list of installed packages on macOS
Change-Id: Ic2df763fc027e3a588723a37a70354d3becc29a6
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2019-05-03 08:36:57 +00:00
Liang Qi
705696e1d1 Provisioning: Add pcre2 to the list of installed packages
This external dependency is now required by QtCore on macOS.

Change-Id: I4eef98e8e54f00861c1e9469dfbac61979d652e8
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2019-05-03 08:36:45 +00:00
Liang Qi
8b0a10d1c1 Provisioning: build cmake from source on macOS 10.13
Change-Id: Ifada0cf62d1e75e8cab3e3bbe6250718747d0703
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2019-05-03 08:36:42 +00:00
Liang Qi
05eaaeda4b Add macOS 10.13 to test cmake build
Change-Id: I676db571d3a14f2abd823d41905b95a070c66f59
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2019-05-03 08:36:38 +00:00
Liang Qi
e57569e70c Update submodules on 'wip/cmake' in qt5
Only needed for qtbase though.

Change-Id: Ib3fdd44c2804139795fc1efc192e05d227f8b8dc
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2019-05-03 08:36:27 +00:00
Liang Qi
ff8220f9f6 Merge remote-tracking branch 'origin/dev' into wip/cmake
Conflicts:
	.gitmodules
	coin/platform_configs/default.txt
	coin/platform_configs/qt5.txt
	coin/platform_configs/qtbase.txt

Change-Id: Ib25154566eb6da77f091d8f112cc1248cac9eb16
2019-05-03 10:10:23 +02:00
Qt Submodule Update Bot
c2506b0f9c Update submodules on '5.13' in qt5
Change-Id: I99a2129b1f73fc1dd801b406b9741cdfea37429e
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-05-03 07:32:05 +00:00
Juha Karjalainen
6465c42122 Provisioning: install msys2
Windows need msys2 perl for configuring openssl 1.1.1 for android.

Task-number: QTQAINFRA-2327
Change-Id: I217542b6e9b3fd0f656b8186e2cde4283257dcf8
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-05-03 07:30:44 +00:00
Qt Submodule Update Bot
ea052ceb0a Update submodules on '5.13' in qt5
Change-Id: I4f9b2ff00e79cf16a9effd6bdffa679a7f25b50b
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-05-02 09:04:01 +00:00
Qt Submodule Update Bot
d27f9e9b88 Update submodules on '5.12' in qt5
Change-Id: If055179b9dfbc4af842c4972cabb79c2966d57d8
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-04-30 18:44:54 +00:00
Kari Oikarinen
b692cf823a Adjust submodule branches
Change-Id: I8efc4803c92a42e67add0646be00c0d6571fb9e2
2019-04-29 11:48:19 +03:00
Liang Qi
22bb88ed07 Update submodules on '5.12' in qt5
Change-Id: I69ecf3e1a1f7b5dbdc6e86478475f9563854dac6
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-04-26 05:46:36 +00:00
Liang Qi
ffe0c11420 Merge "Merge remote-tracking branch 'origin/5.12.3' into 5.12" into refs/staging/5.12 2019-04-26 05:46:30 +00:00
Liang Qi
6dd08088fc Merge remote-tracking branch 'origin/5.12.3' into 5.12
Change-Id: Ib5cb484726a93f7b317e1dd8e74b446e6673cdbd
2019-04-25 16:05:59 +02:00
Simo Fält
09f28e9e1d Provisioning: Install python36-devel to rhel 7.4
The rhel Python3 system package is missing development libs.

Fixes: PYSIDE-996
Change-Id: I3863c85ad04021dd0f0d4af4bae5917a6785a7e1
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-04-25 12:58:28 +00:00
Heikki Halmet
65cf2cb957 Provisioning: Install Vulkan to Rhel 7.4
Enables Vulkan support at compile time

Task-number: QTBUG-72763
Change-Id: If97adb030d50a147c9714afe3ef360291904b58a
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-04-25 09:29:05 +00:00
Qt Submodule Update Bot
766fc425e3 Update submodules on '5.12' in qt5
Change-Id: I2c02e38847615cace282fa261ac5ac526eb6ece2
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-04-24 16:37:45 +00:00
Heikki Halmet
5db0ce74b7 Provisioning: Update QNX 7.0 packages
Updated packages includes QNX Multimedia Suite 2.0,
which enables building QtMultimedia QNX plugins

Task-number: QTBUG-71073
Change-Id: Iaf7cabfe1dc59441abb978c261590c41f7aa0cdc
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2019-04-24 13:27:06 +03:00
Qt Submodule Update Bot
a4e4c13f01 Update submodules on '5.13' in qt5
Change-Id: I43c1b4dac692f6c93702d05d3ee2a2ec224b2736
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-05-28 21:59:04 +02:00
Liang Qi
9d3f29dc03 Merge "Merge remote-tracking branch 'origin/5.13.0' into 5.13" 2019-05-27 15:18:06 +02:00
Liang Qi
7ef9985e4e Merge remote-tracking branch 'origin/5.13.0' into 5.13
Change-Id: I56973a90b028a77c3692f790648b605622af4af6
2019-05-27 15:18:06 +02:00
Qt Submodule Update Bot
a0291fde84 Update submodules on '5.13' in qt5
Change-Id: I5b52a5c17a612ba62948c01696e71c88bd84e85c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-05-24 16:22:05 +02:00
Qt Submodule Update Bot
3e6f5b1486 Update submodules on '5.13' in qt5
Change-Id: Icc5ec39c45931aec77ca5287c14d08902ec6c551
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-05-21 13:48:00 +02:00
Allan Sandfeld Jensen
04fa1bf4ef Fix qtdeclarative boot2qt CI config
DISTRO_OPTS was missing quotes.

Change-Id: Iffcfce8e34f95b5a0c0f0309b26291b31b12a7dc
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
2019-05-13 18:20:59 +00:00
Heikki Halmet
dbaa42baa7 Provisioning: Use ANDROID_NDK_ROOT instead of ANDROID_NDK_HOME
Without this binaries will be hardcoded to look in e.g
/opt/android/android-ndk-r19b which means that RTA tests will fail

Task-number: QTBUG-74952
Change-Id: Ic2b1297e15d905f2250333b6bc884abe2f1472d4
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-04-23 06:04:34 +00:00
Qt Submodule Update Bot
12cde4e0da Update submodules on '5.12' in qt5
Change-Id: I2fa664d7b94bf511d4321e0698aba679ccb38ad0
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-04-23 04:06:25 +00:00
Heikki Halmet
91ab567a64 Provisioning: Upgrade PyYAML because of possible security vulnerability
Known high severity security vulnerability in pyyaml v< 4.2b1

Task-number: QTQAINFRA-2888
Change-Id: I6522fc66ca7c4323cc6248ec2cb31c62201f8e84
Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-04-18 14:35:52 +03:00
Tony Sarajärvi
d494d76c26 Add a no-opengl build on Ubuntu 18.04
Task-number: QTQAINFRA-2577
Change-Id: I815adf0f85f688d9d584b95122d1944cb4b660c1
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-06-26 10:14:17 +03:00
Tony Sarajärvi
670aa09aba Provisioning: Fix cleanup when building GCC from sources
We need sudo rights to delete the temporary folder
where sources for GCC are extracted.

Change-Id: Ic0642e44eabfc3449f7ce5903a63bd38924f7dca
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-05-16 13:45:06 +03:00
Qt Submodule Update Bot
2fd2a20f18 Update submodules on '5.12' in qt5
Change-Id: I5476ca1d214e18ba91b313f9a742d31fc9e04fe7
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-06-26 09:24:40 +02:00
Qt Submodule Update Bot
c06ab02f33 Update submodules on '5.12' in qt5
Change-Id: I961e20f994ffcbc97b822f53069cc3bd5a399345
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-06-25 10:30:36 +02:00
Oliver Wolff
0c339c29d6 platform_configs: Add missing "Configure arguments" to qtconnectivity.txt
Without the tag configure arguments will not be parsed by Coin so that
wrong configurations will be used.

Change-Id: I02f84cde07e9e4cf878add89ba9ba43dacf9d567
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-06-25 10:29:17 +02:00
Liang Qi
dc4790e751 Merge "Merge remote-tracking branch 'origin/5.12.4' into 5.12" 2019-06-25 10:29:08 +02:00
Liang Qi
34a13ff5d9 Merge remote-tracking branch 'origin/5.12.4' into 5.12
Conflicts:
	coin/platform_configs/default.txt
	coin/platform_configs/qt5.txt

Done-With: Tony Sarajärvi <tony.sarajarvi@qt.io>
Change-Id: I1381c4b80a64859cb42d6cb5205ef549de40dde6
2019-06-25 10:29:08 +02:00
Qt Submodule Update Bot
4048c76e65 Update submodules on '5.12' in qt5
Change-Id: Idb8c2824d7d6d7359b0845fcb200d1331029cec9
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-06-21 10:16:38 +02:00
Qt Submodule Update Bot
6361946518 Update submodules on '5.12' in qt5
Change-Id: I3b189f1cfbf6898e35b91eb821485f3b9eeb678b
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-06-19 10:31:09 +02:00
Qt Submodule Update Bot
bb8b7c5140 Update submodules on '5.12' in qt5
Change-Id: I673d342cd906782d8444eebcb8e16ad6cec827f0
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-06-18 13:23:09 +02:00
Liang Qi
452e0d94d4 Update submodules on '5.12' in qt5
Ignore qtvirtualkeyboard temporarily.

Task-number: QTBUG-76371
Change-Id: I6d62f0f60b30044baaef092cbd8066bbca8d0df7
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-06-18 10:36:33 +02:00
Antti Kokko
6e350aff34 ogl-runtime: instead of linking to qt5.txt use the actual configuration
Change-Id: I1b1d467f2c67026fc8039b7346ea8ca02250ba1c
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-06-12 15:15:32 +03:00
Qt Submodule Update Bot
e926f95049 Update submodules on '5.12.4' in qt5
Change-Id: I2b8b3fc60e242872f1cfb850c6219a72b39d471a
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-06-13 03:10:05 +00:00
Heikki Halmet
d87d4e0219 Disable MySQL from packaging builds
We can't link against 3rd party GPL libraries

Task-number: QTBUG-76081
Change-Id: Ia78c58b14349078259488eafb592c2f70dbf7241
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit a05bd71ede)

Change-Id: I97d1d06b266490080325126e2dd715436a91b01a
Reviewed-by: Simo Fält <simo.falt@qt.io>
2019-06-13 05:52:55 +00:00
Heikki Halmet
de41591477 Fix openssl 1.1 library configurations
Change-Id: Idcb919e5f388b509e4215cf5515c8716490d5872
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2019-06-13 08:29:02 +03:00
Qt Submodule Update Bot
0e454d2a14 Update submodules on '5.12.4' in qt5
Change-Id: Id04721e958f15621a0a5b35aa0d44dc2d7238549
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-06-11 04:05:34 +00:00
Jani Heikkinen
01c38dfad8 Use link to qt5.txt instead of copy in qt3d-runtime.txt
Change-Id: If61fe724af869fb35637321311bfb052d3009956
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
 
(cherry picked from commit c5e443374a)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-06-09 17:18:19 +03:00
Antti Kokko
1db94fc9ef Add platform configuration file for ogl-runtime repository
Use configuration from qt5.txt.

Change-Id: Ic788b70545169ee1fce5a97f016882cacd4a7908
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-06-10 11:49:11 +03:00
Qt Submodule Update Bot
fb534d1b44 Update submodules on '5.12.4' in qt5
Change-Id: Ic0a4f9340c23cc8a7b502870e690d1fccb54425f
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-06-10 10:19:00 +03:00
Heikki Halmet
acff1703e4 Install prebuilded OpenSSL 1.1.1b for Windows 7
Change-Id: Ie1ec2d6aaeea8432a654741ed7969cc66c3da7f5
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 247b429c3c)
2019-06-10 10:19:00 +03:00
Juha Karjalainen
c8deeb3d05 Provision sed for windows 10
Sed is needed by webassembly build. Cannot use sed from msys as
having msys bin folder in path breaks webassembly build.

Task-number: QTQAINFRA-2835
Change-Id: I6ad06f0a952a0d8bc5d21e62f8c2cef70f40c618
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 230a73409a)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-06-10 10:19:00 +03:00
Juha Karjalainen
b9e92adf59 Provisioning: install msys2
Windows need msys2 perl for configuring openssl 1.1.1 for android.

Task-number: QTQAINFRA-2327
Change-Id: I217542b6e9b3fd0f656b8186e2cde4283257dcf8
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 6465c42122)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-06-10 10:06:56 +00:00
Juha Karjalainen
31f5c48a80 Provisioning: Change openssl version to 1.1.1b
Use newest LTS version of openssl as support for 1.0.2 series
will end at end of 2019.

For windows 7 x86 openssl 1.0.2 will be used until all need fixed
are made to submodule tests

Task-number: QTQAINFRA-2327
Change-Id: I930d239cd139b6202ebdfb5cdc8068ff2ad0b8a3
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 3e838f2a34)
2019-06-10 10:07:20 +00:00
Tony Sarajärvi
5fd662b550 Fix platform configuration files
Typos, duplicate entries and one missing rebase ended up
in the initial cherry-pick from 5.13

Change-Id: Ibf0fdb8cbc62f8223a0ede89ad4c013ceb7d145e
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 
 
(cherry picked from commit d77fdecc11)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-06-10 10:16:58 +03:00
Tony Sarajärvi
6c6c6ca1a5 Split features list between Coin and qt
Start using configure args as configure string instead of flags.

Task-number: QTQAINFRA-2744
Change-Id: I2ce189531df7ba805d18b36615259bf0303e7175
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 8cdf60fe64)
(cherry picked from commit d49c0cd0bb)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-06-10 10:16:52 +03:00
Tuomas Heimonen
1cf289d182 Remove tests from Saferenderer static build
Task-number: QSR-458

Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>

(cherry picked from commit 3cc1c40ff5)
Change-Id: I076add99b15bfdcde903af6d94913f28c46632ee
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-06-10 17:25:13 +00:00
Heikki Halmet
a2b1dd2d0a Provisioning: Use ANDROID_NDK_ROOT instead of ANDROID_NDK_HOME
Without this binaries will be hardcoded to look in e.g
/opt/android/android-ndk-r19b which means that RTA tests will fail

Task-number: QTBUG-74952
Change-Id: Ic2b1297e15d905f2250333b6bc884abe2f1472d4
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit dbaa42baa7)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-06-10 10:14:57 +03:00
Heikki Halmet
608788de2d Provisioning: Update Android NDK to version r19
Also let's start using 64-bit Android NDK for Windows

Task-number: QTQAINFRA-2568
Change-Id: I2d757aa9e43abf5118abad7bf644e17e88a2ca94
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit c09135cb56)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-06-10 10:14:57 +03:00
Qt Submodule Update Bot
b611da5b35 Update submodules on '5.12' in qt5
Change-Id: Ibd78f70d7795b3927093d1f7de3cb59db2693cac
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-06-05 23:31:03 +02:00
Tony Sarajärvi
d77fdecc11 Fix platform configuration files
Typos, duplicate entries and one missing rebase ended up
in the initial cherry-pick from 5.13

Change-Id: Ibf0fdb8cbc62f8223a0ede89ad4c013ceb7d145e
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-06-04 11:10:57 +03:00
Liang Qi
b825df16f2 Update submodules on '5.12' in qt5
Skip qtbase in this round.

Change-Id: Ibe33457533596f164b2d6342329378604e845720
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-06-03 08:38:33 +02:00
Tony Sarajärvi
d49c0cd0bb Split features list between Coin and qt
Start using configure args as configure string instead of flags.

Task-number: QTQAINFRA-2744
Change-Id: I2ce189531df7ba805d18b36615259bf0303e7175
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 8cdf60fe64)
2019-05-29 15:09:40 +03:00
Tony Sarajärvi
f70bdd89b1 Update GCC version to 9.1.0 in Ubuntu 18.04
Task-number: QTQAINFRA-2958
Change-Id: I3ea8c8e467b9a1f56c2b114c40fb94dfdc1448d0
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-05-31 11:30:45 +03:00
Qt Submodule Update Bot
849df311b1 Update submodules on '5.12.4' in qt5
Change-Id: I73e3a64a4f9b0255c6e82ba638bf1f783e9867db
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-05-27 16:39:39 +02:00
Frederik Gladhorn
1e290229e4 Adjust submodule branches 2019-05-21 19:42:01 +02:00
Tuomas Heimonen
25349a29f7 Remove examples from Saferenderer static Windows build
Task-number: QSR-458
Change-Id: I3f0ba66590683ea221ccd207026602b3b89ee3a9
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
2019-05-21 09:59:12 +03:00
Simo Fält
da9aac698d Provisioning: Install virtualenv to Ubuntu 18.04
The python3-virtualenv package is missing the actual virtualenv
executable. python3-virtualenv will get installed as dependency.

Change-Id: If474831e8f46ac5dcd7e1028c97c7322c5e41b9d
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-05-16 10:13:58 +03:00
Jani Heikkinen
c5e443374a Use link to qt5.txt instead of copy in qt3d-runtime.txt
Change-Id: If61fe724af869fb35637321311bfb052d3009956
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2019-05-08 12:53:18 +03:00
Tuomas Heimonen
3cc1c40ff5 Remove tests from Saferenderer static build
Task-number: QSR-458
Change-Id: I076add99b15bfdcde903af6d94913f28c46632ee
Reviewed-by: Teemu Holappa <teemu.holappa@qt.io>
2019-05-27 09:12:34 +00:00
Tony Sarajärvi
8d8b7d796f Enable a no-gui build on Ubuntu 18.04
Task-number: QTQAINFRA-2576
Change-Id: Iafdecb0571779077b722bde7521da681f00f6f60
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Rolf Eike Beer <eb@emlix.com>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-05-27 10:31:13 +03:00
Qt Submodule Update Bot
1f80c520df Update submodules on '5.12' in qt5
Change-Id: I6a580364ce78fdb792eab228d4ace789fb6e5c25
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-05-24 15:42:57 +02:00
Qt Submodule Update Bot
3897888655 Update submodules on '5.12' in qt5
Change-Id: Ib9074112780183225f5620edb3d02fa60f3af4c9
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-05-21 18:01:32 +02:00
Heikki Halmet
7e0fe78315 Add static build for Saferenderer
Task-number: COIN-229
Change-Id: I1808dbcf53a4e070167b485404c8cf9747dc04f5
Reviewed-by: Tuomas Heimonen <tuomas.heimonen@qt.io>
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
2019-05-03 14:18:33 +03:00
Akseli Salovaara
56134fd7f6 Remove Packaging feature flag from UWP 2015 x86 integrations
UWP 2015 x86 binaries are not published anymore. Speed-up export
tool and reduce exported data disk space consumption by removing
Packaging feature flag from UWP 2015 x86 configurations.

Task-number: QTBUG-73544
Change-Id: Iad2016b6e6aec1787c7bbf31c6ef6f71db905c21
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-05-17 09:10:32 +00:00
Juha Karjalainen
94d140b746 Log more version information on macOS provisioning
Logs more version information to make easier to reproduce build.
Logs macOS build version, homebrew installed packages and apple's
installer installed packages.

Change-Id: Ia9f2842a3fd2e8e0acf1667c7435a19c7a878aed
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-05-12 15:47:26 +00:00
Tony Sarajärvi
8f073cea69 Do DeveloperBuild for Boot2Qt
Task-number: QTBUG-63152
Change-Id: I2a0239625bf5cfa4456c64e90e647c70d4533589
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-05-12 13:02:16 +00:00
Qt Submodule Update Bot
a41e568a78 Update submodules on '5.12' in qt5
Change-Id: Ie7ea68d3f32ca9348ca7f5f7017f6e86c00b860d
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-05-08 09:33:16 +00:00
Heikki Halmet
e72a082da5 Provisioning: Remove MSVC 2015 update 3 patch from provisioning
MSVC 2015 update 3 patch seems to be already pre-provisioned with
MSVC 2015 update installation

Task-number: QTQAINFRA-2899
Change-Id: I582c47e4b54303394805f205c4becf6a74e941ec
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit b3e35cbac5)
Reviewed-by: Juha Karjalainen <juha.karjalainen@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-04-18 10:01:57 +00:00
Qt Submodule Update Bot
712d5447bf Update submodules on '5.12' in qt5
Change-Id: I01acdb8d1dc3137abb193a9ccf1dba20d6953bcb
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-04-16 21:19:06 +00:00
Qt Submodule Update Bot
3436df53cf Update submodules on '5.13' in qt5
Change-Id: I4b003f32744fbf25b6439b555a01ee130d50467e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-04-16 20:51:24 +00:00
Liang Qi
577d01e9df Provisioning: disable docker test servers on Windows 10 (x86_64)
This reverts commit 177df80f09 partially.

Change-Id: I6c091ad48397ad221090274144ac88dfa47c0e0f
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
2019-04-16 08:57:44 +00:00
Liang Qi
e10a2d4ffe Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
	.gitmodules

Change-Id: I6f34dcaedd77228215e1cfa92cd12b6334a41834
2019-04-14 23:11:30 +02:00
Liang Qi
74eab55ea8 Update submodules on 'dev' in qt5
Change-Id: Ibb626ef0429631b901bfb894935b12cad1af6a5c
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-04-14 20:26:28 +00:00
Qt Submodule Update Bot
da9243a97b Update submodules on '5.12' in qt5
Change-Id: Ie4120272ceba142d35265f2fbde316e2af8b30a9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-04-14 06:51:45 +00:00
Qt Submodule Update Bot
f2af07b8ed Update submodules on '5.13' in qt5
Change-Id: Icdc234fca978fd0f510462390b7de537485c7d25
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-04-13 20:30:54 +00:00
Qt Submodule Update Bot
085407eb93 Update submodules on '5.13' in qt5
Change-Id: I6052700191cd9ebd56e1f97fd0f7d52bdb5ef62e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-04-13 17:15:26 +00:00
Liang Qi
8710c7d9cf Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
	coin/platform_configs/qt3d-runtime.txt
	coin/platform_configs/qt5.txt
	coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh
	coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh

Change-Id: Ie428600c72b7fe4d7b5fa7583e11aebd47cfb85e
2019-04-13 11:38:39 +02:00
Qt Submodule Update Bot
869c15629d Update submodules on '5.13' in qt5
Change-Id: Ifb78bd23df6129ccb226b7e0862ebe5620353b3a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-04-13 07:32:12 +00:00
Qt Submodule Update Bot
f31970d5ac Update submodules on '5.12' in qt5
Change-Id: I79cbed7287f7b160624b77b08df04d8fd33c7907
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-04-12 17:40:23 +00:00
Qt Submodule Update Bot
bf868c7e7a Update submodules on '5.13' in qt5
Change-Id: I64ac0b2aeaaed0908aaebff7c45b486b8159e893
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-04-12 17:05:13 +00:00
Qt Submodule Update Bot
21a6541aeb Update submodules on '5.12' in qt5
Change-Id: Ibe1d38a062889777ab9d8dc5ec4d2fb46e8b4cb6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-04-11 16:03:13 +00:00
Juha Karjalainen
48443b4b9a Provisioning: update python 2.7.14 to 2.7.16
Python 2.7.14 used tlsv1 which is no longer accepted by github
thus needing update to newer version.

Task-number: QTQAINFRA-2900
Change-Id: I4e0790854b7c0732e4064ad355d953eb7b71a2b9
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-04-11 06:10:22 +00:00
Juha Karjalainen
d269710383 Change linux webasembly build from devoloper build to release build
Change-Id: Ic2481d69b69e6bc50d583adf5e1d2857abc6ec25
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-04-11 06:09:11 +00:00
Qt Submodule Update Bot
403d4e1d96 Update submodules on '5.13' in qt5
Change-Id: I1e38740b9e4f4c9570d02d5b131def095418778f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-04-11 05:48:40 +00:00
Qt Submodule Update Bot
8337e20fad Update submodules on '5.12.3' in qt5
Change-Id: I173c80b1d080350d41108aac01b8d66de0dcfb56
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-04-11 03:06:13 +00:00
Qt Submodule Update Bot
314db90904 Update submodules on '5.13' in qt5
Change-Id: I240eb1ed9c19588a40f27ca35759fc23320c235b
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-04-10 10:43:51 +00:00
Heikki Halmet
791ec923a7 Provisioning: Echo Emscripten version information to versions.txt
Change-Id: I0ad9b2299805534d1f635fd89ac74d4feb8ce5c4
Reviewed-by: Juha Karjalainen <juha.karjalainen@qt.io>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-04-10 06:06:56 +00:00
Qt Submodule Update Bot
6db224cfc7 Update submodules on '5.12' in qt5
Change-Id: If36b8642907dc68d9d53cfe01bfa91a9d25f3fff
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-04-10 06:06:53 +00:00
Heikki Halmet
b3e35cbac5 Provisioning: Remove MSVC 2015 update 3 patch from provisioning
MSVC 2015 update 3 patch seems to be already pre-provisioned with
MSVC 2015 update installation

Task-number: QTQAINFRA-2899
Change-Id: I582c47e4b54303394805f205c4becf6a74e941ec
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-04-09 09:17:20 +00:00
Qt Submodule Update Bot
261cc1bd8f Update submodules on '5.12' in qt5
Change-Id: I0e3a8b053ca414cff6e066f24514727b25e444bf
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-04-09 03:39:42 +00:00
Ivan Donchevskii
338fce191a Provisioning: Install i686 mingw on Windows 10 X64
Required to compile 32-bit binaries.

Fixes: QTQAINFRA-2896
Change-Id: I91a43ecf6e2c97886429c34c79591999b908879f
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-04-08 06:36:50 +00:00
Alex Blasche
16201ab31d Deprecate QtXmlPattern module
Change-Id: Iec4561cd6ae38b8133d4f0ddaf5ed0ecb03d4304
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2019-04-08 06:28:02 +00:00
Qt Submodule Update Bot
7ff76b89dd Update submodules on '5.12.3' in qt5
Change-Id: I216b93959076bc9402c715599398dea770cacde2
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-04-05 11:29:29 +00:00
Heikki Halmet
c654e63c87 Update Windows 10, MSVC 2015 and MSVC 2017
Windows 10 updated to build 1809
msvc2015 update 3 14.0.25431.01
msvc2015 update 3 (KB3165756)
msvc2017 5.18.2 4.7.03056

ms-zune is no longer available in the latest
Windows 10 version

dotnet and msvc 2015 update patch installation
moved to pre-provisioning. Msvc 2015 update patch installation
seems to be flaky with this windows version.

Task-number: QTBUG-68190
Task-number: QTQAINFRA-2255
Task-number: QTBUG-71125
Change-Id: I87defffa488cb75f7de0909020073b35476bea80
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-04-05 05:04:34 +00:00
Liang Qi
8630f18d1e Only update qtwebengine in this round
Change-Id: Ic8a307e2a3dd774adf6484894531b9a177bec58f
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-04-05 05:04:27 +00:00
Tony Sarajärvi
b2afcc8405 Fix shellcheck complaints from provisioning scripts
Change-Id: I8d1ee4241d7e99269e8c717ceb2aecde3194c51a
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-04-01 15:16:59 +00:00
Tony Sarajärvi
f678ae3769 Fix soft links and file modes of a few macOS provisioning scripts
Change-Id: I1d4d09424aa2ce0b75d840a2c26cbfed99740d0c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-04-01 15:16:52 +00:00
Heikki Halmet
c09135cb56 Provisioning: Update Android NDK to version r19
Also let's start using 64-bit Android NDK for Windows

Task-number: QTQAINFRA-2568
Change-Id: I2d757aa9e43abf5118abad7bf644e17e88a2ca94
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-04-01 11:42:49 +00:00
Qt Submodule Update Bot
2f59bd5fbe Update submodules on 'dev' in qt5
Change-Id: I619cf4f0168d08cb2e94b23db557d9a53f9e5338
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-31 07:59:08 +00:00
Qt Submodule Update Bot
d0d7ade759 Update submodules on '5.12.3' in qt5
Change-Id: I34e1bd8f276b6e9eb2a1f658f2447fdd01fd4d09
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-30 20:26:00 +00:00
Qt Submodule Update Bot
b9da3a4bda Update submodules on 'dev' in qt5
Change-Id: I393b5619168e820b3ffbcf7263c47c93abb81aa9
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-30 14:05:17 +00:00
Qt Submodule Update Bot
7eeee0df43 Update submodules on '5.13' in qt5
Change-Id: I81587903b3fdf6d68c3e91d0c6d21c591e2746a3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-29 21:05:29 +00:00
Qt Submodule Update Bot
b9e40e2fd7 Update submodules on '5.12' in qt5
Change-Id: I2df7f448e6f121039e343b3dd87d7fbbcbef25fd
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-28 19:35:06 +00:00
Qt Submodule Update Bot
35b489b1bd Update submodules on '5.12' in qt5
Change-Id: I7e7a49b60f4082d177c59dd3ccdd752fc4e3c5ca
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-27 20:11:53 +00:00
Kari Oikarinen
84aaf6871c Adjust submodule branches
Change-Id: I28500be5d253a4d047cef1409659c275c314d5b0
2019-03-25 10:07:35 +02:00
Qt Submodule Update Bot
4f268edc88 Update submodules on 'dev' in qt5
Change-Id: I799f3265c9b6d28de248fc55685b77ea26039816
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-24 18:01:13 +00:00
Qt Submodule Update Bot
4d427ae04f Update submodules on 'dev' in qt5
Change-Id: Ib8090cd0a47e284dc7197cf4614d63d2e2e127a9
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-23 19:07:16 +00:00
Qt Submodule Update Bot
eb3c52455c Update submodules on '5.13' in qt5
Change-Id: I2a21f0c7eabe7697691bbe330fd0c74058997bb1
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-23 08:32:55 +00:00
Qt Submodule Update Bot
b02d849d76 Update submodules on '5.12' in qt5
Change-Id: I944abf1de570b68229ba2284e93e879aadc21b2d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-23 08:32:42 +00:00
Tony Sarajärvi
665703efc9 Remove 32bit MSVC 2015 from the CI
Task-number: QTQAINFRA-2251
Change-Id: I4006c7390759e2eb357309de36eb23af007a576e
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
2019-03-23 08:32:35 +00:00
Juha Karjalainen
a97d669a20 Provisioning: Remove certificate printing to log
macOS openssl provisioning printed certificates to log. This patch
prevent printing certificates to log by redirecting it to /dev/null

Task-number: QTQAINFRA-2841
Change-Id: I9ec120212a1f068fa040a302cb50e775857cbb74
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
2019-03-22 12:06:56 +00:00
Qt Submodule Update Bot
7cc57995bf Update submodules on '5.12' in qt5
Change-Id: Idba1b3637a56b7bf822c6a0bff29dd91dca735b7
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-22 08:56:29 +00:00
Qt Submodule Update Bot
d8a1801f1d Update submodules on 'dev' in qt5
Change-Id: I46929f3d189bc07ee3a9f95cb539bdae57d6d10d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-22 08:18:51 +00:00
Qt Submodule Update Bot
3003529631 Update submodules on '5.13' in qt5
Change-Id: I0c15efb52ebac506133653336a16d09174bb938f
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-21 19:49:57 +00:00
Qt Submodule Update Bot
209b8117bd Update submodules on '5.12' in qt5
Change-Id: I5cd2a0098c21f4d4691261fd5c2c1f535f119a77
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-21 18:29:30 +00:00
Liang Qi
78afd2d4b6 Merge remote-tracking branch 'origin/5.12.2' into 5.12
Change-Id: I8795e84dd750cbb2b55a03c861b911f57a1e2626
2019-03-21 14:26:56 +01:00
Qt Submodule Update Bot
323dcdb60f Update submodules on '5.12' in qt5
Change-Id: If57974194302222651f94a7e7b99cc4e34c3b3a1
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-20 15:31:56 +00:00
Johanna Äijälä
c71f004171 Provisioning: add dependency walker to win10 x86
Needed by RTA.

Change-Id: I51889477dd6e6f4bdff509ab8f6c1b8307842ebd
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-03-20 13:23:34 +00:00
Qt Submodule Update Bot
24de703f26 Update submodules on 'dev' in qt5
Change-Id: I6c78b9e00e9bdbf579e8b423b42499bea822ceca
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-18 06:19:33 +00:00
Liang Qi
4978e6f835 Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
	coin/provisioning/common/windows/helpers.ps1

Change-Id: If35fe38af7b7b1c4bba5009180fe51f37a90aa5c
2019-03-17 21:43:11 +01:00
Qt Submodule Update Bot
5df387f924 Update submodules on 'dev' in qt5
Change-Id: Id296241c270ea33450e57ef07b382930711daa89
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-17 19:56:49 +00:00
Qt Submodule Update Bot
7158816eed Update submodules on '5.13' in qt5
Change-Id: I9b5cfc02f045711d84084dd52e3add7baa3a0722
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-17 19:56:39 +00:00
Heikki Halmet
0660a25cca Provisioning: Make gnuwin32 available for windows machines
This script will install gnuwin32 to the windows machines so it can be
removed from qt5

Task-number: QTBUG-73422
Change-Id: I40b7963efcf047525626fe6f1e3ba50b54d68199
Reviewed-by: Juha Karjalainen <juha.karjalainen@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-03-17 08:16:25 +00:00
Liang Qi
38b6cbfd42 Provisioning: Add pcre2 to the list of installed packages
This external dependency is now required by QtCore on Linux.

Change-Id: I47ba758e86e110c33f9e2bc7607ff9352892470a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-03-15 22:06:26 +00:00
Liang Qi
7343e226d4 Provisioning: build cmake from source
Change-Id: I6b4006250a7e019d7c38eaf3c29ae75a3a65300c
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2019-03-15 12:51:35 +00:00
Maurice Kalinowski
3d087c5a6a Split docker provisioning files
Split the creation of the test images and the creation of the
docker environment. This way, one can easily recreate the test
images, without requiring to re-provision everything.

Change-Id: I35bbe8d8bf497f16d9be92cbaa2d9001f8eee247
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Reviewed-by: Ryan Chu <ryan.chu@qt.io>
2019-03-15 12:14:20 +00:00
Liang Qi
ca9f9b9cc4 Update submodules on 'dev' in qt5
Change-Id: I7484fcfc4915d0e22057b671bba6e63243452ceb
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-15 12:14:13 +00:00
Juha Karjalainen
48ab1d879b Fix provisioning disable defragmentation for windows
If no scheduled task exist it would throw error causing
provisioning to fail. Now catch when scheduling does not exist.

Task-number: QTQAINFRA-2823
Change-Id: I3bf24df6116b6c978171950bf5bf954f5ddee533
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-03-15 09:13:16 +00:00
Qt Submodule Update Bot
deecc97dc2 Update submodules on '5.13' in qt5
Change-Id: Ibd880c74a5842a88d8ee0a8cb1eaf3487b4f7192
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-14 17:00:45 +00:00
Liang Qi
e6e5e7b2ee Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
	.gitmodules
	coin/provisioning/common/macos/docker_testserver.sh

Change-Id: Ifcf97d2ff12ca390e63e814c2a377f6f9135acab
2019-03-14 12:36:04 +01:00
Liang Qi
bbce3228af Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
	coin/provisioning/common/linux/emsdk.sh

Change-Id: I9ba6a1c52b70b605f0f856b6ce6912fd499792a3
2019-03-14 12:10:15 +01:00
Johanna Äijälä
675deb1474 Add Squish for MSVC2017 x64 to Win10 x64 machines
Also Squish for MinGW x86 on Win7 x86.

Change-Id: Ie73371b7993f94f32ef1cd2b90f340cf20935e0b
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-03-14 05:27:53 +00:00
Qt Submodule Update Bot
0545584315 Update submodules on '5.13' in qt5
Change-Id: I8c823bab00e24f89a748986bf3eacf12d8de1d46
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-13 20:33:23 +00:00
Simon Hausmann
d9bf3742ad Add double-conversion to the list of installed packages
This external dependency is now required by QtCore on Linux.

Change-Id: I910a3e17ec4d6c10ad4e1a9dfc31d1340fe110de
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2019-03-13 15:11:34 +00:00
Liang Qi
36f7ccc586 Cmake: install latest 3.14.0-rc3 packages on Linux
Change-Id: I5d88ac6c9180c24538de7c386d026f2d6547ccf4
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2019-03-13 14:26:35 +00:00
Simon Hausmann
bc14adc831 Shrink build configurations and modules
This change disables all modules except qtbase from the build and also
reduces the build to one configuration. This is not intended to be
merged back to qt5/dev but rather a starting point to build up cmake
builds in the CI platform by platform and module by module.

Change-Id: I899da885dacb32188a0d02b2301df3d4450c0589
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2019-03-13 14:26:31 +00:00
Qt Submodule Update Bot
4c46984c46 Update submodules on '5.13' in qt5
Change-Id: I87f15314cf01a1b0482b1675c1eeaed380d92a3d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-13 09:12:10 +00:00
Paul Wicking
cc1203311a Update comment in clang-format file
Change-Id: I18f14a1956f508317f8a3995873a14bc1af29594
Reviewed-by: Andy Maloney <asmaloney@gmail.com>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2019-03-11 10:33:26 +00:00
Qt Submodule Update Bot
f9c5acb2ff Update submodules on '5.12' in qt5
Change-Id: I4f983c014f06d1d396b13fde8e58d473bf5c988a
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-11 06:19:46 +00:00
Qt Submodule Update Bot
fc1d5bbe4c Update submodules on '5.13' in qt5
Change-Id: I696da0adc9f8f11c08765662016972d4c47a8a04
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-11 05:16:35 +00:00
Heikki Halmet
76c80866af Provisioning: Help script for removing items
Sometimes items are locked (access denied) so we need to have function
which waits and retry until removing is possible.

Task-number: QTQAINFRA-2806
Change-Id: I09055c45c0e439ed1a20eb575ee79b7ca22c5745
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2019-03-10 14:32:03 +00:00
Qt Submodule Update Bot
afa1b053fe Update submodules on '5.12' in qt5
Change-Id: I324c45e79a1719943cdd8544a3ddbefc9394421c
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-08 21:38:55 +00:00
Paul Wicking
e403403b39 Update clang-format config
Set column width to 100 as described in the official Qt coding style
(https://wiki.qt.io/Qt_Coding_Style).

Also, break constructor initializers before the colon and after the commas.

Change-Id: I6ac5a21ce831a35a0d74e699192ba981c8a8ba3c
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2019-03-08 13:53:33 +00:00
Qt Submodule Update Bot
9a5d221afc Update submodules on '5.13' in qt5
Change-Id: I85f2cd016dc8c3e98e39ebee057d1d6bfc71d19b
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-08 12:09:53 +00:00
Qt Submodule Update Bot
ec772e3e4a Update submodules on '5.12' in qt5
Change-Id: Ie5d3cf0419efe268c3268fd4e5038c61677e57ea
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-08 08:50:13 +00:00
Qt Submodule Update Bot
7100c54887 Update submodules on '5.12.2' in qt5
Change-Id: I9fc68dfd357dd32546248dee88558744502cb24c
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2019-03-08 04:47:08 +00:00
Johanna Aijala
88b35a4921 Update Squish to 6.4.3
Froglogic has not yet released Squish for Qt5.13 but we can use Squish
packages build with Qt5.12.

Remove msvc12 Squish, not needed.

Change-Id: I1de1bb67a5577fa7f7233c69c3a58bedd15fd16b
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-03-07 06:18:26 +00:00
Qt Submodule Update Bot
a99977cf78 Update submodules on '5.13' in qt5
Change-Id: I20b6331abe3a914c5cf2503be61c34e2efe60016
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-05 06:41:28 +00:00
Qt Submodule Update Bot
cfea5af0ed Update submodules on '5.12' in qt5
Change-Id: I99b557104856e3cbf7375f56e7f42b77430bf49f
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-05 06:41:22 +00:00
Liang Qi
ed3d7f6cf5 Update submodules on 'dev' in qt5
Skip qtbase in this round.

Change-Id: I4384f32d093aaaad73146e661bc3f3a56d57328d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-04 20:02:56 +00:00
Qt Submodule Update Bot
bec94435f8 Update submodules on '5.13' in qt5
Change-Id: I798c8bc1278a02cdf9043ed50eade5ff66b6502d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-02 21:38:04 +00:00
Qt Submodule Update Bot
b74bc40b41 Update submodules on '5.12' in qt5
Change-Id: I31fc2036208413ee138e6154f65af60e15f0e00c
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-02 21:37:30 +00:00
Heikki Halmet
abfc2cd571 Provisioning: Update emsdk version
Task-number: QTBUG-73867
Change-Id: I4caab8d434787bf4323e1ea3232bf4bf23c1ec8d
Reviewed-by: Juha Karjalainen <juha.karjalainen@qt.io>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
2019-03-02 06:29:52 +00:00
Liang Qi
4df2866684 Update submodules on '5.12' in qt5
Change-Id: I20eba8a90e0683263245a01eac5a553c78961050
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-03-01 19:05:44 +00:00
Qt Submodule Update Bot
3a1e557e54 Update submodules on '5.12.2' in qt5
Change-Id: I3448762f4f01e6fd334927713a61c8d1d6881ab6
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-02-28 19:08:08 +00:00
Mårten Nordheim
5c9979a995 Add docker container with iptables
Used for dropping packets on a specific port.

Needs to be launched with the NET_ADMIN and NET_RAW capabilities to be
able to actually be able to interact with iptables, this is done in
docker-compose.

Change-Id: I5093d19fbc269f42fe3e314e9344866fa5b79999
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
2019-02-28 10:36:30 +00:00
Mårten Nordheim
03a0872a34 Add docker container with Cyrus
For its imap server, needed in various tests

Change-Id: I7ad11342f362392edec2f15c781f4c48deeeff30
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
2019-02-28 10:36:27 +00:00
Mårten Nordheim
9d0022ee44 Add docker container with xinetd
Needed in the QUdpSocket test for the echo service and in the QSslSocket
test for the daylight service.

Change-Id: Ic7143eb7abd37dbf2c20ddb4b52cdd5ea3f0d193
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
2019-02-28 10:32:59 +00:00
Antti Kokko
091820f6a1 Remove qt3d-runtime.txt symbolic link from platform configurations
Caused recursion in CI platform configuration parsing algorithm.
Add qt3d-runtime.txt back as regular file.

Task-number: QTQAINFRA-2804
Change-Id: I11c42a70dcd2157501d4b1f0f67fc7a77a575d31
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-02-28 04:08:21 +00:00
Qt Submodule Update Bot
ffe8fd7701 Update submodules on '5.12.2' in qt5
Change-Id: Ifc604747b5d94f44948a710e2f9b1c0a5318eaa5
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-02-27 19:35:15 +00:00
Qt Submodule Update Bot
e9d5fdaa20 Update submodules on '5.13' in qt5
Change-Id: I33af247c322de51b34dc65381be9e4e03261842d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-02-27 16:46:26 +00:00
Liang Qi
2d0e6b81dd Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
	coin/provisioning/common/windows/android-openssl.ps1

Change-Id: I0755066ece5458040a21b3da6ddbc1656240f5bb
2019-02-27 12:43:22 +01:00
Heikki Halmet
099b7ffe4c Provisioning: Update emsdk version
Task-number: QTBUG-73867
Change-Id: I2aabbecbce2fc3378db6c0747fc8146c03fac545
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
2019-02-26 11:11:15 +00:00
Qt Submodule Update Bot
4e99a6976c Update submodules on '5.13' in qt5
Change-Id: I7bf5a68c37be83ba2ad4e67ba24bcae7243297a0
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-02-26 09:31:40 +00:00
Heikki Halmet
d5c96aad5a Provisioning: Remove docker from macOS provisioning
When docker provisioning starting test-server in virtual box whole
virtual machine will reboot.

Let's remove docker until it's more stable or we know how to fix it.

Task-number: QTQAINFRA-2801
Change-Id: Iad7437a69c954a90522e44ef27015518fa3f8c1e
(cherry picked from commit 1865b99b527bd9eee80c39e95d47a44096e44e6a)
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
2019-02-23 13:37:10 +00:00
Heikki Halmet
06fb909429 Provisioning: Change installation order for dotnet-framework
Windows updates can't be disabled before dotnet-framework is enabled

Task-number: QTQAINFRA-2824
Change-Id: I26c6b9d9aacfd8031a0b05ce48e003822aec3bdc
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-02-23 10:56:58 +00:00
Qt Submodule Update Bot
becac559b7 Update submodules on '5.12.2' in qt5
Change-Id: Id1d8765c3a400a7e12725ccf7fcff5aef49c47c0
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-02-23 06:47:32 +00:00
Qt Submodule Update Bot
83d5226604 Update submodules on '5.12.2' in qt5
Change-Id: I131875e52b21ab1c354955cf82427470094da8ea
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-02-21 19:06:48 +00:00
Juha Karjalainen
9c60d8b190 Fix: Set correct path to environmental variable
Env variable BREAKPAD_SOURCE_DIR had /src at end which was
not needed.

Change-Id: I4d126c3b7c3b2da03dc2a0ba075b0d4ddad92eeb
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2019-02-18 13:17:52 +00:00
Heikki Halmet
da2bd45ba6 Provisioning: Update mysql to Windows
Currently this is the last version that support x86 for at least Windows.

Task-number: QTQAINFRA-1996
Change-Id: Idd55694837afad2188697b4d5cc009a127ddb760
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
2019-02-18 07:43:26 +00:00
Samuli Piippo
abbd43c943 Provisioning: update ARMv7 and ARM64 toolchains
Update toolchains to Yocto Sumo release with GCC 7.3.0

Task-number: QTQAINFRA-2630
Change-Id: I078cfebde1df039a3783f76c37f914f0dda0483f
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-02-18 07:41:18 +00:00
Qt Submodule Update Bot
b3b6b100e6 Update submodules on '5.12.2' in qt5
Change-Id: Iea1284a0920bbae7ebefda199db7564f3d874edc
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-02-16 06:50:30 +00:00
Qt Submodule Update Bot
1c6f272dd0 Update submodules on '5.12' in qt5
Change-Id: Ia2c669226e73a545a19c941c5672972a92049534
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-02-15 07:41:30 +00:00
Juha Karjalainen
ce91433364 Fix failing to disable windows update service
Sometimes when trying to stop windows update service it fails.
Will now retry disabling wuauserv

Task-number: QTQAINFRA-2632
Change-Id: I5b6bf40aa15bb1f5225dc51e2f7212a01a13e9a6
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-02-14 15:22:56 +00:00
Liang Qi
b0afdd4bc7 Update submodules on '5.13' in qt5
Change-Id: Ie526118f93295f56e0c2bf951c6fe8ab2b427eea
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-02-14 11:18:47 +00:00
Qt Submodule Update Bot
391ba3a9ca Update submodules on '5.12' in qt5
Change-Id: Id119f941479fac5fa63c281ea21555ff99dc9a47
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-02-14 05:32:36 +00:00
Kari Oikarinen
d5d380f452 Adjust submodule branches
Change-Id: I309db20815d3b383155e6549b649607e956b8d89
2019-02-13 09:25:22 +02:00
Qt Submodule Update Bot
6967ec6b73 Update submodules on '5.12' in qt5
Change-Id: I75976d5f76dfac7cca5e13cf619a1d019b3bc5e3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-02-13 05:39:18 +00:00
Juha Karjalainen
80deae9b74 Fix provisioning script dxsdk.ps1
Due to typo in dxsdk.ps1 provisioning script, it did not download from
cached location. Also checksum Check was missing.

Task-number: QTQAINFRA-2614
Change-Id: I321549721b256b85513fa1e4ff57ab1302e28f43
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-02-12 09:10:50 +00:00
Qt Submodule Update Bot
2dff8afa98 Update submodules on '5.12' in qt5
Change-Id: I758a05cd029f8252523681c19b657e76c7bb22dc
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-02-12 08:55:19 +00:00
Qt Submodule Update Bot
f64ba39ce5 Update submodules on '5.12' in qt5
Change-Id: I5a8f3943047e4b222795c08aeb6593b0225ada99
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-02-11 10:12:41 +00:00
Jani Heikkinen
2471d6dab8 Update qtwebengine
Change-Id: I4f70e86ee6f22dd4e14780b606294ca26d0e4007
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2019-02-09 19:15:13 +00:00
Qt Submodule Update Bot
7bd38a4997 Update submodules on '5.13' in qt5
Change-Id: I1653a60f6c0b5dab394b364814bcabf566090498
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-02-08 09:47:56 +00:00
Qt Submodule Update Bot
ef7908d90c Update submodules on '5.12' in qt5
Change-Id: I7c99a0f95deb83a7aa81f68e1e1be2a7466b21d2
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-02-08 08:10:27 +00:00
Qt Submodule Update Bot
ab438507e9 Update submodules on 'dev' in qt5
Change-Id: I6bae6951b1c9253a423cd2d0d38ffea6121415a8
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-02-07 19:47:54 +00:00
Qt Submodule Update Bot
26ff9bdc3d Update submodules on '5.13' in qt5
Change-Id: I3fe91983a4719ccd77146ed63165a7939358c3c0
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-02-07 17:33:49 +00:00
Tony Sarajärvi
9b84c7135b Build MIPS64 with b2qt toolchain
This configuration verifies big endian builds

Task-number: QTQAINFRA-2492
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 80339a10a4)
Change-Id: I3111190b5c924eb73b037b94be1a0dc48bcc68c2
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-02-07 17:33:41 +00:00
Qt Submodule Update Bot
9df5188493 Update submodules on '5.12' in qt5
Change-Id: I609f70ead9f00039d3c89f9e26b1301bb18931c0
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-02-07 08:56:38 +00:00
Liang Qi
84aa9b73ad Merge remote-tracking branch 'origin/dev' into 5.13
Change-Id: If5219843c4f0d4b34fe56a826d0e9bb17d92f877
2019-02-07 09:31:51 +01:00
Liang Qi
774f18e61a Merge remote-tracking branch 'origin/5.12.1' into 5.12
Change-Id: I73b9cf3d1cdb2a9f2f88e5568f61447469f45313
2019-02-06 15:44:34 +01:00
Qt Submodule Update Bot
d926dbe415 Update submodules on 'dev' in qt5
Change-Id: I78814e361bf5574ed190fc2d98cdc050bb54815e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-02-06 07:03:59 +00:00
Qt Submodule Update Bot
73f1d0f518 Update submodules on '5.13' in qt5
Change-Id: I9fbaaaf4870edefceb1a4557799c41077002aaa0
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-02-06 07:03:09 +00:00
Qt Submodule Update Bot
4f7c2120a7 Update submodules on '5.12' in qt5
Change-Id: Ia0b08ce2f5513e78cffa4679d7465a30c95de8e4
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-02-05 19:16:28 +00:00
Tony Sarajärvi
4987a682ff Make qt3d-runtime.txt platform configuration a link
The content of qt3d-runtime.txt should always be the same as qt5.txt.

Change-Id: I6cdee575206332f6a719acfaacd7072a2178fd78
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-02-04 11:11:43 +00:00
Liang Qi
bee2b8cdb9 Update submodules on '5.12' in qt5
Change-Id: Ib8b55ed958660be457a7f0852fad9a13d853f1a5
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-02-04 09:53:02 +00:00
Qt Submodule Update Bot
99b46f7dec Update submodules on 'dev' in qt5
Change-Id: I8c6d0d5c7679930ca05961dcaac3c71d2819cba8
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-02-03 03:49:49 +00:00
Tony Sarajärvi
80339a10a4 Build MIPS64 with b2qt toolchain
This configuration verifies big endian builds

Task-number: QTQAINFRA-2492
Change-Id: I19a8437c5320e7acb97a26fbd5fd62596d3b0fb4
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2019-02-02 13:16:50 +00:00
Ryan Chu
5cfa5637ba Provision docker test servers based on Ubuntu 18.04
Comparing to the previous release, Ubuntu 18.04 includes dante-server
1.4.2 by default. Therefore, it doesn't rely on the Third-party PPA.

The SHA-1 of the provisioned images in docker cache:
qt-test-server-apache2_18.04:69478e75b362d57691a53700434a7034d471459e
qt-test-server-squid_18.04:cd5a5e2ff5d23c9a7adef1bd82847e027c090e5b
qt-test-server-vsftpd_18.04:a40425c0494f8f4e8ba27ac9fb5cc02aaedd62d8
qt-test-server-ftp-proxy_18.04:5f78e23a0579a579fcae7f3e5704bb5eec0e2f6d
qt-test-server-danted_18.04:d590b915cda9d524620d18a0398fdfa4d5876f97

Change-Id: Iffb4abe144a957465a2daab657c6259f0b75e800
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2019-02-02 12:23:22 +00:00
Ryan Chu
b4b2152dd3 Start the docker machine and update with new TLS certificates
After the system reboots, the docker machine is created, but in a
stopped state. To handle the case that a developer may rerun the
provisioning scripts for the missed docker images, make sure the
docker machine is both started and running with new TLS certificates.

Change-Id: Ibdb58152cac860132a77d6d094f9bca20a5e95e8
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2019-02-02 12:23:18 +00:00
Ryan Chu
177df80f09 Docker Provisioning: Install docker test servers on Windows 10 (x86_64)
Build and cache docker images to VirtualBox virtual machine.
1. Download and install the docker tool kits and Apple Bonjour
2. Deploy boot2docker image into VirtualBox via docker-machine commands
3. Use Git Bash to run the shared provisioning scripts
4. Print CPU features to verify that CI has enabled VT-X/AMD-v support
5. Disable Hyper-V from Windows 10 Pro/Enterprise editions

Change-Id: I5520e4a28376aba14f880c077bd7b083be971f0a
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2019-02-02 12:23:15 +00:00
Ryan Chu
ab3e34827a Display the provisioned version of docker tool kits
For debug purpose, print the installed version of docker,
docker-compose, and docker-engine. Because 'docker info' is related to
the docker-engine, postpone calling the command until docker virtual
machine has been created.

Change-Id: I4c869b7122b831b7f22c9c3846ac9cbe47c3b355
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-02-02 12:23:11 +00:00
Ryan Chu
b97e448ba4 Move and merge the provisioning scripts of docker to a shared folder
To reuse the provisioning scripts for all platforms, they are moved to a
shared folder (coin/common/shared/testserver). The scripts of macOS and
linux are combined and controlled by an input parameter (macos/linux).

Change-Id: Ibf9a438d1825d01d707c2fc8fbcf2bc70a8b4902
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2019-02-02 12:23:07 +00:00
Qt Submodule Update Bot
1830cca2bc Update submodules on 'dev' in qt5
Change-Id: Ie71dc26e772ace0d4a7ab51360ad4abe1448d438
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-02-01 20:55:10 +00:00
Heikki Halmet
3cb745565f Provisioning: Renew iOS signing certificates
Task-number: QTQAINFRA-2690
Change-Id: I4a058c7d88b3daa24f62d5bc314ec2b0ecc8c383
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-02-01 10:50:32 +00:00
Qt Submodule Update Bot
92498bad9c Update submodules on '5.12' in qt5
Change-Id: I678bfdb4333abc34a29732aef1816d67f46c09cb
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-02-01 05:17:57 +00:00
Juha Karjalainen
366eaceff0 Change order in which certain provisioning scripts are run
Disables windows update and defender  now earlier in provisioning.

Task-number: QTQAINFRA-2592
Change-Id: I4cc380830695a97f02b54ab904e2f6192fc36d44
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-01-29 15:24:41 +00:00
Juha Karjalainen
afbd9305e3 Fix provisioning failure when unsetting proxy with no proxy
When unset-proxy.ps1 script is run when there is no proxy set
unset script fails leading provisioning to fail. Now will check
if  proxy is set before removing registery keys for it.

Task-number: QTQAINFRA-2311
Change-Id: Ic50bcebc634bb90385ca817dac9bed24e9e897ec
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-01-29 15:24:38 +00:00
Qt Submodule Update Bot
044f079158 Update submodules on 'dev' in qt5
Change-Id: If01f147a0f76b8075492ebb6baedc832de7611b3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-01-29 15:24:35 +00:00
Heikki Halmet
8ba5474da7 Provisioning: Install Google's Protocol Buffers
Protobuf is needed for Automotive Suite

Task-number: QTQAINFRA-2314
Change-Id: I12b4248f1de5aea88f573297a47b791b5b6296fb
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2019-01-29 12:10:57 +00:00
Heikki Halmet
54cdba9e3d Provisioning: Remove Unneeded Android variables
Change-Id: I7dd008aef6465fdddd07e227b48e9b6361c13f81
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-01-29 12:10:53 +00:00
Qt Submodule Update Bot
6d90dd2191 Update submodules on '5.12' in qt5
Change-Id: I4fbd3ab3ddb7509366797dde34678d9739229e8d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-01-29 12:10:49 +00:00
Qt Submodule Update Bot
c45f3395ee Update submodules on '5.12.1' in qt5
Change-Id: I31b89394b870ee1c20d3be5add7fed60e9b23d80
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-01-29 09:21:03 +00:00
Liang Qi
b40d27b808 Update submodules on 'dev' in qt5
Change-Id: Ic263e48fc994a7c77c0198e6544395f4facee760
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-01-29 08:33:51 +00:00
Paul Wicking
3793e0ddfc Adjust submodule branches 2019-01-28 14:37:50 +01:00
Qt Submodule Update Bot
f5f03ebfcd Update submodules on '5.12.1' in qt5
Change-Id: I3ad370f5f6312e22508a37f5618c979b60381987
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-01-26 07:21:10 +00:00
Qt Submodule Update Bot
1518bfdab6 Update submodules on '5.12' in qt5
Change-Id: I8060a5f51ae598fa7c8c348cfce212001250941d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-01-25 20:09:57 +00:00
Oliver Wolff
92b7d48bc2 Windows provisioning: Explicitly state OpenGL configuration to use
One of our configurations relied on ANGLE being the default OpenGL
configuration on Windows. This is the case at the moment, but might
change, so we should not rely on this behavior, but explicitly state the
configuration we are expecting.

Change-Id: Ie8cb215c2675faf8b514f4d9a43055638be1aaa8
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2019-01-25 11:57:42 +00:00
Jani Heikkinen
77a73f65df Add qtlottie as a submodule in qt5.git#dev
Task-number: QTBUG-72945
Change-Id: Ib8daf1541e7ff5dca70e8a1c7bec48ee02d0eb59
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2019-01-25 11:06:21 +00:00
Aapo Keskimolo
daf0d3a4c6 Update qtsaferenderer platform configuration definitions
The project-specific platform configuration file is renamed to follow the
convention as for other projects. This will allow Coin to recognize the
configuration that are specific for qtsaferenderer project where they
were previously (unintentionally) ignored.

Removed QNX 7 as it is in the Qt mainline configuration.

Removed Ubuntu 16.04 as Ubuntu 18.04 is now supported.

Task-number: QSR-209
Change-Id: I505edc3741dbc047b2fc23bc409016d712596872
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-01-25 09:02:08 +00:00
Qt Submodule Update Bot
e8a1ca0581 Update submodules on '5.12' in qt5
Change-Id: I6403bd766964d9f65fadfbc514b01eeefdac540e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-01-24 19:31:16 +00:00
Tuomas Heimonen
22f032bd02 Build qtsaferenderer examples in Windows
Task-number: QSR-209
Change-Id: If8db177a77e3340f6b75f5a7fa768b6d8abec017
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
2019-01-23 13:31:36 +00:00
Liang Qi
85eb7b7a03 Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
	coin/platform_configs/default.txt

Change-Id: Ie21baa51738ce0761fb45fba3819b1894cc808b6
2019-01-23 08:02:11 +01:00
Tony Sarajärvi
47d14b365e Accept license in Android SDK provisioning
A change in Android SDK prompts us now for
accepting license.

Task-number: QTQAINFRA-2591
Change-Id: I1ff05d84ccda743649c6d38784c6170e08f50eb1
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-01-23 01:29:37 +00:00
Qt Submodule Update Bot
017d9e2ee3 Update submodules on '5.12.1' in qt5
Change-Id: Idc5f439eb75011f6ec422f37050ced3fec879a6c
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-01-22 04:14:04 +00:00
Qt Submodule Update Bot
56b801a77e Update submodules on '5.12' in qt5
Change-Id: Ifa9eae2c3cfbd6fd001caf289e5ed360623d45f7
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-01-21 10:11:54 +00:00
Jani Heikkinen
390a373f28 Remove Qt Canvas3D from qt5.git (Qt 5.13 ->)
Task-number: QTBUG-73015
Change-Id: I52b8d26a2e50b51229c83b532c7a1d5360dc88d7
Reviewed-by: Pasi Keränen <pasi.keranen@qt.io>
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
2019-01-21 08:02:03 +00:00
Heikki Halmet
4ddadb9aa3 Add Qt WebAssembly for all submodules
Task-number: QTBUG-63917
Change-Id: I61074c8b1acbf3ffd7781e7435784c4a15412c98
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
2019-01-17 13:03:27 +00:00
Juha Karjalainen
3332223130 Provisioning: breakpad for qt3dstudio
Breakpad https://chromium.googlesource.com/breakpad/breakpad/
sources are needed for qt3studio. Also Breakpad need sources for
https://chromium.googlesource.com/linux-syscall-support.

Task-number: QT3DS-2650
Change-Id: I13c7534e1c6e97a1e345dad3c2c82eeb6428313d
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-01-17 09:45:12 +00:00
Liang Qi
34c751db5e Update submodules on '5.12' in qt5
Change-Id: I99897f12572b1927ef140ac0dd3430db2f97799c
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-01-17 09:45:09 +00:00
Simo Fält
6d2929d1aa Provisioning: Move Android toolchain and config to win10
Installing Android toolchains and ssl headers to win10 template
and moving Android windows platform configs to win10 from win7.

Task-number: QTQAINFRA-1266
Change-Id: I9b3e3a378451e0bdfc7dc5c7b75ee035faf8994c
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 5a040ca46a)
2019-01-17 09:45:05 +00:00
Heikki Halmet
ea0825abe8 Provisioning: Remove update notifier
Update notifier is showing when vm is running.
It can affect to test results and that's why it need to be removed

Task-number: QTQAINFRA-2453
Change-Id: Icb27ba998ef9a51aaf8f40274c182b0c3dcd496a
Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Reviewed-by: Juha Karjalainen <juha.karjalainen@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2019-01-17 09:45:02 +00:00
Qt Submodule Update Bot
e425b8b65f Update submodules on 'dev' in qt5
Change-Id: I3b69a0cc0aa6ec1395afd043e1810b68ebf9f1f6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-01-17 07:27:21 +00:00
Maurice Kalinowski
209d09d530 Provisioning: Update Unified Automation OpcUA backend
Adding in the x64 bit installers to deployment. Furthermore, we can use
the msvc2015 installer to create msvc2017 binaries with Qt.
After the licensing change, we will be able to generate packages for all
msvc based installers.

Change-Id: I96db345b535a2518c758175137c808b15130ff41
Reviewed-by: Rainer Keller <Rainer.Keller@qt.io>
2019-01-16 07:30:37 +00:00
Simo Fält
332ec62ead Fix qtbase LinuxWebAssembly config host
The OpenSUSE 42.3 was replaced with OpenSUSE 15.0.

This amends 89e0159bbc, Swap openSUSE 42.3 to 15.

Task-number: QTQAINFRA-2067
Fixes: QTQAINFRA-2555
Change-Id: I0cd10bcfda5a63fecda0ccdb652b6cc23f349339
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-01-15 09:31:49 +00:00
Heikki Halmet
c1f3a886ed Provisioning: Signtools for Windows x86
QtDesignStudio requires signtools for Windows x86

Task-number: QTBUG-72907
Change-Id: I7fb15cb07511cb89d3be00e1fe65247ecc21bcfe
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2019-01-14 10:25:09 +00:00
Qt Submodule Update Bot
3855853e34 Update submodules on '5.12.1' in qt5
Change-Id: I0e1da14b452ed6237831dca5459627f29621182e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-01-14 06:45:22 +00:00
Qt Submodule Update Bot
4cc4daa28e Update submodules on 'dev' in qt5
Change-Id: I49e60d4857ca27219862cfac7f2286275fa23a6f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-01-12 07:11:01 +00:00
Qt Submodule Update Bot
da3ffbea17 Update submodules on '5.12.1' in qt5
Change-Id: Idf66e86252cea5b32bac9df3ebaa592936bc34d6
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-01-11 11:31:00 +00:00
Tuomas Heimonen
6930998900 Add qtsaferenderer extra targets for Coin
The cross-compile targets that qtsaferenderer needs do not exist in qt5
therefore we add those extra targets for CI.

Task-number: QSR-378
Change-Id: Ia07074392b09af8d111a957027407f85518e5d85
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
(cherry picked from commit f7b6a4c276)
Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io>
2019-01-11 11:21:58 +00:00
Qt Submodule Update Bot
8b634155a9 Update submodules on 'dev' in qt5
Change-Id: If053c1ae2aba3aefb28d22b84d992f710e7f0321
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-01-11 07:40:26 +00:00
Liang Qi
3b5c100040 Update submodules on '5.12' in qt5
Skip qtbase in this round.

Change-Id: Ib718f8343c710c22bb241867bf3b90eb11aabe05
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-01-10 19:31:52 +00:00
Tony Sarajärvi
89e0159bbc Swap openSUSE 42.3 to 15
Task-number: QTQAINFRA-2067
Change-Id: I71f79181704d6ce8faac0019f6d7a5016b0ecb5e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-01-10 17:39:51 +00:00
Qt Submodule Update Bot
affeefbbe6 Update submodules on 'dev' in qt5
Change-Id: I349c81cfd119703e54c3c7f73601f07f3235bbbe
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-01-10 12:34:56 +00:00
Juha Karjalainen
cfa7877afe Fix provisioning ODBC environmetal variables had : at end
CPLUS_INCLUDE_PATH and LIBRARY_PATH environmental variables had
 --> : <-- at end of variable. As this adds current dir to search
path this is undesirable and causes bugs.

Change-Id: Ia36c3f3f791f5d506eea15aba6be6d665049a922
Reviewed-by: Juha Karjalainen <juha.karjalainen@qt.io>
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
2019-01-10 12:32:57 +00:00
Qt Submodule Update Bot
616178cfb2 Update submodules on '5.12.1' in qt5
Change-Id: I8768b71048a5602b4a716b3a6da8b570f5e8e51a
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-01-10 05:13:22 +00:00
Maurice Kalinowski
56c43a03cd Provisioning: Update Qt OpcUA backends
- Unified Automation SDK needs to be updated to 1.6x to reflect latest
API changes
- Open62541 is now inside 3rdparty of the Qt OpcUA module. Hence, no
need to provision it.

Change-Id: I96a3764053ca684fa71f9d49e998ebe0ce45a6ae
Reviewed-by: Jannis Völker <jannis.voelker@basyskom.com>
Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
Reviewed-by: Rainer Keller <Rainer.Keller@qt.io>
2019-01-09 09:57:35 +00:00
Simon Hausmann
0b18f12f99 Prospective fix for git lfs installation
Keys used to sign package repositories tend to have expiry dates and
therefore need to be changed from time to time. Therefore hardcoding
the key we expect here will break (as it does right now) and it's better
to retrieve the expected key via a secure transport.

The old key - per
http://keyserver.ubuntu.com/pks/lookup?search=0xC2E73424D59097AB&op=vindex
- will expire on the 12 of January. That's probably why they changed the
key used to sign the repo before the expiry.

Change-Id: I39d082a6e12731b7eb0a8214a500101ca24f8af4
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-01-09 09:56:56 +00:00
Juha Karjalainen
7028ee3184 Fix broken provisioning script DownloadURL.sh
DownloadURL returns 0 even when alt download fails.

Task-number: QTQAINFRA-2501
Change-Id: Id2fb1e0b4ff12a48b6adb27291f55fc129296233
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
2019-01-09 09:14:02 +00:00
Qt Submodule Update Bot
463a873edd Update submodules on 'dev' in qt5
Change-Id: Iec9fa664e9d99a2c4673a9a8c5a1c6124ad2fcc2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-01-09 08:49:07 +00:00
Qt Submodule Update Bot
ff12741299 Update submodules on '5.12' in qt5
Change-Id: I438761719f8deceebfc4a77fb660a18c8d6ed00b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-01-09 05:24:00 +00:00
Qt Submodule Update Bot
5256ac9c60 Update submodules on '5.12.1' in qt5
Change-Id: I6bfbe10520706d6c93037585b1e78b8b85cd3ea1
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-01-09 05:22:17 +00:00
Liang Qi
0f8243bce8 Adjust submodule branches
Change-Id: I581af0bcf61605f9cc9ee24dc9dc1c916b91abbd
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2019-01-09 05:22:13 +00:00
Juha Karjalainen
f4b482d844 Provision: install unixodbc-devel library
Adds odbc support for rhel7.

Task-number: QTBUG-72444
Change-Id: I49b1e91d9f87bdf98601627538aaa65b78440451
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-01-08 15:09:55 +00:00
Liang Qi
6d4cb1849a Merge remote-tracking branch 'origin/5.12' into 5.12.1
Change-Id: I53782263d173268fdfd3a3116c7fc6b596716992
2019-01-08 13:30:22 +01:00
Qt Submodule Update Bot
6f297420bb Update submodules on 'dev' in qt5
Change-Id: I049658e51a118f46ab46a9e7fa70f6560a8b7982
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-01-08 09:56:32 +00:00
Qt Submodule Update Bot
ca52fc7e29 Update submodules on '5.12' in qt5
Change-Id: I68c69cdc9b74c52bc0729fc51144a8fdd9d783ec
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-01-08 05:11:47 +00:00
Qt Submodule Update Bot
19a9abeac6 Update submodules on 'dev' in qt5
Change-Id: I47de211a3ba630daafd58fb4e8e1fcff382b4e75
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-01-07 15:01:44 +00:00
Tony Sarajärvi
6b64780b61 Fix .ci.local to .intra.qt.io in docker provisioning
Change-Id: I9de241e70a5dd15568619da6e4a19d54e76e5a4c
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2019-01-07 15:01:31 +00:00
Simo Fält
421eb7551b Provisioning: Enable support for printer test
Task-number: QTQAINFRA-992
Change-Id: Ibf13b8df51e72b2885c85af7bb256c73ce5697ed
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2019-01-07 15:01:24 +00:00
Tuomas Heimonen
f7b6a4c276 Add qtsaferenderer extra targets for Coin
The cross-compile targets that qtsaferenderer needs do not exist in qt5
therefore we add those extra targets for CI.

Task-number: QSR-378
Change-Id: Ia07074392b09af8d111a957027407f85518e5d85
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
2019-01-07 13:28:36 +00:00
Qt Submodule Update Bot
fe79ca444b Update submodules on '5.12' in qt5
Change-Id: I3ce524dab858e04fd2098385557893efbfa4c6ad
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-01-07 06:02:09 +00:00
Qt Submodule Update Bot
f30e44e9ff Update submodules on 'dev' in qt5
Change-Id: I348d25b8c0a90d8b1bd6ff20e759bcedb05b3f6f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-01-07 05:09:11 +00:00
Qt Submodule Update Bot
6e4aed08e1 Update submodules on '5.12' in qt5
Change-Id: I52940e20029c38b79e9f437395d5cf91c4f9f7d4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-01-06 08:59:53 +00:00
Qt Submodule Update Bot
677c4d62c5 Update submodules on 'dev' in qt5
Change-Id: I934499413588606f3db7acf499f4f6da59f7941a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-01-05 08:07:47 +00:00
Qt Submodule Update Bot
69b079c38e Update submodules on '5.12' in qt5
Change-Id: Iccf7bb925a120556c11db3396e67571c69ca9d68
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-01-04 20:58:52 +00:00
Qt Submodule Update Bot
f103df4826 Update submodules on 'dev' in qt5
Change-Id: I4eb4a253bbf94463ea2743c81f34ed21df101b35
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-01-04 19:54:24 +00:00
Heikki Halmet
72d0cfc6dc Provisioning: Add Squish Coco for RTA
Task-number: QTQAINFRA-2393
Change-Id: I391a2670a46835988da6fd1d9121172c706c7a21
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
2019-01-04 14:09:59 +00:00
Qt Submodule Update Bot
7324ace490 Update submodules on 'dev' in qt5
Change-Id: Ie53a57b7b1da333cc5274c2071232f361e8cb2c8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-01-04 09:25:45 +00:00
Qt Submodule Update Bot
07063160ae Update submodules on '5.12' in qt5
Change-Id: I8fea0b5ffaadbf5670fd2408b9f9c2e410c49cdb
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-01-03 20:32:07 +00:00
Tony Sarajärvi
2657a96f0e Upgrade macOS 10.12.3 to 10.12.6
Also changes the resolution of the desktop to 1280x800x32,
timezone to GMT and upgrades Xcode.

Task-number: QTBUG-70180
Change-Id: I4620cbfa3033a100b0e325951a5a9ebcbfa92751
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-01-03 12:59:57 +00:00
Juha Karjalainen
e28da040ee Provisioning: Unify duplicated openssl provisioning script
MacOS(10.12 and 10.13) had two identical provisioning scripts for
openssl. Now unified under common.

Change-Id: If469a56d431e72b291a810fa9c1b701873fe382d
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
2019-01-03 11:46:20 +00:00
Frederik Gladhorn
b78812f84e Reduce the number of zypper invocations
Change-Id: Ibb1c76fc4786d19a921c31b0933746f9dfefcde8
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-01-03 08:03:31 +00:00
Qt Submodule Update Bot
8e7b85af99 Update submodules on 'dev' in qt5
Change-Id: Id3bea223f49d19d801fa5ea880ce42e5312534e4
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-01-03 05:03:28 +00:00
Qt Submodule Update Bot
c231323b74 Update submodules on '5.12' in qt5
Change-Id: I77e2984900d563a6effb5e31c7f20654e5624b71
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-01-03 05:03:17 +00:00
Qt Submodule Update Bot
20b96704ee Update submodules on 'dev' in qt5
Change-Id: I9da113cf7cd79ed9ba04b1a764644c7920951508
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-01-02 19:48:39 +00:00
Joni Jäntti
2306cb69c8 Provisioning: Windows: Disable automatic defragmentation
Automatic disk defragmentation is enabled by default on Windows
machines. It should be disabled to save some time.

Task-number: QTQAINFRA-2217
Change-Id: I3f024208bd35c9e305569e6b2b562f5a8b16f6f1
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2019-01-02 12:23:01 +00:00
Liang Qi
38e2fc6b80 Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
	.gitmodules
	coin/provisioning/common/linux/docker_testserver.sh
	coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh

Done-With: Ryan Chu <ryan.chu@qt.io>
Change-Id: I9bc3afcb50783a9f0f7718731d237de4be287cae
2019-01-02 10:46:49 +01:00
Qt Submodule Update Bot
05c1f1cf99 Update submodules on '5.12.1' in qt5
Change-Id: I1e2e226840416c8ae0166950dd62a3180dd52ee1
Reviewed-by: Liang Qi <liang.qi@qt.io>
2019-01-01 19:34:46 +00:00
Qt Submodule Update Bot
da65a37041 Update submodules on 'dev' in qt5
Change-Id: I26b5fbbd0279f6321550deaf3425d52dff4d274d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2019-01-01 02:31:13 +00:00
Qt Submodule Update Bot
b6283a31c8 Update submodules on '5.12' in qt5
Change-Id: Iafeef38423c165f29169adf499b554b78e1a6c60
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-12-31 21:30:43 +00:00
Tony Sarajärvi
2dd72ec5a6 Fix .ci.local to .intra.qt.io in provisioning scripts
Change-Id: I113095b337c3592757878fb919a0a18a60a8ce7e
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-12-31 13:02:00 +00:00
Juha Karjalainen
55a990322b Provisioning: Install ODBC for macOS 10.12 10.13
This script installs libiodbc from brew and adds it to
CPLUS_INCLUDE_PATH and LIBRARY_PATH thus enabling configure to
find it and thus enabling odbc support for qt build on macOS.

Task-number: QTBUG-58956
Change-Id: I7f865800b580a87afcc480534da57ee546c74406
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2018-12-31 10:45:04 +00:00
Simo Fält
0a6d32bdd8 Provisioning: Install XCode 10.1
Task-number: QTQAINFRA-2323
Change-Id: I8fa4e146b2da71fba641f982d8114a916df42fc7
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-12-31 08:12:20 +00:00
Qt Submodule Update Bot
f95cd8d3f1 Update submodules on '5.12' in qt5
Change-Id: I4b4259963187eeeb8a4914c5581f3b4c69d70aa5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-12-27 14:49:15 +00:00
Qt Submodule Update Bot
72182d1333 Update submodules on 'dev' in qt5
Change-Id: I2c75b03cc707bf24c5e4e20a908fd5a1348d09b3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-12-27 08:41:22 +00:00
Qt Submodule Update Bot
a1ace2e097 Update submodules on '5.12' in qt5
Change-Id: I252064eb22e7360fdaf31e97bca31da562af6d6f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-12-25 21:30:44 +00:00
Qt Submodule Update Bot
4d785fc3db Update submodules on '5.12' in qt5
Change-Id: I211a94a83d207cbc522ba4256004c6d17caeeebd
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-12-25 18:19:18 +00:00
Qt Submodule Update Bot
88a777b242 Update submodules on '5.12' in qt5
Change-Id: I16389902fc5c4ac89d3f287c1b31384a825f6b8e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-12-23 15:09:05 +00:00
Qt Submodule Update Bot
c245638131 Update submodules on 'dev' in qt5
Change-Id: I63d8b91dec1e0eb4a11b9f8332d2f7dd203abdd5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-12-23 10:15:56 +00:00
Liang Qi
0e82de327b Merge remote-tracking branch 'origin/5.12.0' into 5.12
Change-Id: Ifb4277657a6f85e6a6d0ee62e54360b2cb1c0514
2018-12-22 23:21:54 +01:00
Liang Qi
d732383e6b Update submodules on 'dev' in qt5
Change-Id: I3cc13b9baa61251c16cacc1b96a0e0625b4ed751
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-12-22 03:47:27 +00:00
Qt Submodule Update Bot
db99f0563d Update submodules on '5.12' in qt5
Change-Id: I03d42c54ab6e4acc9f67612f5a9e34e691ee0192
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-12-21 15:57:33 +00:00
Qt Submodule Update Bot
eee805a6f1 Update submodules on '5.12' in qt5
Change-Id: I45912749fc6e25f25e1065b8f7a751d5713ee2c9
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-12-20 05:18:52 +00:00
Juha Karjalainen
cbdd122e18 Provisioning: Update install android sdk to version 28
QT needs at least buildSdk 24 after commit
70057dfc0e53b7996acd5ef2c0f9c40aa3f66062. Updating provisioned sdk
version to 28. Please note minSDK <= targetSDK <= build/compileSDK.

Task-number: QTQAINFRA-2412
Change-Id: I0bf67cf42dfc6f707bdeae973a60c6601d2e73c3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-12-18 08:20:41 +00:00
Qt Submodule Update Bot
2a7ea7c53d Update submodules on '5.12' in qt5
Change-Id: Icca1ee8d9b84ca8766e2b6a774098f936970b3ab
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-12-18 08:20:33 +00:00
Heikki Halmet
deacc72f73 Provisioning: Hide squish installation output from provisioning log
This will prevent the output of unwanted information

Change-Id: I547e91ef344ec51f799b26f254139b03d20a315c
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-12-17 07:16:39 +00:00
Liang Qi
65586dfb40 Update submodules on '5.12' in qt5
Skip qtdeclarative in this round due to QTBUG-72527.

Change-Id: I97aa9c1f472e88b3339dc39d841a5ef324b6fd90
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-12-14 16:36:59 +00:00
Liang Qi
43b493d223 Merge remote-tracking branch 'origin/5.11' into 5.12
Change-Id: I262b06902381426b304d815265662a315e217c0a
2018-12-12 20:39:25 +01:00
Qt Submodule Update Bot
a51b2dbf25 Update submodules on '5.12' in qt5
Change-Id: Ib45df166b0096ec1ec198e6cba792cd8a41c05a7
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-12-12 13:49:50 +00:00
Oliver Wolff
7bee789af3 Add configuration to run qtconnectivity tests on winrt
Change-Id: Ib9b61b19033d4ceb7ce15ecc8c1a0227b53bb669
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
2018-12-12 13:49:45 +00:00
Juha Karjalainen
e21401751a Provisioning: Change how executables are waited to finish
This patch only affects Windows.
Python3 provisioning took over 30-35 minutes. As both
32 and 64 bit versions are provisioned it took over 1h
this change lowers time taken to 5 minutes.

start-process with -wait flag waits for given process and its
sub-processes to exit.  Wait-process insteads just waits for
process to exit.

Change-Id: Ib9a323dcf9e2d07318a0d259a72ca4c4d0a4ed80
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-12-12 13:49:42 +00:00
Juha Karjalainen
bc12bb763f Provisioning: Windows 10 32bit remote desktop access allow
Allow accessing windows remote desktop.

Task-number: QTBUG-71874
Change-Id: I70c0acc309bd5e2bc590e7cd35a918ca7940fd03
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-12-12 13:49:39 +00:00
Heikki Halmet
a1cd361579 Provisioning: Add missing prefix for yocto_ssh_configurations
Change-Id: I1a49737188cff6291b16797293a221043bdddad1
Reviewed-by: Juha Karjalainen <juha.karjalainen@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-12-12 13:49:35 +00:00
Alex Blasche
57e432e0da Ensure qtserialport is treated as optional dependency for qtserialbus
Fixes: QTBUG-70360
Change-Id: If4e28c60906787054a607d72a33321eab20a9401
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-12-12 09:01:28 +00:00
Qt Submodule Update Bot
b093af0207 Update submodules on '5.11' in qt5
Change-Id: I72f653e9bdbece531d9d8d053e80d547a5ad56d5
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-12-10 17:22:19 +00:00
Ryan Chu
959d9bdb67 Docker Provisioning: Install Avahi daemon on Ubuntu
Avahi is a free Zeroconf implementation and provides mDNS service
discovery. It enables Docker containers to publish their services on a
local network. For the host systems supporting mDNS technology, they
will automatically discover the services when running network tests.

However, some of the Linux distributions don't have avahi-daemon
installation by default (e.g. Ubuntu Server 18.04). To not surprise the
user, the provisioning script will help to install avahi-daemon package.

Change-Id: Ibb4c278c552c149b15da8cf7918f7f71ffa3ebec
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2018-12-10 14:11:01 +00:00
Ryan Chu
a695130478 Assert the provisioning process in macOS if VMX is not enabled
The Docker-machine requires VT-x/AMD-v to build up boot2docker virtual
machine. The VMX flag should be enabled when deploying the VM into
Virtualbox. In the CI framework, it relies on Coin to expose the VMX
flag to the CPU feature. To well handle the case that the VMX could be
removed due to some CI updates, the provisioning script will assert the
process with the related debug message if VMX is not found.

Change-Id: I9f3f123d33629df1655a5b55d776d5361878d1f5
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2018-12-10 14:10:58 +00:00
Ryan Chu
477fc6a73f Docker Provisioning: Remove the obsolete tag of test servers from Ubuntu
The SHA-1 tag of a server image is generated by the shared function
(sha1tree) in testserver_util.sh. The sha1tree function sorts the files
by the their SHA-1 and use the accumulated results as the TAG. So that,
we can assign the same SHA-1 value to a server on all the platforms.

Change-Id: If87ac72f7a9c5cdebef04977480d27b26a701b73
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2018-12-10 14:10:54 +00:00
Ryan Chu
ce3791a214 Docker Provisioning: Remove the fixed version of package dependencies
Free the dependencies of the specific Ubuntu packages. Ensure that test
server is using the latest version of the Ubuntu packages to test
network changes.

The SHA-1 of the provisioned images in docker cache:
qt-test-server-apache2:537fe302f61851d1663f41495230d8e3554a4a13
qt-test-server-squid:9c32f41b19aca3d778733c4d8fb0ecc5955e893c
qt-test-server-vsftpd:f3a9c8d793a77cc007c0e4e481bec01f9e3eeb7e
qt-test-server-ftp-proxy:d7de8b28392d173db512a558ccc84ead8bece2ae
qt-test-server-danted:35607f9b790524cf9690c7d12a9a401696b7b6b5

Change-Id: I4e6c8cb235f1f798274eb52858e06d8755ae626f
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2018-12-10 14:10:51 +00:00
Liang Qi
37eb5a63b7 Merge remote-tracking branch 'origin/5.11.3' into 5.11
Change-Id: Iaa9c11ed5435e297e87b225060ea892bdb18deef
2018-12-09 20:32:46 +01:00
Liang Qi
bb0a12e410 Update submodules on 'dev' in qt5
Skip qtdeclarative in this round due to QTBUG-72294.

Change-Id: I02dadd44227e8472d2f293d808c6c3eb44f18b66
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-12-05 20:26:14 +00:00
Qt Submodule Update Bot
e49086eb0d Update submodules on '5.11' in qt5
Change-Id: I07f616fb66b4b3e0f2a5a216c9fe56c0a0f42d6e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-12-04 04:31:00 +00:00
Qt Submodule Update Bot
061cf1f2ca Update submodules on '5.12.0' in qt5
Change-Id: I17131af760308b6520dd702eaf7aaf03b9a7d706
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-12-03 19:06:04 +00:00
Qt Submodule Update Bot
785042ea87 Update submodules on '5.12' in qt5
Change-Id: Ibd42172f2b956c18c692bf125390554e5868a438
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-12-03 18:25:11 +00:00
Qt Submodule Update Bot
c6b7e8d8a8 Update submodules on '5.11' in qt5
Change-Id: Idbb6f72e0092d564d76c81f41470e5d687864a00
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-12-01 07:49:11 +00:00
Liang Qi
d15a5b8841 Update submodules on 'dev' in qt5
Skip qtbase in this round.

Change-Id: I72eb2d8ddca7f536d18956952a0c54f69b2d63f0
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-12-01 01:26:07 +00:00
Jędrzej Nowacki
e8e76d256b Fix handling of structs by clang format
Our coding style expects classes to have opening braces on a new line.
Structs and classes are the same.

Before the patch:
 struct Foo {
    ...
 };

After the patch:
 struct Foo
 {
    ...
 };

Change-Id: Ifab8a402d03ef2fd75b939f39274887feedc7b1b
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2018-11-30 15:50:58 +00:00
Qt Submodule Update Bot
2d30a2442c Update submodules on '5.11' in qt5
Change-Id: I7f6500a82a0967a0adafe719647f40013457a2a5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-11-30 15:15:37 +00:00
Qt Submodule Update Bot
5a1c876ec7 Update submodules on '5.12' in qt5
Change-Id: Id7db93fe860bd6986e4565c91fa03674306b7b88
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-11-29 21:31:07 +00:00
Tony Sarajärvi
4de6c12b17 Don't set http_proxy in its own subshell
The subshell actually meant, that the http_proxy environment
variable was never seen outside that check. Thus proxy was never
used where this was checked.

Change-Id: I069f43f13dffca98d8b60a47c2e105209018c84d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2018-11-29 20:20:26 +00:00
Gatis Paeglis
22e5bda9a9 provisioning: RHEL-7.4 install xcb-util-* packages
We do install them on Ubuntu and openSUSE. Eventually we want to stop
using bundled xcb libraries. Currently all builds of Qt on Linux use
-qt-xcb switch (see coin/src/targetenvironments.py::LinuxTargetEnvironment),
which is the reason why things build fine, even when packages are not
present on the system.

Change-Id: I856ddb5a17768b347aec3e593d6b969109a5c3a3
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2018-11-29 20:20:13 +00:00
Gatis Paeglis
d9a869707e provisioning: consistently install libxkbcommon* on linux distros
Ubuntu was the only distro that installed both of the required packages:

installPackages+=(libxkbcommon-dev)
installPackages+=(libxkbcommon-x11-dev)

RHEL 7.4 did not explicitly install any, but got libxkbcommon-dev
pulled in as gtk3 dependency. Extract from provisioning log:

--> Processing Dependency: pkgconfig(xkbcommon) >= 0.2.0 for package: gtk3-devel-3.22.30-3.el7.x86_64
---> Package libxkbcommon-devel.x86_64 0:0.7.1-1.el7 will be installed

openSUSE explicitly installed libxkbcommon-devel, but not libxkbcommon-x11-devel.

Qt official binaries are built on RHEL, where we do not have
libxkbcommon-x11-dev installed. This means that XCB plugin and
Compose input plugin would fallback to using bundled sources.
It was actually desired until now that XCB/Compose use the
bundled sources instead of linking with the library from the
system, but this was only a lucky side effect. If we had installed
libxkbcommon-x11-dev on RHEL, then Qt binaries would end up
linking with the libxkbcommon from the system, because of the
missing "-qt-xkbcommon" configre switch for release builds.
We won't bundle libxkbcommon anymore, hence we need to install
the missing dependencies, as done by this patch.

Change-Id: I5c7b8ac38c266ce81cb5a3189a9082bfd581ee31
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2018-11-29 20:19:57 +00:00
Qt Submodule Update Bot
1af77cdacf Update submodules on '5.11' in qt5
Change-Id: I809770ab61b7f7544f96b218f89f55c66360e7b8
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-11-29 06:42:42 +00:00
Qt Submodule Update Bot
6ea6c85f06 Update submodules on '5.12' in qt5
Change-Id: I3641f84b3395cbb306be44e01beefceb776b2ed5
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-11-29 06:42:34 +00:00
Qt Submodule Update Bot
820a1fbe7c Update submodules on '5.12.0' in qt5
Change-Id: Id850c3339ddc5fe82ee9c0ef13340e56001fbd15
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-11-28 04:11:02 +00:00
Juha Karjalainen
1deea3debc Provisioning: Update openssl to version 1.0.2p
Task-number: QTQAINFRA-2266
Change-Id: I3f09d9169f17bcd83dcfd72547440bca487fd9db
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 3b4ca5d6c0)
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-11-27 05:44:26 +00:00
Qt Submodule Update Bot
76b9b7dbd3 Update submodules on '5.11.3' in qt5
Change-Id: I57a880017b682818a6ff0d8d6aaca204a5a7e87f
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-11-27 05:44:22 +00:00
Qt Submodule Update Bot
7eff84a7e5 Update submodules on '5.12' in qt5
Change-Id: I522ab6944a7d30421e8087c9406c383c004cf7a7
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-11-25 08:48:33 +00:00
Liang Qi
a55b732053 Update submodules on 'dev' in qt5
Skip qtbase in this round.

Change-Id: I40329a2263b6c32046fe867aef55e229574915d2
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-11-23 19:52:35 +00:00
Qt Submodule Update Bot
4f4361e9fd Update submodules on '5.12' in qt5
Change-Id: I8259419a5f66db5da640c0d39fcc8a4410634767
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-11-23 08:12:30 +00:00
Ryan Chu
3ae624cd6e Docker Provisioning: Remove the fixed version of package dependencies
Free the dependencies of the specific Ubuntu packages. Ensure that test
server is using the latest version of the Ubuntu packages to test
network changes. Otherwise, all the docker files need to be manually
updated when upgrading to the next Ubuntu version (e.g. 18.04).

For debugging purpose, the installed packaged will be listed in the
provisioning logs.

Change-Id: I38d119d11f33cfd60dc34fcd57ec0fe1615e98f2
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2018-11-22 07:57:53 +00:00
Qt Submodule Update Bot
8437deb219 Update submodules on '5.12' in qt5
Change-Id: I3cf40a50955c7de9808932c14a50433c30828322
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-11-22 07:57:49 +00:00
Qt Submodule Update Bot
5c4d85a9b9 Update submodules on '5.11.3' in qt5
Change-Id: I82d312c03bf12d9afe81316aad9a41bd4c4859e3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-11-21 06:34:37 +00:00
Liang Qi
0c839f87fb Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
	coin/provisioning/common/unix/mqtt_broker.sh

Change-Id: I990dbf66b7120f2f1bcf202f0a2547a5ad9881f2
2018-11-20 19:37:06 +01:00
Qt Submodule Update Bot
2a4eafbc77 Update submodules on '5.12' in qt5
Change-Id: I00f8fe0ed2f8dd23ccb8bd093485f7d14bf15181
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-11-20 18:00:43 +00:00
Qt Submodule Update Bot
a9a4b97c70 Update submodules on '5.11' in qt5
Change-Id: Iaf5b3d17d80e26c1c205f5f18e16325ac9997484
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-11-20 04:30:56 +00:00
Qt Submodule Update Bot
07b6c0554b Update submodules on '5.12.0' in qt5
Change-Id: Ice89787923481000fca0409665a366ab8c3540be
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-11-20 04:06:57 +00:00
Qt Submodule Update Bot
50b85b0d38 Update submodules on '5.11' in qt5
Change-Id: Ifb302b8a2674c775e37605658f5451cf41eb0c58
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-11-17 21:23:23 +00:00
Qt Submodule Update Bot
0b488e88e7 Update submodules on '5.12' in qt5
Change-Id: I0006d5ddd851caaac5939ab2d0af2b2a09d3fdd3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-11-17 09:10:45 +00:00
Qt Submodule Update Bot
579d0ff553 Update submodules on '5.12' in qt5
Change-Id: I4a85369e42e3b8fe36ee754e46d8f9cc482e901d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-11-16 10:39:44 +00:00
Qt Submodule Update Bot
efb253f031 Update submodules on '5.12.0' in qt5
Change-Id: Ib05608e04fe7128046e0573e6c029262e2f8280b
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-11-15 20:03:18 +00:00
Qt Submodule Update Bot
ac63ffa071 Update submodules on '5.12' in qt5
Change-Id: I8e14dc23368e1eef5cefe9696adc3dd75affa501
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-11-15 07:20:49 +00:00
Qt Submodule Update Bot
3094200a9f Update submodules on '5.12' in qt5
Change-Id: I9eed8d0a199294a41568c21640cf88b462035304
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-11-14 08:31:07 +00:00
Qt Submodule Update Bot
5b1848c02a Update submodules on '5.11' in qt5
Change-Id: Id003008d7ca8599fc4e1c5c06997659a04370ce3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-11-14 08:22:16 +00:00
Qt Submodule Update Bot
fbf22546be Update submodules on '5.11.3' in qt5
Change-Id: Ie32ea1823a1e4d33d4077db3c5d856b3ea216d90
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-11-13 18:40:34 +00:00
Qt Submodule Update Bot
fb83a49c30 Update submodules on '5.12' in qt5
Change-Id: Ic1a6f9bd8ec1ee005d437f81f8cda3348ce9ea72
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-11-13 05:54:35 +00:00
Heikki Halmet
84aaa89cf4 Provisioning: Fix path for fbx files
Currently Qt3d Studio build don't recognize fbx path because of space
in folder name. This change will fix it by taken use the packages which
don't have space in the folder name.

Task-number: QT3DS-2440
Change-Id: I502bb04489a03a5a81e164f8a86f3200f4ec3910
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
2018-11-13 05:51:53 +00:00
Liang Qi
72b60b23f3 Update submodules on '5.12' in qt5
Skip qtdeclarative in this round due to QTBUG-71705.

Change-Id: Ic62440612e135c1cb8c5e740f4c13de7d37565bf
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-11-12 17:12:05 +00:00
Eike Ziller
7156b83710 Provisioning: Install perl on Windows 10 32-bit
Needed for Qt Creator build.

Change-Id: I5674f159de456a925e7a695546a53537f2517376
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-11-12 08:21:46 +00:00
Heikki Halmet
c89d9ed357 Provisioning: Add Rhel 6.6 for QtCreator
QtCreator need's to have provisioned Rhel 6.6 available.
(Partially) Reverts 54261be7c3

Task-number: QTQAINFRA-2270
Change-Id: Ie73c09181e0586dd0f4e9977208c9188037843d9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-11-12 08:21:43 +00:00
Qt Submodule Update Bot
161c7e79ac Update submodules on '5.11' in qt5
Change-Id: I468056d9f0f591e259125814b2ecaed2f323135b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-11-12 04:30:56 +00:00
Qt Submodule Update Bot
caf4c58941 Update submodules on '5.11.3' in qt5
Change-Id: If25a7c3df9d53ff3bd84b75a1dd775e5ab9cd35f
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-11-11 20:42:04 +00:00
Qt Submodule Update Bot
d649cc3740 Update submodules on '5.11' in qt5
Change-Id: I64984b9043e20918c6876bc5941b66dcdee257a4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-11-11 19:04:28 +00:00
Qt Submodule Update Bot
6c624aa570 Update submodules on '5.12.0' in qt5
Change-Id: I8c971bdcbbca07a8ec03cc4a3dda56ada4afcd00
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-11-11 18:59:51 +00:00
Qt Submodule Update Bot
c17352fc12 Update submodules on '5.11.3' in qt5
Change-Id: Ibf09137346dd0aef4f3dc0a784ad9f4c450f068a
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-11-09 21:47:12 +00:00
Qt Submodule Update Bot
829447d340 Update submodules on '5.12.0' in qt5
Change-Id: If218ebc667e5378b1a2527f42c93c456045f1f45
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-11-09 13:10:15 +00:00
Heikki Halmet
4d15cea11a Provisioning: Update Java to 1.8.0 version in Rhel 6.6
Currently Rhel 6.6 have too old Java version for Jenkins. This need to
be updated so that machine can connect with Jenkins.

Task-number: QTQAINFRA-2377
Change-Id: I653df6f1f060bdc12164cc407fcc4cd873d2b24f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-11-08 13:52:01 +00:00
Matti Paaso
f335f71d02 Add new targets for packaging Jenkins
Change-Id: If2a769ef74ef01f663cc7673477346009d593e38
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-11-08 13:51:34 +00:00
Qt Submodule Update Bot
3debc56a2d Update submodules on '5.11' in qt5
Change-Id: If42e9fef6d7d56d6bff98fbf79d06b3b99176221
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-11-08 04:31:03 +00:00
Heikki Halmet
1248a6787d Provisioning: Add scp and ssh location in the PATH for Windows
RTA needs to have these on the PATH

Change-Id: I59694737e9284bc31eefcc4ff89219665c2aa430
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
2018-11-07 20:07:36 +00:00
Liang Qi
1bd6aab208 Update submodules on '5.12' in qt5
Skip qtbase in this round due to QTBUG-71550.

Change-Id: I8cd54eab0c1d6c7a95f6b97aac467dce9a9325da
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-11-07 20:07:27 +00:00
Qt Submodule Update Bot
471fa009d9 Update submodules on '5.11' in qt5
Change-Id: Ibcc62dda910fb662ff85c840ca00cc31f17a8f00
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-11-07 11:56:35 +00:00
Heikki Halmet
7974f26b20 Provisioning: Disable notifications and remove apport
These can cause flakiness during tests

Task-number: QTQAINFRA-2307
Change-Id: Ib8b850e3e1fabe3070bbd27785d043984e085cb7
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-11-07 07:23:49 +00:00
Liang Qi
a4fc60b21c Update submodules on 'dev' in qt5
Skip qtbase in this round due to QTBUG-71550.

Change-Id: I245a30e6f731dbbbd6400756c161ed402861d43e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-11-07 07:10:48 +00:00
Qt Submodule Update Bot
092b611d80 Update submodules on '5.12.0' in qt5
Change-Id: Ie4dca9cdf3a39a21cd8c380204860ee578733463
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-11-07 05:00:29 +00:00
Simo Fält
5a040ca46a Provisioning: Move Android toolchain and config to win10
Installing Android toolchains and ssl headers to win10 template
and moving Android windows platform configs to win10 from win7.

Task-number: QTQAINFRA-1266
Change-Id: I9b3e3a378451e0bdfc7dc5c7b75ee035faf8994c
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-11-06 19:30:23 +00:00
Liang Qi
de05c3d5e8 Update submodules on 'dev' in qt5
Skip qtbase in this round due to QTBUG-71550.

Change-Id: I74b8b9ba8a7a5595acc916db78df25864a23b5f6
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-11-06 19:30:12 +00:00
Heikki Halmet
abe69c34bb Provisioning: Install chrpath for Jenkins
Task-number: QTQAINFRA-2270
Change-Id: I5afd9c6682ff6acb040ee069f3d7a179260f71d3
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-11-06 17:34:02 +00:00
Liang Qi
599370a6c4 Update submodules on '5.12' in qt5
Skip qtbase in this round due to QTBUG-71550.

Change-Id: I3eaa76e386a4d6a6b981a11a2eadd290059cb830
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-11-06 17:33:53 +00:00
Qt Submodule Update Bot
6d6e000932 Update submodules on '5.12.0' in qt5
Change-Id: I41d60616e029d96bb6580345a59ff906ded608d5
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-11-06 10:25:52 +00:00
Michal Klocek
417d293fa7 Add 'qttools' dependency for WebEngine
QtTools module is required for designer plugin.

Fixes: QTBUG-71404
Change-Id: I081740679dace196b9ff42d98bddd941848738f8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2018-11-05 18:13:19 +00:00
Qt Submodule Update Bot
e4707bcdff Update submodules on '5.12.0' in qt5
Change-Id: Ic6ce42f23f2e567e79d69180b986ae25e97ea1c7
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-11-05 18:13:02 +00:00
Liang Qi
9a9f358508 Graduate qtremoteobjects and qtwebglplugin
Change-Id: I07a55764a4a6900d233d4bcfa20344009a9add26
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-11-02 14:56:28 +00:00
Oswald Buddenhagen
3bb63c22c4 Adjust submodule branches
Change-Id: Iae1035a9633243bc39e86a6e9133a1263b40a750
2018-11-02 15:29:23 +01:00
Liang Qi
c1376f91df Update submodules on '5.12.0' in qt5
Change-Id: I2dc837b9d8e75176c5ecd3c42e17892676c1f65d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-11-02 11:21:46 +00:00
Joni Jäntti
7e67d0e558 Provisioning: RHEL-6.6: Update curl
The currently used version of curl does not support TLS 1.2 or newer.
Since download.qt.io has minimum requirement of TLS 1.2 we need to
update the these packages.

Task-number: QTQAINFRA-2212
Change-Id: I4737443b5b2180a592a18d9095fe3f31063ba329
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-11-02 07:59:24 +00:00
Ryan Chu
9dc75c3a3d Provisioning: Enable Docker-based test servers to macOS_10.12
Build and provision docker images of test servers into the docker-cache.

Relates to qt/qt5 ea76ace825

Change-Id: I3fbdd7a733669935c64575d50c209da9adf51f42
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2018-11-01 08:43:14 +00:00
Tony Sarajärvi
b082d7d544 Replace .ci.local addresses with .intra.qt.io in provisioning scripts
Change-Id: I5e5bc084faabb28ffdf0437871445ecb8970bfb3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-11-01 07:16:57 +00:00
Qt Submodule Update Bot
195799f36c Update submodules on '5.11' in qt5
Change-Id: Id39d804153ed5bd04545fdd5fd90ec3cb7de88cf
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-11-01 07:16:52 +00:00
Qt Submodule Update Bot
4eda836c8c Update submodules on 'dev' in qt5
Change-Id: I8920284e859de42a5c7bc5f3828c36bcd6ba5a98
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-11-01 06:23:35 +00:00
Joni Jantti
37eeb598cc Provisioning: PyPFD2
Required for reading PDF doc files in RTA tests.

Task-number: QTQAINFRA-2103
Change-Id: I4da98460fb5d5ad26f9e1e16c503a0d94be047a6
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit bb6a91d5d4)
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-10-31 19:39:10 +00:00
Heikki Halmet
1f07276692 Provisioning: Remove environment variables from androind-openssl
We shouldn't need those anymore.

Task-number: QTQAINFRA-1266
Change-Id: Ie2161eb1d05cc1af26cbbb1a46525a9a8d7c3a30
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-10-31 15:47:01 +00:00
Liang Qi
d3299a3d27 Merge remote-tracking branch 'origin/5.12' into 5.12.0
Change-Id: I41f6780d67aeb9e065d86f53feee71d38c00428f
2018-10-30 12:22:55 +01:00
Antti Kokko
01faa84629 Update qt3d-runtime.txt targets
Add missing macOS and Windows Android arm64 targets.
Remove iOS target that is now included in default.txt.

Change-Id: Ifc20336b94477b2f8be456ef7f7f8bfaf8bf1190
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-10-30 09:56:38 +00:00
Ryan Chu
ea76ace825 Docker Provisioning: Install Docker-based test servers on macOS
Build and cache docker images based on the configurations in testserver.
1. Move the shared Docker files to common/shared/testserver
2. Deploy boot2docker image into VirtualBox via docker-machine commands.
3. Build and tag the docker images by the SHA-1 of server context.

Change-Id: Ic5a588e5cc5e753ec4c4e2e1bc79917bbd03f95d
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2018-10-30 08:15:43 +00:00
Liang Qi
a76e315034 Update submodules on 'dev' in qt5
Change-Id: I1134ae427a2de7bbc08ef000b81e02ded1471bd8
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-10-30 08:15:39 +00:00
Qt Submodule Update Bot
82ca14ffd0 Update submodules on '5.12' in qt5
Change-Id: I33be3020b077a33f128f18bc920aa89746ba5590
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-10-29 17:29:18 +00:00
Oswald Buddenhagen
1af3c19fc8 commit template: add missing trailing space to Fixes footer
Change-Id: If966752eeebc7044a9a8ba5a2a66b8c03846c771
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-10-29 15:29:44 +00:00
Qt Submodule Update Bot
e6e78d4e36 Update submodules on 'dev' in qt5
Change-Id: Icddbe16baf8cff912e131068e73ca772c7520184
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-10-26 11:49:09 +00:00
Qt Submodule Update Bot
7ea65aec65 Update submodules on '5.11' in qt5
Change-Id: I2fd329c2d1097b89ab86768927b605af4c6e2a0f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-10-26 10:28:13 +00:00
Juha Karjalainen
3b4ca5d6c0 Provisioning: Update openssl to version 1.0.2p
Task-number: QTQAINFRA-2266
Change-Id: I3f09d9169f17bcd83dcfd72547440bca487fd9db
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-10-26 07:23:14 +00:00
Qt Submodule Update Bot
99f8704350 Update submodules on '5.12' in qt5
Change-Id: I38d842c7d9df454cd653ca48574023b25512c62c
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-10-26 07:22:38 +00:00
Qt Submodule Update Bot
70162c557c Update submodules on '5.12' in qt5
Change-Id: Iba893056096d70731449005033a5e3e13d6650c7
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-10-25 16:11:03 +00:00
Simo Fält
d65d71731f CI platform config: Make 32 bit msvc2017 config as default
Swapping 32 bit windows packaging configs so that MSVC 2017 is
built as default config and MSVC 2015 only for qt5.

As the config is not part of the default.txt we have to add it as
module specific config.

Change-Id: I3c423c2c80d0093fdeca340d6faa8e162c03b5cd
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-10-25 12:35:07 +00:00
Qt Submodule Update Bot
26cece9f93 Update submodules on '5.11' in qt5
Change-Id: I71eaf20c20124a8634e715aaee11bc0118a84a23
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-10-24 13:26:46 +00:00
Qt Submodule Update Bot
6d23debda8 Update submodules on 'dev' in qt5
Change-Id: I5b4d663b82af33c54a0f93515bd755cb7edec201
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-10-24 13:26:33 +00:00
Qt Submodule Update Bot
41b0fbb462 Update submodules on '5.12' in qt5
Change-Id: I86f12f4294fcda16d1aff7ee73681d9fef37403e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-10-24 11:39:38 +00:00
Qt Submodule Update Bot
96a07386fb Update submodules on '5.11' in qt5
Change-Id: I7cd87f5de55b09332b9bfcfd5d4532cbc09072fc
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-10-23 18:13:07 +00:00
Qt Submodule Update Bot
3f76170c93 Update submodules on '5.12' in qt5
Change-Id: Ia2c18f2579af6a1c3e0277cf73a1a219e14b5295
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-10-23 18:12:59 +00:00
Oswald Buddenhagen
ff2c96f483 Adjust submodule branches
Change-Id: I43f7c5c76e0cd646e506e7071e9e8c450bdc1b03
2018-10-22 15:52:09 +02:00
Qt Submodule Update Bot
ab7b56afe6 Update submodules on '5.11' in qt5
Change-Id: I2a43b09d5d15775ed17aaa782bb81741f1e15c1f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-10-22 00:20:14 +00:00
Qt Submodule Update Bot
4480ed8ab8 Update submodules on 'dev' in qt5
Change-Id: Iee06cc029a6322f205b314196fb4a41c52ecbcf3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-10-22 00:20:07 +00:00
Qt Submodule Update Bot
7d01b06b8f Update submodules on '5.12' in qt5
Change-Id: I8e2e7811ac09b65cb81b45c4aa48bf4e57885c71
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-10-22 00:19:52 +00:00
Qt Submodule Update Bot
b621cfd505 Update submodules on '5.12' in qt5
Change-Id: Ie8e19006d5e007e732ca0f68d8128ac3dfc8f498
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-10-21 09:33:06 +00:00
Liang Qi
4a8b97d020 Update submodules on 'dev' in qt5
Change-Id: I617a3480a3bc0fe333fe2ace90f1ee00238c9a98
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-10-21 09:22:35 +00:00
Liang Qi
16c6fa419a Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I34a18e1ea9ca774638ffe65d08d1fee46efba4aa
2018-10-20 14:17:57 +02:00
Tony Sarajärvi
4667cfc432 Update Android NDK and SDK on macOS envs
Task-number: QTQAINFRA-2244
Change-Id: I20994bc7a64edefda09da68c4beddde4dc9948aa
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-10-20 05:16:02 +00:00
Tony Sarajärvi
bc5e5baf55 Update Android NDK and SDK on Windows envs
Task-number: QTBUG-47672
Change-Id: I3e6526b296f15927b90ab3310d91f8505b0228b3
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-10-20 05:15:55 +00:00
Tony Sarajärvi
97efaacb2b Update Android NDK and SDK on Linux envs
Task-number: QTBUG-47672
Task-number: QTQAINFRA-2298
Done-with: Liang Qi <liang.qi@qt.io>
Change-Id: I42c87d8453423530173b826c09dc6eb4bf9ad5b8
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-10-20 05:15:40 +00:00
Qt Submodule Update Bot
bb1f484318 Update submodules on '5.11' in qt5
Change-Id: Id7020bdeb4cafb5e6fe83fcf8833b882695205c8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-10-19 10:47:06 +00:00
Qt Submodule Update Bot
6de2d1d211 Update submodules on '5.12' in qt5
Change-Id: I09368e4171c76cc52110b7778491d512d0d43de1
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-10-19 08:27:29 +00:00
Joni Jäntti
c51cbddc90 Provisioning: Windows_7_x86: libclang
libclang is required for qdoc.

Task-number: QTBUG-69793
Change-Id: I60b54b4338ed6fd3bae99813e268816e063c648a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2018-10-18 11:07:43 +00:00
Joni Jäntti
7e40cd3a7f Provisioning: macOS_10.13: Update Xcode and cmd line tools to 10.0.0
Xcode and command line tools version 10 have been released, we
should start building our Qt releases with it, both for iOS and
macOS.

Installing Xcode 10.0.0 requires OS version update to 10.13.6. A new
tier 1 image has been created with the updated OS and this change
takes it into use.

Task-number: QTQAINFRA-2274
Change-Id: Ida7df234ecfd356b2cb2545ae10cd501dc47197b
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2018-10-18 10:59:34 +00:00
Oswald Buddenhagen
4c2fea3d5d fix setting QTDIR_build for default_pre.prf
adding it to the super cache makes no sense, as that's read before
spec_pre.prf, which clears CONFIG. use the regular cache instead.

submodules do not inherit that setting, and they don't need to as per
comment.

also, don't keep adding it to the cache - the cache() function doesn't
check whether the added value is already present, so we need to do that
manually.

amends 31590c0b65.

Fixes: QTBUG-63452
Change-Id: I608559a80a7c772dbdaacfaaadb4fc268b442c39
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2018-10-18 10:59:31 +00:00
Qt Submodule Update Bot
4061156381 Update submodules on '5.12' in qt5
Change-Id: Ica33ddf6fa348ed65f7194127c80b6e539462e6a
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-10-18 10:59:28 +00:00
Qt Submodule Update Bot
0345ab91fb Update submodules on 'dev' in qt5
Change-Id: If9a481665755ad4758d22d3c2f8438e6c5e0c380
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-10-18 10:09:35 +00:00
Michal Klocek
b365b3853e Make quickcontrols1/2 and webchannel optional for webengine
Fixes: QTBUG-70784
Change-Id: I845216123f7638afd69b39d5da8020a449ab40b8
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2018-10-16 13:59:23 +00:00
Heikki Halmet
9573b78b56 Provisioning: Use /dev/null when dealing with passwords
This will prevent passwords showing in provisioning logs.

Task-number: QTQAINFRA-2261
Change-Id: I501fd3be64514c59a604c1116113eaf975208024
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-10-16 13:59:18 +00:00
Jani Heikkinen
0b1493a840 Add packaging feature for MSVC2017 32 bit build
Task-number: QTBUG-63708
Change-Id: Ib7897c5daffa49b014c95db5a6db9d350fe1a5e8
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2018-10-16 13:59:16 +00:00
Qt Submodule Update Bot
2863cdc7aa Update submodules on '5.11' in qt5
Change-Id: I4327f5eef196cdad0ea41c7e2b8e59ccaa637582
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-10-16 10:07:34 +00:00
Qt Submodule Update Bot
9597af1ae4 Update submodules on 'dev' in qt5
Change-Id: Ia36224250ccbcc677bfe75c082acf31407acdd51
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-10-16 08:46:15 +00:00
Liang Qi
ad4b13b71c Update submodules on 'dev' in qt5
Change-Id: I9677e735cc06b98c937ad2cd3cd8b00e05f2e3b0
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-10-13 19:23:12 +00:00
Qt Submodule Update Bot
d30c0366db Update submodules on '5.11' in qt5
Change-Id: I4a586ab957fc68b0afb2334048040e01f398a07b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-10-13 08:53:14 +00:00
Juha Karjalainen
0ac22704fa Provisioning: Disable powershell quickedit
Powershell quickedit causes powershell window freeze until quickedit
mode is exited by pressing enter. For some reason quickedit mode get's
activated during build. This causes time out as agent does not get
any output from processes.

Task-number: QTQAINFRA-2263
Change-Id: I2878cc7a39bae504f826c5622cc5817fd227d7f0
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-10-13 08:41:42 +00:00
Qt Submodule Update Bot
af7dd645c8 Update submodules on '5.12' in qt5
Change-Id: I93231f063bc3c3d29add8ade27803c8f87572dde
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-10-13 08:41:33 +00:00
Andy Nichols
80aa7d0018 Update qt3d-runtime platform_configs
Change-Id: I52ad38289e6a4b385a981bcf91933378651eafe7
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2018-10-10 11:26:02 +00:00
Liang Qi
6a650748d3 Update submodules on 'dev' in qt5
Change-Id: Id161e602ba99a8547257f96f5181607af24927d8
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-10-10 07:26:53 +00:00
Qt Submodule Update Bot
ab670f1967 Update submodules on '5.12' in qt5
Change-Id: If26ce4b6686cf5a704c9d64298a23159780a39e0
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-10-10 04:01:57 +00:00
Qt Submodule Update Bot
e05e24aa18 Update submodules on '5.11' in qt5
Change-Id: I0c458253ebe502ad13b40c6dda619ec9779e675e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-10-09 13:15:18 +00:00
Tony Sarajärvi
61c4be2c0b Add Android arm64 targets
Task-number: QTQAINFRA-2078
Change-Id: Icbc4fa27932e2a53d43bf1c72ddd2091f2801e5c
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-10-08 18:21:50 +00:00
Qt Submodule Update Bot
f06e9ff32b Update submodules on 'dev' in qt5
Change-Id: I9fa852a20f27256bd34029b5a2d5ec2cff1cac5f
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-10-07 19:07:29 +00:00
Liang Qi
9bfa486dd0 Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
	coin/platform_configs/default.txt
	coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh

Change-Id: Ie454d4eff0317cea2fec6870b5ca53f36ad2f191
2018-10-07 12:49:55 +02:00
Qt Submodule Update Bot
245815a620 Update submodules on '5.12' in qt5
Change-Id: Ibe3ea201ddcb9c555d458296e0f12fcc03fcf0e2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-10-07 08:19:45 +00:00
Joni Jäntti
7b9c3ced84 Provisioning: Ubuntu_16.04_x64: Use internal mirror
Currently the internal package mirroring is being enabled only after
the installation of the packages. It should be done before to
actually download them from the internal repo instead of the
official repos.

Change-Id: I4aeb2e463ae804bd2f8ce9536ab89fc26fedbdb5
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-10-05 12:04:46 +00:00
Joni Jäntti
ca36d5b3fa Provisioning: Ubuntu 18.04: Use internal package mirror
Using internal package mirror during provisioning reduces outgoing web
traffic by a huge amount.

Task-number: QTQAINFRA-2213
Change-Id: I6a63b51efbf411a712795a6347c2deeed6ac44d3
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-10-04 10:08:47 +00:00
Tony Sarajärvi
e85296ba98 Optimize macOS build targets by removing excess builds
Change-Id: I983f7558dabddf7e91f855dbead6dc0172db127c
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2018-10-04 08:03:27 +00:00
Qt Submodule Update Bot
260d66f94e Update submodules on '5.12' in qt5
Updated qtwebengine once againt to have a fix for getting beta1 out

Change-Id: I3de7ad0916e886722186f09da036ea7a398f363f
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-10-03 17:58:05 +00:00
Qt Submodule Update Bot
f0f31335e9 Update submodules on '5.11' in qt5
Change-Id: If72a35b56e4f1a1c102f60d2db543dd07c525dcd
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-10-03 04:31:14 +00:00
Qt Submodule Update Bot
bc7af0171f Update submodules on '5.12' in qt5
Change-Id: Idb32934a75413896c3a1ea64cd0a69a42d75e9f5
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-10-02 08:11:15 +00:00
Qt Submodule Update Bot
4e8b5bae5b Update submodules on 'dev' in qt5
Change-Id: I075115b833822c74887629fdde4f21d5ddc57f72
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-10-01 09:31:24 +00:00
Qt Submodule Update Bot
269e38c27c Update submodules on '5.12' in qt5
Change-Id: I1705b1d1b99f4a547bcd6c0c7d17a65f61aea44a
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-10-01 09:10:16 +00:00
Qt Submodule Update Bot
cc5b03d6ca Update submodules on 'dev' in qt5
Change-Id: Ie1f9ff96a8cabdfa01d4f6d26aedc49d81f8cb3d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-09-30 15:28:43 +00:00
Qt Submodule Update Bot
74ab43ba23 Update submodules on '5.12' in qt5
Change-Id: Ib44fb3e8fa52ff72bbe7f92630635a5158a02ed2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-09-30 14:06:37 +00:00
Liang Qi
d58cfd0db9 Update submodules on '5.12' in qt5
Skip qtbase in this round.

Change-Id: Ia649f87c2bc71d9e755b665ef9bc86e2f63f8d0d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-28 05:40:46 +00:00
Tony Sarajärvi
f35067c7c3 Set timezone to GMT in macOS'es
macOS doesn't support UTC, so we'll go with GMT.

Task-number: QTQAINFRA-1641
Change-Id: Ifae9547b010c293c4a2cb18252e8f18961a4456a
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2018-09-27 18:09:38 +00:00
Qt Submodule Update Bot
0e4743cabf Update submodules on '5.11' in qt5
Change-Id: Ie4b2b37794d3cfad7da7c7449d287369c5b6315b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-09-27 08:57:36 +00:00
Tony Sarajärvi
5e3511c0c6 Remove Ubuntu 16.04 from the CI
This one also removes the provisioning scripts
for both x64 and x86 envs.

Task-number: QTQAINFRA-2182
Change-Id: I56f109e4600f46a4d11de8d2dbdcdcd08cb896f3
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-09-27 06:49:07 +00:00
Qt Submodule Update Bot
1ce244fec0 Update submodules on '5.11' in qt5
Change-Id: Iff73075fe2038d7d1f7fc0853723004b263e994a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-09-26 10:30:13 +00:00
Liang Qi
7520be78cf Update submodules on '5.12' in qt5
Exclude qtwebengine in this round.

Change-Id: Iccbd8d5f4f4c016eab24f8b969aa485bb59a1d62
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-26 04:28:05 +00:00
Tony Sarajärvi
a620807118 Move QNX770 from macOS 10.12 to macOS 10.13
Change-Id: I02f0fff983349dd59f2697a050b97b761d04d3b5
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-09-24 17:13:22 +00:00
Tony Sarajärvi
f1256e1f39 Switch MinGW to clang in Windows Android builds
Also as target_compiler is a column now, let's
add the missing information about android target
compiler in the rest of the configurations as well.

Task-number: QTQAINFRA-1682
Change-Id: I6de1ea40383512f5fb8b55242f1a1ac264f9d7d6
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-09-21 16:33:36 +00:00
Tony Sarajärvi
00958e9430 Move packaging from macOS 10.12 to macos 10.13
Task-number: QTQAINFRA-2056
Change-Id: I04b0a282beedce15959b416d716b63bd6197b4a3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-19 08:18:21 +00:00
Qt Submodule Update Bot
04b1fb9adc Update submodules on '5.11' in qt5
Change-Id: I39b766717891eeeca7da66be4b61937f2dec80dd
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-18 08:30:08 +00:00
Qt Submodule Update Bot
713ed0c9b8 Update submodules on '5.12' in qt5
Change-Id: Ib09d0026a9427134822303cd05e7f696a5d15a28
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-17 13:04:44 +00:00
Liang Qi
a0d9b4605e Merge remote-tracking branch 'origin/5.11.2' into 5.11
Change-Id: Ia69cee4eaced64a0c46123a59918b984ab24317f
2018-09-17 10:47:59 +02:00
Liang Qi
a03ecaa7fd Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I433d7f0d4fd69509acc405b3de3979426dbbc660
2018-09-16 16:39:28 +02:00
Qt Submodule Update Bot
e4b9ccbbde Update submodules on '5.11' in qt5
Change-Id: Ia6d0831b5376b92d8e2a261fe9f5626d3f2fddaa
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-09-16 13:32:19 +00:00
Qt Submodule Update Bot
291aa4d366 Update submodules on 'dev' in qt5
Change-Id: I5df6396153e09c7505cb2acb9c8d541c7b8311a8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-09-16 13:30:23 +00:00
Qt Submodule Update Bot
e59a97be63 Update submodules on '5.12' in qt5
Change-Id: I4f74142bd95c043968a80b75ff4a8d69207595dc
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-16 07:54:56 +00:00
Qt Submodule Update Bot
01c2cf3d8c Update submodules on '5.11' in qt5
Change-Id: I7a43072f75fc3ab3fb1814593af0bf6910ac85c7
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-09-15 13:02:31 +00:00
Heikki Halmet
0e0d99d617 Provisioning: Support for Webassembly
This change will install specified packages of Emscripten and set up
the build environment for making binary artifacts of WebAssembly

Task-number: QTQAINFRA-1972
Change-Id: Ia5df6c208ea8f29ca8948f0273f321a59fc694a2
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
2018-09-15 10:06:47 +00:00
Tony Sarajärvi
c51c0a2b2e Fix shebang on QNX provisioning scripts for Ubuntu 18.04
Change-Id: I74393c3d0382daae9bd1e82a495be19ad2baf90e
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-09-15 10:06:43 +00:00
Qt Submodule Update Bot
d25341093a Update submodules on '5.12' in qt5
Change-Id: Ib41f214459b3e5dfc5f509871facc6c2212237ed
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-15 10:06:40 +00:00
Qt Submodule Update Bot
967d28eed2 Update submodules on '5.11.2' in qt5
Change-Id: Iffc768a304dedfd645219db18ce10fb77515710f
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-13 15:33:30 +00:00
Qt Submodule Update Bot
31d989af00 Update submodules on '5.11' in qt5
Change-Id: If048c9cde7b6374c844cba513658564fe476abc1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-09-13 14:42:50 +00:00
Kai Koehne
6dfe5c31f2 init-repo: Resolve alternate url for git sub-submodules
Do set correct --alternates argument for sub-submodules like
qtwebengine/src/3rdparty. So far these repositories were always
fully cloned from remote (or the mirror).

Fixes: QTBUG-61901
Change-Id: I19f5930a03ab9050b6e62ac5a5c78780d0544e03
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2018-09-13 08:53:29 +00:00
Qt Submodule Update Bot
1cfe79db61 Update submodules on 'dev' in qt5
Change-Id: I00ff4d749b6a51a005be8abae10a14fbc3209ed9
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-13 05:14:38 +00:00
Liang Qi
dada6497fb Merge remote-tracking branch 'origin/5.11' into 5.12
Change-Id: Iac3eb41931081588a08916ddce51dae977c6ef15
2018-09-12 21:50:27 +02:00
Qt Submodule Update Bot
384ca26700 Update submodules on '5.11.2' in qt5
Change-Id: Icf8612cbd19dcd417956ce4d56634e7f5a31369e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-12 19:49:09 +00:00
Joni Jäntti
974884c0d1 Provisioning: Rebase Ubuntu provisioning
Some provisioning changes made to Ubuntu 16.04 didn't make it to 18.04
when the new platform was introduced. These changes need to be included.

Task-number: QTQAINFRA-2210
Change-Id: Ie8c3cfda95abadbd3a416545ebcfbbab8c0cb4ad
Reviewed-by: Dominik Holland <dominik.holland@pelagicore.com>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-12 18:16:02 +00:00
Qt Submodule Update Bot
9a7969f76c Update submodules on '5.12' in qt5
Change-Id: I1f0cfca076840b06faf3ed8b606857be3f690e41
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-12 18:15:57 +00:00
Qt Submodule Update Bot
7bc473908e Update submodules on '5.12' in qt5
Change-Id: Icf10a073edbc1dde7868d4390dacd6935c037522
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-11 13:32:30 +00:00
Johanna Aijala
1cad3084a9 Use Squish 6.3.2 Qt5.10 on Qt5.12 RTA tests
Update to latest Squish versions that Froglogic is providing. May need
to update to Squish 6.4 later, but now we use 6.3.2.

Change-Id: I89e1f20b58cdd2e948c8021a5fdc357bfc201db1
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-11 13:32:27 +00:00
Joni Jäntti
36dbfa3b97 Provisioning: Add chmod +x to Squish .run file
This file needs execution rights before it can be run in provisioning.

Change-Id: Id49de89e0260b18a71cbcd4f4dc2b5a28e0a9890
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-09-11 13:32:23 +00:00
Tony Sarajärvi
d038ea6757 Provision GCC 8.2 to Ubuntu 18.04 and set as default compiler
The provisioning scripts supports prebuilt binaries. When available,
those are extracted taken into use. If they are not found,
sources are downloaded and built.

Task-number: QTQAINFRA-2066
Change-Id: Id1a59be2d1cbdb29d316ade572c3ce8f17ad3a6b
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-09-11 13:32:20 +00:00
Liang Qi
0a5c08be35 Update submodules on '5.12' in qt5
Skip qtbase in this round.

Change-Id: Id55013815613d188ffaf46d7eb9bdb8c46085898
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-10 13:00:22 +00:00
Liang Qi
e866953948 Merge remote-tracking branch 'origin/5.11.2' into 5.11
Conflicts:
	coin/platform_configs/qt5.txt

Change-Id: I430b2b99d1ed463d1750c6f1a5955bc0742f4b35
2018-09-10 10:12:36 +02:00
Qt Submodule Update Bot
e95824f59e Update submodules on '5.11' in qt5
Change-Id: I15c5af9f1985ad113fd63c3366bd7f4d8612e4af
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-10 07:38:43 +00:00
Qt Submodule Update Bot
fd4e4cceff Update submodules on 'dev' in qt5
Change-Id: Id3bf837247352541b72660b76e2a6dbaa807622f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-09 11:39:40 +00:00
Tony Sarajärvi
d038865e65 Fix license text of provisioning script
Change-Id: I542da038dd087b1705d1ceb475a1656eeec84c91
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-08 12:24:09 +00:00
Qt Submodule Update Bot
3a5feff2a2 Update submodules on '5.12' in qt5
Change-Id: I84ed5c723c9c3bef9f509a30502b93af2dde844b
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-08 12:23:52 +00:00
Qt Submodule Update Bot
bf0b84a051 Update submodules on '5.11' in qt5
Change-Id: Ie1bf232eae589efe512178d158aef2f3c09a2b7c
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-07 05:30:18 +00:00
Qt Submodule Update Bot
d6a82a8416 Update submodules on '5.12' in qt5
Change-Id: Ica545d4ea4639924b24dd6d75ff614075879955d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-07 05:13:44 +00:00
Qt Submodule Update Bot
a54910a07e Update submodules on 'dev' in qt5
Change-Id: I74b5ef2e3e68abf3cdb2e10277b43c00a6c22c52
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-09-07 02:31:14 +00:00
Qt Submodule Update Bot
8c1b4757fd Update submodules on 'dev' in qt5
Change-Id: If8edd2c5bfd297a6f13710cf5bea250488c862b8
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-06 21:10:02 +00:00
Liang Qi
a90fb8f83a Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I4e41d54d4b5fe12ca964583b4e7eba484e7b5336
2018-09-06 15:53:41 +02:00
Antti Kokko
6a919fb8f5 Use MinGW73 for building Qt3D runtime QNX targets
Change-Id: I0fc650345dcffe8840f440db74cf4d9d48465bf9
Reviewed-by: Simo Fält <simo.falt@qt.io>
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
2018-09-06 11:41:52 +00:00
Qt Submodule Update Bot
daae11c62b Update submodules on '5.11.2' in qt5
Change-Id: If0f3dc30be6ad8e10d81c0b8861c9523a07c0894
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-09-06 11:41:48 +00:00
Liang Qi
fd922eb4b1 Update submodules on '5.12' in qt5
Change-Id: Ifda91b5137093a660d23591f1252c4c8f1c2f2c7
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-06 11:30:35 +00:00
Joni Jäntti
ee9dd0d860 Provisioning: Ubuntu 18.04: Add required packages for b2qt
These packages are required for building b2qt module.

Change-Id: Ia6c5ffd95d4f778b23f381a6f1f5473aa11971e3
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2018-09-06 10:06:01 +00:00
Dominik Holland
7fe274f6f6 Correctly use pip3 to setup a wheel cache for python3 packages on linux
Previously pip was used (instead of pip3) which caused that python2
packages were installed into the python3 wheel cache folder. Some of
the packages also worked for python3, but not all of them.

Task-number: AUTOSUITE-195
Change-Id: I393d036667b14e11dee65975ba6933e7174d0e9d
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-09-05 05:53:59 +00:00
Qt Submodule Update Bot
db7391647f Update submodules on '5.12' in qt5
Change-Id: I16bee67a353e15b2d30207eb3c0979d25a449b5c
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-05 05:53:54 +00:00
Joni Jantti
83f6543be8 Provisioning: Move Android NDK to macos 10.13
Task-number: QTQAINFRA-2158
Change-Id: Iddf3bd2609e6b06b33cbe2258075157e91e52e8e
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-09-05 05:53:51 +00:00
Joni Jäntti
ccc960b6be Provisioning: Ubuntu 18.04: QNX700 and QNX660
RTA testing needs QNX platforms installed on Ubuntu 18.04 as well.

Change-Id: I8cf95dc5eb12761f82081bfda0973cc19a2864bc
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-09-05 05:53:47 +00:00
Qt Submodule Update Bot
040ca5e267 Update submodules on '5.11.2' in qt5
Change-Id: If055dba4544826db368e5d46bb8d6b622e08d892
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-05 04:40:45 +00:00
Qt Submodule Update Bot
72505cc55b Update submodules on '5.11' in qt5
Change-Id: I35ae3d03cfa8f5dd202218ffb7d2f0057eb41660
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-09-04 21:30:42 +00:00
Qt Submodule Update Bot
b9b8066d97 Update submodules on '5.11' in qt5
Change-Id: I89b673b1078c0ffab7e4710b2718008c46127bad
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-09-04 08:45:49 +00:00
Liang Qi
75e33d94bd Update submodules on '5.12' in qt5
Change-Id: I48c73c56b339a8e28b7c1641f3160aa8febf188d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-04 08:29:11 +00:00
Tor Arne Vestbø
b5a989133a Version Xcode application bundle when provisioning macOS images
By versioning the Xcode installation we open up for having multiple
Xcode versions installed on the same image in the future, which
allows for e.g. choosing the Xcode version in the build config.

By running xcode-select to choose the bundle, we ensure that
build steps that do not know that Xcode has been versioned
will still pick up the right compiler and SDK paths when
e.g. running xcrun -find clang.

Done-with: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
Change-Id: I0bd877bd344cebdd1fbf3a3035b00069f75c4c96
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-09-04 08:29:08 +00:00
Maurice Kalinowski
61ce2045be Provisioning: Add mqtt broker to Ubuntu 18.04
The broker is required to run tests of the mqtt module.
This is a followup of e89420945f which
was missing this part.

Task-number: QTQAINFRA-1983
Change-Id: Ibcc79aecbf1212ecc64150c911ecf296c7f58e19
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-09-04 08:29:05 +00:00
Tony Sarajärvi
7d0c343fc6 Cleanup of RHEL 6 codes from provisioning scripts
RHEL 6 has been removed in 5.12+ verifications, so no need
to maintain those changes.

Change-Id: Ie65120bf8ec7a7d0aaa71b7c28e95283263e62eb
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-09-04 08:29:01 +00:00
Tony Sarajärvi
413fcafc14 Change 'test suite' in license headers of prov scripts
Change-Id: I9687bcb15b26287ea6eeb2098079137d6e3fc288
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-09-04 08:28:58 +00:00
Joni Jäntti
7cbb032dc5 Provisioning: Fix vclib path on x86 machines
The path was incorrect for x86 Windows machines since they use "Program
Files" without the "(x86)" suffix.

Change-Id: Iecfee3b568a4d23b056fab230891f7eeb4d63cc8
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
2018-09-04 08:28:55 +00:00
Liang Qi
c478262c26 Update submodules on '5.11.2' in qt5
Change-Id: Iebe3db08c265da0185b58c67aeae3765f8eb5616
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-03 19:38:40 +00:00
Heikki Halmet
c870b9b13f Provisioning: Disable mlocate from linux
No need to update the locate database

Task-number: QTQAINFRA-2099
Change-Id: Iae8bf26e4b04ff9c287e9e3f4cc6f492e74355e4
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-09-03 19:38:37 +00:00
Heikki Halmet
967129344a Provisioning: Remove update-manager
Task-number: QTQAINFRA-2104
Change-Id: Ieaf0801099d8c90821c2b8d9db7da47730fd8abb
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-09-03 19:38:34 +00:00
Heikki Halmet
cd9b6276b8 Provisioning: Disable Cracklib-runtime
Task-number: QTQAINFRA-2104
Change-Id: I784fa1b3d8c98d765bfdea929fdb494ca63e09d3
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-09-03 19:38:32 +00:00
Liang Qi
0be0d5a10c Update submodules on 'dev' in qt5
Exclude qtdeclarative in this round.

Change-Id: Ica63600c300475dbb7e5357efa7a77f8528de95d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-09-01 08:26:47 +00:00
Liang Qi
5024bd5725 Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I6c3472a0a6c7f1da8e7320cab5cc9b098bd574ba
2018-08-31 16:32:13 +02:00
Liang Qi
2e6a5787ef Update submodules on '5.12' in qt5
Exclude qtdeclarative in this round.

Change-Id: I74de8fc02d0c0295dc7746defe11bed50fb0ba5e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-31 13:37:51 +00:00
Frederik Gladhorn
8b4d267af7 Add Fixes: tag to commit template
Change-Id: I2ad6829901be73bd18a8785c2bee3acd3ba20bcc
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2018-08-31 08:35:56 +00:00
Frederik Gladhorn
5872e22f31 _clang-format: indent initializers with four spaces, not eight
Change-Id: I9fc644554bd326a3a54163072b7b9e06253a5ff2
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
2018-08-30 09:09:28 +00:00
Antti Kokko
f70c304b5e Add qt3d-runtime targets
Task-number: QT3DS-2126
Change-Id: Ibce83cbd513bc0083ac149ed453fc9eb217c1d7a
Reviewed-by: Simo Fält <simo.falt@qt.io>
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
2018-08-30 08:35:36 +00:00
Liang Qi
1b65a5d73a Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
	coin/platform_configs/default.txt
	coin/platform_configs/qt5.txt

Change-Id: Iaae974fbfad9130ead96d229829ab472c998e098
2018-08-30 09:50:50 +02:00
Joni Jantti
e89420945f Add Ubuntu 18.04 to the CI
Qt 5.12 will have both 16.04 and 18.04
LTS releases verified. Some configurations
are upgraded from 16.04 to 18.04.

Task-number: QTQAINFRA-1983
Change-Id: I1b5c2a1c23ce209040b3478cff21b7f6436a9b54
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-08-30 04:53:50 +00:00
Liang Qi
90e3bb68e6 Update submodules on 'dev' in qt5
Exclude qtdeclarative in this round.

Change-Id: Ie2d5d427fed014ddb32da17c6b58f5ee2f261ef7
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-30 04:52:58 +00:00
Qt Submodule Update Bot
5a2a93ddf4 Update submodules on '5.11' in qt5
Change-Id: Ibde23ec3cee72507c530db0e00c9037d84768890
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-08-29 21:30:44 +00:00
Frederik Gladhorn
e470da9d65 Make xmlpatterns depend on declarative
After moving the xmllistmodel into qtxmlpatterns we can reverse the
dependency. This will improve build times and cleaning up dependencies
makes sense in any case.

Change-Id: I560d51ee47167a0cb519b98a15e6eb9199b4cd79
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-08-29 05:50:07 +00:00
Liang Qi
cf405ea20e Update submodules on '5.12' in qt5
Exclude qtdeclarative in this round.

Change-Id: Iad9c2862709be91155a9a72af77fb769528768cc
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-29 05:50:00 +00:00
Liang Qi
2b2a639fb9 Unify the iOS/tvOS/watchOS builds in default.txt
Then we can save more virtual machines.

DebugAndRelease V.S. Release(build time):

qtbase
* iOS static: 14min, 57s : 11min, 35s
* tvOS: 17min, 24s : 9min, 38s
* watchOS: 16min, 36s : 9min, 46s

The longest ones, some win10 builds, are about 40 min. And the
longest ones for tests, are about 1 and half hours.

qtdeclarative
* iOS static: 19min, 10s : 12min, 19s
* tvOS: 20min, 35s : 12min, 55s
* watchOS: 15min, 17s : 9min, 59s

qtwebengine
* iOS static: 12min, 48s : 4min, 14s
* tvOS: 6min, 6s : 4min, 10s
* watchOS: 6min, 21s : 6min, 13s

Change-Id: I51618683de8ed0826120b8baaef1e2e11473283a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-08-28 19:02:05 +00:00
Qt Submodule Update Bot
7b029c8ca2 Update submodules on '5.11' in qt5
Change-Id: I37c29f60c68926fc6cd8b02d06ea139675f6c80e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-28 19:02:01 +00:00
Qt Submodule Update Bot
f767b01159 Update submodules on 'dev' in qt5
Change-Id: I55dc0bf5d0107b8a54278e7116aabfb81f45da16
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-08-28 16:30:09 +00:00
Tony Sarajärvi
3044d0d454 Enable autotests on macOS 10.13
Task-number: QTQAINFRA-1301
Change-Id: I65680f2a0fd42b7473da05f71a8f1cb3d733a360
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-28 16:29:52 +00:00
Liang Qi
e999cc7df9 Move iOS/tvOS/watchOS build host to macOS 10.13
Task-number: QTBUG-70180
Change-Id: I6b4b90883cccfdaedbeb0440b62a1b8290655838
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-08-28 05:05:48 +00:00
Liang Qi
02336a3ac0 Provisioning: need to install packages in Xcode
Task-number: QTBUG-70180
Change-Id: I23134b887bf7fa05e29bd16769fdb9c7f025764e
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2018-08-28 05:05:44 +00:00
Liang Qi
5f57766742 Update submodules on '5.12' in qt5
Exclude qtdeclarative in this round.

Change-Id: I1a4a5cbf3817b40e47701fdc5a0f6f4df18633c9
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-28 05:05:41 +00:00
Frederik Gladhorn
b54ad48585 Merge remote-tracking branch 'origin/5.11' into 5.11.2
Change-Id: I376800d8d095d483bbf5342d90fc5e013415e59a
2018-08-27 15:54:13 +02:00
Simo Fält
d0d326dddd Replace MinGW 5.3.0 with 7.3.0
Task-number: QTQAINFRA-1289
Task-number: QTQAINFRA-1389
Change-Id: Ic6f637170cd4b98ece45811e66dbb21dc3ee66e3
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-08-26 19:16:55 +00:00
Qt Submodule Update Bot
aab459709f Update submodules on 'dev' in qt5
Change-Id: Ie4a7236b6930c030a89f0fcde20b3c87aa3d147d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-08-26 15:30:25 +00:00
Qt Submodule Update Bot
a11917306e Update submodules on 'dev' in qt5
Change-Id: Ic292d5bbb54f9fb865e8cc6209100342a4cc1952
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-25 19:41:27 +00:00
Heikki Halmet
a2289e9b4e Provisioning: Change mesa_llvmpipe to use ci-files01-hki as primary url
This will reduce download time

Task-number: QTQAINFRA-2170
Change-Id: I8313764f7d440e2300a8efabfe4e4226a591d339
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-08-25 07:09:14 +00:00
Heikki Halmet
32fcfb08ce Provisioning: Change jom to use ci-files01-hki as primary url
This will reduce download time

Task-number: QTQAINFRA-2169
Change-Id: If36ac57daa7066cdd97d5d893a105b812e0eee18
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-08-25 07:09:11 +00:00
Qt Submodule Update Bot
6945c8487c Update submodules on '5.11.2' in qt5
Change-Id: I63679cff0e7469b9483e521dfa5f59d355e6562e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-25 07:09:07 +00:00
Liang Qi
7e43cc3c7c Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: If94f226052c35a2400eaeeef450bf75c07367a6e
2018-08-25 00:02:02 +02:00
Qt Submodule Update Bot
5c1c629796 Update submodules on 'dev' in qt5
Change-Id: Iefc67aa6602258a06a35c37cda032e86687b4165
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-24 20:44:06 +00:00
Tony Sarajärvi
5745c4da94 Cleanup of unused macOS 10.10 provisioning scripts
Change-Id: Iae988527c2ed9a27bb724072064cd6d1dcd55f08
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-24 18:24:57 +00:00
Maurice Kalinowski
ba5211d85f Provisioning: Fix open62541 on msvc2015 x86/x64
The correct vcvars resides in Visual Studio 14, not 12.

Change-Id: I89e75b4c5c7806ac451f645b3bf341f588818040
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2018-08-24 18:24:53 +00:00
Simo Fält
0125d70806 Provisioning: Disable spotlight in macOS
While the VM we launch is a clean image the spotlight starts indexing
right after the boot. That seems to require quite a lot of resources.
Build machine doesn't need the feature, so we are disabling it.

Change-Id: I2c5f0030d7a687cfbded4e9bd4da70302cb0a933
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-24 18:24:50 +00:00
Simon Hausmann
9a7555e54d Fix failing assertions in QML when running under qemu
Unfortunately the user-space emulation mode of qemu does not implement
MADV_DONTNEED, which is a feature that the garbage collector of QML
relies on. Patch is submitted to the qemu list and included here to fix
the imminent issue we're seeing.

Task-number: QTBUG-68349
Change-Id: I2bb15513a1e5a7ad03eeae98d77691336985a20f
Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2018-08-24 18:24:47 +00:00
Qt Submodule Update Bot
c620015aac Update submodules on '5.11' in qt5
Change-Id: Icfc06ccf7128083957edc4478cd810cbb259186c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-08-24 07:22:49 +00:00
Tony Sarajärvi
096780db16 Drop testing of macOS 10.11 in the CI
The 10.11 configurations were bumped to 10.12 configurations.
The 10.12 packaging configuration will be deleted once autotests
have been enabled for 10.13 and packaging moved to 10.13 cross
the board.

Task-number: QTQAINFRA-2055
Change-Id: I17c598a306487e9a2f72006c3fa02e4ee683ee12
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-24 06:50:09 +00:00
Qt Submodule Update Bot
4b2a2d2d92 Update submodules on '5.12' in qt5
Change-Id: I82cbc9879fd675685e3ac4eb4b368f975c2a27a1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-08-24 06:50:05 +00:00
Liang Qi
2a439be756 Update qtbase manually
Change-Id: Ic48eee5dcf4b6f05713a6ab04c39cfcb6baa8bef
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-23 14:36:48 +00:00
Simon Hausmann
cdb1230145 Manual update of just qttools to pull in libclang build fix
Task-number: QTBUG-69793
Change-Id: I9852567a5268be62b45f605bc0e7a0248278c931
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-08-23 09:28:59 +00:00
Simon Hausmann
1e9fb7f9d9 Prospective fix for build of qttools on Windows with QNX target
This modules contains qdoc as a host build tool, which needs to be built
with MinGW 7.3 as host compiler in order for the libclang linkage to
succeed. That linkage is forced via QDOC_USE_STATIC_LIBCLANG, which is
set on the Windows 10 machine.

Task-number: QTBUG-69793
Change-Id: I2f0ce81c58ae049d9d59559dfe4f457d082cc98d
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-08-23 09:28:56 +00:00
Heikki Halmet
3dd549d618 Provisioning: Fix activate of static linking for libclang
Task-number: QTBUG-69793
Change-Id: Ib5151e16d0e040a63a3f7fce054f2fad6abb2b6d
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-08-23 09:28:51 +00:00
Qt Submodule Update Bot
c3e5f325bb Update submodules on '5.11' in qt5
Change-Id: I4f4c59dc396299e2c6a398521174e91cc7cac2ec
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-08-23 09:27:34 +00:00
Qt Submodule Update Bot
f35a0cb742 Update submodules on '5.11' in qt5
Change-Id: I4195ceeeefeb98c8d600b86079f986d2d18e6884
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-08-22 04:31:17 +00:00
Qt Submodule Update Bot
6b6f337925 Update submodules on '5.12' in qt5
Change-Id: Ie06d6075cf0f157f892e829dabdf5890a646b4ce
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-21 15:13:59 +00:00
Qt Submodule Update Bot
79c3ea18ed Update submodules on '5.11' in qt5
Change-Id: I3b4d492fcaca7b1519fea144a944aefda68299ef
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-08-21 10:37:49 +00:00
Liang Qi
5360fc7fcf Merge remote-tracking branch 'origin/dev' into 5.12
Change-Id: I593555fd39b6499d241acb00cc656bcdbef83d77
2018-08-21 09:26:11 +02:00
Tony Sarajärvi
92088b295c Upgrade Xcode to 9.4.1
Task-number: QTQAINFRA-2136
Change-Id: I57f64c3dc3b91f21bb6d42ab5dc5163db75120b9
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-20 19:02:25 +00:00
Qt Submodule Update Bot
6c225347aa Update submodules on '5.11.2' in qt5
Change-Id: I34da23765b048c8e3348d6ac05b18598bfefcd83
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-20 16:16:31 +00:00
Liang Qi
42f4bdd051 Update submodules on 'dev' in qt5
Change-Id: I15b2964fb22fdac38f172b2a24852fb90a255649
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-20 15:47:47 +00:00
Oliver Wolff
f8086955b3 Provisioning: Install debug version of vclibs for UWP usage
RTA relies on the availability of debug vclibs. The frameworks are usually
installed on first usage by Visual Studio, but as we use winrtrunner, we
have to install the packages manually.

Task-number: QTBUG-69809
Change-Id: I66cc4b04062afe634345cddc8ab4d001778274cc
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-08-20 13:23:49 +00:00
Qt Submodule Update Bot
8a559f20e3 Update submodules on '5.11' in qt5
Change-Id: Id6f78adf7c0c3f455b798ad1bc80c7097b519e0b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-08-18 20:52:25 +00:00
Joni Jantti
6077565b3e Provisioning: openSUSE_42.3: Wait for PackageKit to finish
Provisioning sometimes fails if PackageKit is locked at the moment we
try to remove plasma5-pk-updates package.

Task-number: QTQAINFRA-2141
Change-Id: I5e6c2ecab87033ce01aae915813e1d5f70ea8186
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-08-17 16:01:57 +00:00
Maurice Kalinowski
21b3591580 Provisioning: Update MQTT broker
Required to get shared subscription testing working, namely to fix
https://github.com/eclipse/paho.mqtt.testing/issues/56

Change-Id: Ib8657cde0d8e33135bbc2ebcb9558f8e6b13e40f
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2018-08-17 16:01:51 +00:00
Qt Submodule Update Bot
50ef5744f5 Update submodules on 'dev' in qt5
Change-Id: I3968edabb171ffaf9d498f8aaad90843a04fb9ee
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-17 16:01:48 +00:00
Oswald Buddenhagen
e49e7fc8ad Adjust submodule branches
Change-Id: Ie460cb41d050c1b73e71278469a8231e294db3e3
2018-08-17 16:03:52 +02:00
Oswald Buddenhagen
31590c0b65 set QTDIR_build in .qmake.super
this suppresses license checking in default_pre.prf in the super module.
submodules set it via their .qmake.conf's.

Change-Id: Ic3599613140169eeacb48385be8f324c4bef8f1a
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2018-08-17 13:57:40 +00:00
Qt Submodule Update Bot
d4479f59f8 Update submodules on '5.11' in qt5
Change-Id: I78af59a68a665f7dec71495a58bf4c2e9e23ade3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-08-17 11:13:36 +00:00
Liang Qi
530a923e68 Update submodules on 'dev' in qt5
Change-Id: Ibc222c15fe9a02dd4ed34fb3cd4724180bb45680
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-17 07:17:36 +00:00
Qt Submodule Update Bot
82401c04df Update submodules on '5.11' in qt5
Change-Id: I4c4d079e17fbab5d98b35a9f9311052ac036bb64
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-16 18:42:31 +00:00
Liang Qi
02b7a0b984 Update submodules on 'dev' in qt5
Change-Id: Ibe68c18b979b20890cfcbfdbedb1620f7914bba4
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-16 17:50:20 +00:00
Qt Submodule Update Bot
c8016c0093 Update submodules on '5.11' in qt5
Change-Id: If4f598db669ad39d1a0f1042d3666a548aeb3370
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-16 04:16:53 +00:00
Liang Qi
c00f007d32 Update submodules on '5.12' in qt5
Exclude qtbase in this round.

Change-Id: I0b4c1359b5f5016a1732a290d8e0affa50182e69
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-15 08:16:58 +00:00
Liang Qi
ab25e989b1 Update submodules on 'dev' in qt5
Exclude qtbase in this round.

Change-Id: I9b781f1add1dea2723e799928db253720b1f2bbd
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-15 08:11:25 +00:00
Liang Qi
726cfcb376 Update submodules on 'dev' in qt5
Exclude qtbase in this round.

Change-Id: I5cc23b431b7a02ad81bba67af3b124b169f02507
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-15 06:07:22 +00:00
Qt Submodule Update Bot
53a457820c Update submodules on '5.11' in qt5
Change-Id: Ie97b7d21aeb8326256943a646dce4271405f6982
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-08-15 04:31:14 +00:00
Ryan Chu
23560769c1 Provisioning: Update QEMU toolchains of boot2qt
Docker-based test server needs mdns to resolve .local while testing qt
network stack in CI. Otherwise the tests would not see announced
services.

Relates to yocto/meta-boot2qt 7608ebe44f65f4d525081cf9a5b12cfa05792a8f

Change-Id: If834b01668bcf844e475e863eb1337849c718270
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2018-08-14 21:08:29 +00:00
Oswald Buddenhagen
8b46f403c8 Adjust submodule branches
Change-Id: Ia24ec2ff93495eed938c5dddab83934327ced02e
2018-08-14 13:00:09 +02:00
Qt Submodule Update Bot
ff39808a80 Update submodules on '5.11' in qt5
Change-Id: Ic2fbb75fb89fe0d5ef8204a0ca56dbb8c20aa47d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-08-12 08:50:46 +00:00
Liang Qi
013d1fd540 Update submodules on 'dev' in qt5
Exclude qtbase in this round.

Change-Id: Ie6f33cfdba6f17c105660263c444a7386561d038
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-11 21:01:28 +00:00
Qt Submodule Update Bot
c5d9951e7f Update submodules on '5.11' in qt5
Change-Id: If6a2c0aaa5d8c906c5b128780e96e287229b0aa8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-08-11 11:25:52 +00:00
Qt Submodule Update Bot
f785a27eac Update submodules on '5.11' in qt5
Change-Id: Idc7f48f35f25f8b9373aee159ebf742338bc5a50
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-08-10 12:48:24 +00:00
Maurice Kalinowski
bc644fd6c9 Provisioning: Update Open62541
Change-Id: I1a1402f80d31d6063cca1838e0b7c3ebbe2d876c
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jannis Völker <jannis.voelker@basyskom.com>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
2018-08-09 13:30:16 +00:00
Joni Jantti
bb6a91d5d4 Provisioning: PyPFD2
Required for QSR documentation.

Task-number: QTQAINFRA-2103
Change-Id: I4da98460fb5d5ad26f9e1e16c503a0d94be047a6
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-08-09 13:30:11 +00:00
Joni Jantti
33276c1719 Provisioning: Win10_x64: Remove MS Zune Appx packages
Windows 10 has these Zune Audio and Zune Video packages installed that
often open up automatically when accessing the VMs through VNC for
example. Removing the packages gets rid of this annoyance.

Task-number: QTQAINFRA-2121
Change-Id: I09aa276fcb06ad84321709e64bcfd71fbd33c657
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-08-09 13:30:08 +00:00
Joni Jantti
19f1bf803c Provisioning: OpenSUSE_42.3: Set GRUB_TIMEOUT to 0
Setting the grub timeout to 0 will save us some time during the bootup
phases.

Task-number: QTQAINFRA-1703
Change-Id: I6dc6fbac0cfe54608068531eba4808cf87cf435c
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-08-09 13:30:06 +00:00
Liang Qi
27c5523b3d Update submodules on 'dev' in qt5
Exclude qtbase in this round.

Change-Id: Id70accc133763b3570c19630e7161215f326fd84
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-09 13:30:02 +00:00
Qt Submodule Update Bot
fe66f9a927 Update submodules on '5.11' in qt5
Change-Id: I5513ef5d623e23ec68934cf129efa60eeee58bf2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-08-09 01:34:03 +00:00
Simon Hausmann
76d922b211 Add soft qtdoc => qtquickcontrols 1/2 dependency
The photoviewer demo imports QtQuick Controls 1 and the coffee demo
imports Qt Quick Controls 2. This is a run-time dependency for dynamic
builds, but for static builds it becomes a build time dependency.

Change-Id: Ie8d7dcf85c2dfe93033fa9254ee350fb654475c3
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2018-08-08 14:13:28 +00:00
Oswald Buddenhagen
0a65cf0e9c add soft dep qtdoc => qtmultimedia
at least the maroon demo will use the multimedia module if available.

Task-number: QTBUG-69823
Change-Id: I7e0f7103aaf1a33a755b9a362274273a9b997f37
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Martin Smith <martin.smith@qt.io>
Reviewed-by: Alexander Shevchenko <sav_ix@ukr.net>
2018-08-08 10:21:09 +00:00
Ryan Chu
4ece0e74ef Update provisioned boot2qt version from 2.3.1 to 2.3.4
Docker-based test server needs mdns to resolve .local while testing qt
network stack in CI. Otherwise the tests would not see announced
services.

Relates to yocto/meta-boot2qt 2f17ab34687ef100c4390057dd220ab431ec8ff8

Change-Id: I5313fc34634211ae6950769518c68c2b11d77eb3
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2018-08-08 10:02:53 +00:00
Qt Submodule Update Bot
1b7b7b363f Update submodules on 'dev' in qt5
Change-Id: I0dec993ba45ada4bf0d5e8f95d511f85b3c8246b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-08-08 09:28:48 +00:00
Qt Submodule Update Bot
5088f70e7c Update submodules on '5.11' in qt5
Change-Id: I990522ab7bca86409285b39aa6a9e5d74df9653c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-08-08 07:50:49 +00:00
Joni Jantti
07e349546c Provisioning: Update QNX packages with security patches
BlackBerry has released security updates for QNX 7.0.0 and 6.6.0 that
we want to include in CI since out customers will most likely have them
installed.

Task-number: QTQAINFRA-1535
Change-Id: I6f38ca8831bb91609f79385a2dcbc51302f68eb8
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-08-07 18:11:43 +00:00
Qt Submodule Update Bot
7c6f78a52e Update submodules on '5.11' in qt5
Change-Id: I670025f9dbbdcaa67f211fb6f5dd616b1a428b1c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-08-07 08:37:14 +00:00
Liang Qi
d746bc3ea8 Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
	coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh

Change-Id: If414fac20cc1cddd155a9f9c8048d0ad76ac54ef
2018-08-06 11:31:33 +02:00
Qt Submodule Update Bot
a43a23f7d1 Update submodules on 'dev' in qt5
Change-Id: Ibe8b3b0b97289dff2dd8b91a25028e0aa53875ac
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-08-06 07:45:07 +00:00
Qt Submodule Update Bot
a4654e2aaa Update submodules on 'dev' in qt5
Change-Id: I890f8b105ff51503737f757cf4d681d5029b22a1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-08-05 15:27:19 +00:00
Qt Submodule Update Bot
00730d1caf Update submodules on '5.11' in qt5
Change-Id: Ibe011d723e946afb21d6631ba0b6c9ef25aa9e43
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-08-05 15:27:11 +00:00
Kai Koehne
8646f7cf9e Remove outdated archive names from README
There are no distinct commercial and opensource source archives anymore.
Some people do also build from git, so adding the archive name
here is just misleading. Given that users read the README, they arguably
should know already where the sources are ...

Change-Id: I42aac84cd0c904b7b6f2dbb19cacf8b3021f6b21
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-08-04 12:12:11 +00:00
Maurice Kalinowski
53f4bb2d92 Provisioning: Update MQTT test broker
Updates required for latest MQTT5 features and fixes.

Change-Id: I63e967efafbe1b22800e338b6c431febe3389a45
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-08-04 12:12:06 +00:00
Maurice Kalinowski
f2fae0b7b1 Provisioning: MQTT: Switch download order
We should try the internal ones first.

Change-Id: Id0bb3c00e0a1359004f66435a452c30ee4997689
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-08-04 12:12:00 +00:00
Qt Submodule Update Bot
814b318048 Update submodules on '5.11' in qt5
Change-Id: Ic787c30a4a0654d4f0cd8fd484ff9ce0247e0030
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-08-04 12:11:55 +00:00
Joni Jantti
aeb39be740 Upgrade Android NDK to r16b and switch to clang
We need to upgrade the Android NDK version
when we switch to building with clang.

Task-number: QTQAINFRA-1681
Change-Id: Ic43b28ead393ec5828b099727182df5f4424f419
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-04 05:06:22 +00:00
Qt Submodule Update Bot
a97bea0821 Update submodules on 'dev' in qt5
Change-Id: Ib23bce6910ad849e3dc3d70cbc2fd042071c5c6c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-08-03 18:49:58 +00:00
Fredrik Orderud
d60ef0b202 Remove broken qtquick1 submodule
This submodule have not been maintained in several years. Building currently
fails due to qtquick1 not being in sync with interface changes in qtbase. I
think it's therefore better to just remove the submodule altogether. That way
we stop causing problems for external developers wanting to build Qt from
source.

Task-number: QTBUG-69725
Change-Id: I905888d99f510be12c484f7da52986c9b1e9478f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2018-08-02 19:33:13 +00:00
Tony Sarajärvi
0bdbc37b43 Only update qtserialport
For a fix on Android.

Task-number: QTBUG-69727
Change-Id: Ie7d000dece247678e80c7d7db08c0ac3763bc8a3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-08-02 18:31:04 +00:00
Qt Submodule Update Bot
51ea6f2895 Update submodules on '5.11' in qt5
Change-Id: I43f504b9f30ce021fc38f7115cbc7d61d9b9d790
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-08-02 01:33:00 +00:00
Tony Sarajärvi
37ad6b0144 Use local Ubuntu repositories with Ubuntu 16.04
Using cached local repositories saves us outgoing
bandwidth. This way we also get version pinned packages.

Change-Id: I475c62c3e408d71e85f24d74dd384c62de583403
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-08-01 14:51:15 +00:00
Qt Submodule Update Bot
781d243f89 Update submodules on '5.11' in qt5
Change-Id: I3989272610c8c491f9c3a989e79cae36ad036d88
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-08-01 11:11:55 +00:00
Frederik Gladhorn
b6fd915b26 Remove packagekit (update notifications) from RHEL 7.4
PackageKit and gnome-software run in the background and at some point
will show popups to ask the user to update.

Change-Id: I99a3314c8788c7cc06e479718306a822bf255fbd
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-07-31 15:09:08 +00:00
Simon Hausmann
21995a6158 Fix dependencies of the qtdoc module
After commit 01d2f35b6988edacc741b358703d16d4cd8c199a in qtbase, the
existing CONFIG+=lrelease in examples/demos/photoviewer/photoviewer.pro
now calls lrelease and thus requires qttools.

Change-Id: I7cabc70fc6316a49793d7e91a493d8a5e5028295
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2018-07-31 14:36:44 +00:00
Dominik Holland
f9f9e0944d Download and cache needed python wheels during provisioning
Instead of downloading the packages during the compile/configure
step setup a wheel cache folder during the provisioning phase

Task-number: AUTOSUITE-195
Change-Id: I465f1be7cdd351e7680dcd8ae22d5e97ddf8cb2d
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2018-07-31 14:36:41 +00:00
Qt Submodule Update Bot
f128708e34 Update submodules on '5.11' in qt5
Change-Id: Ie6ec2358ba3df679b0d7bc30f9c17935fc19993b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-07-31 05:12:39 +00:00
Qt Submodule Update Bot
fc44b43851 Update submodules on '5.11' in qt5
Change-Id: I620723f0983da8a0bf8e19348a6a0be2d02c1341
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-07-30 19:56:26 +00:00
Qt Submodule Update Bot
d16c0d2675 Update submodules on 'dev' in qt5
Change-Id: Ic321b9e43d8e744049142b01d40728460f5722f1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-07-26 09:11:43 +00:00
Qt Submodule Update Bot
dc406ec87e Update submodules on '5.11' in qt5
Change-Id: I7ad748481565042891e28dc17385e8229ea18c73
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-07-26 07:53:33 +00:00
Qt Submodule Update Bot
c8d7e38778 Update submodules on 'dev' in qt5
Change-Id: I0b014bee5ef1621a1dc3c02571ba0aff52d8cf2d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-07-25 09:36:09 +00:00
Qt Submodule Update Bot
c00bed4a42 Update submodules on '5.11' in qt5
Change-Id: I77c1b4607fc857de5c9ee9abfa8e81f4bc8f0e0a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-07-25 09:35:47 +00:00
Qt Submodule Update Bot
11851f418b Update submodules on '5.11' in qt5
Change-Id: Ie65a8302aa83a5c7c83c5c4ca2debcb9fe116e3c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-07-24 08:49:34 +00:00
Qt Submodule Update Bot
cd852d51eb Update submodules on 'dev' in qt5
Change-Id: Ie9f30b588c9f959f049f1f3b0830ac2894f284ab
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-07-24 07:41:11 +00:00
Simo Fält
a7a31600b4 Provisioning: Update cmake to 3.11.3 on macos
It seems that cmake 3.6 had issues with more recent XCode. Since XCode 8
the sysroot folder might have been unversioned (MacOSX10.12.sdk ->
MacOSX.sdk). In that case older cmake can't detect correct SDK
version. This is causing issues when building Pyside2.

Change-Id: I09f0ed4fe6d15ba3d60aa3a6e9a9b3b9091996c8
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-07-23 20:19:30 +00:00
Qt Submodule Update Bot
34e0a56144 Update submodules on '5.11' in qt5
Change-Id: I681548a12fec32f415694bc6a397a202c876e8e8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-07-23 07:16:15 +00:00
Qt Submodule Update Bot
60cdf0d303 Update submodules on 'dev' in qt5
Change-Id: Icd056ebc3efef5427b9bfd7ad8fc568855155ad0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-07-23 06:12:15 +00:00
Qt Submodule Update Bot
231446f684 Update submodules on 'dev' in qt5
Change-Id: Ic9ee5417a89c9a83e6b65d2b33c3fea37dfc9245
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-07-22 08:31:45 +00:00
Qt Submodule Update Bot
edbd24972f Update submodules on 'dev' in qt5
Change-Id: Ib375f5182203ae1217586bd95bb3a6e0c47429bb
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-07-21 11:58:00 +00:00
Qt Submodule Update Bot
5e45a7a26e Update submodules on '5.11' in qt5
Change-Id: I1532481ce8b85e25058b580308c44f531141f1a3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-07-21 11:57:53 +00:00
Qt Submodule Update Bot
78a597f987 Update submodules on '5.11' in qt5
Change-Id: I27d4627770309abe7a9393e411c82e7ea414b766
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-07-20 06:50:14 +00:00
Qt Submodule Update Bot
5bd70863f6 Update submodules on 'dev' in qt5
Change-Id: I46590a04c487498f6118cf17bd06114680e4493c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-07-20 06:49:42 +00:00
Frederik Gladhorn
9cd9258b8b Move _clang-format from qtrepotools
Change-Id: I9ccacaf6ed09bbc0ee3f55bf6f97d96976341d14
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2018-07-19 12:15:55 +00:00
Qt Submodule Update Bot
b9bc0d8a10 Update submodules on 'dev' in qt5
Change-Id: Idccb3051f2d430ff7b353bc1c8aee341d1314d84
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-07-19 11:02:13 +00:00
Maurice Kalinowski
44280782ed Open62541 win32: Add python to dev environment
The autodetection of cmake used a different python for x86 builds of
msvc. Those did not have six installed. Instead, use one python for all
build variants to stay consistent.

Change-Id: Id1ad2bc320e47a68358364ff94d78993ba0b0848
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-07-18 18:30:37 +00:00
Qt Submodule Update Bot
743843bddb Update submodules on '5.11' in qt5
Change-Id: Iac05412210fa6030234b450d87d5b15543fdbbb5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-07-18 12:55:22 +00:00
Qt Submodule Update Bot
c87e4754b2 Update submodules on 'dev' in qt5
Change-Id: I93cf04ca1ecec20b61cac9275b719ebd3e76c227
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-07-18 09:30:32 +00:00
Simon Hausmann
344a384030 Merge "Merge remote-tracking branch 'origin/5.11' into dev" into refs/staging/dev 2018-07-12 09:46:06 +00:00
Andy Shaw
c1fcf7c1ad init-repo: Allow sub-module checkout path to differ from config name
Change-Id: I622a8ed5daee59a96f4c6c28cc8c5e4d20b88f58
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2018-07-10 15:23:41 +00:00
Ryan Chu
e99fe6b354 Docker Provisioning: Install Avahi and enable mDNS service discovery
The challenge of connecting Docker containers from the host is to
resolve a predefined hostname to an IP address assigned at runtime. For
Unix-like platforms such as Ubuntu, it can be done by either hard-code
the IP addresses or creating a DNS server. Both of them are not
user-friendly which need root permission to modify system files.

Avahi is a free Zeroconf implementation and provides multicast DNS
(mDNS) service discovery. It enables Docker containers to publish their
services on a local network. For the host systems supporting mDNS
technology, they will automatically discover the services in a local
domain without extra user-efforts.

Task-number: QTQAINFRA-1686
Change-Id: I1ef464a455cef5d331a3e2eb0194e2741172ef95
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Ryan Chu <ryan.chu@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2018-07-10 14:55:18 +00:00
Simon Hausmann
5913addf85 Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I1af773187b7dd55bf820ce7d3218a9f3121c198a
2018-07-10 09:11:31 +02:00
Oliver Wolff
c2c2a14091 provisioning: Update winrtrunner
winrtrunner is from dev. The only change to the previous version is a
longer timeout for deployment, as CI runs now and then failed, because
deployment did not finish in time.

Change-Id: I244e68af447db9298d64bb791048032edd3ec1fd
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-07-09 20:03:32 +00:00
Maurice Kalinowski
4869ad6a49 Provisioning: Update Open62541 install path
Use the updated install path for OPEN62541_PREFIX argument in CI.

Change-Id: Ifa06d002516da20001a94ff6e7066504fa471a8f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2018-07-04 12:03:37 +00:00
Maurice Kalinowski
7c14e7a5cc Provisioning: Open62541 Update environment variables
Using CI_OPEN62541_<compiler>_<arch>_PREFIX is more verbose.

Change-Id: I58ed0f31935308389f274f93578361db3dc01daa
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-07-04 12:03:21 +00:00
Maurice Kalinowski
9f57c8135a Provisioning: Install Unified Automation C++ SDK on Windows
UA C++ SDK is one of the supported OPC UA backends in the Qt OpcUa
module. The aim is to have packages available with Qt 5.12.

Change-Id: I2d1b3c6c583f4563e7470317d4f73f853bd34c72
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2018-07-04 12:03:06 +00:00
Qt Submodule Update Bot
d92fc36d32 Update submodules on '5.11' in qt5
Change-Id: I789b8631db8db928a08443bb507b5f18d0e49241
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-07-04 05:10:04 +00:00
Qt Submodule Update Bot
54c23f97c6 Update submodules on '5.11' in qt5
Change-Id: Idc7f66cc084706ac4a2bb9a212af764d41301182
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-07-03 06:43:44 +00:00
Ryan Chu
2b6f5f165d Provisioning: Install Docker-based test servers on Ubuntu 16.04
Build and cache docker images based on the configurations in testserver.
1. Download and install the docker engine and docker-compose extension.
2. Append address and hostname of test servers to CI environment.
3. Build and tag the docker images by the SHA-1 of server context.

Task-number: QTQAINFRA-1686
Change-Id: Ib9b58d45856682ddec04af045e1eab18e14a85fb
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2018-07-02 19:20:21 +00:00
Liang Qi
c6d9e433df Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
	coin/provisioning/qtci-linux-RHEL-6.6-x86_64/30-install_icu.sh

Change-Id: I00d0ccd138eb8d89e30e7e57632c6fc8f83e0001
2018-07-02 13:12:35 +02:00
Qt Submodule Update Bot
a37b78293b Update submodules on '5.11' in qt5
Change-Id: Ie3dfab4426573c7c9a3312f40cb349cf8b49938f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-07-02 07:25:45 +00:00
Qt Submodule Update Bot
3e044c71b9 Update submodules on '5.11' in qt5
Change-Id: Icb4cd2f6afe9a7aa4c3000a7006471afd141f562
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-06-30 08:01:50 +00:00
Simon Hausmann
0a2b499cca Remove unused libclang installations
We don't need to install the MinGW builds of libclang 6.0 for
configurations where the Qt MinGW build can't use them.

Task-number: QTBUG-68064
Change-Id: Id9183ccfc15a7a81edb67df371075d584e5cbae8
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-06-29 13:37:38 +00:00
Heikki Halmet
ecb01d283c Provisioning: Fetch icu from ci-files01 instead of master.qt.io
Change-Id: Ia27e68cb94ab0744ce11cfa74c90e118c1f0e4b3
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-06-29 13:37:36 +00:00
Heikki Halmet
74fd490884 Provisioning: Add force option when unmounting squish
Sometimes unmount of squish fail because resource busy even if
the installation is already succeeded. To avoid this let's add force
option to make sure unmounting works every time.

Task-number: QTQAINFRA-1964
Change-Id: Icacd01341d09577d9880e3ed208cb6ea18a7ac4f
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-06-29 13:37:34 +00:00
Qt Submodule Update Bot
7784f89036 Update submodules on 'dev' in qt5
Change-Id: I61e51dde3ba430920b115511cdc219bf9930927e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-06-29 13:18:51 +00:00
Heikki Halmet
4a7366f960 Provisioning: Refactor libclang installation
Libclang must use cached url (ci-files01-hki) to reduce the download time
Libclang release_60 versions were rebuild which requires sha1 changes

Task-number: QTQAINFRA-1966
Task-number: QTQAINFRA-2100
Change-Id: Iddf47a2a3a5bc38dbed684320120164bb40c028c
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-06-29 05:49:22 +00:00
Liang Qi
72d711356c Update submodules on '5.11' in qt5
Change-Id: I2d450d444d40d129003461329fa5058ca1c0f140
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-06-29 05:49:17 +00:00
Qt Submodule Update Bot
26dd89e493 Update submodules on 'dev' in qt5
Change-Id: Icf069b26f93995833ef35f490f61d9d75fcaf84b
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-06-29 04:46:09 +00:00
Oliver Wolff
256020fa15 Enable auto tests for winrt x64 using MSVC 2015
We are using a statically built Qt because it eases deployment of
the built tests. As static linking is broken on MSVC 2017, 2015 is
used.

Change-Id: Ie0cc0ee8229da8772ae548ca077e48086ab03adb
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-06-28 23:54:37 +00:00
Oliver Wolff
d103986282 Revert "Enable auto tests for winrt x64 using MSVC 2015"
There are still auto test failures in qtbase for WinRT.
Revert this change to unblock CI and investigate.

This reverts commit 2fb043eace.

Change-Id: I13cc618828f773750c031daaaffce777163f8b8d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-06-27 14:38:02 +00:00
Oliver Wolff
2fb043eace Enable auto tests for winrt x64 using MSVC 2015
We are using a statically built Qt because it eases deployment of
the built tests. As static linking is broken on MSVC 2017, 2015 is
used.

Change-Id: Iaf665f68ab705f44e93129ff6e25384ae4b5a319
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-06-26 14:19:37 +00:00
Kai Koehne
92f1fe4e34 Replace commercial preview license with Qt License Agreement 4.0
Do allow people to build from git using the Qt License Agreement 4.0.
The license agreement text is the same as in the installers, except
that some Unicode characters got normalized to their ASCII variants,
and things have been properly wrapped.

This follows qtbase change 60e56f1679d6.

Task-number: QTBUG-52222
Change-Id: Id00d026e47be3bfc488419652d9f53d72d56f0d0
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2018-06-26 08:46:25 +00:00
Maurice Kalinowski
7551b13276 Provisioning: Update MQTT test broker
Change-Id: Ie4e9ff5c13eb5f882b70e4e948836ae78496dd40
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2018-06-25 06:36:50 +00:00
Qt Submodule Update Bot
c145e9c217 Update submodules on 'dev' in qt5
Change-Id: I0ab9f158a0bb083d7f71da19e8583f7c5dfba536
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-06-24 09:10:27 +00:00
Qt Submodule Update Bot
f3d761294d Update submodules on 'dev' in qt5
Change-Id: Ib637706a9dbd933edbed0ebc44053e357806d13a
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-06-23 20:59:07 +00:00
Liang Qi
2a58a48318 Merge remote-tracking branch 'origin/5.11.1' into 5.11
Change-Id: I48c80e0162f44a3eca1694d538971ef981d37d2e
2018-06-22 22:20:52 +02:00
Qt Submodule Update Bot
d33170e21d Update submodules on 'dev' in qt5
Change-Id: Ie1267c55571b23166d5989954a12ad07c09a26ed
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-06-22 20:18:07 +00:00
Liang Qi
33d5c271f6 Update submodules on '5.11' in qt5
Skip qtbase and qtwayland in this round.

Change-Id: Id405a21fda570ab62588f128536ba77cc01fd080
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-06-22 07:44:37 +00:00
Qt Submodule Update Bot
519d656f34 Update submodules on 'dev' in qt5
Change-Id: I2a83a076896b9b29103c031a204936816d3fd6f4
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-06-20 06:10:02 +00:00
Liang Qi
ca1f50fa72 Update submodules on 'dev' in qt5
Skip qtwebengine in this round.

Change-Id: I09c52a57592d1bfa8b64a7bf5ea5beed795af02b
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-06-18 13:57:10 +00:00
Qt Submodule Update Bot
32eee8f17a Update submodules on '5.11.1' in qt5
Change-Id: I1b1caa12ea3b4e6c36b2051d88ad8492d17d06cf
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-06-17 16:49:03 +00:00
Maurice Kalinowski
bd8fe6a463 Provisioning: Fix downloading from github
Invoke-WebRequest uses TLS1.0 by default, which is not accepted by
Github anymore, causing all downloads from that site to fail. Upgrade to
1.2 to get downloads working again.

Change-Id: Ie242432937c273db5c345b38482dd74c19c3b4ca
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
2018-06-13 18:08:15 +00:00
Qt Submodule Update Bot
a25629abfb Update submodules on '5.11.1' in qt5
Change-Id: Ibc6aaaa9d4de853685695d192495e98d98d81082
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-06-11 10:47:06 +00:00
Liang Qi
857e3ca32a Update submodules on 'dev' in qt5
Skip qtdeclarative in this round.

Change-Id: Ia70fe1f43ce29cc321111dfc37c55f070cd806d9
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-06-09 13:30:54 +00:00
Qt Submodule Update Bot
bfda8d1f25 Update submodules on '5.11' in qt5
Change-Id: I3b6197f122aaeca5eb1838db41d3fb864eb4043a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-06-09 08:41:01 +00:00
Qt Submodule Update Bot
cca980f401 Update submodules on '5.11.1' in qt5
Change-Id: I54afe311c809984962f9644830899e00d1766f96
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-06-08 19:06:14 +00:00
Liang Qi
7b7e0410fd Merge remote-tracking branch 'origin/5.11' into 5.11.1
Change-Id: I0bfda3a8816684275bd7f63372684cdf3e8b9ac3
2018-06-08 13:19:30 +02:00
Qt Submodule Update Bot
4ab6c1dace Update submodules on '5.11.1' in qt5
Change-Id: Ia0779127ef3859678ef194b0af2e4fdb5b25d9f5
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-06-08 11:02:29 +00:00
Simo Fält
eb1ca70def Provisioning: Add 64 bit Mingw to coin as packaging target
Change will provision DirectX SDK with enabler DotNetFramework also, so
that configure for MinGW will detect ANGLE correctly. The DirectX
headers and libs will be in two location, while those are installed
with MSVC also.

Task-number: QTBUG-35288
Change-Id: I04ca71a73b22cd4eb27987a368cd9ede03b0e437
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-06-06 08:37:51 +00:00
Qt Submodule Update Bot
e28ed4a3a4 Update submodules on '5.11' in qt5
Change-Id: I49fd99ca74e396010e65069e04579daa81b4fab2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-06-06 06:52:54 +00:00
Qt Submodule Update Bot
02127d3654 Update submodules on '5.11' in qt5
Change-Id: I01ace9bc6ad2805a7a3cdf5b464357e4bad5dc19
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-06-05 06:00:58 +00:00
Qt Submodule Update Bot
bdbc314b2a Update submodules on '5.11' in qt5
Change-Id: I363b007807ce65746d22ad2e2608aa17c5859deb
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-06-02 10:41:06 +00:00
Simo Fält
6c295ac7f0 Provisioning: Install 32 bit python to 64 bit windows
In order to create 32 bit Pyside wheels we have to be able to link
Pyside against 32 bit python. While 32 Qt build is done in 64 bit
Windows Pyside must follow.

Task-number: PYSIDE-646
Change-Id: I30855d4cecd6bc6219021216e9c296d28c56b405
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-06-01 13:21:30 +00:00
Tony Sarajärvi
de191df84f Add macOS 10.13 to the CI
Includes provisioning scripts and modifications
to default.txt enabling the build. Builds are
disabled while fixing or blacklisting autotests.

Task-number: QTQAINFRA-1299
Task-number: QTQAINFRA-1300
Change-Id: I0fde33c8028c7ded9d07e8d9cb0dcfb03d5db188
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-06-01 11:45:06 +00:00
Oswald Buddenhagen
b4b1bfe1a6 Adjust submodule branches
Change-Id: I9c6e8ecf1798041b1d2524cb80be936b56216e47
2018-06-01 13:33:15 +02:00
Qt Submodule Update Bot
6b243aa278 Update submodules on '5.11' in qt5
Change-Id: Ib58c5a24c0398483da71115e049f1cbcfa8732b9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-06-01 06:50:50 +00:00
Qt Submodule Update Bot
4dcb07d2d4 Update submodules on 'dev' in qt5
Change-Id: Ie192c2d52f48e81160a7dd328c6a01accb8a7ebe
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-05-31 16:48:32 +00:00
Liang Qi
154c24cc4f Merge "Merge remote-tracking branch 'origin/5.11' into dev" into refs/staging/dev 2018-05-31 22:07:11 +00:00
Edward Welbourne
21a37fe009 Remove LGPL_EXCEPTION.txt
It became obsolete when we switched to LGPL3, as discussed on the developer
mailing list in April 2017.

Change-Id: I67913f46c81730ffdc0f56163e854fd7043b2514
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2018-05-31 05:58:21 +00:00
Liang Qi
0a2465bc30 Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I7502e49bc75f84b7fb2d4534181a2082fc939265
2018-05-30 21:19:11 +02:00
Qt Submodule Update Bot
feb12a86f8 Update submodules on 'dev' in qt5
Change-Id: I9039e373e97899ea9ec756e07b278ea8c1f20aef
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-30 16:48:29 +00:00
Qt Submodule Update Bot
e09cd7630f Update submodules on '5.11' in qt5
Change-Id: I695ecee66a9a0c256e6df2c68790cf3f9d58ac9a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-30 05:56:51 +00:00
Qt Submodule Update Bot
ff8efac616 Update submodules on 'dev' in qt5
Change-Id: Ib89eaa00e83cf0d124980660397a54aafc506196
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-29 07:48:01 +00:00
Qt Submodule Update Bot
7c3689778e Update submodules on '5.11' in qt5
Change-Id: Ib8dd64712bea33b7dffc46ea13bdd7c5239121cb
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-29 06:51:23 +00:00
Joni Jantti
e9faaf8239 Provisioning: Remove broken proxy setup from RTA 32-bit Windows 10
Currently the proxy disabling script on 32-bit Windows breaks the
internet settings, preventing browser usage for example.

Change-Id: I77282f0d929a6223ceafd3b648d2e2a7b16186c9
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-05-29 06:47:16 +00:00
Oliver Wolff
e57ef7c949 Update winrtrunner
A newer build of winrtrunner is needed. It is built from dev and
contains fixes related to handling of test output (most
importantly 044e9ad878ed1cf0ace0a9260b55cc94c71a294d).

To make the script more stable, the newer version of winrtrunner
was also copied to ci-files01, so that an alternative download
location can be offered.

Change-Id: I6a429aa3292266067756ce7ba3553088dc168197
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
2018-05-28 11:38:29 +00:00
Qt Submodule Update Bot
f11b58d500 Update submodules on 'dev' in qt5
Change-Id: I5b5825abf17a302fde54efb7fb24684f3461b6dd
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-28 06:56:21 +00:00
Qt Submodule Update Bot
9ca1d1bf8f Update submodules on 'dev' in qt5
Change-Id: Ib7cdc0ff958af88d011c1db1a49e11f7378582d1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-27 17:40:32 +00:00
Qt Submodule Update Bot
15ae235e51 Update submodules on '5.11' in qt5
Change-Id: Ic5b0846668d59b88e47e432dd692b569079e09a3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-27 17:06:00 +00:00
Qt Submodule Update Bot
6f6efe15fd Update submodules on '5.11' in qt5
Change-Id: I09f4b1a1c4d50f935f5d7c83fcab232d05630b68
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-26 00:02:24 +00:00
Maurice Kalinowski
b317ad8096 Remove hardcoded download path
Previously all files got downloaded to a hardcoded path, including the
username for the CI machines. Usually, it does not fit the username of a
local development machine, complicating to reproduce bugs.

Introduce Get-(Default)DownloadLocation functions in helpers to
specify the default download location. This helps to run the
provisioning scripts on a local machine.

Change-Id: I761a92bf5e3e774358756a95dddb9a5d6ee54db9
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2018-05-25 10:25:55 +00:00
Maurice Kalinowski
45709cec07 Provisioning: Update Open62541
Change-Id: I04d8dfed982c68efb83f28a2f34f8632e3a66312
Reviewed-by: Jannis Völker <jannis.voelker@basyskom.com>
Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
2018-05-25 07:32:00 +00:00
Maurice Kalinowski
d9fcbde41d Provisioning: Install Open62541 on Windows
Open62541 is one of the supported OPC UA backends in the Qt OpcUa
module.

Change-Id: I9baaffbae058d0590819e248694ee41887558708
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-05-25 06:45:00 +00:00
Qt Submodule Update Bot
7670e95e52 Update submodules on 'dev' in qt5
Change-Id: I4f192d544796443b3986393d386323791563918c
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-05-25 06:44:56 +00:00
Qt Submodule Update Bot
275f53c681 Update submodules on '5.11' in qt5
Change-Id: Ide77625c853aa01db8e4d6e51bc7d693788884c2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-25 06:43:46 +00:00
Qt Submodule Update Bot
32c5bc52ce Update submodules on '5.11' in qt5
Change-Id: I167745a5280f35ab02e81e4a55c87f779d3f1a1a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-24 16:04:51 +00:00
Qt Submodule Update Bot
8aa0d92d3d Update submodules on 'dev' in qt5
Change-Id: I2b45743807a8b4456e58756ecf7e4a8afa476b8f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-22 06:29:55 +00:00
Qt Submodule Update Bot
0cd3312bd4 Update submodules on '5.11' in qt5
Change-Id: I75e33acd5abd94893ba89acc249ef3808b04b06f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-22 00:01:29 +00:00
Simo Fält
2a27a539e7 Restore clang version 4.0 to RHEL 6.6
Libclang is required for Pyside to compile, so dropping it totally would
block Pyside development.

Change-Id: I9c0deb3f0457f97bc4c36179971d49d58ca244a6
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
2018-05-21 11:51:19 +00:00
Qt Submodule Update Bot
407d64d584 Update submodules on '5.11' in qt5
Change-Id: I1b7a7a9970f15669e9957a99b1f932e0ad22a209
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-21 08:25:13 +00:00
Qt Submodule Update Bot
9dbddbcc8e Update submodules on 'dev' in qt5
Change-Id: I3401f64d62d459c640c2e3239b09861a17f8a2f0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-21 08:25:01 +00:00
Qt Submodule Update Bot
3c3f50c015 Update submodules on 'dev' in qt5
Change-Id: I2e63b1e58332e29a6f229069756e1da6e5373709
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-20 09:16:33 +00:00
Qt Submodule Update Bot
b496b5f4d2 Update submodules on '5.11' in qt5
Change-Id: I3883afd4c1f626825e7c5741364f255862a2e512
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-20 00:00:55 +00:00
Qt Submodule Update Bot
9dbf3d46ba Update submodules on '5.11' in qt5
Change-Id: I24c92fc659cbf40271b171ecf8179ffed14e5454
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-19 11:49:55 +00:00
Qt Submodule Update Bot
5b5f008526 Update submodules on 'dev' in qt5
Change-Id: I1de969915ada8d1915da4107ff7e4620340fb269
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-19 08:34:26 +00:00
Liang Qi
b6c915e4c5 Update submodules on '5.11' in qt5
Change-Id: I9398f42e940a4249e1fece564e51aa028e7f7464
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-05-18 21:30:50 +00:00
Liang Qi
a2b5c37d7a Merge remote-tracking branch 'origin/5.11.0' into 5.11
Change-Id: Ifa6c63ef62e339b90e571b13c73addaa17d7af4e
2018-05-18 11:55:23 +02:00
Qt Submodule Update Bot
ea52430c66 Update submodules on '5.11' in qt5
Change-Id: I888cec01eaeab2b2029b172061d2ce07170faa97
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-05-18 07:17:37 +00:00
Qt Submodule Update Bot
03138c3980 Update submodules on 'dev' in qt5
Change-Id: I4478023c65825d45085b3fe3bf77fda0a3bfe827
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-05-17 09:20:53 +00:00
Qt Submodule Update Bot
3a0c2b894c Update submodules on '5.11' in qt5
Change-Id: I9d3f11e5fa9df3a4596474312a2ffc0426e495c5
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-05-17 07:20:03 +00:00
Liang Qi
9cc1220a43 Update submodules on '5.11' in qt5
Change-Id: Ib08b9121da4235621876f41686f2715f01db0b30
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-05-16 21:04:33 +00:00
Qt Submodule Update Bot
081601ba0e Update submodules on '5.11.0' in qt5
Change-Id: Ibd0c5cf8c72518bd5bb608dfe3c7946f6bc2d121
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-05-16 14:32:45 +00:00
Qt Submodule Update Bot
f6f9bd6d93 Update submodules on 'dev' in qt5
Change-Id: Ia4432c50cba26e11284b74d5ea87d9a77b8da950
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-05-16 10:43:52 +00:00
Jędrzej Nowacki
54261be7c3 Remove RHEL 6 from the CI
RHEL7 was introduced to replace RHEL6, we do build packages on RHEL7
already. The only coverage that it adds is an old gcc, but in the same
time it is quite expensive to maintain because of generally old
software stack.

Change-Id: I9955747efecefc3354aa9e1f1c45f7d1bc48dfc6
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
2018-05-16 10:43:45 +00:00
Qt Submodule Update Bot
e7a999ce4d Update submodules on '5.11.0' in qt5
Change-Id: I4de0d56b6bd15782984f67e4107b7ec9a90731e4
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-05-16 09:14:15 +00:00
Qt Submodule Update Bot
426708026e Update submodules on '5.11' in qt5
Change-Id: Ia95638ce97e677ceeb0bfd85b287735b6027eeb6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-15 12:50:30 +00:00
Qt Submodule Update Bot
defbea3929 Update submodules on 'dev' in qt5
Change-Id: I05469b85b7cf92b21ed9c3e82a89c116ff66abe0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-15 12:27:13 +00:00
Qt Submodule Update Bot
d7b03bf0bc Update submodules on '5.11.0' in qt5
Change-Id: I13dae70cd516b623c9e9039a6c8b71de84e88459
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-05-15 11:00:36 +00:00
Samuli Piippo
1c8ff381be Change QNX7 x86 release builds to x86_64
Task-number: QTBUG-67746
Change-Id: I677019909d56d8b227f0607069cbf3ab0cf7fec3
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-05-15 06:13:26 +00:00
Simon Hausmann
d75411d6e5 Fix linking of qdoc against an external libclang (part 1)
This is the qt5 part of the fix for the task. For the special version of
libclang we hacked together that allows static linkage, set an
environment variable that the mighty qdoc build system can utilize to
activate the release packaging specific linkage.

Change-Id: Ie340955214585329fe8fd3bc790e3cd6c6be42f9
Task-number: QTBUG-68178
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2018-05-14 12:30:59 +00:00
Qt Submodule Update Bot
e18e2b1a49 Update submodules on 'dev' in qt5
Change-Id: I046ebf51bbccb3e75275ba57fdf1c555d41ae6df
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-14 09:32:33 +00:00
Qt Submodule Update Bot
36e5f25e56 Update submodules on '5.11' in qt5
Change-Id: Ia5f7391624235fe85ba4ee591ff7a9dacc380a61
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-14 08:53:54 +00:00
Qt Submodule Update Bot
a32c6e3d8d Update submodules on 'dev' in qt5
Change-Id: I666fee90000d4a36d5f2acd47e43fd0d95d954b1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-11 08:17:56 +00:00
Qt Submodule Update Bot
1f510d9514 Update submodules on '5.11' in qt5
Change-Id: I0bbfab039743e644b1acf3321bb900c4ad8a43f1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-11 00:01:14 +00:00
Qt Submodule Update Bot
e77da9ecb3 Update submodules on 'dev' in qt5
Change-Id: Ie4e6177e118c2783723ca8c12fbab50be6044912
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-05-10 17:06:55 +00:00
Liang Qi
1e5cf1852a Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ia167d4f873ed500e3bae798eade6720db6b21750
2018-05-10 12:38:49 +02:00
Qt Submodule Update Bot
f5ef436426 Update submodules on '5.11' in qt5
Change-Id: I7020e4048d61eec71f931da3fc12da2613d3dab8
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-05-10 08:33:12 +00:00
Liang Qi
b1f1bf5560 Merge remote-tracking branch 'origin/5.11.0' into 5.11
Change-Id: Ia252225aa1339ac448dd726b149e08739c02dfc5
2018-05-09 22:12:22 +02:00
Qt Submodule Update Bot
b1b04fcb1a Update submodules on '5.11.0' in qt5
Change-Id: Ia6d3ee44db368765612cea543952878499889d6b
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-05-09 12:05:12 +00:00
Qt Submodule Update Bot
af8eab0993 Update submodules on 'dev' in qt5
Change-Id: I6cedb5c221711ed38323d4ba5a4b6cbd693f6c6c
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-05-09 10:34:54 +00:00
Qt Submodule Update Bot
1989bc105d Update submodules on '5.11' in qt5
Change-Id: I0922b0b730ec0abd02d5940fdf6b3e7b1162baba
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-05-09 07:43:10 +00:00
Qt Submodule Update Bot
f0dfbba994 Update submodules on 'dev' in qt5
Change-Id: I26fdc25d6a542dc6f0f4faeca0af84d171c491f6
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-05-08 17:52:30 +00:00
Rainer Keller
24eaf68a10 Provisioning: Remove freeopcua
Support for it is dropped

Change-Id: I574a50f279df9e390954e6dece4b947c8860038b
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
2018-05-08 10:17:50 +00:00
Qt Submodule Update Bot
39a109c884 Update submodules on '5.11' in qt5
Change-Id: Ibfe4750bb82679e1a0366c77d74ef9491b642212
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-08 00:01:20 +00:00
Qt Submodule Update Bot
4d9ab7c72c Update submodules on '5.11' in qt5
Change-Id: I29efdec1b59ea7703481840aaaf4220778eace13
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-05 07:14:29 +00:00
Qt Submodule Update Bot
9819faba63 Update submodules on 'dev' in qt5
Change-Id: Ibcea46a3aafdbb3fc999be6c61b7c469b4a5ae68
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-05-04 18:26:17 +00:00
Qt Submodule Update Bot
8cd324b216 Update submodules on '5.11.0' in qt5
Change-Id: I73fe6947d8ffdf56ea77e9aab5eb89955a0eed2f
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-05-04 18:21:18 +00:00
Qt Submodule Update Bot
ab7772a73d Update submodules on '5.11.0' in qt5
Change-Id: I37be73eba9442b56b5f7147e7d69b98ce464b44d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-05-03 15:42:55 +00:00
Qt Submodule Update Bot
c740458cd8 Update submodules on '5.11' in qt5
Change-Id: I3d5244647a09a02ed54879e3a79dbce7daa65460
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-05-03 05:47:55 +00:00
Tony Sarajärvi
80b8954591 Update openssl packages to 1.0.2o
Change-Id: Iab7043212cc3b66c26100519d95ac18fc69fa26a
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-05-02 19:01:49 +00:00
Tony Sarajärvi
b1c3eeb213 Fix styles in setting proxy
Change-Id: Iac4243e767a7cfb29b9bb0b4603ca6509356ce8c
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-05-02 19:01:44 +00:00
Tony Sarajärvi
c7562fa8ef Take proxy into use in python provisioning in windows
Task-number: QTQAINFRA-1669
Change-Id: I2030f244da65e4fd0c3b0be54d941b065f9a180e
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-05-02 19:01:40 +00:00
Qt Submodule Update Bot
f5af9f119b Update submodules on '5.11' in qt5
Change-Id: I9e2f1fdb7f746a96d5e78889c1a77741ed9f116c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-05-02 11:37:57 +00:00
Liang Qi
b49034df17 Update submodules on 'dev' in qt5
Exclude qtdeclarative in this round.

Change-Id: I59d364b4165766e33d6344f7b3e10f0bc79c7442
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-05-02 07:14:39 +00:00
Simon Hausmann
41369b6282 Install the MinGW build of libclang
This restores the MinGW installation of libclang on Windows 7 and
installs the MSVC and MinGW builds in parallel on Windows 10. For
compatibility reasons the MSVC installation is done last, to ensure that
the older LLVM_INSTALL_DIR variable points to the MSVC installation. In
addition though we now get LLVM_INSTALL_DIR_MINGW and
LLVM_INSTALL_DIR_MSVC, which qt_find_clang.prf in qttools can use in the
future.

Task-number: QTBUG-66015
Change-Id: I8b53b85d0cde597c88a089f2a05f03947828d9bd
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-05-01 06:34:05 +00:00
Liang Qi
6840a639ec Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I02bb2ecd3b1121255d885082023f24412284b445
2018-04-29 20:25:03 +02:00
Tony Sarajärvi
889cdbf4a8 Fix shellcheck complaints for RHEL 7.x in provisioning scripts
Change-Id: I489f4f25d603457c8f0444ed277a162a7fd4128f
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-29 16:12:00 +00:00
Joni Jantti
7a018aeb8b Provisioning: Add a clean Ubuntu 16.04 x86
A clean ubuntu 16.04 provisioning is required by RTA.

Task-number: QTQAINFRA-1640
Change-Id: I83f53c7b677da6d1aa0e89cc6bde0b2363a7ae1e
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-04-29 13:21:10 +00:00
Oliver Wolff
8d04f876e7 windows provisioning: Do not use Windows builtin way of extracting zips
The builtin way of Windows for handling zip files is much slower than
using 7zip. A small benchmark (not representative, just extracting the
android ndk) showed 11 minutes using Extract-Zip vs 2,5 minutes using
Extract-7Zip on my machine.

Change-Id: I5198aabb5b75860ead687581fc5e368eb75e48ae
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-04-29 13:21:05 +00:00
Heikki Halmet
e3699c5a6f Add missing sw versions to versions.txt
Change-Id: Ifa12b6c6308e4ad73989e7e935061f77ae1823e2
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-04-29 13:21:01 +00:00
Joni Jantti
93e31c1281 Provisioning: Ubuntu - zlib1g:i386
RTA needs this package for QNX testing.

Task-number: QTQAINFRA-1930
Change-Id: I3587558bc1c8ece6dbb29b5f5184f4bfa744a790
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-04-29 13:20:55 +00:00
Tony Sarajärvi
ce1479c1d3 Provisioning: list installed packages in distro
Change-Id: I71bbfbfba034066cffd4cb1a9d781d386b1b6b9a
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-04-29 13:20:51 +00:00
Tony Sarajärvi
d93baa38d0 Fix powershell stylings in provisioning scripts
Change-Id: I946027047b9810ec1197b50394f157eb406434c2
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2018-04-29 13:20:48 +00:00
Tony Sarajärvi
cd87f148dd Fix Squish Provisioning coding style
Change-Id: I663ce38fffa3a9446972d1790d80f76b7155c029
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-04-29 13:20:44 +00:00
Tony Sarajärvi
b8c0fb552f Fix and-or in NTP disabling
Change-Id: Ib4b6ffa65ba600919ad71b2748da5055449f3164
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-04-29 13:20:40 +00:00
Tony Sarajärvi
5586a17eff Fix shellcheck complaints for openSUSE provisioning scripts
Change-Id: I5360a1b7b4c405d7ca9fedee8e100d933ec6e7b7
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-04-29 13:20:36 +00:00
Tony Sarajärvi
eccb53c607 Fix shellcheck complaints in common macos provisioning scripts
Change-Id: I9d6891a2956f66ebf2ca759c4085acad30a84618
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-04-29 13:20:32 +00:00
Tony Sarajärvi
9bf79e6bab Fix shellcheck complaints in provisioning scripts
Change-Id: I38306c6d2ff360dc12f8c33b289bbc4ae4935aca
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-04-29 13:20:29 +00:00
Liang Qi
cddb2254c3 Update submodules on 'dev' in qt5
Exclude qtdeclarative in this round.

Change-Id: I26bdf0fefb782f3f93c6674ebf183ce1dd6e13e6
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-29 09:38:15 +00:00
Liang Qi
c17c6f224c Update submodules on 'dev' in qt5
qtdeclarative was switched back to 913dc3f4f2be7c2c23237bcb9bffb3192cb10d60
due to sick coin integration.

Change-Id: I3defce1fb1f2ca86c85ada2605b351bf48668082
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-29 06:32:52 +00:00
Qt Submodule Update Bot
1125bbae42 Update submodules on '5.11' in qt5
Change-Id: I342c23fe566e1f2d8bf1aab24a7b9c6c47ea82fc
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-04-28 20:10:13 +00:00
Qt Submodule Update Bot
d14d8f0cac Update submodules on '5.11.0' in qt5
Change-Id: If2f1f76270195f337803ba302e46049acb015e3c
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-28 16:22:40 +00:00
Qt Submodule Update Bot
5cc5f606a9 Update submodules on '5.11.0' in qt5
Change-Id: Ica9fca497f78dd4660118814acce3a4c2c0e68b7
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-28 11:59:13 +00:00
Jędrzej Nowacki
c5ddbdb86b Update clang version to 6.0
The version also contains statically compiled libraries so we can
ship qdoc without shipping libclang.

The change temporarly removes CI qdoc builds from RHEL6 and MinGW,
these two configurations are not used for packaging, just for CI
testing. We should restore MinGW later.

Task-number: QTBUG-66015
Task-number: QTBUG-67764
Change-Id: Ie37b4be6a639e81d9ef0815682c6d60981cbeaae
Reviewed-by: Jesus Fernandez <Jesus.Fernandez@qt.io>
Reviewed-by: Fredrik de Vibe <fredrik.devibe@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-04-28 11:59:06 +00:00
Qt Submodule Update Bot
e48317193f Update submodules on '5.11' in qt5
Change-Id: I33004fcf26af40c9f17315a8aa5e66b22cc5f6ec
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-04-27 07:31:55 +00:00
Qt Submodule Update Bot
a809b77965 Update submodules on 'dev' in qt5
Change-Id: I17e0dbd8ba367b310f391daacc427a66051fb75a
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-26 04:55:13 +00:00
Liang Qi
c4d98c8dd1 Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ie540fd9391b53aa249c1c46bf1089575572612de
2018-04-25 20:14:43 +02:00
Gatis Paeglis
8115be2811 Provisioning: Ubuntu - remove Unity window decorations
Unity does not respect setGeometry() call, which is
violation of WM spec. During the years we have tried
various workarounds, but it has proved to be counterproductive.

This patch adjusts Unity theme to not draw window decorations,
ensuring that Unity treats the setGeometry() call the same way
all the other WMs and platforms we are testing on.

For more detailed explanation see QTBUG-67757.

Task-number: QTBUG-67757
Change-Id: I8d2bb9f2af14d3c184fc218ed08a1febd70f4026
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
2018-04-25 05:48:35 +00:00
Liang Qi
13051ee1d2 Update submodules on '5.11' in qt5
Change-Id: Ifc4c66653fe08abaee02e743ba947170b20f5acc
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-25 05:48:31 +00:00
Liang Qi
4442b551be Update submodules on 'dev' in qt5
Change-Id: If80bed6e4c0a484f2366deeb59d3b133f0850db6
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-25 05:42:52 +00:00
Qt Submodule Update Bot
0e870f5594 Update submodules on '5.11.0' in qt5
Change-Id: I16b8e45bd4dff9470299aced9fdf5302878f61f8
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-24 19:43:11 +00:00
Liang Qi
38e6ddc9ee Merge remote-tracking branch 'origin/5.11' into 5.11.0
Change-Id: Ida278c6731466e7de8c9dc9115a948488869a746
2018-04-20 15:29:36 +02:00
Qt Submodule Update Bot
60dd5ad451 Update submodules on 'dev' in qt5
Change-Id: I462316f021624950e61ae38aceee90b49600816f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-04-20 10:33:52 +00:00
Qt Submodule Update Bot
2671e05023 Update submodules on '5.11.0' in qt5
Change-Id: Ie95476e1e3f240b8a55da79b09c65736f240272e
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-18 17:16:53 +00:00
Qt Submodule Update Bot
5aca8f9e5e Update submodules on 'dev' in qt5
Change-Id: Ic476ef7434eb7911177d95618094d7972d0f6203
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-17 21:49:19 +00:00
Topi Reinio
795981e720 Provisioning: openSUSE-42.3: Install libpulse-devel
Required by Qt Multimedia.

Task-number: QTBUG-64538
Change-Id: I12e5a1b1a6390f553d883ce12647475eb9dd2992
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-04-17 16:43:53 +00:00
Liang Qi
4d4159f7b7 Merge remote-tracking branch 'origin/5.11' into 5.11.0
Change-Id: Id0540cee408413b7f5ab7410f3d1db3f38fd46af
2018-04-17 14:15:23 +02:00
Liang Qi
9a8c6faf26 Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I8bb29f5e2edfbee3df2388712137cfd7f31aa3aa
2018-04-16 10:40:51 +02:00
Qt Submodule Update Bot
7f937b6d94 Update submodules on 'dev' in qt5
Change-Id: I54baff3ba462cfcab812bf3a97378a1f2b169a49
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-16 03:59:53 +00:00
Simo Fält
6a06c4b4fe Revert "Install Python 2.7.13 to RHEL with pip"
This reverts commit 794913dde7,
which seems to break pyside builds. Instead we install python-pip
package from the EPEL repository.

Change-Id: Ic84680b0b0d6950d389bb42a6add18c83256f00f
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-04-16 03:32:20 +00:00
Liang Qi
1567d66269 Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I299251ffa3bf10346d0d99abe02b14d7af5b5860
2018-04-15 19:13:55 +02:00
Qt Submodule Update Bot
6c8307abf6 Update submodules on '5.11' in qt5
Change-Id: I18750ffb5810a3f60a2b615ca487ce42459d560d
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-15 16:41:22 +00:00
Heikki Halmet
83f2a25f17 Provisioning: Add test for squish installation
Squish is needed by RTA which is not run during normal qt5 build. Other
words squish installation is not tested during integration. That's why
we need separate test for it.
This change will fetch test and run test suite which is made to check
that squish installation works

Task-number: QTQAINFRA-1733
Change-Id: I9284fd52d87767ae04022c3a6996e0bb972315dd
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
2018-04-15 16:41:18 +00:00
Joni Jantti
e8a60ed41b Provisioning: Ubuntu - Add QNX 6.6.0
QNX 6.6.0 is required by RTA.

Task-number: QTQAINFRA-1914
Change-Id: Id0578050d24fb13f3e10a10e972be790d39f9bc0
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-04-15 16:41:13 +00:00
Joni Jantti
c404097600 Provisioning: Win10_x86 - mysql
Required by RTA.

Task-number: QTQAINFRA-1923
Change-Id: I13d78da0bd3ea2fa8a75734fb5f88a472cbd79de
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-04-15 16:41:08 +00:00
Joni Jantti
3d6736a7f1 Provisioning: Win10_x86 - openssl
Required by RTA.

Task-number: QTQAINFRA-1923
Change-Id: I4937980a1f23d56e509b71541605c80cb6423402
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-04-15 16:41:04 +00:00
Joni Jantti
c1e2307d02 Provisioning: Win10_x86 - psql
Required by RTA.

Task-number: QTQAINFRA-1923
Change-Id: Ia13d9586d1c1934c8c4e51fcbe9ce826bba68524
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-04-15 16:41:00 +00:00
Joni Jantti
081861de18 Provisioning: Win10_x86 - Windows 10 SDK with debugging tools
RTA needs debugging tools for Windows 10 x86 testing.

Change-Id: I69cae92a2529a933a018f22c1b200bdc4d2c0aa0
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-04-15 16:40:57 +00:00
Tony Sarajärvi
8375a33d4a Fix squish provisioning script typo
Change-Id: If33847a552fe40128cef577b99adf3152de3a9e2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2018-04-15 16:40:53 +00:00
Tony Sarajärvi
cd347c86af Fix shellcheck complaints in RHEL 6.6 provisioning scripts
Change-Id: Idb4240b4cfd309b2c6c418e8c18b175a491f8eea
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-04-15 16:40:49 +00:00
Liang Qi
6df84f8984 Update submodules on '5.11' in qt5
Change-Id: I5b4c4043f2bfb2bf3e62bc06e244a4fec3e5bbd6
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-15 05:55:49 +00:00
Heikki Halmet
cfc44559ef Provisioning: Install Git Large File Storage
This tool is needed to clone some repositories correctly

Task-number: QTQAINFRA-1921
Change-Id: If4744304490649aeecf9daa0c1f840ded9b7beed
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2018-04-15 05:55:45 +00:00
Heikki Halmet
f9e9dd1393 Provisioning: Use wayland libs provided by distro
Redhat repositories includes needed wayland
libraries. Let's use those instead providing
those through provisioning.


Task-number: QTQAINFRA-1925
Change-Id: I543a6b9fb8876f64d4b9c17ef909b9c61129e62e
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-04-15 05:55:42 +00:00
Heikki Halmet
ba30e967d0 Provisioning: Set ssh key and configurations for Yocto build
Task-number: QTQAINFRA-1888
Change-Id: I2dd01080998866ce2affd6a5aea797540f28db19
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-04-15 05:55:39 +00:00
Heikki Halmet
2e6af2bba7 Provisioning: Upgrade pip to latest version
Latest pip version is not installed during python
installation. Pip need to be reinstalled after python
installation because older version of pip seems to cause
installation problems randomly at least with python 2.7

Task-number: QTQAINFRA-1902
Change-Id: If3d74130ecee6e410c64cad309feff9edc0e5db0
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-04-15 05:55:35 +00:00
Heikki Halmet
c79d285ffa Provisioning: Remove sha1 file after shasum check
Change-Id: Iee8e66d98e5ebd2dee18baf8e1752a86065417d1
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-04-15 05:55:32 +00:00
Qt Submodule Update Bot
f728979975 Update submodules on 'dev' in qt5
Change-Id: I963065f0eca222056e025ec9fd86f4929b43e662
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-04-15 05:50:05 +00:00
Simon Hausmann
847cbbd869 Remove qtenginio
The module has been dead for a while as well as the corresponding
service.

Change-Id: I40ce39f18d32be7ae22e944dcd181a7d7c0cfce5
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2018-04-13 10:45:53 +00:00
Oswald Buddenhagen
24e1a15d40 Adjust submodule branches
Change-Id: Ic069e5dedce639cb1c17df06ee43e87eacc139d8
2018-04-12 14:07:13 +02:00
Qt Submodule Update Bot
73be04a169 Update submodules on 'dev' in qt5
Change-Id: Ifec2d71b764805946eff7ddfefb8cf439c07e9bc
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-12 05:12:14 +00:00
Qt Submodule Update Bot
2074cadecd Update submodules on '5.11' in qt5
Change-Id: Ibfd10c0da7c86f52a860cd39776519c9d4ab4b61
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-04-11 05:44:38 +00:00
Qt Submodule Update Bot
7ae52b78e4 Update submodules on 'dev' in qt5
Change-Id: I8f4b1e5069782dc9269d1510f08a0e252cc5f9b3
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-10 20:35:16 +00:00
Liang Qi
9b584a8117 Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I63778fc883354b724fcf91d92ee6d80b7cb481aa
2018-04-10 15:04:06 +02:00
Liang Qi
5abe434755 Update submodules on 'dev' in qt5
Change-Id: Ia35c5a575635a4c02f209822501bf7dd71351f87
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-10 10:46:52 +00:00
Qt Submodule Update Bot
1616d89eea Update submodules on '5.11' in qt5
Change-Id: I71ed7dbae2d7071e9c16a6e24979174b1b75d640
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-04-10 08:31:14 +00:00
Qt Submodule Update Bot
69841b3e9a Update submodules on 'dev' in qt5
Change-Id: Ie17a34259d7a1ba39f341a915d95901a1a9e7499
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-07 12:50:36 +00:00
Qt Submodule Update Bot
7f6fd7621b Update submodules on '5.11' in qt5
Change-Id: Ie59c702af192cf03bb5c865345625f61feb83887
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-04-07 08:26:59 +00:00
Oliver Wolff
0029642f18 Fix msvc_2015_update3_patch
Change-Id: Ie008b274c2f27d9792340dd4f6c2d3215bd376ca
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
2018-04-06 19:41:22 +00:00
Tony Sarajärvi
daeaec9b3c Remove updating of RHEL 7.4 system during each provisioning
Yum update doesn't only fetch the repository data. It also runs
a distro upgrade. So if something gets updated that isn't
compatible with us, it breaks. It also slows down the provisioning
a lot.

Change-Id: I27136bc572fbce5410b82ff9574cf85bf89e3100
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-04-06 19:41:19 +00:00
Qt Submodule Update Bot
9fdc8fe5e9 Update submodules on '5.11' in qt5
Change-Id: Ic767892fd0ed815d1cec35eced62e83b1ac4e029
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-06 19:41:16 +00:00
Joni Jantti
9af755a79e Add VC build tools to Windows 10 x86 template
These tools were missing from the installation.

Change-Id: I627b28a6f9373df708952e22a7f404b8dbce6239
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-04-06 11:02:51 +00:00
Qt Submodule Update Bot
2171fc5840 Update submodules on 'dev' in qt5
Change-Id: Idbf93b4fc080fc6921a6e91822650c9d7520d6c8
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-05 21:21:15 +00:00
Liang Qi
d4edeff8aa Update submodules on '5.11' in qt5
Change-Id: Ic5b5615653f2fed507c75ca96a05de0affb65863
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-05 18:42:39 +00:00
Eskil Abrahamsen Blomfeldt
3c23dc4846 Don't require Qt Android Extras for Qt Purchasing
Qt Purchasing is supported on other platforms than Android, so
move qtandroidextras from depends to recommends instead.

Task-number: QTBUG-67318
Change-Id: I9c70574dd9b45579485b2640f7daeebdc6c2bc63
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2018-04-05 14:44:48 +00:00
Joni Jantti
9e74a1e5b7 Add a clean installed Win10_x86 for RTA
Task-number: QTQAINFRA-1842
Change-Id: I0334d74055690c7f850fd105fe008d11a8e57b8c
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
2018-04-05 13:10:26 +00:00
Qt Submodule Update Bot
bb9547048b Update submodules on '5.11' in qt5
Change-Id: I2c8dfa7b7b27e6aa80381761d8b7883690133496
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-04 07:22:50 +00:00
Liang Qi
98daaeac6c Update submodules on 'dev' in qt5
Skip qtbase in this round for QTBUG-67371.

Change-Id: I95034ff9451b4c1fbfc8d820d0af365dddb63cdf
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-04-03 06:41:52 +00:00
Qt Submodule Update Bot
7c19a3f83b Update submodules on '5.11' in qt5
Change-Id: I7e60d0eae7d23fbc2eebf1734c3fd9a713b6b732
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-04-02 00:00:58 +00:00
Qt Submodule Update Bot
9f50ae280f Update submodules on '5.11' in qt5
Change-Id: I7f31b0b19c8380a7f5420917ad7dc423e3ca3658
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-04-01 10:23:51 +00:00
Qt Submodule Update Bot
fe06923553 Update submodules on '5.11' in qt5
Change-Id: I89c95acfd2ee14574c0ca524d80837023dbc112f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-03-31 10:49:31 +00:00
Joni Jantti
dbe27bc9cc Provisioning: Win8.1 - Add jom for RTA
Jom is required by RTA.

Task-number: QTQAINFRA-1895
Change-Id: Iec99a91d2a48c4c6ef49829e4f05baa90d1a96e0
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-03-30 17:57:20 +00:00
Qt Submodule Update Bot
c8b3ed182d Update submodules on '5.11' in qt5
Change-Id: I2f7afb1e261e59e527a482983f699402f0d29d85
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-03-30 11:11:25 +00:00
Liang Qi
e27f168cd9 Update submodules on 'dev' in qt5
Skip qtbase in this round for QTBUG-67371.

Change-Id: I1d3fe67288fb4ed3a02233cab9502be8ba543129
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-03-29 07:28:37 +00:00
Qt Submodule Update Bot
8f73d37425 Update submodules on '5.11' in qt5
Change-Id: I77701db7d1955d7309d464ca1597888d98883a30
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-03-28 17:28:28 +00:00
Miikka Heikkinen
9dd5f6d861 Add SeparateDebugInfo for linux release
Task-number: QTQAINFRA-1688
Change-Id: I3557ac1e2bb6964278f381736f87e6fd3304744b
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-03-28 14:24:53 +00:00
Frederik Gladhorn
a01e7f3d40 Install an android virtual device for testing
The goal is to run tests on the AVD eventually.

Change-Id: I7ac887661497b5169c154ef8b0264ef07749a36a
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
2018-03-26 09:18:48 +00:00
Frederik Gladhorn
8552003532 Reduce wget verbosity when downloading qnx
The default style gives 1 KiB dots, 50 KiB per line, and the file is
567 MiB (~11600 lines). Reduce it to 1 MiB per dot and 32 MiB per line
(~18 lines).

Change-Id: Id181eee63313a4ad486af6c4752de0ed9ed5f7b6
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
2018-03-26 09:18:45 +00:00
Qt Submodule Update Bot
787af82934 Update submodules on 'dev' in qt5
Change-Id: I9bbfda518eb65d33c6b70bebc8e57f6e24ab79ed
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-03-26 08:27:48 +00:00
Qt Submodule Update Bot
c04f645472 Update submodules on 'dev' in qt5
Change-Id: I704b7ec298f4669b21bc2678c34f15b69d143c24
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-03-25 05:51:29 +00:00
Jani Heikkinen
4eeb6ba0bb Merge "Merge remote-tracking branch 'origin/5.11' into dev" into refs/staging/dev 2018-03-23 05:14:26 +00:00
Qt Submodule Update Bot
63787a03e4 Update submodules on 'dev' in qt5
Change-Id: I3926d3b14d2e258e5418c2fb65db89932a62795b
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-03-23 05:14:20 +00:00
Liang Qi
81835942b5 Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: If72681a7d994b784c8b17fa0f9bafaef722f27d3
2018-03-22 10:06:22 +01:00
Heikki Halmet
8197e80155 Provisioning: Remove Java update from windows startup items
Change-Id: Iec709c9c42840910ab0dd98634c200d2aba8f7bf
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-03-22 06:05:45 +00:00
Tony Sarajärvi
794913dde7 Install Python 2.7.13 to RHEL with pip
System's default Python is 2.7.5 and doesn't come
with pip at all. To install its pip, it would require us to
enable the EPEL repository and install it from there.

The repos we use already include Python 2.7.13. If we install that
we get pip as well.

Change-Id: I083a970697a962ddb301616695c2cf419f1229f8
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-03-22 06:05:42 +00:00
Joni Jantti
5085220907 Provisioning: Win7_x64 - Add Squish 6.3.0 win64 msvc12
This package is required by RTA.

Task-number: QTQAINFRA-1878
Change-Id: I0496445880f838de34ffd53f72fa05e0f0b0be58
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-03-22 06:05:39 +00:00
Tony Sarajärvi
de4e9c2169 Provisioning: refactor squish install
Change-Id: I18e5f8f5d92cff5af2335cc5ac4cf571d27224ac
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-03-22 06:05:36 +00:00
Tony Sarajärvi
f1eca9bbff Remove duplicate python-devel provisioning from RHEL 7.x
Change-Id: I445135d675fa6b5cb305f6aadf5b754ab248a1ff
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-03-22 06:05:33 +00:00
Tony Sarajärvi
ab021d4bb4 Make unzip less verbose in macOS
Change-Id: I83249f724ecbfeeb4fd5c1cd33a9c6195c590c4b
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2018-03-22 06:05:30 +00:00
Frederik Gladhorn
9ae91ae3f8 Update Python 3.4 to 3.6 in RHEL 7.x
Also install Python 3 through system packages instead
of some weird scripts.

Change-Id: Ie22e126a422bd6efe9b3030d5044f4c196894ca8
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-03-22 06:05:26 +00:00
Joni Jantti
418cb4c4f5 Provisioning: Win8.1_x64 - Add Python2 and Python3 for RTA
Python is required by RTA.

Task-number: QTQAINFRA-1870
Change-Id: If63218da138995580a3bed5ede8996d722fff48d
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-03-22 06:05:23 +00:00
Matti Paaso
b59f4207a3 Add Windows 8.1 target for RTA
Change-Id: Ifd055590bada66f7437af0b4de4a8549440952ae
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-03-22 06:05:20 +00:00
Jani Heikkinen
46dcec5ecc Merge "Merge remote-tracking branch 'origin/5.11' into dev" into refs/staging/dev 2018-03-21 05:08:32 +00:00
Qt Submodule Update Bot
3bd7671a97 Update submodules on 'dev' in qt5
Change-Id: If894a58424fae08b0648cd54d38adf6faf847e26
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-03-21 05:08:28 +00:00
Qt Submodule Update Bot
488dc5c36e Update submodules on '5.11' in qt5
Change-Id: Id1050cad70aad6d24368220769709b817dc70f8b
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-03-21 05:07:39 +00:00
Qt Submodule Update Bot
3cb40d34d3 Update submodules on '5.11' in qt5
Change-Id: I12849c9612793703b598411c6a6b3c433f27b4fc
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-03-20 12:38:16 +00:00
Tony Sarajärvi
f6d18ec9b3 Disable background update checks in RHEL 7.x
Change-Id: If17fd47850be8b3a59ded7e0a543c9160f92b84c
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-03-20 12:38:13 +00:00
Liang Qi
4b18389605 Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Iecb1db823736ed8eba450cbe1df1e5d0f46bbc7a
2018-03-20 11:32:45 +01:00
Qt Submodule Update Bot
9d4fdf373f Update submodules on 'dev' in qt5
Change-Id: If5f921f7296d09f855eccec24ceed0ba880c5cda
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-03-20 10:05:20 +00:00
Heikki Halmet
a6feaec287 Provisioning: Fix java installation for mac
Change-Id: I3b6672e671720416af71631c2f9ce814f07e596a
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-03-19 11:57:09 +00:00
Tony Sarajärvi
1b5f8cec03 Remove try_catch.sh helper script
Change-Id: I3981920bb8085ffbad89c31e0fd628a6e11146b6
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-03-19 11:57:06 +00:00
Tony Sarajärvi
2f9a2f65e5 Remove try_catch codes from macOS 10.12 provisioning
Change-Id: I57fbfdef3e8105e9e66c576ef545fc6c22400ac7
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-03-19 11:57:03 +00:00
Tony Sarajärvi
a98b0f3d79 Remove try_catch codes from common macOS scripts
Change-Id: I66291e2da5514499387b61e01ad85a652cd24d7b
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-03-19 11:57:00 +00:00
Tony Sarajärvi
90261c1df5 Remove try_catch codes from unix scripts
Change-Id: Iabadbf28c65132ae614048cb98e92f57e3786056
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-03-19 11:56:58 +00:00
Tony Sarajärvi
250dd8c84e Remove try_catch codes from macOS 10.11 scripts
Change-Id: I7690ae186729b3a180b1d38c298a861d981dbf5d
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-03-19 11:56:55 +00:00
Tony Sarajärvi
1c6abfae01 Remove try_catch from common linux scripts
Change-Id: I9c7b472fa4c448f40c9adc6cc8a0d84cb9c5e74c
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-03-19 11:56:53 +00:00
Tony Sarajärvi
4492fd3268 Remove try_catch codes from Ubuntu 16.04 scripts
Change-Id: I4a377b8bc2a16d9b9c4123a9a4f623f1a6a7ae18
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-03-19 11:56:50 +00:00
Jani Heikkinen
7dbaf0c651 Merge "Merge remote-tracking branch 'origin/5.11' into dev" into refs/staging/dev 2018-03-19 05:04:32 +00:00
Qt Submodule Update Bot
a41519ddf9 Update submodules on 'dev' in qt5
Change-Id: I8de17a2a29f1190a819d6a461f0d2b4c416641a4
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-03-19 05:04:27 +00:00
Liang Qi
26cf8950b8 Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I6538504713bee35853419f14a110af1ba2a6b1e9
2018-03-18 19:01:17 +01:00
Joni Jantti
5d7972b73b Provisioning: Windows - Disable autoreboot
Windows machines currently reboot automatically in case of a blue
screen crash. This must be disabled to prevent problems with Coin.

Task-number: QTQAINFRA-1748
Change-Id: I64ac1cfa124694fab356b8443298c1b37bed9a92
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-03-18 16:22:17 +00:00
Tony Sarajärvi
85f874388c Revert "Provisioning: openSUSE - Set grub timeout to 0"
This reverts commit 2e329bc68e.
grub-update command isn't found, and after enforcing script
results, we have a P0 blocker here.

Change-Id: Iaf4b17a91cdc865974a5f4f196bbb80b085a39c2
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 677524620d)
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-03-18 16:22:15 +00:00
Tony Sarajärvi
863252be49 Download get-pip primarily from our local cache
We should first download from our local cache,
and if that doesn't work, fetch it online.

This commit doesn't fix it per se, but as we download
it from our local cache, the version is the one
our shasum checksum matches against.

Task-number: QTQAINFRA-1876
Change-Id: Ia7de54cf090af47ba33111911582f9d48c0ab2a2
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-03-18 16:22:12 +00:00
Tony Sarajärvi
64c79b27d6 Clean old RHEL repo data before fetching new data
Task-number: QTQAINFRA-1872
Change-Id: I49d9d1589adc5b34f1b7c2dccc14be0021f2baaa
Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
2018-03-18 16:22:09 +00:00
Tony Sarajärvi
eebc0133f0 Disable update download in background
Task-number: QTQAINFRA-1852
Change-Id: I6d8e433fa40dd080fe84efcf3d0c655d14f86010
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-03-18 16:22:07 +00:00
Qt Submodule Update Bot
5533acdd78 Update submodules on 'dev' in qt5
Change-Id: I9b7acbf67f6af2e95db87585dcc70f4aecc5d503
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-03-18 09:13:24 +00:00
Qt Submodule Update Bot
7f4f29ab95 Update submodules on 'dev' in qt5
Change-Id: I2f90804140d6e15fc7c3e829a7b6c86611a496d1
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-03-17 19:36:15 +00:00
Tony Sarajärvi
209cb73a36 Use local RHEL repositories with RHEL 7.4
This will remove the majority of our network traffic from the outbound
connection while provisioning. Also proxy was removed for
yum, as there is no point in proxying local data.

As a side effect, this makes provisioning currently faster by
reducing the time it takes by 35%.


Task-number: QTQAINFRA-1849
Change-Id: Ida4fb86d4bef166fc72e521e395d9753ec47a687
Reviewed-by: Timo Aarnipuro <timo.aarnipuro@qt.io>
Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-03-16 05:23:05 +00:00
Qt Submodule Update Bot
400371faba Update submodules on '5.11' in qt5
Change-Id: I9ad2fe2d1bad7d761b25de77d473994870aac960
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-03-16 05:22:45 +00:00
Heikki Halmet
23b4bcf6c5 Provisioning: Move http_proxy.txt under shared folder
Change-Id: Id5b2f07a92eadfb21fbfdb3fb65621d6322dc8c4
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2018-03-15 15:07:27 +00:00
Heikki Halmet
237b308d47 Provisioning: Fix adb process name for android sdk installation
There's no process called "adb.exe" - It's called "adb"

Change-Id: I3c23ede12a6d7fc7f3f33bbb806a84e8d9a2aaf4
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2018-03-15 15:07:24 +00:00
Qt Submodule Update Bot
9bb3cde706 Update submodules on 'dev' in qt5
Change-Id: Icf3d9d788c45f93e6dbfc973d4cb6df6a66243cd
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-03-15 06:17:16 +00:00
Qt Submodule Update Bot
280b08eb73 Update submodules on '5.11' in qt5
Change-Id: I6a0ad20fa97dabfbec8eaed990e844b26b20b353
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-03-15 05:10:50 +00:00
Qt Submodule Update Bot
573e4d5633 Update submodules on 'dev' in qt5
Change-Id: Iba60f4bbbfee4d7b0a14cac1ff36b03cb1c73c3f
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-03-14 05:14:51 +00:00
Jędrzej Nowacki
8a47814c91 Simplify DownloadURL
The script was over-engineered. The new version provides the same
functionality while removing uninteresting postmortem messages.

In addition try_catch.sh has a bug that injects set +e to a sourcing
script which was propagating through DownloadURL.sh to almost all
provisioning scripts. So it is good to avoid using it.

Change-Id: If191a0dcf52a29c4bec580a254e8e58a00130f6d
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2018-03-14 05:12:41 +00:00
Qt Submodule Update Bot
8fae7aa66d Update submodules on '5.11' in qt5
Change-Id: I8234b4d7d7c54ed0020e6cd2fcdbaa07d33eb928
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-03-14 05:12:31 +00:00
Qt Submodule Update Bot
69dd54a8dc Update submodules on 'dev' in qt5
Change-Id: I4f2eee96b5ca23177816861cca3eb7ac0ea5e515
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-03-11 12:28:25 +00:00
Liang Qi
9494b39329 Update submodules on '5.11' in qt5
Change-Id: Ia27a0de06afe5de52eb026a5225e4d2caac0975c
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-03-11 07:56:21 +00:00
Liang Qi
ec45725ef2 Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I1c443b44c8ebe41b84ca5bbbb9dc8884a8fdfa8a
2018-03-10 17:08:46 +01:00
Liang Qi
5bbeaf6c0d Update qtwebengine only
Change-Id: I1396d561892a5fead56775906ecd8aa7c48ba187
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-03-10 13:31:42 +00:00
Tony Sarajärvi
b85b272c26 Move MSVC2017 x86 builds to 64bit host OS
Change-Id: I7544c12086ef8a437bca575dfce7de44ec9938a5
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-03-10 13:31:40 +00:00
Rainer Keller
04d1ee1df4 Provisioning: Create symbolic for shasum tool on macOS for compatibility
On macOS the sha1 tool is named 'shasum' while on all other unix systems
it is called 'sha1sum'. In order to make all unix provisioning scripts
run on macOS without special case handling a symbolic link is created.

Change-Id: Ib1365cbb0dcb31e68a22959ce939fb450ec7e3f7
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-03-10 13:31:34 +00:00
Rainer Keller
00e3a0149a Properly download and install RHEL EPEL repo
Use the same approach as in the other scripts.

Change-Id: Ie48103e2c4a528a9d29318c4cabd6ead71dc5c2c
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2018-03-10 13:31:30 +00:00
Rainer Keller
9cb66c0114 Install RHEL EPEL only once
Installing twice will fail when preventing the +e injection bug
when fixing the try-catch issue.

Change-Id: I26a1b9fa235c44fe933f2f29016a80f57d47ed49
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2018-03-10 13:31:27 +00:00
Joni Jantti
940ef0a4cc Provisioning: win8.1 - RTA required provisioning scripts
Currently Windows 8.1 platforms have been removed from CI. RTA
however still uses them for testing so we need to add the programs
that RTA uses.

Task-number: QTQAINFRA-1524
Change-Id: Ide9fa076dc965b16b96f610541ace6088543f795
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-03-08 19:27:18 +00:00
Heikki Halmet
3410bab278 Provisioning: Fix Squish installation for msvc14 32-bit
Task-number: QTQAINFRA-1809
Change-Id: I8a2947fe52535e39b0817fec2ee0c35bb09e4060
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
2018-03-08 19:27:14 +00:00
Joni Jantti
95609c6657 Provisioning: Executequeueditems on Windows
mscorsvw.exe background processing is draining a lot of
CPU processing on Windows platforms. Executing the list
of to be processed items with full CPU capacity should
clear out the list and stop the background processing.

Task-number: QTQAINFRA-1775
Change-Id: Ib12bc10f4572390f20bfea915ca48ec398de46ee
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-03-08 19:27:11 +00:00
Joni Jantti
3230cdb138 Provisioning: win10_x86 - Disable automatic updates
Task-number: QTQAINFRA-1814
Change-Id: I1fed4d952f77daa1c7bd5fdb34d9568ae1208bac
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-03-08 19:27:09 +00:00
Maurice Kalinowski
7a052f4183 open62541: Fix provisioning for RHEL 7.4
RHEL does not use pkgconfig, nor does it use /usr/local/lib as default
library path. As a consequence, the config tests for qtopcua were not
able to find the open62541 build.
c3591fe77debc0eab79851bd8f0c050cd4f3f608 in qtopcua.git allows to
specify an environment variable to point to the correct location. Move
to /usr/local/lib/open62541/ on all platforms consistently.

Change-Id: I73c8076b70767553edfd793889150c584d5c33b5
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
2018-03-08 19:27:06 +00:00
Qt Submodule Update Bot
984b15d758 Update submodules on '5.11' in qt5
Change-Id: Id00474dec78862dbce0238560e859656bd69f69f
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-03-08 05:44:13 +00:00
Jędrzej Nowacki
bb9739773c Simplify openssl_for_android_linux provisioning script
The script was over-engineered. The new version provides the same
functionality while removing uninteresting postmortem messages.

In addition try_catch.sh has a bug that injects set +e So it is good
to avoid using it.

Change-Id: I9e26e8fedad71d40270fe94695d5e1c09c3d9023
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2018-03-06 06:41:46 +00:00
Qt Submodule Update Bot
764294fcb8 Update submodules on '5.11' in qt5
Change-Id: I3f19c5b7daedfa7d499ab769404d1f34a32c7816
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-03-05 08:37:59 +00:00
Qt Submodule Update Bot
686e3ff1b5 Update submodules on '5.11' in qt5
Change-Id: Iebf77d7f467d0fde9ee622e4e7b657cb1e9b8003
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-03-04 09:53:17 +00:00
Qt Submodule Update Bot
b038a8c2bd Update submodules on '5.11' in qt5
Change-Id: I2ba427ea1d9e37421775c297d983654f3e691845
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-03-03 09:00:50 +00:00
Qt Submodule Update Bot
e926cd7556 Update submodules on '5.11' in qt5
Change-Id: I0b551c2af57243eee865cd4319ee1797dc38f705
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-03-02 21:34:42 +00:00
Jani Heikkinen
52b163092a Add missing 08-libclang.ps1 for windows7 provisioning
We need to set LLVM_INSTALL_DIR to be able to build qdoc. That was
missing from windows7.

Task-number: QTBUG-65950
Change-Id: I7f75eb0181056a2117080ead6dc5862324906689
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-03-01 07:17:27 +00:00
Qt Submodule Update Bot
d6d6318e98 Update submodules on 'dev' in qt5
Change-Id: Ia305f8493404ed258de43504a440c9cd5b2eac90
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-02-27 16:51:08 +00:00
Kari Oikarinen
140c6479b5 Install libusbx-devel for QDB on RHEL 7.4
On previous RHEL version the package was libusb1-devel. That package doesn't
seem to be there anymore, which presumably means why the package to install was
changed to libusb-devel. Unfortunately libusb-devel provides a compatibility
package for the old 0.1 API version and doesn't work with QDB. libusbx-devel
seems to be the new name for the 1.0 API version of libusb on RHEL.

Change-Id: I50a10bed0b73b536e5d591363f01d7cf6a3a69d7
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2018-02-27 13:47:58 +00:00
Liang Qi
0f22ce6a71 Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I45b92cefd7f14bbe99a6fa2d31b8d14bb41da21a
2018-02-27 11:27:21 +01:00
Qt Submodule Update Bot
399cface18 Update submodules on '5.11' in qt5
Change-Id: I7c090de84c5cf511ec7cea69900546edf6039c39
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-02-27 07:01:04 +00:00
Oliver Wolff
cb6709ce5c Unify Windows provisioning scripts & improve error handling
While Coin should also see exit codes != 0 as error, we should
stick to one way of handling script errors. As Power Shell cmdlets
signal an error by throwing an exception we should do the same
(and that approach also works in Coin).

Additionally extracting 7zip files was unified across scripts by
using the existing helper function instead of reinventing the wheel
again and again.

A similar helper function was introduced for starting an external
application (and handling its errors).

Also echo and other "cmd" commands were replaced by their PowerShell
equivalents to have a unified approach across our Windows provisioning
scripts.

Change-Id: I70129ce38692f1396c33c13b33a2918485fa5271
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2018-02-26 19:52:45 +00:00
Johan Klokkhammer Helsing
08c88de5c8 Provisioning: Build and install Wayland 1.12.0 on RHEL 7.4
So QtWayland will be built and included in the installer.

wayland-egl, however, will not be built, as that depends on support in mesa.

Task-number: QTBUG-66341
Change-Id: Id3f1825e00be9d278fce8ac2710a2640baafd332
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-26 19:52:41 +00:00
Johan Klokkhammer Helsing
51a87054d6 Provisioning: Install RPMs for mesa-wayland-egl on RHEL 7.4
The standard mesa.spec file had sections for wayland-egl, which were ifdef'ed
out. The RPMs downloaded by this script have been built with these ifdef's
removed.

Task-number: QTBUG-66341
Change-Id: I43bcc67f5fd112e0837d45da7df20bcb63bfd989
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-26 19:52:38 +00:00
Qt Submodule Update Bot
20b1d0a54b Update submodules on 'dev' in qt5
Change-Id: Ic951b2a9e44e299bedc4c6dc561d8f9e17de6544
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-02-26 09:54:33 +00:00
Qt Submodule Update Bot
8c790cd2bc Update submodules on '5.11' in qt5
Change-Id: I46be13c9983d30fb1e2461dbc795664600e0655a
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-02-26 05:16:07 +00:00
Qt Submodule Update Bot
9c1ce66737 Update submodules on '5.11' in qt5
Change-Id: I2f9a24e295282514da028d8ff8d27e0de6326218
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-02-24 06:17:43 +00:00
Liang Qi
36d5e1a794 Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ie83ca342acce563e85620c3998ae7e9f74a7c4bc
2018-02-23 22:16:13 +01:00
Frederik Gladhorn
b20224fe60 Uninstall aptdaemon/aptd before using apt
This removes various kinds of update notifiers that depend on aptd.
Also gets rid of the problem that aptd may hold apt lock files.

Task-number: QTQAINFRA-1755
Change-Id: I27dd6fef4720ef25a504d76a3da16d9bf45fb2f7
Reviewed-by: Sami Nurmenniemi <sami.nurmenniemi@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-02-23 21:00:32 +00:00
Joni Jantti
f6f00fdce1 Provisioning: Win7-x86 - Add msvc14_x86 squish package
Squish is required by RTA testing.

Task-number: QTQAINFRA-1732
Change-Id: I8ab0b11ccc299cc0b10e59f99d1cf27c0cdd48b9
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-02-23 21:00:29 +00:00
Joni Jantti
f6f5cc70e9 Provisioning: openSUSE-42.3 - Disable update notifications
Update notifications need to be disabled to prevent popup messages
from stealing focus during testing.

Task-number: QTQAINFRA-1755
Change-Id: I202ffbee6420d2c9c167a97f02d5245145b618d0
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-02-23 21:00:25 +00:00
Matti Paaso
c3b33afc32 Provisioning: osx-10.11 - Java
This is needed for running RTA jobs in Coin.

Change-Id: Iff855dae54babef00c055a2c8b938871101305e3
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-02-23 21:00:21 +00:00
Joni Jantti
5e31866727 Provisioning: Win10 - Add Squish for mingw53
RTA requires Squish for mingw53 on Windows 10 machines for testing.

Task-number: QTQAINFRA-1729
Change-Id: I42f2c6c62dd004ebc072835340ce24105cfac5e8
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-02-23 21:00:19 +00:00
Joni Jantti
b1a212b52e Provisioning: Make Windows scripts use the Download helper function
Some Windows provisioning scripts use the Invoke-WebRequest without
setting the ProgressPreference = 'SilentlyContinue' variable for
disabling the download progress bar. Disabling the progress bar
greatly increases the download speed during provisioning.

Change-Id: I649c1bcc970577776d720a4ebf5a7af96c1603f8
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-02-23 21:00:15 +00:00
Tony Sarajärvi
54d8396d68 Set proxy on Windows VMs while provisioning
Task-number: QTQAINFRA-1669
Change-Id: Ia6b5b668051642a3729d7c7c83c69d8797045847
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-02-23 21:00:11 +00:00
Heikki Halmet
3a3c6fb2b3 Provisioning: Fix Windows 10 msvc 2014 squish installation
Change-Id: Id935580730d20a2f86fa6c82bf08ee3705f344f2
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-02-23 21:00:08 +00:00
Qt Submodule Update Bot
b17fcbe630 Update submodules on 'dev' in qt5
Change-Id: Ia6f8ec8bb3361419f6d50dbddb665e974a2f1fca
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-02-23 09:08:49 +00:00
Tony Sarajärvi
ae17b63db2 Add shebang to launchable script
Change-Id: I62e33b656eee3a17e1dab4476569d9afa0b62a45
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2018-02-23 08:20:34 +00:00
Maurice Kalinowski
acbedcc314 Provisioning: Update Open62541
This is required to use new APIs from the library.

Change-Id: Idbadfd04c331af228a9e095e130930b5fb88f7af
Reviewed-by: Jannis Völker <jannis.voelker@basyskom.com>
Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
2018-02-23 08:20:31 +00:00
Liang Qi
238cb26099 Update submodules on 'dev' in qt5
Change-Id: Ia8de2d8c35a6a021fd22522a642caa82d960aed2
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-02-23 06:31:08 +00:00
Liang Qi
3ba940924d Merge remote-tracking branch 'origin/5.10' into 5.11
Change-Id: Ia450fbc4398a627ebb37646b408a0692cc970094
2018-02-22 09:06:19 +01:00
Qt Submodule Update Bot
8eed3b5be4 Update submodules on '5.11' in qt5
Change-Id: I1447f714aa1035c2cdbe423935cc5a67a700de2d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-02-22 06:56:53 +00:00
Liang Qi
93ff678878 Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ib867a3e53f624b8963e6dab311fe5c2a28c87801
2018-02-21 09:57:48 +01:00
Liang Qi
91739f5fe3 Merge remote-tracking branch 'origin/5.9' into 5.11
Conflicts:
	coin/provisioning/common/linux/open62541.sh
	coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/02-apt.sh
	coin/provisioning/qtci-macos-10.12-x86_64/40-qnx700.sh

Done-with: Maurice Kalinowski <maurice.kalinowski@qt.io>
Change-Id: Icd472b8f770a933bafead48093ecf7eb94156128
2018-02-20 22:33:59 +01:00
Oswald Buddenhagen
c64b2415d3 init-repo: complain about non-option arguments
otherwise abuse may go unnoticed (at this stage ...).

Change-Id: Ic8c2a843a941cdeb2d69542830eccf7fadcf252d
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2018-02-20 11:20:20 +00:00
Matti Paaso
884490eaae Add RTA targets
Release Test Automation tests are ran also in additional targets
compared to qt5 targets.

Change-Id: I72ca86f875920ec266e0e6b7ea3fee026eaa1cfe
Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
2018-02-20 10:47:12 +00:00
Qt Submodule Update Bot
bcaeff8210 Update submodules on '5.11' in qt5
Change-Id: I069e5672ed40279dbbd8769be17f5cb328b12bc1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-02-19 07:15:40 +00:00
Qt Submodule Update Bot
060d0bdec1 Update submodules on '5.11' in qt5
Change-Id: I92f9401dc98ab115fe737ec5395025055830140f
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-02-18 21:40:38 +00:00
Qt Submodule Update Bot
e086fbc6cb Update submodules on '5.9' in qt5
Change-Id: Ie7a64cad655dd0e850c8c6145f35b425de6f4c25
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-02-17 21:25:08 +00:00
Qt Submodule Update Bot
5186a96b47 Update submodules on '5.11' in qt5
Change-Id: I5253636ea9da20b20879f4863dc5b037842b9e7b
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-02-17 10:52:39 +00:00
Liang Qi
ea28c00dd6 Merge remote-tracking branch 'origin/5.10.1' into 5.11
Change-Id: I07cebe617c7860cbeede24b2f45c7c508aed5a92
2018-02-15 20:59:29 +01:00
Qt Submodule Update Bot
443328fa9f Update submodules on '5.11' in qt5
Change-Id: Ie33f91194895634fbf837210e534b78e7559989e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-02-15 13:51:31 +00:00
Liang Qi
c152f646db Update submodules on 'dev' in qt5
Change-Id: Icbb7b51a46c55ed4ec7690e6cdceedf4680f3b2f
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-02-14 06:54:00 +00:00
Liang Qi
3d445e8b77 Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Iac3ddede9c1d6b0de5a30b3490d5564995afaabc
2018-02-13 21:18:24 +01:00
Heikki Halmet
404805141a Disable set -e when enabling devtoolset-4 environment variables
Change-Id: If427179da490f14963077cd733082258e354710f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-02-13 19:32:03 +00:00
Simo Fält
769a34ed26 Provision: Use specific Python2 version in macOS
Make sure we use some specific Python2 version on macOS instead of the
one pre-installed along with system.

Change-Id: Ifee07a8cf003e282ec3cb67535818f9fe39c8679
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-02-13 19:32:00 +00:00
Qt Submodule Update Bot
066373c9c6 Update submodules on '5.9' in qt5
Change-Id: I360edc60d8e2740d1964b91e18e02dc5daeea39a
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-02-12 18:50:11 +00:00
Qt Submodule Update Bot
c77d4946b2 Update submodules on '5.10' in qt5
Change-Id: Ie45f18cc0c70cca437cadd8bfaa6e8a4ac0c81b8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-02-12 08:16:58 +00:00
Qt Submodule Update Bot
9cb9e7654a Update submodules on 'dev' in qt5
Change-Id: Ibb42cbf10eb51d99e5d26a3e616bf488f9b5bd28
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-02-12 05:26:25 +00:00
Qt Submodule Update Bot
623528bf40 Update submodules on 'dev' in qt5
Change-Id: Id7d9342393bbf3068dd7a1c90dc2afe365d80962
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-02-11 19:13:43 +00:00
Jake Petroules
355252621c Remove macOS 10.10 from CI for Qt 5.11
As agreed, this version will not be supported any longer.

Change-Id: I37d9d9d9e32b5d17dbf0f80a6c42a8e233bcc446
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2018-02-10 19:15:51 +00:00
Qt Submodule Update Bot
a969ebdb84 Update submodules on 'dev' in qt5
Change-Id: If9edf8eca3865c32db056bb8f167dc47530c9d37
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-02-10 07:47:38 +00:00
Qt Submodule Update Bot
5611fe34b0 Update submodules on '5.10' in qt5
Change-Id: Ica319a5d98406174ce94d2e3c3784364ab44c642
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-02-10 07:47:25 +00:00
Mitch Curtis
e30de965b9 .gitmodules: update recommended modules for qtvirtualkeyboard
The basic example will start using qtquickcontrols2, so recommend that.
Remove qtquickcontrols, as it wasn't used.

Change-Id: Ieaab1480e6a85ecaa24888fa58024d728d863a16
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2018-02-09 18:36:54 +00:00
Qt Submodule Update Bot
f50cada914 Update submodules on 'dev' in qt5
Change-Id: I712f991abb4fb97e341133c295f2d77330a84a68
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-02-09 13:14:52 +00:00
Qt Submodule Update Bot
b2b076782f Update submodules on '5.10' in qt5
Change-Id: I06c4afea4e574aa78f37009db512ba25194f6d5d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-02-09 12:47:17 +00:00
Qt Submodule Update Bot
456a4d6453 Update submodules on '5.10' in qt5
Change-Id: I935d6ad075384973425d48782a105a9e3e7d21a0
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-02-08 09:31:00 +00:00
Joni Jantti
cadedac3b4 Provisioning: osx-10.11 - Disable sleep
Display sleep and system sleep need to be disabled to prevent the
machine from going to sleep during RTA testing.

Task-number: QTQAINFRA-1588
Change-Id: Idc91d77388ed9bc6df5f3c1aceca515f6308c618
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-02-08 08:04:47 +00:00
Joni Jantti
af55ddc913 Provisioning: MacOS-10.12 - Disable sleep
Display sleep and system sleep need to be disabled to prevent the
machine from going to sleep during RTA testing.

Task-number: QTQAINFRA-1588
Change-Id: I3dc1642d3714762bfb56963392d2bb5137c13256
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-02-08 08:04:44 +00:00
Qt Submodule Update Bot
25a19a1115 Update submodules on 'dev' in qt5
Change-Id: I29aba3e5aebc6ee4b2e130b70dbf184ad3d79303
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-02-08 07:30:24 +00:00
Oswald Buddenhagen
9c506a5164 Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Ia8d3b57d6cb1b89de7164d7ecede664cf5bd2f58
2018-02-07 20:17:09 +01:00
Qt Submodule Update Bot
9680fa7860 Update submodules on 'dev' in qt5
Change-Id: If34630f163416a6ee7b34df5b7f41c47f8f5cfd1
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-02-07 18:34:51 +00:00
Liang Qi
6cd75cce72 Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I71b7fd09cd8f1c7e64531eec8a645c06a7066325
2018-02-07 13:58:54 +01:00
Alex Blasche
d212f48b67 Remove QtOpcUA from qt5.git
This module is moved to tqtc-qt5.

Change-Id: I57641392be0a968dfd51633fcba15e38de45abcd
2018-02-07 11:32:54 +01:00
Liang Qi
da1189b867 Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: Icf5a559c89f572249cc1fd54d2c11319597afdf9
2018-02-07 10:14:50 +01:00
Tony Sarajärvi
c3096caa14 Remove excess comment line for shellcheck
Change-Id: I3e9b8091c158a978bd95e48b18df326c3a545798
Reviewed-by: Joni Jäntti <joni.jantti@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-02-07 06:30:47 +00:00
Tony Sarajärvi
b4b62658ac Fix environment variable checking for proxy
Change-Id: Iec261d4ce4e84ba656edf9de52b4dc42d0249e51
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-02-07 06:30:44 +00:00
Qt Submodule Update Bot
052aa06ef4 Update submodules on '5.9' in qt5
Change-Id: I1254c80a58ec607af3cf3955b3c73e3fb30a516e
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-02-07 06:30:41 +00:00
Joni Jantti
38649924df Provisioning: Ubuntu 16.04 x64 - Set grub timeout to 0
Grub timeout should be set to 0 so we save some time whenever the VMs
are booted.

Task-number: QTQAINFRA-1703
Change-Id: Ia866000703fdc083407d5d8588ba6680ffd80038
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-02-07 06:30:38 +00:00
Joni Jantti
9fa8b3ca35 Provisioning: openSUSE - Disable file indexing
Baloo file indexing sometimes takes up a great amount of CPU capacity
and should therefore be disabled.

Task-number: QTQAINFRA-1702
Change-Id: I549aef39c1dd2d2fa97196910f577153a42c4f54
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-02-07 06:30:35 +00:00
Qt Submodule Update Bot
0687514221 Update submodules on '5.11' in qt5
Change-Id: I8e2b737f940e5712c49eadf688983607e4ec349c
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-02-07 05:40:13 +00:00
Liang Qi
3279652635 Merge remote-tracking branch 'origin/dev' into 5.11
Change-Id: I3354e454e9b8c686e5d696562096a793e4a0b284
2018-02-06 17:49:39 +01:00
Liang Qi
0e4931a8af Merge remote-tracking branch 'origin/5.10' into 5.11
Change-Id: I3b299786e8500b0a8f2c197f7501f8e6e1cf29cf
2018-02-04 15:30:50 +01:00
Joni Jantti
2e329bc68e Provisioning: openSUSE - Set grub timeout to 0
Grub timeout should be set to 0 so we save some time whenever the VMs
are booted.

Task-number: QTQAINFRA-1703
Change-Id: I67db00d200dc3e5f94ed205b53bb0ca6e70bdd8d
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-02-03 20:52:57 +00:00
Qt Submodule Update Bot
88811f882e Update submodules on '5.9' in qt5
Change-Id: I14c5e22d5c76b64a573fb32b71580e00c2a3eeba
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-02-03 15:20:59 +00:00
Qt Submodule Update Bot
704b2387de Update submodules on 'dev' in qt5
Change-Id: Ie2e621ae2c2387c7daa0c29c5e04c8928fed169b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2018-01-31 21:59:37 +00:00
J-P Nurmi
13be05c06d Swap qtquickcontrols vs. qtquickcontrols2 statuses
The Qt Quick Controls (1) module, which was still listed as an essential
module, has not been actively developed for almost three years. Promote
Qt Quick Controls 2 as an essential module instead, and demote Qt Quick
Controls (1) as an addon.

Change-Id: If51c6c17d199ca10a574053d7dba67539a764aba
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2018-01-31 21:59:17 +00:00
Frederik Gladhorn
b032d87632 Revert "Adjust submodule branches"
This got merged accidentally.

This reverts commit 282899453d.

Change-Id: I1457513217e636aa54b43a1dc21b01443c798119
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2018-01-31 21:59:10 +00:00
Frederik Gladhorn
282a4f0a35 Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I30587abcc4062808e13570ff2a158a0fdc60cad2
2018-01-31 08:35:46 +01:00
Frederik Gladhorn
61cd31a5e3 Provisioning: Fix location of sw_versions.txt
I did not see this in the previous direct push.

Change-Id: I620dcc7f1c562e5bd9e09d479a4a5b8598a970fb
2018-01-31 08:32:41 +01:00
Frederik Gladhorn
250e07e99a Merge remote-tracking branch 'origin/5.11' into dev
This was pushed directly, bypassing codereview.qt-project.org to get
provisioning back into a working state.

Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Change-Id: I4eadb7ffafdf5cbc821d1f0a96734b0f83243464
2018-01-29 14:10:44 +01:00
Frederik Gladhorn
a434f14bd9 Merge remote-tracking branch 'origin/5.10' into 5.11
Conflicts:
	coin/provisioning/common/linux/qnx_700.sh
	coin/provisioning/common/windows/libclang.ps1

Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Change-Id: I7fe1337fb8a575083e8b649d1a051abc82e3b408
2018-01-29 14:06:05 +01:00
Allan Sandfeld Jensen
18b5dbf7df Add a MSVC2017 platform to the default tested
Is needed for qtwebkit and qtwebengine testing and added in dev, where
MSVC2013 was removed to not add additional pressure on the CI.

Task-number: QTBUG-65830
Change-Id: I48d3a36a9f69f7345d3cf4dc5a652adb62bb461f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2018-01-26 15:49:50 +00:00
Qt Submodule Update Bot
c0b7daeb10 Update submodules on 'dev' in qt5
Change-Id: I3b1e1f1b46d3cb067e335ce1bef0da3046afed8e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-01-24 23:01:47 +00:00
Oswald Buddenhagen
282899453d Adjust submodule branches
Change-Id: Id6fe05f393152581b8509fd613084df1f318bc54
2018-01-24 17:49:00 +01:00
Samuli Piippo
953dc011b2 Enable ARM64 build for QNX7
Change-Id: Ic30f4032c73ec16a9f1b93b3afee1e9812074bb7
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-01-24 10:24:13 +00:00
Qt Submodule Update Bot
fc840c3459 Update submodules on 'dev' in qt5
Change-Id: Id6db5f3aa546198917e3e14e53c47126c9f4a012
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-01-23 05:21:41 +00:00
Frederik Gladhorn
052b4b5844 Merge remote-tracking branch 'origin/5.10' into dev
Change-Id: I1031266ae727e7bfeae71bf3faed9b5197c16247
2018-01-22 12:19:10 +01:00
Tony Sarajärvi
dc1560dbef Add dependencies needed to build Yocto
Task-number: QTQAINFRA-1690
Change-Id: I9583c39709849d058e6d44473e074e9327907dd8
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2018-01-19 11:29:58 +00:00
Qt Submodule Update Bot
4319f7da72 Update submodules on 'dev' in qt5
Change-Id: I6a9db841c7c6c9eba6248072caa8069dacb853da
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-19 05:26:04 +00:00
Tony Sarajärvi
7c66e59832 Add nfs-common for mounting to work
Task-number: QTQAINFRA-1690
Change-Id: I43453da3267664c664e80510e3750d1906d00078
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2018-01-18 16:33:18 +00:00
Tony Sarajärvi
f2f9b14cee Consolidate provisioning script name for qnx in macOS
Change-Id: Id07686bcc677b62a4981a46cabefd40b544815c5
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2018-01-18 16:33:13 +00:00
Liang Qi
762530ba70 Update submodules on 'dev' in qt5
Change-Id: I30571e17dc4fafbaf66232546bf33ba4965d36e8
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-18 07:21:08 +00:00
Oliver Wolff
e33ef922ba Use "correct" registry when enabling Windows 10 Developer Mode
As coin is running a 32 bit application the registry key ended
up in the Wow6432Node compatibility area of the registry when run
on a 64 bit Windows. Windows does not use this place to check
for the developer mode setting, so we use the "proper" registry
instead.

If adding the registry key fails the script now reflects that
and exits with a proper exit code.

Change-Id: Ifd6bc7e7b0ed6595a2a967597ab45053cb51e7aa
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2018-01-17 16:47:54 +00:00
Liang Qi
1c7ba877cc Move QNX 7 arm build from qt5 to default
QNX 6.6 builds were removed. We need to check QNX in submodules
build.

This change amends 357de3ea13.

Change-Id: Ia04256bf35e45f111f73661c6f3ca445253900ec
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-01-14 08:59:49 +00:00
Heikki Halmet
6e4f2f8433 Fix common folder paths for common split change
Change-Id: I9d3f1ce71d7995c88005b81f7f9dc9db892e9de7
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-13 07:31:51 +00:00
Liang Qi
da80efa880 Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: I9a419b82cc05549f6d8e6394bec5c349aa1c9c63
2018-01-12 21:14:23 +01:00
Liang Qi
c2d188f225 Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
	coin/platform_configs/default.txt
	coin/platform_configs/qt5.txt

Task-number: QTBUG-65688
Change-Id: I17a303731dab4b967c9ef8a852ee0c1097b88f10
2018-01-12 21:13:56 +01:00
Liang Qi
ab25cb7af6 Update submodules on 'dev' in qt5
Change-Id: Iae26c4fdcf07ff7cd1ff53a98ce0fcbf4af1ffac
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-12 08:22:34 +00:00
Jani Heikkinen
de5d8f3b4f Adjust QNX packaging builds for Qt 5.11
- Add missing 'Packaging' flag for linux and windows QNX builds
- Remove unnecessary 'Packaging' flag from mac QNX build

Change-Id: Ie4c49b9bd93f67f6a2dbbdece99da8c8f5fb3bef
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
2018-01-09 15:56:32 +00:00
Qt Submodule Update Bot
29f29e6ea8 Update submodules on 'dev' in qt5
Change-Id: I71684e67b6c6861fbcbcb6a652dc2d8b2f799e28
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-09 05:21:08 +00:00
Joni Jantti
dc6c54cb2d Provisioning: Ubuntu 16.04 - QNX700
QNX 7.0 is required by RTA on Ubuntu.

Task-number: QTQAINFRA-1671
Change-Id: I82821e096cfa2d35a2176eba6e753a0d71049b72
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-01-08 15:54:23 +00:00
Qt Submodule Update Bot
a8178a1888 Update submodules on 'dev' in qt5
Change-Id: Iadd154372d1cbf8b133ae8f858c9192c5afad239
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-08 04:56:41 +00:00
Liang Qi
d196866f31 Revert "Temporarily ignore qtwayland"
QtWayland adapted to new api in qtbase.

This reverts commit eba433c126.

Task-number: QTBUG-65600
Change-Id: If46f054adfb8a2db0d82acbd07cb39b2f512530e
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2018-01-07 15:50:41 +00:00
Liang Qi
01b9b9051b Update qtwayland only
Change-Id: Id64117912e009a93422dce6434bc5d6782b881fd
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-07 15:50:38 +00:00
Liang Qi
eba433c126 Temporarily ignore qtwayland
qtbase changed API, qssize_t was changed to qsizetype. In order for
qtwayland to update, qt5 needs to update first; but in order for
qt5 to update, qtwayland needs to compile.

Ignoring breaks cycle.

Task-number: QTBUG-65600
Change-Id: I978b0ed8dc86898ab1feb8b9cc47960e42095dfa
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-07 13:30:20 +00:00
Liang Qi
04727e9936 Update submodules on 'dev' in qt5
Change-Id: I8b41e6c3f695547ea8b8449f60b2b87be5ddb718
Reviewed-by: Liang Qi <liang.qi@qt.io>
2018-01-07 13:30:17 +00:00
Tony Sarajärvi
7a37b90702 Drop builds done with VS2013
Task-number: QTQAINFRA-1390
Change-Id: Id3de3706466508cdbfc586b2a39d96083e8434e5
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Tuukka Turunen <tuukka.turunen@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2018-01-05 20:43:53 +00:00
Oliver Wolff
f51fd755b5 Windows 10: Enable developer mode
In order to be able to run auto tests for UWP, developer mode has to be
enabled.

Change-Id: I4f20fb8d694d5148b7f976c1ef4bb23ff2fb57ba
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
2018-01-05 05:37:08 +00:00
Maurice Kalinowski
a417fd37e0 Update FreeOpcUA version
This should fix the latest failures for FreeOpcUA unit tests.

Change-Id: I0a176d300336b208ebcd8f27b4b6218b7f538f5c
Reviewed-by: Jannis Völker <jannis.voelker@basyskom.com>
Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2018-01-03 08:33:23 +00:00
Maurice Kalinowski
5fa40393c5 Apply path changes to running process
SetEnvironment only applies changes to PATH for new processes. Currently
the provisioning runs the scripts in one process, hence changes are not
applied when they are already needed.

Change-Id: I82a360686651a57e5c94330a9b56671fca1493e5
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2018-01-03 08:33:19 +00:00
Maurice Kalinowski
cb327e54bd Fix open62541 provisioning on Linux
pip is an unknown command in the sudo environment.

Change-Id: Ia59c0b98eac6c3d22b8a452988abe17df6a83909
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
2018-01-03 08:33:13 +00:00
Qt Submodule Update Bot
c8b8ee9c00 Update submodules on 'dev' in qt5
Change-Id: If27f8d737219311944dccb795e70c1061817b965
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2018-01-01 18:12:35 +00:00
Lars Knoll
7a96b8dfd4 Revert "Temporarily remove two platforms from the qt5.git build"
This re-enables all platforms we should be testing on, after
having resolved the deadlock between qtbase and declarative.

This reverts commit 62efcd0c0a.

Change-Id: I2bcc34ad2d00036cc8ed37badbca67d4e68f5eac
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2017-12-30 08:08:33 +00:00
Lars Knoll
0bc8941e0c Update submodules on 'dev' in qt5
Change-Id: I7bef606c5610c1235d3893a1330d82ed0137259b
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2017-12-30 08:08:30 +00:00
Qt Submodule Update Bot
a7ebfbda72 Update submodules on 'dev' in qt5
Change-Id: Ic5a5a6acb55c5d5bac5ef7146c12c699a2b99948
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-12-29 11:40:27 +00:00
Lars Knoll
62efcd0c0a Temporarily remove two platforms from the qt5.git build
This is required to get a qt5.git update through, where we're having
a catch22 problem. Current qtbase in qt5.git gives compile errors on
some of the tested platforms, while qtdeclarative has test failures
due to (correct) changes in qtbase. So we can't merge the fix for
declarative without updating qt5.git, and we can't update qt5.git
without having that fix merged.

Change-Id: I87f79f6312a6ee2226aeb7b6868fd280ab087bcc
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2017-12-29 11:40:12 +00:00
Joni Jantti
66f9718ebb Provisioning: Clean and move Win8 mqtt scripts to Win8.1
mqtt scripts need to be moved to Windows 8.1 directory from Windows 8.

Change-Id: Idc1b116f608e8cc8ae0a37713661d35b55b26a3a
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-27 11:29:37 +00:00
Joni Jantti
dc0d045c17 Provisioning: Move open62541 from RHEL 7.2 to RHEL 7.4
5.10 -> dev merge switched from RHEL 7.2 to 7.4 and the open62541
provisioning script was left behind to the RHEL 7.2 provisioning
directory.

Task-number: QTQAINFRA-1666
Change-Id: I5c325dae63cb14a9935ddce5f3f751bd62df0ba2
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
2017-12-27 11:29:35 +00:00
Tony Sarajärvi
357de3ea13 Drop QNX 6.6.0 verification from the CI
Task-number: QTQAINFRA-1378
Change-Id: Icc5fb21b6430c916ceecb8d5a504d40938931b06
Reviewed-by: Simo Fält <simo.falt@qt.io>
2017-12-27 11:29:31 +00:00
Liang Qi
730e2c9b0b Revert "Temporarily disable android build on macOS 10.12"
Bring android build on macOS back.

This reverts commit b6249e89fa.

Task-number: QTQAINFRA-1660
Change-Id: I510894cf6bdc7089fea140e3702e5246a6617787
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-12-21 16:55:12 +00:00
Simo Fält
5df4ec2ec9 Fix Android provisioning script
We have to accept extra license to enable installing all required
packages.

Task-number: QTQAINFRA-1660
Change-Id: Ifae45ce36b5739cea5124eae04e08472ebe9414a
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-21 16:55:09 +00:00
Liang Qi
ba6ae3be9a Revert "Temporarily ignore qtcanvas3d"
QtCanvas3D adapted to new internal api in qtdeclarative.

This reverts commit 146bda6468.

Task-number: QTBUG-64766
Change-Id: I709cb8856b674edc1a7d3217fdf68cbe8aca1608
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-12-20 08:17:41 +00:00
Liang Qi
6b7ee9a8f0 Update qtcanvas3d only
Task-number: QTBUG-64766
Change-Id: I2ae55f0f4e38ffb98964f960c323334a9049936f
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-12-20 08:17:38 +00:00
Liang Qi
b6249e89fa Temporarily disable android build on macOS 10.12
Need to be re-enabled when correct fix landed.

Task-number: QTQAINFRA-1660
Change-Id: Ifefb019016322ebf2e7c4ec9320e58555c6918e0
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2017-12-20 06:39:05 +00:00
Liang Qi
146bda6468 Temporarily ignore qtcanvas3d
qtdeclarative changed internal API.

Task-number: QTBUG-64766
Change-Id: I7a0bbcaf121bf852fc028be275e82a5658c132a0
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-12-20 06:39:02 +00:00
Liang Qi
b5e287b93b Update submodules on 'dev' in qt5
Change-Id: Ia91b548e08a7d84f47116b79265618ff9d4d8005
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-12-20 06:38:58 +00:00
Liang Qi
def11da274 Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
	coin/platform_configs/qt5.txt

Change-Id: I9ad5a004544bf2f368ee1aaad247c4db3b36b162
2017-12-14 11:49:07 +01:00
Heikki Halmet
44eaaf374a Install command line tools for osx 10.11 and macOS 10.12
Command line tools is needed by homebrew when installing p7zip

Task-number: QTBUG-64729
Change-Id: I2f9ce5a094ffe4d07e8bd138c0dcc150d0d916e0
Reviewed-by: Liang Qi <liang.qi@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit beb73056c3)
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-12-12 16:51:39 +00:00
Maurice Kalinowski
4096e387f0 OpcUA: Add Open62541 Support
Open62541 is a new backend added to the Qt OpcUA module. Furthermore,
this is going to be used as new test server to verify changes against.

Change-Id: Id08c91644f33734318925d84fb22b0d011604dd9
Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
2017-11-13 04:53:30 +00:00
Qt Submodule Update Bot
b0eddcbae6 Update submodules on 'dev' in qt5
Change-Id: Iec4f8b9f7178a8d2bc0f848752db976191e14331
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-11-08 04:51:40 +00:00
Qt Submodule Update Bot
59ee506fe6 Update submodules on 'dev' in qt5
Change-Id: Icf103970bed93741218f7e3165ede8852672eaef
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-11-05 09:14:08 +00:00
Liang Qi
037335f4bf Merge remote-tracking branch 'origin/5.10' into dev
Change-Id: I7f1af5ed2b7653f36ebbcee5eb9255b57c4ca8af
2017-11-02 10:29:13 +01:00
Qt Submodule Update Bot
70f20ec55e Update submodules on 'dev' in qt5
Change-Id: I62a76cb248b1c0d1ffe22e085754a31a0c721a5e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-11-01 23:01:12 +00:00
Joni Jäntti
f90790b3ed MinGW provisioning to 64-bit from 32-bit
We are switching to 64-bit MinGW targets in 5.11 branch.

Task-number: QTQAINFRA-1432
Change-Id: Ic806e0e6400ae98351a922ed7f5a545046273ada
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2017-10-28 19:11:21 +00:00
Liang Qi
dc66b1f7e1 Update submodules on 'dev' in qt5
Change-Id: I59501a4a693f7979b129ff6f8e19d62b5da34e16
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-10-28 19:11:18 +00:00
Qt Submodule Update Bot
081ee56cd0 Update submodules on 'dev' in qt5
Change-Id: Ic3774c799e0fde95edd02076fe33da9accf19ee0
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-10-24 16:54:49 +00:00
Liang Qi
6cbd3faac0 Update submodules on 'dev' in qt5
Change-Id: I6854bd7c7219a6d9cf86ff3566bea966ae2771b1
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-10-21 06:57:56 +00:00
Liang Qi
ef983c6a3b Merge "Merge remote-tracking branch 'origin/5.10' into dev" into refs/staging/dev 2017-10-05 17:50:40 +00:00
Jędrzej Nowacki
ee8327928d Provision 32 bit libclang on all Windowses
Up to now we were always matching host architecture for
clang version to install. It is not good enough as in
some cases (all?) we build qdoc, which depends on clang,
as 32 bit app, that can not link to 64 bit clang.

Change-Id: I7b635f38821533da32d721e5e55f0067d4d0f62e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
2017-10-05 17:50:37 +00:00
Liang Qi
1099b1ddce Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
	.gitmodules
	coin/platform_configs/qt5.txt

Change-Id: I4dee3bb4aab69430fc013ce509e20b7a9b9e4f47
2017-10-05 12:47:24 +02:00
Liang Qi
cdab32be23 Update submodules on 'dev' in qt5
Change-Id: I309c7e0fffbcd8b18c9bacf1587bd247687d9c95
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-10-05 07:12:25 +00:00
Qt Submodule Update Bot
452814565e Update submodules on 'dev' in qt5
Change-Id: If80a73c6fbdd0b790df76802e85f85a05d21dc33
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-09-25 05:06:37 +00:00
Qt Submodule Update Bot
f07e18248f Update submodules on 'dev' in qt5
Change-Id: I1dbe69b48fd449b4336c994fc0b4d6b1385327e5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-09-23 18:32:29 +00:00
Qt Submodule Update Bot
bfec1f8e3b Update submodules on 'dev' in qt5
Change-Id: I5aedaf510d296b0ab7707e7ddb89affebc28fdce
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2017-09-22 04:23:19 +00:00
Liang Qi
5141ac6418 Update submodules on 'dev' in qt5
Change-Id: I0030602560b9e47939557c8bcea9abeb8652b373
Reviewed-by: Liang Qi <liang.qi@qt.io>
2017-09-13 13:01:07 +00:00
Alex Blasche
92b8f50bfa Introduce qtopcua to top-level Qt builds
Change-Id: Iaf9e137c0ae08cc527e14a394cfaf235dfce13fe
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-09-05 07:09:06 +00:00
Tony Sarajärvi
664ce64f24 Provisioning: Add QNX 7.0 SDP in macOS 10.12
Task-number: QTQAINFRA-1190
Change-Id: I2edb16464fa320a8e3beabea32ad673f8d6d0352
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-09-01 19:24:15 +00:00
Tony Sarajärvi
0dbc2a3aaf Add QNX7 as a build target on macOS 10.12 hosts
Task-number: QTQAINFRA-1189
Change-Id: Ica11a1ca1dc7b306da243f719ff48dce4d03d271
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2017-09-01 19:24:04 +00:00
Qt Submodule Update Bot
4ad6292028 Update submodules on 'dev' in qt5
Change-Id: Id6afc51f57495e9416bdad103292a4be5503049e
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-30 11:23:31 +00:00
Martin Smith
cf92d02d8a Provision Ubuntu 16.04 with libclang
It is needed for QDoc.

Task-number: QTBUG-62532
Change-Id: Icfc7d0af8a90cf827f4d6468e95f5aa002872102
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-29 04:32:57 +00:00
Qt Submodule Update Bot
4bddc8d3f6 Update submodules on 'dev' in qt5
Change-Id: Ic635a1050dd225a105925bfbc006ad933f352c27
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-28 07:28:26 +00:00
Alex Blasche
6a44181e8c Update ldconfig cache once freeopcua has been installed
Change-Id: Id9a2fd6c0f4f426906cf5d553db9559e180b27ea
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
2017-08-26 12:00:26 +00:00
Timo Aarnipuro
8007941af0 Enable INTEGRITY coin builds
Task-number: QTBUG-61702
Change-Id: If5f10aafc6d2c0853fbc3039aa7368620e04ea20
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2017-08-25 13:55:01 +00:00
1484 changed files with 28183 additions and 34778 deletions

View File

@@ -9,10 +9,18 @@
# ==[ Footers: Uncomment and edit where applicable ]===================|
#
# One task per entry. Remember space after colon.
# One task per entry. Add a space after the colon.
# Use Fixes to automatically close an issue, and Task-number to
# reference it without further action.
# You do not need both for the same issue.
#Fixes:
#Task-number:
#Coverity-Id:
#
# Add a space-separated list of target branches that the change should
# be cherry-picked to automatically.
#Pick-to:
#
# ==[ Please wrap at 72 characters ]===================================|
#
# Remember to read http://wiki.qt.io/Commit_Policy

237
.gitmodules vendored
View File

@@ -1,66 +1,61 @@
[submodule "qtbase"]
path = qtbase
url = ../qtbase.git
branch = 5.10.1
branch = 6.2
status = essential
[submodule "qtsvg"]
depends = qtbase
path = qtsvg
url = ../qtsvg.git
branch = 5.10.1
branch = 6.2
status = addon
[submodule "qtdeclarative"]
depends = qtbase
recommends = qtsvg qtxmlpatterns
recommends = qtimageformats qtshadertools qtsvg
path = qtdeclarative
url = ../qtdeclarative.git
branch = 5.10.1
branch = 6.2
status = essential
[submodule "qtactiveqt"]
depends = qtbase
path = qtactiveqt
url = ../qtactiveqt.git
branch = 5.10.1
branch = 6.2
status = addon
[submodule "qtscript"]
depends = qtbase
recommends = qttools
path = qtscript
url = ../qtscript.git
branch = 5.10.1
status = deprecated
[submodule "qtmultimedia"]
depends = qtbase
depends = qtbase qtshadertools
recommends = qtdeclarative
path = qtmultimedia
url = ../qtmultimedia.git
branch = 5.10.1
status = essential
branch = 6.2
status = addon
[submodule "qttools"]
depends = qtbase
recommends = qtdeclarative qtactiveqt
path = qttools
url = ../qttools.git
branch = 5.10.1
branch = 6.2
status = essential
[submodule "qtxmlpatterns"]
depends = qtbase
recommends = qtdeclarative
path = qtxmlpatterns
url = ../qtxmlpatterns.git
branch = 5.10.1
status = addon
branch = 6.2
status = ignore
[submodule "qttranslations"]
depends = qttools
path = qttranslations
url = ../qttranslations.git
branch = 5.10.1
branch = 6.2
status = essential
priority = 30
[submodule "qtdoc"]
depends = qtdeclarative
depends = qtdeclarative qttools
recommends = qtmultimedia
path = qtdoc
url = ../qtdoc.git
branch = 5.10.1
branch = 6.2
status = essential
priority = 40
[submodule "qtrepotools"]
@@ -73,22 +68,29 @@
depends = qtbase
path = qtqa
url = ../qtqa.git
branch = master
branch = dev
status = essential
priority = 50
[submodule "qtlocation"]
depends = qtbase
recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
depends = qtbase qtpositioning
recommends = qtdeclarative
path = qtlocation
url = ../qtlocation.git
branch = 5.10.1
branch = 6.2
status = ignore
[submodule "qtpositioning"]
depends = qtbase
recommends = qtdeclarative qtserialport
path = qtpositioning
url = ../qtpositioning.git
branch = 6.2
status = addon
[submodule "qtsensors"]
depends = qtbase
recommends = qtdeclarative
path = qtsensors
url = ../qtsensors.git
branch = 5.10.1
branch = 6.2
status = addon
[submodule "qtsystems"]
depends = qtbase
@@ -104,12 +106,6 @@
url = ../qtfeedback.git
branch = master
status = ignore
[submodule "qtdocgallery"]
depends = qtdeclarative
path = qtdocgallery
url = ../qtdocgallery.git
branch = master
status = ignore
[submodule "qtpim"]
depends = qtdeclarative
path = qtpim
@@ -118,201 +114,186 @@
status = ignore
[submodule "qtconnectivity"]
depends = qtbase
recommends = qtdeclarative qtandroidextras
recommends = qtdeclarative
path = qtconnectivity
url = ../qtconnectivity.git
branch = 5.10.1
branch = 6.2
status = addon
[submodule "qtwayland"]
depends = qtbase
recommends = qtdeclarative
path = qtwayland
url = ../qtwayland.git
branch = 5.10.1
branch = 6.2
status = addon
[submodule "qt3d"]
depends = qtbase
recommends = qtdeclarative qtimageformats qtgamepad
recommends = qtdeclarative qtshadertools
path = qt3d
url = ../qt3d.git
branch = 5.10.1
branch = 6.2
status = addon
[submodule "qtimageformats"]
depends = qtbase
path = qtimageformats
url = ../qtimageformats.git
branch = 5.10.1
branch = 6.2
status = addon
[submodule "qtquick1"]
depends = qtscript
recommends = qtsvg qtxmlpatterns
path = qtquick1
url = ../qtquick1.git
branch = dev
status = ignore
[submodule "qtgraphicaleffects"]
depends = qtdeclarative
path = qtgraphicaleffects
url = ../qtgraphicaleffects.git
branch = 5.10.1
status = addon
[submodule "qtquickcontrols"]
depends = qtdeclarative
recommends = qtgraphicaleffects
path = qtquickcontrols
url = ../qtquickcontrols.git
branch = 5.10.1
status = essential
[submodule "qtserialbus"]
depends = qtserialport
depends = qtbase
recommends = qtserialport
path = qtserialbus
url = ../qtserialbus.git
branch = 5.10.1
branch = 6.2
status = addon
[submodule "qtserialport"]
depends = qtbase
path = qtserialport
url = ../qtserialport.git
branch = 5.10.1
branch = 6.2
status = addon
[submodule "qtx11extras"]
depends = qtbase
path = qtx11extras
url = ../qtx11extras.git
branch = 5.10.1
status = addon
[submodule "qtmacextras"]
depends = qtbase
path = qtmacextras
url = ../qtmacextras.git
branch = 5.10.1
status = addon
[submodule "qtwinextras"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtwinextras
url = ../qtwinextras.git
branch = 5.10.1
status = addon
[submodule "qtandroidextras"]
depends = qtbase
path = qtandroidextras
url = ../qtandroidextras.git
branch = 5.10.1
status = addon
[submodule "qtenginio"]
depends = qtdeclarative
path = qtenginio
url = ../qtenginio.git
branch = dev
status = ignore
[submodule "qtwebsockets"]
depends = qtbase
recommends = qtdeclarative
path = qtwebsockets
url = ../qtwebsockets.git
branch = 5.10.1
branch = 6.2
status = addon
[submodule "qtwebchannel"]
depends = qtbase
recommends = qtdeclarative qtwebsockets
path = qtwebchannel
url = ../qtwebchannel.git
branch = 5.10.1
branch = 6.2
status = addon
[submodule "qtwebengine"]
depends = qtquickcontrols qtwebchannel
recommends = qtlocation qttools
depends = qtdeclarative
recommends = qtwebchannel qttools qtpositioning
path = qtwebengine
url = ../qtwebengine.git
branch = 5.10.1
branch = 6.2
status = addon
priority = 10
[submodule "qtcanvas3d"]
depends = qtdeclarative
path = qtcanvas3d
url = ../qtcanvas3d.git
branch = 5.10.1
status = addon
branch = 6.2
status = ignore
[submodule "qtwebview"]
depends = qtdeclarative
recommends = qtwebengine
path = qtwebview
url = ../qtwebview.git
branch = 5.10.1
status = addon
[submodule "qtquickcontrols2"]
depends = qtgraphicaleffects
recommends = qtimageformats
path = qtquickcontrols2
url = ../qtquickcontrols2.git
branch = 5.10.1
status = addon
[submodule "qtpurchasing"]
depends = qtbase qtandroidextras
recommends = qtdeclarative
path = qtpurchasing
url = ../qtpurchasing.git
branch = 5.10.1
branch = 6.2
status = addon
[submodule "qtcharts"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtcharts
url = ../qtcharts.git
branch = 5.10.1
branch = 6.2
status = addon
[submodule "qtdatavis3d"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtdatavis3d
url = ../qtdatavis3d.git
branch = 5.10.1
branch = 6.2
status = addon
[submodule "qtvirtualkeyboard"]
depends = qtbase qtdeclarative qtsvg
recommends = qtmultimedia qtquickcontrols
recommends = qtmultimedia
path = qtvirtualkeyboard
url = ../qtvirtualkeyboard.git
branch = 5.10.1
branch = 6.2
status = addon
[submodule "qtgamepad"]
depends = qtbase
recommends = qtdeclarative
path = qtgamepad
url = ../qtgamepad.git
branch = 5.10.1
status = addon
branch = 6.2
status = ignore
[submodule "qtscxml"]
depends = qtbase qtdeclarative
path = qtscxml
url = ../qtscxml.git
branch = 5.10.1
branch = 6.2
status = addon
[submodule "qtspeech"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtspeech
url = ../qtspeech.git
branch = 5.10.1
status = addon
branch = 6.2
status = ignore
[submodule "qtnetworkauth"]
depends = qtbase
path = qtnetworkauth
url = ../qtnetworkauth.git
branch = 5.10.1
branch = 6.2
status = addon
[submodule "qtremoteobjects"]
depends = qtbase
recommends = qtdeclarative
path = qtremoteobjects
url = ../qtremoteobjects.git
branch = 5.10.1
status = preview
branch = 6.2
status = addon
[submodule "qtwebglplugin"]
depends = qtbase qtwebsockets
recommends = qtdeclarative
path = qtwebglplugin
url = ../qtwebglplugin.git
branch = 5.10.1
status = preview
branch = 6.2
status = ignore
[submodule "qtlottie"]
depends = qtbase qtdeclarative
path = qtlottie
url = ../qtlottie.git
branch = 6.2
status = addon
[submodule "qtquicktimeline"]
depends = qtbase qtdeclarative
path = qtquicktimeline
url = ../qtquicktimeline
branch = 6.2
status = addon
[submodule "qtquick3d"]
depends = qtbase qtdeclarative qtshadertools
recommends = qtquicktimeline
path = qtquick3d
url = ../qtquick3d.git
branch = 6.2
status = addon
[submodule "qtshadertools"]
depends = qtbase
path = qtshadertools
url = ../qtshadertools.git
branch = 6.2
status = addon
[submodule "qt5compat"]
depends = qtbase qtdeclarative
path = qt5compat
url = ../qt5compat.git
branch = 6.2
status = deprecated
[submodule "qtcoap"]
depends = qtbase
path = qtcoap
url = ../qtcoap.git
branch = 6.2
status = addon
[submodule "qtmqtt"]
depends = qtbase qtdeclarative
path = qtmqtt
url = ../qtmqtt.git
branch = 6.2
status = addon
[submodule "qtopcua"]
depends = qtbase qtdeclarative
path = qtopcua
url = ../qtopcua.git
branch = 6.2
status = addon

114
CMakeLists.txt Normal file
View File

@@ -0,0 +1,114 @@
# The real minimum version will be checked by the qtbase project.
# 3.16 is the absolute minimum though.
cmake_minimum_required(VERSION 3.16...3.20)
# set QT_SUPERBUILD early, so that qtbase/.cmake.conf can check it
set(QT_SUPERBUILD TRUE)
# Include qtbase's .cmake.conf for access to QT_REPO_MODULE_VERSION
set(__qt6_qtbase_src_path "${CMAKE_CURRENT_SOURCE_DIR}/qtbase")
include("${__qt6_qtbase_src_path}/.cmake.conf")
# Run platform auto-detection /before/ the first project() call and thus
# before the toolchain file is loaded.
include("${__qt6_qtbase_src_path}/cmake/QtAutoDetect.cmake")
project(Qt
VERSION "${QT_REPO_MODULE_VERSION}"
DESCRIPTION "Qt Libraries"
HOMEPAGE_URL "https://qt.io/"
LANGUAGES CXX C ASM
)
# Required so we can call ctest from the root build directory
enable_testing()
set(qt_module_prop_prefix "__qt_prop_")
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
if (NOT QT_BUILD_STANDALONE_TESTS)
list(APPEND CMAKE_MODULE_PATH "${__qt6_qtbase_src_path}/cmake")
list(APPEND CMAKE_MODULE_PATH
"${__qt6_qtbase_src_path}/cmake/3rdparty/extra-cmake-modules/find-modules")
list(APPEND CMAKE_MODULE_PATH "${__qt6_qtbase_src_path}/cmake/3rdparty/kwin")
endif()
include("QtTopLevelHelpers")
include(ECMOptionalAddSubdirectory)
# Also make sure the CMake config files do not recreate the already-existing targets
if (NOT QT_BUILD_STANDALONE_TESTS)
set(QT_NO_CREATE_TARGETS TRUE)
endif()
# Get submodule list if not already defined
if(NOT QT_BUILD_SUBMODULES)
if(DEFINED ENV{QT_BUILD_SUBMODULES})
set(QT_BUILD_SUBMODULES "$ENV{QT_BUILD_SUBMODULES}")
else()
qt_internal_find_modules(QT_BUILD_SUBMODULES)
endif()
endif()
set(QT_BUILD_SUBMODULES "${QT_BUILD_SUBMODULES}" CACHE STRING "Submodules to build")
set(qt_module_dependency_map_prefix "__qt_module_dependencies_")
qt_internal_sort_module_dependencies("${QT_BUILD_SUBMODULES}" QT_BUILD_SUBMODULES
"${qt_module_dependency_map_prefix}")
foreach(module IN LISTS QT_BUILD_SUBMODULES)
# Check for unmet dependencies
if(NOT DEFINED BUILD_${module} OR BUILD_${module})
message(NOTICE "Checking dependencies of '${module}'")
get_property(required_deps GLOBAL PROPERTY QT_REQUIRED_DEPS_FOR_${module})
foreach(dep IN LISTS "${qt_module_dependency_map_prefix}${module}")
if (dep STREQUAL "qtbase")
# Always available skip
continue()
endif()
set(required FALSE)
if(dep IN_LIST required_deps)
set(required TRUE)
endif()
set(error_reason "")
if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${dep}/CMakeLists.txt")
set(error_reason "${dep}'s CMakeLists.txt couldn't be found")
elseif(DEFINED BUILD_${dep} AND NOT BUILD_${dep})
set(error_reason "building '${dep}' was explicitly disabled")
endif()
if(NOT error_reason STREQUAL "")
if(required)
message(FATAL_ERROR "Module '${module}' depends on '${dep}', "
"but ${error_reason}.\n"
"Note: Use '-skip ${module}' to exclude it from the build.")
else()
message(NOTICE "Skipping optional dependency '${dep}' of '${module}', "
"because ${error_reason}.")
endif()
endif()
endforeach()
endif()
endforeach()
foreach(module IN LISTS QT_BUILD_SUBMODULES)
message(NOTICE "Configuring '${module}'")
ecm_optional_add_subdirectory("${module}")
if(module STREQUAL "qtbase")
if (NOT QT_BUILD_STANDALONE_TESTS)
list(APPEND CMAKE_PREFIX_PATH "${QtBase_BINARY_DIR}/lib/cmake")
list(APPEND CMAKE_FIND_ROOT_PATH "${QtBase_BINARY_DIR}")
endif()
endif()
endforeach()
if(NOT QT_BUILD_STANDALONE_TESTS)
# Display a summary of everything
include(QtBuildInformation)
include(QtPlatformSupport)
qt_print_feature_summary()
qt_print_build_instructions()
endif()

View File

@@ -1,22 +0,0 @@
The Qt Company Qt LGPL Exception version 1.1
As an additional permission to the GNU Lesser General Public License version
2.1, the object code form of a "work that uses the Library" may incorporate
material from a header file that is part of the Library. You may distribute
such object code under terms of your choice, provided that:
(i) the header files of the Library have not been modified; and
(ii) the incorporated material is limited to numerical parameters, data
structure layouts, accessors, macros, inline functions and
templates; and
(iii) you comply with the terms of Section 6 of the GNU Lesser General
Public License version 2.1.
Moreover, you may apply this exception to a modified version of the Library,
provided that such modification does not involve copying material from the
Library into the modified Library's header files unless such material is
limited to (i) numerical parameters; (ii) data structure layouts;
(iii) accessors; and (iv) small macros, templates and inline functions of
five lines or less in length.
Furthermore, you are not required to apply this additional permission to a
modified version of the Library.

704
LICENSE.GPL3-EXCEPT Normal file
View File

@@ -0,0 +1,704 @@
This is the GNU General Public License version 3, annotated with The
Qt Company GPL Exception 1.0:
-------------------------------------------------------------------------
The Qt Company GPL Exception 1.0
Exception 1:
As a special exception you may create a larger work which contains the
output of this application and distribute that work under terms of your
choice, so long as the work is not otherwise derived from or based on
this application and so long as the work does not in itself generate
output that contains the output from this application in its original
or modified form.
Exception 2:
As a special exception, you have permission to combine this application
with Plugins licensed under the terms of your choice, to produce an
executable, and to copy and distribute the resulting executable under
the terms of your choice. However, the executable must be accompanied
by a prominent notice offering all users of the executable the entire
source code to this application, excluding the source code of the
independent modules, but including any changes you have made to this
application, under the terms of this license.
-------------------------------------------------------------------------
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
Preamble
The GNU General Public License is a free, copyleft license for
software and other kinds of works.
The licenses for most software and other practical works are designed
to take away your freedom to share and change the works. By contrast,
the GNU General Public License is intended to guarantee your freedom to
share and change all versions of a program--to make sure it remains free
software for all its users. We, the Free Software Foundation, use the
GNU General Public License for most of our software; it applies also to
any other work released this way by its authors. You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
them if you wish), that you receive source code or can get it if you
want it, that you can change the software or use pieces of it in new
free programs, and that you know you can do these things.
To protect your rights, we need to prevent others from denying you
these rights or asking you to surrender the rights. Therefore, you have
certain responsibilities if you distribute copies of the software, or if
you modify it: responsibilities to respect the freedom of others.
For example, if you distribute copies of such a program, whether
gratis or for a fee, you must pass on to the recipients the same
freedoms that you received. You must make sure that they, too, receive
or can get the source code. And you must show them these terms so they
know their rights.
Developers that use the GNU GPL protect your rights with two steps:
(1) assert copyright on the software, and (2) offer you this License
giving you legal permission to copy, distribute and/or modify it.
For the developers' and authors' protection, the GPL clearly explains
that there is no warranty for this free software. For both users' and
authors' sake, the GPL requires that modified versions be marked as
changed, so that their problems will not be attributed erroneously to
authors of previous versions.
Some devices are designed to deny users access to install or run
modified versions of the software inside them, although the manufacturer
can do so. This is fundamentally incompatible with the aim of
protecting users' freedom to change the software. The systematic
pattern of such abuse occurs in the area of products for individuals to
use, which is precisely where it is most unacceptable. Therefore, we
have designed this version of the GPL to prohibit the practice for those
products. If such problems arise substantially in other domains, we
stand ready to extend this provision to those domains in future versions
of the GPL, as needed to protect the freedom of users.
Finally, every program is threatened constantly by software patents.
States should not allow patents to restrict development and use of
software on general-purpose computers, but in those that do, we wish to
avoid the special danger that patents applied to a free program could
make it effectively proprietary. To prevent this, the GPL assures that
patents cannot be used to render the program non-free.
The precise terms and conditions for copying, distribution and
modification follow.
TERMS AND CONDITIONS
0. Definitions.
"This License" refers to version 3 of the GNU General Public License.
"Copyright" also means copyright-like laws that apply to other kinds of
works, such as semiconductor masks.
"The Program" refers to any copyrightable work licensed under this
License. Each licensee is addressed as "you". "Licensees" and
"recipients" may be individuals or organizations.
To "modify" a work means to copy from or adapt all or part of the work
in a fashion requiring copyright permission, other than the making of an
exact copy. The resulting work is called a "modified version" of the
earlier work or a work "based on" the earlier work.
A "covered work" means either the unmodified Program or a work based
on the Program.
To "propagate" a work means to do anything with it that, without
permission, would make you directly or secondarily liable for
infringement under applicable copyright law, except executing it on a
computer or modifying a private copy. Propagation includes copying,
distribution (with or without modification), making available to the
public, and in some countries other activities as well.
To "convey" a work means any kind of propagation that enables other
parties to make or receive copies. Mere interaction with a user through
a computer network, with no transfer of a copy, is not conveying.
An interactive user interface displays "Appropriate Legal Notices"
to the extent that it includes a convenient and prominently visible
feature that (1) displays an appropriate copyright notice, and (2)
tells the user that there is no warranty for the work (except to the
extent that warranties are provided), that licensees may convey the
work under this License, and how to view a copy of this License. If
the interface presents a list of user commands or options, such as a
menu, a prominent item in the list meets this criterion.
1. Source Code.
The "source code" for a work means the preferred form of the work
for making modifications to it. "Object code" means any non-source
form of a work.
A "Standard Interface" means an interface that either is an official
standard defined by a recognized standards body, or, in the case of
interfaces specified for a particular programming language, one that
is widely used among developers working in that language.
The "System Libraries" of an executable work include anything, other
than the work as a whole, that (a) is included in the normal form of
packaging a Major Component, but which is not part of that Major
Component, and (b) serves only to enable use of the work with that
Major Component, or to implement a Standard Interface for which an
implementation is available to the public in source code form. A
"Major Component", in this context, means a major essential component
(kernel, window system, and so on) of the specific operating system
(if any) on which the executable work runs, or a compiler used to
produce the work, or an object code interpreter used to run it.
The "Corresponding Source" for a work in object code form means all
the source code needed to generate, install, and (for an executable
work) run the object code and to modify the work, including scripts to
control those activities. However, it does not include the work's
System Libraries, or general-purpose tools or generally available free
programs which are used unmodified in performing those activities but
which are not part of the work. For example, Corresponding Source
includes interface definition files associated with source files for
the work, and the source code for shared libraries and dynamically
linked subprograms that the work is specifically designed to require,
such as by intimate data communication or control flow between those
subprograms and other parts of the work.
The Corresponding Source need not include anything that users
can regenerate automatically from other parts of the Corresponding
Source.
The Corresponding Source for a work in source code form is that
same work.
2. Basic Permissions.
All rights granted under this License are granted for the term of
copyright on the Program, and are irrevocable provided the stated
conditions are met. This License explicitly affirms your unlimited
permission to run the unmodified Program. The output from running a
covered work is covered by this License only if the output, given its
content, constitutes a covered work. This License acknowledges your
rights of fair use or other equivalent, as provided by copyright law.
You may make, run and propagate covered works that you do not
convey, without conditions so long as your license otherwise remains
in force. You may convey covered works to others for the sole purpose
of having them make modifications exclusively for you, or provide you
with facilities for running those works, provided that you comply with
the terms of this License in conveying all material for which you do
not control copyright. Those thus making or running the covered works
for you must do so exclusively on your behalf, under your direction
and control, on terms that prohibit them from making any copies of
your copyrighted material outside their relationship with you.
Conveying under any other circumstances is permitted solely under
the conditions stated below. Sublicensing is not allowed; section 10
makes it unnecessary.
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
No covered work shall be deemed part of an effective technological
measure under any applicable law fulfilling obligations under article
11 of the WIPO copyright treaty adopted on 20 December 1996, or
similar laws prohibiting or restricting circumvention of such
measures.
When you convey a covered work, you waive any legal power to forbid
circumvention of technological measures to the extent such circumvention
is effected by exercising rights under this License with respect to
the covered work, and you disclaim any intention to limit operation or
modification of the work as a means of enforcing, against the work's
users, your or third parties' legal rights to forbid circumvention of
technological measures.
4. Conveying Verbatim Copies.
You may convey verbatim copies of the Program's source code as you
receive it, in any medium, provided that you conspicuously and
appropriately publish on each copy an appropriate copyright notice;
keep intact all notices stating that this License and any
non-permissive terms added in accord with section 7 apply to the code;
keep intact all notices of the absence of any warranty; and give all
recipients a copy of this License along with the Program.
You may charge any price or no price for each copy that you convey,
and you may offer support or warranty protection for a fee.
5. Conveying Modified Source Versions.
You may convey a work based on the Program, or the modifications to
produce it from the Program, in the form of source code under the
terms of section 4, provided that you also meet all of these conditions:
a) The work must carry prominent notices stating that you modified
it, and giving a relevant date.
b) The work must carry prominent notices stating that it is
released under this License and any conditions added under section
7. This requirement modifies the requirement in section 4 to
"keep intact all notices".
c) You must license the entire work, as a whole, under this
License to anyone who comes into possession of a copy. This
License will therefore apply, along with any applicable section 7
additional terms, to the whole of the work, and all its parts,
regardless of how they are packaged. This License gives no
permission to license the work in any other way, but it does not
invalidate such permission if you have separately received it.
d) If the work has interactive user interfaces, each must display
Appropriate Legal Notices; however, if the Program has interactive
interfaces that do not display Appropriate Legal Notices, your
work need not make them do so.
A compilation of a covered work with other separate and independent
works, which are not by their nature extensions of the covered work,
and which are not combined with it such as to form a larger program,
in or on a volume of a storage or distribution medium, is called an
"aggregate" if the compilation and its resulting copyright are not
used to limit the access or legal rights of the compilation's users
beyond what the individual works permit. Inclusion of a covered work
in an aggregate does not cause this License to apply to the other
parts of the aggregate.
6. Conveying Non-Source Forms.
You may convey a covered work in object code form under the terms
of sections 4 and 5, provided that you also convey the
machine-readable Corresponding Source under the terms of this License,
in one of these ways:
a) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by the
Corresponding Source fixed on a durable physical medium
customarily used for software interchange.
b) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by a
written offer, valid for at least three years and valid for as
long as you offer spare parts or customer support for that product
model, to give anyone who possesses the object code either (1) a
copy of the Corresponding Source for all the software in the
product that is covered by this License, on a durable physical
medium customarily used for software interchange, for a price no
more than your reasonable cost of physically performing this
conveying of source, or (2) access to copy the
Corresponding Source from a network server at no charge.
c) Convey individual copies of the object code with a copy of the
written offer to provide the Corresponding Source. This
alternative is allowed only occasionally and noncommercially, and
only if you received the object code with such an offer, in accord
with subsection 6b.
d) Convey the object code by offering access from a designated
place (gratis or for a charge), and offer equivalent access to the
Corresponding Source in the same way through the same place at no
further charge. You need not require recipients to copy the
Corresponding Source along with the object code. If the place to
copy the object code is a network server, the Corresponding Source
may be on a different server (operated by you or a third party)
that supports equivalent copying facilities, provided you maintain
clear directions next to the object code saying where to find the
Corresponding Source. Regardless of what server hosts the
Corresponding Source, you remain obligated to ensure that it is
available for as long as needed to satisfy these requirements.
e) Convey the object code using peer-to-peer transmission, provided
you inform other peers where the object code and Corresponding
Source of the work are being offered to the general public at no
charge under subsection 6d.
A separable portion of the object code, whose source code is excluded
from the Corresponding Source as a System Library, need not be
included in conveying the object code work.
A "User Product" is either (1) a "consumer product", which means any
tangible personal property which is normally used for personal, family,
or household purposes, or (2) anything designed or sold for incorporation
into a dwelling. In determining whether a product is a consumer product,
doubtful cases shall be resolved in favor of coverage. For a particular
product received by a particular user, "normally used" refers to a
typical or common use of that class of product, regardless of the status
of the particular user or of the way in which the particular user
actually uses, or expects or is expected to use, the product. A product
is a consumer product regardless of whether the product has substantial
commercial, industrial or non-consumer uses, unless such uses represent
the only significant mode of use of the product.
"Installation Information" for a User Product means any methods,
procedures, authorization keys, or other information required to install
and execute modified versions of a covered work in that User Product from
a modified version of its Corresponding Source. The information must
suffice to ensure that the continued functioning of the modified object
code is in no case prevented or interfered with solely because
modification has been made.
If you convey an object code work under this section in, or with, or
specifically for use in, a User Product, and the conveying occurs as
part of a transaction in which the right of possession and use of the
User Product is transferred to the recipient in perpetuity or for a
fixed term (regardless of how the transaction is characterized), the
Corresponding Source conveyed under this section must be accompanied
by the Installation Information. But this requirement does not apply
if neither you nor any third party retains the ability to install
modified object code on the User Product (for example, the work has
been installed in ROM).
The requirement to provide Installation Information does not include a
requirement to continue to provide support service, warranty, or updates
for a work that has been modified or installed by the recipient, or for
the User Product in which it has been modified or installed. Access to a
network may be denied when the modification itself materially and
adversely affects the operation of the network or violates the rules and
protocols for communication across the network.
Corresponding Source conveyed, and Installation Information provided,
in accord with this section must be in a format that is publicly
documented (and with an implementation available to the public in
source code form), and must require no special password or key for
unpacking, reading or copying.
7. Additional Terms.
"Additional permissions" are terms that supplement the terms of this
License by making exceptions from one or more of its conditions.
Additional permissions that are applicable to the entire Program shall
be treated as though they were included in this License, to the extent
that they are valid under applicable law. If additional permissions
apply only to part of the Program, that part may be used separately
under those permissions, but the entire Program remains governed by
this License without regard to the additional permissions.
When you convey a copy of a covered work, you may at your option
remove any additional permissions from that copy, or from any part of
it. (Additional permissions may be written to require their own
removal in certain cases when you modify the work.) You may place
additional permissions on material, added by you to a covered work,
for which you have or can give appropriate copyright permission.
Notwithstanding any other provision of this License, for material you
add to a covered work, you may (if authorized by the copyright holders of
that material) supplement the terms of this License with terms:
a) Disclaiming warranty or limiting liability differently from the
terms of sections 15 and 16 of this License; or
b) Requiring preservation of specified reasonable legal notices or
author attributions in that material or in the Appropriate Legal
Notices displayed by works containing it; or
c) Prohibiting misrepresentation of the origin of that material, or
requiring that modified versions of such material be marked in
reasonable ways as different from the original version; or
d) Limiting the use for publicity purposes of names of licensors or
authors of the material; or
e) Declining to grant rights under trademark law for use of some
trade names, trademarks, or service marks; or
f) Requiring indemnification of licensors and authors of that
material by anyone who conveys the material (or modified versions of
it) with contractual assumptions of liability to the recipient, for
any liability that these contractual assumptions directly impose on
those licensors and authors.
All other non-permissive additional terms are considered "further
restrictions" within the meaning of section 10. If the Program as you
received it, or any part of it, contains a notice stating that it is
governed by this License along with a term that is a further
restriction, you may remove that term. If a license document contains
a further restriction but permits relicensing or conveying under this
License, you may add to a covered work material governed by the terms
of that license document, provided that the further restriction does
not survive such relicensing or conveying.
If you add terms to a covered work in accord with this section, you
must place, in the relevant source files, a statement of the
additional terms that apply to those files, or a notice indicating
where to find the applicable terms.
Additional terms, permissive or non-permissive, may be stated in the
form of a separately written license, or stated as exceptions;
the above requirements apply either way.
8. Termination.
You may not propagate or modify a covered work except as expressly
provided under this License. Any attempt otherwise to propagate or
modify it is void, and will automatically terminate your rights under
this License (including any patent licenses granted under the third
paragraph of section 11).
However, if you cease all violation of this License, then your
license from a particular copyright holder is reinstated (a)
provisionally, unless and until the copyright holder explicitly and
finally terminates your license, and (b) permanently, if the copyright
holder fails to notify you of the violation by some reasonable means
prior to 60 days after the cessation.
Moreover, your license from a particular copyright holder is
reinstated permanently if the copyright holder notifies you of the
violation by some reasonable means, this is the first time you have
received notice of violation of this License (for any work) from that
copyright holder, and you cure the violation prior to 30 days after
your receipt of the notice.
Termination of your rights under this section does not terminate the
licenses of parties who have received copies or rights from you under
this License. If your rights have been terminated and not permanently
reinstated, you do not qualify to receive new licenses for the same
material under section 10.
9. Acceptance Not Required for Having Copies.
You are not required to accept this License in order to receive or
run a copy of the Program. Ancillary propagation of a covered work
occurring solely as a consequence of using peer-to-peer transmission
to receive a copy likewise does not require acceptance. However,
nothing other than this License grants you permission to propagate or
modify any covered work. These actions infringe copyright if you do
not accept this License. Therefore, by modifying or propagating a
covered work, you indicate your acceptance of this License to do so.
10. Automatic Licensing of Downstream Recipients.
Each time you convey a covered work, the recipient automatically
receives a license from the original licensors, to run, modify and
propagate that work, subject to this License. You are not responsible
for enforcing compliance by third parties with this License.
An "entity transaction" is a transaction transferring control of an
organization, or substantially all assets of one, or subdividing an
organization, or merging organizations. If propagation of a covered
work results from an entity transaction, each party to that
transaction who receives a copy of the work also receives whatever
licenses to the work the party's predecessor in interest had or could
give under the previous paragraph, plus a right to possession of the
Corresponding Source of the work from the predecessor in interest, if
the predecessor has it or can get it with reasonable efforts.
You may not impose any further restrictions on the exercise of the
rights granted or affirmed under this License. For example, you may
not impose a license fee, royalty, or other charge for exercise of
rights granted under this License, and you may not initiate litigation
(including a cross-claim or counterclaim in a lawsuit) alleging that
any patent claim is infringed by making, using, selling, offering for
sale, or importing the Program or any portion of it.
11. Patents.
A "contributor" is a copyright holder who authorizes use under this
License of the Program or a work on which the Program is based. The
work thus licensed is called the contributor's "contributor version".
A contributor's "essential patent claims" are all patent claims
owned or controlled by the contributor, whether already acquired or
hereafter acquired, that would be infringed by some manner, permitted
by this License, of making, using, or selling its contributor version,
but do not include claims that would be infringed only as a
consequence of further modification of the contributor version. For
purposes of this definition, "control" includes the right to grant
patent sublicenses in a manner consistent with the requirements of
this License.
Each contributor grants you a non-exclusive, worldwide, royalty-free
patent license under the contributor's essential patent claims, to
make, use, sell, offer for sale, import and otherwise run, modify and
propagate the contents of its contributor version.
In the following three paragraphs, a "patent license" is any express
agreement or commitment, however denominated, not to enforce a patent
(such as an express permission to practice a patent or covenant not to
sue for patent infringement). To "grant" such a patent license to a
party means to make such an agreement or commitment not to enforce a
patent against the party.
If you convey a covered work, knowingly relying on a patent license,
and the Corresponding Source of the work is not available for anyone
to copy, free of charge and under the terms of this License, through a
publicly available network server or other readily accessible means,
then you must either (1) cause the Corresponding Source to be so
available, or (2) arrange to deprive yourself of the benefit of the
patent license for this particular work, or (3) arrange, in a manner
consistent with the requirements of this License, to extend the patent
license to downstream recipients. "Knowingly relying" means you have
actual knowledge that, but for the patent license, your conveying the
covered work in a country, or your recipient's use of the covered work
in a country, would infringe one or more identifiable patents in that
country that you have reason to believe are valid.
If, pursuant to or in connection with a single transaction or
arrangement, you convey, or propagate by procuring conveyance of, a
covered work, and grant a patent license to some of the parties
receiving the covered work authorizing them to use, propagate, modify
or convey a specific copy of the covered work, then the patent license
you grant is automatically extended to all recipients of the covered
work and works based on it.
A patent license is "discriminatory" if it does not include within
the scope of its coverage, prohibits the exercise of, or is
conditioned on the non-exercise of one or more of the rights that are
specifically granted under this License. You may not convey a covered
work if you are a party to an arrangement with a third party that is
in the business of distributing software, under which you make payment
to the third party based on the extent of your activity of conveying
the work, and under which the third party grants, to any of the
parties who would receive the covered work from you, a discriminatory
patent license (a) in connection with copies of the covered work
conveyed by you (or copies made from those copies), or (b) primarily
for and in connection with specific products or compilations that
contain the covered work, unless you entered into that arrangement,
or that patent license was granted, prior to 28 March 2007.
Nothing in this License shall be construed as excluding or limiting
any implied license or other defenses to infringement that may
otherwise be available to you under applicable patent law.
12. No Surrender of Others' Freedom.
If conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot convey a
covered work so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you may
not convey it at all. For example, if you agree to terms that obligate you
to collect a royalty for further conveying from those to whom you convey
the Program, the only way you could satisfy both those terms and this
License would be to refrain entirely from conveying the Program.
13. Use with the GNU Affero General Public License.
Notwithstanding any other provision of this License, you have
permission to link or combine any covered work with a work licensed
under version 3 of the GNU Affero General Public License into a single
combined work, and to convey the resulting work. The terms of this
License will continue to apply to the part which is the covered work,
but the special requirements of the GNU Affero General Public License,
section 13, concerning interaction through a network will apply to the
combination as such.
14. Revised Versions of this License.
The Free Software Foundation may publish revised and/or new versions of
the GNU General Public License from time to time. Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.
Each version is given a distinguishing version number. If the
Program specifies that a certain numbered version of the GNU General
Public License "or any later version" applies to it, you have the
option of following the terms and conditions either of that numbered
version or of any later version published by the Free Software
Foundation. If the Program does not specify a version number of the
GNU General Public License, you may choose any version ever published
by the Free Software Foundation.
If the Program specifies that a proxy can decide which future
versions of the GNU General Public License can be used, that proxy's
public statement of acceptance of a version permanently authorizes you
to choose that version for the Program.
Later license versions may give you additional or different
permissions. However, no additional obligations are imposed on any
author or copyright holder as a result of your choosing to follow a
later version.
15. Disclaimer of Warranty.
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
16. Limitation of Liability.
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
SUCH DAMAGES.
17. Interpretation of Sections 15 and 16.
If the disclaimer of warranty and limitation of liability provided
above cannot be given local legal effect according to their terms,
reviewing courts shall apply local law that most closely approximates
an absolute waiver of all civil liability in connection with the
Program, unless a warranty or assumption of liability accompanies a
copy of the Program in return for a fee.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.
To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
Also add information on how to contact you by electronic and paper mail.
If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode:
<program> Copyright (C) <year> <name of author>
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License. Of course, your program's commands
might be different; for a GUI interface, you would use an "about box".
You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU GPL, see
<http://www.gnu.org/licenses/>.
The GNU General Public License does not permit incorporating your program
into proprietary programs. If your program is a subroutine library, you
may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read
<http://www.gnu.org/philosophy/why-not-lgpl.html>.

View File

@@ -1,628 +0,0 @@
TECHNOLOGY PREVIEW LICENSE AGREEMENT
For individuals and/or legal entities resident in the Americas (North
America, Central America and South America), the applicable licensing
terms are specified under the heading "Technology Preview License
Agreement: The Americas".
For individuals and/or legal entities not resident in The Americas, the
applicable licensing terms are specified under the heading "Technology
Preview License Agreement: Rest of the World".
TECHNOLOGY PREVIEW LICENSE AGREEMENT: The Americas
Agreement version 2.4
This Technology Preview License Agreement ("Agreement")is a legal agreement
between Digia USA, Inc. ("Digia"), with its registered office at 2350
Mission College Blvd., Suite 1020, Santa Clara, California 95054,
U.S.A. and you (either an individual or a legal entity) ("Licensee") for the
Licensed Software (as defined below).
1. DEFINITIONS
"Affiliate" of a Party shall mean an entity (i) which is directly or
indirectly controlling such Party; (ii) which is under the same direct
or indirect ownership or control as such Party; or (iii) which is
directly or indirectly owned or controlled by such Party. For these
purposes, an entity shall be treated as being controlled by another if
that other entity has fifty percent (50 %) or more of the votes in such
entity, is able to direct its affairs and/or to control the composition
of its board of directors or equivalent body.
"Applications" shall mean Licensee's software products created using the
Licensed Software which may include portions of the Licensed Software.
"Term" shall mean the period of time six (6) months from the later of
(a) the Effective Date; or (b) the date the Licensed Software was
initially delivered to Licensee by Digia. If no specific Effective Date
is set forth in the Agreement, the Effective Date shall be deemed to be
the date the Licensed Software was initially delivered to Licensee.
"Licensed Software" shall mean the computer software, "online" or
electronic documentation, associated media and printed materials,
including the source code, example programs and the documentation
delivered by Digia to Licensee in conjunction with this Agreement.
"Party" or "Parties" shall mean Licensee and/or Digia.
2. OWNERSHIP
The Licensed Software is protected by copyright laws and international
copyright treaties, as well as other intellectual property laws and
treaties. The Licensed Software is licensed, not sold.
If Licensee provides any findings, proposals, suggestions or other
feedback ("Feedback") to Digia regarding the Licensed Software, Digia
shall own all right, title and interest including the intellectual
property rights in and to such Feedback, excluding however any existing
patent rights of Licensee. To the extent Licensee owns or controls any
patents for such Feedback Licensee hereby grants to Digia and its
Affiliates, a worldwide, perpetual, non-transferable, sublicensable,
royalty-free license to (i) use, copy and modify Feedback and to create
derivative works thereof, (ii) to make (and have made), use, import,
sell, offer for sale, lease, dispose, offer for disposal or otherwise
exploit any products or services of Digia containing Feedback, and
(iii) sublicense all the foregoing rights to third party licensees and
customers of Digia and/or its Affiliates.
3. VALIDITY OF THE AGREEMENT
By installing, copying, or otherwise using the Licensed Software,
Licensee agrees to be bound by the terms of this Agreement. If Licensee
does not agree to the terms of this Agreement, Licensee may not install,
copy, or otherwise use the Licensed Software. Upon Licensee's acceptance
of the terms and conditions of this Agreement, Digia grants Licensee the
right to use the Licensed Software in the manner provided below.
4. LICENSES
4.1. Using and Copying
Digia grants to Licensee a non-exclusive, non-transferable, time-limited
license to use and copy the Licensed Software for sole purpose of
designing, developing and testing Applications, and evaluating and the
Licensed Software during the Term.
Licensee may install copies of the Licensed Software on an unlimited
number of computers provided that (a) if an individual, only such
individual; or (b) if a legal entity only its employees; use the
Licensed Software for the authorized purposes.
4.2 No Distribution or Modifications
Licensee may not disclose, modify, sell, market, commercialise,
distribute, loan, rent, lease, or license the Licensed Software or any
copy of it or use the Licensed Software for any purpose that is not
expressly granted in this Section 4. Licensee may not alter or remove
any details of ownership, copyright, trademark or other property right
connected with the Licensed Software. Licensee may not distribute any
software statically or dynamically linked with the Licensed Software.
4.3 No Technical Support
Digia has no obligation to furnish Licensee with any technical support
whatsoever. Any such support is subject to separate agreement between
the Parties.
5. PRE-RELEASE CODE
The Licensed Software contains pre-release code that is not at the level
of performance and compatibility of a final, generally available,
product offering. The Licensed Software may not operate correctly and
may be substantially modified prior to the first commercial product
release, if any. Digia is not obligated to make this or any later
version of the Licensed Software commercially available. The License
Software is "Not for Commercial Use" and may only be used for the
purposes described in Section 4. The Licensed Software may not be used
in a live operating environment where it may be relied upon to perform
in the same manner as a commercially released product or with data that
has not been sufficiently backed up.
6. THIRD PARTY SOFTWARE
The Licensed Software may provide links to third party libraries or code
(collectively "Third Party Software") to implement various functions.
Third Party Software does not comprise part of the Licensed Software. In
some cases, access to Third Party Software may be included along with
the Licensed Software delivery as a convenience for development and
testing only. Such source code and libraries may be listed in the
".../src/3rdparty" source tree delivered with the Licensed Software or
documented in the Licensed Software where the Third Party Software is
used, as may be amended from time to time, do not comprise the Licensed
Software. Licensee acknowledges (1) that some part of Third Party
Software may require additional licensing of copyright and patents from
the owners of such, and (2) that distribution of any of the Licensed
Software referencing any portion of a Third Party Software may require
appropriate licensing from such third parties.
7. LIMITED WARRANTY AND WARRANTY DISCLAIMER
The Licensed Software is licensed to Licensee "as is". To the maximum
extent permitted by applicable law, Digia on behalf of itself and its
suppliers, disclaims all warranties and conditions, either express or
implied, including, but not limited to, implied warranties of
merchantability, fitness for a particular purpose, title and
non-infringement with regard to the Licensed Software.
8. LIMITATION OF LIABILITY
If, Digia's warranty disclaimer notwithstanding, Digia is held liable to
Licensee, whether in contract, tort or any other legal theory, based on
the Licensed Software, Digia's entire liability to Licensee and
Licensee's exclusive remedy shall be, at Digia's option, either (A)
return of the price Licensee paid for the Licensed Software, or (B)
repair or replacement of the Licensed Software, provided Licensee
returns to Digia all copies of the Licensed Software as originally
delivered to Licensee. Digia shall not under any circumstances be liable
to Licensee based on failure of the Licensed Software if the failure
resulted from accident, abuse or misapplication, nor shall Digia under
any circumstances be liable for special damages, punitive or exemplary
damages, damages for loss of profits or interruption of business or for
loss or corruption of data. Any award of damages from Digia to Licensee
shall not exceed the total amount Licensee has paid to Digia in
connection with this Agreement.
9. CONFIDENTIALITY
Each party acknowledges that during the Term of this Agreement it shall
have access to information about the other party's business, business
methods, business plans, customers, business relations, technology, and
other information, including the terms of this Agreement, that is
confidential and of great value to the other party, and the value of
which would be significantly reduced if disclosed to third parties (the
"Confidential Information"). Accordingly, when a party (the "Receiving
Party") receives Confidential Information from another party (the
"Disclosing Party"), the Receiving Party shall, and shall obligate its
employees and agents and employees and agents of its Affiliates to: (i)
maintain the Confidential Information in strict confidence; (ii) not
disclose the Confidential Information to a third party without the
Disclosing Party's prior written approval; and (iii) not, directly or
indirectly, use the Confidential Information for any purpose other than
for exercising its rights and fulfilling its responsibilities pursuant
to this Agreement. Each party shall take reasonable measures to protect
the Confidential Information of the other party, which measures shall
not be less than the measures taken by such party to protect its own
confidential and proprietary information.
"Confidential Information" shall not include information that (a) is or
becomes generally known to the public through no act or omission of the
Receiving Party; (b) was in the Receiving Party's lawful possession
prior to the disclosure hereunder and was not subject to limitations on
disclosure or use; (c) is developed by the Receiving Party without
access to the Confidential Information of the Disclosing Party or by
persons who have not had access to the Confidential Information of the
Disclosing Party as proven by the written records of the Receiving
Party; (d) is lawfully disclosed to the Receiving Party without
restrictions, by a third party not under an obligation of
confidentiality; or (e) the Receiving Party is legally compelled to
disclose the information, in which case the Receiving Party shall assert
the privileged and confidential nature of the information and cooperate
fully with the Disclosing Party to protect against and prevent
disclosure of any Confidential Information and to limit the scope of
disclosure and the dissemination of disclosed Confidential Information
by all legally available means.
The obligations of the Receiving Party under this Section shall continue
during the Initial Term and for a period of five (5) years after
expiration or termination of this Agreement. To the extent that the
terms of the Non-Disclosure Agreement between Digia and Licensee
conflict with the terms of this Section 9, this Section 9 shall be
controlling over the terms of the Non-Disclosure Agreement.
10. GENERAL PROVISIONS
10.1 No Assignment
Licensee shall not be entitled to assign or transfer all or any of its
rights, benefits and obligations under this Agreement without the prior
written consent of Digia, which shall not be unreasonably withheld.
10.2 Termination
Digia may terminate the Agreement at any time immediately upon written
notice by Digia to Licensee if Licensee breaches this Agreement.
Upon termination of this Agreement, Licensee shall return to Digia all
copies of Licensed Software that were supplied by Digia. All other
copies of Licensed Software in the possession or control of Licensee
must be erased or destroyed. An officer of Licensee must promptly
deliver to Digia a written confirmation that this has occurred.
10.3 Surviving Sections
Any terms and conditions that by their nature or otherwise reasonably
should survive a cancellation or termination of this Agreement shall
also be deemed to survive. Such terms and conditions include, but are
not limited to the following Sections: 2, 5, 6, 7, 8, 9, 10.2, 10.3, 10.4,
10.5, 10.6, 10.7, and 10.8 of this Agreement.
10.4 Entire Agreement
This Agreement constitutes the complete agreement between the parties
and supersedes all prior or contemporaneous discussions,
representations, and proposals, written or oral, with respect to the
subject matters discussed herein, with the exception of the
non-disclosure agreement executed by the parties in connection with this
Agreement ("Non-Disclosure Agreement"), if any, shall be subject to
Section 9. No modification of this Agreement shall be effective unless
contained in a writing executed by an authorized representative of each
party. No term or condition contained in Licensee's purchase order shall
apply unless expressly accepted by Digia in writing. If any provision of
the Agreement is found void or unenforceable, the remainder shall remain
valid and enforceable according to its terms. If any remedy provided is
determined to have failed for its essential purpose, all limitations of
liability and exclusions of damages set forth in this Agreement shall
remain in effect.
10.5 Export Control
Licensee acknowledges that the Licensed Software may be subject to
export control restrictions of various countries. Licensee shall fully
comply with all applicable export license restrictions and requirements
as well as with all laws and regulations relating to the importation of
the Licensed Software and shall procure all necessary governmental
authorizations, including without limitation, all necessary licenses,
approvals, permissions or consents, where necessary for the
re-exportation of the Licensed Software.,
10.6 Governing Law and Legal Venue
This Agreement shall be governed by and construed in accordance with the
federal laws of the United States of America and the internal laws of
the State of New York without given effect to any choice of law rule
that would result in the application of the laws of any other
jurisdiction. The United Nations Convention on Contracts for the
International Sale of Goods (CISG) shall not apply. Each Party (a)
hereby irrevocably submits itself to and consents to the jurisdiction of
the United States District Court for the Southern District of New York
(or if such court lacks jurisdiction, the state courts of the State of
New York) for the purposes of any action, claim, suit or proceeding
between the Parties in connection with any controversy, claim, or
dispute arising out of or relating to this Agreement; and (b) hereby
waives, and agrees not to assert by way of motion, as a defense or
otherwise, in any such action, claim, suit or proceeding, any claim that
is not personally subject to the jurisdiction of such court(s), that the
action, claim, suit or proceeding is brought in an inconvenient forum or
that the venue of the action, claim, suit or proceeding is improper.
Notwithstanding the foregoing, nothing in this Section 9.6 is intended
to, or shall be deemed to, constitute a submission or consent to, or
selection of, jurisdiction, forum or venue for any action for patent
infringement, whether or not such action relates to this Agreement.
10.7 No Implied License
There are no implied licenses or other implied rights granted under this
Agreement, and all rights, save for those expressly granted hereunder,
shall remain with Digia and its licensors. In addition, no licenses or
immunities are granted to the combination of the Licensed Software with
any other software or hardware not delivered by Digia under this
Agreement.
10.8 Government End Users
A "U.S. Government End User" shall mean any agency or entity of the
government of the United States. The following shall apply if Licensee
is a U.S. Government End User. The Licensed Software is a "commercial
item," as that term is defined in 48 C.F.R. 2.101 (Oct. 1995),
consisting of "commercial computer software" and "commercial computer
software documentation," as such terms are used in 48 C.F.R. 12.212
(Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
through 227.7202-4 (June 1995), all U.S. Government End Users acquire
the Licensed Software with only those rights set forth herein. The
Licensed Software (including related documentation) is provided to U.S.
Government End Users: (a) only as a commercial end item; and (b) only
pursuant to this Agreement.
TECHNOLOGY PREVIEW LICENSE AGREEMENT: Rest of the World
Agreement version 2.4
This Technology Preview License Agreement ("Agreement") is a legal
agreement between Digia Finland Ltd ("Digia"), with its registered office at
Valimotie 21,FI-00380 Helsinki, Finland and you (either an individual or a
legal entity) ("Licensee") for the Licensed Software.
1. DEFINITIONS
"Affiliate" of a Party shall mean an entity (i) which is directly or
indirectly controlling such Party; (ii) which is under the same direct
or indirect ownership or control as such Party; or (iii) which is
directly or indirectly owned or controlled by such Party. For these
purposes, an entity shall be treated as being controlled by another if
that other entity has fifty percent (50 %) or more of the votes in such
entity, is able to direct its affairs and/or to control the composition
of its board of directors or equivalent body.
"Applications" shall mean Licensee's software products created using the
Licensed Software which may include portions of the Licensed Software.
"Term" shall mean the period of time six (6) months from the later of
(a) the Effective Date; or (b) the date the Licensed Software was
initially delivered to Licensee by Digia. If no specific Effective Date
is set forth in the Agreement, the Effective Date shall be deemed to be
the date the Licensed Software was initially delivered to Licensee.
"Licensed Software" shall mean the computer software, "online" or
electronic documentation, associated media and printed materials,
including the source code, example programs and the documentation
delivered by Digia to Licensee in conjunction with this Agreement.
"Party" or "Parties" shall mean Licensee and/or Digia.
2. OWNERSHIP
The Licensed Software is protected by copyright laws and international
copyright treaties, as well as other intellectual property laws and
treaties. The Licensed Software is licensed, not sold.
If Licensee provides any findings, proposals, suggestions or other
feedback ("Feedback") to Digia regarding the Licensed Software, Digia
shall own all right, title and interest including the intellectual
property rights in and to such Feedback, excluding however any existing
patent rights of Licensee. To the extent Licensee owns or controls any
patents for such Feedback Licensee hereby grants to Digia and its
Affiliates, a worldwide, perpetual, non-transferable, sublicensable,
royalty-free license to (i) use, copy and modify Feedback and to create
derivative works thereof, (ii) to make (and have made), use, import,
sell, offer for sale, lease, dispose, offer for disposal or otherwise
exploit any products or services of Digia containing Feedback, and
(iii) sublicense all the foregoing rights to third party licensees and
customers of Digia and/or its Affiliates.
3. VALIDITY OF THE AGREEMENT
By installing, copying, or otherwise using the Licensed Software,
Licensee agrees to be bound by the terms of this Agreement. If Licensee
does not agree to the terms of this Agreement, Licensee may not install,
copy, or otherwise use the Licensed Software. Upon Licensee's acceptance
of the terms and conditions of this Agreement, Digia grants Licensee the
right to use the Licensed Software in the manner provided below.
4. LICENSES
4.1. Using and Copying
Digia grants to Licensee a non-exclusive, non-transferable, time-limited
license to use and copy the Licensed Software for sole purpose of
designing, developing and testing Applications, and evaluating and the
Licensed Software during the Term.
Licensee may install copies of the Licensed Software on an unlimited
number of computers provided that (a) if an individual, only such
individual; or (b) if a legal entity only its employees; use the
Licensed Software for the authorized purposes.
4.2 No Distribution or Modifications
Licensee may not disclose, modify, sell, market, commercialise,
distribute, loan, rent, lease, or license the Licensed Software or any
copy of it or use the Licensed Software for any purpose that is not
expressly granted in this Section 4. Licensee may not alter or remove
any details of ownership, copyright, trademark or other property right
connected with the Licensed Software. Licensee may not distribute any
software statically or dynamically linked with the Licensed Software.
4.3 No Technical Support
Digia has no obligation to furnish Licensee with any technical support
whatsoever. Any such support is subject to separate agreement between
the Parties.
5. PRE-RELEASE CODE
The Licensed Software contains pre-release code that is not at the level
of performance and compatibility of a final, generally available,
product offering. The Licensed Software may not operate correctly and
may be substantially modified prior to the first commercial product
release, if any. Digia is not obligated to make this or any later
version of the Licensed Software commercially available. The License
Software is "Not for Commercial Use" and may only be used for the
purposes described in Section 4. The Licensed Software may not be used
in a live operating environment where it may be relied upon to perform
in the same manner as a commercially released product or with data that
has not been sufficiently backed up.
6. THIRD PARTY SOFTWARE
The Licensed Software may provide links to third party libraries or code
(collectively "Third Party Software") to implement various functions.
Third Party Software does not comprise part of the Licensed Software. In
some cases, access to Third Party Software may be included along with
the Licensed Software delivery as a convenience for development and
testing only. Such source code and libraries may be listed in the
".../src/3rdparty" source tree delivered with the Licensed Software or
documented in the Licensed Software where the Third Party Software is
used, as may be amended from time to time, do not comprise the Licensed
Software. Licensee acknowledges (1) that some part of Third Party
Software may require additional licensing of copyright and patents from
the owners of such, and (2) that distribution of any of the Licensed
Software referencing any portion of a Third Party Software may require
appropriate licensing from such third parties.
7. LIMITED WARRANTY AND WARRANTY DISCLAIMER
The Licensed Software is licensed to Licensee "as is". To the maximum
extent permitted by applicable law, Digia on behalf of itself and its
suppliers, disclaims all warranties and conditions, either express or
implied, including, but not limited to, implied warranties of
merchantability, fitness for a particular purpose, title and
non-infringement with regard to the Licensed Software.
8. LIMITATION OF LIABILITY
If, Digia's warranty disclaimer notwithstanding, Digia is held liable to
Licensee, whether in contract, tort or any other legal theory, based on
the Licensed Software, Digia's entire liability to Licensee and
Licensee's exclusive remedy shall be, at Digia's option, either (A)
return of the price Licensee paid for the Licensed Software, or (B)
repair or replacement of the Licensed Software, provided Licensee
returns to Digia all copies of the Licensed Software as originally
delivered to Licensee. Digia shall not under any circumstances be liable
to Licensee based on failure of the Licensed Software if the failure
resulted from accident, abuse or misapplication, nor shall Digia under
any circumstances be liable for special damages, punitive or exemplary
damages, damages for loss of profits or interruption of business or for
loss or corruption of data. Any award of damages from Digia to Licensee
shall not exceed the total amount Licensee has paid to Digia in
connection with this Agreement.
9. CONFIDENTIALITY
Each party acknowledges that during the Term of this Agreement it shall
have access to information about the other party's business, business
methods, business plans, customers, business relations, technology, and
other information, including the terms of this Agreement, that is
confidential and of great value to the other party, and the value of
which would be significantly reduced if disclosed to third parties (the
"Confidential Information"). Accordingly, when a party (the "Receiving
Party") receives Confidential Information from another party (the
"Disclosing Party"), the Receiving Party shall, and shall obligate its
employees and agents and employees and agents of its Affiliates to: (i)
maintain the Confidential Information in strict confidence; (ii) not
disclose the Confidential Information to a third party without the
Disclosing Party's prior written approval; and (iii) not, directly or
indirectly, use the Confidential Information for any purpose other than
for exercising its rights and fulfilling its responsibilities pursuant
to this Agreement. Each party shall take reasonable measures to protect
the Confidential Information of the other party, which measures shall
not be less than the measures taken by such party to protect its own
confidential and proprietary information.
"Confidential Information" shall not include information that (a) is or
becomes generally known to the public through no act or omission of the
Receiving Party; (b) was in the Receiving Party's lawful possession
prior to the disclosure hereunder and was not subject to limitations on
disclosure or use; (c) is developed by the Receiving Party without
access to the Confidential Information of the Disclosing Party or by
persons who have not had access to the Confidential Information of the
Disclosing Party as proven by the written records of the Receiving
Party; (d) is lawfully disclosed to the Receiving Party without
restrictions, by a third party not under an obligation of
confidentiality; or (e) the Receiving Party is legally compelled to
disclose the information, in which case the Receiving Party shall assert
the privileged and confidential nature of the information and cooperate
fully with the Disclosing Party to protect against and prevent
disclosure of any Confidential Information and to limit the scope of
disclosure and the dissemination of disclosed Confidential Information
by all legally available means.
The obligations of the Receiving Party under this Section shall continue
during the Initial Term and for a period of five (5) years after
expiration or termination of this Agreement. To the extent that the
terms of the Non-Disclosure Agreement between Digia and Licensee
conflict with the terms of this Section 9, this Section 9 shall be
controlling over the terms of the Non-Disclosure Agreement.
10. GENERAL PROVISIONS
10.1 No Assignment
Licensee shall not be entitled to assign or transfer all or any of its
rights, benefits and obligations under this Agreement without the prior
written consent of Digia, which shall not be unreasonably withheld.
10.2 Termination
Digia may terminate the Agreement at any time immediately upon written
notice by Digia to Licensee if Licensee breaches this Agreement.
Upon termination of this Agreement, Licensee shall return to Digia all
copies of Licensed Software that were supplied by Digia. All other
copies of Licensed Software in the possession or control of Licensee
must be erased or destroyed. An officer of Licensee must promptly
deliver to Digia a written confirmation that this has occurred.
10.3 Surviving Sections
Any terms and conditions that by their nature or otherwise reasonably
should survive a cancellation or termination of this Agreement shall
also be deemed to survive. Such terms and conditions include, but are
not limited to the following Sections: 2, 5, 6, 7, 8, 9, 10.2, 10.3, 10.4,
10.5, 10.6, 10.7, and 10.8 of this Agreement.
10.4 Entire Agreement
This Agreement constitutes the complete agreement between the parties
and supersedes all prior or contemporaneous discussions,
representations, and proposals, written or oral, with respect to the
subject matters discussed herein, with the exception of the
non-disclosure agreement executed by the parties in connection with this
Agreement ("Non-Disclosure Agreement"), if any, shall be subject to
Section 9. No modification of this Agreement shall be effective unless
contained in a writing executed by an authorized representative of each
party. No term or condition contained in Licensee's purchase order shall
apply unless expressly accepted by Digia in writing. If any provision of
the Agreement is found void or unenforceable, the remainder shall remain
valid and enforceable according to its terms. If any remedy provided is
determined to have failed for its essential purpose, all limitations of
liability and exclusions of damages set forth in this Agreement shall
remain in effect.
10.5 Export Control
Licensee acknowledges that the Licensed Software may be subject to
export control restrictions of various countries. Licensee shall fully
comply with all applicable export license restrictions and requirements
as well as with all laws and regulations relating to the importation of
the Licensed Software and shall procure all necessary governmental
authorizations, including without limitation, all necessary licenses,
approvals, permissions or consents, where necessary for the
re-exportation of the Licensed Software.,
10.6 Governing Law and Legal Venue
This Agreement shall be construed and interpreted in accordance with the
laws of Finland, excluding its choice of law provisions. Any disputes
arising out of or relating to this Agreement shall be resolved in
arbitration under the Rules of Arbitration of the Chamber of Commerce of
Helsinki, Finland. The arbitration tribunal shall consist of one (1), or
if either Party so requires, of three (3), arbitrators. The award shall
be final and binding and enforceable in any court of competent
jurisdiction. The arbitration shall be held in Helsinki, Finland and the
process shall be conducted in the English language.
10.7 No Implied License
There are no implied licenses or other implied rights granted under this
Agreement, and all rights, save for those expressly granted hereunder,
shall remain with Digia and its licensors. In addition, no licenses or
immunities are granted to the combination of the Licensed Software with
any other software or hardware not delivered by Digia under this
Agreement.
10.8 Government End Users
A "U.S. Government End User" shall mean any agency or entity of the
government of the United States. The following shall apply if Licensee
is a U.S. Government End User. The Licensed Software is a "commercial
item," as that term is defined in 48 C.F.R. 2.101 (Oct. 1995),
consisting of "commercial computer software" and "commercial computer
software documentation," as such terms are used in 48 C.F.R. 12.212
(Sept. 1995). Consistent with 48 C.F.R. 12.212 and 48 C.F.R. 227.7202-1
through 227.7202-4 (June 1995), all U.S. Government End Users acquire
the Licensed Software with only those rights set forth herein. The
Licensed Software (including related documentation) is provided to U.S.
Government End Users: (a) only as a commercial end item; and (b) only
pursuant to this Agreement.

1977
LICENSE.QT-LICENSE-AGREEMENT Normal file

File diff suppressed because it is too large Load Diff

136
README
View File

@@ -1,136 +0,0 @@
HOW TO BUILD QT5
================
Synopsis
========
System requirements
------------------
- Perl 5.8 or later
- Python 2.7 or later
- C++ compiler supporting the C++11 standard
For other platform specific requirements,
please see section "Setting up your machine" on:
http://wiki.qt.io/Get_The_Source
Licensing:
----------
Opensource users:
<source_package> = qt-everywhere-opensource-src-<version>
<license> = -opensource
Commercial users:
<source_package> = qt-everywhere-enterprise-src-<version>
<license> = -commercial
Linux, Mac:
-----------
cd <path>/<source_package>
./configure -prefix $PWD/qtbase <license> -nomake tests
make -j 4
Windows:
--------
Open a command prompt.
Ensure that the following tools can be found in the path:
* Supported compiler (Visual Studio 2012 or later,
MinGW-builds gcc 4.9 or later)
* Perl version 5.12 or later [http://www.activestate.com/activeperl/]
* Python version 2.7 or later [http://www.activestate.com/activepython/]
* Ruby version 1.9.3 or later [http://rubyinstaller.org/]
cd <path>\<source_package>
configure -prefix %CD%\qtbase <license> -nomake tests
nmake // jom // mingw32-make
To accelerate the bootstrap of qmake with MSVC, it may be useful to pass
"-make-tool jom" on the configure command line. If you do not use jom,
adding "/MP" to the CL environment variable is a good idea.
More details follow.
Build!
======
A typical `configure; make' build process is used.
Some relevant configure options (see configure -help):
-release Compile and link Qt with debugging turned off.
-debug Compile and link Qt with debugging turned on.
-nomake tests Disable building of tests to speed up compilation
-nomake examples Disable building of examples to speed up compilation
-confirm-license Automatically acknowledge the LGPL 2.1 license.
Example for a release build:
(adjust the `-jN' parameter as appropriate for your system)
./configure -prefix $PWD/qtbase <license>
make -j4
Example for a developer build:
(enables more autotests, builds debug version of libraries, ...)
./configure -developer-build <license>
make -j4
See output of `./configure -help' for documentation on various options to
configure.
The above examples will build whatever Qt5 modules have been enabled by
default in the build system.
It is possible to build selected modules with their dependencies by doing
a `make module-<foo>'. For example, to build only qtdeclarative,
and the modules it depends on:
./configure -prefix $PWD/qtbase <license>
make -j4 module-qtdeclarative
This can save a lot of time if you are only interested in a subset of Qt5.
Hints
=====
The submodule repository qtrepotools contains useful scripts for
developers and release engineers. Consider adding qtrepotools/bin
to your PATH environment variable to access them.
The qt5_tool in qtrepotools has some more features which may be of interest.
Try `qt5_tool --help'.
Building Qt5 from git
=====================
See http://wiki.qt.io/Building_Qt_5_from_Git and README.git
for more information.
See http://wiki.qt.io/Qt_5 for the reference platforms.
Documentation
=============
After configuring and compiling Qt, building the documentation is possible by running
"make docs".
After having built the documentation, you need to install it with the following
command:
make install_docs
The documentation is installed in the path set to $QT_INSTALL_DOCS.
Running "qmake -query" will list the value of QT_INSTALL_DOCS.
Information about Qt 5's documentation is located in qtbase/doc/README
or in the following page: http://wiki.qt.io/Qt5DocumentationProject
Note: Building the documentation is only tested on desktop platforms.

131
README.md Normal file
View File

@@ -0,0 +1,131 @@
HOW TO BUILD Qt6
================
Synopsis
========
System requirements
------------------
* CMake 3.18 or later
* Perl 5.8 or later
* Python 2.7 or later
* C++ compiler supporting the C++17 standard
It's recommended to have ninja 1.8 or later installed.
For other platform specific requirements,
please see section "Setting up your machine" on:
http://wiki.qt.io/Get_The_Source
Linux, Mac:
-----------
````
cd <path>/<source_package>
./configure -prefix $PWD/qtbase
cmake --build .
````
Windows:
--------
1. Open a command prompt.
2. Ensure that the following tools can be found in the path:
* Supported compiler (Visual Studio 2019 or later, or MinGW-builds gcc 8.1 or later)
* Perl version 5.12 or later [http://www.activestate.com/activeperl/]
* Python version 2.7 or later [http://www.activestate.com/activepython/]
* Ruby version 1.9.3 or later [http://rubyinstaller.org/]
````
cd <path>\<source_package>
configure -prefix %CD%\qtbase
cmake --build .
````
More details follow.
Build!
======
Qt is built with CMake, and a typical
`configure && cmake --build .` build process is used.
If ninja is installed, it is automatically chosen as CMake generator.
Some relevant configure options (see configure -help):
* `-release` Compile and link Qt with debugging turned off.
* `-debug` Compile and link Qt with debugging turned on.
Example for a release build:
````
./configure -prefix $PWD/qtbase
cmake --build .
````
Example for a developer build:
(enables more autotests, builds debug version of libraries, ...)
````
./configure -developer-build
cmake --build .
````
See output of `./configure -help` for documentation on various options to
configure.
The above examples will build whatever Qt modules have been enabled
by default in the build system.
It is possible to build selected repositories with their dependencies by doing
a `ninja <repo-name>/all'. For example, to build only qtdeclarative,
and the modules it depends on:
````
./configure
ninja qtdeclarative/all
````
This can save a lot of time if you are only interested in a subset of Qt.
Hints
=====
The submodule repository `qtrepotools` contains useful scripts for
developers and release engineers. Consider adding qtrepotools/bin
to your `PATH` environment variable to access them.
Building Qt from git
=====================
See http://wiki.qt.io/Building_Qt_6_from_Git and README.git
for more information.
See http://wiki.qt.io/Qt_6 for the reference platforms.
Documentation
=============
After configuring and compiling Qt, building the documentation is possible by running
```
cmake --build . --target docs
```
After having built the documentation, you need to install it with the following
command:
```
cmake --build . --target install_docs
```
The documentation is installed in the path specified with the
configure argument `-docdir`.
Information about Qt's documentation is located in qtbase/doc/README
Note: Building the documentation is only tested on desktop platforms.

85
_clang-format Normal file
View File

@@ -0,0 +1,85 @@
# Copyright (C) 2016 Olivier Goffart <ogoffart@woboq.com>
#
# You may use this file under the terms of the 3-clause BSD license.
# See the file LICENSE from this package for details.
# This is the clang-format configuration style to be used by Qt,
# based on the rules from https://wiki.qt.io/Qt_Coding_Style and
# https://wiki.qt.io/Coding_Conventions
---
# Webkit style was loosely based on the Qt style
BasedOnStyle: WebKit
Standard: Cpp11
# Column width is limited to 100 in accordance with Qt Coding Style.
# https://wiki.qt.io/Qt_Coding_Style
# Note that this may be changed at some point in the future.
ColumnLimit: 100
# How much weight do extra characters after the line length limit have.
# PenaltyExcessCharacter: 4
# Disable reflow of qdoc comments: indentation rules are different.
# Translation comments are also excluded.
CommentPragmas: "^!|^:"
# We want a space between the type and the star for pointer types.
PointerBindsToType: false
# We use template< without space.
SpaceAfterTemplateKeyword: false
# We want to break before the operators, but not before a '='.
BreakBeforeBinaryOperators: NonAssignment
# Braces are usually attached, but not after functions or class declarations.
BreakBeforeBraces: Custom
BraceWrapping:
AfterClass: true
AfterControlStatement: false
AfterEnum: false
AfterFunction: true
AfterNamespace: false
AfterObjCDeclaration: false
AfterStruct: true
AfterUnion: false
BeforeCatch: false
BeforeElse: false
IndentBraces: false
# When constructor initializers do not fit on one line, put them each on a new line.
ConstructorInitializerAllOnOneLineOrOnePerLine: true
# Indent initializers by 4 spaces
ConstructorInitializerIndentWidth: 4
# Indent width for line continuations.
ContinuationIndentWidth: 8
# No indentation for namespaces.
NamespaceIndentation: None
# Allow indentation for preprocessing directives (if/ifdef/endif). https://reviews.llvm.org/rL312125
IndentPPDirectives: AfterHash
# Horizontally align arguments after an open bracket.
# The coding style does not specify the following, but this is what gives
# results closest to the existing code.
AlignAfterOpenBracket: true
AlwaysBreakTemplateDeclarations: true
# Ideally we should also allow less short function in a single line, but
# clang-format does not handle that.
AllowShortFunctionsOnASingleLine: Inline
# The coding style specifies some include order categories, but also tells to
# separate categories with an empty line. It does not specify the order within
# the categories. Since the SortInclude feature of clang-format does not
# re-order includes separated by empty lines, the feature is not used.
SortIncludes: false
# macros for which the opening brace stays attached.
ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH, forever, Q_FOREVER, QBENCHMARK, QBENCHMARK_ONCE ]
# Break constructor initializers before the colon and after the commas.
BreakConstructorInitializers: BeforeColon

View File

@@ -0,0 +1,73 @@
#.rst:
# ECMOptionalAddSubdirectory
# --------------------------
#
# Make subdirectories optional.
#
# ::
#
# ecm_optional_add_subdirectory(<dir>)
#
# This behaves like add_subdirectory(), except that it does not complain if the
# directory does not exist. Additionally, if the directory does exist, it
# creates an option to allow the user to skip it. The option will be named
# BUILD_<dir>.
#
# This is useful for "meta-projects" that combine several mostly-independent
# sub-projects.
#
# If the CMake variable DISABLE_ALL_OPTIONAL_SUBDIRECTORIES is set to TRUE for
# the first CMake run on the project, all optional subdirectories will be
# disabled by default (but can of course be enabled via the respective options).
# For example, the following will disable all optional subdirectories except the
# one named "foo":
#
# .. code-block:: sh
#
# cmake -DDISABLE_ALL_OPTIONAL_SUBDIRECTORIES=TRUE -DBUILD_foo=TRUE myproject
#
# Since pre-1.0.0.
#=============================================================================
# Copyright 2007 Alexander Neundorf <neundorf@kde.org>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the copyright
# notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
# 3. The name of the author may not be used to endorse or promote products
# derived from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
function(ECM_OPTIONAL_ADD_SUBDIRECTORY _dir)
get_filename_component(_fullPath ${_dir} ABSOLUTE)
if(EXISTS ${_fullPath}/CMakeLists.txt)
if(DISABLE_ALL_OPTIONAL_SUBDIRECTORIES)
set(_DEFAULT_OPTION_VALUE FALSE)
else()
set(_DEFAULT_OPTION_VALUE TRUE)
endif()
if(DISABLE_ALL_OPTIONAL_SUBDIRS AND NOT DEFINED BUILD_${_dir})
set(_DEFAULT_OPTION_VALUE FALSE)
endif()
option(BUILD_${_dir} "Build directory ${_dir}" ${_DEFAULT_OPTION_VALUE})
if(BUILD_${_dir})
add_subdirectory(${_dir})
endif()
endif()
endfunction()

View File

@@ -0,0 +1,3 @@
include(cmake/QtTopLevelHelpers.cmake)
qt_internal_sync_to(${SYNC_TO_MODULE} ${SYNC_TO_BRANCH})

View File

@@ -0,0 +1,327 @@
# Populates $out_module_list with all subdirectories that have a CMakeLists.txt file
function(qt_internal_find_modules out_module_list)
set(module_list "")
file(GLOB directories LIST_DIRECTORIES true RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" *)
foreach(directory IN LISTS directories)
if(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/${directory}"
AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${directory}/CMakeLists.txt")
list(APPEND module_list "${directory}")
endif()
endforeach()
message(DEBUG "qt_internal_find_modules: ${module_list}")
set(${out_module_list} "${module_list}" PARENT_SCOPE)
endfunction()
# poor man's yaml parser, populating $out_dependencies with all dependencies
# in the $depends_file
# Each entry will be in the format dependency/sha1
function(qt_internal_parse_dependencies depends_file out_dependencies)
file(STRINGS "${depends_file}" lines)
set(eof_marker "---EOF---")
list(APPEND lines "${eof_marker}")
set(required_default TRUE)
set(dependencies "")
set(dependency "")
set(revision "")
set(required "${required_default}")
foreach(line IN LISTS lines)
if(line MATCHES "^ (.+):$" OR line STREQUAL "${eof_marker}")
# Found a repo entry or end of file. Add the last seen dependency.
if(NOT dependency STREQUAL "")
if(revision STREQUAL "")
message(FATAL_ERROR "Format error in ${depends_file} - ${dependency} does not specify revision!")
endif()
list(APPEND dependencies "${dependency}/${revision}/${required}")
endif()
# Remember the current dependency
if(NOT line STREQUAL "${eof_marker}")
set(dependency "${CMAKE_MATCH_1}")
set(revision "")
set(required "${required_default}")
# dependencies are specified with relative path to this module
string(REPLACE "../" "" dependency ${dependency})
endif()
elseif(line MATCHES "^ ref: (.+)$")
set(revision "${CMAKE_MATCH_1}")
elseif(line MATCHES "^ required: (.+)$")
string(TOUPPER "${CMAKE_MATCH_1}" required)
endif()
endforeach()
message(DEBUG "qt_internal_parse_dependencies for ${depends_file}: ${dependencies} ${revisions}")
set(${out_dependencies} "${dependencies}" PARENT_SCOPE)
endfunction()
# Load $module and populate $out_ordered with the submodules based on their dependencies
# $ordered carries already sorted dependencies; $out_has_dependencies is left empty
# if there are no dependencies, otherwise set to 1; Save list of dependencies for $module into
# $out_module_dependencies. List may contain duplicates, since function checks max depth
# dependencies.
# Function calls itself recursively if a dependency is found that is not yet in $ordered.
function(qt_internal_add_module_dependencies module ordered out_ordered out_has_dependencies
out_module_dependencies out_revisions)
set(depends_file "${CMAKE_CURRENT_SOURCE_DIR}/${module}/dependencies.yaml")
if(NOT EXISTS "${depends_file}")
set(${out_has_dependencies} "" PARENT_SCOPE)
return()
endif()
set(${out_has_dependencies} "1" PARENT_SCOPE)
set(dependencies "")
qt_internal_parse_dependencies("${depends_file}" dependencies)
# module hasn't been seen yet, append it
list(FIND ordered "${module}" pindex)
if (pindex EQUAL -1)
list(LENGTH ordered pindex)
list(APPEND ordered "${module}")
list(APPEND revisions "HEAD")
endif()
set(modules_dependencies "")
foreach(dependency IN LISTS dependencies)
if(dependency MATCHES "(.*)/([^/]+)/([^/]+)")
set(dependency "${CMAKE_MATCH_1}")
set(revision "${CMAKE_MATCH_2}")
set(required "${CMAKE_MATCH_3}")
if(required)
set_property(GLOBAL APPEND PROPERTY QT_REQUIRED_DEPS_FOR_${module} ${dependency})
endif()
else()
message(FATAL_ERROR "Internal Error: wrong dependency format ${dependency}")
endif()
list(APPEND modules_dependencies "${dependency}")
list(FIND ordered "${dependency}" dindex)
if (dindex EQUAL -1)
# dependency hasnt' been seen yet - load it
list(INSERT ordered ${pindex} "${dependency}")
list(INSERT revisions ${pindex} "${revision}")
qt_internal_add_module_dependencies(${dependency} "${ordered}" ordered has_dependency
"${out_module_dependencies}" revisions)
elseif(dindex GREATER pindex)
# otherwise, make sure it is before module
list(REMOVE_AT ordered ${dindex})
list(REMOVE_AT revisions ${dindex})
list(INSERT ordered ${pindex} "${dependency}")
list(INSERT revisions ${pindex} "${revision}")
endif()
endforeach()
set(${out_ordered} "${ordered}" PARENT_SCOPE)
set(${out_module_dependencies} ${${out_module_dependencies}} ${modules_dependencies} PARENT_SCOPE)
set(${out_revisions} "${revisions}" PARENT_SCOPE)
endfunction()
# populates $out_all_ordered with the sequence of the modules that need
# to be built in order to build $modules; dependencies for each module are populated
# in variables with specified in $dependencies_map_prefix prefix
function(qt_internal_sort_module_dependencies modules out_all_ordered dependencies_map_prefix)
set(ordered "")
foreach(module IN LISTS modules)
set(out_ordered "")
if(NOT dependencies_map_prefix)
message(FATAL_ERROR "dependencies_map_prefix is not provided")
endif()
set(module_dependencies_list_var_name "${dependencies_map_prefix}${module}")
qt_internal_add_module_dependencies(${module} "${ordered}" out_ordered module_depends
"${module_dependencies_list_var_name}" revisions)
set(${module_dependencies_list_var_name}
"${${module_dependencies_list_var_name}}" PARENT_SCOPE)
if(NOT module_depends)
list(APPEND no_dependencies "${module}")
else()
set(ordered "${out_ordered}")
endif()
endforeach()
if (no_dependencies)
list(APPEND ordered "${no_dependencies}")
endif()
message(DEBUG "qt_internal_parse_dependencies sorted ${modules}: ${ordered}")
set(${out_all_ordered} "${ordered}" PARENT_SCOPE)
endfunction()
# does what it says, but also updates submodules
function(qt_internal_checkout module revision)
set(swallow_output "") # unless VERBOSE, eat git output, show it in case of error
if (NOT VERBOSE)
list(APPEND swallow_output "OUTPUT_VARIABLE" "git_output" "ERROR_VARIABLE" "git_output")
endif()
message(NOTICE "Checking '${module}' out to revision '${revision}'")
execute_process(
COMMAND "git" "checkout" "${revision}"
WORKING_DIRECTORY "./${module}"
RESULT_VARIABLE git_result
${swallow_output}
)
if (git_result EQUAL 128)
message(WARNING "${git_output}, trying detached checkout")
execute_process(
COMMAND "git" "checkout" "--detach" "${revision}"
WORKING_DIRECTORY "./${module}"
RESULT_VARIABLE git_result
${swallow_output}
)
endif()
if (git_result)
message(FATAL_ERROR "Failed to check '${module}' out to '${revision}': ${git_output}")
endif()
execute_process(
COMMAND "git" "submodule" "update"
WORKING_DIRECTORY "./${module}"
RESULT_VARIABLE git_result
OUTPUT_VARIABLE git_stdout
ERROR_VARIABLE git_stderr
)
endfunction()
# clones or creates a worktree for $dependency, using the source of $dependent
function(qt_internal_get_dependency dependent dependency)
set(swallow_output "") # unless VERBOSE, eat git output, show it in case of error
if (NOT VERBOSE)
list(APPEND swallow_output "OUTPUT_VARIABLE" "git_output" "ERROR_VARIABLE" "git_output")
endif()
set(gitdir "")
set(remote "")
# try to read the worktree source
execute_process(
COMMAND "git" "rev-parse" "--git-dir"
WORKING_DIRECTORY "./${dependent}"
RESULT_VARIABLE git_result
OUTPUT_VARIABLE git_stdout
ERROR_VARIABLE git_stderr
OUTPUT_STRIP_TRAILING_WHITESPACE
)
string(FIND "${git_stdout}" "${module}" index)
string(SUBSTRING "${git_stdout}" 0 ${index} gitdir)
string(FIND "${gitdir}" ".git/modules" index)
if(index GREATER -1) # submodules have not been absorbed
string(SUBSTRING "${gitdir}" 0 ${index} gitdir)
endif()
message(DEBUG "Will look for clones in ${gitdir}")
execute_process(
COMMAND "git" "remote" "get-url" "origin"
WORKING_DIRECTORY "./${dependent}"
RESULT_VARIABLE git_result
OUTPUT_VARIABLE git_stdout
ERROR_VARIABLE git_stderr
OUTPUT_STRIP_TRAILING_WHITESPACE
)
string(FIND "${git_stdout}" "${dependent}.git" index)
string(SUBSTRING "${git_stdout}" 0 ${index} remote)
message(DEBUG "Will clone from ${remote}")
if(EXISTS "${gitdir}.gitmodules" AND NOT EXISTS "${gitdir}${dependency}/.git")
# super repo exists, but the submodule we need does not - try to initialize
message(NOTICE "Initializing submodule '${dependency}' from ${gitdir}")
execute_process(
COMMAND "git" "submodule" "update" "--init" "${dependency}"
WORKING_DIRECTORY "${gitdir}"
RESULT_VARIABLE git_result
${swallow_output}
)
if (git_result)
# ignore errors, fall back to an independent clone instead
message(WARNING "Failed to initialize submodule '${dependency}' from ${gitdir}")
endif()
endif()
if(EXISTS "${gitdir}${dependency}")
# for the module we want, there seems to be a clone parallel to what we have
message(NOTICE "Adding worktree for ${dependency} from ${gitdir}${dependency}")
execute_process(
COMMAND "git" "worktree" "add" "--detach" "${CMAKE_CURRENT_SOURCE_DIR}/${dependency}"
WORKING_DIRECTORY "${gitdir}/${dependency}"
RESULT_VARIABLE git_result
${swallow_output}
)
if (git_result)
message(FATAL_ERROR "Failed to check '${module}' out to '${revision}': ${git_output}")
endif()
else()
# we don't find the existing clone, so clone from the same remote
message(NOTICE "Cloning ${dependency} from ${remote}${dependency}.git")
execute_process(
COMMAND "git" "clone" "${remote}${dependency}.git"
WORKING_DIRECTORY "."
RESULT_VARIABLE git_result
${swallow_output}
)
if (git_result)
message(FATAL_ERROR "Failed to check '${module}' out to '${revision}': ${git_output}")
endif()
endif()
endfunction()
# evaluates the dependencies for $module, and checks all dependencies
# out so that it is a consistent set
function(qt_internal_sync_to module)
if(ARGN)
set(revision "${ARGV1}")
# special casing "." as the target module - checkout all out to $revision
if("${module}" STREQUAL ".")
qt_internal_find_modules(modules)
foreach(module IN LISTS modules)
qt_internal_checkout("${module}" "${revision}")
endforeach()
return()
endif()
else()
set(revision "HEAD")
endif()
qt_internal_checkout("${module}" "${revision}")
set(revision "")
set(checkedout "1")
# Load all dependencies for $module, then iterate over the dependencies in reverse order,
# and check out the first that isn't already at the required revision.
# Repeat everything (we need to reload dependencies after each checkout) until no more checkouts
# are done.
while(${checkedout})
set(dependencies "")
set(revisions "")
set(prefix "")
qt_internal_add_module_dependencies(${module} "${dependencies}" dependencies has_dependencies prefix revisions)
message(DEBUG "${module} dependencies: ${dependencies}")
message(DEBUG "${module} revisions : ${revisions}")
if (NOT has_dependencies)
message(NOTICE "Module ${module} has no dependencies")
return()
endif()
list(LENGTH dependencies count)
math(EXPR count "${count} - 1")
set(checkedout 0)
foreach(i RANGE ${count} 0 -1 )
list(GET dependencies ${i} dependency)
list(GET revisions ${i} revision)
if ("${revision}" STREQUAL "HEAD")
message(DEBUG "Not changing checked out revision of ${dependency}")
continue()
endif()
if(NOT EXISTS "./${dependency}")
message(DEBUG "No worktree for '${dependency}' found in '${CMAKE_CURRENT_SOURCE_DIR}'")
qt_internal_get_dependency("${module}" "${dependency}")
endif()
execute_process(
COMMAND "git" "rev-parse" "HEAD"
WORKING_DIRECTORY "./${dependency}"
RESULT_VARIABLE git_result
OUTPUT_VARIABLE git_stdout
ERROR_VARIABLE git_stderr
OUTPUT_STRIP_TRAILING_WHITESPACE
)
if (git_result)
message(WARNING "${git_stdout}")
message(FATAL_ERROR "Failed to get current HEAD of '${dependency}': ${git_stderr}")
endif()
if ("${git_stdout}" STREQUAL "${revision}")
continue()
endif()
qt_internal_checkout("${dependency}" "${revision}")
set(checkedout 1)
break()
endforeach()
endwhile()
endfunction()

View File

@@ -0,0 +1,5 @@
include(linux-developer-x86_64-gcc)
[options]
qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
*:cmake_args_leaf_module="-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"

View File

@@ -0,0 +1,5 @@
include(linux-webassembly-x86_64-gcc)
[options]
qtbase:cmake_args_qtbase="-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
*:cmake_args_leaf_module="-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"

View File

@@ -0,0 +1,6 @@
include(linux-x86_64-gcc)
[options]
qtbase:headersclean=yes
qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOpenGL_GL_PREFERENCE=LEGACY -DFEATURE_system_harfbuzz=OFF -DOPENSSL_ROOT_DIR=$OPENSSL_ANDROID_HOME -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
*:cmake_args_leaf_module="-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"

View File

@@ -0,0 +1 @@
include(macos-ios-arm64-clang)

View File

@@ -0,0 +1,6 @@
include(macos-universal-clang)
[options]
qtbase:headersclean=yes
qtbase:cmake_args_qtbase='-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DODBC_ROOT=/usr/local/opt/libiodbc -DPostgreSQL_ROOT=$POSTGRESQLBINPATH/..'
*:cmake_args_leaf_module="-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"

View File

@@ -0,0 +1,5 @@
include(unix-android-arm64-clang)
[options]
qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DOPENSSL_ROOT_DIR=$OPENSSL_ANDROID_HOME -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_ROOT/build/cmake/android.toolchain.cmake -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
*:cmake_args_leaf_module="-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"

View File

@@ -0,0 +1,5 @@
include(unix-android-armv7-clang)
[options]
qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DOPENSSL_ROOT_DIR=$OPENSSL_ANDROID_HOME -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_ROOT/build/cmake/android.toolchain.cmake -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
*:cmake_args_leaf_module="-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"

View File

@@ -0,0 +1,5 @@
include(unix-android-x86-clang)
[options]
qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DOPENSSL_ROOT_DIR=$OPENSSL_ANDROID_HOME -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_ROOT/build/cmake/android.toolchain.cmake -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
*:cmake_args_leaf_module="-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"

View File

@@ -0,0 +1,5 @@
include(unix-android-x86_64-clang)
[options]
qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DOPENSSL_ROOT_DIR=$OPENSSL_ANDROID_HOME -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_ROOT/build/cmake/android.toolchain.cmake -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
*:cmake_args_leaf_module="-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"

View File

@@ -0,0 +1,5 @@
include(windows-android-arm64-clang)
[options]
qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DOPENSSL_ROOT_DIR=%OPENSSL_ANDROID_HOME% -DCMAKE_TOOLCHAIN_FILE=%ANDROID_NDK_ROOT%/build/cmake/android.toolchain.cmake -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
*:cmake_args_leaf_module="-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"

View File

@@ -0,0 +1,5 @@
include(windows-android-armv7-clang)
[options]
qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DOPENSSL_ROOT_DIR=%OPENSSL_ANDROID_HOME% -DCMAKE_TOOLCHAIN_FILE=%ANDROID_NDK_ROOT%/build/cmake/android.toolchain.cmake -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
*:cmake_args_leaf_module="-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"

View File

@@ -0,0 +1,5 @@
include(windows-android-x86-clang)
[options]
qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR=%OPENSSL_ANDROID_HOME% -DCMAKE_TOOLCHAIN_FILE=%ANDROID_NDK_ROOT%/build/cmake/android.toolchain.cmake -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
*:cmake_args_leaf_module="-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"

View File

@@ -0,0 +1,5 @@
include(windows-android-x86_64-clang)
[options]
qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR=%OPENSSL_ANDROID_HOME% -DCMAKE_TOOLCHAIN_FILE=%ANDROID_NDK_ROOT%/build/cmake/android.toolchain.cmake -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
*:cmake_args_leaf_module="-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"

View File

@@ -0,0 +1,4 @@
include(windows-arm64-msvc2019_64)
qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=cl.exe -DCMAKE_CXX_COMPILER=cl.exe -DQT_QMAKE_TARGET_MKSPEC=win32-arm64-msvc -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DFEATURE_msvc_obj_debug_info=ON"
*:cmake_args_leaf_module="-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"

View File

@@ -0,0 +1,6 @@
include(windows-x86_64-mingw)
[options]
qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DFEATURE_system_tiff=OFF -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR=%OPENSSL_INCLUDE_x64%\.. -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DPostgreSQL_ROOT=%POSTGRESQL_LIB_x64%\.."
*:cmake_args_leaf_module="-DFEATURE_system_tiff=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"

View File

@@ -0,0 +1,7 @@
include(windows-x86_64-msvc2019_64)
[options]
qtbase:headersclean=yes
qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=cl.exe -DCMAKE_CXX_COMPILER=cl.exe -DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR=%OPENSSL_INCLUDE_x64%\.. -DPostgreSQL_ROOT=%POSTGRESQL_LIB_x64%\.. -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"
*:cmake_args_leaf_module="-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache"

View File

@@ -0,0 +1,17 @@
[settings]
os=Linux
arch=x86_64
compiler=gcc
compiler.version=9.3
compiler.libcxx=libstdc++11
build_type=Release
[options]
qtbase:release=yes
qtbase:shared=yes
qtbase:nomake=tests;examples
qtbase:developer_build=yes
qtbase:cmake_args_qtbase=""
*:cmake_args_leaf_module=""
[build_requires]
[env]
CONAN_CMAKE_GENERATOR=Ninja

View File

@@ -0,0 +1,18 @@
[settings]
os=Emscripten
arch=wasm
compiler=clang
compiler.version=10
compiler.libcxx=libstdc++
build_type=RelWithDebInfo
[options]
qtbase:release=yes
qtbase:shared=no
qtbase:qt_host_path=$QT_HOST_PATH
qtbase:nomake=examples;tests
qtbase:force_debug_info=yes
qtbase:cmake_args_qtbase="-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten"
*:cmake_args_leaf_module=""
[build_requires]
[env]
CONAN_CMAKE_GENERATOR=Ninja

View File

@@ -0,0 +1,24 @@
[settings]
os=Linux
arch=x86_64
compiler=gcc
compiler.version=9.3
compiler.libcxx=libstdc++11
build_type=RelWithDebInfo
[options]
qtbase:release=yes
qtbase:shared=yes
qtbase:nomake=tests;examples
qtbase:separate_debug_info=yes
qtbase:force_debug_info=yes
qtbase:bundled_xcb_xinput=yes
qtbase:libudev=no
qtbase:doubleconversion=qt
qtbase:pcre=qt
qtbase:libjpeg=qt
qtbase:libpng=qt
qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOpenGL_GL_PREFERENCE=LEGACY -DFEATURE_system_harfbuzz=OFF"
*:cmake_args_leaf_module=""
[build_requires]
[env]
CONAN_CMAKE_GENERATOR=Ninja

View File

@@ -0,0 +1,17 @@
[settings]
os=iOS
os.version=13.0
arch=armv8
compiler=apple-clang
compiler.version=11.0
compiler.libcxx=libc++
build_type=Release
[options]
qtbase:shared=no
qtbase:debug_and_release=yes
qtbase:nomake=examples;tests
qtbase:qt_host_path=$QT_HOST_PATH
qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_SYSTEM_NAME=iOS"
[build_requires]
[env]
CONAN_CMAKE_GENERATOR=Ninja

View File

@@ -0,0 +1,20 @@
[settings]
os=Macos
os.version=11.0
arch=x86_64
compiler=apple-clang
compiler.version=12.0
compiler.libcxx=libc++
build_type=RelWithDebInfo
[options]
qtbase:release=yes
qtbase:shared=yes
qtbase:nomake=examples;tests
qtbase:force_debug_info=yes
qtbase:separate_debug_info=yes
qtbase:framework=yes
qtbase:cmake_args_qtbase='-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DODBC_ROOT=/usr/local/opt/libiodbc'
*:cmake_args_leaf_module=""
[build_requires]
[env]
CONAN_CMAKE_GENERATOR=Ninja

View File

@@ -0,0 +1,23 @@
[settings]
os=Android
os.api_level=8
arch=armv8
compiler=clang
compiler.version=11
compiler.libcxx=c++_shared
build_type=RelWithDebInfo
[options]
qtbase:release=yes
qtbase:shared=yes
qtbase:force_debug_info=yes
qtbase:nomake=examples;tests
qtbase:qt_host_path=$QT_HOST_PATH
qtbase:platform=android-clang
qtbase:android_abis=arm64-v8a
qtbase:android_ndk=$ANDROID_NDK_ROOT
qtbase:android_sdk=$ANDROID_SDK_ROOT
qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DOPENSSL_ROOT_DIR=$OPENSSL_ANDROID_HOME -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_ROOT/build/cmake/android.toolchain.cmake -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU"
*:cmake_args_leaf_module=""
[build_requires]
[env]
CONAN_CMAKE_GENERATOR=Ninja

View File

@@ -0,0 +1,23 @@
[settings]
os=Android
os.api_level=8
arch=armv7
compiler=clang
compiler.version=11
compiler.libcxx=c++_shared
build_type=RelWithDebInfo
[options]
qtbase:release=yes
qtbase:shared=yes
qtbase:force_debug_info=yes
qtbase:nomake=examples;tests
qtbase:qt_host_path=$QT_HOST_PATH
qtbase:platform=android-clang
qtbase:android_abis=armeabi-v7a
qtbase:android_ndk=$ANDROID_NDK_ROOT
qtbase:android_sdk=$ANDROID_SDK_ROOT
qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DOPENSSL_ROOT_DIR=$OPENSSL_ANDROID_HOME -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_ROOT/build/cmake/android.toolchain.cmake -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU"
*:cmake_args_leaf_module=""
[build_requires]
[env]
CONAN_CMAKE_GENERATOR=Ninja

View File

@@ -0,0 +1,23 @@
[settings]
os=Android
os.api_level=8
arch=x86
compiler=clang
compiler.version=11
compiler.libcxx=c++_shared
build_type=RelWithDebInfo
[options]
qtbase:release=yes
qtbase:shared=yes
qtbase:force_debug_info=yes
qtbase:nomake=examples;tests
qtbase:qt_host_path=$QT_HOST_PATH
qtbase:platform=android-clang
qtbase:android_abis=x86
qtbase:android_ndk=$ANDROID_NDK_ROOT
qtbase:android_sdk=$ANDROID_SDK_ROOT
qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DOPENSSL_ROOT_DIR=$OPENSSL_ANDROID_HOME -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_ROOT/build/cmake/android.toolchain.cmake -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU"
*:cmake_args_leaf_module=""
[build_requires]
[env]
CONAN_CMAKE_GENERATOR=Ninja

View File

@@ -0,0 +1,23 @@
[settings]
os=Android
os.api_level=8
arch=x86_64
compiler=clang
compiler.version=11
compiler.libcxx=c++_shared
build_type=RelWithDebInfo
[options]
qtbase:release=yes
qtbase:shared=yes
qtbase:force_debug_info=yes
qtbase:nomake=examples;tests
qtbase:qt_host_path=$QT_HOST_PATH
qtbase:platform=android-clang
qtbase:android_abis=x86_64
qtbase:android_ndk=$ANDROID_NDK_ROOT
qtbase:android_sdk=$ANDROID_SDK_ROOT
qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DOPENSSL_ROOT_DIR=$OPENSSL_ANDROID_HOME -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_ROOT/build/cmake/android.toolchain.cmake -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU"
*:cmake_args_leaf_module=""
[build_requires]
[env]
CONAN_CMAKE_GENERATOR=Ninja

View File

@@ -0,0 +1,24 @@
[settings]
os=Android
os.api_level=8
arch=armv8
compiler=clang
compiler.version=11
compiler.libcxx=c++_shared
build_type=RelWithDebInfo
[options]
qtbase:release=yes
qtbase:shared=yes
qtbase:pkg_config=no
qtbase:force_debug_info=yes
qtbase:nomake=examples;tests
qtbase:qt_host_path=%QT_HOST_PATH%
qtbase:platform=android-clang
qtbase:android_abis=arm64-v8a
qtbase:android_ndk=%ANDROID_NDK_ROOT%
qtbase:android_sdk=%ANDROID_SDK_ROOT%
qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DOPENSSL_ROOT_DIR=%OPENSSL_ANDROID_HOME% -DCMAKE_TOOLCHAIN_FILE=%ANDROID_NDK_ROOT%/build/cmake/android.toolchain.cmake -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU"
*:cmake_args_leaf_module=""
[build_requires]
[env]
CONAN_CMAKE_GENERATOR=Ninja

View File

@@ -0,0 +1,24 @@
[settings]
os=Android
os.api_level=8
arch=armv7
compiler=clang
compiler.version=11
compiler.libcxx=c++_shared
build_type=RelWithDebInfo
[options]
qtbase:release=yes
qtbase:shared=yes
qtbase:pkg_config=no
qtbase:force_debug_info=yes
qtbase:nomake=examples;tests
qtbase:qt_host_path=%QT_HOST_PATH%
qtbase:platform=android-clang
qtbase:android_abis=armeabi-v7a
qtbase:android_ndk=%ANDROID_NDK_ROOT%
qtbase:android_sdk=%ANDROID_SDK_ROOT%
qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DOPENSSL_ROOT_DIR=%OPENSSL_ANDROID_HOME% -DCMAKE_TOOLCHAIN_FILE=%ANDROID_NDK_ROOT%/build/cmake/android.toolchain.cmake -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU"
*:cmake_args_leaf_module=""
[build_requires]
[env]
CONAN_CMAKE_GENERATOR=Ninja

View File

@@ -0,0 +1,24 @@
[settings]
os=Android
os.api_level=8
arch=x86
compiler=clang
compiler.version=11
compiler.libcxx=c++_shared
build_type=RelWithDebInfo
[options]
qtbase:release=yes
qtbase:shared=yes
qtbase:pkg_config=no
qtbase:force_debug_info=yes
qtbase:nomake=examples;tests
qtbase:qt_host_path=%QT_HOST_PATH%
qtbase:platform=android-clang
qtbase:android_abis=x86
qtbase:android_ndk=%ANDROID_NDK_ROOT%
qtbase:android_sdk=%ANDROID_SDK_ROOT%
qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_TOOLCHAIN_FILE=%ANDROID_NDK_ROOT%/build/cmake/android.toolchain.cmake -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU"
*:cmake_args_leaf_module=""
[build_requires]
[env]
CONAN_CMAKE_GENERATOR=Ninja

View File

@@ -0,0 +1,24 @@
[settings]
os=Android
os.api_level=8
arch=x86_64
compiler=clang
compiler.version=11
compiler.libcxx=c++_shared
build_type=RelWithDebInfo
[options]
qtbase:release=yes
qtbase:shared=yes
qtbase:pkg_config=no
qtbase:force_debug_info=yes
qtbase:nomake=examples;tests
qtbase:qt_host_path=%QT_HOST_PATH%
qtbase:platform=android-clang
qtbase:android_abis=x86_64
qtbase:android_ndk=%ANDROID_NDK_ROOT%
qtbase:android_sdk=%ANDROID_SDK_ROOT%
qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR=%OPENSSL_ANDROID_HOME% -DCMAKE_TOOLCHAIN_FILE=%ANDROID_NDK_ROOT%/build/cmake/android.toolchain.cmake -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU"
*:cmake_args_leaf_module=""
[build_requires]
[env]
CONAN_CMAKE_GENERATOR=Ninja

View File

@@ -0,0 +1,19 @@
[settings]
os=Windows
arch=armv8
compiler=msvc
compiler.version=19.28
compiler.cppstd=17
compiler.runtime=dynamic
compiler.runtime_type=Release
build_type=Release
[options]
qtbase:release=yes
qtbase:shared=yes
qtbase:qt_host_path=$QT_HOST_PATH
qtbase:nomake=tests
qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=cl.exe -DCMAKE_CXX_COMPILER=cl.exe -DQT_QMAKE_TARGET_MKSPEC=win32-arm64-msvc -DFEATURE_msvc_obj_debug_info=ON"
*:cmake_args_leaf_module=""
[build_requires]
[env]
CONAN_CMAKE_GENERATOR=Ninja

View File

@@ -0,0 +1,22 @@
[settings]
os=Windows
arch=x86_64
compiler=gcc
compiler.version=8.1
compiler.libcxx=libstdc++
build_type=RelWithDebInfo
[options]
qtbase:shared=yes
qtbase:debug_and_release=yes
qtbase:force_debug_info=yes
qtbase:separate_debug_info=yes
qtbase:nomake=examples;tests
qtbase:zlib=qt
qtbase:libjpeg=qt
qtbase:freetype=qt
qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DFEATURE_system_tiff=OFF -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++"
*:cmake_args_leaf_module="-DFEATURE_system_tiff=OFF"
[build_requires]
[env]
CONAN_CMAKE_GENERATOR=Ninja

View File

@@ -0,0 +1,21 @@
[settings]
os=Windows
arch=x86_64
compiler=msvc
compiler.version=19.28
compiler.cppstd=17
compiler.runtime=dynamic
compiler.runtime_type=Release
build_type=RelWithDebInfo
[options]
qtbase:shared=yes
qtbase:nomake=tests
qtbase:debug_and_release=yes
qtbase:force_debug_info=yes
qtbase:zlib=None
qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=cl.exe -DCMAKE_CXX_COMPILER=cl.exe -DFEATURE_msvc_obj_debug_info=ON"
*:cmake_args_leaf_module=""
[build_requires]
[env]
CONAN_CMAKE_GENERATOR=Ninja

View File

@@ -0,0 +1,33 @@
type: Group
instructions:
- type: ExecuteCommand
command: "{{.Env.ENV_PREFIX}} cmake --build . --target qtbase/src/plugins/platforms/all qtbase/src/plugins/sqldrivers/all qttools/all --parallel -v"
maxTimeInSeconds: 12000
maxTimeBetweenOutput: 1200
userMessageOnFailure: >
Failed to build sources.
- type: ExecuteCommand
command: "{{.Env.ENV_PREFIX}} cmake --build . --target docs -v"
maxTimeInSeconds: 12000
maxTimeBetweenOutput: 1200
userMessageOnFailure: >
Failed to generate docs.
- type: ExecuteCommand
command: "cp -r {{.BuildDir}}/qtbase/doc/config {{.BuildDir}}/doc"
maxTimeInSeconds: 12000
maxTimeBetweenOutput: 1200
userMessageOnFailure: "Failed to copy qtbase/doc/config to documentation directory."
- type: ExecuteCommand
command: "cp -r {{.BuildDir}}/qtbase/doc/global {{.BuildDir}}/doc"
maxTimeInSeconds: 12000
maxTimeBetweenOutput: 1200
userMessageOnFailure: "Failed to copy qtbase/doc/global to documentation directory."
- type: UploadArtifact
archiveDirectory: '{{.BuildDir}}/doc'
transferType: UploadModuleDocumentation
maxTimeInSeconds: 1800
maxTimeBetweenOutput: 1800
enable_if:
condition: property
property: features
contains_value: "Documentation"

View File

@@ -0,0 +1,4 @@
type: Group
instructions:
- !include "{{qt/qt5}}/coin_qt_configure.yaml"
- !include "{{qt/qt5}}/coin_qt_build_docs.yaml"

View File

@@ -0,0 +1,49 @@
type: Group
instructions:
- !include "{{qt/qtbase}}/prepare_building_env.yaml"
- type: MakeDirectory
directory: .git
- type: SetBuildDirectory
directory: "{{.SourceDir}}"
- type: ChangeDirectory
directory: "{{.BuildDir}}"
- !include "{{qt/qt5}}/prepare_configure_executable.yaml"
- type: EnvironmentVariable
variableName: COIN_CONFIGURE_ARGS
variableValue: "{{.Env.CONFIGURE_ARGS}}"
- type: EnvironmentVariable
variableName: COIN_CMAKE_ARGS
# Use unix separators even on Windows, to avoid escaping issues in the configure script.
variableValue: "{{.Env.CMAKE_ARGS}} {{.Env.COMMON_CMAKE_ARGS}} -DCMAKE_INSTALL_PREFIX:PATH={{unixPathSeparators .InstallDir}}"
- type: EnvironmentVariable
variableName: CONFIGURE_ENV_PREFIX
variableValue: "{{.Env.ENV_PREFIX}}"
- type: ExecuteCommand
# There is no SourceDir on purpose, because configure is called directly from qtbase,
# so the script knows it's own source dir.
# TODO: Consider removing these instructions, and using the ones in qtbase/call_configure_qtbase.yaml
# once all dependencies are propagated.
command: "{{.Env.CONFIGURE_ENV_PREFIX}} {{.Env.CONFIGURE_EXECUTABLE}} {{.Env.COIN_CONFIGURE_ARGS}} -- {{.Env.COIN_CMAKE_ARGS}}"
executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution
maxTimeInSeconds: 6000
maxTimeBetweenOutput: 1200
userMessageOnFailure: >
Failed to call cmake.
enable_if:
condition: property
property: features
contains_value: UseConfigure
- type: ExecuteCommand
command: "{{.Env.CONFIGURE_ENV_PREFIX}} {{.Env.CONFIGURE_EXECUTABLE}} {{.SourceDir}} {{.Env.COIN_CONFIGURE_ARGS}} {{.Env.COIN_CMAKE_ARGS}}"
executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution
maxTimeInSeconds: 6000
maxTimeBetweenOutput: 1200
userMessageOnFailure: >
Failed to call cmake.
disable_if:
condition: property
property: features
contains_value: UseConfigure

View File

@@ -0,0 +1,37 @@
# Call either cmake or configure depending on whether the
# UseConfigure platform configuration feature is set.
# We should remove the cmake branch, once all platform configurations
# are ported to use configure.
# TODO: Remove this file, and reference the one in qtbase, once all
# all dependencies are propagated.
type: Group
instructions:
- type: Group
enable_if:
condition: property
property: features
contains_value: UseConfigure
instructions:
- type: EnvironmentVariable
variableName: CONFIGURE_EXECUTABLE
variableValue: "{{.SourceDir}}/configure"
disable_if:
condition: property
property: host.os
equals_value: Windows
- type: EnvironmentVariable
variableName: CONFIGURE_EXECUTABLE
variableValue: "{{.SourceDir}}\\configure.bat"
enable_if:
condition: property
property: host.os
equals_value: Windows
- type: Group
disable_if:
condition: property
property: features
contains_value: UseConfigure
instructions:
- type: EnvironmentVariable
variableName: CONFIGURE_EXECUTABLE
variableValue: "cmake"

14
coin/module_config.yaml Normal file
View File

@@ -0,0 +1,14 @@
version: 2
accept_configuration:
condition: property
property: features
not_contains_value: Disable
instructions:
Build:
- !include "{{qt/qt5}}/coin_qt_build_template.yaml"
Test:
- type: EnvironmentVariable
variableName: Dummy
variableValue: dummy

View File

@@ -0,0 +1,195 @@
Version: 2
Include: [
cmake_platforms_qemu.yaml,
cmake_platforms_qemu_qnx710.yaml,
cmake_platforms_target_android_host_linux.yaml,
cmake_platforms_target_android_host_macos.yaml,
cmake_platforms_target_android_host_windows.yaml,
cmake_platforms_wasm.yaml,
macos.yaml
]
Configurations:
-
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Compiler: 'GCC'
Features: ['Sccache']
Configure arguments: '-DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_widgets=OFF'
-
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Compiler: 'GCC'
Features: ['Sccache', 'DisableTests']
Configure arguments: '-DFEATURE_developer_build=ON -DFEATURE_gui=OFF'
-
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Compiler: 'GCC'
Features: ['Sccache', 'DisableTests']
Configure arguments: '-DFEATURE_developer_build=ON -DINPUT_opengl=no'
-
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Compiler: 'GCC'
Features: ['Sccache', 'Documentation']
Configure arguments: '-DQT_BUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DWARNINGS_ARE_ERRORS=OFF -DQT_LIBINFIX=TestInfix -DQT_NAMESPACE=TestNamespace'
-
Id: 'Ubuntu-20.04-host'
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Compiler: 'GCC'
Features: ['Sccache']
Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_system_jpeg=OFF -DFEATURE_system_png=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_system_harfbuzz=OFF -DFEATURE_system_doubleconversion=OFF -DFEATURE_libudev=OFF -DCMAKE_AUTOGEN_VERBOSE=ON'
-
Id: 'OpenSUSE-15.3-host'
Template: 'qtci-linux-openSUSE-15.3-x86_64-50'
Compiler: 'GCC'
Features: ['Sccache']
Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON'
Environment variables: [
'PATH={{.Env.CMAKE_MIN_SUPPORTED_BIN_PATH}}:{{.Env.PATH}}',
'CONAN_PROFILE=coin/conan/profiles/linux-developer-x86_64-gcc'
]
-
Template: 'qtci-linux-openSUSE-15.3-x86_64-50'
Compiler: 'GCC'
Features: ['Sccache']
Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_headersclean=ON -DFEATURE_separate_debug_info=ON -DFEATURE_system_jpeg=OFF -DFEATURE_system_png=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_system_harfbuzz=OFF -DFEATURE_system_doubleconversion=OFF -DFEATURE_libudev=OFF -DINPUT_bundled_xcb_xinput=yes -DOpenGL_GL_PREFERENCE=LEGACY'
-
Template: 'qtci-linux-SLES-15_SP3-x86_64-51'
Compiler: 'GCC'
Features: ['Sccache', 'DisableTests']
Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF -DFEATURE_sql_mysql=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}'
-
Template: 'qtci-windows-11_21H2-x86_64-52'
Compiler: 'MSVC2019'
Features: ['Packaging', 'Sccache', "DebugAndRelease"]
Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DFEATURE_headersclean=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
Environment variables: [
'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}']
-
Template: 'qtci-windows-11_21H2-x86_64-51'
Compiler: 'MSVC2022'
Features: ['Sccache', "DebugAndRelease"]
Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DFEATURE_headersclean=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
Environment variables: [
'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}'
]
-
Template: 'qtci-windows-10_21H2-x86_64-51'
Compiler: 'MSVC2019'
Features: ['Packaging', 'Sccache', "DebugAndRelease"]
Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DFEATURE_headersclean=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..'
Environment variables: [
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
'CONAN_PROFILE=coin/conan/profiles/windows-x86_64-msvc2019_64'
]
-
Template: 'qtci-windows-10_21H2-x86_64-51'
Compiler: 'MSVC2022'
Features: ['Sccache', "DebugAndRelease"]
Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DFEATURE_headersclean=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..'
Environment variables: [
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}'
]
-
Id: 'Windows10_21H2-MSVC2019-x64-host'
Template: 'qtci-windows-10_21H2-x86_64-51'
Compiler: 'MSVC2019'
Features: ['Sccache', "DebugAndRelease"]
Configure arguments: '-G"Ninja Multi-Config" -DQT_BUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF'
-
Id: 'Windows11_21H2-MSVC2019-x64-host'
Template: 'qtci-windows-11_21H2-x86_64-52'
Compiler: 'MSVC2019'
Features: ['Sccache', "DebugAndRelease"]
Configure arguments: '-G"Ninja Multi-Config" -DQT_BUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
Environment variables: [
'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
-
Template: 'qtci-windows-11_21H2-x86_64-52'
Compiler: 'MSVC2019'
Target arch: 'arm64'
Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging']
Platform dependency: 'Windows11_21H2-MSVC2019-x64-host'
Environment variables: [
'TARGET_CONFIGURE_ARGS={{.Env.TARGET_CONFIGURE_ARGS}} -DQT_QMAKE_TARGET_MKSPEC=win32-arm64-msvc -G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
-
Template: 'qtci-windows-10_21H2-x86_64-51'
Compiler: 'MSVC2019'
Target arch: 'arm64'
Features: ['Sccache', 'DisableTests', 'TargetBuildOnly', 'Packaging']
Platform dependency: 'Windows10_21H2-MSVC2019-x64-host'
Environment variables: [
'TARGET_CONFIGURE_ARGS={{.Env.TARGET_CONFIGURE_ARGS}} -DQT_QMAKE_TARGET_MKSPEC=win32-arm64-msvc -G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ROOT_DIR_x64_arm64}}',
'OPENSSL_CONF_x64={{.Env.OPENSSL_CONF_x64_arm64}}',
'OPENSSL_INCLUDE_x64={{.Env.OPENSSL_INCLUDE_x64_arm64}}',
'OPENSSL_LIB_x64={{.Env.OPENSSL_LIB_x64_arm64}}',
'CONAN_HOST_PROFILE=coin/conan/profiles/windows-x86_64-msvc2019_64',
'CONAN_PROFILE=coin/conan/profiles/windows-arm64-msvc2019_64'
]
-
Id: 'RHEL-8.4-host'
Template: 'qtci-linux-RHEL-8.4-x86_64-50'
Compiler: 'GCC'
Features: ['Packaging', 'Sccache']
Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_headersclean=ON -DFEATURE_separate_debug_info=ON -DFEATURE_system_jpeg=OFF -DFEATURE_system_png=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_system_harfbuzz=OFF -DFEATURE_system_doubleconversion=OFF -DFEATURE_libudev=OFF -DINPUT_bundled_xcb_xinput=yes -DOpenGL_GL_PREFERENCE=LEGACY'
Environment variables: [
'CONAN_PROFILE=coin/conan/profiles/linux-x86_64-gcc'
]
-
Template: 'qtci-macos-10.14-x86_64'
Target os: 'IOS_ANY'
Target arch: 'arm64'
Compiler: 'Clang'
Target compiler: 'Clang'
Platform dependency: 'macos-latest-xcode-universal-packaging-build'
Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests']
Environment variables: ['TARGET_CONFIGURE_ARGS=-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="Release;Debug" -DQT_BUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS',
'NON_QTBASE_TARGET_CONFIGURE_ARGS=',
'CONAN_HOST_PROFILE=coin/conan/profiles/macos-universal-clang',
'CONAN_PROFILE=coin/conan/profiles/macos-ios-arm64-clang'
]
-
Id: 'Windows10_21H2-Mingw11-x64-host'
Template: 'qtci-windows-10_21H2-x86_64-51'
Compiler: 'Mingw'
Features: ['Packaging', 'Sccache']
Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DFEATURE_system_tiff=OFF -DFEATURE_system_freetype=OFF -DFEATURE_system_jpeg=OFF -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..'
Environment variables: [
'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF',
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}'
]
-
Id: 'Windows11_21H2-LLVM-x64-host'
Template: 'qtci-windows-11_21H2-x86_64-52'
Compiler: 'Clang'
Features: ['Sccache']
Configure arguments: '-GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DFEATURE_system_tiff=OFF -DFEATURE_system_freetype=OFF -DFEATURE_system_jpeg=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..'
Environment variables: ['Path=C:\llvm-mingw\bin;{{.Env.Path}}', 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', 'LLVM_INSTALL_DIR=C:\llvm-mingw']
-
Id: 'Windows10_21H2-LLVM-x64-host'
Template: 'qtci-windows-10_21H2-x86_64-51'
Compiler: 'Clang'
Features: ['Sccache']
Configure arguments: '-GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DFEATURE_system_tiff=OFF -DFEATURE_system_freetype=OFF -DFEATURE_system_jpeg=OFF -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..'
Environment variables: ['Path=C:\llvm-mingw\bin;{{.Env.Path}}', 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF',
'LLVM_INSTALL_DIR=C:\llvm-mingw']
-
Template: 'qtci-windows-11_21H2-x86_64-52'
Compiler: 'Mingw'
Features: ['Sccache']
Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DQT_BUILD_EXAMPLES=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DFEATURE_system_tiff=OFF -DFEATURE_system_freetype=OFF -DFEATURE_system_jpeg=OFF'
Environment variables: ['Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}', 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF',
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}']
-
Template: 'qtci-windows-10_21H2-x86_64-51'
Compiler: 'Mingw'
Features: ['Sccache']
Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DQT_BUILD_EXAMPLES=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DFEATURE_system_tiff=OFF -DFEATURE_system_freetype=OFF -DFEATURE_system_jpeg=OFF'
Environment variables: ['Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}', 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF',
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}']

View File

@@ -0,0 +1,47 @@
Version: 2
Configurations:
-
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Target os: 'QEMU'
Target arch: 'armv7'
Compiler: 'GCC'
Platform dependency: 'Ubuntu-20.04-host'
Features: ['Sccache']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARMV7_TOOLCHAIN_FILE}} -DQT_FEATURE_system_harfbuzz=OFF -DQT_QMAKE_TARGET_MKSPEC=devices/linux-imx7-g++ -DQT_QMAKE_DEVICE_OPTIONS="CROSS_COMPILE={{.Env.QEMUARMV7_TOOLCHAIN_CROSS_COMPILE}};DISTRO_OPTS=hard-float boot2qt" -DCMAKE_STAGING_PREFIX=/home/qt/work/install/target -DCMAKE_AUTOGEN_VERBOSE=ON -DFEATURE_forkfd_pidfd=OFF -DWARNINGS_ARE_ERRORS=OFF',
'QT_YOCTO_ENVSETUP={{.Env.QEMUARMV7_TOOLCHAIN_ENVSETUP}}',
"QT_CMAKE_DIR=/opt/cmake-3.21.1/bin",
'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}',
'GST_PLUGIN_SCANNER={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}/usr/libexec/gstreamer-1.0/gst-plugin-scanner',
'QT_QUICK_BACKEND=software',
]
-
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Target os: 'QEMU'
Target arch: 'arm64'
Compiler: 'GCC'
Platform dependency: 'Ubuntu-20.04-host'
Features: ['Sccache']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARM64_TOOLCHAIN_FILE}} -DQT_FEATURE_system_harfbuzz=OFF -DQT_QMAKE_TARGET_MKSPEC=devices/linux-generic-g++ -DQT_QMAKE_DEVICE_OPTIONS="CROSS_COMPILE={{.Env.QEMUARM64_TOOLCHAIN_CROSS_COMPILE}};DISTRO_OPTS=boot2qt" -DCMAKE_STAGING_PREFIX=/home/qt/work/install/target -DCMAKE_AUTOGEN_VERBOSE=ON -DFEATURE_forkfd_pidfd=OFF -DWARNINGS_ARE_ERRORS=OFF',
'QT_YOCTO_ENVSETUP={{.Env.QEMUARM64_TOOLCHAIN_ENVSETUP}}',
"QT_CMAKE_DIR=/opt/cmake-3.21.1/bin",
'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}',
'GST_PLUGIN_SCANNER={{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}/usr/libexec/gstreamer-1.0/gst-plugin-scanner',
'QT_QUICK_BACKEND=software',
]
-
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Target os: 'QEMU'
Target arch: 'mips64'
Compiler: 'GCC'
Platform dependency: 'Ubuntu-20.04-host'
Features: ['Sccache', 'DisableTests']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUMIPS64_TOOLCHAIN_FILE}} -DQT_FEATURE_system_harfbuzz=OFF -DQT_QMAKE_TARGET_MKSPEC=devices/linux-generic-g++ -DQT_QMAKE_DEVICE_OPTIONS="CROSS_COMPILE={{.Env.QEMUMIPS64_TOOLCHAIN_CROSS_COMPILE}};DISTRO_OPTS=boot2qt" -DCMAKE_STAGING_PREFIX=/home/qt/work/install/target -DCMAKE_AUTOGEN_VERBOSE=ON -DFEATURE_forkfd_pidfd=OFF -DWARNINGS_ARE_ERRORS=OFF',
'QT_YOCTO_ENVSETUP={{.Env.QEMUMIPS64_TOOLCHAIN_ENVSETUP}}',
"QT_CMAKE_DIR=/opt/cmake-3.21.1/bin",
'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUMIPS64_TOOLCHAIN_SYSROOT}}',
'GST_PLUGIN_SCANNER={{.Env.QEMUMIPS64_TOOLCHAIN_SYSROOT}}/usr/libexec/gstreamer-1.0/gst-plugin-scanner',
'QT_QUICK_BACKEND=software',
]

View File

@@ -0,0 +1,39 @@
Version: 2
Configurations:
-
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Target os: 'QNX_710'
Target arch: 'x86_64'
Compiler: 'GCC'
Target compiler: 'QCC'
Platform dependency: 'Ubuntu-20.04-host'
Features: ['InsignificantTests', 'VMSize8']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-DFEATURE_developer_build=ON -DQT_FEATURE_dbus=OFF -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-x8664.cmake',
'QT_CMAKE_DIR=/opt/cmake-3.21.1/bin',
"TESTARGS='{{.Env.QNX_QEMU_SSH}} LD_LIBRARY_PATH={{.Env.QNX_QEMU_LD_LIBRARY_PATH}} QSG_RHI_BACKEND=software QT_QPA_PLATFORM=offscreen QTEST_ENVIRONMENT=ci'",
"TESTRUNNER='python3 {{.SourceDir}}/coin_qnx_qemu_runner.py'",
"COIN_CTEST_RESULTSDIR=/home/qt/work",
'NON_QTBASE_TARGET_CONFIGURE_ARGS=']
-
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Target os: 'QNX_710'
Target arch: 'arm64'
Compiler: 'GCC'
Target compiler: 'QCC'
Platform dependency: 'Ubuntu-20.04-host'
Features: ['DisableTests']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-DQT_FEATURE_dbus=OFF -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-aarch64le.cmake',
'NON_QTBASE_TARGET_CONFIGURE_ARGS=']
-
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Target os: 'QNX_710'
Target arch: 'armv7'
Compiler: 'GCC'
Target compiler: 'QCC'
Platform dependency: 'Ubuntu-20.04-host'
Features: ['DisableTests']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-DQT_FEATURE_dbus=OFF -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.QNX_710}}/qnx-toolchain-armv7le.cmake',
'NON_QTBASE_TARGET_CONFIGURE_ARGS=']

View File

@@ -0,0 +1,28 @@
Version: 2
Configurations:
-
Template: 'qtci-linux-SLES-15_SP3-x86_64-51'
Compiler: 'GCC'
Features: ['Sccache', 'MinimalStaticTests']
Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF -DFEATURE_sql_mysql=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}'
-
Template: 'qtci-windows-10-x86_64-52'
Compiler: 'MSVC2019'
Features: ['Sccache', 'MinimalStaticTests']
Configure arguments: '-G"Ninja" -DCMAKE_BUILD_TYPE="RelWithDebInfo" -DBUILD_SHARED_LIBS=OFF -DFEATURE_msvc_obj_debug_info=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF'
Environment variables: [
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}'
]
-
Template: 'qtci-windows-10_21H2-x86_64-51'
Compiler: 'MSVC2019'
Features: ['Sccache', 'MinimalStaticTests']
Configure arguments: '-G"Ninja" -DCMAKE_BUILD_TYPE="RelWithDebInfo" -DBUILD_SHARED_LIBS=OFF -DFEATURE_msvc_obj_debug_info=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF'
Environment variables: [
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}'
]
-
Template: 'qtci-macos-11-x86_64-104'
Compiler: 'Clang'
Features: ['Sccache', 'MinimalStaticTests']
Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_SHARED_LIBS=OFF -DFEATURE_framework=OFF'

View File

@@ -0,0 +1,55 @@
Version: 2
Configurations:
-
Template: 'qtci-linux-RHEL-8.4-x86_64-50'
Target os: 'Android_ANY'
Target arch: 'arm64'
Compiler: 'GCC'
Target compiler: 'Clang'
Platform dependency: 'RHEL-8.4-host'
Features: ['Packaging', 'Sccache', 'DisableTests']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=arm64-v8a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}',
'CONAN_HOST_PROFILE=coin/conan/profiles/linux-x86_64-gcc',
'CONAN_PROFILE=coin/conan/profiles/unix-android-arm64-clang'
]
-
Template: 'qtci-linux-RHEL-8.4-x86_64-50'
Target os: 'Android_ANY'
Target arch: 'armv7'
Compiler: 'GCC'
Target compiler: 'Clang'
Platform dependency: 'RHEL-8.4-host'
Features: ['Packaging', 'Sccache', 'DisableTests']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=armeabi-v7a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}',
'CONAN_HOST_PROFILE=coin/conan/profiles/linux-x86_64-gcc',
'CONAN_PROFILE=coin/conan/profiles/unix-android-armv7-clang'
]
-
Template: 'qtci-linux-RHEL-8.4-x86_64-50'
Target os: 'Android_ANY'
Target arch: 'x86'
Compiler: 'GCC'
Target compiler: 'Clang'
Platform dependency: 'RHEL-8.4-host'
Features: ['Packaging', 'Sccache', 'DisableTests']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}',
'CONAN_HOST_PROFILE=coin/conan/profiles/linux-x86_64-gcc',
'CONAN_PROFILE=coin/conan/profiles/unix-android-x86-clang'
]
-
Template: 'qtci-linux-RHEL-8.4-x86_64-50'
Target os: 'Android_ANY'
Target arch: 'x86_64'
Compiler: 'GCC'
Target compiler: 'Clang'
Platform dependency: 'RHEL-8.4-host'
Features: ['Packaging', 'Sccache', 'DisableTests']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=x86_64 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}',
'CONAN_HOST_PROFILE=coin/conan/profiles/linux-x86_64-gcc',
'CONAN_PROFILE=coin/conan/profiles/unix-android-x86_64-clang'
]

View File

@@ -0,0 +1,55 @@
Version: 2
Configurations:
-
Template: 'qtci-macos-10.14-x86_64'
Target os: 'Android_ANY'
Target arch: 'arm64'
Compiler: 'Clang'
Target compiler: 'Clang'
Platform dependency: 'macos-latest-xcode-universal-packaging-build'
Features: ['Packaging', 'Sccache', 'DisableTests']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=arm64-v8a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}',
'CONAN_HOST_PROFILE=coin/conan/profiles/macos-universal-clang',
'CONAN_PROFILE=coin/conan/profiles/unix-android-arm64-clang'
]
-
Template: 'qtci-macos-10.14-x86_64'
Target os: 'Android_ANY'
Target arch: 'armv7'
Compiler: 'Clang'
Target compiler: 'Clang'
Platform dependency: 'macos-latest-xcode-universal-packaging-build'
Features: ['Packaging', 'Sccache', 'DisableTests']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=armeabi-v7a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}',
'CONAN_HOST_PROFILE=coin/conan/profiles/macos-universal-clang',
'CONAN_PROFILE=coin/conan/profiles/unix-android-armv7-clang'
]
-
Template: 'qtci-macos-10.14-x86_64'
Target os: 'Android_ANY'
Target arch: 'x86'
Compiler: 'Clang'
Target compiler: 'Clang'
Platform dependency: 'macos-latest-xcode-universal-packaging-build'
Features: ['Packaging', 'Sccache', 'DisableTests']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}',
'CONAN_HOST_PROFILE=coin/conan/profiles/macos-universal-clang',
'CONAN_PROFILE=coin/conan/profiles/unix-android-x86-clang'
]
-
Template: 'qtci-macos-10.14-x86_64'
Target os: 'Android_ANY'
Target arch: 'x86_64'
Compiler: 'Clang'
Target compiler: 'Clang'
Platform dependency: 'macos-latest-xcode-universal-packaging-build'
Features: ['Packaging', 'Sccache', 'DisableTests']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=x86_64 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}',
'CONAN_HOST_PROFILE=coin/conan/profiles/macos-universal-clang',
'CONAN_PROFILE=coin/conan/profiles/unix-android-x86_64-clang'
]

View File

@@ -0,0 +1,50 @@
Version: 2
Configurations:
-
Template: 'qtci-windows-10_21H2-x86_64-51'
Target os: 'Android_ANY'
Target arch: 'arm64'
Compiler: 'Mingw'
Target compiler: 'Clang'
Platform dependency: 'Windows10_21H2-Mingw11-x64-host'
Features: ['Packaging', 'Sccache', 'DisableTests']
Environment variables: [
'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=arm64-v8a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DFEATURE_pkg_config=OFF',
]
-
Template: 'qtci-windows-10_21H2-x86_64-51'
Target os: 'Android_ANY'
Target arch: 'armv7'
Compiler: 'Mingw'
Target compiler: 'Clang'
Platform dependency: 'Windows10_21H2-Mingw11-x64-host'
Features: ['Packaging', 'Sccache', 'DisableTests']
Environment variables: [
'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=armeabi-v7a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DFEATURE_pkg_config=OFF',
]
-
Template: 'qtci-windows-10_21H2-x86_64-51'
Target os: 'Android_ANY'
Target arch: 'x86'
Compiler: 'Mingw'
Target compiler: 'Clang'
Platform dependency: 'Windows10_21H2-Mingw11-x64-host'
Features: ['Packaging', 'Sccache', 'DisableTests']
Environment variables: [
'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DFEATURE_pkg_config=OFF',
]
-
Template: 'qtci-windows-10_21H2-x86_64-51'
Target os: 'Android_ANY'
Target arch: 'x86_64'
Compiler: 'Mingw'
Target compiler: 'Clang'
Platform dependency: 'Windows10_21H2-Mingw11-x64-host'
Features: ['Packaging', 'Sccache', 'DisableTests']
Environment variables: [
'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=x86_64 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DFEATURE_pkg_config=OFF',
]

View File

@@ -0,0 +1,39 @@
Version: 2
Configurations:
-
Template: 'qtci-linux-openSUSE-15.3-x86_64-50'
Target os: 'WebAssembly'
Compiler: 'GCC'
Platform dependency: 'OpenSUSE-15.3-host'
Features: ['Packaging', 'Sccache', 'DisableTests']
Environment variables: [
'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
'TARGET_CONFIGURE_ARGS=-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=Release',
]
-
Template: 'qtci-windows-10_21H2-x86_64-51'
Target os: 'WebAssembly'
Compiler: 'Mingw'
Target compiler: 'Clang'
Platform dependency: 'Windows10_21H2-Mingw11-x64-host'
Features: ['Packaging', 'Sccache', 'DisableTests']
Environment variables: [
'Path={{.Env.EMSDK_PATH}};{{.Env.MINGW1120}}\bin;{{.Env.Path}}',
'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
'TARGET_CONFIGURE_ARGS=-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=Release',
'-DFEATURE_pkg_config=OFF'
]
-
Template: 'qtci-macos-10.14-x86_64'
Target os: 'WebAssembly'
Compiler: 'Clang'
Target compiler: 'Clang'
Platform dependency: 'macos-latest-xcode-universal-packaging-build'
Features: ['Packaging', 'Sccache', 'DisableTests']
Environment variables: [
'EM_CONFIG={{.Env.EMSDK}}/.emscripten',
'TARGET_CONFIGURE_ARGS=-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=Release',
'CONAN_HOST_PROFILE=coin/conan/profiles/linux-developer-x86_64-gcc',
'CONAN_PROFILE=coin/conan/profiles/linux-webassembly-x86_64-gcc'
]

View File

@@ -1,27 +0,0 @@
Template Target OS Target arch Compiler Features
----------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
qtci-windows-8.1-x86_64 MSVC2013 DeveloperBuild Release DisableTests
qtci-windows-10-x86_64-10 MSVC2015 DeveloperBuild Release QtNamespace QtLibInfix BuildExamples
qtci-windows-7-x86-3 Mingw53 DeveloperBuild Release OpenGLDynamic
qtci-windows-10-x86_64-10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
qtci-windows-10-x86_64-10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-linux-Ubuntu-16.04-x86_64-2 GCC NoWidgets ForceDebugInfo
qtci-linux-Ubuntu-16.04-x86_64-2 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples Documentation
qtci-linux-openSUSE-42.3-x86_64 GCC DeveloperBuild NoPch
qtci-linux-openSUSE-42.3-x86_64 ICC_18 DeveloperBuild NoPch DisableTests SystemSQLite
qtci-linux-RHEL-6.6-x86_64 GCC Release ForceDebugInfo
qtci-linux-RHEL-7.4-x86_64 GCC Packaging Release NoUseGoldLinker
qtci-macos-10.12-x86_64-8 Clang Packaging DebugAndRelease Release
qtci-osx-10.11-x86_64-3 Clang DeveloperBuild Release QtNamespace NoPch
qtci-osx-10.10-x86_64 Clang Release NoFramework DisableTests
qtci-macos-10.12-x86_64-8 IOS_ANY multi Clang Release DisableTests Static
qtci-macos-10.12-x86_64-8 TvOS_ANY multi Clang Release DisableTests
qtci-macos-10.12-x86_64-8 WatchOS_ANY multi Clang Release DisableTests
qtci-linux-RHEL-7.4-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
qtci-linux-Ubuntu-16.04-x86_64-2 QEMU armv7 GCC Release
qtci-linux-Ubuntu-16.04-x86_64-2 QEMU arm64 GCC Release
qtci-linux-Ubuntu-16.04-x86_64-2 GCC TestOnly LicenseCheck
qtci-linux-RHEL-6.6-x86_64 QNX_660 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
qtci-linux-RHEL-7.4-x86_64 INTEGRITY_11_04 armv7 GCC Release DisableTests OpenGLES2 NoUseGoldLinker

View File

@@ -0,0 +1,6 @@
Version: 2
Configurations:
-
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Compiler: 'GCC'
Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions']

View File

@@ -0,0 +1,4 @@
Version: 2
Module only: True
Include: [cmake_platforms.yaml]
Configurations: []

View File

@@ -0,0 +1,39 @@
Version: 2
Module only: True
Configurations:
-
Template: 'qtci-windows-10-x86_64-52'
Compiler: 'MSVC2019'
Features: ['Packaging', 'UseLegacyInstructions']
Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -static -no-icu'
-
Template: 'qtci-windows-10_21H2-x86_64-51'
Compiler: 'MSVC2019'
Features: ['Packaging', 'UseLegacyInstructions']
Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64% -static -no-icu'
-
Template: 'qtci-windows-10-x86_64-52'
Compiler: 'MSVC2019'
Target arch: 'x86'
Features: ['Packaging', 'UseLegacyInstructions']
Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -static -no-icu'
-
Template: 'qtci-windows-10_21H2-x86_64-51'
Compiler: 'MSVC2019'
Target arch: 'x86'
Features: ['Packaging', 'UseLegacyInstructions']
Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -static -no-icu'
-
Template: 'qtci-linux-RHEL-8.4-x86_64-50'
Compiler: 'GCC'
Features: ['Packaging', 'UseLegacyInstructions']
Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -openssl -qt-harfbuzz QMAKE_LFLAGS_APP+=-s -static -no-icu'
-
Template: 'qtci-linux-Ubuntu-18.04-x86_64-50'
Compiler: 'GCC'
Features: ['Packaging', 'UseLegacyInstructions']
Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -openssl -qt-harfbuzz QMAKE_LFLAGS_APP+=-s -static -no-icu'
-
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Compiler: 'GCC'
Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions']

View File

@@ -0,0 +1,17 @@
Version: 2
Configurations:
-
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Compiler: 'GCC'
Target os: 'INTEGRITY'
Platform dependency: 'Ubuntu-20.04-host'
Features: ['MinimalStaticTests', 'DoNotRunTests', 'VMSize16']
Environment variables: [
'TARGET_CONFIGURE_ARGS={{.Env.TARGET_CONFIGURE_ARGS}} -DQT_HOST_PATH=/home/qt/work/install -DQT_BUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE=/home/qt/integrity_toolchain/toolchain.cmake -DQT_QMAKE_TARGET_MKSPEC=devices/integrity-armv8-SA8155P -DINPUT_harfbuzz=no -DFEATURE_library=OFF -DBUILD_qtdoc=OFF -DBUILD_qttranslations=OFF -DFEATURE_printdialog=OFF --debug-trycompile -DFEATURE_quick3d_assimp=OFF -DFEATURE_dbus=OFF -GNinja -DUNIX=ON -DFEATURE_gtk3=OFF -DFEATURE_glib=OFF -DFEATURE_libudev=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_sql_mysql=OFF -DCMAKE_C_COMPILER=cxintarm64 -DCMAKE_CXX_COMPILER=cxintarm64',
'INTEGRITY_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/integrity',
'INTEGRITY_BSP=platform-sa8155', 'INTEGRITY_BUILD_TARGET=rel',
'QC_MULTIMEDIA_INC_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/include/amss/multimedia',
'GL_INC_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/AMSS/multimedia/graphics/include/public',
'GL_LIB_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/base:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/multimedia/display:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/multimedia/graphics:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/platform/:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/AMSS/multimedia/graphics/opengl/esx/build/integrity/prebuilt/',
'PATH=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/comp:$PATH',
'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DFEATURE_system_webp=OFF']

View File

@@ -0,0 +1,12 @@
Version: 2
Configurations:
-
Id: "ios-tests-target"
Template: 'qtci-macos-10.14-x86_64'
Target os: 'IOS_ANY'
Target arch: 'arm64'
Compiler: 'Clang'
Target compiler: 'Clang'
Platform dependency: 'macos-latest-xcode-universal-packaging-build'
Features: ['Sccache', 'DebugAndRelease', 'MinimalStaticTests']
Environment variables: ['TARGET_CONFIGURE_ARGS=-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="Release;Debug" -DQT_BUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS', 'NON_QTBASE_TARGET_CONFIGURE_ARGS=']

View File

@@ -0,0 +1,16 @@
Version: 2
Configurations:
-
Template: 'qtci-linux-RHEL-8.4-x86_64-50'
Target os: 'Android_ANY'
Target arch: 'x86'
Compiler: 'GCC'
Target compiler: 'Clang'
Platform dependency: 'RHEL-8.4-host'
Features: ['Packaging', 'Sccache', 'AndroidTestRun']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}',
'CONAN_HOST_PROFILE=coin/conan/profiles/linux-x86_64-gcc',
'CONAN_INSTALL_DIR={{.InstallDir}}/target',
'CONAN_PROFILE=coin/conan/profiles/unix-android-x86-clang',
'ANDROID_EMULATOR=@emulator_x86_api_23']

View File

@@ -0,0 +1,30 @@
Version: 2
Configurations:
# These developer-build tests are only run for qtbase and qtdeclarative
# See macos.yaml for arm64 developer-build tests, run for all modules.
-
Id: 'macos-10.14-x86_64-developer-build-tests'
Template: 'qtci-macos-10.14-x86_64'
Compiler: 'Clang'
Features: ['Sccache', 'TestOnly']
Platform dependency: 'macos-latest-xcode-x86_64-developer-build'
-
Id: 'macos-10.15-x86_64-developer-build-tests'
Template: 'qtci-macos-10.15-x86_64-102'
Compiler: 'Clang'
Features: ['Sccache', 'TestOnly']
Platform dependency: 'macos-latest-xcode-x86_64-developer-build'
-
Id: 'macos-11-x86_64-developer-build-tests'
Template: 'qtci-macos-11-x86_64-104'
Compiler: 'Clang'
Features: ['Sccache', 'TestOnly']
Platform dependency: 'macos-latest-xcode-x86_64-developer-build'
-
Id: 'macos-12-x86_64-developer-build-tests'
Template: 'qtci-macos-12-x86_64-102'
Compiler: 'Clang'
Features: ['Sccache', 'TestOnly']
Platform dependency: 'macos-latest-xcode-x86_64-developer-build'

View File

@@ -0,0 +1,98 @@
Version: 2
Configurations:
# =========================================================================
# Packaging. Universal build with both x86_64 and arm64 architectures.
# =========================================================================
# Build on recent macOS version with latest Xcode
-
Id: 'macos-latest-xcode-universal-packaging-build'
Template: 'qtci-macos-12-x86_64-102'
Compiler: 'Clang'
Target arch: 'x86_64-arm64'
Features: ['Packaging', 'Sccache', 'DoNotRunTests', 'WarningsAreErrors']
Configure arguments: '-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_headersclean=ON -DFEATURE_framework=ON -DODBC_ROOT=/usr/local/opt/libiodbc -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/..'
Environment variables: [
'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_gds=OFF',
'CONAN_PROFILE=coin/conan/profiles/macos-universal-clang'
]
# Test on all supported macOS versions (deployment targets)
-
Id: 'macos-10.14-x86_64-tests'
Template: 'qtci-macos-10.14-x86_64'
Compiler: 'Clang'
Features: ['Sccache', 'TestOnly', 'Packaging']
Platform dependency: 'macos-latest-xcode-universal-packaging-build'
-
Id: 'macos-10.15-x86_64-tests'
Template: 'qtci-macos-10.15-x86_64-102'
Compiler: 'Clang'
Features: ['Sccache', 'TestOnly', 'Packaging']
Platform dependency: 'macos-latest-xcode-universal-packaging-build'
-
Id: 'macos-11-x86_64-tests'
Template: 'qtci-macos-11-x86_64-104'
Compiler: 'Clang'
Features: ['Sccache', 'TestOnly', 'Packaging']
Platform dependency: 'macos-latest-xcode-universal-packaging-build'
-
Id: 'macos-11-arm64-tests'
Template: 'qtci-macos-11.0-arm64'
Compiler: 'Clang'
Features: ['Sccache', 'TestOnly', 'Packaging']
Platform dependency: 'macos-latest-xcode-universal-packaging-build'
-
Id: 'macos-12-arm64-tests'
Template: 'qtci-macos-12-arm64'
Compiler: 'Clang'
Features: ['Sccache', 'TestOnly', 'Packaging']
Platform dependency: 'macos-latest-xcode-universal-packaging-build'
-
Id: 'macos-12-x86_64-tests'
Template: 'qtci-macos-12-x86_64-102'
Compiler: 'Clang'
Features: ['Sccache', 'TestOnly', 'Packaging']
Platform dependency: 'macos-latest-xcode-universal-packaging-build'
# =========================================================================
# Developer build. Single architecture builds.
# =========================================================================
# Build on recent macOS version with latest Xcode
-
Id: 'macos-latest-xcode-x86_64-developer-build'
Template: 'qtci-macos-12-x86_64-102'
Compiler: 'Clang'
Features: ['Sccache', 'DoNotRunTests', 'WarningsAreErrors']
Configure arguments: '-DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_WITH_PCH=OFF -DFEATURE_framework=OFF -DQT_NAMESPACE=TestNamespace -DQT_BUILD_EXAMPLES=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}'
-
Id: 'macos-latest-xcode-arm64-developer-build'
Template: 'qtci-macos-12-arm64'
Compiler: 'Clang'
Features: ['DoNotRunTests', 'WarningsAreErrors']
Configure arguments: '-DFEATURE_developer_build=ON -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_framework=ON'
# Note: We do not include OpenSSL or PostgreSQL in this build,
# as the M1 CI machines are not provisioned for that yet.
# Test on all supported macOS versions (deployment targets)
-
Id: 'macos-11-arm64-developer-build-tests'
Template: 'qtci-macos-11.0-arm64'
Compiler: 'Clang'
Features: ['TestOnly']
Platform dependency: 'macos-latest-xcode-arm64-developer-build'
-
Id: 'macos-12-arm64-developer-build-tests'
Template: 'qtci-macos-12-arm64'
Compiler: 'Clang'
Features: ['TestOnly']
Platform dependency: 'macos-latest-xcode-arm64-developer-build'
# See macos-developer-build-tests.yaml for x86_64 tests,
# as we limit those to qtbase and declarative.

View File

@@ -0,0 +1,43 @@
Version: 2
Module only: True
Configurations:
-
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Compiler: 'Yocto'
Target arch: 'TARGET1'
-
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Compiler: 'Yocto'
Target arch: 'TARGET2'
-
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Compiler: 'Yocto'
Target arch: 'TARGET3'
-
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Compiler: 'Yocto'
Target arch: 'TARGET4'
-
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Compiler: 'Yocto'
Target arch: 'TARGET5'
-
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Compiler: 'Yocto'
Target arch: 'TARGET6'
-
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Compiler: 'Yocto'
Target arch: 'TARGET7'
-
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Compiler: 'Yocto'
Target arch: 'TARGET8'
-
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Compiler: 'Yocto'
Target arch: 'TARGET9'
-
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Compiler: 'Yocto'
Target arch: 'TARGET10'

View File

@@ -0,0 +1,4 @@
Version: 2
Module only: True
Include: [meta-boot2qt.yaml]
Configurations: []

View File

@@ -0,0 +1 @@
qt5.yaml

View File

@@ -0,0 +1,9 @@
Version: 2
Module only: True
Include: [cmake_platforms.yaml]
Configurations:
-
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Compiler: 'GCC'
Features: ['TestOnly', 'LicenseCheck']

View File

@@ -0,0 +1,30 @@
Version: 2
Configurations:
-
Template: 'qtci-windows-10-x86_64-52'
Compiler: 'MSVC2019'
Features: ['Packaging', 'Sccache', 'MinimalStaticTests']
Configure arguments: '-G"Ninja" -DCMAKE_BUILD_TYPE="RelWithDebInfo" -DBUILD_SHARED_LIBS=OFF -DFEATURE_icu=OFF -DFEATURE_system_doubleconversion=OFF -DFEATURE_msvc_obj_debug_info=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF'
Environment variables: [
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}'
]
-
Template: 'qtci-windows-10_21H2-x86_64-51'
Compiler: 'MSVC2019'
Features: ['Packaging', 'Sccache', 'MinimalStaticTests']
Configure arguments: '-G"Ninja" -DCMAKE_BUILD_TYPE="RelWithDebInfo" -DBUILD_SHARED_LIBS=OFF -DFEATURE_icu=OFF -DFEATURE_system_doubleconversion=OFF -DFEATURE_msvc_obj_debug_info=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF'
Environment variables: [
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}'
]
-
Id: 'RHEL-8.4-host'
Template: 'qtci-linux-RHEL-8.4-x86_64-50'
Compiler: 'GCC'
Features: ['Packaging', 'Sccache', 'MinimalStaticTests']
Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF -DFEATURE_system_jpeg=OFF -DFEATURE_system_png=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_system_harfbuzz=OFF -DFEATURE_system_doubleconversion=OFF -DFEATURE_libudev=OFF -DINPUT_bundled_xcb_xinput=yes -DFEATURE_icu=OFF -DFEATURE_sql_mysql=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}'
-
Id: 'macOS-11.0'
Template: 'qtci-macos-11.0-x86_64-102'
Compiler: 'Clang'
Features: ['Packaging', 'Sccache', 'MinimalStaticTests']
Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUILD_SHARED_LIBS=OFF -DFEATURE_icu=OFF -DFEATURE_system_doubleconversion=OFF -DFEATURE_framework=OFF'

View File

@@ -0,0 +1,3 @@
Version: 2
Include: [cmake_platforms.yaml]
Configurations: []

View File

@@ -0,0 +1,39 @@
Version: 2
Module only: True
Configurations:
-
Template: 'qtci-windows-10_21H2-x86_64-51'
Compiler: 'MSVC2019'
Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests']
Configure arguments: ''
Environment variables: []
Environment script: ['%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64']
-
Template: 'qtci-windows-10-x86-4'
Compiler: 'MSVC2019'
Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests']
Configure arguments: ''
Environment variables: []
Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'x86']
-
Template: 'qtci-linux-RHEL-8.4-x86_64-50'
Compiler: 'GCC'
Features: ['Packaging', 'Sccache', 'DisableTests']
Configure arguments: ''
Environment variables: []
-
Template: 'qtci-linux-RHEL-8.4-x86_64-50'
Compiler: 'GCC'
Features: ['Qt5', 'Sccache', 'DebugAndRelease', 'DisableTests']
Configure arguments: ''
Environment variables: []
-
Template: 'qtci-macos-10.14-x86_64'
Compiler: 'Clang'
Features: ['Packaging', 'DisableTests', 'Sccache', 'DebugAndRelease']
Configure arguments: ''
Environment variables: []
-
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
Compiler: 'GCC'
Features: ['TestOnly', 'LicenseCheck']

View File

@@ -0,0 +1 @@
qt5.yaml

View File

@@ -0,0 +1,6 @@
Version: 2
Include: [
cmake_platforms.yaml,
linux_android_tests.yaml
]
Configurations: []

View File

@@ -1,26 +0,0 @@
Template Target OS Target arch Compiler Features
--------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
qtci-windows-8.1-x86_64 x86 MSVC2013 DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests
qtci-windows-8.1-x86_64 MSVC2013 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests
qtci-windows-10-x86_64-10 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-windows-10-x86-6 MSVC2017 DebugAndRelease Release ForceDebugInfo OpenGLDynamic
qtci-windows-10-x86_64-10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-windows-7-x86-3 Mingw53 Packaging DebugAndRelease Release OpenGLDynamic DisableTests
qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-windows-10-x86_64-10 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
qtci-windows-7-x86-3 Android_ANY armv7 Mingw53 Packaging Release DisableTests OpenGLES2
qtci-windows-7-x86-3 Android_ANY x86 Mingw53 Packaging Release DisableTests OpenGLES2
qtci-macos-10.12-x86_64-8 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2
qtci-macos-10.12-x86_64-8 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2
qtci-linux-RHEL-6.6-x86_64 QNX_660 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
qtci-macos-10.12-x86_64-8 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static
qtci-macos-10.12-x86_64-8 TvOS_ANY multi Clang DebugAndRelease DisableTests
qtci-macos-10.12-x86_64-8 WatchOS_ANY multi Clang DebugAndRelease DisableTests
qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw53 Release DisableTests OpenGLES2
qtci-windows-10-x86_64-10 QNX_700 x86 Mingw53 Release DisableTests OpenGLES2
qtci-windows-10-x86_64-10 QNX_660 armv7 Mingw53 Packaging Release DisableTests OpenGLES2
qtci-windows-10-x86_64-10 QNX_660 x86 Mingw53 Packaging Release DisableTests OpenGLES2
qtci-linux-RHEL-7.4-x86_64 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker
qtci-linux-RHEL-7.4-x86_64 QNX_700 armv7 GCC Release DisableTests OpenGLES2 NoUseGoldLinker

View File

@@ -0,0 +1,3 @@
Version: 2
Include: [cmake_platforms.yaml]
Configurations: []

View File

@@ -0,0 +1,6 @@
Version: 2
Include: [
cmake_platforms.yaml,
linux_android_tests.yaml
]
Configurations: []

View File

@@ -0,0 +1,3 @@
Version: 2
Include: [cmake_platforms.yaml]
Configurations: []

View File

@@ -0,0 +1,3 @@
Version: 2
Include: [cmake_platforms.yaml]
Configurations: []

View File

@@ -1,4 +0,0 @@
Template Target OS Target arch Compiler Features
--------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
qtci-linux-Ubuntu-16.04-x86_64-2 QEMU armv7 GCC DeveloperBuild DisableTests
qtci-linux-Ubuntu-16.04-x86_64-2 QEMU arm64 GCC DeveloperBuild DisableTests

View File

@@ -0,0 +1,10 @@
Version: 2
Include: [
cmake_platforms.yaml,
cmake_platforms_static_tests.yaml,
macos-developer-build-tests.yaml,
integrity.yaml,
ios-tests.yaml,
linux_android_tests.yaml
]
Configurations: []

View File

@@ -0,0 +1,3 @@
Version: 2
Include: [cmake_platforms.yaml]
Configurations: []

View File

@@ -0,0 +1,3 @@
Version: 2
Include: [cmake_platforms.yaml]
Configurations: []

View File

@@ -0,0 +1,6 @@
Version: 2
Include: [
cmake_platforms.yaml,
linux_android_tests.yaml
]
Configurations: []

View File

@@ -0,0 +1,3 @@
Version: 2
Include: [cmake_platforms.yaml]
Configurations: []

View File

@@ -1,4 +0,0 @@
Template Target OS Target arch Compiler Features
--------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
qtci-linux-Ubuntu-16.04-x86_64-2 QEMU armv7 GCC DeveloperBuild
qtci-linux-Ubuntu-16.04-x86_64-2 QEMU arm64 GCC DeveloperBuild

View File

@@ -0,0 +1,9 @@
Version: 2
Include: [
cmake_platforms.yaml,
macos-developer-build-tests.yaml,
cmake_platforms_static_tests.yaml,
integrity.yaml,
linux_android_tests.yaml
]
Configurations: []

View File

@@ -0,0 +1,3 @@
Version: 2
Include: [cmake_platforms.yaml]
Configurations: []

View File

@@ -0,0 +1,3 @@
Version: 2
Include: [cmake_platforms.yaml]
Configurations: []

View File

@@ -0,0 +1,3 @@
Version: 2
Include: [cmake_platforms.yaml]
Configurations: []

View File

@@ -0,0 +1,7 @@
Version: 2
Include: [
cmake_platforms.yaml,
integrity.yaml,
linux_android_tests.yaml
]
Configurations: []

View File

@@ -0,0 +1,3 @@
Version: 2
Include: [cmake_platforms.yaml]
Configurations: []

View File

@@ -0,0 +1,3 @@
Version: 2
Include: [cmake_platforms.yaml]
Configurations: []

View File

@@ -0,0 +1,3 @@
Version: 2
Include: [cmake_platforms.yaml]
Configurations: []

View File

@@ -0,0 +1,3 @@
Version: 2
Include: [cmake_platforms.yaml]
Configurations: []

View File

@@ -0,0 +1,6 @@
Version: 2
Include: [
cmake_platforms.yaml,
linux_android_tests.yaml
]
Configurations: []

View File

@@ -0,0 +1,3 @@
Version: 2
Include: [cmake_platforms.yaml]
Configurations: []

View File

@@ -0,0 +1,3 @@
Version: 2
Include: [cmake_platforms.yaml]
Configurations: []

Some files were not shown because too many files have changed in this diff Show More