Commit Graph

1589 Commits

Author SHA1 Message Date
Dan Ackers
80d0b2a91b Make QNX-toolchain files git-tracked
Also, qnx now builds only using toolchain
packages, ignoring host mahcine.

Pick-to: 6.2
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>
2021-09-28 20:22:07 +03:00
Tor Arne Vestbø
5137b415a1 coin: Add explicit OpenSSL location during configure for macOS
This basically reverts 15e37e994d, as we
now have support for multiple TLS backends.

Task-number: QTBUG-93205
Change-Id: I7466121c21c459bb7aee70f9f7c224cc079d16a5
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
2021-09-28 14:03:45 +02:00
Topi Reinio
74bc9ea94d coin: Ensure provisioned qdoc has proper permissions
The testing steps are done with the 'qt' user, so modify the ownership
and permissions when extracting the binaries.

Also update the version of the package itself.

Task-number: QTBUG-83851
Change-Id: I6d5318572e34c99637421e527d1e07286e55bfab
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
2021-09-27 12:47:20 +00:00
Joerg Bornemann
38c0e1a014 CI: Turn harfbuzz support off for INTEGRITY
The INTEGRITY toolchain file in the CI does not set
CMAKE_FIND_ROOT_PATH_MODE-like variables and CMake ends up finding the
host libharfbuzz, causing the build of applications that use QtGui (or
any module that depends on it) to break.

Task-number: QTQAINFRA-4502
Change-Id: I64bd53a3cb30529898e7dd97502cb25229073f15
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-09-27 11:46:04 +02:00
Alexandru Croitor
551c838bad 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.

Pick-to: 6.2 6.2.0
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>
2021-09-24 15:19:07 +02:00
Joerg Bornemann
420adf322a CI: Turn dbus support off for QNX_710
The QNX toolchain file in the CI does not set
CMAKE_FIND_ROOT_PATH_MODE-like variables and CMake ends up finding the
host libdbus, causing the build of applications that use QtDBus (or any
module that depends on it) to break.

Fixes: QTBUG-96791
Task-number: QTQAINFRA-4502
Change-Id: I381747f15135fe65777985742dca0fd102583941
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-09-24 15:19:07 +02:00
Topi Reinio
f0b4d1c8f5 coin: Update provisioned binaries for qdoc, qtattributionsscanner
Also, change the install directory - attempting to install directly
to Qt's installdir won't work as it gets overwritten by modules'
binary packages.

Task-number: QTBUG-83851
Change-Id: I96cd95f99322d1278d066d22965e54cf3c7701b4
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
2021-09-24 10:50:11 +02:00
Jani Heikkinen
74234e3fa4 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
Change-Id: I3625c06b14c633d77f1628ae0cda3092284eabd6
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
(cherry picked from commit 2fd650b973)
2021-09-10 17:14:35 +03:00
Samuli Piippo
663ebcb102 Add zstd to Ubuntu 20.04
Needed for bitbake.

Change-Id: Ib7be3a971b970311adca25f46238d3fae838cba9
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-09-10 10:57:27 +03:00
Heikki Halmet
f320433979 Provisioning: Update the Integrity toolchain version
Pick-to: 6.2
Task-number: QTQAINFRA-3555
Change-Id: I2a1f25024862b0b96bb7675376520d2e3a679d0b
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-09-07 11:31:14 +03:00
Iikka Eklund
d68e108b94 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>
2021-09-06 13:58:10 +03:00
Heikki Halmet
4d617e24ee Add provisioning scripts for macOS 11.0 ARM
Task-number: QTQAINFRA-4263
Task-number: QTQAINFRA-4012
Pick-to: 6.2
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>
2021-09-03 13:14:16 +03:00
Eike Ziller
1f3bdc686e COIN/Qt Creator: Only have one RHEL configuration
No need to have multiple RHEL configurations for Qt Creator.
Remove 8.2 since that will be removed for Qt as well.
Make the "Features" consistent.

Follow-up of cca8ac0023

Change-Id: Ie64578a22262c45b5ed9c2679b3072c958218bcf
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2021-08-30 11:09:03 +02:00
Alexandru Croitor
f0c7664195 Build minimal subset of tests in qtdeclarative desktop static builds
Pick-to: 6.2
Task-number: QTBUG-87580
Change-Id: I417dbfc9b9b3092c9c14227907db4f1c16124ef1
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2021-08-27 10:53:23 +02:00
Alexandru Croitor
4fea3be3af 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.

Pick-to: 6.2
Task-number: QTBUG-95839
Change-Id: Ie1aa6deb202c9b84ce0c14b0f851f38a3a71fe7b
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2021-08-26 20:17:07 +02:00
Heikki Halmet
8dcbfc526e Set ulimit also for grapchical login
Graphical login requires DefaultLimitNOFILE=4096
to be set in user.conf.

Task-number: COIN-699
Pick-to: 6.2
Change-Id: Ia07e834ebcffa2ed24a7c211255a4c4c5a10ca10
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-08-26 21:17:07 +03:00
Assam Boudjelthia
6ac98447b5 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.

Pick-to: 6.2 5.15
Change-Id: Iac58b7250d7cb639a4d760cf12e7630c9d0b77cc
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2021-08-26 07:54:17 +00:00
Heikki Halmet
f824365cb5 Upgrade Xcode and Command line tools to the latest version for Big Sur
Latest version is 12.5.1

Pick-to: 6.2
Change-Id: I86111d5fdab6e06201f1184bbd23806d25eed192
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-08-23 23:59:49 +03:00
Heikki Halmet
cca8ac0023 Remove Insignificant flags from Rhel 8.4 targets
Task-number: QTQAINFRA-4516
Change-Id: Ib508de80d6cb22c5d3a8a5faf2b9614355053827
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-08-23 12:13:03 +03:00
Tony Sarajärvi
426bab28a8 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>
2021-08-23 08:12:43 +03:00
Eike Ziller
bbd31689ec 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.

Pick-to: 6.2
Change-Id: I13425f08c2f51a1522da25804fc7883f8d817059
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
2021-08-19 11:56:03 +02:00
Allan Sandfeld Jensen
c4b8c908b6 Update node.js to 12
For Ubuntu it means using an alternative packages, for
openSUSE not using an alternative package.

Pick-to: 6.2
Change-Id: I09085428db083adc1ff1d68f384cd19c83605bfd
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-08-18 11:31:42 +02:00
Eike Ziller
f945fdc735 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

Pick-to: 6.2
Change-Id: Id3329ca481b7743b4d40dad8faaa62285dbe53b0
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-08-17 10:17:26 +02:00
Topi Reinio
e8a86ab6c8 Provision qdoc and qtattributionsscanner
Provision documentation generators for Ubuntu 20.04, and add 'TestDocs'
feature to the configuration already used for generating documentation.

This is to allow building docs during the testing cycle to block
integrations that introduce new documentation warnings, without the
need to add a dependency to qttools.

Pick-to: 6.2
Fixes: QTBUG-83851
Change-Id: I74d7daeb7abb49403e97af41b0521f903607ce55
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
2021-08-16 11:21:31 +02:00
Tony Sarajärvi
dcab4e83f3 Revert "Replace SLES 15 SP2 with SP3"
This reverts commit 5ecf01ade7.

Reason for revert: Wicked doesn't work well with our Windows 2012's DHCP

Change-Id: I062fbfb50a68af308db9cb810583ca85c2c3e627
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-08-16 07:18:13 +00:00
Tony Sarajärvi
a12bc9e78c Update llvm-mingw to version 12
Task-number: QTQAINFRA-4526
Change-Id: I9a9dbc72bb4a6d1d751b0bbfbe0ed5d93113606f
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-08-13 07:14:15 +00:00
Heikki Halmet
9ff48e5585 Add Red Hat 8.4 to CI
Red Hat 8.4 will be added as parallel with Red Hat 8.3 until packaging
site gives green light to remove the older Red Hat version.
Also targets which are not tested during Qt5 integration will be set
as Insignificant until proven to work

Task-number: QTQAINFRA-4516
Change-Id: I3d9543da315b3d93ee8d9e37389acaf7212b00f7
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-08-13 09:03:39 +03:00
Heikki Halmet
beb8fcca5f Change locale to en_US and install all available language packages
These are needed for Android tests

Task-number: COIN-727
Pick-to: 6.2
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>
2021-08-12 20:14:41 +03:00
Mitch Curtis
9b3411da8d Remove qtquickcontrols2.yaml from platform_configs
Task-number: QTBUG-95173
Pick-to: 6.2
Change-Id: If7470b3d5cd5721def97fd5b41e46e037cec2286
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-08-12 17:44:44 +02:00
Alexandru Croitor
1256b4d504 Remove qtgraphicaleffects.yaml from platform_configs
Pick-to: 6.2
Task-number: QTBUG-95757
Change-Id: Ia83795bbc2ddef9532fd196d64776571e50c1d6c
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2021-08-12 15:43:31 +02:00
Tony Sarajärvi
5ecf01ade7 Replace SLES 15 SP2 with SP3
Task-number: QTQAINFRA-4498
Change-Id: I3d4ab50d16d7279cac771ac3a911af53489e2e2d
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-08-12 14:30:54 +03:00
Jani Suonpera
f573f15f03 Add platform configs for meta-qt5
Uses same configs as meta-boot2qt

Task-number: QTBUG-91354
Change-Id: I9ec77404e99404273e094308b9cef71ef73fb044
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-08-11 13:20:01 +03:00
Tor Arne Vestbø
f8fab3be9b 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)

Pick-to: 6.2
Change-Id: I728a2595987db0568568bbb8ca8117effca73997
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-08-11 08:16:52 +02:00
Alexandru Croitor
9218d50a6e CMake: Update provisioned CMake to version 3.21.1
Task-number: QTBUG-95018
Task-number: QTBUG-95229
Pick-to: 6.2
Change-Id: Ibed6ff323ca1633444ed29423ce1e94c99e68f77
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2021-08-06 20:30:36 +02:00
Kimmo Ollila
16ab287262 Add Integrity target for other modules
QtQuick3D, QtRemoteObjects, also enable Harfbuzz and Assimp

Change-Id: I26e0f60afad40e66f858f99e8e7c852ac5fd9fbb
Reviewed-by: Simo Fält <simo.falt@qt.io>
2021-07-29 08:19:41 +03:00
Kimmo Ollila
dd24bc25c9 Add Integrity target for other modules
QtDeclarative, QtImageFormats, QtShaderTools and QtQuickControls2

Change-Id: I24906d833d364a80025663928650f032a8618c22
Reviewed-by: Simo Fält <simo.falt@qt.io>
2021-07-28 07:54:00 +03:00
Simo Fält
9385d5d687 COIN: Fix integrity target configure arguments
Change-Id: I624feea29eb70dadb9e959d6056eaccd73b7169a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-07-28 07:53:26 +03:00
Kimmo Ollila
401ef8a8b3 Add Integrity target for QtSvg
Change-Id: Ic677c932151aeed9f72e49baba9038bf122e5b5b
Reviewed-by: Simo Fält <simo.falt@qt.io>
2021-07-27 09:50:52 +03:00
Alexandru Croitor
e8b0be7711 Provisioning: Install ninja 1.10.2 for Windows and macOS
To avoid error 'too many path components' when building Qt on Windows.

Pick-to: 6.2
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>
2021-07-23 10:18:23 +02:00
Simo Fält
b5c4effe7e 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>
2021-07-22 10:26:16 +03:00
Ulf Hermann
fab470c190 Coin: Add tqtc-qmlcachegenplus configuration file
Pick-to: 6.2
Change-Id: Ie66b837e95339ff6837ebfa83797716233bb8145
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-07-14 10:51:52 +02:00
Alexandru Croitor
d7c2951de0 CMake: Update provisioned CMake to version 3.20.5
Pick-to: 6.2
Change-Id: Id09eedf75b02b28dd94b0e3f858a05ebe8875679
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
2021-07-09 16:58:13 +02:00
Heikki Halmet
8fa865b37b Update Yocto toolchains
Task-number: QTQAINFRA-4459
Change-Id: I0a6144db1ca1ceb35791749bf5b056ced2307ab9
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 34d0ca0f39)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-07-08 09:01:53 +00:00
Allan Sandfeld Jensen
3f551fedd6 Add qtwebengine dependencies to provisioning
Pick-to: 6.2
Change-Id: If2cc949ce0669281d65995175480ac7cbd9fad74
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
2021-07-06 09:32:23 +02:00
Heikki Halmet
c9bc1ffc10 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.

Task-number: QTQAINFRA-4501
Change-Id: I31db800fa6814c3e7c1e649e2bbe3e3c80b9f4ce
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 675c9ad6c6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-07-01 15:19:48 +00:00
Tony Sarajärvi
e0eb04ecf8 Add execution attribute to provisioning scripts
Change-Id: Ia241a4211d24d2788f0f0ef9af55b23a6b227624
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-07-01 15:40:33 +03:00
Tony Sarajärvi
158cc96835 Remove ICC from provisioning
ICC hasn't been used in a while, so no point in installing it.

Change-Id: Iefbdee631d57c66e2156625daf333337f9163365
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-07-01 15:40:33 +03:00
Assam Boudjelthia
f1fcb89f26 Remove qtandroidextras.yaml from platform_configs
Following qtandroidextras removal in the commit
912fdda4a4, coin's  platform
config yaml file has to be removed.

Pick-to: 6.2
Task-number: QTBUG-84382
Change-Id: I8c3bc89938315ae8361d8d89ec6543d3699440ed
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
2021-06-29 11:55:04 +03:00
Heikki Halmet
ebf78374a7 Remove Insignificant flag from Windows ARM target
Task-number: QTQAINFRA-4452
Change-Id: I049dfb8df259fed40438ee08b339507bda3ed768
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 0a5e63dce9)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-06-28 09:21:05 +00:00
Jani Heikkinen
bae9580da1 Add missing wasm target build for windows and macOS hosts
Based on wasm maintainer these should work already

Pick-to: 6.2
Change-Id: Ifa9606546e6d04be824d5507306a8c6fb5f2d035
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-06-25 17:18:26 +10:00