Commit Graph

4299 Commits

Author SHA1 Message Date
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>
v6.0.0-beta3
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>
v6.0.0-beta2
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>
v6.0.0-beta1
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