Commit Graph

512 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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