mirror of
git://code.qt.io/qt/qt5.git
synced 2025-12-26 09:56:02 +08:00
Compare commits
58 Commits
v6.2.0-bet
...
6.2.0
| Author | SHA1 | Date | |
|---|---|---|---|
|
61b6f0373c | ||
|
|
1d8225dd76 | ||
|
|
4b20bc390f | ||
|
|
febbcf0338 | ||
|
|
b8e587b74c | ||
|
|
fac86c3865 | ||
|
|
a23c44f7a3 | ||
|
|
ab311180ba | ||
|
|
893a7d6d98 | ||
|
|
0d2488bd32 | ||
|
|
efb86886e1 | ||
|
|
6e42fc3e0a | ||
|
|
fc0466cd53 | ||
|
|
d14203d441 | ||
|
|
d3859c14ee | ||
|
|
c9408c8172 | ||
|
|
c5d8723bf2 | ||
|
|
4b4264c7d5 | ||
|
|
e5495d93f6 | ||
|
|
833372c809 | ||
|
|
2fd650b973 | ||
|
|
b94cc9cc28 | ||
|
|
2fe9652422 | ||
|
|
963b169394 | ||
|
|
da33061d66 | ||
|
|
1d7d4a7603 | ||
|
|
9fd1d19465 | ||
|
|
433f106d31 | ||
|
|
4de7f2fd54 | ||
|
|
3a4502ae3d | ||
|
|
33988e12ac | ||
|
|
51155b7bf8 | ||
|
|
26e43959e1 | ||
|
|
8ab13223a5 | ||
|
|
86a34fb5d7 | ||
|
|
5f7bb79fd9 | ||
|
|
69197946f0 | ||
|
|
3c2fca6bb1 | ||
|
|
bed102a587 | ||
|
|
1f452fd479 | ||
|
|
aaf0fad6b5 | ||
|
|
04ad2b6523 | ||
|
|
2ef340e02d | ||
|
|
384bff22f7 | ||
|
|
76741ceaa5 | ||
|
|
92b188ef62 | ||
|
|
3344530eaa | ||
|
|
aebf8f743a | ||
|
|
98fddae379 | ||
|
|
a3f580b0ab | ||
|
|
939c7e7f57 | ||
|
|
bdfbd4ff3f | ||
|
|
8e07b4271b | ||
|
|
a0721ffc10 | ||
|
|
fa08d846df | ||
|
|
d1e747e9c2 | ||
|
|
ad7211e014 | ||
|
|
abed2215b2 |
110
.gitmodules
vendored
110
.gitmodules
vendored
@@ -1,61 +1,61 @@
|
||||
[submodule "qtbase"]
|
||||
path = qtbase
|
||||
url = ../qtbase.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = essential
|
||||
[submodule "qtsvg"]
|
||||
depends = qtbase
|
||||
path = qtsvg
|
||||
url = ../qtsvg.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qtdeclarative"]
|
||||
depends = qtbase
|
||||
recommends = qtshadertools qtsvg
|
||||
recommends = qtimageformats qtshadertools qtsvg
|
||||
path = qtdeclarative
|
||||
url = ../qtdeclarative.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = essential
|
||||
[submodule "qtactiveqt"]
|
||||
depends = qtbase
|
||||
path = qtactiveqt
|
||||
url = ../qtactiveqt.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qtmultimedia"]
|
||||
depends = qtbase qtshadertools
|
||||
recommends = qtdeclarative qtquickcontrols2
|
||||
recommends = qtdeclarative
|
||||
path = qtmultimedia
|
||||
url = ../qtmultimedia.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qttools"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtactiveqt
|
||||
path = qttools
|
||||
url = ../qttools.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = essential
|
||||
[submodule "qtxmlpatterns"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtxmlpatterns
|
||||
url = ../qtxmlpatterns.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = ignore
|
||||
[submodule "qttranslations"]
|
||||
depends = qttools
|
||||
path = qttranslations
|
||||
url = ../qttranslations.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = essential
|
||||
priority = 30
|
||||
[submodule "qtdoc"]
|
||||
depends = qtdeclarative qttools
|
||||
recommends = qtmultimedia qtquickcontrols qtquickcontrols2
|
||||
recommends = qtmultimedia
|
||||
path = qtdoc
|
||||
url = ../qtdoc.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = essential
|
||||
priority = 40
|
||||
[submodule "qtrepotools"]
|
||||
@@ -76,14 +76,14 @@
|
||||
recommends = qtdeclarative qtserialport
|
||||
path = qtlocation
|
||||
url = ../qtlocation.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qtsensors"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtsensors
|
||||
url = ../qtsensors.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qtsystems"]
|
||||
depends = qtbase
|
||||
@@ -110,203 +110,183 @@
|
||||
recommends = qtdeclarative
|
||||
path = qtconnectivity
|
||||
url = ../qtconnectivity.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qtwayland"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwayland
|
||||
url = ../qtwayland.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qt3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtshadertools
|
||||
path = qt3d
|
||||
url = ../qt3d.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qtimageformats"]
|
||||
depends = qtbase
|
||||
path = qtimageformats
|
||||
url = ../qtimageformats.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qtgraphicaleffects"]
|
||||
depends = qtdeclarative
|
||||
path = qtgraphicaleffects
|
||||
url = ../qtgraphicaleffects.git
|
||||
branch = 6.2
|
||||
status = ignore
|
||||
[submodule "qtquickcontrols"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtgraphicaleffects
|
||||
path = qtquickcontrols
|
||||
url = ../qtquickcontrols.git
|
||||
branch = 6.2
|
||||
status = ignore
|
||||
[submodule "qtserialbus"]
|
||||
depends = qtbase
|
||||
recommends = qtserialport
|
||||
path = qtserialbus
|
||||
url = ../qtserialbus.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qtserialport"]
|
||||
depends = qtbase
|
||||
path = qtserialport
|
||||
url = ../qtserialport.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qtwebsockets"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwebsockets
|
||||
url = ../qtwebsockets.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qtwebchannel"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtwebsockets
|
||||
path = qtwebchannel
|
||||
url = ../qtwebchannel.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qtwebengine"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools
|
||||
recommends = qtlocation qtwebchannel qttools
|
||||
path = qtwebengine
|
||||
url = ../qtwebengine.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
priority = 10
|
||||
[submodule "qtcanvas3d"]
|
||||
depends = qtdeclarative
|
||||
path = qtcanvas3d
|
||||
url = ../qtcanvas3d.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = ignore
|
||||
[submodule "qtwebview"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtwebengine
|
||||
path = qtwebview
|
||||
url = ../qtwebview.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qtquickcontrols2"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtimageformats qtgraphicaleffects
|
||||
path = qtquickcontrols2
|
||||
url = ../qtquickcontrols2.git
|
||||
branch = 6.2
|
||||
status = essential
|
||||
[submodule "qtcharts"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtcharts
|
||||
url = ../qtcharts.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qtdatavis3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtdatavis3d
|
||||
url = ../qtdatavis3d.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qtvirtualkeyboard"]
|
||||
depends = qtbase qtdeclarative qtsvg
|
||||
recommends = qtmultimedia qtquickcontrols
|
||||
recommends = qtmultimedia
|
||||
path = qtvirtualkeyboard
|
||||
url = ../qtvirtualkeyboard.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qtgamepad"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtgamepad
|
||||
url = ../qtgamepad.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = ignore
|
||||
[submodule "qtscxml"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtscxml
|
||||
url = ../qtscxml.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qtspeech"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtspeech
|
||||
url = ../qtspeech.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = ignore
|
||||
[submodule "qtnetworkauth"]
|
||||
depends = qtbase
|
||||
path = qtnetworkauth
|
||||
url = ../qtnetworkauth.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qtremoteobjects"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtremoteobjects
|
||||
url = ../qtremoteobjects.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qtwebglplugin"]
|
||||
depends = qtbase qtwebsockets
|
||||
recommends = qtdeclarative
|
||||
path = qtwebglplugin
|
||||
url = ../qtwebglplugin.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = ignore
|
||||
[submodule "qtlottie"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtlottie
|
||||
url = ../qtlottie.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qtquicktimeline"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtquicktimeline
|
||||
url = ../qtquicktimeline
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qtquick3d"]
|
||||
depends = qtbase qtdeclarative qtshadertools
|
||||
recommends = qtquicktimeline
|
||||
path = qtquick3d
|
||||
url = ../qtquick3d.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qtshadertools"]
|
||||
depends = qtbase
|
||||
path = qtshadertools
|
||||
url = ../qtshadertools.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qt5compat"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qt5compat
|
||||
url = ../qt5compat.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = deprecated
|
||||
[submodule "qtcoap"]
|
||||
depends = qtbase
|
||||
path = qtcoap
|
||||
url = ../qtcoap.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qtmqtt"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtmqtt
|
||||
url = ../qtmqtt.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
[submodule "qtopcua"]
|
||||
depends = qtbase qtdeclarative qtquickcontrols2
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtopcua
|
||||
url = ../qtopcua.git
|
||||
branch = 6.2
|
||||
branch = 6.2.0
|
||||
status = addon
|
||||
|
||||
@@ -1,11 +1,13 @@
|
||||
# The real minimum version will be checked by the qtbase project.
|
||||
# 3.16 is the absolute minimum though.
|
||||
cmake_minimum_required(VERSION 3.16...3.20)
|
||||
|
||||
# Include qtbase's .cmake.conf for access to QT_REPO_MODULE_VERSION
|
||||
set(__qt6_qtbase_src_path "${CMAKE_CURRENT_SOURCE_DIR}/qtbase")
|
||||
|
||||
include("${__qt6_qtbase_src_path}/.cmake.conf")
|
||||
include("${__qt6_qtbase_src_path}/cmake/QtCMakeVersionHelpers.cmake")
|
||||
qt_internal_check_for_suitable_cmake_version()
|
||||
qt_internal_get_computed_minimum_cmake_version(__qt_minimum_cmake_version)
|
||||
cmake_minimum_required(VERSION ${__qt_minimum_cmake_version})
|
||||
|
||||
# Run platform auto-detection /before/ the first project() call and thus
|
||||
# before the toolchain file is loaded.
|
||||
include("${__qt6_qtbase_src_path}/cmake/QtAutoDetect.cmake")
|
||||
|
||||
project(Qt
|
||||
|
||||
@@ -10,7 +10,7 @@ Configurations:
|
||||
Environment variables: [
|
||||
'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARMV7_TOOLCHAIN_FILE}} -DQT_FEATURE_system_harfbuzz=OFF -DQT_QMAKE_TARGET_MKSPEC=devices/linux-imx7-g++ -DQT_QMAKE_DEVICE_OPTIONS="CROSS_COMPILE={{.Env.QEMUARMV7_TOOLCHAIN_CROSS_COMPILE}};DISTRO_OPTS=hard-float boot2qt" -DCMAKE_STAGING_PREFIX=/home/qt/work/install/target -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DFEATURE_forkfd_pidfd=OFF -DWARNINGS_ARE_ERRORS=OFF',
|
||||
'QT_YOCTO_ENVSETUP={{.Env.QEMUARMV7_TOOLCHAIN_ENVSETUP}}',
|
||||
"QT_CMAKE_DIR=/opt/cmake-3.20.5/bin",
|
||||
"QT_CMAKE_DIR=/opt/cmake-3.21.1/bin",
|
||||
'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}',
|
||||
'GST_PLUGIN_SCANNER={{.Env.QEMUARMV7_TOOLCHAIN_SYSROOT}}/usr/libexec/gstreamer-1.0/gst-plugin-scanner',
|
||||
'QT_QUICK_BACKEND=software',
|
||||
@@ -26,7 +26,7 @@ Configurations:
|
||||
Environment variables: [
|
||||
'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUARM64_TOOLCHAIN_FILE}} -DQT_FEATURE_system_harfbuzz=OFF -DQT_QMAKE_TARGET_MKSPEC=devices/linux-generic-g++ -DQT_QMAKE_DEVICE_OPTIONS="CROSS_COMPILE={{.Env.QEMUARM64_TOOLCHAIN_CROSS_COMPILE}};DISTRO_OPTS=boot2qt" -DCMAKE_STAGING_PREFIX=/home/qt/work/install/target -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DFEATURE_forkfd_pidfd=OFF -DWARNINGS_ARE_ERRORS=OFF',
|
||||
'QT_YOCTO_ENVSETUP={{.Env.QEMUARM64_TOOLCHAIN_ENVSETUP}}',
|
||||
"QT_CMAKE_DIR=/opt/cmake-3.20.5/bin",
|
||||
"QT_CMAKE_DIR=/opt/cmake-3.21.1/bin",
|
||||
'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}',
|
||||
'GST_PLUGIN_SCANNER={{.Env.QEMUARM64_TOOLCHAIN_SYSROOT}}/usr/libexec/gstreamer-1.0/gst-plugin-scanner',
|
||||
'QT_QUICK_BACKEND=software',
|
||||
@@ -42,7 +42,7 @@ Configurations:
|
||||
Environment variables: [
|
||||
'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON -DCMAKE_TOOLCHAIN_FILE={{.Env.QEMUMIPS64_TOOLCHAIN_FILE}} -DQT_FEATURE_system_harfbuzz=OFF -DQT_QMAKE_TARGET_MKSPEC=devices/linux-generic-g++ -DQT_QMAKE_DEVICE_OPTIONS="CROSS_COMPILE={{.Env.QEMUMIPS64_TOOLCHAIN_CROSS_COMPILE}};DISTRO_OPTS=boot2qt" -DCMAKE_STAGING_PREFIX=/home/qt/work/install/target -DCMAKE_AUTOGEN_VERBOSE=ON -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DFEATURE_forkfd_pidfd=OFF -DWARNINGS_ARE_ERRORS=OFF',
|
||||
'QT_YOCTO_ENVSETUP={{.Env.QEMUMIPS64_TOOLCHAIN_ENVSETUP}}',
|
||||
"QT_CMAKE_DIR=/opt/cmake-3.20.5/bin",
|
||||
"QT_CMAKE_DIR=/opt/cmake-3.21.1/bin",
|
||||
'QT_SYSROOT_FOR_RUNNING_TESTS={{.Env.QEMUMIPS64_TOOLCHAIN_SYSROOT}}',
|
||||
'GST_PLUGIN_SCANNER={{.Env.QEMUMIPS64_TOOLCHAIN_SYSROOT}}/usr/libexec/gstreamer-1.0/gst-plugin-scanner',
|
||||
'QT_QUICK_BACKEND=software',
|
||||
|
||||
@@ -3,11 +3,15 @@ Configurations:
|
||||
-
|
||||
Template: 'qtci-linux-Ubuntu-20.04-x86_64-50'
|
||||
Compiler: 'GCC'
|
||||
Target os: 'INTEGRITY'
|
||||
Platform dependency: 'Ubuntu-20.04-host'
|
||||
Features: ['Sccache', 'DisableTests']
|
||||
Configure arguments: '-DQT_HOST_PATH=/home/qt/work/install -DQT_BUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE=/home/qt/integrity_toolchain/toolchain.cmake -DQT_QMAKE_TARGET_MKSPEC=devices/integrity-armv8-SA8155P -DINPUT_harfbuzz=no -DFEATURE_library=OFF -DBUILD_qtdoc=OFF -DBUILD_qttranslations=OFF -DFEATURE_printdialog=OFF --debug-trycompile -DFEATURE_quick3d_assimp=OFF -DFEATURE_dbus=OFF -GNinja -DUNIX=ON -DFEATURE_gtk3=OFF -DFEATURE_glib=OFF -DFEATURE_libudev=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_sql_mysql=OFF -DCMAKE_C_COMPILER=cxintarm64 -DCMAKE_CXX_COMPILER=cxintarm64'
|
||||
Environment variables: ['INTEGRITY_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/integrity',
|
||||
'INTEGRITY_BSP=platform-sa8155', 'INTEGRITY_BUILD_TARGET=rel', 'QC_MULTIMEDIA_INC_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/include/amss/multimedia',
|
||||
Environment variables: [
|
||||
'TARGET_CONFIGURE_ARGS={{.Env.TARGET_CONFIGURE_ARGS}} -DQT_HOST_PATH=/home/qt/work/install -DQT_BUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE=/home/qt/integrity_toolchain/toolchain.cmake -DQT_QMAKE_TARGET_MKSPEC=devices/integrity-armv8-SA8155P -DINPUT_harfbuzz=no -DFEATURE_library=OFF -DBUILD_qtdoc=OFF -DBUILD_qttranslations=OFF -DFEATURE_printdialog=OFF --debug-trycompile -DFEATURE_quick3d_assimp=OFF -DFEATURE_dbus=OFF -GNinja -DUNIX=ON -DFEATURE_gtk3=OFF -DFEATURE_glib=OFF -DFEATURE_libudev=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_sql_mysql=OFF -DCMAKE_C_COMPILER=cxintarm64 -DCMAKE_CXX_COMPILER=cxintarm64',
|
||||
'INTEGRITY_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/integrity',
|
||||
'INTEGRITY_BSP=platform-sa8155', 'INTEGRITY_BUILD_TARGET=rel',
|
||||
'QC_MULTIMEDIA_INC_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/include/amss/multimedia',
|
||||
'GL_INC_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/AMSS/multimedia/graphics/include/public',
|
||||
'GL_LIB_DIR=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/base:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/multimedia/display:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/multimedia/graphics:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/out/rel/libs/platform/:/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/qc_bsp/AMSS/multimedia/graphics/opengl/esx/build/integrity/prebuilt/',
|
||||
'PATH=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/comp:$PATH']
|
||||
'PATH=/home/qt/integrity_toolchain/hlos_dev_boot/apps/ghs_apps_proc/comp:$PATH',
|
||||
'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DFEATURE_system_webp=OFF']
|
||||
|
||||
12
coin/platform_configs/ios-tests.yaml
Normal file
12
coin/platform_configs/ios-tests.yaml
Normal file
@@ -0,0 +1,12 @@
|
||||
Version: 2
|
||||
Configurations:
|
||||
-
|
||||
Id: "ios-tests-target"
|
||||
Template: 'qtci-macos-10.14-x86_64'
|
||||
Target os: 'IOS_ANY'
|
||||
Target arch: 'arm64'
|
||||
Compiler: 'Clang'
|
||||
Target compiler: 'Clang'
|
||||
Platform dependency: 'macos-latest-xcode-universal-packaging-build'
|
||||
Features: ['Sccache', 'DebugAndRelease', 'MinimalStaticTests']
|
||||
Environment variables: ['TARGET_CONFIGURE_ARGS=-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="Release;Debug" -DQT_BUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS', 'NON_QTBASE_TARGET_CONFIGURE_ARGS=']
|
||||
@@ -10,7 +10,7 @@ Configurations:
|
||||
Features: ['Packaging', 'Sccache', 'DoNotRunTests']
|
||||
Configure arguments: '-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_headersclean=ON -DFEATURE_framework=ON -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DODBC_ROOT=/usr/local/opt/libiodbc -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/..'
|
||||
Environment variables: [
|
||||
'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
|
||||
'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DFEATURE_gds=OFF',
|
||||
'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
|
||||
]
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@ Configurations:
|
||||
Template: 'qtci-linux-RHEL-8.2-x86_64-50'
|
||||
Compiler: 'GCC'
|
||||
Features: ['Packaging', 'Sccache', 'MinimalStaticTests']
|
||||
Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF -DFEATURE_system_doubleconversion=OFF -DFEATURE_icu=OFF -DFEATURE_sql_mysql=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
|
||||
Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF -DFEATURE_system_jpeg=OFF -DFEATURE_system_png=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_system_harfbuzz=OFF -DFEATURE_system_doubleconversion=OFF -DFEATURE_libudev=OFF -DINPUT_bundled_xcb_xinput=yes -DFEATURE_icu=OFF -DFEATURE_sql_mysql=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'
|
||||
Environment variables: ['NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
|
||||
'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']
|
||||
-
|
||||
|
||||
@@ -3,7 +3,8 @@ Include: [
|
||||
cmake_platforms.yaml,
|
||||
cmake_platforms_static_tests.yaml,
|
||||
macos-developer-build-tests.yaml,
|
||||
integrity.yaml
|
||||
integrity.yaml,
|
||||
ios-tests.yaml
|
||||
]
|
||||
Configurations:
|
||||
-
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
Version: 2
|
||||
Include: [
|
||||
cmake_platforms.yaml,
|
||||
macos-developer-build-tests.yaml
|
||||
macos-developer-build-tests.yaml,
|
||||
cmake_platforms_static_tests.yaml,
|
||||
integrity.yaml
|
||||
]
|
||||
Configurations: []
|
||||
|
||||
@@ -1,3 +1,6 @@
|
||||
Version: 2
|
||||
Include: [cmake_platforms.yaml]
|
||||
Include: [
|
||||
cmake_platforms.yaml,
|
||||
integrity.yaml
|
||||
]
|
||||
Configurations: []
|
||||
|
||||
@@ -1,5 +0,0 @@
|
||||
Version: 2
|
||||
Include: [
|
||||
cmake_platforms.yaml
|
||||
]
|
||||
Configurations: []
|
||||
6
coin/platform_configs/qtsdk.yaml
Normal file
6
coin/platform_configs/qtsdk.yaml
Normal file
@@ -0,0 +1,6 @@
|
||||
Version: 2
|
||||
Include: [
|
||||
cmake_platforms.yaml,
|
||||
qt-creator.yaml
|
||||
]
|
||||
Configurations: []
|
||||
@@ -1,3 +1,6 @@
|
||||
Version: 2
|
||||
Include: [cmake_platforms.yaml]
|
||||
Include: [
|
||||
cmake_platforms.yaml,
|
||||
integrity.yaml
|
||||
]
|
||||
Configurations: []
|
||||
|
||||
@@ -1,3 +1,6 @@
|
||||
Version: 2
|
||||
Include: [cmake_platforms.yaml]
|
||||
Include: [
|
||||
cmake_platforms.yaml,
|
||||
integrity.yaml
|
||||
]
|
||||
Configurations: []
|
||||
|
||||
@@ -55,8 +55,8 @@ toolsVersion="2.1"
|
||||
toolsFile="commandlinetools-linux-6609375_latest.zip"
|
||||
ndkVersion="r22b"
|
||||
ndkFile="android-ndk-$ndkVersion-linux-x86_64.zip"
|
||||
sdkBuildToolsVersion="29.0.3"
|
||||
sdkApiLevel="android-29"
|
||||
sdkBuildToolsVersion="30.0.3"
|
||||
sdkApiLevel="android-30"
|
||||
|
||||
toolsSha1="9172381ff070ee2a416723c1989770cf4b0d1076"
|
||||
ndkSha1="9ece64c7f19763dd67320d512794969930fce9dc"
|
||||
|
||||
@@ -42,11 +42,11 @@ source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh"
|
||||
# shellcheck source=../unix/SetEnvVar.sh
|
||||
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
|
||||
|
||||
majorminorversion="3.20"
|
||||
version="3.20.5"
|
||||
majorminorversion="3.21"
|
||||
version="3.21.1"
|
||||
PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-$version-linux-x86_64.tar.gz"
|
||||
AltUrl="https://cmake.org/files/v$majorminorversion/cmake-$version-linux-x86_64.tar.gz"
|
||||
SHA1="55dcec47c2496d4e88cffc900c3990f9f3b14c03"
|
||||
SHA1="591e3b0729ae07c37c1fa3c6adde7cc21387059d"
|
||||
targetFolder="/opt/cmake-$version"
|
||||
appPrefix="cmake-$version-linux-x86_64"
|
||||
|
||||
|
||||
@@ -42,9 +42,9 @@ source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh"
|
||||
# shellcheck source=../unix/SetEnvVar.sh
|
||||
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
|
||||
|
||||
urlToolchainEs7="http://ci-files01-hki.ci.local/input/integrity/integrity_toolchain_es7.zip"
|
||||
urlToolchainEs7="http://ci-files01-hki.ci.local/input/integrity/integrity_toolchain_es7_patched.zip"
|
||||
urlToolchainAddons="http://ci-files01-hki.ci.local/input/integrity/integrity_toolchain_addons.zip"
|
||||
SHA1_toolchainEs7="3c1edba781aa518e53e962cdb5fc5483aaa4991b"
|
||||
SHA1_toolchainEs7="e890fe332a81f8345fed3dff89b30019d9989765"
|
||||
SHA1_toolchainAddons="1eb838edca4edaa3d9076b5ce4aea6409ffaa022"
|
||||
targetFolder="$HOME"
|
||||
appPrefix=""
|
||||
|
||||
@@ -42,11 +42,11 @@ source "${BASH_SOURCE%/*}/InstallAppFromCompressedFileFromURL.sh"
|
||||
# shellcheck source=../unix/SetEnvVar.sh
|
||||
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
|
||||
|
||||
majorminorversion="3.20"
|
||||
version="3.20.5"
|
||||
majorminorversion="3.21"
|
||||
version="3.21.1"
|
||||
PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/cmake/cmake-$version-macos-universal.tar.gz"
|
||||
AltUrl="https://cmake.org/files/v$majorminorversion/cmake-$version-macos-universal.tar.gz"
|
||||
SHA1="5632fed86dbe0e5157fd233b1db6db738dbe4d1f"
|
||||
SHA1="5845da632d0f073c7761df4e78efb4405e00ac5a"
|
||||
appPrefix="cmake-$version-macos-universal"
|
||||
|
||||
InstallAppFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$appPrefix"
|
||||
|
||||
@@ -50,8 +50,8 @@ sha="bad9dc4ae6dcc1855085463099b5dacb0ec6130b"
|
||||
opensslHome="${HOME}/openssl-${version}"
|
||||
opensslSource="${opensslHome}-src"
|
||||
DownloadURL "$cachedUrl" "$officialUrl" "$sha" "$targetFile"
|
||||
tar -xzf "$targetFile" -C "$HOME"
|
||||
mv "$opensslHome" "$opensslSource"
|
||||
mkdir -p "$opensslSource"
|
||||
tar -xzf "$targetFile" --strip 1 -C "$opensslSource"
|
||||
cd "$opensslSource"
|
||||
pwd
|
||||
|
||||
@@ -68,11 +68,17 @@ if [[ "$os" == "linux" ]]; then
|
||||
elif [ "$os" == "macos" -o "$os" == "macos-universal" ]; then
|
||||
# Below target location has been hard coded into Coin.
|
||||
# QTQAINFRA-1195
|
||||
openssl_install_dir=/usr/local/openssl-$version
|
||||
opensslTargetLocation="/usr/local/opt/openssl"
|
||||
echo "prefix=$prefix"
|
||||
if [[ -z "$prefix" ]]; then
|
||||
prefix="/usr/local"
|
||||
fi
|
||||
openssl_install_dir="$prefix/openssl-$version"
|
||||
opensslTargetLocation="$prefix/opt/openssl"
|
||||
|
||||
commonFlags="no-tests shared no-ssl3-method enable-ec_nistp_64_gcc_128 -Wa,--noexecstack"
|
||||
|
||||
export MACOSX_DEPLOYMENT_TARGET=10.14
|
||||
|
||||
opensslBuild="${opensslHome}-build"
|
||||
opensslDestdir="${opensslHome}-destdir"
|
||||
mkdir -p $opensslBuild
|
||||
@@ -80,17 +86,17 @@ elif [ "$os" == "macos" -o "$os" == "macos-universal" ]; then
|
||||
if [ "$os" == "macos-universal" ]; then
|
||||
archs="x86_64 arm64"
|
||||
else
|
||||
archs="x86_64"
|
||||
archs="$(uname -m)"
|
||||
fi
|
||||
|
||||
for arch in $archs; do
|
||||
cd $opensslBuild
|
||||
echo "Configuring OpenSSL for $arch"
|
||||
mkdir $arch && cd $arch
|
||||
mkdir -p $arch && cd $arch
|
||||
$opensslSource/Configure --prefix=$openssl_install_dir $commonFlags darwin64-$arch-cc
|
||||
|
||||
echo "Building OpenSSL for $arch"
|
||||
make --silent >> /tmp/openssl_make.log 2>&1
|
||||
echo "Building OpenSSL for $arch in $PWD"
|
||||
make >> /tmp/openssl_make.log 2>&1
|
||||
|
||||
echo "Installing OpenSSL for $arch"
|
||||
if [ "$os" == "macos-universal" ]; then
|
||||
@@ -99,12 +105,13 @@ elif [ "$os" == "macos" -o "$os" == "macos-universal" ]; then
|
||||
destdir=""
|
||||
fi
|
||||
# shellcheck disable=SC2024
|
||||
sudo make --silent install DESTDIR=$destdir >> /tmp/openssl_make_install.log 2>&1
|
||||
sudo make install_sw install_ssldirs DESTDIR=$destdir >> /tmp/openssl_make_install.log 2>&1
|
||||
done
|
||||
|
||||
if [ "$os" == "macos-universal" ]; then
|
||||
echo "Making universal OpenSSL package"
|
||||
# shellcheck disable=SC2024
|
||||
sudo rm -Rf "$openssl_install_dir"
|
||||
sudo ${BASH_SOURCE%/*}/../macos/makeuniversal.sh "$opensslDestdir/x86_64" $opensslDestdir/arm64
|
||||
fi
|
||||
|
||||
|
||||
@@ -51,8 +51,8 @@ $ndkZip = "c:\Windows\Temp\android_ndk_$ndkVersion.zip"
|
||||
$toolsVersion = "2.1"
|
||||
$toolsFile = "commandlinetools-win-6609375_latest.zip"
|
||||
$sdkApi = "ANDROID_API_VERSION"
|
||||
$sdkApiLevel = "android-29"
|
||||
$sdkBuildToolsVersion = "29.0.3"
|
||||
$sdkApiLevel = "android-30"
|
||||
$sdkBuildToolsVersion = "30.0.3"
|
||||
$toolsCachedUrl= "\\ci-files01-hki.intra.qt.io\provisioning\android\$toolsFile"
|
||||
$toolsOfficialUrl = "https://dl.google.com/android/repository/$toolsFile"
|
||||
$toolsChecksum = "e2e19c2ff584efa87ef0cfdd1987f92881323208"
|
||||
|
||||
@@ -33,8 +33,8 @@
|
||||
|
||||
. "$PSScriptRoot\helpers.ps1"
|
||||
|
||||
$majorminorversion = "3.20"
|
||||
$version = "3.20.5"
|
||||
$majorminorversion = "3.21"
|
||||
$version = "3.21.1"
|
||||
|
||||
$zip = Get-DownloadLocation ("cmake-" + $version + "-windows-i386.zip")
|
||||
$officialurl = "https://cmake.org/files/v" + $majorminorversion + "/cmake-" + $version + "-windows-i386.zip"
|
||||
@@ -44,7 +44,7 @@ Write-Host "Removing old cmake"
|
||||
Remove "C:\CMake"
|
||||
|
||||
Download $officialurl $cachedurl $zip
|
||||
Verify-Checksum $zip "1d93f648fba4d66d76ca3d0d7056ba8c411652d2"
|
||||
Verify-Checksum $zip "7271b8c568f428af433f3aae80c292ef868993c5"
|
||||
|
||||
Extract-7Zip $zip C:
|
||||
$defaultinstallfolder = "C:\cmake-" + $version + "-windows-i386"
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
|
||||
$zip = Get-DownloadLocation "ninja-1.10.2-win-x86.zip"
|
||||
|
||||
Download https://github.com/ninja-build/ninja/releases/download/v1.10.2/ninja-win.zip \\ci-files01-hki.intra.qt.io\provisioning\ninja\ninja-1.10.2-win-x86.zip $zip
|
||||
Verify-Checksum $zip "ccacdf88912e061e0b527f2e3c69ee10544d6f8a"
|
||||
Download http://master.qt.io/development_releases/prebuilt/ninja/v1.10.2/ninja-win-x86.zip \\ci-files01-hki.intra.qt.io\provisioning\ninja\ninja-1.10.2-win-really-x86.zip $zip
|
||||
Verify-Checksum $zip "1a22ee9269df8ed69c4600d7ee4ccd8841bb99ca"
|
||||
|
||||
Extract-7Zip $zip C:\Utils\Ninja
|
||||
Remove "$zip"
|
||||
|
||||
@@ -57,3 +57,5 @@ gsettings set org.gnome.desktop.session idle-delay 0
|
||||
echo "Setting Wayland enable as false"
|
||||
sudo sed -i 's/#WaylandEnable=false/WaylandEnable=false/g' /etc/gdm/custom.conf
|
||||
|
||||
# Set system locale
|
||||
sudo localectl set-locale LANG=en_US.UTF-8
|
||||
|
||||
@@ -138,6 +138,8 @@ installPackages+=(gcc-c++)
|
||||
installPackages+=(make)
|
||||
# Open source VMware Tools
|
||||
installPackages+=(open-vm-tools)
|
||||
# Install all available locales (COIN-727)
|
||||
installPackages+=(langpacks-*)
|
||||
|
||||
sudo yum -y install "${installPackages[@]}"
|
||||
|
||||
|
||||
@@ -90,8 +90,7 @@ installPackages+=(libgbm-dev)
|
||||
installPackages+=(libxkbfile-dev)
|
||||
installPackages+=(libxshmfence-dev)
|
||||
installPackages+=(libxss-dev)
|
||||
installPackages+=(nodejs)
|
||||
# NOTE! Can't install nodejs-dev because libssl1.0-dev conflicts with libssl1.0-dev which is depandency of nodejs-dev.
|
||||
installPackages+=(nodejs-mozilla) # use nodejs-mozilla because nodejs is outdated
|
||||
|
||||
# Common event loop handling
|
||||
installPackages+=(libglib2.0-dev)
|
||||
@@ -231,6 +230,7 @@ pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/sh
|
||||
|
||||
source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
|
||||
SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels"
|
||||
SetEnvVar "PATH" "/usr/lib/nodejs-mozilla/bin:\$PATH"
|
||||
|
||||
OpenSSLVersion="$(openssl version |cut -b 9-14)"
|
||||
echo "OpenSSL = $OpenSSLVersion" >> ~/versions.txt
|
||||
|
||||
@@ -37,7 +37,7 @@ sudo zypper -nq install libicu-devel
|
||||
# qtwebengine
|
||||
sudo zypper -nq install alsa-devel dbus-1-devel libxkbfile-devel \
|
||||
libXcomposite-devel libXcursor-devel libXrandr-devel libXtst-devel \
|
||||
mozilla-nspr-devel mozilla-nss-devel nodejs10 nodejs10-devel glproto-devel \
|
||||
mozilla-nspr-devel mozilla-nss-devel nodejs12 glproto-devel \
|
||||
libxshmfence-devel libXdamage-devel
|
||||
|
||||
# qtwebkit
|
||||
|
||||
@@ -53,9 +53,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"
|
||||
|
||||
ndkVersion="r22b"
|
||||
ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip"
|
||||
sdkBuildToolsVersion="29.0.3"
|
||||
sdkBuildToolsVersion="30.0.3"
|
||||
# this is compile sdk version
|
||||
sdkApiLevel="android-29"
|
||||
sdkApiLevel="android-30"
|
||||
|
||||
toolsSourceFile="$basePath/$toolsFile"
|
||||
ndkSourceFile="$basePath/$ndkFile"
|
||||
|
||||
@@ -53,9 +53,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"
|
||||
|
||||
ndkVersion="r22b"
|
||||
ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip"
|
||||
sdkBuildToolsVersion="29.0.3"
|
||||
sdkBuildToolsVersion="30.0.3"
|
||||
# this is compile sdk version
|
||||
sdkApiLevel="android-29"
|
||||
sdkApiLevel="android-30"
|
||||
|
||||
toolsSourceFile="$basePath/$toolsFile"
|
||||
ndkSourceFile="$basePath/$ndkFile"
|
||||
|
||||
@@ -50,4 +50,4 @@ set -ex
|
||||
# shellcheck source=../common/macos/install_xcode.sh
|
||||
source "${BASH_SOURCE%/*}/../common/macos/install_xcode.sh"
|
||||
|
||||
InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/macos_10.15_catalina/Xcode_12.4.xip 12.4
|
||||
InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_12.5.1.xip 12.5.1
|
||||
|
||||
@@ -37,10 +37,10 @@ set -ex
|
||||
|
||||
# shellcheck source=../common/macos/install-commandlinetools.sh
|
||||
source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh"
|
||||
version="12.4"
|
||||
version="12.5.1"
|
||||
packageName="Command_Line_Tools_for_Xcode_$version.dmg"
|
||||
url="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.15_catalina/$packageName"
|
||||
sha1="eabb32d167da029dfc70af94de2bf61abd416ca1"
|
||||
url="http://ci-files01-hki.intra.qt.io/input/mac/$packageName"
|
||||
sha1="eaf175f4c8854511a6e829f360eb3a7d59afa517"
|
||||
|
||||
InstallCommandLineTools $url $url $sha1 $packageName $version
|
||||
|
||||
|
||||
@@ -53,9 +53,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"
|
||||
|
||||
ndkVersion="r22b"
|
||||
ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip"
|
||||
sdkBuildToolsVersion="29.0.3"
|
||||
sdkBuildToolsVersion="30.0.3"
|
||||
# this is compile sdk version
|
||||
sdkApiLevel="android-29"
|
||||
sdkApiLevel="android-30"
|
||||
|
||||
toolsSourceFile="$basePath/$toolsFile"
|
||||
ndkSourceFile="$basePath/$ndkFile"
|
||||
|
||||
2
qt3d
2
qt3d
Submodule qt3d updated: f33e739874...cb0ec87009
Submodule qt5compat updated: 8231dec63c...dbfdb0922f
Submodule qtactiveqt updated: c9f3f674e4...fc622106cc
2
qtbase
2
qtbase
Submodule qtbase updated: 55b2a1e4fc...e0847c843a
2
qtcharts
2
qtcharts
Submodule qtcharts updated: e07fca7d02...08a0fdc6bb
2
qtcoap
2
qtcoap
Submodule qtcoap updated: 3f2c5e5aa6...92fdc0d5ac
Submodule qtconnectivity updated: d13d8db53d...b59768e4e6
Submodule qtdatavis3d updated: 20ba0f8897...d0851eff2b
Submodule qtdeclarative updated: f699006008...782fb509b2
2
qtdoc
2
qtdoc
Submodule qtdoc updated: f11778a309...3f0bf2a7fe
Submodule qtgraphicaleffects deleted from bbaccc30f7
Submodule qtimageformats updated: 61a52b3191...c4d2842bb5
Submodule qtlocation updated: 2a5f7d270b...af424542dd
2
qtlottie
2
qtlottie
Submodule qtlottie updated: 633f7d90b2...ca4535b891
2
qtmqtt
2
qtmqtt
Submodule qtmqtt updated: 3524b5b4c4...63116d8429
Submodule qtmultimedia updated: 97ecdfad5a...204af60bc0
Submodule qtnetworkauth updated: 94d9d54de9...54ff954ed5
2
qtopcua
2
qtopcua
Submodule qtopcua updated: c25b0060ce...f5ab9a9c23
2
qtqa
2
qtqa
Submodule qtqa updated: c619a5b6f6...23cabc017c
Submodule qtquick3d updated: d9e7e60082...de0f8d83fd
Submodule qtquickcontrols deleted from d259898453
Submodule qtquickcontrols2 deleted from 886eb80b3d
Submodule qtquicktimeline updated: 00469ecbc6...0b7471006f
Submodule qtremoteobjects updated: 49d91e48ad...528d5b8233
Submodule qtrepotools updated: e85982c40f...47b15af0da
2
qtscxml
2
qtscxml
Submodule qtscxml updated: d9311272cc...a4cf98cbcf
Submodule qtsensors updated: 9a7c525917...01ea00003f
Submodule qtserialbus updated: 4139a7c9be...0e8ef9cf54
Submodule qtserialport updated: 61da25f096...287953d0f0
Submodule qtshadertools updated: a21b371a86...43217d83da
2
qtsvg
2
qtsvg
Submodule qtsvg updated: 758b40580a...de1d436c9f
2
qttools
2
qttools
Submodule qttools updated: a7359e36e1...12d76072ca
Submodule qttranslations updated: fb5b0dd253...f4464a1dc8
Submodule qtvirtualkeyboard updated: 7e51a8d142...3832a23d73
Submodule qtwayland updated: dec53785d3...f19b3a4172
Submodule qtwebchannel updated: a910abafd9...169fc3f286
Submodule qtwebengine updated: c2daf61f81...a35bcb790b
Submodule qtwebsockets updated: e489cea459...a6c16c8f08
Submodule qtwebview updated: f43ab6d55c...b6e57887af
Reference in New Issue
Block a user