mirror of
git://code.qt.io/qt/qt5.git
synced 2026-08-03 19:35:51 +08:00
Compare commits
10 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 4fabcfd5d1 | |||
| e5d5e2aacb | |||
| 6bc4d562c8 | |||
| 015b9cb53a | |||
| a63aa1647c | |||
| 07a4522087 | |||
| ef2315af73 | |||
| 2644bebe4b | |||
| 137ed3408d | |||
| ac53509b31 |
+39
-39
@@ -1,66 +1,66 @@
|
||||
[submodule "qtbase"]
|
||||
path = qtbase
|
||||
url = ../qtbase.git
|
||||
branch = 5.9
|
||||
branch = 5.9.5
|
||||
status = essential
|
||||
[submodule "qtsvg"]
|
||||
depends = qtbase
|
||||
path = qtsvg
|
||||
url = ../qtsvg.git
|
||||
branch = 5.9
|
||||
branch = 5.9.5
|
||||
status = addon
|
||||
[submodule "qtdeclarative"]
|
||||
depends = qtbase
|
||||
recommends = qtsvg qtxmlpatterns
|
||||
path = qtdeclarative
|
||||
url = ../qtdeclarative.git
|
||||
branch = 5.9
|
||||
branch = 5.9.5
|
||||
status = essential
|
||||
[submodule "qtactiveqt"]
|
||||
depends = qtbase
|
||||
path = qtactiveqt
|
||||
url = ../qtactiveqt.git
|
||||
branch = 5.9
|
||||
branch = 5.9.5
|
||||
status = addon
|
||||
[submodule "qtscript"]
|
||||
depends = qtbase
|
||||
recommends = qttools
|
||||
path = qtscript
|
||||
url = ../qtscript.git
|
||||
branch = 5.9
|
||||
branch = 5.9.5
|
||||
status = deprecated
|
||||
[submodule "qtmultimedia"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtmultimedia
|
||||
url = ../qtmultimedia.git
|
||||
branch = 5.9
|
||||
branch = 5.9.5
|
||||
status = essential
|
||||
[submodule "qttools"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtactiveqt
|
||||
path = qttools
|
||||
url = ../qttools.git
|
||||
branch = 5.9
|
||||
branch = 5.9.5
|
||||
status = essential
|
||||
[submodule "qtxmlpatterns"]
|
||||
depends = qtbase
|
||||
path = qtxmlpatterns
|
||||
url = ../qtxmlpatterns.git
|
||||
branch = 5.9
|
||||
branch = 5.9.5
|
||||
status = addon
|
||||
[submodule "qttranslations"]
|
||||
depends = qttools
|
||||
path = qttranslations
|
||||
url = ../qttranslations.git
|
||||
branch = 5.9
|
||||
branch = 5.9.5
|
||||
status = essential
|
||||
priority = 30
|
||||
[submodule "qtdoc"]
|
||||
depends = qtdeclarative
|
||||
path = qtdoc
|
||||
url = ../qtdoc.git
|
||||
branch = 5.9
|
||||
branch = 5.9.5
|
||||
status = essential
|
||||
priority = 40
|
||||
[submodule "qtrepotools"]
|
||||
@@ -81,14 +81,14 @@
|
||||
recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
|
||||
path = qtlocation
|
||||
url = ../qtlocation.git
|
||||
branch = 5.9
|
||||
branch = 5.9.5
|
||||
status = addon
|
||||
[submodule "qtsensors"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtsensors
|
||||
url = ../qtsensors.git
|
||||
branch = 5.9
|
||||
branch = 5.9.5
|
||||
status = addon
|
||||
[submodule "qtsystems"]
|
||||
depends = qtbase
|
||||
@@ -121,27 +121,27 @@
|
||||
recommends = qtdeclarative qtandroidextras
|
||||
path = qtconnectivity
|
||||
url = ../qtconnectivity.git
|
||||
branch = 5.9
|
||||
branch = 5.9.5
|
||||
status = addon
|
||||
[submodule "qtwayland"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtwayland
|
||||
url = ../qtwayland.git
|
||||
branch = 5.9
|
||||
branch = 5.9.5
|
||||
status = addon
|
||||
[submodule "qt3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtimageformats qtgamepad
|
||||
path = qt3d
|
||||
url = ../qt3d.git
|
||||
branch = 5.9
|
||||
branch = 5.9.5
|
||||
status = addon
|
||||
[submodule "qtimageformats"]
|
||||
depends = qtbase
|
||||
path = qtimageformats
|
||||
url = ../qtimageformats.git
|
||||
branch = 5.9
|
||||
branch = 5.9.5
|
||||
status = addon
|
||||
[submodule "qtquick1"]
|
||||
depends = qtscript
|
||||
@@ -154,51 +154,51 @@
|
||||
depends = qtdeclarative
|
||||
path = qtgraphicaleffects
|
||||
url = ../qtgraphicaleffects.git
|
||||
branch = 5.9
|
||||
branch = 5.9.5
|
||||
status = addon
|
||||
[submodule "qtquickcontrols"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtgraphicaleffects
|
||||
path = qtquickcontrols
|
||||
url = ../qtquickcontrols.git
|
||||
branch = 5.9
|
||||
branch = 5.9.5
|
||||
status = essential
|
||||
[submodule "qtserialbus"]
|
||||
depends = qtserialport
|
||||
path = qtserialbus
|
||||
url = ../qtserialbus.git
|
||||
branch = 5.9
|
||||
branch = 5.9.5
|
||||
status = addon
|
||||
[submodule "qtserialport"]
|
||||
depends = qtbase
|
||||
path = qtserialport
|
||||
url = ../qtserialport.git
|
||||
branch = 5.9
|
||||
branch = 5.9.5
|
||||
status = addon
|
||||
[submodule "qtx11extras"]
|
||||
depends = qtbase
|
||||
path = qtx11extras
|
||||
url = ../qtx11extras.git
|
||||
branch = 5.9
|
||||
branch = 5.9.5
|
||||
status = addon
|
||||
[submodule "qtmacextras"]
|
||||
depends = qtbase
|
||||
path = qtmacextras
|
||||
url = ../qtmacextras.git
|
||||
branch = 5.9
|
||||
branch = 5.9.5
|
||||
status = addon
|
||||
[submodule "qtwinextras"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtwinextras
|
||||
url = ../qtwinextras.git
|
||||
branch = 5.9
|
||||
branch = 5.9.5
|
||||
status = addon
|
||||
[submodule "qtandroidextras"]
|
||||
depends = qtbase
|
||||
path = qtandroidextras
|
||||
url = ../qtandroidextras.git
|
||||
branch = 5.9
|
||||
branch = 5.9.5
|
||||
status = addon
|
||||
[submodule "qtenginio"]
|
||||
depends = qtdeclarative
|
||||
@@ -211,101 +211,101 @@
|
||||
recommends = qtdeclarative
|
||||
path = qtwebsockets
|
||||
url = ../qtwebsockets.git
|
||||
branch = 5.9
|
||||
branch = 5.9.5
|
||||
status = addon
|
||||
[submodule "qtwebchannel"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtwebsockets
|
||||
path = qtwebchannel
|
||||
url = ../qtwebchannel.git
|
||||
branch = 5.9
|
||||
branch = 5.9.5
|
||||
status = addon
|
||||
[submodule "qtwebengine"]
|
||||
depends = qtquickcontrols qtwebchannel
|
||||
recommends = qtlocation qttools
|
||||
path = qtwebengine
|
||||
url = ../qtwebengine.git
|
||||
branch = 5.9
|
||||
branch = 5.9.5
|
||||
status = addon
|
||||
priority = 10
|
||||
[submodule "qtcanvas3d"]
|
||||
depends = qtdeclarative
|
||||
path = qtcanvas3d
|
||||
url = ../qtcanvas3d.git
|
||||
branch = 5.9
|
||||
branch = 5.9.5
|
||||
status = addon
|
||||
[submodule "qtwebview"]
|
||||
depends = qtdeclarative
|
||||
recommends = qtwebengine
|
||||
path = qtwebview
|
||||
url = ../qtwebview.git
|
||||
branch = 5.9
|
||||
branch = 5.9.5
|
||||
status = addon
|
||||
[submodule "qtquickcontrols2"]
|
||||
depends = qtgraphicaleffects
|
||||
path = qtquickcontrols2
|
||||
url = ../qtquickcontrols2.git
|
||||
branch = 5.9
|
||||
branch = 5.9.5
|
||||
status = addon
|
||||
[submodule "qtpurchasing"]
|
||||
depends = qtbase qtandroidextras
|
||||
recommends = qtdeclarative
|
||||
path = qtpurchasing
|
||||
url = ../qtpurchasing.git
|
||||
branch = 5.9
|
||||
branch = 5.9.5
|
||||
status = addon
|
||||
[submodule "qtcharts"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtcharts
|
||||
url = ../qtcharts.git
|
||||
branch = 5.9
|
||||
branch = 5.9.5
|
||||
status = addon
|
||||
[submodule "qtdatavis3d"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtdatavis3d
|
||||
url = ../qtdatavis3d.git
|
||||
branch = 5.9
|
||||
branch = 5.9.5
|
||||
status = addon
|
||||
[submodule "qtvirtualkeyboard"]
|
||||
depends = qtbase qtdeclarative qtsvg
|
||||
recommends = qtmultimedia qtquickcontrols
|
||||
path = qtvirtualkeyboard
|
||||
url = ../qtvirtualkeyboard.git
|
||||
branch = 5.9
|
||||
branch = 5.9.5
|
||||
status = addon
|
||||
[submodule "qtgamepad"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtgamepad
|
||||
url = ../qtgamepad.git
|
||||
branch = 5.9
|
||||
branch = 5.9.5
|
||||
status = addon
|
||||
[submodule "qtscxml"]
|
||||
depends = qtbase qtdeclarative
|
||||
path = qtscxml
|
||||
url = ../qtscxml.git
|
||||
branch = 5.9
|
||||
branch = 5.9.5
|
||||
status = addon
|
||||
[submodule "qtspeech"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
path = qtspeech
|
||||
url = ../qtspeech.git
|
||||
branch = 5.9
|
||||
branch = 5.9.5
|
||||
status = preview
|
||||
[submodule "qtnetworkauth"]
|
||||
depends = qtbase
|
||||
recommends = qtwebview
|
||||
path = qtnetworkauth
|
||||
url = ../qtnetworkauth.git
|
||||
branch = 5.9
|
||||
branch = 5.9.5
|
||||
status = preview
|
||||
[submodule "qtremoteobjects"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
path = qtremoteobjects
|
||||
url = ../qtremoteobjects.git
|
||||
branch = 5.9
|
||||
branch = 5.9.5
|
||||
status = preview
|
||||
|
||||
@@ -3,7 +3,7 @@ Template Target OS Target arch Compiler Features
|
||||
qtci-windows-8.1-x86_64 x86 MSVC2013 DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests
|
||||
qtci-windows-8.1-x86_64 MSVC2013 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests
|
||||
qtci-windows-10-x86_64-10 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
|
||||
qtci-windows-10-x86-6 MSVC2017 DebugAndRelease Release ForceDebugInfo OpenGLDynamic
|
||||
qtci-windows-10-x86_64-10 x86 MSVC2017 DebugAndRelease Release ForceDebugInfo OpenGLDynamic
|
||||
qtci-windows-10-x86_64-10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
|
||||
qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
|
||||
qtci-windows-7-x86-3 Mingw53 Packaging DebugAndRelease Release OpenGLDynamic DisableTests
|
||||
|
||||
@@ -61,7 +61,7 @@ installPackages+=(gstreamer1-plugins-base-devel)
|
||||
# gtk3 style for QtGui/QStyle
|
||||
installPackages+=(gtk3-devel)
|
||||
# libusb1 for tqtc-boot2qt/qdb
|
||||
installPackages+=(libusb-devel)
|
||||
installPackages+=(libusbx-devel)
|
||||
# speech-dispatcher-devel for QtSpeech, otherwise it has no backend on Linux
|
||||
installPackages+=(speech-dispatcher-devel)
|
||||
# Python
|
||||
|
||||
+1
-1
Submodule qt3d updated: c40c7ac6b5...096500140b
+1
-1
Submodule qtactiveqt updated: d895e5d8f1...8149375978
+1
-1
Submodule qtandroidextras updated: aa7acf474f...c20c722f76
+1
-1
Submodule qtbase updated: 58541d1c68...f4c2fcc052
+1
-1
Submodule qtcanvas3d updated: 08b2b0033d...9030337d37
+1
-1
Submodule qtcharts updated: 31127e1f29...0044a3519f
+1
-1
Submodule qtconnectivity updated: a7be018dfa...6d2e1761eb
+1
-1
Submodule qtdatavis3d updated: 8bfa8a8ef3...8aeab2c338
+1
-1
Submodule qtdeclarative updated: 8fdf466741...dfbe918537
+1
-1
Submodule qtdoc updated: de869e95fa...87e708b2ac
+1
-1
Submodule qtgamepad updated: da6d567a54...8534086482
+1
-1
Submodule qtgraphicaleffects updated: 8e86608f28...3d317f1bb0
+1
-1
Submodule qtimageformats updated: 25d7e0440f...0267be9dac
+1
-1
Submodule qtlocation updated: cc3a5a926d...0008c4b6cc
+1
-1
Submodule qtmacextras updated: 970a10176c...fda624ef87
+1
-1
Submodule qtmultimedia updated: 2cc31ddded...c70e05a8e3
+1
-1
Submodule qtpurchasing updated: a58433b78f...60fad5090b
+1
-1
Submodule qtqa updated: 0d050f36dc...e3754bc547
+1
-1
Submodule qtquickcontrols updated: 93c5dc8b5a...f050a32a43
+1
-1
Submodule qtquickcontrols2 updated: 83da5b251d...c51eea8870
+1
-1
Submodule qtrepotools updated: c112252bc2...5655cafd10
+1
-1
Submodule qtscript updated: 36e82de438...b67dcb4883
+1
-1
Submodule qtscxml updated: 0d6105563d...d37ce5ab3b
+1
-1
Submodule qtsensors updated: dcc4d0b58a...d552586deb
+1
-1
Submodule qtserialbus updated: 38c64b11c9...9b1700a54e
+1
-1
Submodule qtserialport updated: 6f62e9de52...fa6766b397
+1
-1
Submodule qtsvg updated: a2156af9ed...dec74295e8
+1
-1
Submodule qttools updated: 99235a6262...502f06a561
+1
-1
Submodule qttranslations updated: 6ccd657678...20f821fc8b
+1
-1
Submodule qtvirtualkeyboard updated: 1838b75f6c...0c52fc067c
+1
-1
Submodule qtwayland updated: 79cde9fba8...f2bba05d44
+1
-1
Submodule qtwebchannel updated: 5821cad4ca...887564cc04
+1
-1
Submodule qtwebengine updated: 2e06a05140...8bbdfa215c
+1
-1
Submodule qtwebsockets updated: 0b418f5512...6b10c6283e
+1
-1
Submodule qtwebview updated: c47248d9a2...810bfc6b6d
+1
-1
Submodule qtwinextras updated: f688deb091...7ab2f46b93
+1
-1
Submodule qtx11extras updated: def0ad5122...a82b308b01
+1
-1
Submodule qtxmlpatterns updated: 4d95d64382...c7c5681004
Reference in New Issue
Block a user