lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-05-08 03:57:49 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,084 Commits 121 Branches 274 Tags
0cc6956093e7bfd43f070f1c9bf856ffc8bea8a0
Commit Graph

14 Commits

Author SHA1 Message Date
Assam Boudjelthia
0adae901ee Coin: Add Android OpenSSL scripts to macOS 12 provisioning target 
Fixes: QTBUG-105594
Change-Id: I4980f27e216c627c1675d04ed1bb5f5b9d62f2c0
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
(cherry picked from commit 8cc7a5f450)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2022-08-30 22:41:41 +00:00
Heikki Halmet
e5b819e26d Disable Software Updates for macOS 
Pick-to: 6.3 6.2 5.15
Change-Id: Id80d66cfebaa17311d7bfd927f3ce33ba0b81661
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
 2022-05-03 08:33:22 +03:00
Simo Fält
052ef1bd9f Provisioning: Install python2 for arm mac also 
We already use pyenv for installing pytho3 for arm macs, so it is
natural to use the same with python2. Also combining both provisioning
scripts as one, while python2 is already at the end of its lifespan and
should be removed completely from CI nodes.

Task-number: QTQAINFRA-4861
Change-Id: I0f2f73b974a83f8d3f0d42cb02d3b73e5ff82b17
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
 2022-04-27 11:38:20 +02:00
Heikki Halmet
789c276431 Update NDK to r23b 
This also fixes Android OpenSSL installation

NDK update will be added only to dev and 6.3 branches

Task-number: QTQAINFRA-4837
Change-Id: I1233217e71f345d30f3dec83d7477d3c6e3b6c2d
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
 2022-04-12 11:45:04 +00:00
Toni Saario
81dcae4f93 Provision conan on arm macOS 
Pick-to: 6.2 6.3
Change-Id: Ibf074c39b7bf3ac0f0f16a5a65d11022f9ec7e04
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
 2022-01-07 16:46:29 +02: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
Ville-Pekka Karhu
fe35c4dbb0 macOS: Upgrade Xcode to 13.2 
Task-number: QTQAINFRA-4607
Pick-to: 6.2
Pick-to: 6.3
Pick-to: 5.15
Change-Id: Ice52c8f4199e124d92b994cab38151dd712986bf
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
 2021-12-19 14:39:54 +02:00
Ville-Pekka Karhu
20c580e5db macOS provisioning: Disable bluetooth 
Pick-to: 6.2
Pick-to: 6.3
Change-Id: Ia981b4ab37a6ca15a566feb2fdc176253b419193
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
 2021-12-19 14:39:48 +02:00
Simo Fält
ef4fcb8ac7 Provisioning: Set Python 3.9 as a default on Arm macs 
The default intepreter under Frameworks is not working properly for
all CI use cases.

Change-Id: If665ea9ad81afa510c00162021ba7b143855cbd7
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
 2021-12-13 11:38:55 +00:00
Ville-Pekka Karhu
dbb4cd06aa Provisioning: Enable keyboard navigation between controls on macOS 
Task-number: QTQAINFRA-4660
Pick-to: 6.2
Change-Id: I12f2995c797e573d5072145c100ee64e98e133ce
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
 2021-12-11 19:31:16 +00:00
Allan Sandfeld Jensen
83b4afd584 Add python3 html5lib 
Needed for qtwebengine in 6.3

Change-Id: I6dc941fabe4e28e3dce19db8f7812be034be8586
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2021-11-20 11:13:09 +01:00
Tor Arne Vestbø
5de9c0fee3 Build iODBC library as universal binary on macOS 11+ 
As per instructions here:

  https://github.com/openlink/iODBC/blob/develop/README_MACOSX.md

Task-number: QTBUG-93204
Pick-to: 6.2 6.2.2
Change-Id: Ica8d0f8c8d1d497bf0172a5762ae2d419b0ffc95
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
 2021-11-17 17:19:39 +01:00
Tor Arne Vestbø
5733455993 coin: Align PostgreSQL provisioning between macOS 11 and macOS 12 
Pick-to: 6.2
Change-Id: I48770c6c6a33375f621b228fc61b23a2c97f787c
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2021-11-17 11:13:48 +01:00
Ville-Pekka Karhu
478531ac2b Provisioning: Add macOS Monterey (12) ARM scripts 
Task-number: QTQAINFRA-4508
Change-Id: Ia93e534b6911b6aaef2a0107b067c1ba5e6a6224
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
 2021-11-09 12:19:01 +02:00