mirror of
git://code.qt.io/qt/qt5.git
synced 2025-12-31 20:35:39 +08:00
Compare commits
41 Commits
5.14
...
v5.15.0-al
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e01ec6d6f5 | ||
|
|
5f01869f16 | ||
|
|
704ef6207d | ||
|
|
eaf196219b | ||
|
|
f8ab18df91 | ||
|
|
9d78f3bd2b | ||
|
|
f908a069d9 | ||
|
|
75192dee07 | ||
|
|
cfa998544d | ||
|
|
4a0e64744f | ||
|
|
a9633efe67 | ||
|
|
7286bd9f7a | ||
|
|
2dc0539847 | ||
|
|
3ae7991090 | ||
|
|
cac62e47fe | ||
|
|
a626d59af1 | ||
|
|
1def8bb62c | ||
|
|
af7cf0fc3f | ||
|
|
c48c756bb9 | ||
|
|
14174482be | ||
|
|
4282752c19 | ||
|
|
7c1c98e123 | ||
|
|
4b6c05815a | ||
|
|
b5c9819be2 | ||
|
|
f9183e71bf | ||
|
|
b3f160bc39 | ||
|
|
ebc02c3265 | ||
|
|
d148d7b0f7 | ||
|
|
8287111e7b | ||
|
|
db4e91ce90 | ||
|
|
d406ff6398 | ||
|
|
37244913d3 | ||
|
|
41fa18a06b | ||
|
|
1430513438 | ||
|
|
37e43d23fc | ||
|
|
4f903d0139 | ||
|
|
2d577a83ec | ||
|
|
52068b49e8 | ||
|
|
f76c553d75 | ||
|
|
97afb2ce08 | ||
|
|
8f87412708 |
84
.gitmodules
vendored
84
.gitmodules
vendored
@@ -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'
|
||||
|
||||
@@ -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
|
||||
|
||||
2
qt3d
2
qt3d
Submodule qt3d updated: b6923f6fa0...772d8d3dc7
Submodule qtactiveqt updated: 3b07b8b2f3...34d89d9b72
Submodule qtandroidextras updated: 57aacdd654...f4d122b291
2
qtbase
2
qtbase
Submodule qtbase updated: 0f812db558...c08b0cec2f
2
qtcharts
2
qtcharts
Submodule qtcharts updated: 57b67d631d...f63d2a7b46
Submodule qtconnectivity updated: 355f09eccc...635ad60e8e
Submodule qtdatavis3d updated: 5587117016...2dd285bc28
Submodule qtdeclarative updated: 991035ea1f...8e822e981d
2
qtdoc
2
qtdoc
Submodule qtdoc updated: ac24194909...f6d4d98486
Submodule qtgamepad updated: 2ddcdff921...3c91ce46a6
Submodule qtgraphicaleffects updated: fafee001f0...20f436e045
Submodule qtimageformats updated: 3d157f9773...f422f52fcd
Submodule qtlocation updated: cd7edab940...a4469cad40
2
qtlottie
2
qtlottie
Submodule qtlottie updated: 6e1be78c12...f5cc3184f3
Submodule qtmacextras updated: 9bbc26bdc1...9f58d3afbf
Submodule qtmultimedia updated: d986420f3f...d509b9d837
Submodule qtnetworkauth updated: cc6364072c...de3b067522
Submodule qtpurchasing updated: 25198afc6e...3ef9129242
2
qtqa
2
qtqa
Submodule qtqa updated: 556798f875...bb56ecef33
Submodule qtquick3d updated: b864811e6b...7ea11dc385
Submodule qtquickcontrols updated: dfd79afda5...a7829e1ea2
Submodule qtquickcontrols2 updated: 8ee511bcd9...0b607bfe14
Submodule qtquicktimeline updated: 3ca22174ea...649afa13b8
Submodule qtremoteobjects updated: 419455bfe6...09838389f3
2
qtscript
2
qtscript
Submodule qtscript updated: 359185dae1...47c0700724
2
qtscxml
2
qtscxml
Submodule qtscxml updated: d42bb288e5...bae669b37d
Submodule qtsensors updated: 7aef965631...36276fc529
Submodule qtserialbus updated: e333d01545...8c2a9138ff
Submodule qtserialport updated: d4dc8988c5...b30052fa41
2
qtspeech
2
qtspeech
Submodule qtspeech updated: b666af47df...451a120ad9
2
qtsvg
2
qtsvg
Submodule qtsvg updated: e489a32576...07e06c4bbf
2
qttools
2
qttools
Submodule qttools updated: 0b0e82d80a...08a55ca1e4
Submodule qttranslations updated: fbdeaab046...9d7437583d
Submodule qtvirtualkeyboard updated: 462a024e41...01d0cb2212
Submodule qtwayland updated: ce06115da6...1ef3ec8cae
Submodule qtwebchannel updated: b2685b64d1...facf59c1ea
Submodule qtwebengine updated: cc2b1d2b66...649099cfc6
Submodule qtwebglplugin updated: 47bd603dba...8152dd60c0
Submodule qtwebsockets updated: 5b34b19b0a...127d475324
Submodule qtwebview updated: 6ef24b0c6c...3de65bf9da
Submodule qtwinextras updated: 4c1768777c...067f188d32
Submodule qtx11extras updated: 8dae142392...8136ffdfe8
Submodule qtxmlpatterns updated: 9e7745d7e2...5b5da71586
Reference in New Issue
Block a user