lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-01 11:26:04 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,823 Commits 118 Branches 270 Tags
5893f0d3dff8d01d39d8758a67c7ba2d9dc645e3
Commit Graph

4823 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Assam Boudjelthia
5893f0d3df Coin: bump Android platform sdk and build tools version to 31 
Use latest platform and build tools.

Change-Id: I8ddfe79706470918d956a97876a5d140a57ec87b
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
(cherry picked from commit 286a294daf)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-11-04 12:52:49 +00:00
Tor Arne Vestbø
eefe05467d coin: Disable sccache for Integrity 
The platform doesn't support sccache, and the "feature" was
likely cargo culted from some other config, as it was a noop
at the time.

Change-Id: I792231b1bed8856e886eeca9ae37c2b824b1ea8e
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit c273c5bc65)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-11-04 11:10:59 +00:00
Ivan Solovev
409931d897 Update qtlocation dependencies 
This commit amends 6af22246cf.
qtlocation now depends on qtpositioning, but does not require
qtserialport anymore.

Change-Id: I1bda34020f7bc3683cf5038f2e1226d5209dfcc4
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
(cherry picked from commit 70a8080f54)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-11-01 21:26:09 +00:00
Heikki Halmet
0d35051d65 Provisioning: Update Integrity toolchain to fix GHS error 
Task-number: QTQAINFRA-4601
Change-Id: Ica32904ef6e76bc9f9f972f8c6bf02822980f888
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit f4f80d1b0f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-10-31 18:38:29 +00:00
Pasi Petäjäjärvi
0b680fb549 CI: Update QNX ICU libraries for QEMU 
New QNX toolchain has updated ICU libraries

Task-number: QTBUG-87628
Change-Id: I36806c815410877998eb44bef60614bf824f15f9
Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 8d7f2db3a0)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-10-30 11:22:54 +00:00
Assam Boudjelthia
f4903d61e8 Coin:Android: set ANDROID_SDK_ROOT explicitly 
... and remove ANDROID_{SDK,NDK}_HOME as they are
deprecated and might not work even.

Task-number: QTBUG-97002
Change-Id: Ie6fe93eb91fad0153aee795b73a43e84e37c8127
Reviewed-by: Iikka Eklund <iikka.eklund@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit d59825d250)
Reviewed-by: Andreas Buhr <andreas.buhr@qt.io>
 2021-10-30 09:58:43 +00:00
Heikki Halmet
91c20d709a Provisioning: Change cache url suffix ci.local to intra.qt.io 
Change-Id: Ifaa84ddb6b8b3bdbada2a7af26df92e151792532
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit ba32df291c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-10-29 14:57:32 +00:00
Heikki Halmet
5bffe4c688 Provisioning: Change locale and language settings 
Let's script this so we can be sure which language settings are in use

Change-Id: Ibf9ee047ede78535d39e707fd669b8a0f407cf1e
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 8fac7c92c9)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-10-29 14:57:31 +00:00
Heikki Halmet
082500cb93 Provisioning: Remove unused code from JDK installation script 
Amends abd2e0b381

Change-Id: Ica9078571cfc9851bada36474cc80e1fcc642dbb
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 36a58374d6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-10-29 14:57:31 +00:00
Pasi Petäjäjärvi
8a0f13d7ae CI: Move QNX qemu specific configurations to own file 
Task-number: QTBUG-87628
Change-Id: Ifc360071a08304270d75a505eecbd9c2da635c00
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 0b97c457a8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-10-28 11:52:53 +00:00
Pasi Petäjäjärvi
1c7bb0892a CI: Add QNX QEMU image build package 
* Define env variables needed
* Add build files only to create qemu image

Task-number: QTBUG-87628
Change-Id: I26fd10b3e7950c7226c3c66f0b385b1acf0ac118
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit fe0b819588)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-10-28 06:48:49 +00:00
Pasi Petäjäjärvi
f30c29dd88 CI: Add NFS export 
Export work directory via NFS for QNX qemu

Task-number: QTBUG-87628
Change-Id: I57a2f612cf268bef4582726c9b0a1b953e74034b
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit ffc3ef20a3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-10-28 06:48:42 +00:00
Pasi Petäjäjärvi
27db125230 Provisioning: Install NFS support required by QNX QEMU 
Task-number: QTBUG-87628
Change-Id: I9100dd7eda11a9a6ebf35aa6100c6bf983402b64
Reviewed-by: Marianne Yrjänä <marianne.yrjana@qt.io>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit b580128093)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-10-28 06:48:34 +00:00
Ivan Solovev
eb874192c9 Add qtpositioning as a submodule 
The new qtpositionig repo is created to split QtLocation and
QtPositioning development.
This patch adds the new repo as a submodule to qt5.git
It also marks the qtlocation module as ignored and removes
it from dependencies, using qtpositioning instead.

Task-number: QTBUG-97188
Change-Id: I7adb9fc405119f865cd6b25a6ce9eff40d693b14
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
(cherry picked from commit 6af22246cf)
 2021-10-26 09:54:56 +02:00
Heikki Halmet
e3a457f60d Provisioning: Upgrade Java JDK to version 11 
Task-number: QTQAINFRA-4596
Change-Id: I5c67f220b5a1f3115032eb509d1d391cf1e520a6
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit abd2e0b381)
Reviewed-by: Andreas Buhr <andreas.buhr@qt.io>
 2021-10-22 07:27:25 +03:00
Heikki Halmet
deaf7dddca Provisioning: Upgrade Vulkand SDK to the latest version 
Update Vulkand version to 1.2.182
Include fetching from official location if cache is not available and
checking the shasum

Task-number: QTQAINFRA-4532
Change-Id: I3c43b08170a1756f1ca896bd606af1a2f349d93c
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
(cherry picked from commit 3de398e6eb)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-10-21 19:14:27 +00:00
Johanna Äijälä
b749b2689a Provisioning: update Squish on linux and macOS 
Custom Squish 6.7.1 for Qt6.2, macOS package back in the original form
without separate Squish server for Qt6.2.
Pick to: 6.2

Change-Id: I1edb9625f1d2891047d24676019448e8dd0fbaeb
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 5271d9f1cf)
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2021-10-21 07:56:02 +03:00
Dominik Holland
daf76912b8 Provisioning: Update Python packages to the latest version 
Change-Id: I31f3eb4f2d633015105b2915eb8e385c1c2aa6cf
Reviewed-by: Simo Fält <simo.falt@qt.io>
(cherry picked from commit 308584fbfd)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-10-20 22:08:48 +00:00
Ivan Solovev
94cd0802f3 Enable CI for qtpositioning repo 
Task-number: QTBUG-97187
Change-Id: I46cab4dffa8ede6a28f479ee693e2296e8a7c535
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit d0de34c4e1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-10-20 22:08:40 +00:00
Simo Fält
76b0e26e7a Provisioning: Update Python in macOS to 3.9.6 
Change-Id: I092513727642b34cc71034dab96c78eaecfe72f1
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
(cherry picked from commit ea89779e22)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-10-20 22:08:40 +00:00
Heikki Halmet
309c6694df Provisioning: Add OpenSSL for Android to macOS 
Task-number: QTBUG-97243
Change-Id: Ibf67b7d713904edb9f8ee83b35eb096e2d3f1eb1
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit 2aa8303236)
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2021-10-20 12:34:00 +03:00
Samuli Piippo
d7944ea8c6 Add zstd to Ubuntu 20.04 
Needed for bitbake.

Change-Id: Ib7be3a971b970311adca25f46238d3fae838cba9
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 663ebcb102)
 2021-10-15 12:01:54 +03:00
Marianne Yrjänä
3a8ccd8bad Update QNX toolchain 
Change-Id: I6edd66365d73996ca4d02ee82ab86e63bb190fa7
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 153c7680cd)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-10-14 08:40:54 +00:00
Qt Submodule Update Bot
4d90a09487 Update submodules on '6.2 in qt/qt5' 
Change-Id: Ib8a94b52cf2e0854bed30d93ae8b6014eeafc9c6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-10-13 06:50:15 +00:00
Joerg Bornemann
31610bf8c0 CI: Turn dbus support off for QNX_710 
QtDBus is built even if system dbus is not found, and QtGui depends
on QtDBus.  To link a consumer of QtGui, the -rpath-link option must
be passed to the linker.  That is not done at the moment, due to
QTBUG-86533.

Fixes: QTBUG-96791
Task-number: QTBUG-86533
Change-Id: I381747f15135fe65777985742dca0fd102583941
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 420adf322a)
 2021-10-11 09:21:27 +00:00
Qt Submodule Update Bot
ae8b953343 Update submodules on '6.2' in qt/qt5 
Change-Id: I6368ed7114d701c5ca31fda39a8d6f1f14cfde2d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-10-07 13:03:48 +03:00
Qt Submodule Update Bot
2e91316fa3 Update submodules on '6.2' in qt/qt5 
Change-Id: If9157e50a35e57e9d59ee34b2eccea6ac73286e9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-10-06 00:59:30 +03:00
Heikki Halmet
ed724f842b Provisioning: Re-install ca-certificates for Ubuntu 20.04 
This makes sure that needed ca-certificates are installed during
provisioning

Change-Id: I39289f237a54ca0805b1d9116ee899aecf02e72f
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
(cherry picked from commit 3b09730b44)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2021-10-05 18:15:19 +00:00
Qt Submodule Update Bot
564fddd1aa Update submodules on '6.2' in qt/qt5 
Change-Id: Icdc8dd2095e2e0a5636f8c89181d39e0936e0c7f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-10-04 20:57:41 +03:00
Qt Submodule Update Bot
8df89f1f84 Update submodules on '6.2' in qt/qt5 
Change-Id: Id05b4bef885c7115694077c9db0bf6ee9cd7d761
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-10-02 06:55:56 +03:00
Qt Submodule Update Bot
e5f7eb075f Update submodules on '6.2' in qt/qt5 
Change-Id: Ia0d34014d08a282844b5c46aaa75fb62d71ff0c1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-10-01 20:49:39 +03:00
Qt Submodule Update Bot
cf4464c133 Update submodules on '6.2' in qt/qt5 
Change-Id: Ib70902bbd55a4a4d1c28d5e147c3d088d931381d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-10-01 08:50:26 +03:00
Qt Submodule Update Bot
887d4032fa Update submodules on '6.2' in qt/qt5 
Change-Id: I62741b04194baab1baf0162995fc74c5cd777220
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-09-30 14:12:08 +03:00
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
Qt Submodule Update Bot
403f9d56e7 Update submodules on '6.2' in qt/qt5 
Change-Id: I49239b6f4b59f19513a91a52208a25c73806f9c9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-09-29 09:57:13 +03: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
Qt Submodule Update Bot
5f06a16be9 Update submodules on '6.2' in qt/qt5 
Change-Id: I1cc372fc1771c6720dab93b9fe3be646c6de8555
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-09-28 20:09:26 +03:00
Qt Submodule Update Bot
f5c6dde718 Update submodules on '6.2' in qt/qt5 
Change-Id: I351a637e8d09c01b6bb7155d518603431a7b6fd2
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-09-28 08:48:40 +03: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
Qt Submodule Update Bot
c2a8760db7 Update submodules on '6.2' in qt/qt5 
Change-Id: I69b166a88acd1773d8e74ad192a8974044052e10
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-09-25 10:47:18 +03:00
Qt Submodule Update Bot
77e75866a2 Update submodules on '6.2' in qt/qt5 
Change-Id: Ibbf01a3d74121d12dc806adecdf045e3c8c0b6e4
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-09-24 23:03:14 +03:00
Qt Submodule Update Bot
a193212edd Update submodules on '6.2' in qt/qt5 
Change-Id: I0ddd5d9e9ead853ff437799c3e1d41bfdd9955eb
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-09-21 04:26:39 +03:00
Qt Submodule Update Bot
21092f1a60 Update submodules on '6.2' in qt/qt5 
Change-Id: Ia68b201a8f1ed988995574f4ff18dd946cac70f8
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-09-20 17:01:55 +03:00
Qt Submodule Update Bot
33b1a3a319 Update submodules on '6.2' in qt/qt5 
Change-Id: I41240201c1c2c55df8ad429eb3d926a16bb730bf
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-09-20 07:16:32 +03:00
Qt Submodule Update Bot
8f77aad620 Update submodules on '6.2' in qt/qt5 
Change-Id: I84d860988a29673b3e6acdb2c97a06d4f175d9f6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-09-15 12:29:27 +03:00
Qt Submodule Update Bot
606219e8ae Update submodules on '6.2' in qt/qt5 
Change-Id: Ic29a3336f09138631bbdd3204fd62aa45677242d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-09-15 03:10:28 +03:00
Qt Submodule Update Bot
ce0a3d708c Update submodules on '6.2' in qt/qt5 
Change-Id: I0f9ae16e27e01b35036ed1ce079cb49cb7fa9c4f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-09-14 14:55:17 +03:00
Qt Submodule Update Bot
bb898b6cc0 Update submodules on '6.2' in qt/qt5 
Change-Id: I0331b379dd023e74dc59a6e40e9aae43cff75f85
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-09-09 20:49:02 +03:00
Qt Submodule Update Bot
21e86307ed Update submodules on '6.2' in qt/qt5 
Change-Id: I7e124fb9c53ed512f6f581170a256ca20dccef17
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
 2021-09-09 04:42:19 +03:00