qiurui
/
qt5
mirror of https://github.com/qt/qt5.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
5,402 Commits 115 Branches 261 Tags 18 MiB
Commit Graph

13 Commits

Author SHA1 Message Date
Assam Boudjelthia 4e59702b14 Coin:Android: unify and update OpenSSL provisioning scripts 
Use the same prebuilt pacakges for all platforms since the prebuilt libs
are going to be used for the target and they are not tied to the host.

Pick-to: 6.6 6.5
Task-number: QTBUG-110025
Change-Id: I2c79722989902b16883b31cbc6e140855239fcc8
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
 2023-06-20 12:32:48 +03: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
Heikki Halmet f01a4281d6 Fix path of OPENSSL_ANDROID_HOME 
Change-Id: I910cc6695381d870d21b5775d19a76db2d19cf73
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
(cherry picked from commit 70405cddba)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
 2023-01-24 05:46:58 +00:00
Heikki Halmet 68a7947e42 Start using OpenSSL 3.0.7 in CI 
Task-number: QTQAINFRA-4889
Change-Id: I3e335395762710d520ca93a5996d1b21d202ed4e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Vladimir Minenko <vladimir.minenko@qt.io>
Reviewed-by: Simo Fält <simo.falt@qt.io>
 2023-01-10 05:50:29 +00:00
Heikki Halmet 1a91aa20ac Provisioning: Fix for checking the installed Android openssl version 
Pick-to: 6.4
Change-Id: I2b180772da0e16aa69c7044eacc9c8ee617c6217
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
 2022-11-02 07:06:24 +00:00
Matti Paaso 936ede45de Update Android NDK to version r25b 
Update NDK to version r25b and prebuilt openssl 1.1.1m built with
it. Change log: https://github.com/android/ndk/wiki/Changelog-r25

Task-number: QTBUG-105397
Change-Id: I501f43066e7ba8af8a57efdbee6c4a625bb80852
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
 2022-10-17 19:47:10 +03:00
Heikki Halmet 8a72b1de99 Support multiple Android NDK versions 
We need to verify latest Android NDK version in all
Qt6 branches and we need to retain the NDK version we
had when the specific branch was released at the first time.

Verification of the latest NDK will be done during integrations
in 'dev' branch and with older brances it will be done using
nightly build targets

Task-number: QTQAINFRA-4990
Change-Id: I2a96e419d403820f55f4244230c28ad09dc9095b
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
 2022-09-20 10:30:05 +03: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
Heikki Halmet 8732165461 Provisioning: Update OpenSSL to version 1.1.1m 
Pick-to: 6.3
Pick-to: 6.2
Pick-to: 5.15
Change-Id: I93702b9faac5abc9fc01a5725cf34a17a94f0bea
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
 2022-02-05 15:59:17 +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
Assam Boudjelthia d59825d250 Coin:Android: set ANDROID_SDK_ROOT explicitly 
... and remove ANDROID_{SDK,NDK}_HOME as they are
deprecated and might not work even.

Pick-to: 6.2
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>
 2021-10-22 09:14:29 +02:00
Heikki Halmet 2aa8303236 Provisioning: Add OpenSSL for Android to macOS 
Task-number: QTBUG-97243
Pick-to: 6.2
Change-Id: Ibf67b7d713904edb9f8ee83b35eb096e2d3f1eb1
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
 2021-10-18 14:22:16 +03:00