Commit Graph

4690 Commits

Author SHA1 Message Date
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
Qt Submodule Update Bot 3be01a1c13 Update submodules on 'dev' in qt/qt5
Change-Id: I6b3c078d08b56578cdd8b0e0ddc4a8f68f6d7516
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-05-20 19:29:39 +03:00
Dan Ackers 2cee9da977 Libusb coin provisioning
Include libusb to linux, macos and windows

Pick-to: 6.1
Task-number: QTBUG-90951
Change-Id: I633e731d84cc60064bc2d1942f6a1ce129240711
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
2021-05-20 10:57:03 +03:00
Qt Submodule Update Bot 5892947306 Update submodules on 'dev' in qt/qt5
Change-Id: I041374600ca52e2f024d94c465bd6798fa8242e9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-05-20 07:36:35 +03:00
Alexandru Croitor b2fc30956b wasm: Enable sccache for wasm configurations
Change-Id: I564348482511b472940d6c75623d90809a6693a9
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2021-05-19 19:14:18 +02:00
Joerg Bornemann 43f3795125 wasm: Add WebAssembly platform to Coin
Change-Id: Ia377ad7ff8a675e80ead78eaf47848cc0f235247
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-05-19 19:14:15 +02:00
Qt Submodule Update Bot a79dc991e0 Update submodules on 'dev' in qt/qt5
Change-Id: Ia3383cfb2dfd5258ce59db5b064a92ba321a7c8e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-05-19 18:08:01 +03:00
Jani Heikkinen 66ce587c46 Restore qtwebchannel as a addon in qt5.git
According to plan Qt Webchannel will be back in Qt 6.2 so let's add
it in official builds

Task-number: QTBUG-93212
Change-Id: Iea137a18d8c635210ee56e2ebfa1f485b4a791a8
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2021-05-18 17:18:41 +03:00
Tor Arne Vestbø 2cca3aa049 Add qt5 macOS ARM packaging insignificant tests
Change-Id: I62847257a0e8dcb3e48714cb1140a09bebcb53c2
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-05-18 13:48:22 +02:00
Tor Arne Vestbø 16a03d48a6 coin: Make macOS on ARM packaging tests significant for a few modules
Not all modules pass yet, but we want to at least make the ones that
do blocking.

Change-Id: Ic3270bab8825c79d3315e6241d62af1bf7f62435
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-05-18 12:37:32 +02:00
Allan Sandfeld Jensen c4fb89196c Add qtwebchannel config
Change-Id: Ida06681db4cceac72c7cc5b8dcad34457399d756
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-05-18 10:27:00 +02:00
Jani Heikkinen 82f2b64659 Restore qtwebsockets as a addon in qt5.git
According to plan Qt Web Sockets will be back in Qt 6.2 so let's add
it in official builds

Task-number: QTBUG-93684
Change-Id: Idbbc0e5c553bcd863f4b8ad21b9aee6057fe139e
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
2021-05-18 10:13:38 +03:00
Jani Heikkinen 6056d3be5f Change 'Target arch' for macOS universal build
This build containing both x86_64 and arm64 architectures. The 'Target
arch' ends up in the binary package names and needs to be changed
because '+' is illegal character in Amazon S3 file names so replace the
'+' with '-' in the 'Target arch' section.

Fixes: QTBUG-93778
Change-Id: I325210d51115ae0b1eda056636b69421f68fabd8
Reviewed-by: Antti Kokko <antti.kokko@qt.io>
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-05-18 05:06:47 +00:00
Heikki Halmet ca1894acaa Remove CentOS 8.3 targets
Provisioning scripts will be removed later

Task-number: QTQAINFRA-4415
Change-Id: I71da9743066a81638518f44dc663324246a2ce8c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-05-17 20:40:58 +03:00
Qt Submodule Update Bot ba2c43b731 Update submodules on 'dev' in qt/qt5
Change-Id: Ib3de299c8f75105e8df3e6d78c58ecb05649ad0a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-05-12 10:36:24 +03:00
Heikki Halmet 99a81d0c6c Provisioning: Temporary fix for installing Conan packages in Windows
Pick-to: 6.1
Pick-to: 6.0
Pick-to: 5.15
Pick-to: 5.12
Task-number: QTQAINFRA-4443
Change-Id: Iba4b240edaf4a3ec8732ddbe1ae4ac5c1166b676
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-05-12 09:17:40 +03:00
Tor Arne Vestbø d85ff1e934 Remove qtmacextras and qtx11extras submodules
They are no longer part of Qt (as of Qt 6), and the modules themselves
have been wiped (9d99db029613d9cd847407085c5de7f310cd0937, and
6037ece5e4c0d290ae4ebf75c0d9bce0de55ed85).

Task-number: QTBUG-83251
Change-Id: Ie3acfc6d31bda0fcc1c6189e08171dbdf3c50ff7
Reviewed-by: Liang Qi <liang.qi@qt.io>
2021-05-11 10:04:16 +02:00
Jani Heikkinen da632b95d2 Restore qtremoteobjects as a addon in qt5.git
According to plan Qt Remote Objects will be back in Qt 6.2 so let's add
it in official builds

Task-number: QTBUG-93139
Change-Id: Ia4c9feae94b69f01a3c36872b346aa872f0e6654
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
2021-05-07 10:33:55 +03:00
Jani Heikkinen 3916c0bbac Switch qtconnectivity from additional library to addon
And at same time bump qtconnectivity sha1 in qt5.git

Change-Id: I1a9cfdbc95157715bf7b76870d918add76009e4e
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
2021-05-06 13:50:28 +03:00
Qt Submodule Update Bot 7a79c16814 Update submodules on 'dev' in qt/qt5
Change-Id: Ie7555c2f5c1eacde17e2bee06a496c723025e34e
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-05-05 20:52:42 +03:00
Simo Fält 2a4635379c Add ci config for Windows 10 on Arm
Task-number: QTBUG-85820
Change-Id: I145cbfbd39fe164bc57d4106e58c50add51fe976
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-05-05 20:52:42 +03:00
Tor Arne Vestbø e1c8cf2d39 Add test configuration of macOS universal builds on ARM
Change-Id: I8dec178343978b36dce3e9d262a7f6f234513892
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
2021-05-05 11:45:50 +02:00
Qt Submodule Update Bot 80b5b60a5a Update submodules on 'dev' in qt/qt5
Change-Id: Ibb59bafe553eb0ca055d8d4275f476d87b4c46c9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-05-05 10:06:13 +03:00
Qt Submodule Update Bot f32e311b13 Update submodules on 'dev' in qt/qt5
Change-Id: I0cc9ad6d4dae1049b5d5ccba84afa4ea1ff7dbc2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-05-05 02:16:11 +03:00
Qt Submodule Update Bot c94ae9ad53 Update submodules on 'dev' in qt/qt5
Change-Id: I32545ca7ab23266ecbf9ce26593a40bbac9a87cc
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-05-04 11:29:13 +03:00
Qt Submodule Update Bot 1b00e13ec8 Update submodules on 'dev' in qt/qt5
Change-Id: I76b03c8a5e6fdd3da47e35de6ea37b5f7579970a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-05-04 03:59:53 +03:00
Qt Submodule Update Bot 97f41c2fef Update submodules on 'dev' in qt/qt5
Change-Id: I2d83b0da164cfea2694b51f32069698d0c6780af
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-05-03 19:38:04 +03:00
Qt Submodule Update Bot 2fc400fed7 Update submodules on 'dev' in qt/qt5
Change-Id: Ifb8d58ff4677c73e5b2a0ac381a99f9bc4351dff
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-05-01 15:21:46 +03:00
Qt Submodule Update Bot 453cf99c90 Update submodules on 'dev' in qt/qt5
Change-Id: I727a0d4b9c1cc665acf9aaf5c03d168f63646398
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-05-01 10:02:16 +03:00
Qt Submodule Update Bot d38a5d0044 Update submodules on 'dev' in qt/qt5
Change-Id: I8774af63fd1e96cd2e95288170a4510c3799f3ba
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-04-30 20:24:36 +03:00