mirror of
git://code.qt.io/qt/qt5.git
synced 2026-01-18 12:56:43 +08:00
Compare commits
34 Commits
v6.5.0-bet
...
6.5.0
| Author | SHA1 | Date | |
|---|---|---|---|
|
477af4ee90 | ||
|
|
9c918a66bf | ||
|
|
c0d3eec46a | ||
|
|
4c8e9d4df8 | ||
|
|
3aef423123 | ||
|
|
58186c83e9 | ||
|
|
d967f3dd49 | ||
|
|
81c96f6324 | ||
|
|
02c59150f4 | ||
|
|
73d7bba181 | ||
|
|
3166a0a7cf | ||
|
|
4258273614 | ||
|
|
121aa7f72f | ||
|
|
d64669c50b | ||
|
|
0b6642c563 | ||
|
|
34980e252b | ||
|
|
0cc11596c1 | ||
|
|
f6b1bf3c96 | ||
|
|
cf2184002d | ||
|
|
f932c386aa | ||
|
|
6e655d52e3 | ||
|
|
fe2271bba3 | ||
|
|
cd22843cae | ||
|
|
aa520141a0 | ||
|
|
e2935f2068 | ||
|
|
fe3876517f | ||
|
|
c46c54fe7d | ||
|
|
270ce23a1b | ||
|
|
09fc2df086 | ||
|
|
5271768423 | ||
|
|
3917d45ac1 | ||
|
|
bdc867146a | ||
|
|
397f2dadd4 | ||
|
|
394f69b2cd |
84
.gitmodules
vendored
84
.gitmodules
vendored
@@ -1,40 +1,40 @@
|
||||
[submodule "qtbase"]
|
||||
path = qtbase
|
||||
url = ../qtbase.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = essential
|
||||
[submodule "qtsvg"]
|
||||
depends = qtbase
|
||||
path = qtsvg
|
||||
url = ../qtsvg.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = addon
|
||||
[submodule "qtdeclarative"]
|
||||
depends = qtbase
|
||||
recommends = qtimageformats qtshadertools qtsvg qtlanguageserver
|
||||
path = qtdeclarative
|
||||
url = ../qtdeclarative.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = essential
|
||||
[submodule "qtactiveqt"]
|
||||
depends = qtbase
|
||||
path = qtactiveqt
|
||||
url = ../qtactiveqt.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = addon
|
||||
[submodule "qtmultimedia"]
|
||||
depends = qtbase qtshadertools
|
||||
recommends = qtdeclarative qtquick3d
|
||||
path = qtmultimedia
|
||||
url = ../qtmultimedia.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = addon
|
||||
[submodule "qttools"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtactiveqt
|
||||
path = qttools
|
||||
url = ../qttools.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = essential
|
||||
[submodule "qtxmlpatterns"]
|
||||
depends = qtbase
|
||||
@@ -47,7 +47,7 @@
|
||||
depends = qttools
|
||||
path = qttranslations
|
||||
url = ../qttranslations.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = essential
|
||||
priority = 30
|
||||
[submodule "qtdoc"]
|
||||
@@ -55,7 +55,7 @@
|
||||
recommends = qtmultimedia
|
||||
path = qtdoc
|
||||
url = ../qtdoc.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = essential
|
||||
priority = 40
|
||||
[submodule "qtrepotools"]
|
||||
@@ -76,21 +76,21 @@
|
||||
recommends = qtdeclarative
|
||||
path = qtlocation
|
||||
url = ../qtlocation.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = preview
|
||||
[submodule "qtpositioning"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtserialport
|
||||
path = qtpositioning
|
||||
url = ../qtpositioning.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = addon
|
||||
[submodule "qtsensors"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtsensors
|
||||
url = ../qtsensors.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = addon
|
||||
[submodule "qtsystems"]
|
||||
depends = qtbase
|
||||
@@ -117,61 +117,61 @@
|
||||
recommends = qtdeclarative
|
||||
path = qtconnectivity
|
||||
url = ../qtconnectivity.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = addon
|
||||
[submodule "qtwayland"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwayland
|
||||
url = ../qtwayland.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = addon
|
||||
[submodule "qt3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtshadertools
|
||||
path = qt3d
|
||||
url = ../qt3d.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = addon
|
||||
[submodule "qtimageformats"]
|
||||
depends = qtbase
|
||||
path = qtimageformats
|
||||
url = ../qtimageformats.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = addon
|
||||
[submodule "qtserialbus"]
|
||||
depends = qtbase
|
||||
recommends = qtserialport
|
||||
path = qtserialbus
|
||||
url = ../qtserialbus.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = addon
|
||||
[submodule "qtserialport"]
|
||||
depends = qtbase
|
||||
path = qtserialport
|
||||
url = ../qtserialport.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = addon
|
||||
[submodule "qtwebsockets"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwebsockets
|
||||
url = ../qtwebsockets.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = addon
|
||||
[submodule "qtwebchannel"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtwebsockets
|
||||
path = qtwebchannel
|
||||
url = ../qtwebchannel.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = addon
|
||||
[submodule "qtwebengine"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtwebchannel qttools qtpositioning
|
||||
path = qtwebengine
|
||||
url = ../qtwebengine.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = addon
|
||||
priority = 10
|
||||
[submodule "qtcanvas3d"]
|
||||
@@ -185,28 +185,28 @@
|
||||
recommends = qtwebengine
|
||||
path = qtwebview
|
||||
url = ../qtwebview.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = addon
|
||||
[submodule "qtcharts"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtcharts
|
||||
url = ../qtcharts.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = addon
|
||||
[submodule "qtdatavis3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtdatavis3d
|
||||
url = ../qtdatavis3d.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = addon
|
||||
[submodule "qtvirtualkeyboard"]
|
||||
depends = qtbase qtdeclarative qtsvg
|
||||
recommends = qtmultimedia
|
||||
path = qtvirtualkeyboard
|
||||
url = ../qtvirtualkeyboard.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = addon
|
||||
[submodule "qtgamepad"]
|
||||
depends = qtbase
|
||||
@@ -219,27 +219,27 @@
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtscxml
|
||||
url = ../qtscxml.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = addon
|
||||
[submodule "qtspeech"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtspeech
|
||||
url = ../qtspeech.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = addon
|
||||
[submodule "qtnetworkauth"]
|
||||
depends = qtbase
|
||||
path = qtnetworkauth
|
||||
url = ../qtnetworkauth.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = addon
|
||||
[submodule "qtremoteobjects"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtremoteobjects
|
||||
url = ../qtremoteobjects.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = addon
|
||||
[submodule "qtwebglplugin"]
|
||||
depends = qtbase qtwebsockets
|
||||
@@ -252,80 +252,80 @@
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtlottie
|
||||
url = ../qtlottie.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = addon
|
||||
[submodule "qtquicktimeline"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtquicktimeline
|
||||
url = ../qtquicktimeline
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = addon
|
||||
[submodule "qtquick3d"]
|
||||
depends = qtbase qtdeclarative qtshadertools
|
||||
recommends = qtquicktimeline
|
||||
path = qtquick3d
|
||||
url = ../qtquick3d.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = addon
|
||||
[submodule "qtshadertools"]
|
||||
depends = qtbase
|
||||
path = qtshadertools
|
||||
url = ../qtshadertools.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = addon
|
||||
[submodule "qt5compat"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qt5compat
|
||||
url = ../qt5compat.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = deprecated
|
||||
[submodule "qtcoap"]
|
||||
depends = qtbase
|
||||
path = qtcoap
|
||||
url = ../qtcoap.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = addon
|
||||
[submodule "qtmqtt"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtmqtt
|
||||
url = ../qtmqtt.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = addon
|
||||
[submodule "qtopcua"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtopcua
|
||||
url = ../qtopcua.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = addon
|
||||
[submodule "qtlanguageserver"]
|
||||
depends = qtbase
|
||||
path = qtlanguageserver
|
||||
url = ../qtlanguageserver.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = preview
|
||||
[submodule "qthttpserver"]
|
||||
depends = qtbase
|
||||
recommends = qtwebsockets
|
||||
path = qthttpserver
|
||||
url = ../qthttpserver.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = preview
|
||||
[submodule "qtquick3dphysics"]
|
||||
depends = qtbase qtdeclarative qtquick3d qtshadertools
|
||||
path = qtquick3dphysics
|
||||
url = ../qtquick3dphysics.git
|
||||
branch = 6.5
|
||||
status = preview
|
||||
branch = 6.5.0
|
||||
status = addon
|
||||
[submodule "qtgrpc"]
|
||||
depends = qtbase
|
||||
path = qtgrpc
|
||||
url = ../qtgrpc.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = preview
|
||||
[submodule "qtquickeffectmaker"]
|
||||
depends = qtbase qtdeclarative qtshadertools
|
||||
recommends = qtquick3d
|
||||
path = qtquickeffectmaker
|
||||
url = ../qtquickeffectmaker.git
|
||||
branch = 6.5
|
||||
branch = 6.5.0
|
||||
status = addon
|
||||
|
||||
@@ -9,5 +9,6 @@ Configurations:
|
||||
Environment variables: [
|
||||
'PATH={{.Env.CMAKE_MIN_SUPPORTED_BIN_PATH}}:{{.Env.PATH}}',
|
||||
'CONAN_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc-debug-developer',
|
||||
'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}'
|
||||
'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}',
|
||||
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'
|
||||
]
|
||||
|
||||
@@ -8,15 +8,15 @@ Include: [
|
||||
]
|
||||
Configurations:
|
||||
-
|
||||
Id: 'ubuntu-20.04-documentation'
|
||||
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
|
||||
Id: 'ubuntu-22.04-documentation'
|
||||
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
|
||||
Compiler: 'GCC'
|
||||
Features: ['Sccache', 'Documentation', 'TestDocs', 'UseConfigure']
|
||||
Configure arguments: '-make examples -developer-build -c++std c++20 -linker gold -no-warnings-are-errors -qtlibinfix TestInfix -qtnamespace TestNamespace'
|
||||
Environment variables: ['NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}']
|
||||
-
|
||||
Id: 'ubuntu-20.04'
|
||||
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
|
||||
Id: 'ubuntu-22.04'
|
||||
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
|
||||
Compiler: 'GCC'
|
||||
Features: ['Sccache', 'UseConfigure']
|
||||
Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -headersclean -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
|
||||
@@ -33,7 +33,8 @@ Configurations:
|
||||
Environment variables: [
|
||||
'PATH={{.Env.CMAKE_MIN_SUPPORTED_BIN_PATH}}:{{.Env.PATH}}',
|
||||
'CONAN_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc-debug-developer',
|
||||
'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}'
|
||||
'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}',
|
||||
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'
|
||||
]
|
||||
-
|
||||
Id: 'sles-15_sp4-static'
|
||||
@@ -42,7 +43,8 @@ Configurations:
|
||||
Features: ['Sccache', 'DisableTests', 'UseConfigure']
|
||||
Configure arguments: '-nomake examples -static -no-sql-mysql'
|
||||
Environment variables: [
|
||||
'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}'
|
||||
'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}',
|
||||
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'
|
||||
]
|
||||
-
|
||||
Id: 'windows-10_22h2-msvc2019'
|
||||
@@ -133,7 +135,7 @@ Configurations:
|
||||
Template: 'qtci-windows-11_22H2-x86_64-50'
|
||||
Compiler: 'MSVC2019'
|
||||
Features: ['Sccache', "DebugAndRelease", 'WarningsAreErrors', 'UseConfigure']
|
||||
Configure arguments: '-debug-and-release -make examples -developer-build -force-debug-info -qt-zlib'
|
||||
Configure arguments: '-debug-and-release -make examples -developer-build -force-debug-info -qt-zlib -c++std c++20'
|
||||
Environment variables: [
|
||||
'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\..',
|
||||
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}}',
|
||||
@@ -161,6 +163,17 @@ Configurations:
|
||||
Compiler: 'GCC'
|
||||
Features: ['Packaging', 'Sccache', 'UseConfigure', 'InstallQt5Dependencies']
|
||||
Configure arguments: '-nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
|
||||
Environment variables: [
|
||||
'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}',
|
||||
'CONAN_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc',
|
||||
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR}}'
|
||||
]
|
||||
-
|
||||
Id: 'rhel-9.0'
|
||||
Template: 'qtci-linux-RHEL-9.0-x86_64-50'
|
||||
Compiler: 'GCC'
|
||||
Features: ['Sccache', 'UseConfigure', 'InstallQt5Dependencies']
|
||||
Configure arguments: '-nomake examples -release -force-debug-info -headersclean -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -qt-doubleconversion -no-libudev -bundled-xcb-xinput'
|
||||
Environment variables: [
|
||||
'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY',
|
||||
'CONAN_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc',
|
||||
|
||||
@@ -2,11 +2,11 @@ Version: 2
|
||||
Configurations:
|
||||
-
|
||||
Id: 'qemu-armv7-developer-build'
|
||||
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
|
||||
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
|
||||
Target os: 'QEMU'
|
||||
Target arch: 'armv7'
|
||||
Compiler: 'GCC'
|
||||
Platform dependency: 'ubuntu-20.04'
|
||||
Platform dependency: 'ubuntu-22.04'
|
||||
Features: ['Sccache', 'UseConfigure']
|
||||
Environment variables: [
|
||||
'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-warnings-are-errors -make examples -qt-harfbuzz -device linux-imx7-g++ -device-option "CROSS_COMPILE={{.Env.QEMUARMV7_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=hard-float boot2qt" -no-feature-forkfd_pidfd',
|
||||
@@ -19,11 +19,11 @@ Configurations:
|
||||
]
|
||||
-
|
||||
Id: 'qemu-arm64-developer-build'
|
||||
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
|
||||
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
|
||||
Target os: 'QEMU'
|
||||
Target arch: 'arm64'
|
||||
Compiler: 'GCC'
|
||||
Platform dependency: 'ubuntu-20.04'
|
||||
Platform dependency: 'ubuntu-22.04'
|
||||
Features: ['Sccache', 'UseConfigure']
|
||||
Environment variables: [
|
||||
'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-warnings-are-errors -nomake examples -qt-harfbuzz -device linux-generic-g++ -device-option "CROSS_COMPILE={{.Env.QEMUARM64_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=boot2qt" -no-feature-forkfd_pidfd',
|
||||
@@ -36,11 +36,11 @@ Configurations:
|
||||
]
|
||||
-
|
||||
Id: 'qemu-mips64-developer-build'
|
||||
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
|
||||
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
|
||||
Target os: 'QEMU'
|
||||
Target arch: 'mips64'
|
||||
Compiler: 'GCC'
|
||||
Platform dependency: 'ubuntu-20.04'
|
||||
Platform dependency: 'ubuntu-22.04'
|
||||
Features: ['Sccache', 'DisableTests', 'UseConfigure']
|
||||
Environment variables: [
|
||||
'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-warnings-are-errors -nomake examples -qt-harfbuzz -device linux-generic-g++ -device-option "CROSS_COMPILE={{.Env.QEMUMIPS64_TOOLCHAIN_CROSS_COMPILE}}" -device-option "DISTRO_OPTS=boot2qt" -no-feature-forkfd_pidfd',
|
||||
|
||||
@@ -2,12 +2,12 @@ Version: 2
|
||||
Configurations:
|
||||
-
|
||||
Id: 'qnx-710-x86_64-developer-build-on-linux'
|
||||
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
|
||||
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
|
||||
Target os: 'QNX_710'
|
||||
Target arch: 'x86_64'
|
||||
Compiler: 'GCC'
|
||||
Target compiler: 'QCC'
|
||||
Platform dependency: 'ubuntu-20.04'
|
||||
Platform dependency: 'ubuntu-22.04'
|
||||
Features: ['Packaging', 'VMSize8', 'UseConfigure']
|
||||
Environment variables: [
|
||||
'TARGET_CONFIGURE_ARGS=-release -force-debug-info -developer-build -no-dbus -nomake examples',
|
||||
@@ -17,12 +17,12 @@ Configurations:
|
||||
]
|
||||
-
|
||||
Id: 'qnx-710-arm64-on-linux'
|
||||
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
|
||||
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
|
||||
Target os: 'QNX_710'
|
||||
Target arch: 'arm64'
|
||||
Compiler: 'GCC'
|
||||
Target compiler: 'QCC'
|
||||
Platform dependency: 'ubuntu-20.04'
|
||||
Platform dependency: 'ubuntu-22.04'
|
||||
Features: ['Packaging', 'DisableTests', 'UseConfigure']
|
||||
Environment variables: [
|
||||
'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples',
|
||||
@@ -30,12 +30,12 @@ Configurations:
|
||||
]
|
||||
-
|
||||
Id: 'qnx-710-armv7-on-linux'
|
||||
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
|
||||
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
|
||||
Target os: 'QNX_710'
|
||||
Target arch: 'armv7'
|
||||
Compiler: 'GCC'
|
||||
Target compiler: 'QCC'
|
||||
Platform dependency: 'ubuntu-20.04'
|
||||
Platform dependency: 'ubuntu-22.04'
|
||||
Features: ['Packaging', 'DisableTests', 'UseConfigure']
|
||||
Environment variables: [
|
||||
'TARGET_CONFIGURE_ARGS=-release -force-debug-info -no-dbus -nomake examples',
|
||||
|
||||
@@ -47,6 +47,7 @@ Configurations:
|
||||
Environment variables: [
|
||||
'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
|
||||
'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
|
||||
'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}',
|
||||
'CONAN_HOST_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc',
|
||||
'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-x86-clang',
|
||||
'ANDROID_EMULATOR=@emulator_x86_api_23',
|
||||
@@ -64,6 +65,7 @@ Configurations:
|
||||
Environment variables: [
|
||||
'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
|
||||
'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
|
||||
'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}',
|
||||
'CONAN_HOST_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc',
|
||||
'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-x86_64-clang',
|
||||
'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}'
|
||||
|
||||
@@ -12,7 +12,7 @@ Configurations:
|
||||
Environment variables: [
|
||||
'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
|
||||
'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON',
|
||||
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}',
|
||||
'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}',
|
||||
'CONAN_HOST_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc',
|
||||
'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-x86_64-clang',
|
||||
'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}',
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
Version: 2
|
||||
Configurations:
|
||||
-
|
||||
Id: 'ubuntu-20.04-license-check'
|
||||
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
|
||||
Id: 'ubuntu-22.04-license-check'
|
||||
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
|
||||
Compiler: 'GCC'
|
||||
Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions']
|
||||
|
||||
@@ -34,6 +34,6 @@ Configurations:
|
||||
Features: ['Packaging', 'UseLegacyInstructions']
|
||||
Configure arguments: '-qmake -opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -openssl -qt-harfbuzz QMAKE_LFLAGS_APP+=-s -static -no-icu'
|
||||
-
|
||||
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
|
||||
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
|
||||
Compiler: 'GCC'
|
||||
Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions']
|
||||
|
||||
@@ -2,13 +2,13 @@ Version: 2
|
||||
Configurations:
|
||||
-
|
||||
Id: "integrity-arm64"
|
||||
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
|
||||
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
|
||||
Compiler: 'GCC'
|
||||
Target os: 'INTEGRITY'
|
||||
Platform dependency: 'ubuntu-20.04'
|
||||
Platform dependency: 'ubuntu-22.04'
|
||||
Features: ['MinimalStaticTests', 'DoNotRunTests', 'VMSize16', 'UseConfigure']
|
||||
Environment variables: [
|
||||
'TARGET_CONFIGURE_ARGS=-nomake examples -device integrity-armv8-SA8155P -no-feature-library -no-feature-printdialog -no-dbus -no-feature-gtk3 -no-feature-glib -no-feature-libudev -qt-harfbuzz -qt-pcre -no-sql-mysql',
|
||||
'TARGET_CONFIGURE_ARGS=-nomake examples -device integrity-armv8-SA8155P -no-feature-library -no-feature-printdialog -no-dbus -no-feature-gtk3 -no-feature-glib -no-feature-libudev -qt-harfbuzz -qt-pcre -no-sql-mysql -no-feature-brotli',
|
||||
'TARGET_CMAKE_ARGS=-DCMAKE_TOOLCHAIN_FILE=/home/qt/integrity_toolchain/toolchain.cmake -DCMAKE_C_COMPILER=cxintarm64 -DCMAKE_CXX_COMPILER=cxintarm64 -DBUILD_qtdoc=OFF -DBUILD_qttranslations=OFF -DUNIX=ON --debug-trycompile',
|
||||
'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_system_webp=OFF -DQT_FEATURE_timezone=OFF',
|
||||
'INTEGRITY_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/integrity',
|
||||
|
||||
@@ -2,42 +2,42 @@ Version: 2
|
||||
Module only: True
|
||||
Configurations:
|
||||
-
|
||||
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
|
||||
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
|
||||
Compiler: 'Yocto'
|
||||
Target arch: 'TARGET1'
|
||||
-
|
||||
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
|
||||
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
|
||||
Compiler: 'Yocto'
|
||||
Target arch: 'TARGET2'
|
||||
-
|
||||
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
|
||||
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
|
||||
Compiler: 'Yocto'
|
||||
Target arch: 'TARGET3'
|
||||
-
|
||||
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
|
||||
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
|
||||
Compiler: 'Yocto'
|
||||
Target arch: 'TARGET4'
|
||||
-
|
||||
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
|
||||
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
|
||||
Compiler: 'Yocto'
|
||||
Target arch: 'TARGET5'
|
||||
-
|
||||
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
|
||||
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
|
||||
Compiler: 'Yocto'
|
||||
Target arch: 'TARGET6'
|
||||
-
|
||||
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
|
||||
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
|
||||
Compiler: 'Yocto'
|
||||
Target arch: 'TARGET7'
|
||||
-
|
||||
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
|
||||
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
|
||||
Compiler: 'Yocto'
|
||||
Target arch: 'TARGET8'
|
||||
-
|
||||
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
|
||||
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
|
||||
Compiler: 'Yocto'
|
||||
Target arch: 'TARGET9'
|
||||
-
|
||||
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
|
||||
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
|
||||
Compiler: 'Yocto'
|
||||
Target arch: 'TARGET10'
|
||||
|
||||
@@ -2,7 +2,7 @@ Version: 2
|
||||
Module only: True
|
||||
Include: [
|
||||
cmake_platforms.yaml: [
|
||||
"ubuntu-20.04",
|
||||
"ubuntu-22.04",
|
||||
"windows-10_22h2-msvc2019-developer-build",
|
||||
"ios-universal"
|
||||
],
|
||||
|
||||
@@ -3,7 +3,7 @@ Module only: True
|
||||
Include: [cmake_platforms.yaml]
|
||||
Configurations:
|
||||
-
|
||||
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
|
||||
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
|
||||
Compiler: 'GCC'
|
||||
Features: ['TestOnly', 'LicenseCheck']
|
||||
|
||||
|
||||
@@ -14,6 +14,6 @@ Configurations:
|
||||
Compiler: 'GCC'
|
||||
Features: ['DisableTests']
|
||||
-
|
||||
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
|
||||
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
|
||||
Compiler: 'GCC'
|
||||
Features: ['TestOnly', 'LicenseCheck', 'UseLegacyInstructions']
|
||||
|
||||
@@ -22,7 +22,7 @@ Configurations:
|
||||
Configure arguments: ''
|
||||
Environment variables: []
|
||||
-
|
||||
Template: 'qtci-linux-RHEL-9.0-x86_64-500'
|
||||
Template: 'qtci-linux-RHEL-9.0-x86_64-50'
|
||||
Compiler: 'GCC'
|
||||
Features: ['Qt5', 'Sccache', 'DebugAndRelease']
|
||||
Configure arguments: ''
|
||||
@@ -34,6 +34,6 @@ Configurations:
|
||||
Configure arguments: ''
|
||||
Environment variables: []
|
||||
-
|
||||
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
|
||||
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
|
||||
Compiler: 'GCC'
|
||||
Features: ['TestOnly', 'LicenseCheck']
|
||||
|
||||
@@ -2,8 +2,8 @@ Version: 2
|
||||
Include: [ cmake_platforms_target_android.yaml ]
|
||||
Configurations:
|
||||
-
|
||||
Id: 'automotive-ubuntu-20.04-documentation'
|
||||
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
|
||||
Id: 'automotive-ubuntu-22.04-documentation'
|
||||
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
|
||||
Compiler: 'GCC'
|
||||
Features: ['Sccache', 'Documentation', 'TestDocs', 'UseConfigure']
|
||||
Configure arguments: '-make examples -developer-build -c++std c++20 -linker gold -no-warnings-are-errors -qtlibinfix TestInfix -qtnamespace TestNamespace'
|
||||
|
||||
@@ -3,7 +3,7 @@ Module only: True
|
||||
Include: [cmake_platforms.yaml]
|
||||
Configurations:
|
||||
-
|
||||
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
|
||||
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
|
||||
Compiler: 'GCC'
|
||||
Features: ['TestOnly', 'LicenseCheck']
|
||||
|
||||
|
||||
@@ -63,8 +63,8 @@ toolsVersion="2.1"
|
||||
toolsFile="commandlinetools-linux-6609375_latest.zip"
|
||||
ndkVersionLatest="r25b"
|
||||
ndkVersionDefault=$ndkVersionLatest
|
||||
sdkBuildToolsVersion="31.0.0"
|
||||
sdkApiLevel="android-31"
|
||||
sdkBuildToolsVersion="33.0.1"
|
||||
sdkApiLevel="android-33"
|
||||
|
||||
toolsSha1="9172381ff070ee2a416723c1989770cf4b0d1076"
|
||||
ndkSha1Latest="e27dcb9c8bcaa77b78ff68c3f23abcf6867959eb"
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
#############################################################################
|
||||
##
|
||||
## Copyright (C) 2019 The Qt Company Ltd.
|
||||
## Copyright (C) 2023 The Qt Company Ltd.
|
||||
## Contact: https://www.qt.io/licensing/
|
||||
##
|
||||
## This file is part of the provisioning scripts of the Qt Toolkit.
|
||||
@@ -48,12 +48,12 @@ PROVISIONING_DIR="$(dirname "$0")/../../"
|
||||
|
||||
|
||||
localRepo=http://ci-files01-hki.intra.qt.io/input/docker
|
||||
upstreamRepo=https://download.docker.com/linux/ubuntu/dists/bionic/pool/stable/amd64
|
||||
upstreamRepo=https://download.docker.com/linux/ubuntu/dists/focal/pool/stable/amd64/
|
||||
|
||||
echo '
|
||||
f4c941807310e3fa470dddfb068d599174a3daec containerd.io_1.2.10-3_amd64.deb
|
||||
ee640d9258fd4d3f4c7017ab2a71da63cbbead55 docker-ce_19.03.4~3-0~ubuntu-bionic_amd64.deb
|
||||
09402bf5dac40f0c50f1071b17f38f6584a42ad1 docker-ce-cli_19.03.4~3-0~ubuntu-bionic_amd64.deb
|
||||
2666840157bab3b77a850236fbf323c423fb564a containerd.io_1.6.9-1_amd64.deb
|
||||
ec6a1ad99b19b6a674349fb13bcc10d62c54c404 docker-ce_23.0.0-1~ubuntu.20.04~focal_amd64.deb
|
||||
130774916fa7e2c9997b8fcb4e7696a343f12fb0 docker-ce-cli_23.0.0-1~ubuntu.20.04~focal_amd64.deb
|
||||
' \
|
||||
| xargs -n2 | while read sha f
|
||||
do
|
||||
@@ -68,10 +68,11 @@ sudo docker --version
|
||||
|
||||
# Download and install the docker-compose extension from https://github.com/docker/compose/releases
|
||||
f=docker-compose-$(uname -s)-$(uname -m)
|
||||
dockerComposeVersion="v2.15.1"
|
||||
DownloadURL \
|
||||
$localRepo/$f-1.24.1 \
|
||||
https://github.com/docker/compose/releases/download/1.24.1/$f \
|
||||
cfb3439956216b1248308141f7193776fcf4b9c9b49cbbe2fb07885678e2bb8a
|
||||
$localRepo/$f-${dockerComposeVersion} \
|
||||
https://github.com/docker/compose/releases/download/${dockerComposeVersion}/$f \
|
||||
bcfd9ea51dee4c19dccdfaeef0e7956ef68bf14f3d175933742061a7271ef0f5
|
||||
sudo install -m 755 ./docker-compose* /usr/local/bin/docker-compose
|
||||
sudo docker-compose --version
|
||||
rm ./docker-compose*
|
||||
|
||||
@@ -59,9 +59,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"
|
||||
|
||||
ndkVersionLatest="r25b"
|
||||
ndkVersionDefault="$ndkVersionLatest"
|
||||
sdkBuildToolsVersion="31.0.0"
|
||||
sdkBuildToolsVersion="33.0.1"
|
||||
# this is compile sdk version
|
||||
sdkApiLevel="android-31"
|
||||
sdkApiLevel="android-33"
|
||||
|
||||
toolsSourceFile="$basePath/$toolsFile"
|
||||
|
||||
|
||||
@@ -143,10 +143,6 @@ build_ffmpeg_android() {
|
||||
}
|
||||
|
||||
if [ "$os" == "linux" ]; then
|
||||
if [ -f /etc/redhat-release ]
|
||||
then sudo yum -y install yasm
|
||||
else sudo apt install yasm
|
||||
fi
|
||||
build_ffmpeg
|
||||
sudo mv "$ffmpeg_source_dir/build/installed/usr/local/$ffmpeg_name" "/usr/local"
|
||||
SetEnvVar "FFMPEG_DIR" "/usr/local/$ffmpeg_name"
|
||||
@@ -181,13 +177,14 @@ elif [ "$os" == "android" ]; then
|
||||
target_arch=x86_64
|
||||
sha1="0241fd483c16f4ce53206b911214b06854cdef9d"
|
||||
url_cached="http://ci-files01-hki.intra.qt.io/input/ffmpeg/android-ffmpeg-x86_64.zip"
|
||||
target_dir="/opt/android/$ffmpeg_name/ffmpeg-x86_64"
|
||||
else
|
||||
target_arch=x86
|
||||
url_cached="http://ci-files01-hki.intra.qt.io/input/ffmpeg/android-ffmpeg-x86.zip"
|
||||
sha1="8b254e31411a350edb581bb30e31401866abbe7d"
|
||||
target_dir="/opt/android/$ffmpeg_name/ffmpeg-x86"
|
||||
fi
|
||||
|
||||
target_dir="/opt/android/$ffmpeg_name"
|
||||
app_prefix=""
|
||||
|
||||
#try install a pre-build
|
||||
|
||||
@@ -67,7 +67,7 @@ installPrefix="$HOME/install-grpc-$version"
|
||||
targetDir="$HOME/grpc-$version"
|
||||
targetFile="$targetDir.zip"
|
||||
DownloadURL "$internalUrl" "$externalUrl" "$sha1" "$targetFile"
|
||||
unzip "$targetFile" -d "$HOME"
|
||||
unzip -q "$targetFile" -d "$HOME"
|
||||
sudo rm "$targetFile"
|
||||
|
||||
# devtoolset is needed when running configuration
|
||||
@@ -77,10 +77,17 @@ fi
|
||||
|
||||
if uname -a |grep -q Darwin; then
|
||||
extraCMakeArgs="-DCMAKE_OSX_ARCHITECTURES=x86_64;arm64 -DCMAKE_OSX_DEPLOYMENT_TARGET=11"
|
||||
extraOpenSslArg=-DOPENSSL_ROOT_DIR=$OPENSSL_DIR
|
||||
SetEnvVar PATH "\$PATH:$installPrefix/bin"
|
||||
fi
|
||||
|
||||
# MacOS
|
||||
if [[ -n "$OPENSSL_DIR" ]]; then
|
||||
extraOpenSslArg=-DOPENSSL_ROOT_DIR=$OPENSSL_DIR
|
||||
# Linux
|
||||
elif [[ -n "$OPENSSL_HOME" ]]; then
|
||||
extraOpenSslArg=-DOPENSSL_ROOT_DIR=$OPENSSL_HOME
|
||||
fi
|
||||
|
||||
echo "Configuring and building gRPC"
|
||||
|
||||
buildDir="$HOME/build-grpc-$version"
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
#############################################################################
|
||||
##
|
||||
## Copyright (C) 2020 The Qt Company Ltd.
|
||||
## Copyright (C) 2022 The Qt Company Ltd.
|
||||
## Contact: https://www.qt.io/licensing/
|
||||
##
|
||||
## This file is part of the provisioning scripts of the Qt Toolkit.
|
||||
@@ -53,6 +53,9 @@ source "${BASH_SOURCE%/*}/SetEnvVar.sh"
|
||||
# shellcheck source=./DownloadURL.sh
|
||||
source "${BASH_SOURCE%/*}/DownloadURL.sh"
|
||||
|
||||
PROVISIONING_DIR="$(dirname "$0")/../../"
|
||||
. "$PROVISIONING_DIR"/common/unix/common.sourced.sh
|
||||
|
||||
libclang_version="15.0.0"
|
||||
|
||||
if uname -a |grep -q Darwin; then
|
||||
@@ -65,6 +68,11 @@ elif test -f /etc/redhat-release && cat /etc/redhat-release | grep "Red Hat" | g
|
||||
url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version}-based-linux-Rhel8.4-gcc10.0-x86_64.7z"
|
||||
url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version}-based-linux-Rhel8.4-gcc10.0-x86_64.7z"
|
||||
sha1="6ca035bb522022d34d61759e0460845832933b5c"
|
||||
elif [ "$PROVISIONING_OS_ID" = ubuntu ]; then
|
||||
version=$libclang_version
|
||||
url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version}-based-linux-Ubuntu22.04-gcc11.2-x86_64.7z"
|
||||
url_cached="http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_${version}-based-linux-Ubuntu22.04-gcc11.2-x86_64.7z"
|
||||
sha1="dd170ec762a7ec8ac84b4b5cac3a422514e5b030"
|
||||
else
|
||||
version=$libclang_version
|
||||
url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version}-based-linux-Ubuntu20.04-gcc9.3-x86_64.7z"
|
||||
|
||||
@@ -62,8 +62,8 @@ $ndkZip = "c:\Windows\Temp\android_ndk.zip"
|
||||
$toolsVersion = "2.1"
|
||||
$toolsFile = "commandlinetools-win-6609375_latest.zip"
|
||||
$sdkApi = "ANDROID_API_VERSION"
|
||||
$sdkApiLevel = "android-31"
|
||||
$sdkBuildToolsVersion = "31.0.0"
|
||||
$sdkApiLevel = "android-33"
|
||||
$sdkBuildToolsVersion = "33.0.1"
|
||||
$toolsCachedUrl= "\\ci-files01-hki.intra.qt.io\provisioning\android\$toolsFile"
|
||||
$toolsOfficialUrl = "https://dl.google.com/android/repository/$toolsFile"
|
||||
$toolsChecksum = "e2e19c2ff584efa87ef0cfdd1987f92881323208"
|
||||
|
||||
@@ -78,6 +78,8 @@ installPackages+=(dbus-devel)
|
||||
installPackages+=(gstreamer1-plugins-bad-free)
|
||||
installPackages+=(gstreamer1-devel)
|
||||
installPackages+=(gstreamer1-plugins-base-devel)
|
||||
# yasm for QtMultimedia
|
||||
installPackages+=(yasm)
|
||||
# gtk3 style for QtGui/QStyle
|
||||
installPackages+=(gtk3-devel)
|
||||
# libusb1 for tqtc-boot2qt/qdb
|
||||
|
||||
@@ -0,0 +1,3 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux"
|
||||
@@ -78,6 +78,8 @@ installPackages+=(dbus-devel)
|
||||
installPackages+=(gstreamer1-plugins-bad-free)
|
||||
installPackages+=(gstreamer1-devel)
|
||||
installPackages+=(gstreamer1-plugins-base-devel)
|
||||
# yasm for QtMultimedia
|
||||
installPackages+=(yasm)
|
||||
# gtk3 style for QtGui/QStyle
|
||||
installPackages+=(gtk3-devel)
|
||||
# libusb1 for tqtc-boot2qt/qdb
|
||||
|
||||
@@ -0,0 +1,3 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux"
|
||||
@@ -48,6 +48,7 @@ installPackages=()
|
||||
installPackages+=(git)
|
||||
installPackages+=(zlib-devel)
|
||||
installPackages+=(glib2-devel)
|
||||
installPackages+=(openssl3)
|
||||
installPackages+=(openssl3-devel)
|
||||
installPackages+=(freetype-devel)
|
||||
installPackages+=(fontconfig-devel)
|
||||
@@ -78,6 +79,8 @@ installPackages+=(dbus-devel)
|
||||
installPackages+=(gstreamer1-plugins-bad-free)
|
||||
installPackages+=(gstreamer1-devel)
|
||||
installPackages+=(gstreamer1-plugins-base-devel)
|
||||
# yasm for QtMultimedia
|
||||
installPackages+=(yasm)
|
||||
# gtk3 style for QtGui/QStyle
|
||||
installPackages+=(gtk3-devel)
|
||||
# libusb1 for tqtc-boot2qt/qdb
|
||||
|
||||
8
coin/provisioning/qtci-linux-RHEL-8.4-x86_64/09-openssl.sh
Executable file
8
coin/provisioning/qtci-linux-RHEL-8.4-x86_64/09-openssl.sh
Executable file
@@ -0,0 +1,8 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
set -ex
|
||||
|
||||
# Required by Rhel source build
|
||||
sudo yum -y install perl-IPC-Cmd
|
||||
|
||||
"$(dirname "$0")/../common/unix/install-openssl.sh" "linux"
|
||||
@@ -79,6 +79,8 @@ installPackages+=(dbus-devel)
|
||||
installPackages+=(gstreamer1-plugins-bad-free)
|
||||
installPackages+=(gstreamer1-devel)
|
||||
installPackages+=(gstreamer1-plugins-base-devel)
|
||||
# yasm for QtMultimedia
|
||||
installPackages+=(yasm)
|
||||
# gtk3 style for QtGui/QStyle
|
||||
installPackages+=(gtk3-devel)
|
||||
# libusb1 for tqtc-boot2qt/qdb
|
||||
|
||||
@@ -97,6 +97,9 @@ sudo zypper -nq install alsa-devel dbus-1-devel libxkbfile-devel libdrm-devel \
|
||||
# qtwebkit
|
||||
sudo zypper -nq install libxml2-devel libxslt-devel
|
||||
|
||||
# yasm (for ffmpeg in multimedia)
|
||||
sudo zypper -nq install yasm
|
||||
|
||||
# GStreamer (qtwebkit and qtmultimedia), pulseaudio (qtmultimedia)
|
||||
sudo zypper -nq install gstreamer-devel gstreamer-plugins-base-devel libpulse-devel
|
||||
|
||||
|
||||
@@ -54,9 +54,9 @@ PROVISIONING_DIR="$(dirname "$0")/../"
|
||||
# https://raw.githubusercontent.com/linux-on-ibm-z/scripts/master/Python3/build_python3.sh
|
||||
export PACKAGE_NAME="python"
|
||||
python2Version="2.7.18"
|
||||
python3Version="3.7.6"
|
||||
python3Version="3.8.16"
|
||||
python2Sha="678d4cf483a1c92efd347ee8e1e79326dc82810b"
|
||||
python3Sha="55a2cce72049f0794e9a11a84862e9039af9183603b78bc60d89539f82cf533f"
|
||||
python3Sha="d85dbb3774132473d8081dcb158f34a10ccad7a90b96c7e50ea4bb61f5ce4562"
|
||||
|
||||
|
||||
function InstallPython {
|
||||
@@ -113,4 +113,5 @@ pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/sh
|
||||
|
||||
# shellcheck source=../common/unix/SetEnvVar.sh
|
||||
source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
|
||||
SetEnvVar "PYTHON3_PATH" "/usr/local/bin"
|
||||
SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"
|
||||
|
||||
@@ -0,0 +1,3 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux"
|
||||
@@ -117,6 +117,7 @@ installPackages+=(libgstreamer1.0-dev)
|
||||
installPackages+=(libgstreamer-plugins-base1.0-dev)
|
||||
installPackages+=(libgstreamer-plugins-good1.0-dev)
|
||||
installPackages+=(libgstreamer-plugins-bad1.0-dev)
|
||||
installPackages+=(yasm)
|
||||
# Support for cross-building to x86 (needed by WebEngine boot2qt builds)
|
||||
installPackages+=(g++-multilib)
|
||||
# python3 development package
|
||||
|
||||
@@ -134,6 +134,7 @@ installPackages+=(libgstreamer-plugins-bad1.0-dev)
|
||||
installPackages+=(libgstreamer-gl1.0-0)
|
||||
installPackages+=(gir1.2-gst-plugins-base-1.0)
|
||||
installPackages+=(gir1.2-gst-plugins-bad-1.0)
|
||||
installPackages+=(yasm)
|
||||
|
||||
# Support for cross-building to x86 (needed by WebEngine boot2qt builds)
|
||||
installPackages+=(g++-multilib)
|
||||
|
||||
@@ -10,4 +10,4 @@ cat <<EOT | sudo tee /etc/mdns.allow
|
||||
.local
|
||||
EOT
|
||||
|
||||
sudo sed -i '/^hosts:/s/.*/hosts: files mdns_minimal [NOTFOUND=return] dns mdns4/' /etc/nsswitch.conf
|
||||
sudo sed -i '/^hosts:/s/.*/hosts: files mdns_minimal [NOTFOUND=return] mdns4 dns/' /etc/nsswitch.conf
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
#############################################################################
|
||||
##
|
||||
## Copyright (C) 2021 The Qt Company Ltd.
|
||||
## Copyright (C) 2022 The Qt Company Ltd.
|
||||
## Contact: https://www.qt.io/licensing/
|
||||
##
|
||||
## This file is part of the provisioning scripts of the Qt Toolkit.
|
||||
@@ -135,6 +135,7 @@ installPackages+=(libgstreamer-plugins-bad1.0-dev)
|
||||
installPackages+=(libgstreamer-gl1.0-0)
|
||||
installPackages+=(gir1.2-gst-plugins-base-1.0)
|
||||
installPackages+=(gir1.2-gst-plugins-bad-1.0)
|
||||
installPackages+=(yasm)
|
||||
|
||||
# Support for cross-building to x86 (needed by WebEngine boot2qt builds)
|
||||
installPackages+=(g++-multilib)
|
||||
@@ -143,6 +144,7 @@ installPackages+=(python3-dev)
|
||||
installPackages+=(python3-pip)
|
||||
installPackages+=(virtualenv)
|
||||
installPackages+=(python3-wheel)
|
||||
installPackages+=(python-is-python3)
|
||||
# python2 development package
|
||||
installPackages+=(python2-dev)
|
||||
# Automates interactive applications (Needed by RTA to automate configure testing)
|
||||
@@ -162,6 +164,8 @@ installPackages+=(libicu-dev)
|
||||
installPackages+=(zlib1g-dev)
|
||||
installPackages+=(zlib1g)
|
||||
installPackages+=(openjdk-8-jdk)
|
||||
#Java 11 for Android
|
||||
installPackages+=(openjdk-11-jdk)
|
||||
installPackages+=(libgtk-3-dev)
|
||||
installPackages+=(ninja-build)
|
||||
installPackages+=(libssl-dev)
|
||||
@@ -221,6 +225,7 @@ installPackages+=(ssh)
|
||||
installPackages+=(diffstat)
|
||||
installPackages+=(binfmt-support)
|
||||
installPackages+=(zstd)
|
||||
installPackages+=(lz4)
|
||||
# Vulkan is needed for examples
|
||||
installPackages+=(libvulkan-dev)
|
||||
# Needed for qtdltlogging
|
||||
|
||||
0
coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/40-android_linux.sh
Executable file → Normal file
0
coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/40-android_linux.sh
Executable file → Normal file
61
coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/50-openssl_for_android_linux.sh
Executable file → Normal file
61
coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/50-openssl_for_android_linux.sh
Executable file → Normal file
@@ -1,8 +1,8 @@
|
||||
#!/usr/bin/env bash
|
||||
#!/bin/bash
|
||||
|
||||
#############################################################################
|
||||
##
|
||||
## Copyright (C) 2022 The Qt Company Ltd.
|
||||
## Copyright (C) 2021 The Qt Company Ltd.
|
||||
## Contact: https://www.qt.io/licensing/
|
||||
##
|
||||
## This file is part of the provisioning scripts of the Qt Toolkit.
|
||||
@@ -39,60 +39,7 @@
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
# This script install prebuilt OpenSSL which was built against Android NDK 21.
|
||||
# OpenSSL build will fail with Android NDK 22, because it's missing platforms and sysroot directories
|
||||
|
||||
set -ex
|
||||
# shellcheck source=../unix/DownloadURL.sh
|
||||
source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"
|
||||
# shellcheck source=../unix/SetEnvVar.sh
|
||||
source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
|
||||
|
||||
version="3.0.3"
|
||||
: ' 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"
|
||||
# source previously made environmental variables.
|
||||
if uname -a |grep -q "Ubuntu"; then
|
||||
# shellcheck disable=SC1090
|
||||
grep -e "^export" "$HOME/.profile" > $exports_file && source $exports_file
|
||||
rm -rf "$exports_file"
|
||||
else
|
||||
# shellcheck disable=SC1090
|
||||
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="1138de3f1a2f573ae69302ab52ecd9bbf5e063ca"
|
||||
opensslHome="${HOME}/openssl/android/openssl-${version}"
|
||||
DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile"
|
||||
mkdir -p "${HOME}/openssl/android/"
|
||||
tar -xzf "$targetFile" -C "${HOME}/openssl/android/"
|
||||
if uname -a |grep -q "Darwin"; then
|
||||
TOOLCHAIN=${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/darwin-x86_64/bin
|
||||
else
|
||||
TOOLCHAIN=${ANDROID_NDK_ROOT}/toolchains/llvm/prebuilt/linux-x86_64/bin
|
||||
fi
|
||||
cd "$opensslHome"
|
||||
PATH=$TOOLCHAIN:$PATH CC=clang ./Configure android-arm
|
||||
PATH=$TOOLCHAIN:$PATH CC=clang make build_generated
|
||||
'
|
||||
|
||||
if uname -a |grep -q "Darwin"; then
|
||||
prebuiltUrl="http://ci-files01-hki.intra.qt.io/input/openssl/prebuilt-openssl-1.1.1m-for-android-ndk-r23b-darwin.tar.gz"
|
||||
sha="2624b0c2772e360bbbae7a7f2dc342e4b97f1a2e"
|
||||
else
|
||||
prebuiltUrl="http://ci-files01-hki.intra.qt.io/input/openssl/prebuilt-openssl-${version}-for-android-ndk-r23b-linux.tar.gz"
|
||||
sha="2d1b6f5d90b5e3ae6a7e2a376250c66e99371485"
|
||||
fi
|
||||
targetFile="/tmp/prebuilt-openssl-$version.tar.gz"
|
||||
DownloadURL "$prebuiltUrl" "$prebuiltUrl" "$sha" "$targetFile"
|
||||
tar -xzf "$targetFile" -C "${HOME}"
|
||||
|
||||
opensslHome="${HOME}/openssl/android/openssl-${version}"
|
||||
SetEnvVar "OPENSSL_ANDROID_HOME" "$opensslHome"
|
||||
|
||||
echo "OpenSSL for Android = $version" >> ~/versions.txt
|
||||
# shellcheck source=../common/unix/openssl_for_android.sh
|
||||
source "${BASH_SOURCE%/*}/../common/unix/openssl_for_android.sh"
|
||||
|
||||
@@ -48,4 +48,4 @@ cat <<EOT | sudo tee /etc/mdns.allow
|
||||
.local
|
||||
EOT
|
||||
|
||||
sudo sed -i '/^hosts:/s/.*/hosts: files mdns_minimal [NOTFOUND=return] dns mdns4/' /etc/nsswitch.conf
|
||||
sudo sed -i '/^hosts:/s/.*/hosts: files mdns_minimal [NOTFOUND=return] mdns4 dns/' /etc/nsswitch.conf
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
#############################################################################
|
||||
##
|
||||
## Copyright (C) 2021 The Qt Company Ltd.
|
||||
## Copyright (C) 2022 The Qt Company Ltd.
|
||||
## Contact: https://www.qt.io/licensing/
|
||||
##
|
||||
## This file is part of the provisioning scripts of the Qt Toolkit.
|
||||
@@ -48,11 +48,8 @@ set -e
|
||||
"${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh"
|
||||
# shellcheck source=./DownloadURL.sh
|
||||
source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"
|
||||
version="39fad60085501729985888d3f546c7b8d897a394"
|
||||
sha1="c66e3984cd647c8e32977dee72fe9d06f1b2ea28"
|
||||
|
||||
# Provision Ubuntu 20.04-built package for 22.04
|
||||
# TODO: Remove libicu66 from 02-apt.sh when updating the package
|
||||
version="6781b63c31a3088b7029e272179be5765f8e61c7"
|
||||
sha1="096a80f0f01268aa239580c031753f7c23918438"
|
||||
url="https://download.qt.io/development_releases/prebuilt/qdoc/qt/qdoc-qtattributionsscanner_${version//\./}-based-linux-Ubuntu22.04-gcc11.3-x86_64.7z"
|
||||
url_cached="http://ci-files01-hki.intra.qt.io/input/qdoc/qt/qdoc-qtattributionsscanner_${version//\./}-based-linux-Ubuntu22.04-gcc11.3-x86_64.7z"
|
||||
|
||||
|
||||
3
coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/90-install-ffmpeg.sh
Executable file
3
coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/90-install-ffmpeg.sh
Executable file
@@ -0,0 +1,3 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux"
|
||||
44
coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/99-cleanup.sh
Executable file
44
coin/provisioning/qtci-linux-Ubuntu-22.04-x86_64/99-cleanup.sh
Executable file
@@ -0,0 +1,44 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
#############################################################################
|
||||
##
|
||||
## Copyright (C) 2022 The Qt Company Ltd.
|
||||
## Contact: https://www.qt.io/licensing/
|
||||
##
|
||||
## This file is part of the provisioning scripts of the Qt Toolkit.
|
||||
##
|
||||
## $QT_BEGIN_LICENSE:LGPL$
|
||||
## Commercial License Usage
|
||||
## Licensees holding valid commercial Qt licenses may use this file in
|
||||
## accordance with the commercial license agreement provided with the
|
||||
## Software or, alternatively, in accordance with the terms contained in
|
||||
## a written agreement between you and The Qt Company. For licensing terms
|
||||
## and conditions see https://www.qt.io/terms-conditions. For further
|
||||
## information use the contact form at https://www.qt.io/contact-us.
|
||||
##
|
||||
## GNU Lesser General Public License Usage
|
||||
## Alternatively, this file may be used under the terms of the GNU Lesser
|
||||
## General Public License version 3 as published by the Free Software
|
||||
## Foundation and appearing in the file LICENSE.LGPL3 included in the
|
||||
## packaging of this file. Please review the following information to
|
||||
## ensure the GNU Lesser General Public License version 3 requirements
|
||||
## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
|
||||
##
|
||||
## GNU General Public License Usage
|
||||
## Alternatively, this file may be used under the terms of the GNU
|
||||
## General Public License version 2.0 or (at your option) the GNU General
|
||||
## Public license version 3 or any later version approved by the KDE Free
|
||||
## Qt Foundation. The licenses are as published by the Free Software
|
||||
## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
|
||||
## included in the packaging of this file. Please review the following
|
||||
## information to ensure the GNU General Public License requirements will
|
||||
## be met: https://www.gnu.org/licenses/gpl-2.0.html and
|
||||
## https://www.gnu.org/licenses/gpl-3.0.html.
|
||||
##
|
||||
## $QT_END_LICENSE$
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
set -ex
|
||||
|
||||
"$(dirname "$0")"/../common/linux/cleanup_cache.sh
|
||||
@@ -43,6 +43,9 @@ sudo zypper -nq install alsa-devel dbus-1-devel libxkbfile-devel \
|
||||
# qtwebkit
|
||||
sudo zypper -nq install libxml2-devel libxslt-devel
|
||||
|
||||
# yasm (for ffmpeg in multimedia)
|
||||
sudo zypper -nq install yasm
|
||||
|
||||
# GStreamer (qtwebkit and qtmultimedia), pulseaudio (qtmultimedia)
|
||||
sudo zypper -nq install gstreamer-devel gstreamer-plugins-base-devel libpulse-devel
|
||||
|
||||
|
||||
@@ -0,0 +1,3 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux"
|
||||
@@ -75,6 +75,9 @@ sudo zypper -nq install alsa-devel dbus-1-devel libxkbfile-devel \
|
||||
# qtwebkit
|
||||
sudo zypper -nq install libxml2-devel libxslt-devel
|
||||
|
||||
# yasm (for ffmpeg in multimedia)
|
||||
sudo zypper -nq install yasm
|
||||
|
||||
# GStreamer (qtwebkit and qtmultimedia), pulseaudio (qtmultimedia)
|
||||
sudo zypper -nq install gstreamer-devel gstreamer-plugins-base-devel libpulse-devel
|
||||
|
||||
|
||||
@@ -0,0 +1,3 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg.sh" "linux"
|
||||
@@ -59,9 +59,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"
|
||||
|
||||
ndkVersion="r25b"
|
||||
ndkFile="android-ndk-$ndkVersion-darwin.zip"
|
||||
sdkBuildToolsVersion="31.0.0"
|
||||
sdkBuildToolsVersion="33.0.1"
|
||||
# this is compile sdk version
|
||||
sdkApiLevel="android-31"
|
||||
sdkApiLevel="android-33"
|
||||
|
||||
toolsSourceFile="$basePath/$toolsFile"
|
||||
ndkSourceFile="$basePath/$ndkFile"
|
||||
|
||||
@@ -59,9 +59,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"
|
||||
|
||||
ndkVersion="r25b"
|
||||
ndkFile="android-ndk-$ndkVersion-darwin.zip"
|
||||
sdkBuildToolsVersion="28.0.3"
|
||||
sdkBuildToolsVersion="33.0.1"
|
||||
# this is compile sdk version
|
||||
sdkApiLevel="android-28"
|
||||
sdkApiLevel="android-33"
|
||||
|
||||
toolsSourceFile="$basePath/$toolsFile"
|
||||
ndkSourceFile="$basePath/$ndkFile"
|
||||
|
||||
@@ -59,9 +59,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"
|
||||
|
||||
ndkVersion="r25b"
|
||||
ndkFile="android-ndk-$ndkVersion-darwin.zip"
|
||||
sdkBuildToolsVersion="31.0.0"
|
||||
sdkBuildToolsVersion="33.0.1"
|
||||
# this is compile sdk version
|
||||
sdkApiLevel="android-31"
|
||||
sdkApiLevel="android-33"
|
||||
|
||||
toolsSourceFile="$basePath/$toolsFile"
|
||||
ndkSourceFile="$basePath/$ndkFile"
|
||||
|
||||
@@ -59,9 +59,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"
|
||||
|
||||
ndkVersion="r25b"
|
||||
ndkFile="android-ndk-$ndkVersion-darwin.zip"
|
||||
sdkBuildToolsVersion="28.0.3"
|
||||
sdkBuildToolsVersion="33.0.1"
|
||||
# this is compile sdk version
|
||||
sdkApiLevel="android-28"
|
||||
sdkApiLevel="android-33"
|
||||
|
||||
toolsSourceFile="$basePath/$toolsFile"
|
||||
ndkSourceFile="$basePath/$ndkFile"
|
||||
|
||||
@@ -59,9 +59,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"
|
||||
|
||||
ndkVersion="r25b"
|
||||
ndkFile="android-ndk-$ndkVersion-darwin.zip"
|
||||
sdkBuildToolsVersion="28.0.3"
|
||||
sdkBuildToolsVersion="33.0.1"
|
||||
# this is compile sdk version
|
||||
sdkApiLevel="android-28"
|
||||
sdkApiLevel="android-33"
|
||||
|
||||
toolsSourceFile="$basePath/$toolsFile"
|
||||
ndkSourceFile="$basePath/$ndkFile"
|
||||
|
||||
2
qt3d
2
qt3d
Submodule qt3d updated: 8528d25d73...19945c3374
Submodule qt5compat updated: 9b2c590ec1...50a78d8f17
Submodule qtactiveqt updated: be78dcfcae...1d1cce4581
2
qtbase
2
qtbase
Submodule qtbase updated: 5baf644660...aea92807be
2
qtcharts
2
qtcharts
Submodule qtcharts updated: 520bc8eb43...720006a194
2
qtcoap
2
qtcoap
Submodule qtcoap updated: 6a6e1e86f2...577ee0bd65
Submodule qtconnectivity updated: 6196c467c0...9e72bbe795
Submodule qtdatavis3d updated: 279e9b9424...0da756a81f
Submodule qtdeclarative updated: 0fac060a18...3238e18d6b
2
qtdoc
2
qtdoc
Submodule qtdoc updated: 8c7d5edd72...d6bdf2f881
2
qtgrpc
2
qtgrpc
Submodule qtgrpc updated: ff55f8937a...841f5aed35
Submodule qthttpserver updated: 18737db69d...774f043c4a
Submodule qtimageformats updated: 60a9d0d7e1...55bab88828
Submodule qtlanguageserver updated: e0c44ed60e...7d094478e1
Submodule qtlocation updated: 7046137217...5278743537
2
qtlottie
2
qtlottie
Submodule qtlottie updated: d0f705e5c5...4f203e8655
2
qtmqtt
2
qtmqtt
Submodule qtmqtt updated: f629fa58cb...5c833ff317
Submodule qtmultimedia updated: e1fbb5b142...c618713d0f
Submodule qtnetworkauth updated: 1f7de2af1f...87db582c72
2
qtopcua
2
qtopcua
Submodule qtopcua updated: 05a85f9810...347c2557a1
Submodule qtpositioning updated: 760ea4b364...6765596a40
2
qtqa
2
qtqa
Submodule qtqa updated: d66e89eb4f...5bf4bd9f10
Submodule qtquick3d updated: 851c031864...3538ca27fb
Submodule qtquick3dphysics updated: 86ad152363...653bc5f59a
Submodule qtquickeffectmaker updated: b1d6fbbf28...84411f078b
Submodule qtquicktimeline updated: f9db8ca3a5...06739c8cb6
Submodule qtremoteobjects updated: bb219ce945...e49ed1e40a
Submodule qtrepotools updated: 0a526b66db...5b67e21705
2
qtscxml
2
qtscxml
Submodule qtscxml updated: f28be94260...90c50da132
Submodule qtsensors updated: 6ded928493...5bbb158d56
Submodule qtserialbus updated: e3799c1d0b...7d9948f832
Submodule qtserialport updated: c2f7195fd8...b85cf9bb4f
Submodule qtshadertools updated: 4c650c8024...2a9f26b893
2
qtspeech
2
qtspeech
Submodule qtspeech updated: badc7d6085...da317b9e1f
2
qtsvg
2
qtsvg
Submodule qtsvg updated: 24ffaf7a07...276e202014
2
qttools
2
qttools
Submodule qttools updated: 56db4ceb20...e47c8899ef
Submodule qttranslations updated: 4c97a3ba62...7bba6b36b5
Submodule qtvirtualkeyboard updated: 7da8600186...2c85d7745d
Submodule qtwayland updated: e99c2ee89f...d711c6a028
Submodule qtwebchannel updated: 0dab00f7c8...0fbbb1a2df
Submodule qtwebengine updated: 0729d4da7b...98db685e1a
Submodule qtwebsockets updated: 6c5b876f4b...5c92cce2f7
Submodule qtwebview updated: 9fa0a557de...3332e0d238
Reference in New Issue
Block a user