Commit Graph

4264 Commits

Author SHA1 Message Date
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
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>
v6.0.0-alpha1
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