Commit Graph

4789 Commits

Author SHA1 Message Date
Dan Ackers
96269c2d01 Rename new file for clarity
Pick-to: 6.2
Change-Id: I83428ef280cef73c3c0530feabb116973632ccd9
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-09-29 13:33:29 +03:00
Dan Ackers
cae9a1e8ef Integrity: git track toolchain file
Also make cmake find libraries only from toolchain

Pick-to: 6.2
Task-number: QTQAINFRA-4580
Change-Id: I5eabaa3b6915e16db6ce152591d3b88bc7483d29
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-09-28 20:22:07 +03:00
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
Qt Submodule Update Bot
7f0841f7fc Update submodules on 'dev in qt/qt5'
Change-Id: I11d860ea7f81cc9c3aed9441a71e81061e6c55e0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-09-28 05:03:20 +00: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
Qt Submodule Update Bot
7e68851205 Update submodules on 'dev in qt/qt5'
Change-Id: I2e5df346feb72c404db3b0e7fe261d313ac20494
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-09-25 00:27:14 +00: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
Qt Submodule Update Bot
f3db397fea Update submodules on 'dev in qt/qt5'
Change-Id: Iab95e8e734e315dcb17701fad39e85688e823941
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-09-17 03:14:58 +00: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
Qt Submodule Update Bot
3b6c8eea20 Update submodules on 'dev in qt/qt5'
Change-Id: I7647e58da9883cab47a9e80f404aa620563e5c29
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-09-09 20:33:47 +00: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
Qt Submodule Update Bot
456bc458e8 Update submodules on 'dev' in qt/qt5
Change-Id: I230ba9f0c6ac072bfb51192489421c0b5814685d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-09-03 07:00:55 +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
Qt Submodule Update Bot
5c960dbfa2 Update submodules on 'dev' in qt/qt5
Change-Id: Iac85cb223d3cd78292b4847c837737760b8e01ab
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-08-19 08:18:22 +03: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
Qt Submodule Update Bot
51c0f68cb9 Update submodules on 'dev' in qt/qt5
Change-Id: I0d37617fefa48416359fe24b023a642027d4d115
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-08-18 10:14:43 +03: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
Qt Submodule Update Bot
e3834034f8 Update submodules on 'dev' in qt/qt5
Change-Id: I27041bcba4b9dc89f0ec2b7c07ec54ddd4254adf
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-08-16 07:20:39 +03:00
Qt Submodule Update Bot
af28b76358 Update submodules on 'dev' in qt/qt5
Change-Id: Ia9ba8663e613b73e9d1d8d55cefafa136982fdff
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-08-14 09:33:46 +03: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
Qt Submodule Update Bot
887c368197 Update submodules on 'dev' in qt/qt5
Change-Id: I70c4e2f6dffc4a64e26294e5308e47e77789ee32
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-08-13 05:18:53 +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
Qt Submodule Update Bot
258d1c58ea Update submodules on 'dev' in qt/qt5
Change-Id: Ie77ec064d63626576aa53b5262ad6c8df05d0b0d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-08-12 16:43:31 +03: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
Qt Submodule Update Bot
3e8e0780ad Update submodules on 'dev' in qt/qt5
Change-Id: I44da14eb6c472f070af2afb9137bc31d8ed7bfc5
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
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
Joerg Bornemann
cec25d2ac6 Remove qtgraphicaleffects from .gitmodules
This repository has been merged into qt5compat.

Pick-to: 6.2
Fixes: QTBUG-95228
Change-Id: I07ad4302c874e25673b7644cc9b7f2b24cca3833
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
2021-08-10 12:37:49 +02:00
Joerg Bornemann
149cc2ebc0 Remove qtquickcontrols from .gitmodules
This repository is not available in Qt6.

Every repository that recommends qtquickcontrols should recommend
qtquickcontrols2 instead.  However, this has been merged into
qtdeclarative, which means that the existent dependencies on
qtdeclarative are sufficient.

Pick-to: 6.2
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>
2021-08-10 12:37:46 +02:00
Qt Submodule Update Bot
b2ff16b6d1 Update submodules on 'dev' in qt/qt5
Change-Id: I0d0dac5315eca1ca25972c79fdb33f983ff38601
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-08-07 13:07:03 +03:00