Commit Graph

4728 Commits

Author SHA1 Message Date
Qt Submodule Update Bot
07ba2084de Update submodules on '6.2' in qt/qt5
Change-Id: I91aab3d9a572326775c0a2c37383d77918984893
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-07-21 23:25:48 +03:00
Qt Submodule Update Bot
6742cfecb7 Update submodules on '6.2' in qt/qt5
Change-Id: Ic85a2785a837d73507e866a2f3a3b1b29f21ea54
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-07-21 04:05:10 +03:00
Qt Submodule Update Bot
8711116396 Update submodules on '6.2' in qt/qt5
Change-Id: Idc0e457695645fc8fed9a93ca83ee5437f25a1d0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-07-20 12:55:19 +03:00
Qt Submodule Update Bot
b3efc246b3 Update submodules on '6.2' in qt/qt5
Change-Id: I5e0d932100ae441de15fa7346311b9165c4ed4c6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-07-20 02:41:20 +03: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
Qt Submodule Update Bot
90d85dae7d Update submodules on '6.2' in qt/qt5
Change-Id: I7e358268f00769e5acd31546a31df315bab4908d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-07-13 16:47:34 +03: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
Assam Boudjelthia
e3e388d76c 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
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>
(cherry picked from commit eb16fe519f)
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
v6.2.0-beta1
2021-07-01 17:26:24 +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
Qt Submodule Update Bot
fad3ce0574 Update submodules on '6.2' in qt/qt5
Change-Id: I47b98b1e84927a50f99dbda1832d14d2a70a7345
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-06-30 16:47:05 +03:00
Qt Submodule Update Bot
6dd1b85fd6 Update submodules on '6.2' in qt/qt5
Change-Id: I83f3659feace8cd95ef1208886602b4a0734059c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-06-30 02:39:13 +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
Qt Submodule Update Bot
8cecbd9e8b Update submodules on '6.2' in qt/qt5
Change-Id: I2a38867ad47eb01b5f1a1e65988469ac13aa3089
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-06-29 10:48:37 +03: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
Qt Submodule Update Bot
6ada10bf35 Update submodules on '6.2' in qt/qt5
Change-Id: Ic310607b215a1ca819f2145ffd965f282f05507b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-06-26 18:44:15 +03:00
Lars Knoll
9a2aba6192 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

Change-Id: If067defe371dc9584634d1c1aa7c5eae74c9af25
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
(cherry picked from commit 4131439fb9)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-06-25 22:17:30 +00: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
Qt Submodule Update Bot
ca5bc70a3b Update submodules on '6.2' in qt/qt5
Change-Id: I82c549410e7c80d76975e9faaf5966d29cd75e28
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-06-23 16:09:16 +03: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
Qt Submodule Update Bot
eea5f47027 Update submodules on '6.2' in qt/qt5
Change-Id: I05b348aa027e333e47301ad9186368c8cb9a16ab
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
v6.2.0-alpha1
2021-06-22 08:24:28 +03: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
Assam Boudjelthia
a0f6a60fb7 Remove qtandroidextras submodule
Remove qtandroidextras from the submodules list of qt5 since it's
not part of Qt 6.

Task-number: QTBUG-84382
Pick-to: dev
Change-Id: Ib95fa4c759c1135b7e0cde9b54ddd334a2f7d382
Reviewed-by: Simo Fält <simo.falt@qt.io>
2021-06-15 13:20:22 +00: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
Jani Heikkinen
a1ee8408ff Fix qtmultimedia status
It has to be addon

Pick-to: dev
Change-Id: Ideafe810c032be9fdff6fae8cefb438204f61be8
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-06-14 08:52:20 +00:00
Jani Heikkinen
4d67b1e1fd Restore qtmultimedia as a addon in qt5.git
According to plan Qt Multimedia will be back in Qt 6.2 so let's add
it in official builds

Task-number: QTBUG-93129
Pick-to: dev
Change-Id: I57363932aa461210cac806fa24cc2fe9b6951391
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
2021-06-12 00:39:12 +03:00
Jani Heikkinen
00be2755b8 Update submodules on '6.2' manually
Submodule update bot didn't do this because of some reason so try this
manually instead

Change-Id: Iaaad962fec9e56f0a46ab7934c9172eefd328322
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
2021-06-11 07:31:03 +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
Inho Lee
90e313538c Quick3D : Add optional dependency to QtQuickTimeline
Quick3D's runtime asset animation needs QuickTimeline module.
This is an optional module just for the animation feature.

Change-Id: I080b23e2f8f73277a92ef6207829fd3e3fc6d1b5
Reviewed-by: Christian Strømme <christian.stromme@qt.io>
(cherry picked from commit 6069cf9a84)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-06-09 13:01:37 +00:00
Jani Heikkinen
cad3bd7c94 Adjust submodule branches 2021-06-09 07:23:53 +03: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