mirror of
git://code.qt.io/qt/qt5.git
synced 2026-08-01 19:20:46 +08:00
Compare commits
44 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| e01ec6d6f5 | |||
| 5f01869f16 | |||
| 704ef6207d | |||
| eaf196219b | |||
| f8ab18df91 | |||
| 9d78f3bd2b | |||
| f908a069d9 | |||
| 75192dee07 | |||
| cfa998544d | |||
| 4a0e64744f | |||
| a9633efe67 | |||
| 7286bd9f7a | |||
| 2dc0539847 | |||
| 3ae7991090 | |||
| cac62e47fe | |||
| a626d59af1 | |||
| 1def8bb62c | |||
| af7cf0fc3f | |||
| c48c756bb9 | |||
| 14174482be | |||
| 4282752c19 | |||
| e4f9ac5607 | |||
| 7c1c98e123 | |||
| 4b6c05815a | |||
| b3da333101 | |||
| 56ad797f42 | |||
| b5c9819be2 | |||
| f9183e71bf | |||
| b3f160bc39 | |||
| ebc02c3265 | |||
| d148d7b0f7 | |||
| 8287111e7b | |||
| db4e91ce90 | |||
| d406ff6398 | |||
| 37244913d3 | |||
| 41fa18a06b | |||
| 1430513438 | |||
| 37e43d23fc | |||
| 4f903d0139 | |||
| 2d577a83ec | |||
| 52068b49e8 | |||
| f76c553d75 | |||
| 97afb2ce08 | |||
| 8f87412708 |
+42
-42
@@ -1,60 +1,60 @@
|
||||
[submodule "qtbase"]
|
||||
path = qtbase
|
||||
url = ../qtbase.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = essential
|
||||
[submodule "qtsvg"]
|
||||
depends = qtbase
|
||||
path = qtsvg
|
||||
url = ../qtsvg.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtdeclarative"]
|
||||
depends = qtbase
|
||||
recommends = qtsvg
|
||||
path = qtdeclarative
|
||||
url = ../qtdeclarative.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = essential
|
||||
[submodule "qtactiveqt"]
|
||||
depends = qtbase
|
||||
path = qtactiveqt
|
||||
url = ../qtactiveqt.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtscript"]
|
||||
depends = qtbase
|
||||
recommends = qttools
|
||||
path = qtscript
|
||||
url = ../qtscript.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = deprecated
|
||||
[submodule "qtmultimedia"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtmultimedia
|
||||
url = ../qtmultimedia.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = essential
|
||||
[submodule "qttools"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtactiveqt
|
||||
path = qttools
|
||||
url = ../qttools.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = essential
|
||||
[submodule "qtxmlpatterns"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtxmlpatterns
|
||||
url = ../qtxmlpatterns.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = deprecated
|
||||
[submodule "qttranslations"]
|
||||
depends = qttools
|
||||
path = qttranslations
|
||||
url = ../qttranslations.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = essential
|
||||
priority = 30
|
||||
[submodule "qtdoc"]
|
||||
@@ -62,7 +62,7 @@
|
||||
recommends = qtmultimedia qtquickcontrols qtquickcontrols2
|
||||
path = qtdoc
|
||||
url = ../qtdoc.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = essential
|
||||
priority = 40
|
||||
[submodule "qtrepotools"]
|
||||
@@ -83,14 +83,14 @@
|
||||
recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
|
||||
path = qtlocation
|
||||
url = ../qtlocation.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtsensors"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtsensors
|
||||
url = ../qtsensors.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtsystems"]
|
||||
depends = qtbase
|
||||
@@ -123,99 +123,99 @@
|
||||
recommends = qtdeclarative qtandroidextras
|
||||
path = qtconnectivity
|
||||
url = ../qtconnectivity.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtwayland"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwayland
|
||||
url = ../qtwayland.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qt3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtimageformats qtgamepad
|
||||
path = qt3d
|
||||
url = ../qt3d.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtimageformats"]
|
||||
depends = qtbase
|
||||
path = qtimageformats
|
||||
url = ../qtimageformats.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtgraphicaleffects"]
|
||||
depends = qtdeclarative
|
||||
path = qtgraphicaleffects
|
||||
url = ../qtgraphicaleffects.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtquickcontrols"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtgraphicaleffects
|
||||
path = qtquickcontrols
|
||||
url = ../qtquickcontrols.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtserialbus"]
|
||||
depends = qtbase
|
||||
recommends = qtserialport
|
||||
path = qtserialbus
|
||||
url = ../qtserialbus.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtserialport"]
|
||||
depends = qtbase
|
||||
path = qtserialport
|
||||
url = ../qtserialport.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtx11extras"]
|
||||
depends = qtbase
|
||||
path = qtx11extras
|
||||
url = ../qtx11extras.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtmacextras"]
|
||||
depends = qtbase
|
||||
path = qtmacextras
|
||||
url = ../qtmacextras.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtwinextras"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtwinextras
|
||||
url = ../qtwinextras.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtandroidextras"]
|
||||
depends = qtbase
|
||||
path = qtandroidextras
|
||||
url = ../qtandroidextras.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtwebsockets"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwebsockets
|
||||
url = ../qtwebsockets.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtwebchannel"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtwebsockets
|
||||
path = qtwebchannel
|
||||
url = ../qtwebchannel.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtwebengine"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools
|
||||
path = qtwebengine
|
||||
url = ../qtwebengine.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = addon
|
||||
priority = 10
|
||||
[submodule "qtcanvas3d"]
|
||||
@@ -229,98 +229,98 @@
|
||||
recommends = qtwebengine
|
||||
path = qtwebview
|
||||
url = ../qtwebview.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtquickcontrols2"]
|
||||
depends = qtgraphicaleffects
|
||||
recommends = qtimageformats
|
||||
path = qtquickcontrols2
|
||||
url = ../qtquickcontrols2.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = essential
|
||||
[submodule "qtpurchasing"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtandroidextras
|
||||
path = qtpurchasing
|
||||
url = ../qtpurchasing.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtcharts"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtcharts
|
||||
url = ../qtcharts.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtdatavis3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtdatavis3d
|
||||
url = ../qtdatavis3d.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtvirtualkeyboard"]
|
||||
depends = qtbase qtdeclarative qtsvg
|
||||
recommends = qtmultimedia qtquickcontrols
|
||||
path = qtvirtualkeyboard
|
||||
url = ../qtvirtualkeyboard.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtgamepad"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtgamepad
|
||||
url = ../qtgamepad.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtscxml"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtscxml
|
||||
url = ../qtscxml.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtspeech"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtspeech
|
||||
url = ../qtspeech.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtnetworkauth"]
|
||||
depends = qtbase
|
||||
path = qtnetworkauth
|
||||
url = ../qtnetworkauth.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtremoteobjects"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtremoteobjects
|
||||
url = ../qtremoteobjects.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtwebglplugin"]
|
||||
depends = qtbase qtwebsockets
|
||||
recommends = qtdeclarative
|
||||
path = qtwebglplugin
|
||||
url = ../qtwebglplugin.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = addon
|
||||
[submodule "qtlottie"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtlottie
|
||||
url = ../qtlottie.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = preview
|
||||
[submodule "qtquicktimeline"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtquicktimeline
|
||||
url = ../qtquicktimeline
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = preview
|
||||
[submodule "qtquick3d"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtquick3d
|
||||
url = ../qtquick3d.git
|
||||
branch = 5.14
|
||||
branch = 5.15
|
||||
status = preview
|
||||
|
||||
@@ -58,7 +58,7 @@ Configurations:
|
||||
-
|
||||
Template: 'qtci-linux-Ubuntu-18.04-x86_64'
|
||||
Compiler: 'GCC'
|
||||
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -force-debug-info -nomake tests -no-widgets -nomake examples -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib'
|
||||
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -force-debug-info -nomake tests -no-widgets -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib'
|
||||
-
|
||||
Template: 'qtci-linux-Ubuntu-18.04-x86_64'
|
||||
Compiler: 'GCC'
|
||||
@@ -89,7 +89,7 @@ Configurations:
|
||||
Template: 'qtci-linux-RHEL-7.6-x86_64'
|
||||
Compiler: 'GCC'
|
||||
Features: ['Packaging']
|
||||
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -separate-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s'
|
||||
Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -separate-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -xcb -bundled-xcb-xinput -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s'
|
||||
-
|
||||
Template: 'qtci-macos-10.13-x86_64-2'
|
||||
Compiler: 'Clang'
|
||||
@@ -112,20 +112,6 @@ Configurations:
|
||||
Compiler: 'Clang'
|
||||
Features: ['Packaging', 'DisableTests']
|
||||
Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -no-icu -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -static -xplatform macx-ios-clang'
|
||||
-
|
||||
Template: 'qtci-macos-10.14-x86_64'
|
||||
Target os: 'TvOS_ANY'
|
||||
Target arch: 'multi'
|
||||
Compiler: 'Clang'
|
||||
Features: ['DisableTests']
|
||||
Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -xplatform macx-tvos-clang'
|
||||
-
|
||||
Template: 'qtci-macos-10.14-x86_64'
|
||||
Target os: 'WatchOS_ANY'
|
||||
Target arch: 'multi'
|
||||
Compiler: 'Clang'
|
||||
Features: ['DisableTests']
|
||||
Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -xplatform macx-watchos-clang'
|
||||
-
|
||||
Template: 'qtci-linux-RHEL-7.6-x86_64'
|
||||
Target os: 'Android_ANY'
|
||||
|
||||
@@ -51,18 +51,20 @@ sha1tree () {
|
||||
sort | ${SHASUM-sha1sum} | cut -d ' ' -f 1
|
||||
}
|
||||
|
||||
# Using SHA-1 of each server context as the tag of docker images. A tag labels a
|
||||
# specific image version. It is used by docker compose file (docker-compose.yml)
|
||||
# to launch the corresponding docker containers. If one of the server contexts
|
||||
# (./apache2, ./danted, ...) gets changes, all the related compose files in
|
||||
# qtbase should be updated as well.
|
||||
# A tag labels a specific image version. In the docker compose file
|
||||
# (docker-compose.yml) that launches the containers, the tag used is
|
||||
# "latest". Here the images are also tagged with the SHA1 of each server
|
||||
# context, so if needed we can modify docker-compose.yml to launch a very
|
||||
# specific image, thus providing a way to stage backwards-incompatible changes
|
||||
# across repositories.
|
||||
|
||||
source "$SERVER_PATH/settings.sh"
|
||||
|
||||
for server in $testserver
|
||||
do
|
||||
context="$SERVER_PATH/$server"
|
||||
docker build -t qt-test-server-$server:$(sha1tree $context) $context
|
||||
tag=$(sha1tree $context)
|
||||
docker build -t qt-test-server-$server:$tag -t qt-test-server-$server:latest $context
|
||||
done
|
||||
|
||||
docker images
|
||||
|
||||
@@ -169,6 +169,8 @@ installPackages+=(git-lfs)
|
||||
installPackages+=(chrpath)
|
||||
installPackages+=(gawk)
|
||||
installPackages+=(texinfo)
|
||||
# Needed for Poppler test in QtWebEngine
|
||||
installPackages+=(libpoppler-cpp-dev)
|
||||
|
||||
echo "Running update for apt"
|
||||
waitLoop
|
||||
|
||||
+1
-1
Submodule qt3d updated: 31d3ebed75...772d8d3dc7
+1
-1
Submodule qtactiveqt updated: 3b07b8b2f3...34d89d9b72
+1
-1
Submodule qtandroidextras updated: 57aacdd654...f4d122b291
+1
-1
Submodule qtbase updated: 84892e5e69...c08b0cec2f
+1
-1
Submodule qtcharts updated: 57b67d631d...f63d2a7b46
+1
-1
Submodule qtconnectivity updated: 355f09eccc...635ad60e8e
+1
-1
Submodule qtdatavis3d updated: 5587117016...2dd285bc28
+1
-1
Submodule qtdeclarative updated: 9248166095...8e822e981d
+1
-1
Submodule qtdoc updated: 1e27737f9e...f6d4d98486
+1
-1
Submodule qtgamepad updated: 2ddcdff921...3c91ce46a6
+1
-1
Submodule qtgraphicaleffects updated: fafee001f0...20f436e045
+1
-1
Submodule qtimageformats updated: 3d157f9773...f422f52fcd
+1
-1
Submodule qtlocation updated: cd7edab940...a4469cad40
+1
-1
Submodule qtlottie updated: 6e1be78c12...f5cc3184f3
+1
-1
Submodule qtmacextras updated: 9bbc26bdc1...9f58d3afbf
+1
-1
Submodule qtmultimedia updated: 49bf444b44...d509b9d837
+1
-1
Submodule qtnetworkauth updated: cc6364072c...de3b067522
+1
-1
Submodule qtpurchasing updated: 25198afc6e...3ef9129242
+1
-1
Submodule qtqa updated: 0f6a737ca7...bb56ecef33
+1
-1
Submodule qtquick3d updated: 2c7d2d46bd...7ea11dc385
+1
-1
Submodule qtquickcontrols updated: dfd79afda5...a7829e1ea2
+1
-1
Submodule qtquickcontrols2 updated: f9877da406...0b607bfe14
+1
-1
Submodule qtquicktimeline updated: 02b8928d42...649afa13b8
+1
-1
Submodule qtremoteobjects updated: 419455bfe6...09838389f3
+1
-1
Submodule qtrepotools updated: a3d6e9d396...fa4ab96e75
+1
-1
Submodule qtscript updated: 359185dae1...47c0700724
+1
-1
Submodule qtscxml updated: d42bb288e5...bae669b37d
+1
-1
Submodule qtsensors updated: 7aef965631...36276fc529
+1
-1
Submodule qtserialbus updated: e333d01545...8c2a9138ff
+1
-1
Submodule qtserialport updated: d4dc8988c5...b30052fa41
+1
-1
Submodule qtspeech updated: b666af47df...451a120ad9
+1
-1
Submodule qtsvg updated: e489a32576...07e06c4bbf
+1
-1
Submodule qttools updated: 8437ead59e...08a55ca1e4
+1
-1
Submodule qttranslations updated: fbdeaab046...9d7437583d
+1
-1
Submodule qtvirtualkeyboard updated: 6547842b5e...01d0cb2212
+1
-1
Submodule qtwayland updated: c327759b8f...1ef3ec8cae
+1
-1
Submodule qtwebchannel updated: b2685b64d1...facf59c1ea
+1
-1
Submodule qtwebengine updated: aca2a6df40...649099cfc6
+1
-1
Submodule qtwebglplugin updated: ef0f5f5ed8...8152dd60c0
+1
-1
Submodule qtwebsockets updated: 5b34b19b0a...127d475324
+1
-1
Submodule qtwebview updated: 6ef24b0c6c...3de65bf9da
+1
-1
Submodule qtwinextras updated: 4c1768777c...067f188d32
+1
-1
Submodule qtx11extras updated: 8dae142392...8136ffdfe8
+1
-1
Submodule qtxmlpatterns updated: 9e7745d7e2...5b5da71586
Reference in New Issue
Block a user