mirror of
git://code.qt.io/qt/qt5.git
synced 2025-12-28 10:56:02 +08:00
Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
56657e036f | ||
|
|
575b8791f4 | ||
|
|
7381247f5d | ||
|
|
768f56a7d0 | ||
|
|
91b9ddb0c7 |
86
.gitmodules
vendored
86
.gitmodules
vendored
@@ -1,40 +1,40 @@
|
||||
[submodule "qtbase"]
|
||||
path = qtbase
|
||||
url = ../qtbase.git
|
||||
branch = 6.10
|
||||
branch = 6.10.1
|
||||
status = essential
|
||||
[submodule "qtsvg"]
|
||||
depends = qtbase
|
||||
path = qtsvg
|
||||
url = ../qtsvg.git
|
||||
branch = 6.10
|
||||
branch = 6.10.1
|
||||
status = addon
|
||||
[submodule "qtdeclarative"]
|
||||
depends = qtbase
|
||||
recommends = qtimageformats qtshadertools qtsvg qtlanguageserver
|
||||
path = qtdeclarative
|
||||
url = ../qtdeclarative.git
|
||||
branch = 6.10
|
||||
branch = 6.10.1
|
||||
status = essential
|
||||
[submodule "qtactiveqt"]
|
||||
depends = qtbase
|
||||
path = qtactiveqt
|
||||
url = ../qtactiveqt.git
|
||||
branch = 6.10
|
||||
branch = 6.10.1
|
||||
status = addon
|
||||
[submodule "qtmultimedia"]
|
||||
depends = qtbase qtshadertools
|
||||
recommends = qtdeclarative qtquick3d
|
||||
path = qtmultimedia
|
||||
url = ../qtmultimedia.git
|
||||
branch = 6.10
|
||||
branch = 6.10.1
|
||||
status = addon
|
||||
[submodule "qttools"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtactiveqt
|
||||
path = qttools
|
||||
url = ../qttools.git
|
||||
branch = 6.10
|
||||
branch = 6.10.1
|
||||
status = essential
|
||||
[submodule "qtxmlpatterns"]
|
||||
depends = qtbase
|
||||
@@ -47,7 +47,7 @@
|
||||
depends = qttools
|
||||
path = qttranslations
|
||||
url = ../qttranslations.git
|
||||
branch = 6.10
|
||||
branch = 6.10.1
|
||||
status = essential
|
||||
priority = 30
|
||||
[submodule "qtdoc"]
|
||||
@@ -55,7 +55,7 @@
|
||||
recommends = qtmultimedia qtshadertools qtwebengine
|
||||
path = qtdoc
|
||||
url = ../qtdoc.git
|
||||
branch = 6.10
|
||||
branch = 6.10.1
|
||||
status = essential
|
||||
priority = 40
|
||||
[submodule "qtrepotools"]
|
||||
@@ -68,7 +68,7 @@
|
||||
depends = qtbase
|
||||
path = qtqa
|
||||
url = ../qtqa.git
|
||||
branch = 6.10
|
||||
branch = 6.10.1
|
||||
status = essential
|
||||
priority = 50
|
||||
[submodule "qtlocation"]
|
||||
@@ -76,21 +76,21 @@
|
||||
recommends = qtdeclarative
|
||||
path = qtlocation
|
||||
url = ../qtlocation.git
|
||||
branch = 6.10
|
||||
branch = 6.10.1
|
||||
status = preview
|
||||
[submodule "qtpositioning"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtserialport
|
||||
path = qtpositioning
|
||||
url = ../qtpositioning.git
|
||||
branch = 6.10
|
||||
branch = 6.10.1
|
||||
status = addon
|
||||
[submodule "qtsensors"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtsensors
|
||||
url = ../qtsensors.git
|
||||
branch = 6.10
|
||||
branch = 6.10.1
|
||||
status = addon
|
||||
[submodule "qtsystems"]
|
||||
depends = qtbase
|
||||
@@ -117,61 +117,61 @@
|
||||
recommends = qtdeclarative
|
||||
path = qtconnectivity
|
||||
url = ../qtconnectivity.git
|
||||
branch = 6.10
|
||||
branch = 6.10.1
|
||||
status = addon
|
||||
[submodule "qtwayland"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwayland
|
||||
url = ../qtwayland.git
|
||||
branch = 6.10
|
||||
branch = 6.10.1
|
||||
status = addon
|
||||
[submodule "qt3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtshadertools qtmultimedia
|
||||
path = qt3d
|
||||
url = ../qt3d.git
|
||||
branch = 6.10
|
||||
branch = 6.10.1
|
||||
status = deprecated
|
||||
[submodule "qtimageformats"]
|
||||
depends = qtbase
|
||||
path = qtimageformats
|
||||
url = ../qtimageformats.git
|
||||
branch = 6.10
|
||||
branch = 6.10.1
|
||||
status = addon
|
||||
[submodule "qtserialbus"]
|
||||
depends = qtbase
|
||||
recommends = qtserialport
|
||||
path = qtserialbus
|
||||
url = ../qtserialbus.git
|
||||
branch = 6.10
|
||||
branch = 6.10.1
|
||||
status = addon
|
||||
[submodule "qtserialport"]
|
||||
depends = qtbase
|
||||
path = qtserialport
|
||||
url = ../qtserialport.git
|
||||
branch = 6.10
|
||||
branch = 6.10.1
|
||||
status = addon
|
||||
[submodule "qtwebsockets"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwebsockets
|
||||
url = ../qtwebsockets.git
|
||||
branch = 6.10
|
||||
branch = 6.10.1
|
||||
status = addon
|
||||
[submodule "qtwebchannel"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtwebsockets
|
||||
path = qtwebchannel
|
||||
url = ../qtwebchannel.git
|
||||
branch = 6.10
|
||||
branch = 6.10.1
|
||||
status = addon
|
||||
[submodule "qtwebengine"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtwebchannel qttools qtpositioning
|
||||
path = qtwebengine
|
||||
url = ../qtwebengine.git
|
||||
branch = 6.10
|
||||
branch = 6.10.1
|
||||
status = addon
|
||||
priority = 10
|
||||
[submodule "qtcanvas3d"]
|
||||
@@ -185,28 +185,28 @@
|
||||
recommends = qtwebengine
|
||||
path = qtwebview
|
||||
url = ../qtwebview.git
|
||||
branch = 6.10
|
||||
branch = 6.10.1
|
||||
status = addon
|
||||
[submodule "qtcharts"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtcharts
|
||||
url = ../qtcharts.git
|
||||
branch = 6.10
|
||||
branch = 6.10.1
|
||||
status = deprecated
|
||||
[submodule "qtdatavis3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtdatavis3d
|
||||
url = ../qtdatavis3d.git
|
||||
branch = 6.10
|
||||
branch = 6.10.1
|
||||
status = deprecated
|
||||
[submodule "qtvirtualkeyboard"]
|
||||
depends = qtbase qtdeclarative qtsvg
|
||||
recommends = qtmultimedia
|
||||
path = qtvirtualkeyboard
|
||||
url = ../qtvirtualkeyboard.git
|
||||
branch = 6.10
|
||||
branch = 6.10.1
|
||||
status = addon
|
||||
[submodule "qtgamepad"]
|
||||
depends = qtbase
|
||||
@@ -219,27 +219,27 @@
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtscxml
|
||||
url = ../qtscxml.git
|
||||
branch = 6.10
|
||||
branch = 6.10.1
|
||||
status = addon
|
||||
[submodule "qtspeech"]
|
||||
depends = qtbase qtmultimedia
|
||||
recommends = qtdeclarative
|
||||
path = qtspeech
|
||||
url = ../qtspeech.git
|
||||
branch = 6.10
|
||||
branch = 6.10.1
|
||||
status = addon
|
||||
[submodule "qtnetworkauth"]
|
||||
depends = qtbase
|
||||
path = qtnetworkauth
|
||||
url = ../qtnetworkauth.git
|
||||
branch = 6.10
|
||||
branch = 6.10.1
|
||||
status = addon
|
||||
[submodule "qtremoteobjects"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtremoteobjects
|
||||
url = ../qtremoteobjects.git
|
||||
branch = 6.10
|
||||
branch = 6.10.1
|
||||
status = addon
|
||||
[submodule "qtwebglplugin"]
|
||||
depends = qtbase qtwebsockets
|
||||
@@ -252,88 +252,88 @@
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtlottie
|
||||
url = ../qtlottie.git
|
||||
branch = 6.10
|
||||
branch = 6.10.1
|
||||
status = addon
|
||||
[submodule "qtquicktimeline"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtquicktimeline
|
||||
url = ../qtquicktimeline
|
||||
branch = 6.10
|
||||
branch = 6.10.1
|
||||
status = addon
|
||||
[submodule "qtquick3d"]
|
||||
depends = qtbase qtdeclarative qtshadertools
|
||||
recommends = qtquicktimeline
|
||||
path = qtquick3d
|
||||
url = ../qtquick3d.git
|
||||
branch = 6.10
|
||||
branch = 6.10.1
|
||||
status = addon
|
||||
[submodule "qtshadertools"]
|
||||
depends = qtbase
|
||||
path = qtshadertools
|
||||
url = ../qtshadertools.git
|
||||
branch = 6.10
|
||||
branch = 6.10.1
|
||||
status = addon
|
||||
[submodule "qt5compat"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qt5compat
|
||||
url = ../qt5compat.git
|
||||
branch = 6.10
|
||||
branch = 6.10.1
|
||||
status = deprecated
|
||||
[submodule "qtcoap"]
|
||||
depends = qtbase
|
||||
path = qtcoap
|
||||
url = ../qtcoap.git
|
||||
branch = 6.10
|
||||
branch = 6.10.1
|
||||
status = addon
|
||||
[submodule "qtmqtt"]
|
||||
depends = qtbase qtdeclarative
|
||||
recommends = qtwebsockets
|
||||
path = qtmqtt
|
||||
url = ../qtmqtt.git
|
||||
branch = 6.10
|
||||
branch = 6.10.1
|
||||
status = addon
|
||||
[submodule "qtopcua"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtopcua
|
||||
url = ../qtopcua.git
|
||||
branch = 6.10
|
||||
branch = 6.10.1
|
||||
status = addon
|
||||
[submodule "qtlanguageserver"]
|
||||
depends = qtbase
|
||||
path = qtlanguageserver
|
||||
url = ../qtlanguageserver.git
|
||||
branch = 6.10
|
||||
branch = 6.10.1
|
||||
status = preview
|
||||
[submodule "qthttpserver"]
|
||||
depends = qtbase
|
||||
recommends = qtwebsockets
|
||||
path = qthttpserver
|
||||
url = ../qthttpserver.git
|
||||
branch = 6.10
|
||||
branch = 6.10.1
|
||||
status = addon
|
||||
[submodule "qtquick3dphysics"]
|
||||
depends = qtbase qtdeclarative qtquick3d qtshadertools
|
||||
path = qtquick3dphysics
|
||||
url = ../qtquick3dphysics.git
|
||||
branch = 6.10
|
||||
branch = 6.10.1
|
||||
status = addon
|
||||
[submodule "qtgrpc"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtgrpc
|
||||
url = ../qtgrpc.git
|
||||
branch = 6.10
|
||||
branch = 6.10.1
|
||||
status = addon
|
||||
[submodule "qtquickeffectmaker"]
|
||||
depends = qtbase qtdeclarative qtshadertools
|
||||
recommends = qtquick3d
|
||||
path = qtquickeffectmaker
|
||||
url = ../qtquickeffectmaker.git
|
||||
branch = 6.10
|
||||
branch = 6.10.1
|
||||
status = addon
|
||||
[submodule "qtgraphs"]
|
||||
depends = qtbase qtdeclarative qtquick3d
|
||||
path = qtgraphs
|
||||
url = ../qtgraphs.git
|
||||
branch = 6.10
|
||||
branch = 6.10.1
|
||||
status = addon
|
||||
|
||||
@@ -421,19 +421,3 @@ function(qt_ir_get_option_as_cmake_flag_option cli_name cmake_option_name out_va
|
||||
endif()
|
||||
set(${out_var} "${cmake_option}" PARENT_SCOPE)
|
||||
endfunction()
|
||||
|
||||
# Get the value of a command line option as existing absolute path.
|
||||
# Yield error if the path does not exist.
|
||||
# Convert to absolute path if necessary.
|
||||
function(qt_ir_get_option_as_existing_absolute_path name value)
|
||||
qt_ir_get_option_value("${name}" path)
|
||||
if(NOT "${path}" STREQUAL "")
|
||||
if(NOT EXISTS "${path}")
|
||||
qt_ir_add_error("The path '${path}' passed with -${name} does not exist.")
|
||||
endif()
|
||||
if(NOT IS_ABSOLUTE "${path}")
|
||||
get_filename_component(path "${path}" ABSOLUTE)
|
||||
endif()
|
||||
endif()
|
||||
set("${value}" "${path}" PARENT_SCOPE)
|
||||
endfunction()
|
||||
|
||||
@@ -295,7 +295,7 @@ function(qt_ir_run_after_args_parsed top_level_src_path out_var_exit_reason)
|
||||
"${working_directory}")
|
||||
|
||||
# Get some additional options to pass down.
|
||||
qt_ir_get_option_as_existing_absolute_path(alternates alternates)
|
||||
qt_ir_get_option_value(alternates alternates)
|
||||
qt_ir_get_option_as_cmake_flag_option(branch "CHECKOUT_BRANCH" checkout_branch_option)
|
||||
|
||||
# The prefix for the cmake-style 'dictionary' that will be used by various functions.
|
||||
|
||||
@@ -33,12 +33,12 @@ Configurations:
|
||||
]
|
||||
-
|
||||
Id: 'android-9-x86-on-linux'
|
||||
Template: 'qtci-linux-RHEL-9.4-x86_64-50'
|
||||
Template: 'qtci-linux-RHEL-8.10-x86_64-51'
|
||||
Target os: 'Android_ANY'
|
||||
Target arch: 'x86'
|
||||
Compiler: 'GCC'
|
||||
Target compiler: 'Clang'
|
||||
Platform dependency: 'rhel-9.4'
|
||||
Platform dependency: 'rhel-8.10'
|
||||
Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
|
||||
Environment variables: [
|
||||
'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
|
||||
@@ -49,12 +49,12 @@ Configurations:
|
||||
]
|
||||
-
|
||||
Id: 'android-16-x86_64-on-linux'
|
||||
Template: 'qtci-linux-RHEL-9.4-x86_64-50'
|
||||
Template: 'qtci-linux-RHEL-8.10-x86_64-51'
|
||||
Target os: 'Android_ANY'
|
||||
Target arch: 'x86_64'
|
||||
Compiler: 'GCC'
|
||||
Target compiler: 'Clang'
|
||||
Platform dependency: 'rhel-9.4'
|
||||
Platform dependency: 'rhel-8.10'
|
||||
Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
|
||||
Environment variables: [
|
||||
'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
|
||||
|
||||
@@ -2,12 +2,12 @@ Version: 2
|
||||
Configurations:
|
||||
-
|
||||
Id: 'android-x86-developer-build-testrun-on-linux'
|
||||
Template: 'qtci-linux-RHEL-9.4-x86_64-50'
|
||||
Template: 'qtci-linux-RHEL-8.10-x86_64-51'
|
||||
Target os: 'Android_ANY'
|
||||
Target arch: 'x86'
|
||||
Compiler: 'GCC'
|
||||
Target compiler: 'Clang'
|
||||
Platform dependency: 'rhel-9.4'
|
||||
Platform dependency: 'rhel-8.10'
|
||||
Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'UseConfigure']
|
||||
Environment variables: [
|
||||
'TARGET_CONFIGURE_ARGS=-nomake examples -debug -developer-build -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
|
||||
|
||||
@@ -2,13 +2,13 @@ Version: 2
|
||||
Configurations:
|
||||
-
|
||||
Id: 'android-9-multi-abi'
|
||||
Template: 'qtci-linux-RHEL-9.4-x86_64-50'
|
||||
Template: 'qtci-linux-RHEL-8.10-x86_64-51'
|
||||
Target os: 'Android_ANY'
|
||||
Target arch: 'multi'
|
||||
Compiler: 'GCC'
|
||||
Target compiler: 'Clang'
|
||||
Platform dependency: [
|
||||
'rhel-9.4',
|
||||
'rhel-8.10',
|
||||
'android-9-x86-on-linux',
|
||||
'android-16-x86_64-on-linux'
|
||||
]
|
||||
@@ -20,7 +20,7 @@ Configurations:
|
||||
'InstallDepsPerPlatformSubdir'
|
||||
]
|
||||
Environment variables: [
|
||||
'QT_CI_ARTIFACT_ID_PATH_Android-host=QT_CI_ARTIFACT_ID_PATH_rhel-9.4',
|
||||
'QT_CI_ARTIFACT_ID_PATH_Android-host=QT_CI_ARTIFACT_ID_PATH_rhel-8.10',
|
||||
'QT_CI_ARTIFACT_ID_PATH_Android-x86=QT_CI_ARTIFACT_ID_PATH_android-9-x86-on-linux',
|
||||
'QT_CI_ARTIFACT_ID_PATH_Android-x86_64=QT_CI_ARTIFACT_ID_PATH_android-16-x86_64-on-linux',
|
||||
'COMMON_TARGET_TEST_CMAKE_ARGS=-DQT_ANDROID_ABIS="x86;x86_64"',
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
Version: 2
|
||||
Include: [
|
||||
cmake_platforms.yaml: [
|
||||
'rhel-9.4'
|
||||
'rhel-8.10'
|
||||
],
|
||||
cmake_platforms_target_android.yaml: [
|
||||
'android-15-x86_64-on-linux',
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
Version: 2
|
||||
Include: [
|
||||
cmake_platforms.yaml: [
|
||||
'rhel-9.4',
|
||||
'rhel-8.10',
|
||||
'windows-11_24h2-mingw13'
|
||||
],
|
||||
cmake_platforms_target_android.yaml: [
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
Version: 2
|
||||
Include: [
|
||||
cmake_platforms.yaml: [
|
||||
'rhel-9.4',
|
||||
'rhel-8.10',
|
||||
'windows-11_24h2-mingw13'
|
||||
],
|
||||
cmake_platforms_target_android.yaml: [
|
||||
|
||||
@@ -9,7 +9,7 @@ Configurations:
|
||||
Environment variables: []
|
||||
Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64']
|
||||
-
|
||||
Template: 'qtci-linux-RHEL-9.4-x86_64-50'
|
||||
Template: 'qtci-linux-RHEL-8.10-x86_64-51'
|
||||
Compiler: 'GCC'
|
||||
Features: ['Sccache', 'DebugAndRelease']
|
||||
Configure arguments: ''
|
||||
@@ -21,7 +21,7 @@ Configurations:
|
||||
Configure arguments: ''
|
||||
Environment variables: []
|
||||
-
|
||||
Template: 'qtci-macos-15-arm-104'
|
||||
Template: 'qtci-macos-14-arm-106'
|
||||
Compiler: 'Clang'
|
||||
Features: ['Sccache', 'DebugAndRelease']
|
||||
Configure arguments: ''
|
||||
@@ -42,28 +42,15 @@ Configurations:
|
||||
Configure arguments: ''
|
||||
Environment variables: []
|
||||
Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64']
|
||||
-
|
||||
Template: 'qtci-linux-RHEL-9.4-x86_64-50'
|
||||
Compiler: 'GCC'
|
||||
Features: ['Sccache', 'DebugAndRelease', 'OldestQt']
|
||||
Configure arguments: ''
|
||||
Environment variables: []
|
||||
-
|
||||
Template: 'qtci-linux-RHEL-8.10-x86_64-51'
|
||||
Compiler: 'GCC'
|
||||
Features: ['Sccache', 'DebugAndRelease', 'OldestQt', 'QtC18AndEarlier']
|
||||
Configure arguments: ''
|
||||
Environment variables: []
|
||||
-
|
||||
Template: 'qtci-macos-15-arm-104'
|
||||
Compiler: 'Clang'
|
||||
Features: ['Sccache', 'DebugAndRelease', 'OldestQt']
|
||||
Configure arguments: ''
|
||||
Environment variables: []
|
||||
# Tests GCC 11
|
||||
-
|
||||
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
|
||||
Compiler: 'GCC'
|
||||
Template: 'qtci-macos-14-arm-106'
|
||||
Compiler: 'Clang'
|
||||
Features: ['Sccache', 'DebugAndRelease', 'OldestQt']
|
||||
Configure arguments: ''
|
||||
Environment variables: []
|
||||
|
||||
@@ -2,7 +2,7 @@ Version: 2
|
||||
Include: [
|
||||
cmake_platforms.yaml: [
|
||||
"documentation-warnings",
|
||||
"rhel-9.4",
|
||||
"rhel-8.10",
|
||||
'windows-11_24h2-mingw13',
|
||||
],
|
||||
macos.yaml: [
|
||||
@@ -19,12 +19,12 @@ Include: [
|
||||
Configurations:
|
||||
-
|
||||
Id: "automotive-android-14-x86_64-on-linux"
|
||||
Template: 'qtci-linux-RHEL-9.4-x86_64-50'
|
||||
Template: 'qtci-linux-RHEL-8.10-x86_64-51'
|
||||
Target os: 'Android_ANY'
|
||||
Target arch: 'x86_64'
|
||||
Compiler: 'GCC'
|
||||
Target compiler: 'Clang'
|
||||
Platform dependency: 'rhel-9.4'
|
||||
Platform dependency: 'rhel-8.10'
|
||||
Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
|
||||
Environment variables: [
|
||||
'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
|
||||
@@ -35,12 +35,12 @@ Configurations:
|
||||
]
|
||||
-
|
||||
Id: "automotive-android-10-x86_64-on-linux"
|
||||
Template: 'qtci-linux-RHEL-9.4-x86_64-50'
|
||||
Template: 'qtci-linux-RHEL-8.10-x86_64-51'
|
||||
Target os: 'Android_ANY'
|
||||
Target arch: 'x86_64'
|
||||
Compiler: 'GCC'
|
||||
Target compiler: 'Clang'
|
||||
Platform dependency: 'rhel-9.4'
|
||||
Platform dependency: 'rhel-8.10'
|
||||
Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
|
||||
Environment variables: [
|
||||
'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
|
||||
|
||||
@@ -15,21 +15,14 @@ sha1="ddd46a2e2a16a308245c008721d877455b23bba8"
|
||||
target_source_dir="$HOME/patchelf-$patchelf_version"
|
||||
|
||||
if [ ! -d "$target_source_dir" ]; then
|
||||
InstallFromCompressedFileFromURL "$url_cached" "$url_public" "$sha1" "$HOME" ""
|
||||
InstallFromCompressedFileFromURL "$url_cached" "$url_public" "$sha1" "$HOME" ""
|
||||
fi
|
||||
|
||||
pushd "$target_source_dir" || exit
|
||||
pushd "$target_source_dir"
|
||||
|
||||
./bootstrap.sh
|
||||
./configure
|
||||
make
|
||||
sudo make install
|
||||
|
||||
popd || exit
|
||||
|
||||
if [[ "$(uname -s)" = "Linux" && -f /etc/redhat-release ]]; then
|
||||
# RHEL-9 with sudo or non-interactive shells do not include /usr/local/bin/ in PATH
|
||||
# Add a symlink so patchelf is found in later scripts
|
||||
echo "Creating symlink for patchelf in /usr/bin"
|
||||
sudo ln -sf /usr/local/bin/patchelf /usr/bin/patchelf
|
||||
fi
|
||||
popd
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
# This script will install Java SE
|
||||
# https://www.oracle.com/java/technologies/javase/jdk17-archive-downloads.html
|
||||
$version_major = "17"
|
||||
$installdir = "C:\Program Files\Java\jdk-$version_major"
|
||||
|
||||
$cpu_arch = Get-CpuArchitecture
|
||||
switch ($cpu_arch) {
|
||||
@@ -18,9 +19,6 @@ switch ($cpu_arch) {
|
||||
$url_official = "https://aka.ms/download-jdk/microsoft-jdk-${version}-windows-${arch}.msi"
|
||||
$url_cache = "\\ci-files01-hki.ci.qt.io\provisioning\windows\microsoft-jdk-${version}-windows-${arch}.msi"
|
||||
$javaPackage = "C:\Windows\Temp\jdk-$version.msi"
|
||||
# Microsoft installer does not allow to override the installation path using the regular
|
||||
# TARGETDIR or INSTALLDIR properties, so just hardcode the path that it uses
|
||||
$installdir = "C:\Program Files\Microsoft\jdk-17.0.11.9-hotspot"
|
||||
Break
|
||||
}
|
||||
x64 {
|
||||
@@ -30,7 +28,6 @@ switch ($cpu_arch) {
|
||||
$url_official = "https://download.oracle.com/java/17/archive/jdk-${version}_windows-${arch}_bin.exe"
|
||||
$url_cache = "\\ci-files01-hki.ci.qt.io\provisioning\windows\jdk-$version-windows-$arch.exe"
|
||||
$javaPackage = "C:\Windows\Temp\jdk-$version.exe"
|
||||
$installdir = "C:\Program Files\Java\jdk-$version_major"
|
||||
Break
|
||||
}
|
||||
default {
|
||||
|
||||
@@ -166,8 +166,6 @@ installPackages+=(zip)
|
||||
installPackages+=(perl-IPC-Cmd)
|
||||
# password management support for Qt Creator
|
||||
installPackages+=(libsecret-devel)
|
||||
# for license-service library
|
||||
installPackages+=(libuuid-devel)
|
||||
# For Firebird in RTA
|
||||
installPackages+=(libtommath-devel)
|
||||
|
||||
|
||||
@@ -167,8 +167,6 @@ installPackages+=(zip)
|
||||
installPackages+=(perl-IPC-Cmd)
|
||||
# password management support for Qt Creator
|
||||
installPackages+=(libsecret-devel)
|
||||
# for license-service library
|
||||
installPackages+=(libuuid-devel)
|
||||
# For Firebird in RTA
|
||||
installPackages+=(libtommath-devel)
|
||||
# For tst_license.pl with all the machines generating SBOM
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
source "${BASH_SOURCE%/*}/../common/linux/install-ffmpeg-linux.sh"
|
||||
source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-x86_64" "use_16kb_page_size"
|
||||
source "${BASH_SOURCE%/*}/../common/unix/install-ffmpeg-android.sh" "android-x86" "use_4kb_page_size"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#!/usr/bin/env bash
|
||||
# Copyright (C) 2025 The Qt Company Ltd.
|
||||
# Copyright (C) 2017 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
|
||||
|
||||
# Install required packages with APT
|
||||
@@ -20,14 +20,14 @@ function set_internal_repo {
|
||||
sudo mv /etc/apt/apt.conf.d/50appstream{,.disabled}
|
||||
|
||||
sudo tee "/etc/apt/sources.list" > /dev/null <<-EOC
|
||||
deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 bionic-amd64 main restricted universe multiverse
|
||||
deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 bionic-updates-amd64 main restricted universe multiverse
|
||||
deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 bionic-backports-amd64 main restricted universe
|
||||
deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 bionic-security-amd64 main restricted universe multiverse
|
||||
deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ bionic main restricted universe multiverse
|
||||
deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ bionic-updates main restricted universe multiverse
|
||||
deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ bionic-backports main restricted universe
|
||||
deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ bionic-security main restricted universe multiverse
|
||||
EOC
|
||||
}
|
||||
|
||||
(ping -c 3 repo-clones-apt.ci.qt.io && set_internal_repo) || echo "Internal package repository not found. Using public repositories."
|
||||
(ping -c 3 repo-clones.ci.qt.io && set_internal_repo) || echo "Internal package repository not found. Using public repositories."
|
||||
|
||||
# Git is not needed by builds themselves, but is nice to have
|
||||
# immediately as one starts debugging
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#!/usr/bin/env bash
|
||||
# Copyright (C) 2025 The Qt Company Ltd.
|
||||
# Copyright (C) 2021 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
|
||||
|
||||
# Install required packages with APT
|
||||
@@ -20,16 +20,17 @@ function set_internal_repo {
|
||||
sudo mv /etc/apt/apt.conf.d/50appstream{,.disabled}
|
||||
|
||||
sudo tee "/etc/apt/sources.list" > /dev/null <<-EOC
|
||||
deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 focal-amd64 main restricted universe multiverse
|
||||
deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 focal-updates-amd64 main restricted universe multiverse
|
||||
deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 focal-backports-amd64 main restricted universe
|
||||
deb [arch=amd64 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 focal-security-amd64 main restricted universe multiverse
|
||||
deb [arch=i386 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 focal-i386 main restricted universe
|
||||
deb [arch=i386 trusted=yes] http://repo-clones-apt.ci.qt.io:8080 focal-updates-i386 main restricted
|
||||
deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ focal main restricted universe multiverse
|
||||
deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ focal-updates main restricted universe multiverse
|
||||
deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ focal-backports main restricted universe
|
||||
deb [arch=amd64] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ focal-security main restricted universe multiverse
|
||||
deb [arch=i386] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ focal main restricted
|
||||
deb [arch=i386] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ focal-updates main restricted
|
||||
deb [arch=i386] http://repo-clones.ci.qt.io/apt-mirror/mirror/ubuntu/ focal universe
|
||||
EOC
|
||||
}
|
||||
|
||||
(ping -c 3 repo-clones-apt.ci.qt.io && set_internal_repo) || echo "Internal package repository not found. Using public repositories."
|
||||
(ping -c 3 repo-clones.ci.qt.io && set_internal_repo) || echo "Internal package repository not found. Using public repositories."
|
||||
|
||||
# Make sure needed ca-certificates are available
|
||||
sudo apt-get install --reinstall ca-certificates
|
||||
|
||||
@@ -1,7 +0,0 @@
|
||||
#!/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
|
||||
|
||||
brew install go
|
||||
@@ -1,8 +0,0 @@
|
||||
#!/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
|
||||
|
||||
# The package was disabled in brew
|
||||
#brew install upx
|
||||
@@ -1 +0,0 @@
|
||||
. "$PSScriptRoot\..\common\windows\winappsdk.ps1"
|
||||
2
qt3d
2
qt3d
Submodule qt3d updated: d0fd899518...2472f07e08
Submodule qt5compat updated: 3c6c3dffb4...dbc825317c
Submodule qtactiveqt updated: 63216e1990...e1f7aa4944
2
qtbase
2
qtbase
Submodule qtbase updated: 0bc9040c90...90b845d15f
2
qtcharts
2
qtcharts
Submodule qtcharts updated: 6e67ac8ee2...5754032cf8
2
qtcoap
2
qtcoap
Submodule qtcoap updated: f3597f84a4...b066ae97ac
Submodule qtconnectivity updated: 6709f2ad2b...b7339f4a74
Submodule qtdatavis3d updated: e4b136aa2a...f589de9689
Submodule qtdeclarative updated: 6d847997d9...22fb5e739a
2
qtdoc
2
qtdoc
Submodule qtdoc updated: 11b54c7c86...52310ad96e
2
qtgraphs
2
qtgraphs
Submodule qtgraphs updated: 3a1f9a378d...b50b4e3b46
2
qtgrpc
2
qtgrpc
Submodule qtgrpc updated: 35752dda79...4fb8bebd2c
Submodule qthttpserver updated: 658f08e508...8dc17fd127
Submodule qtimageformats updated: 46dc686224...f24f9588d9
Submodule qtlanguageserver updated: 1d29e7fc5d...6fecea633d
Submodule qtlocation updated: cdf5b62817...f9b4e48a1b
2
qtlottie
2
qtlottie
Submodule qtlottie updated: e7c95503d3...f5ccb0bd1f
2
qtmqtt
2
qtmqtt
Submodule qtmqtt updated: c88f138b79...ff285a85d0
Submodule qtmultimedia updated: e04ac5abec...685218d33d
Submodule qtnetworkauth updated: a50d86353c...4287152362
2
qtopcua
2
qtopcua
Submodule qtopcua updated: 4ccff3018c...e758980bb5
Submodule qtpositioning updated: 7315a312ef...11d336c178
Submodule qtquick3d updated: 6a02134dd9...c145340b68
Submodule qtquick3dphysics updated: d0d7954e8f...33292b0356
Submodule qtquickeffectmaker updated: 87797b2efc...7485785475
Submodule qtquicktimeline updated: 8e4bb487d4...1289642dc2
Submodule qtremoteobjects updated: 77affbb9cf...2a5279d42a
2
qtscxml
2
qtscxml
Submodule qtscxml updated: 828c605372...5558876224
Submodule qtsensors updated: 676ababd9d...6cf07f0c52
Submodule qtserialbus updated: ee2dfcdc54...aeb9194a48
Submodule qtserialport updated: c9e01aa6da...b2d8eade3a
Submodule qtshadertools updated: eefdc76037...86c4b079a0
2
qtspeech
2
qtspeech
Submodule qtspeech updated: 8301a4cab7...34650239df
2
qtsvg
2
qtsvg
Submodule qtsvg updated: 442ef1a511...4b1a183d35
2
qttools
2
qttools
Submodule qttools updated: 8865244d3d...9e0030f889
Submodule qttranslations updated: 471482e5ef...0ef9d13d31
Submodule qtvirtualkeyboard updated: e4431e0e4b...0218b3261f
Submodule qtwayland updated: 55ba835fbd...8368f75344
Submodule qtwebchannel updated: 399dd50b6d...f6afc40645
Submodule qtwebengine updated: 8b82dd2945...28eb5425c6
Submodule qtwebsockets updated: 9466c0fd9f...ba2ada87ef
Submodule qtwebview updated: 8a718a84a7...86a71b5a88
Reference in New Issue
Block a user