lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-01-07 23:46:51 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,981 Commits 117 Branches 268 Tags
8a98b34cc718700c8e5fe8a52c8012dcaf5ef9c5
Commit Graph

10 Commits

Author SHA1 Message Date
Matti Paaso
c1edd84a8a Update java in macOS x64 
Android requires java 17 in Qt 6.8 and RTA needs java 17 into VMs
to compile Qt examples.

Task-number: QTQAINFRA-6492
Change-Id: I873c188154c2eae2a9eebddb94279c41ca822576
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
(cherry picked from commit 73cc61c389)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2024-10-23 04:31:26 +00:00
Lucie Gérard
eecfb19548 Use SPDX license identifiers 
Replace the current license disclaimer in files by
a SPDX-License-Identifier.
License files are organized under LICENSES directory.

Pick-to: 6.5 6.6
Task-number: QTBUG-67283
Task-number: QTBUG-108364
Change-Id: If26e4d35c780db4a7982bb84872b251dad24716e
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
 2023-06-12 12:10:41 +00:00
Tony Sarajärvi
58ddf7133c Correct the domain of ci-files01-hki 
It's hasn't been .intra.qt.io for quite some time, it
has worked through an alias we have on the DNS server.

Change-Id: I0bc17668dacfea64c276bb553e75e4be16e97659
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
 2023-06-12 12:10:26 +00:00
Kai Köhne
becb423e80 Replace LGPL2.1 only header with LGPL3 one 
This is in line with e.g. qtbase. Also remove outdated/unreferenced
license files.

Pick-to: 6.3
Change-Id: I5d3370ab453610f9c8165ff9e57db7ad4a785370
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
 2021-12-19 19:47:15 +00:00
Heikki Halmet
abd2e0b381 Provisioning: Upgrade Java JDK to version 11 
Pick-to: 6.2
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>
 2021-10-15 09:51:01 +03:00
Heikki Halmet
f6b0b21ba2 Add Big Sur macOS 11.0 to CI 
Only one target is added because current HW capasity is minor.

Task-number: QTQAINFRA-3967
Change-Id: Iae2ac0e02b38b45a219a78e046fb21338ff9cd97
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2021-01-22 10:35:11 +02:00
Antti Jaakkola
68a183324d Use Parallels for macOS 10.15 builds and tests 
Pick-to: 5.15
Pick-to: 6.0
Change-Id: I875cf12afafae5389f8c974cd40789c5183d4cb2
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
 2020-12-31 06:08:19 +00:00
Heikki Halmet
a6feaec287 Provisioning: Fix java installation for mac 
Change-Id: I3b6672e671720416af71631c2f9ce814f07e596a
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2018-03-19 11:57:09 +00:00
Tony Sarajärvi
a98b0f3d79 Remove try_catch codes from common macOS scripts 
Change-Id: I66291e2da5514499387b61e01ad85a652cd24d7b
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
 2018-03-19 11:57:00 +00:00
Matti Paaso
c3b33afc32 Provisioning: osx-10.11 - Java 
This is needed for running RTA jobs in Coin.

Change-Id: Iff855dae54babef00c055a2c8b938871101305e3
Reviewed-by: Simo Fält <simo.falt@qt.io>
 2018-02-23 21:00:21 +00:00