Commit Graph

1575 Commits

Author SHA1 Message Date
Dan Ackers
7b9448f2b9 Rename new file for clarity
Change-Id: I83428ef280cef73c3c0530feabb116973632ccd9
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 96269c2d01)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-09-29 13:05:02 +00:00
Dan Ackers
8504d78c96 Make QNX-toolchain files git-tracked
Also, qnx now builds only using toolchain
packages, ignoring host mahcine.

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>
(cherry picked from commit 80d0b2a91b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-09-28 22:32:01 +00:00
Dan Ackers
04f7a70291 Integrity: git track toolchain file
Also make cmake find libraries only from toolchain

Task-number: QTQAINFRA-4580
Change-Id: I5eabaa3b6915e16db6ce152591d3b88bc7483d29
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit cae9a1e8ef)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-09-28 22:32:01 +00:00
Alexandru Croitor
53779c4fa1 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.

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>
(cherry picked from commit 551c838bad)
2021-09-27 11:56:56 +02:00
Heikki Halmet
e5679646b5 Provisioning: Update the Integrity toolchain version
Task-number: QTQAINFRA-3555
Change-Id: I2a1f25024862b0b96bb7675376520d2e3a679d0b
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit f320433979)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-09-08 05:28:19 +00:00
Jani Heikkinen
2fd650b973 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
Pick-to: dev
Change-Id: I3625c06b14c633d77f1628ae0cda3092284eabd6
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
2021-09-07 16:58:57 +03:00
Heikki Halmet
b94cc9cc28 Make Integrity significant
Task-number: QTQAINFRA-4285
Change-Id: I131e6af26a28012228178192e60e2a91d33959fe
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-09-07 08:01:09 +03:00
Simo Fält
2fe9652422 COIN: Fix integrity target configure arguments
Change-Id: I624feea29eb70dadb9e959d6056eaccd73b7169a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 9385d5d687)
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-09-06 05:45:10 +00:00
Kimmo Ollila
da33061d66 Add Integrity target for other modules
QtDeclarative, QtImageFormats and QtShaderTools

Change-Id: I24906d833d364a80025663928650f032a8618c22
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit dd24bc25c9)
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-09-03 09:48:22 +03:00
Kimmo Ollila
1d7d4a7603 Add Integrity target for QtSvg
Change-Id: Ic677c932151aeed9f72e49baba9038bf122e5b5b
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 401ef8a8b3)
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-09-03 06:48:19 +00:00
Heikki Halmet
9fd1d19465 Add Insignificant flag for Integrity
We will add new module targets for Integrity. Those are not tested
during Qt5 integration. Let's remove the flag after we are sure that
nothing will break on those new targets

Change-Id: Ifdcecc869a931897e377281618dfce744353b47e
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-09-03 09:48:13 +03:00
Simo Fält
433f106d31 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>
(cherry picked from commit b5c4effe7e)
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-09-03 09:48:09 +03:00
Robert Griebl
33988e12ac Add a platform config file for Qt Application Manager
Change-Id: I59013a841e96eb679798e906af4c1af09884dc45
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
(cherry picked from commit 2b22f80725)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-09-02 09:19:01 +02:00
Alexandru Croitor
51155b7bf8 Build minimal subset of tests in qtdeclarative desktop static builds
Task-number: QTBUG-87580
Change-Id: I417dbfc9b9b3092c9c14227907db4f1c16124ef1
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit f0c7664195)
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2021-08-27 14:42:00 +02:00
Alexandru Croitor
26e43959e1 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.

Task-number: QTBUG-95839
Change-Id: Ie1aa6deb202c9b84ce0c14b0f851f38a3a71fe7b
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit 4fea3be3af)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-08-27 08:09:25 +00:00
Assam Boudjelthia
8ab13223a5 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.

Change-Id: Iac58b7250d7cb639a4d760cf12e7630c9d0b77cc
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
(cherry picked from commit 6ac98447b5)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-08-26 18:17:13 +00:00
Heikki Halmet
86a34fb5d7 Upgrade Xcode and Command line tools to the latest version for Big Sur
Latest version is 12.5.1

Change-Id: I86111d5fdab6e06201f1184bbd23806d25eed192
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
(cherry picked from commit f824365cb5)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-08-24 07:14:39 +00:00
Samuli Piippo
5f7bb79fd9 qdp: remove system dependencies
Use more of the same arguments as RHEL-8.2-host to limit
the unnecessary dependencies to the system libraries.

Task-number: QTBUG-95882
Change-Id: Ibc5b1755aca7bfef42fd7ca3db0d19ebd49b8e4e
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-08-23 13:51:44 +03:00
Eike Ziller
3c2fca6bb1 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.

Change-Id: I13425f08c2f51a1522da25804fc7883f8d817059
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
(cherry picked from commit bbd31689ec)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-08-19 12:29:12 +00:00
Allan Sandfeld Jensen
1f452fd479 Update node.js to 12
For Ubuntu it means using an alternative packages, for
openSUSE not using an alternative package.

Change-Id: I09085428db083adc1ff1d68f384cd19c83605bfd
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit c4b8c908b6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-08-18 19:19:46 +00:00
Eike Ziller
aaf0fad6b5 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

Change-Id: Id3329ca481b7743b4d40dad8faaa62285dbe53b0
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit f945fdc735)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-08-17 15:59:58 +00:00
Mitch Curtis
76741ceaa5 Remove qtquickcontrols2.yaml from platform_configs
Task-number: QTBUG-95173
Change-Id: If7470b3d5cd5721def97fd5b41e46e037cec2286
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 9b3411da8d)
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
2021-08-14 11:59:02 +02:00
Alexandru Croitor
92b188ef62 CMake: Update provisioned CMake to version 3.21.1
Task-number: QTBUG-95018
Task-number: QTBUG-95229
Change-Id: Ibed6ff323ca1633444ed29423ce1e94c99e68f77
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
(cherry picked from commit 9218d50a6e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-08-14 09:58:51 +00:00
Tor Arne Vestbø
3344530eaa 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)

Change-Id: I728a2595987db0568568bbb8ca8117effca73997
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit f8fab3be9b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-08-13 16:55:47 +00:00
Heikki Halmet
939c7e7f57 Change locale to en_US and install all available language packages
These are needed for Android tests

Task-number: COIN-727
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>
(cherry picked from commit beb8fcca5f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-08-12 18:47:27 +00:00
Alexandru Croitor
bdfbd4ff3f Remove qtgraphicaleffects.yaml from platform_configs
Task-number: QTBUG-95757
Change-Id: Ia83795bbc2ddef9532fd196d64776571e50c1d6c
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
(cherry picked from commit 1256b4d504)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-08-12 15:44:50 +00:00
Alexandru Croitor
200542194a Provisioning: Install ninja 1.10.2 for Windows and macOS
To avoid error 'too many path components' when building Qt on Windows.

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>
(cherry picked from commit e8b0be7711)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-07-23 16:41:21 +00:00
Ulf Hermann
d50ea75346 Coin: Add tqtc-qmlcachegenplus configuration file
Change-Id: Ie66b837e95339ff6837ebfa83797716233bb8145
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit fab470c190)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-07-14 11:09:04 +00:00
Alexandru Croitor
d0583b0388 CMake: Update provisioned CMake to version 3.20.5
Change-Id: Id09eedf75b02b28dd94b0e3f858a05ebe8875679
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit d7c2951de0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-07-09 18:50:43 +00:00
Allan Sandfeld Jensen
c0c484278d Add qtwebengine dependencies to provisioning
Change-Id: If2cc949ce0669281d65995175480ac7cbd9fad74
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
(cherry picked from commit 3f551fedd6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-07-06 10:28:27 +00:00
Heikki Halmet
675c9ad6c6 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.

Pick-to: dev
Pick-to: 6.1
Pick-to: 6.0
Pick-to: 5.15
Pick-to: 5.12
Task-number: QTQAINFRA-4501
Change-Id: I31db800fa6814c3e7c1e649e2bbe3e3c80b9f4ce
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-07-01 12:34:51 +03:00
Assam Boudjelthia
9d47c22900 Remove qtandroidextras.yaml from platform_configs
Following qtandroidextras removal in the commit
912fdda4a4, coin's  platform
config yaml file has to be removed.

Task-number: QTBUG-84382
Change-Id: I8c3bc89938315ae8361d8d89ec6543d3699440ed
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
(cherry picked from commit f1fcb89f26)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-06-29 09:53:39 +00:00
Samuli Piippo
bb95d19ca8 Build QDB without icu or system doubleconversion
... to avoid unnecessary dependencies.

Pick-to: dev
Change-Id: I607f034d5b092e69e7d2aead4c0747268b690a5d
Reviewed-by: Toni Saario <toni.saario@qt.io>
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
2021-06-28 14:59:36 +03:00
Jani Heikkinen
ea62a47c56 Add missing wasm target build for windows and macOS hosts
Based on wasm maintainer these should work already

Change-Id: Ifa9606546e6d04be824d5507306a8c6fb5f2d035
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit bae9580da1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-06-25 13:16:27 +00:00
Tanja Remes
e2877a3e5b Provisioning: update Squish packages
Custom packages for Qt6.2. macOS:use custom build Qt5.15 package
with separate Squish server adjusted for Qt6.2

Change-Id: I25ed60f8ec9e3fdf919e5003f52a58cdca14e633
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 1c17b656e0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-06-22 14:14:08 +00:00
Heikki Halmet
34d0ca0f39 Update Yocto toolchains
Pick-to: dev
Task-number: QTQAINFRA-4459
Change-Id: I0a6144db1ca1ceb35791749bf5b056ced2307ab9
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-06-18 12:43:41 +03:00
Heikki Halmet
e216d829ff Switch back to RedHat 8.2 for Android target
Timeout increased so this should be ok to move back to Redhat 8.2

Pick-to: dev
Task-number: QTQAINFRA-4415
Change-Id: Iece9aefcbfdade2e29f495039de1f1fcafec2caf
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2021-06-18 12:42:44 +03:00
Toni Saario
91030b897c Archive global and config from qtbase in doc build
Copy the global and config folder from under qtbase to directory from
which the documentation.tar.gz is created. This is similar to how these
are added in qmake builds.

Task-number: QTBUG-94443
Change-Id: I1dfd6dd05057bb1bfdaeec9cf5d03fbfe474a5d1
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 7ed6d04410)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-06-16 22:22:31 +00:00
Alexandru Croitor
6276e48226 WoA: Build both release and debug configs for Windows on ARM
The config is marked as Packaging, but it didn't specify the list of
CMake configurations to build and defaulted only to Debug.

Task-number: QTQAINFRA-4492
Change-Id: If75eaf76d386442355c45e4705fe2f4c0eeaa086
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
(cherry picked from commit 52eebe8a89)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-06-16 14:43:33 +00:00
Samuli Piippo
e40315c22d Add static platform targets for qdb
Static host platforms with packaging enabled.

Change-Id: I137bde6ccefb960282c5a830eb3862f03ee2f5f5
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-06-16 12:17:01 +03:00
Tor Arne Vestbø
b90fef29dc coin: Make macOS on ARM developer-build tests significant
Pick-to: dev
Change-Id: I2cc95e955fb313131dbef56028332b611d5dba7d
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-06-15 08:01:11 +03:00
Heikki Halmet
0a5e63dce9 Remove Insignificant flag from Windows ARM target
Pick-to: dev
Task-number: QTQAINFRA-4452
Change-Id: I049dfb8df259fed40438ee08b339507bda3ed768
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-06-14 13:49:54 +03:00
Simo Fält
80d999890d Add 'Packaging' feature for Mac TestOnly CI configs
This will allow exporting the testlogs for release.

Task-number: QTBUG-94111
Change-Id: Ib0db2b8ba0814539f235ddff412653e797b3f3e2
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit 9673311626)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-06-09 14:52:55 +00:00
Dominik Holland
92f423c06d Provisioning: Install libdlt-dev
Fixes: COIN-217
Change-Id: I3ce5da4d6b8e79a766ad90715462a9c8b7c50294
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-06-08 11:18:57 +02:00
Dominik Holland
30e02f32fb Add a platform config file for Qt DLT Logging
Change-Id: I6ad13ba724158719c463d1e64e9aa21e59cd89c9
Reviewed-by: Robert Griebl <robert.griebl@qt.io>
2021-06-07 22:47:24 +02:00
Dominik Holland
632997a94e Add a platform config file for Qt Interface Framework
Task-number: AUTOSUITE-1633
Change-Id: Ie960510ac3c7e53c6e1b8cdbac26a339b72d31d5
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-06-07 22:47:19 +02:00
Tony Sarajärvi
d9be0951b4 Replace openSUSE 15.2 with 15.3
Task-number: QTQAINFRA-4477
Change-Id: Ie8ce60c4e6d9b948be2ff813b599a2d8f6d75099
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-06-07 18:40:13 +03:00
Tor Arne Vestbø
ab78fc3c52 coin: Provision OpenSSL as universal build for macOS
Fixes: QTBUG-93205
Change-Id: Ic1f4d7709139da06cdd05605613602c1b28306b6
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-06-07 16:08:20 +02:00
Michal Klocek
b28866f7b1 Switch webview builds to cmake
Task-number: QTBUG-88620
Change-Id: I77bc7ad283d6b33590cc27e23dead7aac301fec9
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2021-06-04 16:33:29 +02:00
Heikki Halmet
ba869e1975 Add Integrity target for QtBase including provisioning changes
At this point let's add only target for QtBase. Target for
QtDeclarative, QtQuick3d and QtQuickcontrols2 will be
added later when we have all required fixes.

Task-number: QTQAINFRA-3555
Task-number: QTQAINFRA-4285
Change-Id: I59ef76079e98ba428cdb7abcb2560f434c37f517
Reviewed-by: Kimmo Ollila <kimmo.ollila@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-06-04 11:25:05 +03:00