mirror of
git://code.qt.io/qt/qt5.git
synced 2026-01-09 08:26:34 +08:00
Compare commits
38 Commits
v6.7.0-bet
...
v6.7.0
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b76f8dbbae | ||
|
|
8e73b68d54 | ||
|
|
3c2c44a36e | ||
|
|
de3ed54e54 | ||
|
|
1ab203e517 | ||
|
|
2ac1bddea4 | ||
|
|
67e95f4591 | ||
|
|
3bbe6f0250 | ||
|
|
3d465d12d9 | ||
|
|
1bfb20fddd | ||
|
|
1b1df0bd22 | ||
|
|
64de8fa3ce | ||
|
|
cabe404c4a | ||
|
|
9e9dbeafa4 | ||
|
|
ee0409138b | ||
|
|
c582745a66 | ||
|
|
7c1e6971aa | ||
|
|
dc2d69e3f0 | ||
|
|
030478671c | ||
|
|
708ffa68a7 | ||
|
|
c71b6a5343 | ||
|
|
a607c4c58d | ||
|
|
6eb72bddd5 | ||
|
|
142ffbd208 | ||
|
|
37aed11625 | ||
|
|
82db8fadea | ||
|
|
3a9a48d165 | ||
|
|
0abefd8bba | ||
|
|
a92bc9040a | ||
|
|
358a5f58e2 | ||
|
|
014ef281e4 | ||
|
|
045c72d4eb | ||
|
|
f84d0c1644 | ||
|
|
1cf5b24dc2 | ||
|
|
2a6f3f9168 | ||
|
|
1cdaa78534 | ||
|
|
de0797d809 | ||
|
|
cf2365c2ec |
78
.gitmodules
vendored
78
.gitmodules
vendored
@@ -1,40 +1,40 @@
|
||||
[submodule "qtbase"]
|
||||
path = qtbase
|
||||
url = ../qtbase.git
|
||||
branch = 6.7
|
||||
branch = 6.7.0
|
||||
status = essential
|
||||
[submodule "qtsvg"]
|
||||
depends = qtbase
|
||||
path = qtsvg
|
||||
url = ../qtsvg.git
|
||||
branch = 6.7
|
||||
branch = 6.7.0
|
||||
status = addon
|
||||
[submodule "qtdeclarative"]
|
||||
depends = qtbase
|
||||
recommends = qtimageformats qtshadertools qtsvg qtlanguageserver
|
||||
path = qtdeclarative
|
||||
url = ../qtdeclarative.git
|
||||
branch = 6.7
|
||||
branch = 6.7.0
|
||||
status = essential
|
||||
[submodule "qtactiveqt"]
|
||||
depends = qtbase
|
||||
path = qtactiveqt
|
||||
url = ../qtactiveqt.git
|
||||
branch = 6.7
|
||||
branch = 6.7.0
|
||||
status = addon
|
||||
[submodule "qtmultimedia"]
|
||||
depends = qtbase qtshadertools
|
||||
recommends = qtdeclarative qtquick3d
|
||||
path = qtmultimedia
|
||||
url = ../qtmultimedia.git
|
||||
branch = 6.7
|
||||
branch = 6.7.0
|
||||
status = addon
|
||||
[submodule "qttools"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtactiveqt
|
||||
path = qttools
|
||||
url = ../qttools.git
|
||||
branch = 6.7
|
||||
branch = 6.7.0
|
||||
status = essential
|
||||
[submodule "qtxmlpatterns"]
|
||||
depends = qtbase
|
||||
@@ -47,7 +47,7 @@
|
||||
depends = qttools
|
||||
path = qttranslations
|
||||
url = ../qttranslations.git
|
||||
branch = 6.7
|
||||
branch = 6.7.0
|
||||
status = essential
|
||||
priority = 30
|
||||
[submodule "qtdoc"]
|
||||
@@ -55,7 +55,7 @@
|
||||
recommends = qtmultimedia qtshadertools qtwebengine
|
||||
path = qtdoc
|
||||
url = ../qtdoc.git
|
||||
branch = 6.7
|
||||
branch = 6.7.0
|
||||
status = essential
|
||||
priority = 40
|
||||
[submodule "qtrepotools"]
|
||||
@@ -76,21 +76,21 @@
|
||||
recommends = qtdeclarative
|
||||
path = qtlocation
|
||||
url = ../qtlocation.git
|
||||
branch = 6.7
|
||||
branch = 6.7.0
|
||||
status = preview
|
||||
[submodule "qtpositioning"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtserialport
|
||||
path = qtpositioning
|
||||
url = ../qtpositioning.git
|
||||
branch = 6.7
|
||||
branch = 6.7.0
|
||||
status = addon
|
||||
[submodule "qtsensors"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtsensors
|
||||
url = ../qtsensors.git
|
||||
branch = 6.7
|
||||
branch = 6.7.0
|
||||
status = addon
|
||||
[submodule "qtsystems"]
|
||||
depends = qtbase
|
||||
@@ -117,61 +117,61 @@
|
||||
recommends = qtdeclarative
|
||||
path = qtconnectivity
|
||||
url = ../qtconnectivity.git
|
||||
branch = 6.7
|
||||
branch = 6.7.0
|
||||
status = addon
|
||||
[submodule "qtwayland"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwayland
|
||||
url = ../qtwayland.git
|
||||
branch = 6.7
|
||||
branch = 6.7.0
|
||||
status = addon
|
||||
[submodule "qt3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtshadertools qtmultimedia
|
||||
path = qt3d
|
||||
url = ../qt3d.git
|
||||
branch = 6.7
|
||||
branch = 6.7.0
|
||||
status = addon
|
||||
[submodule "qtimageformats"]
|
||||
depends = qtbase
|
||||
path = qtimageformats
|
||||
url = ../qtimageformats.git
|
||||
branch = 6.7
|
||||
branch = 6.7.0
|
||||
status = addon
|
||||
[submodule "qtserialbus"]
|
||||
depends = qtbase
|
||||
recommends = qtserialport
|
||||
path = qtserialbus
|
||||
url = ../qtserialbus.git
|
||||
branch = 6.7
|
||||
branch = 6.7.0
|
||||
status = addon
|
||||
[submodule "qtserialport"]
|
||||
depends = qtbase
|
||||
path = qtserialport
|
||||
url = ../qtserialport.git
|
||||
branch = 6.7
|
||||
branch = 6.7.0
|
||||
status = addon
|
||||
[submodule "qtwebsockets"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwebsockets
|
||||
url = ../qtwebsockets.git
|
||||
branch = 6.7
|
||||
branch = 6.7.0
|
||||
status = addon
|
||||
[submodule "qtwebchannel"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtwebsockets
|
||||
path = qtwebchannel
|
||||
url = ../qtwebchannel.git
|
||||
branch = 6.7
|
||||
branch = 6.7.0
|
||||
status = addon
|
||||
[submodule "qtwebengine"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtwebchannel qttools qtpositioning
|
||||
path = qtwebengine
|
||||
url = ../qtwebengine.git
|
||||
branch = 6.7
|
||||
branch = 6.7.0
|
||||
status = addon
|
||||
priority = 10
|
||||
[submodule "qtcanvas3d"]
|
||||
@@ -185,28 +185,28 @@
|
||||
recommends = qtwebengine
|
||||
path = qtwebview
|
||||
url = ../qtwebview.git
|
||||
branch = 6.7
|
||||
branch = 6.7.0
|
||||
status = addon
|
||||
[submodule "qtcharts"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtcharts
|
||||
url = ../qtcharts.git
|
||||
branch = 6.7
|
||||
branch = 6.7.0
|
||||
status = addon
|
||||
[submodule "qtdatavis3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtdatavis3d
|
||||
url = ../qtdatavis3d.git
|
||||
branch = 6.7
|
||||
branch = 6.7.0
|
||||
status = addon
|
||||
[submodule "qtvirtualkeyboard"]
|
||||
depends = qtbase qtdeclarative qtsvg
|
||||
recommends = qtmultimedia
|
||||
path = qtvirtualkeyboard
|
||||
url = ../qtvirtualkeyboard.git
|
||||
branch = 6.7
|
||||
branch = 6.7.0
|
||||
status = addon
|
||||
[submodule "qtgamepad"]
|
||||
depends = qtbase
|
||||
@@ -219,27 +219,27 @@
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtscxml
|
||||
url = ../qtscxml.git
|
||||
branch = 6.7
|
||||
branch = 6.7.0
|
||||
status = addon
|
||||
[submodule "qtspeech"]
|
||||
depends = qtbase qtmultimedia
|
||||
recommends = qtdeclarative
|
||||
path = qtspeech
|
||||
url = ../qtspeech.git
|
||||
branch = 6.7
|
||||
branch = 6.7.0
|
||||
status = addon
|
||||
[submodule "qtnetworkauth"]
|
||||
depends = qtbase
|
||||
path = qtnetworkauth
|
||||
url = ../qtnetworkauth.git
|
||||
branch = 6.7
|
||||
branch = 6.7.0
|
||||
status = addon
|
||||
[submodule "qtremoteobjects"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtremoteobjects
|
||||
url = ../qtremoteobjects.git
|
||||
branch = 6.7
|
||||
branch = 6.7.0
|
||||
status = addon
|
||||
[submodule "qtwebglplugin"]
|
||||
depends = qtbase qtwebsockets
|
||||
@@ -252,32 +252,32 @@
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtlottie
|
||||
url = ../qtlottie.git
|
||||
branch = 6.7
|
||||
branch = 6.7.0
|
||||
status = addon
|
||||
[submodule "qtquicktimeline"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtquicktimeline
|
||||
url = ../qtquicktimeline
|
||||
branch = 6.7
|
||||
branch = 6.7.0
|
||||
status = addon
|
||||
[submodule "qtquick3d"]
|
||||
depends = qtbase qtdeclarative qtshadertools
|
||||
recommends = qtquicktimeline
|
||||
path = qtquick3d
|
||||
url = ../qtquick3d.git
|
||||
branch = 6.7
|
||||
branch = 6.7.0
|
||||
status = addon
|
||||
[submodule "qtshadertools"]
|
||||
depends = qtbase
|
||||
path = qtshadertools
|
||||
url = ../qtshadertools.git
|
||||
branch = 6.7
|
||||
branch = 6.7.0
|
||||
status = addon
|
||||
[submodule "qt5compat"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qt5compat
|
||||
url = ../qt5compat.git
|
||||
branch = 6.7
|
||||
branch = 6.7.0
|
||||
status = deprecated
|
||||
[submodule "qtcoap"]
|
||||
depends = qtbase
|
||||
@@ -301,38 +301,38 @@
|
||||
depends = qtbase
|
||||
path = qtlanguageserver
|
||||
url = ../qtlanguageserver.git
|
||||
branch = 6.7
|
||||
branch = 6.7.0
|
||||
status = preview
|
||||
[submodule "qthttpserver"]
|
||||
depends = qtbase
|
||||
recommends = qtwebsockets
|
||||
path = qthttpserver
|
||||
url = ../qthttpserver.git
|
||||
branch = 6.7
|
||||
branch = 6.7.0
|
||||
status = preview
|
||||
[submodule "qtquick3dphysics"]
|
||||
depends = qtbase qtdeclarative qtquick3d qtshadertools
|
||||
path = qtquick3dphysics
|
||||
url = ../qtquick3dphysics.git
|
||||
branch = 6.7
|
||||
branch = 6.7.0
|
||||
status = addon
|
||||
[submodule "qtgrpc"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtgrpc
|
||||
url = ../qtgrpc.git
|
||||
branch = 6.7
|
||||
branch = 6.7.0
|
||||
status = preview
|
||||
[submodule "qtquickeffectmaker"]
|
||||
depends = qtbase qtdeclarative qtshadertools
|
||||
recommends = qtquick3d
|
||||
path = qtquickeffectmaker
|
||||
url = ../qtquickeffectmaker.git
|
||||
branch = 6.7
|
||||
branch = 6.7.0
|
||||
status = addon
|
||||
[submodule "qtgraphs"]
|
||||
depends = qtbase qtdeclarative qtquick3d
|
||||
path = qtgraphs
|
||||
url = ../qtgraphs.git
|
||||
branch = 6.7
|
||||
branch = 6.7.0
|
||||
status = preview
|
||||
|
||||
@@ -69,7 +69,7 @@ Configurations:
|
||||
Environment variables: [
|
||||
'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
|
||||
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
|
||||
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DFEATURE_native_grpc=OFF',
|
||||
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_native_grpc=OFF',
|
||||
'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
|
||||
]
|
||||
-
|
||||
@@ -80,7 +80,7 @@ Configurations:
|
||||
Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib'
|
||||
Environment variables: [
|
||||
'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
|
||||
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DFEATURE_native_grpc=OFF',
|
||||
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_native_grpc=OFF',
|
||||
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
|
||||
'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
|
||||
]
|
||||
@@ -92,7 +92,7 @@ Configurations:
|
||||
Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib'
|
||||
Environment variables: [
|
||||
'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DMySQL_ROOT={{.Env.ENV_MySQL_ROOT}} -DMySQL_LIBRARY_DIR={{.Env.ENV_MySQL_LIBRARY_DIR}}',
|
||||
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DFEATURE_native_grpc=OFF',
|
||||
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_native_grpc=OFF',
|
||||
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
|
||||
'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
|
||||
]
|
||||
@@ -104,7 +104,7 @@ Configurations:
|
||||
Configure arguments: '-debug-and-release -force-debug-info -headersclean -nomake examples -qt-zlib'
|
||||
Environment variables: [
|
||||
'CMAKE_ARGS=-DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..',
|
||||
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DFEATURE_native_grpc=OFF',
|
||||
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_native_grpc=OFF',
|
||||
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}',
|
||||
'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
|
||||
]
|
||||
@@ -116,7 +116,7 @@ Configurations:
|
||||
Configure arguments: '-debug-and-release -make examples -developer-build -force-debug-info -qt-zlib'
|
||||
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}}',
|
||||
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE',
|
||||
'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
|
||||
'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
|
||||
]
|
||||
@@ -144,7 +144,7 @@ Configurations:
|
||||
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}}',
|
||||
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MSVC}} -DQT_DEPLOY_FFMPEG=TRUE',
|
||||
'Protobuf_ROOT={{.Env.Protobuf_ROOT_msvc}}',
|
||||
'gRPC_ROOT={{.Env.gRPC_ROOT_msvc}}',
|
||||
]
|
||||
@@ -186,9 +186,9 @@ Configurations:
|
||||
Template: 'qtci-linux-Debian-11.6-aarch64-50'
|
||||
Compiler: 'GCC'
|
||||
Features: ['Packaging', 'UseConfigure', 'InstallQt5Dependencies', 'InsignificantTests']
|
||||
Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-harfbuzz -no-libudev -bundled-xcb-xinput'
|
||||
Configure arguments: '-nomake examples -release -force-debug-info -separate-debug-info -qt-libjpeg -qt-libpng -qt-pcre -qt-doubleconversion -qt-harfbuzz -no-libudev -bundled-xcb-xinput'
|
||||
Environment variables: [
|
||||
'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY'
|
||||
'CMAKE_ARGS=-DOpenGL_GL_PREFERENCE=LEGACY -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}',
|
||||
]
|
||||
|
||||
-
|
||||
@@ -213,7 +213,7 @@ Configurations:
|
||||
Environment variables: [
|
||||
'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
|
||||
'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
|
||||
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}} -DFEATURE_native_grpc=OFF -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
|
||||
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}} -DQT_DEPLOY_FFMPEG=TRUE -DFEATURE_native_grpc=OFF -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
|
||||
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}',
|
||||
'Protobuf_ROOT={{.Env.Protobuf_ROOT_mingw}}',
|
||||
]
|
||||
@@ -226,7 +226,7 @@ Configurations:
|
||||
Environment variables: [
|
||||
'Path=C:\llvm-mingw\bin;{{.Env.Path}}',
|
||||
'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
|
||||
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_LLVM_MINGW}} -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
|
||||
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_LLVM_MINGW}} -DQT_DEPLOY_FFMPEG=TRUE -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
|
||||
'LLVM_INSTALL_DIR=C:\llvm-mingw',
|
||||
'Protobuf_ROOT={{.Env.Protobuf_ROOT_llvm_mingw}}',
|
||||
]
|
||||
@@ -239,7 +239,7 @@ Configurations:
|
||||
Environment variables: [
|
||||
'Path=C:\llvm-mingw\bin;{{.Env.Path}}',
|
||||
'CMAKE_ARGS=-DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\.. -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
|
||||
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_LLVM_MINGW}} -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
|
||||
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_LLVM_MINGW}} -DQT_DEPLOY_FFMPEG=TRUE -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
|
||||
'LLVM_INSTALL_DIR=C:\llvm-mingw',
|
||||
'Protobuf_ROOT={{.Env.Protobuf_ROOT_llvm_mingw}}',
|
||||
]
|
||||
@@ -252,7 +252,7 @@ Configurations:
|
||||
Environment variables: [
|
||||
'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
|
||||
'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
|
||||
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}} -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c -DFEATURE_native_grpc=OFF',
|
||||
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}} -DQT_DEPLOY_FFMPEG=TRUE -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c -DFEATURE_native_grpc=OFF',
|
||||
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}',
|
||||
'Protobuf_ROOT={{.Env.Protobuf_ROOT_mingw}}',
|
||||
]
|
||||
@@ -265,30 +265,33 @@ Configurations:
|
||||
Environment variables: [
|
||||
'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}',
|
||||
'CMAKE_ARGS=-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c',
|
||||
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}} -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c -DFEATURE_native_grpc=OFF',
|
||||
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_MINGW}} -DQT_DEPLOY_FFMPEG=TRUE -DCMAKE_IGNORE_PREFIX_PATH=C:/strawberry/c -DFEATURE_native_grpc=OFF',
|
||||
'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}',
|
||||
'Protobuf_ROOT={{.Env.Protobuf_ROOT_mingw}}',
|
||||
]
|
||||
-
|
||||
Id: 'focal-arm64-debian-pkg-packaging'
|
||||
Id: 'jammy-arm64-debian-pkg-packaging'
|
||||
Template: 'qtci-linux-Debian-11.6-aarch64-50'
|
||||
Compiler: 'GCC'
|
||||
Features: ['Packaging','DebianPackaging','DisableTests', 'Insignificant']
|
||||
Environment variables: [
|
||||
'DEBIAN_RULES_REF=6.7_dev',
|
||||
'COIN_TARGET_DIST=tqtc-jammy',
|
||||
'COIN_EXTRA_DEBIAN_PACKAGES={{.Env.HOME}}/debian_packages/',
|
||||
'COIN_SBUILD_CHROOT=focal-arm64-sbuild',
|
||||
'COIN_EXTRA_DEBIAN_REPO=deb http://ports.ubuntu.com/ubuntu-ports/ focal main universe multiverse',
|
||||
'COIN_SBUILD_CHROOT=jammy-arm64-sbuild',
|
||||
'COIN_EXTRA_DEBIAN_REPO=deb http://ports.ubuntu.com/ubuntu-ports/ jammy main universe multiverse',
|
||||
'COIN_SKIP_DEBIAN_MODULES=qt5 qtqa qtactiveqt qtdoc qtwebengine qtwebview',
|
||||
]
|
||||
-
|
||||
Id: 'focal-amd64-debian-pkg-packaging'
|
||||
Id: 'jammy-amd64-debian-pkg-packaging'
|
||||
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
|
||||
Compiler: 'GCC'
|
||||
Features: ['Packaging','DebianPackaging','DisableTests', 'Insignificant']
|
||||
Environment variables: [
|
||||
'DEBIAN_RULES_REF=6.7_dev',
|
||||
'COIN_TARGET_DIST=tqtc-jammy',
|
||||
'COIN_EXTRA_DEBIAN_PACKAGES={{.Env.HOME}}/debian_packages/',
|
||||
'COIN_SBUILD_CHROOT=focal-amd64-sbuild',
|
||||
'COIN_EXTRA_DEBIAN_REPO=deb http://archive.ubuntu.com/ubuntu/ focal main universe multiverse',
|
||||
|
||||
'COIN_SBUILD_CHROOT=jammy-amd64-sbuild',
|
||||
'COIN_EXTRA_DEBIAN_REPO=deb http://archive.ubuntu.com/ubuntu/ jammy main universe multiverse',
|
||||
'COIN_SKIP_DEBIAN_MODULES=qt5 qtqa qtactiveqt qtdoc qtwebengine qtwebview',
|
||||
]
|
||||
|
||||
@@ -131,6 +131,18 @@ EOB
|
||||
cd "$sdkTargetFolder/cmdline-tools/tools/bin"
|
||||
./sdkmanager --install "emulator" --sdk_root="$sdkTargetFolder" \
|
||||
| eval "$sdkmanager_no_progress_bar_cmd"
|
||||
|
||||
echo "Download and unzip Android Emulator version 32.1.15"
|
||||
emulatorFileName="emulator-linux_x64-10696886.zip"
|
||||
emulatorCiUrl="https://ci-files01-hki.ci.qt.io/input/android/$emulatorFileName"
|
||||
emulatorUrl="http://dl.google.com/android/repository/$emulatorFileName"
|
||||
emulatorTargetFile="$sdkTargetFolder/$emulatorFileName"
|
||||
emulatorSha1="b78f4d2c22d6aa5ca83d26ccb68cbf885a273888"
|
||||
DownloadURL "$emulatorCiUrl" "$emulatorUrl" "$emulatorSha1" "$emulatorTargetFile"
|
||||
echo "Unzipping the Android Emulator to '$sdkTargetFolder'"
|
||||
sudo unzip -o -q "$emulatorTargetFile" -d "$sdkTargetFolder"
|
||||
rm "$emulatorTargetFile"
|
||||
|
||||
echo "y" | ./sdkmanager --install "system-images;android-23;google_apis;x86" \
|
||||
| eval "$sdkmanager_no_progress_bar_cmd"
|
||||
echo "y" | ./sdkmanager --install "system-images;android-33;google_apis;x86_64" \
|
||||
|
||||
35
coin/provisioning/common/linux/enable_test_stacktraces.sh
Executable file
35
coin/provisioning/common/linux/enable_test_stacktraces.sh
Executable file
@@ -0,0 +1,35 @@
|
||||
#!/usr/bin/env bash
|
||||
#Copyright (C) 2023 The Qt Company Ltd
|
||||
#SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
|
||||
|
||||
### Enable automatic stacktraces in case of fatal errors in QTest.
|
||||
# This requires that gdb can be found in PATH, and that no
|
||||
# kernel security settings like yama.ptrace_scope prevent it.
|
||||
|
||||
|
||||
PROVISIONING_DIR="$(dirname "$0")/../.."
|
||||
source "$PROVISIONING_DIR/common/unix/common.sourced.sh"
|
||||
|
||||
|
||||
f="/etc/sysctl.d/10-ptrace.conf"
|
||||
if [ -f $f ]
|
||||
then
|
||||
echo "Modifying $f ..."
|
||||
sudo sed -i '/^kernel\.yama\.ptrace_scope *= *[1-9]$/s/[1-9]$/0/' $f
|
||||
# Reload the modified setting, so that we can verify it right afterwards.
|
||||
sudo sysctl -p $f
|
||||
fi
|
||||
|
||||
# Verify that yama.ptrace_scope = 0, if it's supported by the kernel.
|
||||
ptrace_scope_value=`sudo sysctl kernel.yama.ptrace_scope 2>/dev/null \
|
||||
| sed -E 's/.*([0-9])$/\1/'`
|
||||
if [ -n "$ptrace_scope_value" ] && [ "$ptrace_scope_value" != 0 ]
|
||||
then
|
||||
fatal "kernel.yama.ptrace_scope = $ptrace_scope_value \
|
||||
which means that QTest automatic stacktraces will not work"
|
||||
else
|
||||
echo kernel.yama.ptrace_scope = "$ptrace_scope_value"
|
||||
fi
|
||||
|
||||
|
||||
$CMD_PKG_INSTALL gdb
|
||||
@@ -9,11 +9,17 @@ set -e
|
||||
for dir in "$@"; do
|
||||
echo "Processing files in $dir ..."
|
||||
pushd "$dir" >/dev/null
|
||||
find . -type f | while read -r f; do
|
||||
find . -type f -or -type l | while read -r f; do
|
||||
dst="${f:1}"
|
||||
dstdir="$(dirname "$dst")"
|
||||
mkdir -p "$dstdir"
|
||||
if [[ ! -f "$dst" ]]; then
|
||||
|
||||
if [[ -L "$f" ]]; then
|
||||
if [[ ! -L "$dst" && ! -d "$dst" && ! -f "$dst" ]]; then
|
||||
echo "Copying symlink $dir/$f to $dst"
|
||||
cp -P -n "$f" "$dst"
|
||||
fi
|
||||
elif [[ ! -f "$dst" ]]; then
|
||||
echo "Copying $dir/$f to $dst"
|
||||
cp -c "$f" "$dst"
|
||||
elif lipo -info "$f" >/dev/null 2>&1; then
|
||||
|
||||
@@ -23,4 +23,6 @@ set(CMAKE_C_COMPILER_TARGET ${_qnx_toolchain_arch})
|
||||
set(CMAKE_CXX_COMPILER q++)
|
||||
set(CMAKE_CXX_COMPILER_TARGET ${_qnx_toolchain_arch})
|
||||
|
||||
set(CMAKE_STRIP $ENV{QNX_HOST}/usr/bin/ntoaarch64-strip)
|
||||
|
||||
set(CMAKE_SYSROOT $ENV{QNX_TARGET})
|
||||
|
||||
@@ -23,4 +23,6 @@ set(CMAKE_C_COMPILER_TARGET ${_qnx_toolchain_arch})
|
||||
set(CMAKE_CXX_COMPILER q++)
|
||||
set(CMAKE_CXX_COMPILER_TARGET ${_qnx_toolchain_arch})
|
||||
|
||||
set(CMAKE_STRIP $ENV{QNX_HOST}/usr/bin/ntoarmv7-strip)
|
||||
|
||||
set(CMAKE_SYSROOT $ENV{QNX_TARGET})
|
||||
|
||||
@@ -23,4 +23,6 @@ set(CMAKE_C_COMPILER_TARGET ${_qnx_toolchain_arch})
|
||||
set(CMAKE_CXX_COMPILER q++)
|
||||
set(CMAKE_CXX_COMPILER_TARGET ${_qnx_toolchain_arch})
|
||||
|
||||
set(CMAKE_STRIP $ENV{QNX_HOST}/usr/bin/ntox86_64-strip)
|
||||
|
||||
set(CMAKE_SYSROOT $ENV{QNX_TARGET})
|
||||
|
||||
@@ -108,7 +108,7 @@ set_common_environment () {
|
||||
uname_m="$(uname -m)"
|
||||
case "$uname_m" in
|
||||
x86_64|amd64) PROVISIONING_ARCH=amd64 ;;
|
||||
arm64) PROVISIONING_ARCH=arm64 ;;
|
||||
aarch64|arm64)PROVISIONING_ARCH=arm64 ;;
|
||||
i[3456]86) PROVISIONING_ARCH=x86 ;;
|
||||
*) fatal "Unknown architecture in uname: $uname_m" 43 ;;
|
||||
esac
|
||||
|
||||
@@ -8,15 +8,15 @@ source "${BASH_SOURCE%/*}/SetEnvVar.sh"
|
||||
# shellcheck source=./DownloadURL.sh
|
||||
source "${BASH_SOURCE%/*}/DownloadURL.sh"
|
||||
|
||||
version="3.1.37"
|
||||
versionNode="v14.18.2"
|
||||
version="3.1.50"
|
||||
versionNode="v16.20.0"
|
||||
tarBallVersion="${version//./_}"
|
||||
if uname -a |grep -q Darwin; then
|
||||
tarBallPackage="emsdk_macos_${tarBallVersion}.tar.gz"
|
||||
sha="fe9900b0f27ada608f25552dbd4a58bf62c6f05b"
|
||||
sha="c12169ec8d22fc7a9ef1ba98027435bdf3b72729"
|
||||
else
|
||||
tarBallPackage="emsdk_linux_${tarBallVersion}.tar.gz"
|
||||
sha="000bbd5666d8fc1afbf2dce1a7938ef0efeeab3f"
|
||||
sha="5d81a8f1ddcb8d74c70ba5608efd4266c857944a"
|
||||
fi
|
||||
cacheUrl="https://ci-files01-hki.ci.qt.io/input/emsdk/${tarBallPackage}"
|
||||
target="/tmp/${tarBallPackage}"
|
||||
|
||||
@@ -11,9 +11,9 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
|
||||
# shellcheck source=../unix/SetEnvVar.sh
|
||||
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
|
||||
|
||||
version="n6.0"
|
||||
version="n6.1.1"
|
||||
url_public="https://github.com/FFmpeg/FFmpeg/archive/refs/tags/$version.tar.gz"
|
||||
sha1="78435ec71cc2227017a99c030e858719b8c7c74d"
|
||||
sha1="59e0c3c4cc48e9c60073495f8c045329bb21f446"
|
||||
url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz"
|
||||
ffmpeg_name="FFmpeg-$version"
|
||||
|
||||
@@ -38,7 +38,7 @@ build_ffmpeg_android() {
|
||||
if [ "$target_arch" == "x86_64" ]; then
|
||||
target_toolchain_arch="x86_64-linux-android"
|
||||
target_arch=x86_64
|
||||
target_cpu=x86_64
|
||||
target_cpu=x86-64
|
||||
openssl_libs="$OPENSSL_ANDROID_HOME_DEFAULT/x86_64"
|
||||
elif [ "$target_arch" == "x86" ]; then
|
||||
target_toolchain_arch="i686-linux-android"
|
||||
|
||||
@@ -11,12 +11,9 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
|
||||
# shellcheck source=../unix/SetEnvVar.sh
|
||||
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
|
||||
|
||||
# Commit c5039e158d20e85d4d8a2dee3160533d627b839a is the latest one in 6.0 branch.
|
||||
# When using the latest commit we will also get fix for https://fftrac-bg.ffmpeg.org/ticket/10405
|
||||
# Should be changed to official release as soon as possible!
|
||||
version="c5039e158d20e85d4d8a2dee3160533d627b839a"
|
||||
version="n6.1.1"
|
||||
url_public="https://github.com/FFmpeg/FFmpeg/archive/$version.tar.gz"
|
||||
sha1="4e13a26d3be7ac4d69201a6aa0accd734b24b3c4"
|
||||
sha1="59e0c3c4cc48e9c60073495f8c045329bb21f446"
|
||||
url_cached="http://ci-files01-hki.ci.qt.io/input/ffmpeg/$version.tar.gz"
|
||||
ffmpeg_name="FFmpeg-$version"
|
||||
|
||||
|
||||
@@ -25,16 +25,20 @@ cd "$opensslSource"
|
||||
pwd
|
||||
|
||||
if [[ "$os" == "linux" ]]; then
|
||||
./Configure --prefix="$opensslHome" shared enable-ec_nistp_64_gcc_128 linux-x86_64 "-Wa,--noexecstack"
|
||||
if [ $(uname -m) = aarch64 ]; then
|
||||
arch=$(uname -m)
|
||||
else
|
||||
arch="x86_64"
|
||||
fi
|
||||
./Configure --prefix="$opensslHome" shared enable-ec_nistp_64_gcc_128 "linux-$arch" "-Wa,--noexecstack"
|
||||
make && make install_sw install_ssldirs
|
||||
SetEnvVar "OPENSSL_HOME" "$opensslHome"
|
||||
SetEnvVar "PATH" "\"$opensslHome/bin:\$PATH\""
|
||||
if uname -a |grep -q "Ubuntu"; then
|
||||
echo "export LD_LIBRARY_PATH=$opensslHome/lib64:$LD_LIBRARY_PATH" >> ~/.bash_profile
|
||||
if uname -a |grep -q "Debian"; then
|
||||
SetEnvVar "LD_LIBRARY_PATH" "\"$opensslHome/lib:$LD_LIBRARY_PATH\""
|
||||
else
|
||||
echo "export LD_LIBRARY_PATH=$opensslHome/lib64:$LD_LIBRARY_PATH" >> ~/.bashrc
|
||||
SetEnvVar "LD_LIBRARY_PATH" "\"$opensslHome/lib64:$LD_LIBRARY_PATH\""
|
||||
fi
|
||||
|
||||
elif [ "$os" == "macos" ] || [ "$os" == "macos-universal" ]; then
|
||||
# Below target location has been hard coded into Coin.
|
||||
# QTQAINFRA-1195
|
||||
|
||||
@@ -48,5 +48,5 @@ sudo mv /usr/local/libclang "$destination"
|
||||
rm -rf $zip
|
||||
|
||||
|
||||
echo "export LLVM_DYNAMIC_LIBS_100=$destination" >> ~/.bash_profile
|
||||
SetEnvVar "LLVM_DYNAMIC_LIBS_100" "$destination"
|
||||
echo "libClang for QtForPython= $version" >> ~/versions.txt
|
||||
|
||||
@@ -33,10 +33,15 @@ elif test -f /etc/redhat-release && grep "Red Hat" /etc/redhat-release | grep -v
|
||||
url_cached="http://ci-files01-hki.ci.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.ci.qt.io/input/libclang/qt/libclang-release_${version}-based-linux-Ubuntu22.04-gcc11.2-x86_64.7z"
|
||||
sha1="dd170ec762a7ec8ac84b4b5cac3a422514e5b030"
|
||||
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.ci.qt.io/input/libclang/qt/libclang-release_${version}-based-linux-Ubuntu22.04-gcc11.2-x86_64.7z"
|
||||
sha1="dd170ec762a7ec8ac84b4b5cac3a422514e5b030"
|
||||
elif [ "$PROVISIONING_OS_ID" = debian ]; then
|
||||
version=17.0.1
|
||||
url="https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_${version}-based-linux-Debian11.6-gcc10.0-arm64.7z"
|
||||
url_cached="http://ci-files01-hki.ci.qt.io/input/libclang/qt/libclang-release_${version}-based-linux-Debian11.6-gcc10.0-arm64.7z"
|
||||
sha1="43f0210121b889107e3dab631e8104e661a3866b"
|
||||
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"
|
||||
@@ -57,5 +62,5 @@ sudo mv /usr/local/libclang "$destination"
|
||||
rm -rf $zip
|
||||
|
||||
|
||||
echo "export LLVM_INSTALL_DIR=$destination" >> ~/.bash_profile
|
||||
SetEnvVar "LLVM_INSTALL_DIR" "$destination"
|
||||
echo "libClang = $version" >> ~/versions.txt
|
||||
|
||||
@@ -5,11 +5,11 @@
|
||||
|
||||
# This script will install emscripten needed by WebAssembly
|
||||
|
||||
$version = "3.1.37"
|
||||
$version = "3.1.50"
|
||||
$zipVersion = $version -replace '\.', "_"
|
||||
$temp = "$env:tmp"
|
||||
$cacheUrl = "https://ci-files01-hki.ci.qt.io/input/emsdk/emsdk_windows_${zipVersion}.zip"
|
||||
$sha = "5e5c0f50a940be09b82bf8256434f4510270e208"
|
||||
$sha = "40dc636688166ecdb476da40d02c491ee5032f7b"
|
||||
|
||||
# Make sure python is in the path
|
||||
Prepend-Path "C:\Python27"
|
||||
|
||||
@@ -6,9 +6,9 @@
|
||||
# This script will install FFmpeg
|
||||
$msys = "C:\Utils\msys64\usr\bin\bash"
|
||||
|
||||
$version = "n6.0"
|
||||
$version = "n6.1.1"
|
||||
$ffmpeg_name = "ffmpeg-" + $version;
|
||||
$sha1 = "5DDDE739FF966A7EEE810D65D7290860A52709D7"
|
||||
$sha1 = "7AECCED8A0366BE407329B4E176167534233DA12"
|
||||
|
||||
$url_cached = "https://ci-files01-hki.ci.qt.io/input/ffmpeg/" + $version + ".zip"
|
||||
$url_public = "https://github.com/FFmpeg/FFmpeg/archive/refs/tags/" +$version + ".zip"
|
||||
@@ -32,7 +32,8 @@ function InstallFfmpeg {
|
||||
[string]$msystem,
|
||||
[string]$additionalPath,
|
||||
[string]$ffmpegDirEnvVar,
|
||||
[string]$toolchain
|
||||
[string]$toolchain,
|
||||
[bool]$shared
|
||||
)
|
||||
|
||||
Write-Host "Configure and compile ffmpeg for $buildSystem"
|
||||
@@ -47,6 +48,7 @@ function InstallFfmpeg {
|
||||
$cmd += " && mkdir -p build/$buildSystem && cd build/$buildSystem"
|
||||
$cmd += " && ../../configure --prefix=installed $config"
|
||||
if ($toolchain) { $cmd += " --toolchain=$toolchain" }
|
||||
if ($shared) { $cmd += " --enable-shared --disable-static" }
|
||||
$cmd += " && make install -j"
|
||||
|
||||
Write-Host "MSYS cmd:"
|
||||
@@ -66,7 +68,7 @@ function InstallFfmpeg {
|
||||
|
||||
function InstallMingwFfmpeg {
|
||||
$mingwPath = [System.Environment]::GetEnvironmentVariable("MINGW1120", [System.EnvironmentVariableTarget]::Machine)
|
||||
return InstallFfmpeg -buildSystem "mingw" -msystem "MINGW" -additionalPath "$mingwPath\bin" -ffmpegDirEnvVar "FFMPEG_DIR_MINGW"
|
||||
return InstallFfmpeg -buildSystem "mingw" -msystem "MINGW" -additionalPath "$mingwPath\bin" -ffmpegDirEnvVar "FFMPEG_DIR_MINGW" -shared $true
|
||||
}
|
||||
|
||||
|
||||
@@ -76,7 +78,7 @@ function InstallMsvcFfmpeg {
|
||||
return $false
|
||||
}
|
||||
|
||||
$result = InstallFfmpeg -buildSystem "msvc" -msystem "MSYS" -toolchain "msvc" -ffmpegDirEnvVar "FFMPEG_DIR_MSVC"
|
||||
$result = InstallFfmpeg -buildSystem "msvc" -msystem "MSYS" -toolchain "msvc" -ffmpegDirEnvVar "FFMPEG_DIR_MSVC" -shared $true
|
||||
|
||||
if ($result) {
|
||||
# As ffmpeg build system creates lib*.a file we have to rename them to *.lib files to be recognized by WIN32
|
||||
@@ -99,7 +101,7 @@ function InstallMsvcFfmpeg {
|
||||
|
||||
|
||||
function InstallLlvmMingwFfmpeg {
|
||||
return InstallFfmpeg -buildSystem "llvm-mingw" -msystem "CLANG64" -ffmpegDirEnvVar "FFMPEG_DIR_LLVM_MINGW" -additionalPath "C:\llvm-mingw\bin"
|
||||
return InstallFfmpeg -buildSystem "llvm-mingw" -msystem "CLANG64" -ffmpegDirEnvVar "FFMPEG_DIR_LLVM_MINGW" -additionalPath "C:\llvm-mingw\bin" -shared $true
|
||||
}
|
||||
|
||||
function InstallAndroidArmv7 {
|
||||
|
||||
@@ -5,10 +5,10 @@
|
||||
|
||||
# This script will installs msys2
|
||||
|
||||
$version = "20220319"
|
||||
$version = "20240113"
|
||||
$prog = "msys2"
|
||||
$arch = "x86_64"
|
||||
$sha1 = "d3d05090c09c08a47efbffe469142b45231cbc89"
|
||||
$sha1 = "b46c08fd901da0fdba1dc30422a322766d7d03c6"
|
||||
$sha1_prebuilt = "d86d45d72228f53f7ae060771bc95b6f54c703c8"
|
||||
$folder = "msys64"
|
||||
|
||||
|
||||
@@ -25,8 +25,7 @@ echo "deb http://deb.debian.org/debian bullseye-backports main" | sudo tee -a /e
|
||||
echo "deb-src http://deb.debian.org/debian bullseye-backports main" | sudo tee -a /etc/apt/sources.list
|
||||
|
||||
# Make sure needed ca-certificates are available
|
||||
sudo apt-get install --reinstall ca-certificates
|
||||
|
||||
installPackages+=(ca-certificates)
|
||||
# Git is not needed by builds themselves, but is nice to have
|
||||
# immediately as one starts debugging
|
||||
installPackages+=(git)
|
||||
|
||||
6
coin/provisioning/qtci-linux-Debian-11.6-aarch64/04-libclang.sh
Executable file
6
coin/provisioning/qtci-linux-Debian-11.6-aarch64/04-libclang.sh
Executable file
@@ -0,0 +1,6 @@
|
||||
#!/usr/bin/env bash
|
||||
#Copyright (C) 2023 The Qt Company Ltd
|
||||
#SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
|
||||
|
||||
BASEDIR=$(dirname "$0")
|
||||
"$BASEDIR/../common/unix/libclang.sh"
|
||||
@@ -0,0 +1,7 @@
|
||||
#!/usr/bin/env bash
|
||||
# Copyright (C) 2023 The Qt Company Ltd
|
||||
# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
|
||||
|
||||
set -ex
|
||||
|
||||
"$(dirname "$0")/../common/unix/install-openssl.sh" "linux"
|
||||
@@ -0,0 +1,5 @@
|
||||
#!/usr/bin/env bash
|
||||
# Copyright (C) 2024 The Qt Company Ltd.
|
||||
# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
|
||||
|
||||
sudo DEBIAN_FRONTEND=noninteractive apt -q -y install libprotobuf-dev libgrpc-dev libprotoc-dev protobuf-compiler
|
||||
@@ -39,18 +39,24 @@ EOF
|
||||
sudo sbuild-adduser "$LOGNAME"
|
||||
newgrp sbuild
|
||||
|
||||
# Create chroot
|
||||
# Create chroot for debian stable
|
||||
sudo sbuild-createchroot --include=eatmydata,ccache,gnupg,ca-certificates stable /srv/chroot/stable-arm64
|
||||
# For ubuntu 20.04
|
||||
echo "Create chroot for Ubuntu Focal"
|
||||
sudo sbuild-createchroot --include=eatmydata,ccache,gnupg,ca-certificates focal /srv/chroot/focal-arm64 http://ports.ubuntu.com/ubuntu-ports/
|
||||
echo "Done creating chroot for Ubuntu Focal"
|
||||
|
||||
# Update chroot
|
||||
echo "Create chroot for Ubuntu Jammy"
|
||||
# First we need update the deboostrap scripts
|
||||
mkdir -p $HOME/deboot
|
||||
cd $HOME/deboot
|
||||
# Orig url http://ftp.fi.debian.org/debian/pool/main/d/debootstrap/debootstrap_1.0.134~bpo12+1.tar.gz
|
||||
# we have to update the debootstrap so that sbuild-createroot will recognize jammy code name
|
||||
wget http://ci-files01-hki.ci.qt.io/input/debian/debootstrap/debootstrap_1.0.134~bpo12+1.tar.gz
|
||||
tar xzvf debootstrap_1.0.134~bpo12+1.tar.gz
|
||||
cd debootstrap
|
||||
sudo make install
|
||||
cd
|
||||
rm -rf $HOME/deboot
|
||||
sudo sbuild-createchroot --include=gnupg,ca-certificates jammy /srv/chroot/jammy-arm64 http://ports.ubuntu.com/ubuntu-ports/
|
||||
echo "Done creating chroot for Ubuntu Jammy"
|
||||
|
||||
# Update chroot.
|
||||
sudo sbuild-update -udcar stable
|
||||
sudo sbuild-update -udcar focal
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
sudo sbuild-update -udcar jammy
|
||||
|
||||
@@ -6,23 +6,13 @@
|
||||
mkdir -p /home/qt/debian_packages
|
||||
cd /home/qt/debian_packages || exit
|
||||
# Backported cmake 3.24
|
||||
wget https://ci-files01-hki.intra.qt.io/input/debian/cmake/arm64-focal/cmake-3.24-deb.tar.gz
|
||||
wget https://ci-files01-hki.intra.qt.io/input/debian/cmake/arm64-jammy/cmake-3.24-deb.tar.gz
|
||||
tar xzf cmake-3.24-deb.tar.gz
|
||||
# get rest of ready made Ubuntu focal arm debian packages
|
||||
# get rest of ready made Ubuntu arm debian packages
|
||||
# so that sbuild can find those
|
||||
# QtWebEngine dependencies
|
||||
wget http://ci-files01-hki.ci.qt.io/input/debian/libuv1/arm64-focal/libuv1_1.43.0.tar.gz
|
||||
tar -xzf libuv1_1.43.0.tar.gz
|
||||
rm -rf libuv1_1.43.0.tar.gz
|
||||
wget http://ci-files01-hki.ci.qt.io/input/debian/nghttp2/arm64-focal/nghttp2_1.43.0.tar.gz
|
||||
tar -xzf nghttp2_1.43.0.tar.gz
|
||||
rm -rf nghttp2_1.43.0.tar.gz
|
||||
wget http://ci-files01-hki.ci.qt.io/input/debian/nodejs/arm64-focal/nodejs_12.22.9.tar.gz
|
||||
tar -xzf nodejs_12.22.9.tar.gz
|
||||
rm -rf nodejs_12.22.9.tar.gz
|
||||
# get ICU
|
||||
wget http://ci-files01-hki.ci.qt.io/input/debian/icu/arm64-focal/libicu-56.1-qt_56.1-1_arm64.deb
|
||||
wget http://ci-files01-hki.ci.qt.io/input/debian/icu/arm64-focal/libicu-56.1-qt-dev_56.1-1_arm64.deb
|
||||
|
||||
wget http://ci-files01-hki.ci.qt.io/input/debian/icu/arm64-jammy/libicu-56.1-qt_56.1-1_arm64.deb
|
||||
wget http://ci-files01-hki.ci.qt.io/input/debian/icu/arm64-jammy/libicu-56.1-qt-dev_56.1-1_arm64.deb
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,8 @@
|
||||
#!/usr/bin/env bash
|
||||
#Copyright (C) 2023 The Qt Company Ltd
|
||||
#SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
|
||||
|
||||
set -ex
|
||||
|
||||
BASEDIR=$(dirname "$0")
|
||||
"$BASEDIR"/../common/linux/enable_test_stacktraces.sh
|
||||
@@ -0,0 +1,8 @@
|
||||
#!/usr/bin/env bash
|
||||
#Copyright (C) 2023 The Qt Company Ltd
|
||||
#SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
|
||||
|
||||
set -ex
|
||||
|
||||
BASEDIR=$(dirname "$0")
|
||||
"$BASEDIR"/../common/linux/enable_test_stacktraces.sh
|
||||
@@ -0,0 +1,8 @@
|
||||
#!/usr/bin/env bash
|
||||
#Copyright (C) 2023 The Qt Company Ltd
|
||||
#SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
|
||||
|
||||
set -ex
|
||||
|
||||
BASEDIR=$(dirname "$0")
|
||||
"$BASEDIR"/../common/linux/enable_test_stacktraces.sh
|
||||
@@ -11,8 +11,8 @@ set -e
|
||||
"${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh"
|
||||
# shellcheck source=../common/unix/DownloadURL.sh
|
||||
source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh"
|
||||
version="22ac5ee7e6e9e80c34ffe3616b1ac461e9a552cd"
|
||||
sha1="32084b2e3fd63b715d3eaee5545164e6781d52ec"
|
||||
version="68bdc5764da2d4e442181b408751b6572f36fa74"
|
||||
sha1="dac76e8f6cb69990661e7d814bea6f32fea29bf4"
|
||||
url="https://download.qt.io/development_releases/prebuilt/qdoc/qt/qdoc-qtattributionsscanner_${version//\./}-based-linux-Ubuntu22.04-gcc11.4-x86_64.7z"
|
||||
url_cached="http://ci-files01-hki.ci.qt.io/input/qdoc/qt/qdoc-qtattributionsscanner_${version//\./}-based-linux-Ubuntu22.04-gcc11.4-x86_64.7z"
|
||||
|
||||
|
||||
@@ -41,14 +41,15 @@ newgrp sbuild
|
||||
|
||||
# Create chroot
|
||||
sudo sbuild-createchroot --include=eatmydata,ccache,gnupg,ca-certificates stable /srv/chroot/stable-amd64
|
||||
# For ubuntu 20.04
|
||||
echo "Create chroot for Ubuntu Focal"
|
||||
sudo sbuild-createchroot --include=eatmydata,ccache,gnupg,ca-certificates focal /srv/chroot/focal-amd64 http://archive.ubuntu.com/ubuntu/
|
||||
echo "Done creating chroot for Ubuntu Focal"
|
||||
|
||||
# Update chroot
|
||||
# For ubuntu 22.04
|
||||
echo "Create chroot for Ubuntu Jammy"
|
||||
## ccache can't be found with Jammy
|
||||
sudo sbuild-createchroot --include=eatmydata,gnupg,ca-certificates jammy /srv/chroot/jammy-amd64 http://archive.ubuntu.com/ubuntu/
|
||||
echo "Done creating chroot for Ubuntu Jammy"
|
||||
|
||||
# Update chroot.
|
||||
sudo sbuild-update -udcar stable
|
||||
sudo sbuild-update -udcar focal
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -2,24 +2,15 @@
|
||||
# Copyright (C) 2023 The Qt Company Ltd.
|
||||
# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
|
||||
|
||||
# Get required deb files for sbuild to build qt debian packages for Ubuntu focal
|
||||
# Get required deb files for sbuild to build qt debian packages for Ubuntu jammy
|
||||
mkdir -p /home/qt/debian_packages
|
||||
cd /home/qt/debian_packages || exit
|
||||
# Backported cmake 3.24
|
||||
wget https://ci-files01-hki.intra.qt.io/input/debian/cmake/amd64-focal/cmake-3.24-deb.tar.gz
|
||||
wget https://ci-files01-hki.intra.qt.io/input/debian/cmake/amd64-jammy/cmake-3.24-deb.tar.gz
|
||||
tar xzf cmake-3.24-deb.tar.gz
|
||||
# get rest of ready made Ubuntu focal arm debian packages
|
||||
rm -rf cmake-3.24-deb.tar.gz
|
||||
# get rest of ready made Ubuntu jammy arm debian packages
|
||||
# so that sbuild can find those
|
||||
# QtWebEngine dependencies
|
||||
wget http://ci-files01-hki.ci.qt.io/input/debian/libuv1/amd64-focal/libuv1_1.43.0.tar.gz
|
||||
tar -xzf libuv1_1.43.0.tar.gz
|
||||
rm -rf libuv1_1.43.0.tar.gz
|
||||
wget http://ci-files01-hki.ci.qt.io/input/debian/nghttp2/amd64-focal/nghttp2_1.43.0.tar.gz
|
||||
tar -xzf nghttp2_1.43.0.tar.gz
|
||||
rm -rf nghttp2_1.43.0.tar.gz
|
||||
wget http://ci-files01-hki.ci.qt.io/input/debian/nodejs/amd64-focal/nodejs_12.22.9.tar.gz
|
||||
tar -xzf nodejs_12.22.9.tar.gz
|
||||
rm -rf nodejs_12.22.9.tar.gz
|
||||
# get ICU
|
||||
wget http://ci-files01-hki.ci.qt.io/input/debian/icu/amd64-focal/libicu-56.1-qt_56.1-1_amd64.deb
|
||||
wget http://ci-files01-hki.ci.qt.io/input/debian/icu/amd64-focal/libicu-56.1-qt-dev_56.1-1_amd64.deb
|
||||
|
||||
wget http://ci-files01-hki.ci.qt.io/input/debian/icu/amd64-jammy/libicu-56.1-qt_56.1-1_amd64.deb
|
||||
wget http://ci-files01-hki.ci.qt.io/input/debian/icu/amd64-jammy/libicu-56.1-qt-dev_56.1-1_amd64.deb
|
||||
|
||||
@@ -0,0 +1,8 @@
|
||||
#!/usr/bin/env bash
|
||||
#Copyright (C) 2023 The Qt Company Ltd
|
||||
#SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
|
||||
|
||||
set -ex
|
||||
|
||||
BASEDIR=$(dirname "$0")
|
||||
"$BASEDIR"/../common/linux/enable_test_stacktraces.sh
|
||||
2
qt3d
2
qt3d
Submodule qt3d updated: 08771a2ecf...584e1f3a3f
Submodule qt5compat updated: d7130c8fd5...de8c7e0b43
Submodule qtactiveqt updated: 626db282a7...d6c7dc80ae
2
qtbase
2
qtbase
Submodule qtbase updated: 60c33a2501...98602c26fc
2
qtcharts
2
qtcharts
Submodule qtcharts updated: c8603bcfa7...f35de24c01
2
qtcoap
2
qtcoap
Submodule qtcoap updated: aa60f25ce5...dcbe6c5277
Submodule qtconnectivity updated: b02591cfc8...d8812bdd39
Submodule qtdatavis3d updated: 9090624015...d5a8908f2d
Submodule qtdeclarative updated: 7c74c0895c...e6d14fcdc9
2
qtdoc
2
qtdoc
Submodule qtdoc updated: 46644b9663...12b560d627
2
qtgraphs
2
qtgraphs
Submodule qtgraphs updated: 8b23a481aa...bb5fd92e61
2
qtgrpc
2
qtgrpc
Submodule qtgrpc updated: e157e38b4d...e3b70ec75f
Submodule qthttpserver updated: 75a0b431b7...5336cc98bc
Submodule qtimageformats updated: 72d9361796...3eedabd515
Submodule qtlanguageserver updated: 0b87c6a02e...f4f5ca2eec
Submodule qtlocation updated: 490dff1557...c9749a81eb
2
qtlottie
2
qtlottie
Submodule qtlottie updated: 882c65e642...5a8235d0a0
2
qtmqtt
2
qtmqtt
Submodule qtmqtt updated: b746af5fdf...3816ff0913
Submodule qtmultimedia updated: ead22a2ad8...5d2bdf0092
Submodule qtnetworkauth updated: 05afc4f336...33a58af35d
2
qtopcua
2
qtopcua
Submodule qtopcua updated: 6daf78f623...87e8ad711f
Submodule qtpositioning updated: d0c64c2145...f473f4b659
2
qtqa
2
qtqa
Submodule qtqa updated: 0ddac0c8a3...9d52ae48ff
Submodule qtquick3d updated: 009186db12...2f4d3edc80
Submodule qtquick3dphysics updated: 5216f87f15...e4ee174658
Submodule qtquickeffectmaker updated: 5624fcec20...0d58d0ad4e
Submodule qtquicktimeline updated: 1830433b0c...fd74687a02
Submodule qtremoteobjects updated: 92ce5a10d4...6d973e34b5
Submodule qtrepotools updated: 62c866e68f...141876182b
2
qtscxml
2
qtscxml
Submodule qtscxml updated: 7e0efeb23b...0942dca79e
Submodule qtsensors updated: bd6c4fd73c...3d3ad478b6
Submodule qtserialbus updated: 322d5327c6...2c1fec48f9
Submodule qtserialport updated: 0fdce7843b...df94dfb401
Submodule qtshadertools updated: 16c3ca8875...65b015f6a2
2
qtspeech
2
qtspeech
Submodule qtspeech updated: 7448998bb6...d019c418c1
2
qtsvg
2
qtsvg
Submodule qtsvg updated: 8a8e56ed6d...85eeb5aecf
2
qttools
2
qttools
Submodule qttools updated: 667537524c...67a4b353b2
Submodule qttranslations updated: 3755c1a310...d0383e66bb
Submodule qtvirtualkeyboard updated: 3188fe00a0...6a52fb1c23
Submodule qtwayland updated: c58e53d3fc...b71592631f
Submodule qtwebchannel updated: eac031407d...d2f8de3fd4
Submodule qtwebengine updated: 374c20590b...1a3e3a233d
Submodule qtwebsockets updated: 04c7f36aa7...45d5cdde4c
Submodule qtwebview updated: 4e745154a1...7548ee6677
Reference in New Issue
Block a user