mirror of
git://code.qt.io/qt/qt5.git
synced 2025-12-22 07:56:15 +08:00
Compare commits
78 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
166c7b04b2 | ||
|
|
e0aa395546 | ||
|
|
540616c0f0 | ||
|
|
c19321b5d8 | ||
|
|
0d5af11844 | ||
|
|
40331e1f6a | ||
|
|
b747c75b9c | ||
|
|
bd3b766a67 | ||
|
|
8f4f179bf5 | ||
|
|
7439cf73ae | ||
|
|
4c81e688d1 | ||
|
|
e09a6b0ded | ||
|
|
a717de6991 | ||
|
|
9bcabfb834 | ||
|
|
60723702ba | ||
|
|
843e3a3356 | ||
|
|
19aa82a335 | ||
|
|
2a1803c4e5 | ||
|
|
957d58330a | ||
|
|
0b125e0078 | ||
|
|
2a4603490b | ||
|
|
eaea6975a9 | ||
|
|
d58600aa0a | ||
|
|
53319ea9f1 | ||
|
|
40675f7809 | ||
|
|
669bd84baa | ||
|
|
918ec2927a | ||
|
|
459aeaaaf7 | ||
|
|
dd8f98e2ae | ||
|
|
ec544ba30f | ||
|
|
5bf26d317a | ||
|
|
3c0e4df21f | ||
|
|
1a0c8a10d7 | ||
|
|
dfa8daea2a | ||
|
|
4e4db99cce | ||
|
|
357b1e3ce8 | ||
|
|
ecefd41bdc | ||
|
|
186dc56e4d | ||
|
|
5fb1bbca8a | ||
|
|
a170c0f29b | ||
|
|
88ce2bac6e | ||
|
|
0877fe545d | ||
|
|
624e609000 | ||
|
|
fecff97465 | ||
|
|
642d0e2539 | ||
|
|
fb39282481 | ||
|
|
d6b3a5d61c | ||
|
|
7ee053c650 | ||
|
|
b9ce5596cc | ||
|
|
3c6cde4782 | ||
|
|
5f0cf72e58 | ||
|
|
5cb861147e | ||
|
|
7077699e82 | ||
|
|
1f78f58625 | ||
|
|
6d4a803f35 | ||
|
|
ea2696bb2d | ||
|
|
6db43f41eb | ||
|
|
024eef0a12 | ||
|
|
dcc106704b | ||
|
|
4021c315c6 | ||
|
|
8341414664 | ||
|
|
51e88c7313 | ||
|
|
a22e9d7674 | ||
|
|
c0070e50f6 | ||
|
|
d586120528 | ||
|
|
017fe58774 | ||
|
|
402dc4ee8b | ||
|
|
82c42de834 | ||
|
|
dc7c53aa05 | ||
|
|
b842483f93 | ||
|
|
0afdcac0c4 | ||
|
|
3661bb8fde | ||
|
|
398ce69dab | ||
|
|
93f5f2028b | ||
|
|
ac2f1b1dbb | ||
|
|
cfa82b923a | ||
|
|
9f7c915329 | ||
|
|
a0b0bae147 |
48
.gitmodules
vendored
48
.gitmodules
vendored
@@ -1,26 +1,26 @@
|
||||
[submodule "qtbase"]
|
||||
path = qtbase
|
||||
url = ../qtbase.git
|
||||
branch = 6.1.1
|
||||
branch = 6.1
|
||||
status = essential
|
||||
[submodule "qtsvg"]
|
||||
depends = qtbase
|
||||
path = qtsvg
|
||||
url = ../qtsvg.git
|
||||
branch = 6.1.1
|
||||
branch = 6.1
|
||||
status = addon
|
||||
[submodule "qtdeclarative"]
|
||||
depends = qtbase
|
||||
recommends = qtsvg
|
||||
path = qtdeclarative
|
||||
url = ../qtdeclarative.git
|
||||
branch = 6.1.1
|
||||
branch = 6.1
|
||||
status = essential
|
||||
[submodule "qtactiveqt"]
|
||||
depends = qtbase
|
||||
path = qtactiveqt
|
||||
url = ../qtactiveqt.git
|
||||
branch = 6.1.1
|
||||
branch = 6.1
|
||||
status = addon
|
||||
[submodule "qtmultimedia"]
|
||||
depends = qtbase
|
||||
@@ -34,7 +34,7 @@
|
||||
recommends = qtdeclarative qtactiveqt
|
||||
path = qttools
|
||||
url = ../qttools.git
|
||||
branch = 6.1.1
|
||||
branch = 6.1
|
||||
status = essential
|
||||
[submodule "qtxmlpatterns"]
|
||||
depends = qtbase
|
||||
@@ -47,7 +47,7 @@
|
||||
depends = qttools
|
||||
path = qttranslations
|
||||
url = ../qttranslations.git
|
||||
branch = 6.1.1
|
||||
branch = 6.1
|
||||
status = essential
|
||||
priority = 30
|
||||
[submodule "qtdoc"]
|
||||
@@ -55,7 +55,7 @@
|
||||
recommends = qtmultimedia qtquickcontrols qtquickcontrols2
|
||||
path = qtdoc
|
||||
url = ../qtdoc.git
|
||||
branch = 6.1.1
|
||||
branch = 6.1
|
||||
status = essential
|
||||
priority = 40
|
||||
[submodule "qtrepotools"]
|
||||
@@ -117,20 +117,20 @@
|
||||
recommends = qtdeclarative
|
||||
path = qtwayland
|
||||
url = ../qtwayland.git
|
||||
branch = 6.1.1
|
||||
branch = 6.1
|
||||
status = addon
|
||||
[submodule "qt3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtshadertools
|
||||
path = qt3d
|
||||
url = ../qt3d.git
|
||||
branch = 6.1.1
|
||||
branch = 6.1
|
||||
status = addon
|
||||
[submodule "qtimageformats"]
|
||||
depends = qtbase
|
||||
path = qtimageformats
|
||||
url = ../qtimageformats.git
|
||||
branch = 6.1.1
|
||||
branch = 6.1
|
||||
status = addon
|
||||
[submodule "qtgraphicaleffects"]
|
||||
depends = qtdeclarative
|
||||
@@ -223,7 +223,7 @@
|
||||
recommends = qtimageformats qtgraphicaleffects
|
||||
path = qtquickcontrols2
|
||||
url = ../qtquickcontrols2.git
|
||||
branch = 6.1.1
|
||||
branch = 6.1
|
||||
status = essential
|
||||
[submodule "qtpurchasing"]
|
||||
depends = qtbase
|
||||
@@ -237,21 +237,21 @@
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtcharts
|
||||
url = ../qtcharts.git
|
||||
branch = 6.1.1
|
||||
branch = 6.1
|
||||
status = addon
|
||||
[submodule "qtdatavis3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtdatavis3d
|
||||
url = ../qtdatavis3d.git
|
||||
branch = 6.1.1
|
||||
branch = 6.1
|
||||
status = addon
|
||||
[submodule "qtvirtualkeyboard"]
|
||||
depends = qtbase qtdeclarative qtsvg
|
||||
recommends = qtmultimedia qtquickcontrols
|
||||
path = qtvirtualkeyboard
|
||||
url = ../qtvirtualkeyboard.git
|
||||
branch = 6.1.1
|
||||
branch = 6.1
|
||||
status = addon
|
||||
[submodule "qtgamepad"]
|
||||
depends = qtbase
|
||||
@@ -264,7 +264,7 @@
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtscxml
|
||||
url = ../qtscxml.git
|
||||
branch = 6.1.1
|
||||
branch = 6.1
|
||||
status = addon
|
||||
[submodule "qtspeech"]
|
||||
depends = qtbase
|
||||
@@ -277,7 +277,7 @@
|
||||
depends = qtbase
|
||||
path = qtnetworkauth
|
||||
url = ../qtnetworkauth.git
|
||||
branch = 6.1.1
|
||||
branch = 6.1
|
||||
status = addon
|
||||
[submodule "qtremoteobjects"]
|
||||
depends = qtbase
|
||||
@@ -297,47 +297,47 @@
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtlottie
|
||||
url = ../qtlottie.git
|
||||
branch = 6.1.1
|
||||
branch = 6.1
|
||||
status = addon
|
||||
[submodule "qtquicktimeline"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtquicktimeline
|
||||
url = ../qtquicktimeline
|
||||
branch = 6.1.1
|
||||
branch = 6.1
|
||||
status = addon
|
||||
[submodule "qtquick3d"]
|
||||
depends = qtbase qtdeclarative qtshadertools
|
||||
path = qtquick3d
|
||||
url = ../qtquick3d.git
|
||||
branch = 6.1.1
|
||||
branch = 6.1
|
||||
status = addon
|
||||
[submodule "qtshadertools"]
|
||||
depends = qtbase
|
||||
path = qtshadertools
|
||||
url = ../qtshadertools.git
|
||||
branch = 6.1.1
|
||||
branch = 6.1
|
||||
status = addon
|
||||
[submodule "qt5compat"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qt5compat
|
||||
url = ../qt5compat.git
|
||||
branch = 6.1.1
|
||||
branch = 6.1
|
||||
status = deprecated
|
||||
[submodule "qtcoap"]
|
||||
depends = qtbase qttools
|
||||
path = qtcoap
|
||||
url = ../qtcoap.git
|
||||
branch = 6.1.1
|
||||
branch = 6.1
|
||||
status = addon
|
||||
[submodule "qtmqtt"]
|
||||
depends = qtbase qtdeclarative qttools
|
||||
path = qtmqtt
|
||||
url = ../qtmqtt.git
|
||||
branch = 6.1.1
|
||||
branch = 6.1
|
||||
status = addon
|
||||
[submodule "qtopcua"]
|
||||
depends = qtbase qtdeclarative qtquickcontrols2 qttools
|
||||
path = qtopcua
|
||||
url = ../qtopcua.git
|
||||
branch = 6.1.1
|
||||
branch = 6.1
|
||||
status = addon
|
||||
|
||||
@@ -35,8 +35,16 @@ instructions:
|
||||
maxTimeBetweenOutput: 1200
|
||||
userMessageOnFailure: >
|
||||
Failed to generate docs.
|
||||
- type: MakeDirectory
|
||||
directory: "{{.BuildDir}}/qtbase/doc/global"
|
||||
- type: ExecuteCommand
|
||||
command: "cp -r {{.BuildDir}}/qtbase/doc/config {{.BuildDir}}/doc"
|
||||
maxTimeInSeconds: 12000
|
||||
maxTimeBetweenOutput: 1200
|
||||
userMessageOnFailure: "Failed to copy qtbase/doc/config to documentation directory."
|
||||
- type: ExecuteCommand
|
||||
command: "cp -r {{.BuildDir}}/qtbase/doc/global {{.BuildDir}}/doc"
|
||||
maxTimeInSeconds: 12000
|
||||
maxTimeBetweenOutput: 1200
|
||||
userMessageOnFailure: "Failed to copy qtbase/doc/global to documentation directory."
|
||||
- type: UploadArtifact
|
||||
archiveDirectory: '{{.BuildDir}}/doc'
|
||||
transferType: UploadModuleDocumentation
|
||||
|
||||
@@ -46,14 +46,14 @@ Configurations:
|
||||
Environment variables: ['NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
|
||||
'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
|
||||
-
|
||||
Template: 'qtci-linux-openSUSE-15.2-x86_64-50'
|
||||
Template: 'qtci-linux-openSUSE-15.3-x86_64-50'
|
||||
Compiler: 'GCC'
|
||||
Features: ['Sccache']
|
||||
Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
|
||||
Environment variables: ['NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
|
||||
'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
|
||||
-
|
||||
Template: 'qtci-linux-openSUSE-15.2-x86_64-50'
|
||||
Template: 'qtci-linux-openSUSE-15.3-x86_64-50'
|
||||
Compiler: 'GCC'
|
||||
Features: ['Sccache']
|
||||
Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_headersclean=ON -DFEATURE_separate_debug_info=ON -DFEATURE_system_jpeg=OFF -DFEATURE_system_png=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_system_harfbuzz=OFF -DFEATURE_system_doubleconversion=OFF -DFEATURE_libudev=OFF -DINPUT_bundled_xcb_xinput=yes -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DOpenGL_GL_PREFERENCE=LEGACY'
|
||||
@@ -125,7 +125,7 @@ Configurations:
|
||||
Template: 'qtci-windows-10-x86_64-52'
|
||||
Compiler: 'Mingw'
|
||||
Environment variables: ['PATH=C:\MINGW810\mingw64\bin;$PATH']
|
||||
Features: ['Sccache', 'InsignificantTests']
|
||||
Features: ['Sccache']
|
||||
Configure arguments: '-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DBUILD_EXAMPLES=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DFEATURE_system_tiff=OFF -DFEATURE_system_freetype=OFF -DFEATURE_system_jpeg=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
|
||||
Environment variables: ['Path={{.Env.MINGW810}}\bin;{{.Env.Path}}', 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
|
||||
'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache','LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}']
|
||||
|
||||
@@ -17,19 +17,19 @@ Configurations:
|
||||
Id: 'macos-10.14-x86_64-tests'
|
||||
Template: 'qtci-macos-10.14-x86_64'
|
||||
Compiler: 'Clang'
|
||||
Features: ['Sccache', 'TestOnly']
|
||||
Features: ['Sccache', 'TestOnly', 'Packaging']
|
||||
Platform dependency: 'macos-latest-xcode-x86_64-packaging-build'
|
||||
-
|
||||
Id: 'macos-10.15-x86_64-tests'
|
||||
Template: 'qtci-macos-10.15-x86_64-102'
|
||||
Compiler: 'Clang'
|
||||
Features: ['Sccache', 'TestOnly']
|
||||
Features: ['Sccache', 'TestOnly', 'Packaging']
|
||||
Platform dependency: 'macos-latest-xcode-x86_64-packaging-build'
|
||||
-
|
||||
Id: 'macos-11-x86_64-tests'
|
||||
Template: 'qtci-macos-11.0-x86_64-102'
|
||||
Compiler: 'Clang'
|
||||
Features: ['Sccache', 'TestOnly']
|
||||
Features: ['Sccache', 'TestOnly', 'Packaging']
|
||||
Platform dependency: 'macos-latest-xcode-x86_64-packaging-build'
|
||||
|
||||
# Build developer builds for all modules, but only run tests for qtbase and declarative.
|
||||
|
||||
@@ -5,40 +5,28 @@ Configurations:
|
||||
Template: 'qtci-windows-10-x86_64-52'
|
||||
Compiler: 'MSVC2019'
|
||||
Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests']
|
||||
Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DFEATURE_headersclean=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
|
||||
Environment variables: [
|
||||
'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
|
||||
'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
|
||||
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}'
|
||||
]
|
||||
Configure arguments: ''
|
||||
Environment variables: []
|
||||
Environment script: ['%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64']
|
||||
-
|
||||
Template: 'qtci-windows-10-x86-4'
|
||||
Compiler: 'MSVC2019'
|
||||
Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests']
|
||||
Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DFEATURE_headersclean=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
|
||||
Environment variables: [
|
||||
'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
|
||||
'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
|
||||
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}'
|
||||
]
|
||||
Configure arguments: ''
|
||||
Environment variables: []
|
||||
Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2019\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'x86']
|
||||
-
|
||||
Template: 'qtci-linux-CentOS-8.3-x86_64-50'
|
||||
Compiler: 'GCC'
|
||||
Features: ['Packaging', 'Sccache', 'DisableTests']
|
||||
Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_headersclean=ON -DFEATURE_separate_debug_info=ON -DFEATURE_system_jpeg=OFF -DFEATURE_system_png=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_system_harfbuzz=OFF -DFEATURE_system_doubleconversion=OFF -DFEATURE_libudev=OFF -DINPUT_bundled_xcb_xinput=yes -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DOpenGL_GL_PREFERENCE=LEGACY'
|
||||
Environment variables: ['NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
|
||||
'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
|
||||
Configure arguments: ''
|
||||
Environment variables: []
|
||||
-
|
||||
Template: 'qtci-macos-10.14-x86_64'
|
||||
Compiler: 'Clang'
|
||||
Features: ['Packaging', 'DisableTests', 'Sccache', 'DebugAndRelease']
|
||||
Configure arguments: '-DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_framework=OFF -DQT_NAMESPACE=TestNamespace -DQT_BUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
|
||||
Environment variables: [
|
||||
'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
|
||||
'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
|
||||
]
|
||||
Configure arguments: ''
|
||||
Environment variables: []
|
||||
-
|
||||
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
|
||||
Compiler: 'GCC'
|
||||
|
||||
@@ -42,7 +42,7 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
|
||||
# shellcheck source=../unix/SetEnvVar.sh
|
||||
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
|
||||
|
||||
version="1.1.1g"
|
||||
version="1.1.1k"
|
||||
: ' SOURCE BUILD INSTRUCTIONS - Openssl prebuilt was made using Android NDK 21
|
||||
# Source built requires GCC and Perl to be in PATH.
|
||||
exports_file="/tmp/export.sh"
|
||||
@@ -56,10 +56,11 @@ else
|
||||
grep -e "^export" "$HOME/.bashrc" > $exports_file && source $exports_file
|
||||
rm -rf "$exports_file"
|
||||
fi
|
||||
|
||||
officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz"
|
||||
cachedUrl="http://ci-files01-hki.intra.qt.io/input/openssl/openssl-$version.tar.gz"
|
||||
targetFile="/tmp/openssl-$version.tar.gz"
|
||||
sha="b213a293f2127ec3e323fb3cfc0c9807664fd997"
|
||||
sha="bad9dc4ae6dcc1855085463099b5dacb0ec6130b"
|
||||
opensslHome="${HOME}/openssl/android/openssl-${version}"
|
||||
DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile"
|
||||
mkdir -p "${HOME}/openssl/android/"
|
||||
@@ -70,9 +71,9 @@ cd "$opensslHome"
|
||||
PATH=$TOOLCHAIN:$PATH CC=clang ./Configure android-arm
|
||||
PATH=$TOOLCHAIN:$PATH CC=clang make build_generated
|
||||
'
|
||||
prebuiltUrl="http://ci-files01-hki.intra.qt.io/input/openssl/prebuilt-openssl-1_1_1_g_for-android-ndk-21.tar.gz"
|
||||
prebuiltUrl="http://ci-files01-hki.intra.qt.io/input/openssl/prebuilt-openssl-1_1_1_k_for-android-ndk-21.tar.gz"
|
||||
targetFile="/tmp/prebuilt-openssl-$version.tar.gz"
|
||||
sha="2998e1a3bc9aa4bc7475d1be270db9f4109fca00"
|
||||
sha="8c4db1eb8460d749c998a0e033b3939123cbc5ac"
|
||||
DownloadURL "$prebuiltUrl" "$prebuiltUrl" "$sha" "$targetFile"
|
||||
tar -xzf "$targetFile" -C "${HOME}"
|
||||
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
#############################################################################
|
||||
##
|
||||
## Copyright (C) 2020 The Qt Company Ltd.
|
||||
## Copyright (C) 2021 The Qt Company Ltd.
|
||||
## Contact: http://www.qt.io/licensing/
|
||||
##
|
||||
## This file is part of the provisioning scripts of the Qt Toolkit.
|
||||
@@ -42,11 +42,11 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
|
||||
# shellcheck source=../unix/SetEnvVar.sh
|
||||
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
|
||||
|
||||
version="1.1.1g"
|
||||
version="1.1.1k"
|
||||
officialUrl="https://www.openssl.org/source/openssl-$version.tar.gz"
|
||||
cachedUrl="http://ci-files01-hki.intra.qt.io/input/openssl/openssl-$version.tar.gz"
|
||||
targetFile="/tmp/openssl-$version.tar.gz"
|
||||
sha="b213a293f2127ec3e323fb3cfc0c9807664fd997"
|
||||
sha="bad9dc4ae6dcc1855085463099b5dacb0ec6130b"
|
||||
opensslHome="${HOME}/openssl-${version}"
|
||||
opensslSource="${opensslHome}-src"
|
||||
DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile"
|
||||
|
||||
@@ -45,11 +45,11 @@ if (Is64BitWinHost) {
|
||||
# Msys need to be installed to target machine
|
||||
# More info and building instructions can be found from http://doc.qt.io/qt-5/opensslsupport.html
|
||||
|
||||
$version = "1.1.1g"
|
||||
$version = "1.1.1k"
|
||||
$zip = Get-DownloadLocation ("openssl-$version.tar.gz")
|
||||
$prebuilt_zip = Get-DownloadLocation ("openssl-android-master-$version.zip")
|
||||
$sha1 = "b213a293f2127ec3e323fb3cfc0c9807664fd997"
|
||||
$prebuilt_sha1 = "d799f54e402c00eaa2633d54df1e8295bfac3d7b"
|
||||
$sha1 = "bad9dc4ae6dcc1855085463099b5dacb0ec6130b"
|
||||
$prebuilt_sha1 = "07fad2a44ffa90261a779782bd64fe2304487945"
|
||||
$destination = "C:\Utils\openssl-android-master"
|
||||
$prebuilt_url = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-android-master-$version.zip"
|
||||
|
||||
|
||||
@@ -51,8 +51,8 @@ $ndkZip = "c:\Windows\Temp\android_ndk_$ndkVersion.zip"
|
||||
$toolsVersion = "2.1"
|
||||
$toolsFile = "commandlinetools-win-6609375_latest.zip"
|
||||
$sdkApi = "ANDROID_API_VERSION"
|
||||
$sdkApiLevel = "android-28"
|
||||
$sdkBuildToolsVersion = "28.0.3"
|
||||
$sdkApiLevel = "android-29"
|
||||
$sdkBuildToolsVersion = "29.0.3"
|
||||
$toolsCachedUrl= "\\ci-files01-hki.intra.qt.io\provisioning\android\$toolsFile"
|
||||
$toolsOfficialUrl = "https://dl.google.com/android/repository/$toolsFile"
|
||||
$toolsChecksum = "e2e19c2ff584efa87ef0cfdd1987f92881323208"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
#############################################################################
|
||||
##
|
||||
## Copyright (C) 2020 The Qt Company Ltd.
|
||||
## Copyright (C) 2021 The Qt Company Ltd.
|
||||
## Contact: http://www.qt.io/licensing/
|
||||
##
|
||||
## This file is part of the provisioning scripts of the Qt Toolkit.
|
||||
@@ -36,7 +36,7 @@
|
||||
# This script installs OpenSSL $version.
|
||||
# Both x86 and x64 versions needed when x86 integrations are done on x64 machine
|
||||
|
||||
$version = "1_1_1g"
|
||||
$version = "1_1_1k"
|
||||
$packagex64 = "C:\Windows\Temp\Win64OpenSSL-$version.exe"
|
||||
$packagex86 = "C:\Windows\Temp\Win32OpenSSL-$version.exe"
|
||||
|
||||
@@ -47,7 +47,7 @@ if (Is64BitWinHost) {
|
||||
$installFolder = "C:\openssl"
|
||||
$externalUrl = "https://slproweb.com/download/Win64OpenSSL-$version.exe"
|
||||
$internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win64OpenSSL-$version.exe"
|
||||
$sha1 = "7643561c372720f55de51454a707ede334db086e"
|
||||
$sha1 = "ab5367a1f46a3779a870fe2c1a99e03f8ffa3041"
|
||||
|
||||
Write-Host "Fetching from URL ..."
|
||||
Download $externalUrl $internalUrl $packagex64
|
||||
@@ -74,7 +74,7 @@ if (Is64BitWinHost) {
|
||||
|
||||
$externalUrl = "https://slproweb.com/download/Win32OpenSSL-$version.exe"
|
||||
$internalUrl = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\Win32OpenSSL-$version.exe"
|
||||
$sha1 = "c7d4b096c2413d1af819ccb291214fa3c4cece07"
|
||||
$sha1 = "49f5b7fe01d686f706071c9a00d19bd69f2e7371"
|
||||
|
||||
Write-Host "Fetching from URL ..."
|
||||
Download $externalUrl $internalUrl $packagex86
|
||||
|
||||
@@ -35,9 +35,9 @@
|
||||
|
||||
set -ex
|
||||
|
||||
sudo sed -i "s#baseurl=.*#baseurl=http://repo-clones.ci.qt.io/repos/opensuse/distribution/leap/15.2/repo/oss/#g" /etc/zypp/repos.d/repo-oss.repo
|
||||
sudo sed -i "s#baseurl=.*#baseurl=http://repo-clones.ci.qt.io/repos/opensuse/distribution/leap/15.2/repo/non-oss/#g" /etc/zypp/repos.d/repo-non-oss.repo
|
||||
sudo sed -i "s#baseurl=.*#baseurl=http://repo-clones.ci.qt.io/repos/opensuse/update/leap/15.2/oss/#g" /etc/zypp/repos.d/repo-update.repo
|
||||
sudo sed -i "s#baseurl=.*#baseurl=http://repo-clones.ci.qt.io/repos/opensuse/update/leap/15.2/non-oss/#g" /etc/zypp/repos.d/repo-update-non-oss.repo
|
||||
sudo sed -i "s#baseurl=.*#baseurl=http://repo-clones.ci.qt.io/repos/opensuse/distribution/leap/15.3/repo/oss/#g" /etc/zypp/repos.d/repo-oss.repo
|
||||
sudo sed -i "s#baseurl=.*#baseurl=http://repo-clones.ci.qt.io/repos/opensuse/distribution/leap/15.3/repo/non-oss/#g" /etc/zypp/repos.d/repo-non-oss.repo
|
||||
sudo sed -i "s#baseurl=.*#baseurl=http://repo-clones.ci.qt.io/repos/opensuse/update/leap/15.3/oss/#g" /etc/zypp/repos.d/repo-update.repo
|
||||
sudo sed -i "s#baseurl=.*#baseurl=http://repo-clones.ci.qt.io/repos/opensuse/update/leap/15.3/non-oss/#g" /etc/zypp/repos.d/repo-update-non-oss.repo
|
||||
|
||||
sudo zypper lr -u
|
||||
@@ -51,6 +51,9 @@ sudo zypper -nq install cups-devel
|
||||
#speech-dispatcher
|
||||
sudo zypper -nq install libspeechd-devel
|
||||
|
||||
# make
|
||||
sudo zypper -nq install make
|
||||
|
||||
gccVersion="$(gcc --version |grep gcc |cut -b 17-23)"
|
||||
echo "GCC = $gccVersion" >> versions.txt
|
||||
|
||||
@@ -53,9 +53,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"
|
||||
|
||||
ndkVersion="r22b"
|
||||
ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip"
|
||||
sdkBuildToolsVersion="28.0.3"
|
||||
sdkBuildToolsVersion="29.0.3"
|
||||
# this is compile sdk version
|
||||
sdkApiLevel="android-28"
|
||||
sdkApiLevel="android-29"
|
||||
|
||||
toolsSourceFile="$basePath/$toolsFile"
|
||||
ndkSourceFile="$basePath/$ndkFile"
|
||||
|
||||
@@ -53,9 +53,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"
|
||||
|
||||
ndkVersion="r22b"
|
||||
ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip"
|
||||
sdkBuildToolsVersion="28.0.3"
|
||||
sdkBuildToolsVersion="29.0.3"
|
||||
# this is compile sdk version
|
||||
sdkApiLevel="android-28"
|
||||
sdkApiLevel="android-29"
|
||||
|
||||
toolsSourceFile="$basePath/$toolsFile"
|
||||
ndkSourceFile="$basePath/$ndkFile"
|
||||
|
||||
@@ -53,9 +53,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"
|
||||
|
||||
ndkVersion="r22b"
|
||||
ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip"
|
||||
sdkBuildToolsVersion="28.0.3"
|
||||
sdkBuildToolsVersion="29.0.3"
|
||||
# this is compile sdk version
|
||||
sdkApiLevel="android-28"
|
||||
sdkApiLevel="android-29"
|
||||
|
||||
toolsSourceFile="$basePath/$toolsFile"
|
||||
ndkSourceFile="$basePath/$ndkFile"
|
||||
|
||||
2
qt3d
2
qt3d
Submodule qt3d updated: 40b2754dfd...dc9af53fb6
Submodule qt5compat updated: 789e2304ae...8bfe48a3f5
Submodule qtactiveqt updated: 60646d73b5...4d8cd0daf7
2
qtbase
2
qtbase
Submodule qtbase updated: 179b3f6797...ae1921b0ea
2
qtcharts
2
qtcharts
Submodule qtcharts updated: b7ec86468d...6643e1b588
2
qtcoap
2
qtcoap
Submodule qtcoap updated: 9298cdd408...4766482bcb
Submodule qtdatavis3d updated: e27f58aa9e...34ee66db19
Submodule qtdeclarative updated: 41c787b567...feb076d23e
2
qtdoc
2
qtdoc
Submodule qtdoc updated: a9889f9e0e...35162e0a03
Submodule qtimageformats updated: da0e08acfb...f9e0924701
2
qtlottie
2
qtlottie
Submodule qtlottie updated: 28444e1236...68e7c4bb83
2
qtmqtt
2
qtmqtt
Submodule qtmqtt updated: 6cbd930f14...74450afc27
Submodule qtnetworkauth updated: cf1a87456a...3152cf5cc6
2
qtopcua
2
qtopcua
Submodule qtopcua updated: acc43cee31...a2410032e5
2
qtqa
2
qtqa
Submodule qtqa updated: 7fb6de8e0d...1b1510d612
Submodule qtquick3d updated: 0ffc35798b...2293b371db
Submodule qtquickcontrols2 updated: e9ebf5fea7...131230a555
Submodule qtquicktimeline updated: cf110c2aa2...ab8c067bad
Submodule qtrepotools updated: 63796e0140...47b15af0da
2
qtscxml
2
qtscxml
Submodule qtscxml updated: abb003fa7c...705e57a116
Submodule qtshadertools updated: ada359ab14...322f0f8107
2
qtsvg
2
qtsvg
Submodule qtsvg updated: dd0649d1d2...2dca6bc761
2
qttools
2
qttools
Submodule qttools updated: 7fe527d19d...20d0f61e4a
Submodule qttranslations updated: fd663070ec...0155f8957f
Submodule qtvirtualkeyboard updated: 8a885ce1d5...3d5d61ee5d
Submodule qtwayland updated: 875c6c1b7c...1ad265a63f
Reference in New Issue
Block a user