mirror of
git://code.qt.io/qt/qt5.git
synced 2025-12-21 23:48:23 +08:00
Compare commits
11 Commits
wip/cmake
...
v5.15.0-rc
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d20eaafc5c | ||
|
|
d913a868d4 | ||
|
|
db44923e30 | ||
|
|
8f653ce4f8 | ||
|
|
71043ca243 | ||
|
|
e2d2d25a57 | ||
|
|
d937578404 | ||
|
|
d88858d98b | ||
|
|
3050559262 | ||
|
|
767711b44a | ||
|
|
f008144b88 |
84
.gitmodules
vendored
84
.gitmodules
vendored
@@ -1,60 +1,60 @@
|
||||
[submodule "qtbase"]
|
||||
path = qtbase
|
||||
url = ../qtbase.git
|
||||
branch = 5.15
|
||||
branch = 5.15.0
|
||||
status = essential
|
||||
[submodule "qtsvg"]
|
||||
depends = qtbase
|
||||
path = qtsvg
|
||||
url = ../qtsvg.git
|
||||
branch = 5.15
|
||||
branch = 5.15.0
|
||||
status = addon
|
||||
[submodule "qtdeclarative"]
|
||||
depends = qtbase
|
||||
recommends = qtsvg
|
||||
path = qtdeclarative
|
||||
url = ../qtdeclarative.git
|
||||
branch = 5.15
|
||||
branch = 5.15.0
|
||||
status = essential
|
||||
[submodule "qtactiveqt"]
|
||||
depends = qtbase
|
||||
path = qtactiveqt
|
||||
url = ../qtactiveqt.git
|
||||
branch = 5.15
|
||||
branch = 5.15.0
|
||||
status = addon
|
||||
[submodule "qtscript"]
|
||||
depends = qtbase
|
||||
recommends = qttools
|
||||
path = qtscript
|
||||
url = ../qtscript.git
|
||||
branch = 5.15
|
||||
branch = 5.15.0
|
||||
status = deprecated
|
||||
[submodule "qtmultimedia"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtmultimedia
|
||||
url = ../qtmultimedia.git
|
||||
branch = 5.15
|
||||
branch = 5.15.0
|
||||
status = essential
|
||||
[submodule "qttools"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtactiveqt
|
||||
path = qttools
|
||||
url = ../qttools.git
|
||||
branch = 5.15
|
||||
branch = 5.15.0
|
||||
status = essential
|
||||
[submodule "qtxmlpatterns"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtxmlpatterns
|
||||
url = ../qtxmlpatterns.git
|
||||
branch = 5.15
|
||||
branch = 5.15.0
|
||||
status = deprecated
|
||||
[submodule "qttranslations"]
|
||||
depends = qttools
|
||||
path = qttranslations
|
||||
url = ../qttranslations.git
|
||||
branch = 5.15
|
||||
branch = 5.15.0
|
||||
status = essential
|
||||
priority = 30
|
||||
[submodule "qtdoc"]
|
||||
@@ -62,7 +62,7 @@
|
||||
recommends = qtmultimedia qtquickcontrols qtquickcontrols2
|
||||
path = qtdoc
|
||||
url = ../qtdoc.git
|
||||
branch = 5.15
|
||||
branch = 5.15.0
|
||||
status = essential
|
||||
priority = 40
|
||||
[submodule "qtrepotools"]
|
||||
@@ -83,14 +83,14 @@
|
||||
recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
|
||||
path = qtlocation
|
||||
url = ../qtlocation.git
|
||||
branch = 5.15
|
||||
branch = 5.15.0
|
||||
status = addon
|
||||
[submodule "qtsensors"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtsensors
|
||||
url = ../qtsensors.git
|
||||
branch = 5.15
|
||||
branch = 5.15.0
|
||||
status = addon
|
||||
[submodule "qtsystems"]
|
||||
depends = qtbase
|
||||
@@ -123,99 +123,99 @@
|
||||
recommends = qtdeclarative qtandroidextras
|
||||
path = qtconnectivity
|
||||
url = ../qtconnectivity.git
|
||||
branch = 5.15
|
||||
branch = 5.15.0
|
||||
status = addon
|
||||
[submodule "qtwayland"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwayland
|
||||
url = ../qtwayland.git
|
||||
branch = 5.15
|
||||
branch = 5.15.0
|
||||
status = addon
|
||||
[submodule "qt3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtimageformats qtgamepad
|
||||
path = qt3d
|
||||
url = ../qt3d.git
|
||||
branch = 5.15
|
||||
branch = 5.15.0
|
||||
status = addon
|
||||
[submodule "qtimageformats"]
|
||||
depends = qtbase
|
||||
path = qtimageformats
|
||||
url = ../qtimageformats.git
|
||||
branch = 5.15
|
||||
branch = 5.15.0
|
||||
status = addon
|
||||
[submodule "qtgraphicaleffects"]
|
||||
depends = qtdeclarative
|
||||
path = qtgraphicaleffects
|
||||
url = ../qtgraphicaleffects.git
|
||||
branch = 5.15
|
||||
branch = 5.15.0
|
||||
status = essential
|
||||
[submodule "qtquickcontrols"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtgraphicaleffects
|
||||
path = qtquickcontrols
|
||||
url = ../qtquickcontrols.git
|
||||
branch = 5.15
|
||||
branch = 5.15.0
|
||||
status = addon
|
||||
[submodule "qtserialbus"]
|
||||
depends = qtbase
|
||||
recommends = qtserialport
|
||||
path = qtserialbus
|
||||
url = ../qtserialbus.git
|
||||
branch = 5.15
|
||||
branch = 5.15.0
|
||||
status = addon
|
||||
[submodule "qtserialport"]
|
||||
depends = qtbase
|
||||
path = qtserialport
|
||||
url = ../qtserialport.git
|
||||
branch = 5.15
|
||||
branch = 5.15.0
|
||||
status = addon
|
||||
[submodule "qtx11extras"]
|
||||
depends = qtbase
|
||||
path = qtx11extras
|
||||
url = ../qtx11extras.git
|
||||
branch = 5.15
|
||||
branch = 5.15.0
|
||||
status = addon
|
||||
[submodule "qtmacextras"]
|
||||
depends = qtbase
|
||||
path = qtmacextras
|
||||
url = ../qtmacextras.git
|
||||
branch = 5.15
|
||||
branch = 5.15.0
|
||||
status = addon
|
||||
[submodule "qtwinextras"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtwinextras
|
||||
url = ../qtwinextras.git
|
||||
branch = 5.15
|
||||
branch = 5.15.0
|
||||
status = addon
|
||||
[submodule "qtandroidextras"]
|
||||
depends = qtbase
|
||||
path = qtandroidextras
|
||||
url = ../qtandroidextras.git
|
||||
branch = 5.15
|
||||
branch = 5.15.0
|
||||
status = addon
|
||||
[submodule "qtwebsockets"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwebsockets
|
||||
url = ../qtwebsockets.git
|
||||
branch = 5.15
|
||||
branch = 5.15.0
|
||||
status = addon
|
||||
[submodule "qtwebchannel"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtwebsockets
|
||||
path = qtwebchannel
|
||||
url = ../qtwebchannel.git
|
||||
branch = 5.15
|
||||
branch = 5.15.0
|
||||
status = addon
|
||||
[submodule "qtwebengine"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools
|
||||
path = qtwebengine
|
||||
url = ../qtwebengine.git
|
||||
branch = 5.15
|
||||
branch = 5.15.0
|
||||
status = addon
|
||||
priority = 10
|
||||
[submodule "qtcanvas3d"]
|
||||
@@ -229,98 +229,98 @@
|
||||
recommends = qtwebengine
|
||||
path = qtwebview
|
||||
url = ../qtwebview.git
|
||||
branch = 5.15
|
||||
branch = 5.15.0
|
||||
status = addon
|
||||
[submodule "qtquickcontrols2"]
|
||||
depends = qtgraphicaleffects
|
||||
recommends = qtimageformats
|
||||
path = qtquickcontrols2
|
||||
url = ../qtquickcontrols2.git
|
||||
branch = 5.15
|
||||
branch = 5.15.0
|
||||
status = essential
|
||||
[submodule "qtpurchasing"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtandroidextras
|
||||
path = qtpurchasing
|
||||
url = ../qtpurchasing.git
|
||||
branch = 5.15
|
||||
branch = 5.15.0
|
||||
status = addon
|
||||
[submodule "qtcharts"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtcharts
|
||||
url = ../qtcharts.git
|
||||
branch = 5.15
|
||||
branch = 5.15.0
|
||||
status = addon
|
||||
[submodule "qtdatavis3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtdatavis3d
|
||||
url = ../qtdatavis3d.git
|
||||
branch = 5.15
|
||||
branch = 5.15.0
|
||||
status = addon
|
||||
[submodule "qtvirtualkeyboard"]
|
||||
depends = qtbase qtdeclarative qtsvg
|
||||
recommends = qtmultimedia qtquickcontrols
|
||||
path = qtvirtualkeyboard
|
||||
url = ../qtvirtualkeyboard.git
|
||||
branch = 5.15
|
||||
branch = 5.15.0
|
||||
status = addon
|
||||
[submodule "qtgamepad"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtgamepad
|
||||
url = ../qtgamepad.git
|
||||
branch = 5.15
|
||||
branch = 5.15.0
|
||||
status = addon
|
||||
[submodule "qtscxml"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtscxml
|
||||
url = ../qtscxml.git
|
||||
branch = 5.15
|
||||
branch = 5.15.0
|
||||
status = addon
|
||||
[submodule "qtspeech"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtspeech
|
||||
url = ../qtspeech.git
|
||||
branch = 5.15
|
||||
branch = 5.15.0
|
||||
status = addon
|
||||
[submodule "qtnetworkauth"]
|
||||
depends = qtbase
|
||||
path = qtnetworkauth
|
||||
url = ../qtnetworkauth.git
|
||||
branch = 5.15
|
||||
branch = 5.15.0
|
||||
status = addon
|
||||
[submodule "qtremoteobjects"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtremoteobjects
|
||||
url = ../qtremoteobjects.git
|
||||
branch = 5.15
|
||||
branch = 5.15.0
|
||||
status = addon
|
||||
[submodule "qtwebglplugin"]
|
||||
depends = qtbase qtwebsockets
|
||||
recommends = qtdeclarative
|
||||
path = qtwebglplugin
|
||||
url = ../qtwebglplugin.git
|
||||
branch = 5.15
|
||||
branch = 5.15.0
|
||||
status = addon
|
||||
[submodule "qtlottie"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtlottie
|
||||
url = ../qtlottie.git
|
||||
branch = 5.15
|
||||
branch = 5.15.0
|
||||
status = addon
|
||||
[submodule "qtquicktimeline"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtquicktimeline
|
||||
url = ../qtquicktimeline
|
||||
branch = 5.15
|
||||
branch = 5.15.0
|
||||
status = addon
|
||||
[submodule "qtquick3d"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtquick3d
|
||||
url = ../qtquick3d.git
|
||||
branch = 5.15
|
||||
branch = 5.15.0
|
||||
status = addon
|
||||
|
||||
@@ -41,8 +41,8 @@ set -ex
|
||||
source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh"
|
||||
|
||||
targetFolder="/opt/"
|
||||
sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx700-20190325-linux.tar.xz"
|
||||
sha1="a278234bf38cc70ead98fc0a8d2e63070fb69621"
|
||||
sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/qnx700-20190325-2-linux.tar.xz"
|
||||
sha1="9fb115b2c84b8e7b6016a51cc421a763bda298a1"
|
||||
folderName="qnx700"
|
||||
targetFile="qnx700.tar.xz"
|
||||
wget --tries=5 --waitretry=5 --progress=dot:giga --output-document="$targetFile" "$sourceFile"
|
||||
|
||||
@@ -66,6 +66,9 @@ cmd /c "$msys `"-l`" `"-c`" `"rm -rf /etc/pacman.d/gnupg;pacman-key --init;pacma
|
||||
Start-Sleep -s 30
|
||||
cmd /c "$msys `"-l`" `"-c`" `"cpan -i Text::Template Test::More`""
|
||||
|
||||
# Sometimes gpg-agent won't get killed after the installation process. If that happens the provisioning will won't continue and it will hang until timeout. So we need make sure it will be killed.
|
||||
# Let's sleep for awhile and wait that msys installation is finished. Otherwise the installation might start up gpg-agent or dirmngr after the script has passed the killing process.
|
||||
Start-Sleep -s 180
|
||||
if (Get-Process -Name "gpg-agent" -ErrorAction SilentlyContinue) { Stop-Process -Force -Name gpg-agent }
|
||||
if (Get-Process -Name "dirmngr" -ErrorAction SilentlyContinue) { Stop-Process -Force -Name dirmngr }
|
||||
|
||||
|
||||
@@ -36,7 +36,7 @@
|
||||
# This script installs QNX 7.
|
||||
|
||||
targetFolder="/opt/"
|
||||
sourceFile="/net/ci-files01-hki.intra.qt.io/hdd/www/input/qnx/qnx700-20190325-macos.tar.xz"
|
||||
sourceFile="/net/ci-files01-hki.intra.qt.io/hdd/www/input/qnx/qnx700-20190325-2-macos.tar.xz"
|
||||
folderName="qnx700"
|
||||
|
||||
sudo mkdir -p "$targetFolder"
|
||||
|
||||
@@ -36,13 +36,13 @@
|
||||
# This script installs QNX 7.
|
||||
|
||||
targetFolder="/opt/"
|
||||
sourceFile="/net/ci-files01-hki.intra.qt.io/hdd/www/input/qnx/qnx700_mac.zip"
|
||||
sourceFile="/net/ci-files01-hki.intra.qt.io/hdd/www/input/qnx/qnx700-20190325-2-macos.tar.xz"
|
||||
folderName="qnx700"
|
||||
|
||||
sudo mkdir -p "$targetFolder"
|
||||
|
||||
echo "Extracting QNX 7"
|
||||
sudo unzip -q "$sourceFile" -d "$targetFolder"
|
||||
sudo tar -C "$targetFolder" -Jxf $sourceFile
|
||||
|
||||
sudo chown -R qt:wheel "$targetFolder"/"$folderName"
|
||||
|
||||
|
||||
@@ -36,10 +36,10 @@
|
||||
# This script installs QNX SDP 7.0
|
||||
|
||||
$zip = Get-DownloadLocation "qnx700.7z"
|
||||
$url = "http://ci-files01-hki.intra.qt.io/input/qnx/qnx700-20190325-windows.7z"
|
||||
$url = "http://ci-files01-hki.intra.qt.io/input/qnx/qnx700-20190325-2-windows.7z"
|
||||
|
||||
Download $url $url $zip
|
||||
Verify-Checksum $zip "59c681466ff78f64b98b16a95b0b44650a729dfd"
|
||||
Verify-Checksum $zip "1f10e9660efc81b18cb897871ba2b0384cf0fc6d"
|
||||
Extract-7Zip $zip C:\
|
||||
|
||||
Set-EnvironmentVariable "QNX_700" "C:\QNX700"
|
||||
|
||||
2
qt3d
2
qt3d
Submodule qt3d updated: 37735f11f9...5e16aa067a
Submodule qtactiveqt updated: a0ddb6ace7...0aa2b1ac1d
Submodule qtandroidextras updated: aa346dcc8d...455cddd68f
2
qtbase
2
qtbase
Submodule qtbase updated: 89dc1a1865...a8b373d678
2
qtcharts
2
qtcharts
Submodule qtcharts updated: 7cdded63b5...785a8d7118
Submodule qtconnectivity updated: 35fe7d452d...eb908370e0
Submodule qtdatavis3d updated: 24c043fbff...d15ace0300
Submodule qtdeclarative updated: 7c9a54907f...829da62396
2
qtdoc
2
qtdoc
Submodule qtdoc updated: 1c7c696190...c09aafd635
Submodule qtgamepad updated: 996ccf5bba...b036b58721
Submodule qtgraphicaleffects updated: 7665821bc4...18f17fed89
Submodule qtimageformats updated: 26c548096b...b26e5fbf4c
Submodule qtlocation updated: 36070d457c...b2d0a90961
2
qtlottie
2
qtlottie
Submodule qtlottie updated: f5cc3184f3...eeac38075b
Submodule qtmacextras updated: 66a5de12b6...52e2485ef1
Submodule qtmultimedia updated: f3c9161147...83f0038fa7
Submodule qtnetworkauth updated: 5f9fbc2a6e...8e6e45b990
Submodule qtpurchasing updated: c9a2a6dcb8...231e7e55e9
2
qtqa
2
qtqa
Submodule qtqa updated: ff87df77b1...62e2b16e17
Submodule qtquick3d updated: b9f82c503a...c9073f11ba
Submodule qtquickcontrols updated: 44c239aa1b...c9b0270985
Submodule qtquickcontrols2 updated: 7d4f8365c1...e2768b6d05
Submodule qtquicktimeline updated: 05c2a52042...e40206c703
Submodule qtremoteobjects updated: 0b98fb2b3f...f68928c439
Submodule qtrepotools updated: 8f06a5036a...062a16545b
2
qtscript
2
qtscript
Submodule qtscript updated: a5c819cef6...ebd4605c71
2
qtscxml
2
qtscxml
Submodule qtscxml updated: db8b84e117...e72ad1f088
Submodule qtsensors updated: 5acdc122a4...b084dc36e3
Submodule qtserialbus updated: 1d5fa84ed9...b12bc31046
Submodule qtserialport updated: c24fd46221...1c736fefa6
2
qtspeech
2
qtspeech
Submodule qtspeech updated: 387f4b6b37...d9dbe04ce4
2
qtsvg
2
qtsvg
Submodule qtsvg updated: a26b32e157...e12485f69e
2
qttools
2
qttools
Submodule qttools updated: dccea132cb...94e861104a
Submodule qtvirtualkeyboard updated: 70105b9b43...4286d32688
Submodule qtwayland updated: 28e7d940c4...efc94a4852
Submodule qtwebchannel updated: e38d01e785...bb144ebca2
Submodule qtwebengine updated: 75412200db...387fb9377d
Submodule qtwebglplugin updated: 219abce4c8...f1327aa34c
Submodule qtwebsockets updated: 593466b4b9...6efa2ea5fd
Submodule qtwebview updated: a15f2b83c4...d2e2dbeaf6
Submodule qtwinextras updated: acb8cbb19c...41f8d34efd
Submodule qtx11extras updated: e05196b464...306a2b20a8
Submodule qtxmlpatterns updated: 84b9bd01cb...af8b0cfdc8
Reference in New Issue
Block a user