mirror of
git://code.qt.io/qt/qt5.git
synced 2026-03-20 21:40:00 +08:00
Compare commits
13 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bab1fecd55 | ||
|
|
f62c07c716 | ||
|
|
336fc07c80 | ||
|
|
61fab6d730 | ||
|
|
7ea247f6cc | ||
|
|
cfc20bd9de | ||
|
|
fc625d5c8e | ||
|
|
9412ed738b | ||
|
|
adf7c5ab10 | ||
|
|
80fda87743 | ||
|
|
f7c6506ec1 | ||
|
|
8c4c44877c | ||
|
|
78e19dbd34 |
86
.gitmodules
vendored
86
.gitmodules
vendored
@@ -1,40 +1,40 @@
|
|||||||
[submodule "qtbase"]
|
[submodule "qtbase"]
|
||||||
path = qtbase
|
path = qtbase
|
||||||
url = ../qtbase.git
|
url = ../qtbase.git
|
||||||
branch = 6.8
|
branch = 6.8.3
|
||||||
status = essential
|
status = essential
|
||||||
[submodule "qtsvg"]
|
[submodule "qtsvg"]
|
||||||
depends = qtbase
|
depends = qtbase
|
||||||
path = qtsvg
|
path = qtsvg
|
||||||
url = ../qtsvg.git
|
url = ../qtsvg.git
|
||||||
branch = 6.8
|
branch = 6.8.3
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qtdeclarative"]
|
[submodule "qtdeclarative"]
|
||||||
depends = qtbase
|
depends = qtbase
|
||||||
recommends = qtimageformats qtshadertools qtsvg qtlanguageserver
|
recommends = qtimageformats qtshadertools qtsvg qtlanguageserver
|
||||||
path = qtdeclarative
|
path = qtdeclarative
|
||||||
url = ../qtdeclarative.git
|
url = ../qtdeclarative.git
|
||||||
branch = 6.8
|
branch = 6.8.3
|
||||||
status = essential
|
status = essential
|
||||||
[submodule "qtactiveqt"]
|
[submodule "qtactiveqt"]
|
||||||
depends = qtbase
|
depends = qtbase
|
||||||
path = qtactiveqt
|
path = qtactiveqt
|
||||||
url = ../qtactiveqt.git
|
url = ../qtactiveqt.git
|
||||||
branch = 6.8
|
branch = 6.8.3
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qtmultimedia"]
|
[submodule "qtmultimedia"]
|
||||||
depends = qtbase qtshadertools
|
depends = qtbase qtshadertools
|
||||||
recommends = qtdeclarative qtquick3d
|
recommends = qtdeclarative qtquick3d
|
||||||
path = qtmultimedia
|
path = qtmultimedia
|
||||||
url = ../qtmultimedia.git
|
url = ../qtmultimedia.git
|
||||||
branch = 6.8
|
branch = 6.8.3
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qttools"]
|
[submodule "qttools"]
|
||||||
depends = qtbase
|
depends = qtbase
|
||||||
recommends = qtdeclarative qtactiveqt
|
recommends = qtdeclarative qtactiveqt
|
||||||
path = qttools
|
path = qttools
|
||||||
url = ../qttools.git
|
url = ../qttools.git
|
||||||
branch = 6.8
|
branch = 6.8.3
|
||||||
status = essential
|
status = essential
|
||||||
[submodule "qtxmlpatterns"]
|
[submodule "qtxmlpatterns"]
|
||||||
depends = qtbase
|
depends = qtbase
|
||||||
@@ -47,7 +47,7 @@
|
|||||||
depends = qttools
|
depends = qttools
|
||||||
path = qttranslations
|
path = qttranslations
|
||||||
url = ../qttranslations.git
|
url = ../qttranslations.git
|
||||||
branch = 6.8
|
branch = 6.8.3
|
||||||
status = essential
|
status = essential
|
||||||
priority = 30
|
priority = 30
|
||||||
[submodule "qtdoc"]
|
[submodule "qtdoc"]
|
||||||
@@ -55,7 +55,7 @@
|
|||||||
recommends = qtmultimedia qtshadertools qtwebengine
|
recommends = qtmultimedia qtshadertools qtwebengine
|
||||||
path = qtdoc
|
path = qtdoc
|
||||||
url = ../qtdoc.git
|
url = ../qtdoc.git
|
||||||
branch = 6.8
|
branch = 6.8.3
|
||||||
status = essential
|
status = essential
|
||||||
priority = 40
|
priority = 40
|
||||||
[submodule "qtrepotools"]
|
[submodule "qtrepotools"]
|
||||||
@@ -68,7 +68,7 @@
|
|||||||
depends = qtbase
|
depends = qtbase
|
||||||
path = qtqa
|
path = qtqa
|
||||||
url = ../qtqa.git
|
url = ../qtqa.git
|
||||||
branch = dev
|
branch = 6.8.3
|
||||||
status = essential
|
status = essential
|
||||||
priority = 50
|
priority = 50
|
||||||
[submodule "qtlocation"]
|
[submodule "qtlocation"]
|
||||||
@@ -76,21 +76,21 @@
|
|||||||
recommends = qtdeclarative
|
recommends = qtdeclarative
|
||||||
path = qtlocation
|
path = qtlocation
|
||||||
url = ../qtlocation.git
|
url = ../qtlocation.git
|
||||||
branch = 6.8
|
branch = 6.8.3
|
||||||
status = preview
|
status = preview
|
||||||
[submodule "qtpositioning"]
|
[submodule "qtpositioning"]
|
||||||
depends = qtbase
|
depends = qtbase
|
||||||
recommends = qtdeclarative qtserialport
|
recommends = qtdeclarative qtserialport
|
||||||
path = qtpositioning
|
path = qtpositioning
|
||||||
url = ../qtpositioning.git
|
url = ../qtpositioning.git
|
||||||
branch = 6.8
|
branch = 6.8.3
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qtsensors"]
|
[submodule "qtsensors"]
|
||||||
depends = qtbase
|
depends = qtbase
|
||||||
recommends = qtdeclarative
|
recommends = qtdeclarative
|
||||||
path = qtsensors
|
path = qtsensors
|
||||||
url = ../qtsensors.git
|
url = ../qtsensors.git
|
||||||
branch = 6.8
|
branch = 6.8.3
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qtsystems"]
|
[submodule "qtsystems"]
|
||||||
depends = qtbase
|
depends = qtbase
|
||||||
@@ -117,61 +117,61 @@
|
|||||||
recommends = qtdeclarative
|
recommends = qtdeclarative
|
||||||
path = qtconnectivity
|
path = qtconnectivity
|
||||||
url = ../qtconnectivity.git
|
url = ../qtconnectivity.git
|
||||||
branch = 6.8
|
branch = 6.8.3
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qtwayland"]
|
[submodule "qtwayland"]
|
||||||
depends = qtbase
|
depends = qtbase
|
||||||
recommends = qtdeclarative
|
recommends = qtdeclarative
|
||||||
path = qtwayland
|
path = qtwayland
|
||||||
url = ../qtwayland.git
|
url = ../qtwayland.git
|
||||||
branch = 6.8
|
branch = 6.8.3
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qt3d"]
|
[submodule "qt3d"]
|
||||||
depends = qtbase
|
depends = qtbase
|
||||||
recommends = qtdeclarative qtshadertools qtmultimedia
|
recommends = qtdeclarative qtshadertools qtmultimedia
|
||||||
path = qt3d
|
path = qt3d
|
||||||
url = ../qt3d.git
|
url = ../qt3d.git
|
||||||
branch = 6.8
|
branch = 6.8.3
|
||||||
status = deprecated
|
status = deprecated
|
||||||
[submodule "qtimageformats"]
|
[submodule "qtimageformats"]
|
||||||
depends = qtbase
|
depends = qtbase
|
||||||
path = qtimageformats
|
path = qtimageformats
|
||||||
url = ../qtimageformats.git
|
url = ../qtimageformats.git
|
||||||
branch = 6.8
|
branch = 6.8.3
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qtserialbus"]
|
[submodule "qtserialbus"]
|
||||||
depends = qtbase
|
depends = qtbase
|
||||||
recommends = qtserialport
|
recommends = qtserialport
|
||||||
path = qtserialbus
|
path = qtserialbus
|
||||||
url = ../qtserialbus.git
|
url = ../qtserialbus.git
|
||||||
branch = 6.8
|
branch = 6.8.3
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qtserialport"]
|
[submodule "qtserialport"]
|
||||||
depends = qtbase
|
depends = qtbase
|
||||||
path = qtserialport
|
path = qtserialport
|
||||||
url = ../qtserialport.git
|
url = ../qtserialport.git
|
||||||
branch = 6.8
|
branch = 6.8.3
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qtwebsockets"]
|
[submodule "qtwebsockets"]
|
||||||
depends = qtbase
|
depends = qtbase
|
||||||
recommends = qtdeclarative
|
recommends = qtdeclarative
|
||||||
path = qtwebsockets
|
path = qtwebsockets
|
||||||
url = ../qtwebsockets.git
|
url = ../qtwebsockets.git
|
||||||
branch = 6.8
|
branch = 6.8.3
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qtwebchannel"]
|
[submodule "qtwebchannel"]
|
||||||
depends = qtbase
|
depends = qtbase
|
||||||
recommends = qtdeclarative qtwebsockets
|
recommends = qtdeclarative qtwebsockets
|
||||||
path = qtwebchannel
|
path = qtwebchannel
|
||||||
url = ../qtwebchannel.git
|
url = ../qtwebchannel.git
|
||||||
branch = 6.8
|
branch = 6.8.3
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qtwebengine"]
|
[submodule "qtwebengine"]
|
||||||
depends = qtdeclarative
|
depends = qtdeclarative
|
||||||
recommends = qtwebchannel qttools qtpositioning
|
recommends = qtwebchannel qttools qtpositioning
|
||||||
path = qtwebengine
|
path = qtwebengine
|
||||||
url = ../qtwebengine.git
|
url = ../qtwebengine.git
|
||||||
branch = 6.8
|
branch = 6.8.3
|
||||||
status = addon
|
status = addon
|
||||||
priority = 10
|
priority = 10
|
||||||
[submodule "qtcanvas3d"]
|
[submodule "qtcanvas3d"]
|
||||||
@@ -185,28 +185,28 @@
|
|||||||
recommends = qtwebengine
|
recommends = qtwebengine
|
||||||
path = qtwebview
|
path = qtwebview
|
||||||
url = ../qtwebview.git
|
url = ../qtwebview.git
|
||||||
branch = 6.8
|
branch = 6.8.3
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qtcharts"]
|
[submodule "qtcharts"]
|
||||||
depends = qtbase
|
depends = qtbase
|
||||||
recommends = qtdeclarative qtmultimedia
|
recommends = qtdeclarative qtmultimedia
|
||||||
path = qtcharts
|
path = qtcharts
|
||||||
url = ../qtcharts.git
|
url = ../qtcharts.git
|
||||||
branch = 6.8
|
branch = 6.8.3
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qtdatavis3d"]
|
[submodule "qtdatavis3d"]
|
||||||
depends = qtbase
|
depends = qtbase
|
||||||
recommends = qtdeclarative qtmultimedia
|
recommends = qtdeclarative qtmultimedia
|
||||||
path = qtdatavis3d
|
path = qtdatavis3d
|
||||||
url = ../qtdatavis3d.git
|
url = ../qtdatavis3d.git
|
||||||
branch = 6.8
|
branch = 6.8.3
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qtvirtualkeyboard"]
|
[submodule "qtvirtualkeyboard"]
|
||||||
depends = qtbase qtdeclarative qtsvg
|
depends = qtbase qtdeclarative qtsvg
|
||||||
recommends = qtmultimedia
|
recommends = qtmultimedia
|
||||||
path = qtvirtualkeyboard
|
path = qtvirtualkeyboard
|
||||||
url = ../qtvirtualkeyboard.git
|
url = ../qtvirtualkeyboard.git
|
||||||
branch = 6.8
|
branch = 6.8.3
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qtgamepad"]
|
[submodule "qtgamepad"]
|
||||||
depends = qtbase
|
depends = qtbase
|
||||||
@@ -219,27 +219,27 @@
|
|||||||
depends = qtbase qtdeclarative
|
depends = qtbase qtdeclarative
|
||||||
path = qtscxml
|
path = qtscxml
|
||||||
url = ../qtscxml.git
|
url = ../qtscxml.git
|
||||||
branch = 6.8
|
branch = 6.8.3
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qtspeech"]
|
[submodule "qtspeech"]
|
||||||
depends = qtbase qtmultimedia
|
depends = qtbase qtmultimedia
|
||||||
recommends = qtdeclarative
|
recommends = qtdeclarative
|
||||||
path = qtspeech
|
path = qtspeech
|
||||||
url = ../qtspeech.git
|
url = ../qtspeech.git
|
||||||
branch = 6.8
|
branch = 6.8.3
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qtnetworkauth"]
|
[submodule "qtnetworkauth"]
|
||||||
depends = qtbase
|
depends = qtbase
|
||||||
path = qtnetworkauth
|
path = qtnetworkauth
|
||||||
url = ../qtnetworkauth.git
|
url = ../qtnetworkauth.git
|
||||||
branch = 6.8
|
branch = 6.8.3
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qtremoteobjects"]
|
[submodule "qtremoteobjects"]
|
||||||
depends = qtbase
|
depends = qtbase
|
||||||
recommends = qtdeclarative
|
recommends = qtdeclarative
|
||||||
path = qtremoteobjects
|
path = qtremoteobjects
|
||||||
url = ../qtremoteobjects.git
|
url = ../qtremoteobjects.git
|
||||||
branch = 6.8
|
branch = 6.8.3
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qtwebglplugin"]
|
[submodule "qtwebglplugin"]
|
||||||
depends = qtbase qtwebsockets
|
depends = qtbase qtwebsockets
|
||||||
@@ -252,87 +252,87 @@
|
|||||||
depends = qtbase qtdeclarative
|
depends = qtbase qtdeclarative
|
||||||
path = qtlottie
|
path = qtlottie
|
||||||
url = ../qtlottie.git
|
url = ../qtlottie.git
|
||||||
branch = 6.8
|
branch = 6.8.3
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qtquicktimeline"]
|
[submodule "qtquicktimeline"]
|
||||||
depends = qtbase qtdeclarative
|
depends = qtbase qtdeclarative
|
||||||
path = qtquicktimeline
|
path = qtquicktimeline
|
||||||
url = ../qtquicktimeline
|
url = ../qtquicktimeline
|
||||||
branch = 6.8
|
branch = 6.8.3
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qtquick3d"]
|
[submodule "qtquick3d"]
|
||||||
depends = qtbase qtdeclarative qtshadertools
|
depends = qtbase qtdeclarative qtshadertools
|
||||||
recommends = qtquicktimeline
|
recommends = qtquicktimeline
|
||||||
path = qtquick3d
|
path = qtquick3d
|
||||||
url = ../qtquick3d.git
|
url = ../qtquick3d.git
|
||||||
branch = 6.8
|
branch = 6.8.3
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qtshadertools"]
|
[submodule "qtshadertools"]
|
||||||
depends = qtbase
|
depends = qtbase
|
||||||
path = qtshadertools
|
path = qtshadertools
|
||||||
url = ../qtshadertools.git
|
url = ../qtshadertools.git
|
||||||
branch = 6.8
|
branch = 6.8.3
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qt5compat"]
|
[submodule "qt5compat"]
|
||||||
depends = qtbase qtdeclarative
|
depends = qtbase qtdeclarative
|
||||||
path = qt5compat
|
path = qt5compat
|
||||||
url = ../qt5compat.git
|
url = ../qt5compat.git
|
||||||
branch = 6.8
|
branch = 6.8.3
|
||||||
status = deprecated
|
status = deprecated
|
||||||
[submodule "qtcoap"]
|
[submodule "qtcoap"]
|
||||||
depends = qtbase
|
depends = qtbase
|
||||||
path = qtcoap
|
path = qtcoap
|
||||||
url = ../qtcoap.git
|
url = ../qtcoap.git
|
||||||
branch = 6.8
|
branch = 6.8.3
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qtmqtt"]
|
[submodule "qtmqtt"]
|
||||||
depends = qtbase qtdeclarative
|
depends = qtbase qtdeclarative
|
||||||
path = qtmqtt
|
path = qtmqtt
|
||||||
url = ../qtmqtt.git
|
url = ../qtmqtt.git
|
||||||
branch = 6.8
|
branch = 6.8.3
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qtopcua"]
|
[submodule "qtopcua"]
|
||||||
depends = qtbase qtdeclarative
|
depends = qtbase qtdeclarative
|
||||||
path = qtopcua
|
path = qtopcua
|
||||||
url = ../qtopcua.git
|
url = ../qtopcua.git
|
||||||
branch = 6.8
|
branch = 6.8.3
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qtlanguageserver"]
|
[submodule "qtlanguageserver"]
|
||||||
depends = qtbase
|
depends = qtbase
|
||||||
path = qtlanguageserver
|
path = qtlanguageserver
|
||||||
url = ../qtlanguageserver.git
|
url = ../qtlanguageserver.git
|
||||||
branch = 6.8
|
branch = 6.8.3
|
||||||
status = preview
|
status = preview
|
||||||
[submodule "qthttpserver"]
|
[submodule "qthttpserver"]
|
||||||
depends = qtbase
|
depends = qtbase
|
||||||
recommends = qtwebsockets
|
recommends = qtwebsockets
|
||||||
path = qthttpserver
|
path = qthttpserver
|
||||||
url = ../qthttpserver.git
|
url = ../qthttpserver.git
|
||||||
branch = 6.8
|
branch = 6.8.3
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qtquick3dphysics"]
|
[submodule "qtquick3dphysics"]
|
||||||
depends = qtbase qtdeclarative qtquick3d qtshadertools
|
depends = qtbase qtdeclarative qtquick3d qtshadertools
|
||||||
path = qtquick3dphysics
|
path = qtquick3dphysics
|
||||||
url = ../qtquick3dphysics.git
|
url = ../qtquick3dphysics.git
|
||||||
branch = 6.8
|
branch = 6.8.3
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qtgrpc"]
|
[submodule "qtgrpc"]
|
||||||
depends = qtbase
|
depends = qtbase
|
||||||
recommends = qtdeclarative
|
recommends = qtdeclarative
|
||||||
path = qtgrpc
|
path = qtgrpc
|
||||||
url = ../qtgrpc.git
|
url = ../qtgrpc.git
|
||||||
branch = 6.8
|
branch = 6.8.3
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qtquickeffectmaker"]
|
[submodule "qtquickeffectmaker"]
|
||||||
depends = qtbase qtdeclarative qtshadertools
|
depends = qtbase qtdeclarative qtshadertools
|
||||||
recommends = qtquick3d
|
recommends = qtquick3d
|
||||||
path = qtquickeffectmaker
|
path = qtquickeffectmaker
|
||||||
url = ../qtquickeffectmaker.git
|
url = ../qtquickeffectmaker.git
|
||||||
branch = 6.8
|
branch = 6.8.3
|
||||||
status = addon
|
status = addon
|
||||||
[submodule "qtgraphs"]
|
[submodule "qtgraphs"]
|
||||||
depends = qtbase qtdeclarative qtquick3d
|
depends = qtbase qtdeclarative qtquick3d
|
||||||
path = qtgraphs
|
path = qtgraphs
|
||||||
url = ../qtgraphs.git
|
url = ../qtgraphs.git
|
||||||
branch = 6.8
|
branch = 6.8.3
|
||||||
status = addon
|
status = addon
|
||||||
|
|||||||
@@ -289,3 +289,16 @@ Configurations:
|
|||||||
'COIN_EXTRA_DEBIAN_REPO=deb http://archive.ubuntu.com/ubuntu/ jammy main universe multiverse',
|
'COIN_EXTRA_DEBIAN_REPO=deb http://archive.ubuntu.com/ubuntu/ jammy main universe multiverse',
|
||||||
'COIN_SKIP_DEBIAN_MODULES=qt5 qtqa qtactiveqt qtdoc qtwebengine qtwebview',
|
'COIN_SKIP_DEBIAN_MODULES=qt5 qtqa qtactiveqt qtdoc qtwebengine qtwebview',
|
||||||
]
|
]
|
||||||
|
-
|
||||||
|
Id: 'bookworm-gles-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.8_gles',
|
||||||
|
'COIN_TARGET_DIST=tqtc-bookworm',
|
||||||
|
'COIN_EXTRA_DEBIAN_PACKAGES={{.Env.HOME}}/debian_packages/',
|
||||||
|
'COIN_SBUILD_CHROOT=stable-arm64-sbuild',
|
||||||
|
'COIN_EXTRA_DEBIAN_REPO=deb http://deb.debian.org/debian/ bookworm main',
|
||||||
|
'COIN_SKIP_DEBIAN_MODULES=qt5 qtqa qtactiveqt qtdoc qtwebengine qtwebview',
|
||||||
|
]
|
||||||
|
|||||||
@@ -26,8 +26,8 @@ toolsVersion="2.1"
|
|||||||
toolsFile="commandlinetools-linux-6609375_latest.zip"
|
toolsFile="commandlinetools-linux-6609375_latest.zip"
|
||||||
ndkVersionLatest="r26b"
|
ndkVersionLatest="r26b"
|
||||||
ndkVersionDefault=$ndkVersionLatest
|
ndkVersionDefault=$ndkVersionLatest
|
||||||
sdkBuildToolsVersion="34.0.0"
|
sdkBuildToolsVersion="35.0.1"
|
||||||
sdkApiLevel="android-34"
|
sdkApiLevel="android-35"
|
||||||
|
|
||||||
toolsSha1="9172381ff070ee2a416723c1989770cf4b0d1076"
|
toolsSha1="9172381ff070ee2a416723c1989770cf4b0d1076"
|
||||||
ndkSha1Latest="fdf33d9f6c1b3f16e5459d53a82c7d2201edbcc4"
|
ndkSha1Latest="fdf33d9f6c1b3f16e5459d53a82c7d2201edbcc4"
|
||||||
|
|||||||
@@ -22,9 +22,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"
|
|||||||
|
|
||||||
ndkVersionLatest="r26b"
|
ndkVersionLatest="r26b"
|
||||||
ndkVersionDefault="$ndkVersionLatest"
|
ndkVersionDefault="$ndkVersionLatest"
|
||||||
sdkBuildToolsVersion="34.0.0"
|
sdkBuildToolsVersion="35.0.1"
|
||||||
# this is compile sdk version
|
# this is compile sdk version
|
||||||
sdkApiLevel="android-34"
|
sdkApiLevel="android-35"
|
||||||
|
|
||||||
toolsSourceFile="$basePath/$toolsFile"
|
toolsSourceFile="$basePath/$toolsFile"
|
||||||
|
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ ffmpeg_name="FFmpeg-$version"
|
|||||||
target_dir="$HOME"
|
target_dir="$HOME"
|
||||||
ffmpeg_source_dir="$target_dir/$ffmpeg_name"
|
ffmpeg_source_dir="$target_dir/$ffmpeg_name"
|
||||||
prefix="/usr/local/ios/ffmpeg"
|
prefix="/usr/local/ios/ffmpeg"
|
||||||
|
dylib_regex="^@rpath/.*\.dylib$"
|
||||||
|
|
||||||
if [ ! -d "$ffmpeg_source_dir" ];
|
if [ ! -d "$ffmpeg_source_dir" ];
|
||||||
then
|
then
|
||||||
|
|||||||
@@ -24,8 +24,8 @@ $ndkZip = "C:\Windows\Temp\android_ndk.zip"
|
|||||||
$toolsVersion = "2.1"
|
$toolsVersion = "2.1"
|
||||||
$toolsFile = "commandlinetools-win-6609375_latest.zip"
|
$toolsFile = "commandlinetools-win-6609375_latest.zip"
|
||||||
$sdkApi = "ANDROID_API_VERSION"
|
$sdkApi = "ANDROID_API_VERSION"
|
||||||
$sdkApiLevel = "android-34"
|
$sdkApiLevel = "android-35"
|
||||||
$sdkBuildToolsVersion = "34.0.0"
|
$sdkBuildToolsVersion = "35.0.1"
|
||||||
$toolsCachedUrl= "\\ci-files01-hki.ci.qt.io\provisioning\android\$toolsFile"
|
$toolsCachedUrl= "\\ci-files01-hki.ci.qt.io\provisioning\android\$toolsFile"
|
||||||
$toolsOfficialUrl = "https://dl.google.com/android/repository/$toolsFile"
|
$toolsOfficialUrl = "https://dl.google.com/android/repository/$toolsFile"
|
||||||
$toolsChecksum = "e2e19c2ff584efa87ef0cfdd1987f92881323208"
|
$toolsChecksum = "e2e19c2ff584efa87ef0cfdd1987f92881323208"
|
||||||
|
|||||||
@@ -48,9 +48,8 @@ sudo zypper -nq install libxml2-devel libxslt-devel
|
|||||||
# yasm (for ffmpeg in multimedia)
|
# yasm (for ffmpeg in multimedia)
|
||||||
sudo zypper -nq install yasm
|
sudo zypper -nq install yasm
|
||||||
|
|
||||||
# GStreamer (qtwebkit and qtmultimedia), pulseaudio (qtmultimedia)
|
# pulseaudio (qtmultimedia)
|
||||||
sudo zypper -nq install gstreamer-devel gstreamer-plugins-base-devel libpulse-devel pipewire-devel \
|
sudo zypper -nq install libpulse-devel pipewire-devel
|
||||||
gstreamer-1.20-plugin-openh264 gstreamer-plugins-bad-devel
|
|
||||||
|
|
||||||
# cups
|
# cups
|
||||||
sudo zypper -nq install cups-devel
|
sudo zypper -nq install cups-devel
|
||||||
|
|||||||
@@ -22,9 +22,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"
|
|||||||
|
|
||||||
ndkVersion="r26b"
|
ndkVersion="r26b"
|
||||||
ndkFile="android-ndk-$ndkVersion-darwin.zip"
|
ndkFile="android-ndk-$ndkVersion-darwin.zip"
|
||||||
sdkBuildToolsVersion="34.0.0"
|
sdkBuildToolsVersion="35.0.1"
|
||||||
# this is compile sdk version
|
# this is compile sdk version
|
||||||
sdkApiLevel="android-34"
|
sdkApiLevel="android-35"
|
||||||
|
|
||||||
toolsSourceFile="$basePath/$toolsFile"
|
toolsSourceFile="$basePath/$toolsFile"
|
||||||
ndkSourceFile="$basePath/$ndkFile"
|
ndkSourceFile="$basePath/$ndkFile"
|
||||||
|
|||||||
@@ -22,9 +22,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"
|
|||||||
|
|
||||||
ndkVersion="r26b"
|
ndkVersion="r26b"
|
||||||
ndkFile="android-ndk-$ndkVersion-darwin.zip"
|
ndkFile="android-ndk-$ndkVersion-darwin.zip"
|
||||||
sdkBuildToolsVersion="34.0.0"
|
sdkBuildToolsVersion="35.0.1"
|
||||||
# this is compile sdk version
|
# this is compile sdk version
|
||||||
sdkApiLevel="android-34"
|
sdkApiLevel="android-35"
|
||||||
|
|
||||||
toolsSourceFile="$basePath/$toolsFile"
|
toolsSourceFile="$basePath/$toolsFile"
|
||||||
ndkSourceFile="$basePath/$ndkFile"
|
ndkSourceFile="$basePath/$ndkFile"
|
||||||
|
|||||||
@@ -22,9 +22,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"
|
|||||||
|
|
||||||
ndkVersion="r26b"
|
ndkVersion="r26b"
|
||||||
ndkFile="android-ndk-$ndkVersion-darwin.zip"
|
ndkFile="android-ndk-$ndkVersion-darwin.zip"
|
||||||
sdkBuildToolsVersion="34.0.0"
|
sdkBuildToolsVersion="35.0.1"
|
||||||
# this is compile sdk version
|
# this is compile sdk version
|
||||||
sdkApiLevel="android-34"
|
sdkApiLevel="android-35"
|
||||||
|
|
||||||
toolsSourceFile="$basePath/$toolsFile"
|
toolsSourceFile="$basePath/$toolsFile"
|
||||||
ndkSourceFile="$basePath/$ndkFile"
|
ndkSourceFile="$basePath/$ndkFile"
|
||||||
|
|||||||
@@ -22,9 +22,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"
|
|||||||
|
|
||||||
ndkVersion="r26b"
|
ndkVersion="r26b"
|
||||||
ndkFile="android-ndk-$ndkVersion-darwin.zip"
|
ndkFile="android-ndk-$ndkVersion-darwin.zip"
|
||||||
sdkBuildToolsVersion="34.0.0"
|
sdkBuildToolsVersion="35.0.1"
|
||||||
# this is compile sdk version
|
# this is compile sdk version
|
||||||
sdkApiLevel="android-34"
|
sdkApiLevel="android-35"
|
||||||
|
|
||||||
toolsSourceFile="$basePath/$toolsFile"
|
toolsSourceFile="$basePath/$toolsFile"
|
||||||
ndkSourceFile="$basePath/$ndkFile"
|
ndkSourceFile="$basePath/$ndkFile"
|
||||||
|
|||||||
@@ -2,7 +2,10 @@
|
|||||||
#Copyright (C) 2023 The Qt Company Ltd
|
#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
|
#SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
|
||||||
|
|
||||||
|
# shellcheck source=../common/unix/SetEnvVar.sh
|
||||||
|
source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh"
|
||||||
|
|
||||||
set -ex
|
set -ex
|
||||||
|
|
||||||
brew install nodejs
|
brew install node@22
|
||||||
|
SetEnvVar "PATH" "/opt/homebrew/opt/node@22/bin:\$PATH"
|
||||||
|
|||||||
@@ -22,9 +22,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"
|
|||||||
|
|
||||||
ndkVersion="r26b"
|
ndkVersion="r26b"
|
||||||
ndkFile="android-ndk-$ndkVersion-darwin.zip"
|
ndkFile="android-ndk-$ndkVersion-darwin.zip"
|
||||||
sdkBuildToolsVersion="34.0.0"
|
sdkBuildToolsVersion="35.0.1"
|
||||||
# this is compile sdk version
|
# this is compile sdk version
|
||||||
sdkApiLevel="android-34"
|
sdkApiLevel="android-35"
|
||||||
|
|
||||||
toolsSourceFile="$basePath/$toolsFile"
|
toolsSourceFile="$basePath/$toolsFile"
|
||||||
ndkSourceFile="$basePath/$ndkFile"
|
ndkSourceFile="$basePath/$ndkFile"
|
||||||
|
|||||||
@@ -22,9 +22,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"
|
|||||||
|
|
||||||
ndkVersion="r26b"
|
ndkVersion="r26b"
|
||||||
ndkFile="android-ndk-$ndkVersion-darwin.zip"
|
ndkFile="android-ndk-$ndkVersion-darwin.zip"
|
||||||
sdkBuildToolsVersion="34.0.0"
|
sdkBuildToolsVersion="35.0.1"
|
||||||
# this is compile sdk version
|
# this is compile sdk version
|
||||||
sdkApiLevel="android-34"
|
sdkApiLevel="android-35"
|
||||||
|
|
||||||
toolsSourceFile="$basePath/$toolsFile"
|
toolsSourceFile="$basePath/$toolsFile"
|
||||||
ndkSourceFile="$basePath/$ndkFile"
|
ndkSourceFile="$basePath/$ndkFile"
|
||||||
|
|||||||
2
qt3d
2
qt3d
Submodule qt3d updated: 853dc45ee2...bfad8d1ca7
Submodule qt5compat updated: 2d690a846f...00aa5892e6
Submodule qtactiveqt updated: 400d978e15...d20ffe3cca
2
qtbase
2
qtbase
Submodule qtbase updated: f55ea3271b...c07c2d5a52
2
qtcharts
2
qtcharts
Submodule qtcharts updated: 4d6eeb9c34...16fe4460f5
2
qtcoap
2
qtcoap
Submodule qtcoap updated: eb8fb6773d...4ca6138222
Submodule qtconnectivity updated: 3741c49e24...4640a73bc2
Submodule qtdatavis3d updated: 2b99ddd6e9...dd5b0d7a70
Submodule qtdeclarative updated: 7b4837d3e3...2ec235a223
2
qtdoc
2
qtdoc
Submodule qtdoc updated: d4fd6fa937...5252bd9258
2
qtgraphs
2
qtgraphs
Submodule qtgraphs updated: de1f22159d...68ddd540f3
2
qtgrpc
2
qtgrpc
Submodule qtgrpc updated: 6be8fc5b24...7a1193097d
Submodule qthttpserver updated: e269617cd7...ca2bc5a769
Submodule qtimageformats updated: 9e7f0c0f46...3b6b1fb960
Submodule qtlanguageserver updated: caeeb4301b...f38cd19f2a
Submodule qtlocation updated: 8d06509499...7a7317488e
2
qtlottie
2
qtlottie
Submodule qtlottie updated: 2980a41819...7ef0b00ca0
2
qtmqtt
2
qtmqtt
Submodule qtmqtt updated: 03f00e0a11...6a876cb321
Submodule qtmultimedia updated: e750791a46...2bf1135261
Submodule qtnetworkauth updated: e477222ab9...2092f9c301
2
qtopcua
2
qtopcua
Submodule qtopcua updated: be1c77c0ed...8c3494316b
Submodule qtpositioning updated: 83cc61df4a...b0a8c903ed
Submodule qtquick3d updated: 4b9b8b362a...fbf77a8469
Submodule qtquick3dphysics updated: e94713f2e2...1661fd2279
Submodule qtquickeffectmaker updated: 88b36c5209...70ad88b9d7
Submodule qtquicktimeline updated: 337c99f9c3...9024c17340
Submodule qtremoteobjects updated: eb4e4c2cde...8d8148300b
Submodule qtrepotools updated: 0838a75434...4434304a56
2
qtscxml
2
qtscxml
Submodule qtscxml updated: d832f2d3e6...01b054ac35
Submodule qtsensors updated: ebeffe4e01...d311baa1f5
Submodule qtserialbus updated: af8847c84e...39b4a7ba6e
Submodule qtserialport updated: 7fb269900f...704c70cde4
Submodule qtshadertools updated: 1ac1d7e42c...7578691493
2
qtspeech
2
qtspeech
Submodule qtspeech updated: 266d03c482...1a0b83de2a
2
qtsvg
2
qtsvg
Submodule qtsvg updated: 4422b48cb3...c75099a75e
2
qttools
2
qttools
Submodule qttools updated: feda5851dd...2649ea1aa5
Submodule qttranslations updated: b046f9e927...abe01d7de3
Submodule qtvirtualkeyboard updated: af9e779ff3...eb8cedd4fa
Submodule qtwayland updated: e5d1950090...8ab0d5b4cd
Submodule qtwebchannel updated: ca7d35059a...af7ba48b05
Submodule qtwebengine updated: 9ab8432ee9...b586c4eb65
Submodule qtwebsockets updated: 2c7e41f767...621eb11be8
Submodule qtwebview updated: f966ce20cc...5dad1f9da9
Reference in New Issue
Block a user