Commit Graph

4719 Commits

Author SHA1 Message Date
Qt Submodule Update Bot
f1feffcd2b Update submodules on 'dev' in qt/qt5
Change-Id: Ib3de73d6203b4442b6fe46224753382d92127bb0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-07-13 21:27:33 +03: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
Qt Submodule Update Bot
2144c1914e Update submodules on 'dev' in qt/qt5
Change-Id: Iedef78a8d717b01d4f5b8e56802f6f2221d6b38a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-07-01 12:14:02 +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
Assam Boudjelthia
eb16fe519f Remove qtpurchasing submodule from qt5
Qt purchasing was not part of Qt 6, and will be moved as a demo/example
under qtdoc, thus we don't need it here.

Task-number: QTBUG-84776
Pick-to: 6.2
Change-Id: Ie6f704e72914072e7e105763ffaeae1d13cff086
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
2021-06-28 13:29:13 +00: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
Assam Boudjelthia
912fdda4a4 Remove qtandroidextras submodule
Remove qtandroidextras from the submodules list of qt5 since it's
not part of Qt 6.

Task-number: QTBUG-84382
Change-Id: I2f9b5a576781b5d45e563dfda7830c17996685a5
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
2021-06-28 08:11:43 +00:00
Qt Submodule Update Bot
53ff4f00bd Update submodules on 'dev' in qt/qt5
Change-Id: Id120afaa6658c2cadbf17dba87707d47379854bf
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-06-26 19:31:25 +03:00
Qt Submodule Update Bot
0e5b5af8b3 Update submodules on 'dev' in qt/qt5
Change-Id: I527d41ac13bf60b705d2c245b14602adbc16a0c1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-06-26 07:32:48 +03:00
Lars Knoll
4131439fb9 Make QtMultimedia depend on shadertools and recommend qtquickcontrols2
Multimedia needs shadertools for building, so make that explicit.
Some examples use Qt Quick Controls, so we recommend that as well

Pick-to: 6.2
Change-Id: If067defe371dc9584634d1c1aa7c5eae74c9af25
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
2021-06-25 13:16:21 +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
Qt Submodule Update Bot
f1b826440d Update submodules on 'dev' in qt/qt5
Change-Id: I75c5072b7fe2c73b3f75a9f8b85220039dd879fb
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
2021-06-24 09:10:22 +00:00
Jani Heikkinen
a341894f29 Fix qtmultimedia status
It has to be addon

Change-Id: Ideafe810c032be9fdff6fae8cefb438204f61be8
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit a1ee8408ff)
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
2021-06-24 11:10:20 +02:00
Tanja Remes
1c17b656e0 Provisioning: update Squish packages
Custom packages for Qt6.2. macOS:use custom build Qt5.15 package
with separate Squish server adjusted for Qt6.2

Pick-to: 6.2
Change-Id: I25ed60f8ec9e3fdf919e5003f52a58cdca14e633
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-06-22 06:04:53 +00:00
Heikki Halmet
9a029a5872 Switch back to RedHat 8.2 for Android target
Timeout increased so this should be ok to move back to Redhat 8.2

Task-number: QTQAINFRA-4415
Change-Id: Iece9aefcbfdade2e29f495039de1f1fcafec2caf
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit e216d829ff)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-06-21 04:58:57 +00:00
Toni Saario
7ed6d04410 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.

Pick-to: 6.1 6.2
Task-number: QTBUG-94443
Change-Id: I1dfd6dd05057bb1bfdaeec9cf5d03fbfe474a5d1
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2021-06-16 21:27:56 +00:00
Alexandru Croitor
52eebe8a89 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.

Pick-to: 6.2
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>
2021-06-16 15:00:29 +02:00
Robert Griebl
2b22f80725 Add a platform config file for Qt Application Manager
Change-Id: I59013a841e96eb679798e906af4c1af09884dc45
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
2021-06-15 19:55:29 +02:00
Tor Arne Vestbø
27f62f7dd8 coin: Make macOS on ARM developer-build tests significant
Change-Id: I2cc95e955fb313131dbef56028332b611d5dba7d
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
(cherry picked from commit b90fef29dc)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-06-15 05:56:39 +00:00
Simo Fält
9673311626 Add 'Packaging' feature for Mac TestOnly CI configs
This will allow exporting the testlogs for release.

Pick-to: 6.1
Pick-to: 6.2
Task-number: QTBUG-94111
Change-Id: Ib0db2b8ba0814539f235ddff412653e797b3f3e2
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-06-09 13:01:32 +00:00
Inho Lee
6069cf9a84 Quick3D : Add optional dependency to QtQuickTimeline
Quick3D's runtime asset animation needs QuickTimeline module.
This is an optional module just for the animation feature.

Pick-to: 6.2
Change-Id: I080b23e2f8f73277a92ef6207829fd3e3fc6d1b5
Reviewed-by: Christian Strømme <christian.stromme@qt.io>
2021-06-09 09:32:47 +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
Tor Arne Vestbø
f5dbd9b4f0 Remove qtwinextras submodules
It's no longer part of Qt (as of Qt 6)

Task-number: QTBUG-89564
Change-Id: I302c58f1b6a55797cf1f6722eafe936561bf456f
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2021-06-07 11:17:58 +02:00
Jani Heikkinen
d71ae6f832 Restore qtwebview as a addon in qt5.git
According to plan Qt Webview will be back in Qt 6.2 so let's add
it in official builds

Task-number: QTBUG-93222
Change-Id: I20a20e74f08327a15d6c3985a42efc01b01a5848
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
2021-06-07 10:22:27 +03: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
Heikki Halmet
c399c02fe7 Use CentOS 8.3 when running tests with Android emulator
Rhel 8.2 with Android emulator seems to be unstable

Change-Id: Ibd858b25959b397d68e3242df0bf49eda3ca9445
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
2021-06-02 07:20:58 +03:00
Assam Boudjelthia
53220710f5 Update build tools and platforms API level to 29
Windows and macOS hosts were still using 28 while Linux uses 29.

Change-Id: I36afd17277605b6478bf840340c0341a7f327caa
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-06-01 07:50:45 +03:00
Li Xinwei
4450693ac0 Fix --mirror option for init-repository
If submodule url is absolute, don't use mirror, don't set
remote.gerrit.url and remote.gerrit.fetch.

To avoid error when passing "--mirror git://github.com/qt/":
fatal: remote error: qt/https://code.qt.io/playground/qlitehtml
is not a valid repository name
Visit https://support.github.com/ for help

amends 7374ef8e38

Change-Id: Ifb4e1c8de57c7729f2965c16388f1acd763a150f
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2021-05-31 10:58:48 +00:00
Eike Ziller
3b2dd1560c COIN: Remove unused parameters from qt-creator.yml
We are not using them for the Qt Creator build, since for us it makes
more sense to define these things in the Qt Creator branches. They
create additional noise (and confusion) in the COIN interface though, so
remove them.

Pick-to: 6.1
Change-Id: Iadcb9570f88fa0245996d8e7c112dc8b54dfe80d
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
2021-05-28 10:27:32 +02:00
Allan Sandfeld Jensen
a6c5f0e918 Add nodejs to RHEL 8.2
Change-Id: I325a1df169b9055af78d3579df1370f7c3a17852
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-05-27 21:06:34 +02:00
Heikki Halmet
b1a3ccb99c Remove InsignificantTests flag from Windows developer build
This patch only affects to dev branch.
Separate patch will handle 6.1 and 6.0 branches

Task-number: QTQAINFRA-4427
Change-Id: Ibaf6422061e9cd66a3458922fae7a4533f80c40f
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-05-27 11:33:50 +03:00
Lars Knoll
dff3eab96c Add a platform config file for Qt Multimedia
Change-Id: I56460067682dd221756266513ec994ebb4794209
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-05-27 10:32:54 +02:00
Qt Submodule Update Bot
bb5f9f5a3c Update submodules on 'dev' in qt/qt5
Change-Id: Ica870b71d996427281b817bf7f64b0e20fd3e541
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-05-27 09:33:17 +03:00
Kai Köhne
7374ef8e38 Support absolute submodule urls
This is needed for qttools.

Fixes: QTBUG-93850
Change-Id: I59a7f8a56d8d7143521b67d0c385150e62338209
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
2021-05-27 06:32:24 +00:00
Jani Heikkinen
7cda9fd97b Restore qtwebengine as a addon in qt5.git
According to plan Qt Webengine will be back in Qt 6.2 so let's add
it in official builds

Task-number: QTBUG-93195
Change-Id: If7e0406bb66033e110f16518a73a2579721cb0c0
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2021-05-26 12:54:40 +03:00
Qt Submodule Update Bot
8a791ec5a1 Update submodules on 'dev' in qt/qt5
Change-Id: I5917bc2c7d73d0f94db88c0e5b86707b26763e94
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-05-26 06:20:10 +03:00
Tor Arne Vestbø
565ca05254 coin: Make macOS ARM packaging config test significant for all modules
Change-Id: Icc30025a33de602e6677b47f131b0557a4d2eabd
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-05-25 09:37:04 +02:00
Qt Submodule Update Bot
4d5e420009 Update submodules on 'dev' in qt/qt5
Change-Id: If12af41e8c677af16f92e59f713ab4e7fecd9fc7
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-05-25 07:50:50 +03:00
Simo Fält
ce66a83485 Fix used Ubuntu version for Pyside6 license check
Pick-to: 6.1
Change-Id: I9f966089818559178d6e1e2c286da25bbd8219e1
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
2021-05-24 10:21:29 +00:00
Michal Klocek
f0ec54c6fb Switch qtwebengine to cmake
Add defaults for now. Later this should get customized
to avoid unnecessary targets.

Task-number: QTBUG-91760
Change-Id: I72d3f11e117abeecf6c8c5fefac16fe951d3a9da
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2021-05-22 14:36:00 +02:00