mirror of
git://code.qt.io/qt/qt5.git
synced 2025-12-24 00:46:22 +08:00
Compare commits
3 Commits
dev
...
v6.11.0-be
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f00a460c60 | ||
|
|
69a8b1abfe | ||
|
|
c78156feca |
92
.gitmodules
vendored
92
.gitmodules
vendored
@@ -1,40 +1,40 @@
|
||||
[submodule "qtbase"]
|
||||
path = qtbase
|
||||
url = ../qtbase.git
|
||||
branch = dev
|
||||
branch = 6.11
|
||||
status = essential
|
||||
[submodule "qtsvg"]
|
||||
depends = qtbase
|
||||
path = qtsvg
|
||||
url = ../qtsvg.git
|
||||
branch = dev
|
||||
branch = 6.11
|
||||
status = addon
|
||||
[submodule "qtdeclarative"]
|
||||
depends = qtbase
|
||||
recommends = qtimageformats qtshadertools qtsvg qtlanguageserver
|
||||
path = qtdeclarative
|
||||
url = ../qtdeclarative.git
|
||||
branch = dev
|
||||
branch = 6.11
|
||||
status = essential
|
||||
[submodule "qtactiveqt"]
|
||||
depends = qtbase
|
||||
path = qtactiveqt
|
||||
url = ../qtactiveqt.git
|
||||
branch = dev
|
||||
branch = 6.11
|
||||
status = addon
|
||||
[submodule "qtmultimedia"]
|
||||
depends = qtbase qtshadertools
|
||||
recommends = qtdeclarative qtquick3d
|
||||
path = qtmultimedia
|
||||
url = ../qtmultimedia.git
|
||||
branch = dev
|
||||
branch = 6.11
|
||||
status = addon
|
||||
[submodule "qttools"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtactiveqt
|
||||
path = qttools
|
||||
url = ../qttools.git
|
||||
branch = dev
|
||||
branch = 6.11
|
||||
status = essential
|
||||
[submodule "qtxmlpatterns"]
|
||||
depends = qtbase
|
||||
@@ -47,7 +47,7 @@
|
||||
depends = qttools
|
||||
path = qttranslations
|
||||
url = ../qttranslations.git
|
||||
branch = dev
|
||||
branch = 6.11
|
||||
status = essential
|
||||
priority = 30
|
||||
[submodule "qtdoc"]
|
||||
@@ -55,7 +55,7 @@
|
||||
recommends = qtmultimedia qtshadertools qttasktree qtwebengine
|
||||
path = qtdoc
|
||||
url = ../qtdoc.git
|
||||
branch = dev
|
||||
branch = 6.11
|
||||
status = essential
|
||||
priority = 40
|
||||
[submodule "qtrepotools"]
|
||||
@@ -68,7 +68,7 @@
|
||||
depends = qtbase
|
||||
path = qtqa
|
||||
url = ../qtqa.git
|
||||
branch = dev
|
||||
branch = 6.11
|
||||
status = essential
|
||||
priority = 50
|
||||
[submodule "qtlocation"]
|
||||
@@ -76,21 +76,21 @@
|
||||
recommends = qtdeclarative
|
||||
path = qtlocation
|
||||
url = ../qtlocation.git
|
||||
branch = dev
|
||||
branch = 6.11
|
||||
status = preview
|
||||
[submodule "qtpositioning"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtserialport
|
||||
path = qtpositioning
|
||||
url = ../qtpositioning.git
|
||||
branch = dev
|
||||
branch = 6.11
|
||||
status = addon
|
||||
[submodule "qtsensors"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtsensors
|
||||
url = ../qtsensors.git
|
||||
branch = dev
|
||||
branch = 6.11
|
||||
status = addon
|
||||
[submodule "qtsystems"]
|
||||
depends = qtbase
|
||||
@@ -117,61 +117,61 @@
|
||||
recommends = qtdeclarative
|
||||
path = qtconnectivity
|
||||
url = ../qtconnectivity.git
|
||||
branch = dev
|
||||
branch = 6.11
|
||||
status = addon
|
||||
[submodule "qtwayland"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwayland
|
||||
url = ../qtwayland.git
|
||||
branch = dev
|
||||
branch = 6.11
|
||||
status = addon
|
||||
[submodule "qt3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtshadertools qtmultimedia
|
||||
path = qt3d
|
||||
url = ../qt3d.git
|
||||
branch = dev
|
||||
branch = 6.11
|
||||
status = deprecated
|
||||
[submodule "qtimageformats"]
|
||||
depends = qtbase
|
||||
path = qtimageformats
|
||||
url = ../qtimageformats.git
|
||||
branch = dev
|
||||
branch = 6.11
|
||||
status = addon
|
||||
[submodule "qtserialbus"]
|
||||
depends = qtbase
|
||||
recommends = qtserialport
|
||||
path = qtserialbus
|
||||
url = ../qtserialbus.git
|
||||
branch = dev
|
||||
branch = 6.11
|
||||
status = addon
|
||||
[submodule "qtserialport"]
|
||||
depends = qtbase
|
||||
path = qtserialport
|
||||
url = ../qtserialport.git
|
||||
branch = dev
|
||||
branch = 6.11
|
||||
status = addon
|
||||
[submodule "qtwebsockets"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwebsockets
|
||||
url = ../qtwebsockets.git
|
||||
branch = dev
|
||||
branch = 6.11
|
||||
status = addon
|
||||
[submodule "qtwebchannel"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtwebsockets
|
||||
path = qtwebchannel
|
||||
url = ../qtwebchannel.git
|
||||
branch = dev
|
||||
branch = 6.11
|
||||
status = addon
|
||||
[submodule "qtwebengine"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtwebchannel qttools qtpositioning
|
||||
path = qtwebengine
|
||||
url = ../qtwebengine.git
|
||||
branch = dev
|
||||
branch = 6.11
|
||||
status = addon
|
||||
priority = 10
|
||||
[submodule "qtcanvas3d"]
|
||||
@@ -185,28 +185,28 @@
|
||||
recommends = qtwebengine
|
||||
path = qtwebview
|
||||
url = ../qtwebview.git
|
||||
branch = dev
|
||||
branch = 6.11
|
||||
status = addon
|
||||
[submodule "qtcharts"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtcharts
|
||||
url = ../qtcharts.git
|
||||
branch = dev
|
||||
branch = 6.11
|
||||
status = deprecated
|
||||
[submodule "qtdatavis3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtdatavis3d
|
||||
url = ../qtdatavis3d.git
|
||||
branch = dev
|
||||
branch = 6.11
|
||||
status = deprecated
|
||||
[submodule "qtvirtualkeyboard"]
|
||||
depends = qtbase qtdeclarative qtsvg
|
||||
recommends = qtmultimedia
|
||||
path = qtvirtualkeyboard
|
||||
url = ../qtvirtualkeyboard.git
|
||||
branch = dev
|
||||
branch = 6.11
|
||||
status = addon
|
||||
[submodule "qtgamepad"]
|
||||
depends = qtbase
|
||||
@@ -219,27 +219,27 @@
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtscxml
|
||||
url = ../qtscxml.git
|
||||
branch = dev
|
||||
branch = 6.11
|
||||
status = addon
|
||||
[submodule "qtspeech"]
|
||||
depends = qtbase qtmultimedia
|
||||
recommends = qtdeclarative
|
||||
path = qtspeech
|
||||
url = ../qtspeech.git
|
||||
branch = dev
|
||||
branch = 6.11
|
||||
status = addon
|
||||
[submodule "qtnetworkauth"]
|
||||
depends = qtbase
|
||||
path = qtnetworkauth
|
||||
url = ../qtnetworkauth.git
|
||||
branch = dev
|
||||
branch = 6.11
|
||||
status = addon
|
||||
[submodule "qtremoteobjects"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtremoteobjects
|
||||
url = ../qtremoteobjects.git
|
||||
branch = dev
|
||||
branch = 6.11
|
||||
status = addon
|
||||
[submodule "qtwebglplugin"]
|
||||
depends = qtbase qtwebsockets
|
||||
@@ -252,107 +252,107 @@
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtlottie
|
||||
url = ../qtlottie.git
|
||||
branch = dev
|
||||
branch = 6.11
|
||||
status = addon
|
||||
[submodule "qtquicktimeline"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtquicktimeline
|
||||
url = ../qtquicktimeline
|
||||
branch = dev
|
||||
branch = 6.11
|
||||
status = addon
|
||||
[submodule "qtquick3d"]
|
||||
depends = qtbase qtdeclarative qtshadertools
|
||||
recommends = qtquicktimeline
|
||||
path = qtquick3d
|
||||
url = ../qtquick3d.git
|
||||
branch = dev
|
||||
branch = 6.11
|
||||
status = addon
|
||||
[submodule "qtshadertools"]
|
||||
depends = qtbase
|
||||
path = qtshadertools
|
||||
url = ../qtshadertools.git
|
||||
branch = dev
|
||||
branch = 6.11
|
||||
status = addon
|
||||
[submodule "qt5compat"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qt5compat
|
||||
url = ../qt5compat.git
|
||||
branch = dev
|
||||
branch = 6.11
|
||||
status = deprecated
|
||||
[submodule "qtcoap"]
|
||||
depends = qtbase
|
||||
path = qtcoap
|
||||
url = ../qtcoap.git
|
||||
branch = dev
|
||||
branch = 6.11
|
||||
status = addon
|
||||
[submodule "qtmqtt"]
|
||||
depends = qtbase qtdeclarative
|
||||
recommends = qtwebsockets
|
||||
path = qtmqtt
|
||||
url = ../qtmqtt.git
|
||||
branch = dev
|
||||
branch = 6.11
|
||||
status = addon
|
||||
[submodule "qtopcua"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtopcua
|
||||
url = ../qtopcua.git
|
||||
branch = dev
|
||||
branch = 6.11
|
||||
status = addon
|
||||
[submodule "qtlanguageserver"]
|
||||
depends = qtbase
|
||||
path = qtlanguageserver
|
||||
url = ../qtlanguageserver.git
|
||||
branch = dev
|
||||
branch = 6.11
|
||||
status = preview
|
||||
[submodule "qthttpserver"]
|
||||
depends = qtbase
|
||||
recommends = qtwebsockets
|
||||
path = qthttpserver
|
||||
url = ../qthttpserver.git
|
||||
branch = dev
|
||||
branch = 6.11
|
||||
status = addon
|
||||
[submodule "qtquick3dphysics"]
|
||||
depends = qtbase qtdeclarative qtquick3d qtshadertools
|
||||
path = qtquick3dphysics
|
||||
url = ../qtquick3dphysics.git
|
||||
branch = dev
|
||||
branch = 6.11
|
||||
status = addon
|
||||
[submodule "qtgrpc"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtgrpc
|
||||
url = ../qtgrpc.git
|
||||
branch = dev
|
||||
branch = 6.11
|
||||
status = addon
|
||||
[submodule "qtquickeffectmaker"]
|
||||
depends = qtbase qtdeclarative qtshadertools
|
||||
recommends = qtquick3d
|
||||
path = qtquickeffectmaker
|
||||
url = ../qtquickeffectmaker.git
|
||||
branch = dev
|
||||
branch = 6.11
|
||||
status = addon
|
||||
[submodule "qtgraphs"]
|
||||
depends = qtbase qtdeclarative qtquick3d
|
||||
path = qtgraphs
|
||||
url = ../qtgraphs.git
|
||||
branch = dev
|
||||
branch = 6.11
|
||||
status = addon
|
||||
[submodule "qttasktree"]
|
||||
depends = qtbase
|
||||
path = qttasktree
|
||||
url = ../qttasktree.git
|
||||
branch = dev
|
||||
branch = 6.11
|
||||
status = preview
|
||||
[submodule "qtopenapi"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtopenapi
|
||||
url = ../qtopenapi.git
|
||||
branch = dev
|
||||
branch = 6.11
|
||||
status = preview
|
||||
[submodule "qtcanvaspainter"]
|
||||
depends = qtbase qtdeclarative qtshadertools
|
||||
path = qtcanvaspainter
|
||||
url = ../qtcanvaspainter.git
|
||||
branch = dev
|
||||
branch = 6.11
|
||||
status = preview
|
||||
|
||||
@@ -9,7 +9,7 @@ Configurations:
|
||||
Environment variables: []
|
||||
Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64']
|
||||
-
|
||||
Template: 'qtci-linux-RHEL-8.10-x86_64-51'
|
||||
Template: 'qtci-linux-RHEL-9.4-x86_64-50'
|
||||
Compiler: 'GCC'
|
||||
Features: ['Sccache', 'DebugAndRelease']
|
||||
Configure arguments: ''
|
||||
@@ -21,7 +21,7 @@ Configurations:
|
||||
Configure arguments: ''
|
||||
Environment variables: []
|
||||
-
|
||||
Template: 'qtci-macos-14-arm-106'
|
||||
Template: 'qtci-macos-15-arm-104'
|
||||
Compiler: 'Clang'
|
||||
Features: ['Sccache', 'DebugAndRelease']
|
||||
Configure arguments: ''
|
||||
@@ -43,17 +43,30 @@ Configurations:
|
||||
Environment variables: []
|
||||
Environment script: ['%ProgramFiles%\Microsoft Visual Studio\2022\Professional\VC\Auxiliary\Build\vcvarsall.bat', 'amd64']
|
||||
-
|
||||
Template: 'qtci-linux-RHEL-8.10-x86_64-51'
|
||||
Template: 'qtci-linux-RHEL-9.4-x86_64-50'
|
||||
Compiler: 'GCC'
|
||||
Features: ['Sccache', 'DebugAndRelease', 'OldestQt']
|
||||
Configure arguments: ''
|
||||
Environment variables: []
|
||||
-
|
||||
Template: 'qtci-macos-14-arm-106'
|
||||
Template: 'qtci-linux-RHEL-8.10-x86_64-51'
|
||||
Compiler: 'GCC'
|
||||
Features: ['Sccache', 'DebugAndRelease', 'OldestQt', 'QtC18AndEarlier']
|
||||
Configure arguments: ''
|
||||
Environment variables: []
|
||||
-
|
||||
Template: 'qtci-macos-15-arm-104'
|
||||
Compiler: 'Clang'
|
||||
Features: ['Sccache', 'DebugAndRelease', 'OldestQt']
|
||||
Configure arguments: ''
|
||||
Environment variables: []
|
||||
# Tests GCC 11
|
||||
-
|
||||
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
|
||||
Compiler: 'GCC'
|
||||
Features: ['Sccache', 'DebugAndRelease', 'OldestQt']
|
||||
Configure arguments: ''
|
||||
Environment variables: []
|
||||
# license check
|
||||
-
|
||||
Template: 'qtci-linux-Ubuntu-22.04-x86_64-51'
|
||||
|
||||
2
qt3d
2
qt3d
Submodule qt3d updated: 60f3bfa206...cae635df4c
Submodule qt5compat updated: d9c7c3b164...fdf51a8793
Submodule qtactiveqt updated: 168002320b...b37c38072f
2
qtbase
2
qtbase
Submodule qtbase updated: 44b6b62d83...53a8f242ed
Submodule qtcanvaspainter updated: 42f3835ff2...823783a5aa
2
qtcharts
2
qtcharts
Submodule qtcharts updated: bfb8907878...87a127fd14
2
qtcoap
2
qtcoap
Submodule qtcoap updated: 50720cab42...887b6eda7b
Submodule qtconnectivity updated: d7b0174ee8...b0ea1a7e4a
Submodule qtdatavis3d updated: 6fc563085a...cfe0fd8923
Submodule qtdeclarative updated: c45dd3e90b...13d72a16ca
2
qtdoc
2
qtdoc
Submodule qtdoc updated: be0f24b2ee...05985de0be
2
qtgraphs
2
qtgraphs
Submodule qtgraphs updated: 8e44b5cc66...c13f639d4b
2
qtgrpc
2
qtgrpc
Submodule qtgrpc updated: 018343f095...6f35b0fb2d
Submodule qthttpserver updated: 59410ee126...788efad186
Submodule qtimageformats updated: 09a3279b9b...48d5ead7d0
Submodule qtlanguageserver updated: 1040f15cfd...32143f9b17
Submodule qtlocation updated: 2ea266d8e9...1bc147db5b
2
qtlottie
2
qtlottie
Submodule qtlottie updated: d4af7f2e7e...c97347bb9c
2
qtmqtt
2
qtmqtt
Submodule qtmqtt updated: b50be0baf7...9cfc4db145
Submodule qtmultimedia updated: f557ab284d...24dadc4804
Submodule qtnetworkauth updated: cd731939dc...6cc8cf9453
2
qtopcua
2
qtopcua
Submodule qtopcua updated: c21b81e2a6...3176fe6fed
Submodule qtopenapi updated: d01f26c466...89ca27a44a
Submodule qtpositioning updated: cd259eab43...3aebb7732e
Submodule qtquick3d updated: e69178aa1b...f2df626f8c
Submodule qtquick3dphysics updated: cfc525b284...5779241be8
Submodule qtquickeffectmaker updated: 77b95c21aa...7b280519ed
Submodule qtquicktimeline updated: 145daf35aa...0a8687372b
Submodule qtremoteobjects updated: 3b47eb9c0a...27a0731caf
2
qtscxml
2
qtscxml
Submodule qtscxml updated: 01383d5b29...fc55b1b5d0
Submodule qtsensors updated: 548e57f57f...93acd3a514
Submodule qtserialbus updated: 7fae5efe5a...79a95e8432
Submodule qtserialport updated: a04c3f2153...8c72072b45
Submodule qtshadertools updated: d4ce391692...451adb0e59
2
qtspeech
2
qtspeech
Submodule qtspeech updated: f7f40ba833...0f8ed38e28
2
qtsvg
2
qtsvg
Submodule qtsvg updated: 976d0dab21...0e92982b52
Submodule qttasktree updated: 09eca27d97...f63d19c99d
2
qttools
2
qttools
Submodule qttools updated: 8eec8afd1b...ffde172b50
Submodule qttranslations updated: f129cd306e...2ece25d17e
Submodule qtvirtualkeyboard updated: 38bdcb0348...3c05bc3e8a
Submodule qtwayland updated: b5cbd46f9f...700b2f2a5f
Submodule qtwebchannel updated: 39928be7b4...2019cbd6da
Submodule qtwebengine updated: 3244dffbe1...d8c6dd0398
Submodule qtwebsockets updated: 9a7894a521...cf32718939
Submodule qtwebview updated: 4925d3ac88...d6a5fac01b
Reference in New Issue
Block a user