mirror of
git://code.qt.io/qt/qt5.git
synced 2026-01-06 23:16:54 +08:00
Compare commits
15 Commits
v6.3.0-bet
...
v6.3.0
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1734139bf4 | ||
|
|
7bd9550eb8 | ||
|
|
8b9d185ad3 | ||
|
|
28fa31c441 | ||
|
|
686481f48c | ||
|
|
4ec029b83f | ||
|
|
0420b8e8d2 | ||
|
|
9362c7ec43 | ||
|
|
05b49c7b60 | ||
|
|
98f696ce30 | ||
|
|
ed8d1c76ae | ||
|
|
ba761fab29 | ||
|
|
0ad4b8a794 | ||
|
|
28d8ebdd5b | ||
|
|
c4d99abe5e |
82
.gitmodules
vendored
82
.gitmodules
vendored
@@ -1,53 +1,53 @@
|
||||
[submodule "qtbase"]
|
||||
path = qtbase
|
||||
url = ../qtbase.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = essential
|
||||
[submodule "qtsvg"]
|
||||
depends = qtbase
|
||||
path = qtsvg
|
||||
url = ../qtsvg.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = addon
|
||||
[submodule "qtdeclarative"]
|
||||
depends = qtbase
|
||||
recommends = qtimageformats qtshadertools qtsvg qtlanguageserver
|
||||
path = qtdeclarative
|
||||
url = ../qtdeclarative.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = essential
|
||||
[submodule "qtactiveqt"]
|
||||
depends = qtbase
|
||||
path = qtactiveqt
|
||||
url = ../qtactiveqt.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = addon
|
||||
[submodule "qtmultimedia"]
|
||||
depends = qtbase qtshadertools
|
||||
recommends = qtdeclarative
|
||||
path = qtmultimedia
|
||||
url = ../qtmultimedia.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = addon
|
||||
[submodule "qttools"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtactiveqt
|
||||
path = qttools
|
||||
url = ../qttools.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = essential
|
||||
[submodule "qtxmlpatterns"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtxmlpatterns
|
||||
url = ../qtxmlpatterns.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = ignore
|
||||
[submodule "qttranslations"]
|
||||
depends = qttools
|
||||
path = qttranslations
|
||||
url = ../qttranslations.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = essential
|
||||
priority = 30
|
||||
[submodule "qtdoc"]
|
||||
@@ -55,7 +55,7 @@
|
||||
recommends = qtmultimedia
|
||||
path = qtdoc
|
||||
url = ../qtdoc.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = essential
|
||||
priority = 40
|
||||
[submodule "qtrepotools"]
|
||||
@@ -76,21 +76,21 @@
|
||||
recommends = qtdeclarative
|
||||
path = qtlocation
|
||||
url = ../qtlocation.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = ignore
|
||||
[submodule "qtpositioning"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtserialport
|
||||
path = qtpositioning
|
||||
url = ../qtpositioning.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = addon
|
||||
[submodule "qtsensors"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtsensors
|
||||
url = ../qtsensors.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = addon
|
||||
[submodule "qtsystems"]
|
||||
depends = qtbase
|
||||
@@ -117,189 +117,189 @@
|
||||
recommends = qtdeclarative
|
||||
path = qtconnectivity
|
||||
url = ../qtconnectivity.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = addon
|
||||
[submodule "qtwayland"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwayland
|
||||
url = ../qtwayland.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = addon
|
||||
[submodule "qt3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtshadertools
|
||||
path = qt3d
|
||||
url = ../qt3d.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = addon
|
||||
[submodule "qtimageformats"]
|
||||
depends = qtbase
|
||||
path = qtimageformats
|
||||
url = ../qtimageformats.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = addon
|
||||
[submodule "qtserialbus"]
|
||||
depends = qtbase
|
||||
recommends = qtserialport
|
||||
path = qtserialbus
|
||||
url = ../qtserialbus.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = addon
|
||||
[submodule "qtserialport"]
|
||||
depends = qtbase
|
||||
path = qtserialport
|
||||
url = ../qtserialport.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = addon
|
||||
[submodule "qtwebsockets"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwebsockets
|
||||
url = ../qtwebsockets.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = addon
|
||||
[submodule "qtwebchannel"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtwebsockets
|
||||
path = qtwebchannel
|
||||
url = ../qtwebchannel.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = addon
|
||||
[submodule "qtwebengine"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtwebchannel qttools qtpositioning
|
||||
path = qtwebengine
|
||||
url = ../qtwebengine.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = addon
|
||||
priority = 10
|
||||
[submodule "qtcanvas3d"]
|
||||
depends = qtdeclarative
|
||||
path = qtcanvas3d
|
||||
url = ../qtcanvas3d.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = ignore
|
||||
[submodule "qtwebview"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtwebengine
|
||||
path = qtwebview
|
||||
url = ../qtwebview.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = addon
|
||||
[submodule "qtcharts"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtcharts
|
||||
url = ../qtcharts.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = addon
|
||||
[submodule "qtdatavis3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtdatavis3d
|
||||
url = ../qtdatavis3d.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = addon
|
||||
[submodule "qtvirtualkeyboard"]
|
||||
depends = qtbase qtdeclarative qtsvg
|
||||
recommends = qtmultimedia
|
||||
path = qtvirtualkeyboard
|
||||
url = ../qtvirtualkeyboard.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = addon
|
||||
[submodule "qtgamepad"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtgamepad
|
||||
url = ../qtgamepad.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = ignore
|
||||
[submodule "qtscxml"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtscxml
|
||||
url = ../qtscxml.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = addon
|
||||
[submodule "qtspeech"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtspeech
|
||||
url = ../qtspeech.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = ignore
|
||||
[submodule "qtnetworkauth"]
|
||||
depends = qtbase
|
||||
path = qtnetworkauth
|
||||
url = ../qtnetworkauth.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = addon
|
||||
[submodule "qtremoteobjects"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtremoteobjects
|
||||
url = ../qtremoteobjects.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = addon
|
||||
[submodule "qtwebglplugin"]
|
||||
depends = qtbase qtwebsockets
|
||||
recommends = qtdeclarative
|
||||
path = qtwebglplugin
|
||||
url = ../qtwebglplugin.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = ignore
|
||||
[submodule "qtlottie"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtlottie
|
||||
url = ../qtlottie.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = addon
|
||||
[submodule "qtquicktimeline"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtquicktimeline
|
||||
url = ../qtquicktimeline
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = addon
|
||||
[submodule "qtquick3d"]
|
||||
depends = qtbase qtdeclarative qtshadertools
|
||||
recommends = qtquicktimeline
|
||||
path = qtquick3d
|
||||
url = ../qtquick3d.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = addon
|
||||
[submodule "qtshadertools"]
|
||||
depends = qtbase
|
||||
path = qtshadertools
|
||||
url = ../qtshadertools.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = addon
|
||||
[submodule "qt5compat"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qt5compat
|
||||
url = ../qt5compat.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = deprecated
|
||||
[submodule "qtcoap"]
|
||||
depends = qtbase
|
||||
path = qtcoap
|
||||
url = ../qtcoap.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = addon
|
||||
[submodule "qtmqtt"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtmqtt
|
||||
url = ../qtmqtt.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = addon
|
||||
[submodule "qtopcua"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtopcua
|
||||
url = ../qtopcua.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = addon
|
||||
[submodule "qtlanguageserver"]
|
||||
depends = qtbase
|
||||
path = qtlanguageserver
|
||||
url = ../qtlanguageserver.git
|
||||
branch = 6.3
|
||||
branch = 6.3.0
|
||||
status = preview
|
||||
|
||||
@@ -2,6 +2,10 @@
|
||||
# 3.16 is the absolute minimum though.
|
||||
cmake_minimum_required(VERSION 3.16...3.20)
|
||||
|
||||
|
||||
# set QT_SUPERBUILD early, so that qtbase/.cmake.conf can check it
|
||||
set(QT_SUPERBUILD TRUE)
|
||||
|
||||
# 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")
|
||||
@@ -37,7 +41,6 @@ include(ECMOptionalAddSubdirectory)
|
||||
if (NOT QT_BUILD_STANDALONE_TESTS)
|
||||
set(QT_NO_CREATE_TARGETS TRUE)
|
||||
endif()
|
||||
set(QT_SUPERBUILD TRUE)
|
||||
|
||||
# Get submodule list if not already defined
|
||||
if(NOT QT_BUILD_SUBMODULES)
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
QT LICENSE AGREEMENT
|
||||
Agreement version 4.4
|
||||
Agreement version 4.4.1
|
||||
|
||||
This Qt License Agreement ("Agreement") is a legal agreement for the licensing
|
||||
of Licensed Software (as defined below) between The Qt Company (as defined
|
||||
@@ -233,7 +233,7 @@ Appendix 9 hereto.
|
||||
United States or a legal entity incorporated outside of the United
|
||||
States or having its registered office outside of the United States,
|
||||
The Qt Company Ltd., a Finnish company with its registered office at
|
||||
Bertel Jungin aukio D3A, 02600 Espoo, Finland.
|
||||
Miestentie 7, 02150 Espoo, Finland.
|
||||
|
||||
"Third-Party Software" shall have the meaning set forth in Section 4.
|
||||
|
||||
@@ -1054,8 +1054,8 @@ The Agreement includes following Appendices 1-10, as applicable.
|
||||
- Appendix 1: Licensed Software details
|
||||
- Appendix 2: Pricing
|
||||
- Appendix 3: Add-on Software details (optional)
|
||||
- Appendix 4: Non-commercial and educational Licenses (optional)
|
||||
- Appendix 5: Small business and startup Licenses (optional)
|
||||
- Appendix 4: Small business and startup Licenses (optional)
|
||||
- Appendix 5: Non-commercial and educational Licenses (optional)
|
||||
- Appendix 6: License Reporting (optional)
|
||||
- Appendix 7: Marketing Rights (optional)
|
||||
- Appendix 8: Intentionally left blank (optional)
|
||||
|
||||
16
coin/platform_configs/linux_android_tests.yaml
Normal file
16
coin/platform_configs/linux_android_tests.yaml
Normal file
@@ -0,0 +1,16 @@
|
||||
Version: 2
|
||||
Configurations:
|
||||
-
|
||||
Template: 'qtci-linux-RHEL-8.4-x86_64-50'
|
||||
Target os: 'Android_ANY'
|
||||
Target arch: 'x86'
|
||||
Compiler: 'GCC'
|
||||
Target compiler: 'Clang'
|
||||
Platform dependency: 'RHEL-8.4-host'
|
||||
Features: ['Packaging', 'Sccache', 'AndroidTestRun']
|
||||
Environment variables: [
|
||||
'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}',
|
||||
'CONAN_HOST_PROFILE=coin/conan/profiles/linux-x86_64-gcc',
|
||||
'CONAN_INSTALL_DIR={{.InstallDir}}/target',
|
||||
'CONAN_PROFILE=coin/conan/profiles/unix-android-x86-clang',
|
||||
'ANDROID_EMULATOR=@emulator_x86_api_23']
|
||||
@@ -4,21 +4,7 @@ Include: [
|
||||
cmake_platforms_static_tests.yaml,
|
||||
macos-developer-build-tests.yaml,
|
||||
integrity.yaml,
|
||||
ios-tests.yaml
|
||||
ios-tests.yaml,
|
||||
linux_android_tests.yaml
|
||||
]
|
||||
Configurations:
|
||||
-
|
||||
Template: 'qtci-linux-RHEL-8.4-x86_64-50'
|
||||
Target os: 'Android_ANY'
|
||||
Target arch: 'x86'
|
||||
Compiler: 'GCC'
|
||||
Target compiler: 'Clang'
|
||||
Platform dependency: 'RHEL-8.4-host'
|
||||
Features: ['Packaging', 'Sccache', 'AndroidTestRun']
|
||||
Environment variables: [
|
||||
'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}',
|
||||
'CONAN_HOST_PROFILE=coin/conan/profiles/linux-x86_64-gcc',
|
||||
'CONAN_INSTALL_DIR={{.InstallDir}}/target',
|
||||
'CONAN_PROFILE=coin/conan/profiles/unix-android-x86-clang',
|
||||
'ANDROID_EMULATOR=@emulator_x86_api_23']
|
||||
|
||||
Configurations: []
|
||||
|
||||
@@ -3,6 +3,7 @@ Include: [
|
||||
cmake_platforms.yaml,
|
||||
macos-developer-build-tests.yaml,
|
||||
integrity.yaml,
|
||||
cmake_platforms_static_tests.yaml
|
||||
cmake_platforms_static_tests.yaml,
|
||||
linux_android_tests.yaml
|
||||
]
|
||||
Configurations: []
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
Version: 2
|
||||
Include: [
|
||||
cmake_platforms.yaml,
|
||||
integrity.yaml
|
||||
integrity.yaml,
|
||||
linux_android_tests.yaml
|
||||
]
|
||||
Configurations: []
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
Version: 2
|
||||
Include: [
|
||||
cmake_platforms.yaml,
|
||||
integrity.yaml
|
||||
integrity.yaml,
|
||||
linux_android_tests.yaml
|
||||
]
|
||||
Configurations: []
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
Version: 2
|
||||
Include: [
|
||||
cmake_platforms.yaml,
|
||||
integrity.yaml
|
||||
integrity.yaml,
|
||||
linux_android_tests.yaml
|
||||
]
|
||||
Configurations: []
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
Version: 2
|
||||
Include: [
|
||||
cmake_platforms.yaml,
|
||||
integrity.yaml
|
||||
integrity.yaml,
|
||||
linux_android_tests.yaml
|
||||
]
|
||||
Configurations: []
|
||||
|
||||
@@ -45,7 +45,7 @@ Configurations:
|
||||
Compiler: 'GCC'
|
||||
Target compiler: 'Clang'
|
||||
Platform dependency: 'RHEL-8.4-host'
|
||||
Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'Insignificant']
|
||||
Features: ['Sccache', 'AndroidTestRun', 'Insignificant']
|
||||
Environment variables: [
|
||||
'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}',
|
||||
'CONAN_HOST_PROFILE=coin/conan/profiles/linux-x86_64-gcc',
|
||||
|
||||
@@ -102,6 +102,11 @@ if [ ! -d "$targetFolder" ]; then
|
||||
fi
|
||||
DownloadAndExtract "$sourceFile" "$sha1" "$targetFile" "$targetFolder"
|
||||
|
||||
# Add ssl certificates. Expects Ubuntu 20.04 LTS with ca-certificates package installed
|
||||
cp -R /usr/share/ca-certificates "$targetFolder"
|
||||
mkdir -p "$targetFolder/etc/ssl/certs"
|
||||
cp -PR /etc/ssl/certs/* "$targetFolder/etc/ssl/certs"
|
||||
|
||||
sudo chown -R qt:users "$targetPath"
|
||||
|
||||
# Verify that we have last files in tars
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
# Need to add all testserver names statically
|
||||
# as current Docker uses Multicast DNS (mDNS) (avahi)
|
||||
# Which does not work with QNX qemu
|
||||
172.31.1.1 apache2 apache2.test-net.qt.local
|
||||
172.31.1.1 squid squid.test-net.qt.local
|
||||
172.31.1.1 vsftpd vsftpd.test-net.qt.local
|
||||
172.31.1.1 ftp-proxy ftp-proxy.test-net.qt.local
|
||||
172.31.1.1 danted danted.test-net.qt.local
|
||||
172.31.1.1 cyrus cyrus.test-net.qt.local
|
||||
172.31.1.1 echo echo.test-net.qt.local
|
||||
172.31.1.1 iptables iptables.test-net.qt.local
|
||||
@@ -0,0 +1,2 @@
|
||||
search test-net.qt.local
|
||||
nameserver 172.31.1.1
|
||||
@@ -15,3 +15,11 @@ var/share/zoneinfo=usr/share/zoneinfo
|
||||
[uid=0 gid=0 dperms=755 type=dir] var/share/fonts
|
||||
var/etc/fontconfig/fonts.conf=etc/fontconfig/fonts.conf
|
||||
var/share/fonts=usr/share/fonts
|
||||
|
||||
var/etc/hosts=local/misc_files/etc/hosts
|
||||
var/etc/resolv.conf=local/misc_files/etc/resolv.conf
|
||||
var/etc/nsswitch.conf=etc/nsswitch.conf
|
||||
|
||||
[uid=0 gid=0 dperms=755 type=dir] var/etc/ssl/certs
|
||||
var/share/ca-certificates=local/misc_files/ca-certificates
|
||||
var/etc/ssl/certs=local/misc_files/etc/ssl/certs
|
||||
|
||||
@@ -18,3 +18,8 @@ rm -rf /data/var/share/fonts/NotoSansCJK*
|
||||
rm -rf /data/var/share/fonts/NotoSansMonoCJK*
|
||||
echo "---> Create fontconfig cache"
|
||||
fc-cache &
|
||||
|
||||
# Add default route so QNX knows where to send
|
||||
# requests for unknown network
|
||||
echo "---> Add default route"
|
||||
route add default 172.31.1.1
|
||||
|
||||
@@ -49,3 +49,8 @@ xbin/fsevmgr=sbin/fsevmgr
|
||||
lib/libfontconfig.so.1=usr/lib/libfontconfig.so.1
|
||||
xbin/fc-cache=bin/fc-cache
|
||||
xbin/fc-match=local/misc_files/fc-match
|
||||
|
||||
# network
|
||||
lib/libssl.so=usr/lib/libssl.so
|
||||
xbin/nslookup=usr/bin/nslookup
|
||||
xbin/curl=usr/bin/curl
|
||||
|
||||
@@ -52,15 +52,16 @@ if (Is64BitWinHost) {
|
||||
# More info and building instructions can be found from http://doc.qt.io/qt-5/opensslsupport.html
|
||||
|
||||
$version = "1.1.1m"
|
||||
$ndk_version = "r22b"
|
||||
$zip = Get-DownloadLocation ("openssl-$version.tar.gz")
|
||||
$prebuilt_zip = Get-DownloadLocation ("openssl-android-master-$version.zip")
|
||||
$sha1 = "39d424c4411e45f1570073d7a71b1830b96007ca"
|
||||
$prebuilt_sha1 = "07fad2a44ffa90261a779782bd64fe2304487945"
|
||||
$prebuilt_zip = Get-DownloadLocation ("prebuilt-openssl-${version}-fixes-ndk_root-windows.zip")
|
||||
$sha1 = "c9638d25b9709eda1ac52591c0993af52d6d1206"
|
||||
$prebuilt_sha1 = "2bf5354b2264ed80e85fea3705ba434a38fe563e"
|
||||
$destination = "C:\Utils\openssl-android-master"
|
||||
$prebuilt_url = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-android-master-$version.zip"
|
||||
$prebuilt_url = "\\ci-files01-hki.intra.qt.io\provisioning\openssl\prebuilt-openssl-${version}-fixes-ndk_root-windows.zip"
|
||||
|
||||
# msys unix style paths
|
||||
$ndkPath = "/c/Utils/Android/android-ndk-r22b"
|
||||
$ndkPath = "/c/Utils/Android/android-ndk-${ndk_version}"
|
||||
$openssl_path = "/c/Utils/openssl-android-master"
|
||||
$cc_path = "$ndkPath/toolchains/llvm/prebuilt/windows-x86_64/bin"
|
||||
if ((Test-Path $prebuilt_url)) {
|
||||
@@ -69,7 +70,8 @@ if ((Test-Path $prebuilt_url)) {
|
||||
Extract-7Zip $prebuilt_zip C:\Utils
|
||||
Remove $prebuilt_zip
|
||||
} else {
|
||||
Download https://www.openssl.org/source/openssl-$version.tar.gz \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-$version.tar.gz $zip
|
||||
# openssl-${version}_fixes-ndk_root.tar.gz package includes fixes from https://github.com/openssl/openssl/pull/17322 and string ANDROID_NDK_HOME is replaced with ANDROID_NDK_ROOT in Configurations/15-android.conf
|
||||
Download \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-${version}_fixes-ndk_root.tar.gz \\ci-files01-hki.intra.qt.io\provisioning\openssl\openssl-${version}_fixes-ndk_root.tar.gz $zip
|
||||
Verify-Checksum $zip $sha1
|
||||
|
||||
Extract-7Zip $zip C:\Utils\tmp
|
||||
|
||||
@@ -1,45 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
#############################################################################
|
||||
##
|
||||
## Copyright (C) 2021 The Qt Company Ltd.
|
||||
## Contact: https://www.qt.io/licensing/
|
||||
##
|
||||
## This file is part of the provisioning scripts of the Qt Toolkit.
|
||||
##
|
||||
## $QT_BEGIN_LICENSE:LGPL$
|
||||
## Commercial License Usage
|
||||
## Licensees holding valid commercial Qt licenses may use this file in
|
||||
## accordance with the commercial license agreement provided with the
|
||||
## Software or, alternatively, in accordance with the terms contained in
|
||||
## a written agreement between you and The Qt Company. For licensing terms
|
||||
## and conditions see https://www.qt.io/terms-conditions. For further
|
||||
## information use the contact form at https://www.qt.io/contact-us.
|
||||
##
|
||||
## GNU Lesser General Public License Usage
|
||||
## Alternatively, this file may be used under the terms of the GNU Lesser
|
||||
## General Public License version 3 as published by the Free Software
|
||||
## Foundation and appearing in the file LICENSE.LGPL3 included in the
|
||||
## packaging of this file. Please review the following information to
|
||||
## ensure the GNU Lesser General Public License version 3 requirements
|
||||
## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
|
||||
##
|
||||
## GNU General Public License Usage
|
||||
## Alternatively, this file may be used under the terms of the GNU
|
||||
## General Public License version 2.0 or (at your option) the GNU General
|
||||
## Public license version 3 or any later version approved by the KDE Free
|
||||
## Qt Foundation. The licenses are as published by the Free Software
|
||||
## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
|
||||
## included in the packaging of this file. Please review the following
|
||||
## information to ensure the GNU General Public License requirements will
|
||||
## be met: https://www.gnu.org/licenses/gpl-2.0.html and
|
||||
## https://www.gnu.org/licenses/gpl-3.0.html.
|
||||
##
|
||||
## $QT_END_LICENSE$
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
set -ex
|
||||
|
||||
# shellcheck source=../common/linux/qnx_700.sh
|
||||
source "${BASH_SOURCE%/*}/../common/linux/qnx_710.sh"
|
||||
@@ -1,45 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
#############################################################################
|
||||
##
|
||||
## Copyright (C) 2021 The Qt Company Ltd.
|
||||
## Contact: https://www.qt.io/licensing/
|
||||
##
|
||||
## This file is part of the provisioning scripts of the Qt Toolkit.
|
||||
##
|
||||
## $QT_BEGIN_LICENSE:LGPL$
|
||||
## Commercial License Usage
|
||||
## Licensees holding valid commercial Qt licenses may use this file in
|
||||
## accordance with the commercial license agreement provided with the
|
||||
## Software or, alternatively, in accordance with the terms contained in
|
||||
## a written agreement between you and The Qt Company. For licensing terms
|
||||
## and conditions see https://www.qt.io/terms-conditions. For further
|
||||
## information use the contact form at https://www.qt.io/contact-us.
|
||||
##
|
||||
## GNU Lesser General Public License Usage
|
||||
## Alternatively, this file may be used under the terms of the GNU Lesser
|
||||
## General Public License version 3 as published by the Free Software
|
||||
## Foundation and appearing in the file LICENSE.LGPL3 included in the
|
||||
## packaging of this file. Please review the following information to
|
||||
## ensure the GNU Lesser General Public License version 3 requirements
|
||||
## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
|
||||
##
|
||||
## GNU General Public License Usage
|
||||
## Alternatively, this file may be used under the terms of the GNU
|
||||
## General Public License version 2.0 or (at your option) the GNU General
|
||||
## Public license version 3 or any later version approved by the KDE Free
|
||||
## Qt Foundation. The licenses are as published by the Free Software
|
||||
## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
|
||||
## included in the packaging of this file. Please review the following
|
||||
## information to ensure the GNU General Public License requirements will
|
||||
## be met: https://www.gnu.org/licenses/gpl-2.0.html and
|
||||
## https://www.gnu.org/licenses/gpl-3.0.html.
|
||||
##
|
||||
## $QT_END_LICENSE$
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
set -ex
|
||||
|
||||
# shellcheck source=../common/linux/qnx_700.sh
|
||||
source "${BASH_SOURCE%/*}/../common/linux/qnx_710.sh"
|
||||
@@ -1,45 +0,0 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
#############################################################################
|
||||
##
|
||||
## Copyright (C) 2021 The Qt Company Ltd.
|
||||
## Contact: https://www.qt.io/licensing/
|
||||
##
|
||||
## This file is part of the provisioning scripts of the Qt Toolkit.
|
||||
##
|
||||
## $QT_BEGIN_LICENSE:LGPL$
|
||||
## Commercial License Usage
|
||||
## Licensees holding valid commercial Qt licenses may use this file in
|
||||
## accordance with the commercial license agreement provided with the
|
||||
## Software or, alternatively, in accordance with the terms contained in
|
||||
## a written agreement between you and The Qt Company. For licensing terms
|
||||
## and conditions see https://www.qt.io/terms-conditions. For further
|
||||
## information use the contact form at https://www.qt.io/contact-us.
|
||||
##
|
||||
## GNU Lesser General Public License Usage
|
||||
## Alternatively, this file may be used under the terms of the GNU Lesser
|
||||
## General Public License version 3 as published by the Free Software
|
||||
## Foundation and appearing in the file LICENSE.LGPL3 included in the
|
||||
## packaging of this file. Please review the following information to
|
||||
## ensure the GNU Lesser General Public License version 3 requirements
|
||||
## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
|
||||
##
|
||||
## GNU General Public License Usage
|
||||
## Alternatively, this file may be used under the terms of the GNU
|
||||
## General Public License version 2.0 or (at your option) the GNU General
|
||||
## Public license version 3 or any later version approved by the KDE Free
|
||||
## Qt Foundation. The licenses are as published by the Free Software
|
||||
## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
|
||||
## included in the packaging of this file. Please review the following
|
||||
## information to ensure the GNU General Public License requirements will
|
||||
## be met: https://www.gnu.org/licenses/gpl-2.0.html and
|
||||
## https://www.gnu.org/licenses/gpl-3.0.html.
|
||||
##
|
||||
## $QT_END_LICENSE$
|
||||
##
|
||||
#############################################################################
|
||||
|
||||
set -ex
|
||||
|
||||
# shellcheck source=../common/linux/qnx_700.sh
|
||||
source "${BASH_SOURCE%/*}/../common/linux/qnx_710.sh"
|
||||
@@ -1,6 +1,6 @@
|
||||
#############################################################################
|
||||
##
|
||||
## Copyright (C) 2020 The Qt Company Ltd.
|
||||
## Copyright (C) 2022 The Qt Company Ltd.
|
||||
## Contact: https://www.qt.io/licensing/
|
||||
##
|
||||
## This file is part of the provisioning scripts of the Qt Toolkit.
|
||||
2
qt3d
2
qt3d
Submodule qt3d updated: b62e621c1a...80ef7cf797
Submodule qt5compat updated: ab1de0f793...6c7ea55add
Submodule qtactiveqt updated: 50954fc7a1...f442f0a9a0
2
qtbase
2
qtbase
Submodule qtbase updated: 1d186e9a9a...9554d315aa
2
qtcharts
2
qtcharts
Submodule qtcharts updated: bac82b3ef4...479851a3f4
2
qtcoap
2
qtcoap
Submodule qtcoap updated: 0ee7b34303...25a1c973e6
Submodule qtconnectivity updated: 07488fbc98...d7fd6b3922
Submodule qtdatavis3d updated: ea397bfcbb...5f25eafc1a
Submodule qtdeclarative updated: 48216ce496...2a45651292
2
qtdoc
2
qtdoc
Submodule qtdoc updated: 5e91b14031...47496430db
Submodule qtimageformats updated: 92a6d172e2...d759f8e42c
Submodule qtlanguageserver updated: afcad3abd6...4f99a9caa5
2
qtlottie
2
qtlottie
Submodule qtlottie updated: 1a1c100897...7913fec615
2
qtmqtt
2
qtmqtt
Submodule qtmqtt updated: cb8248ff4a...6980d4e038
Submodule qtmultimedia updated: 7bea65d156...9f7be3950f
Submodule qtnetworkauth updated: 5898069066...f6d0c112a2
2
qtopcua
2
qtopcua
Submodule qtopcua updated: b30250e106...b0b3ef3298
Submodule qtpositioning updated: d9c80dd230...7f616e1aa2
2
qtqa
2
qtqa
Submodule qtqa updated: 4156ce8b3c...e6ce035337
Submodule qtquick3d updated: 2a0179d107...c8174e0ac7
Submodule qtquicktimeline updated: 1a14695f3c...fb678d1d73
Submodule qtremoteobjects updated: 6291df21e3...a4a1673eff
Submodule qtrepotools updated: 08ca994471...e3205793dc
2
qtscxml
2
qtscxml
Submodule qtscxml updated: 2b76f34c81...e2402cd6b8
Submodule qtsensors updated: c5c8583f8d...869d0803ae
Submodule qtserialbus updated: 6671976b3c...e70e26805d
Submodule qtserialport updated: 3fae16569f...da602a3e43
Submodule qtshadertools updated: 9eef03f9e6...7cd8cb7da4
2
qtsvg
2
qtsvg
Submodule qtsvg updated: 893c975c4c...8c0a12af45
2
qttools
2
qttools
Submodule qttools updated: 0e2541a623...ca3066f3ed
Submodule qttranslations updated: c0f83e36b3...a3b78a1e69
Submodule qtvirtualkeyboard updated: 48e0cc3bc1...4d2409cf24
Submodule qtwayland updated: f8aec2a113...b66112068c
Submodule qtwebchannel updated: b522e246ab...00b8395603
Submodule qtwebengine updated: 724032b835...662a09e725
Submodule qtwebsockets updated: 61314c528c...d705763398
Submodule qtwebview updated: 62f213679d...c247c025fd
Reference in New Issue
Block a user