aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitmodules90
m---------qt3d0
m---------qtactiveqt0
m---------qtandroidextras0
m---------qtbase0
m---------qtcanvas3d0
m---------qtcharts0
m---------qtconnectivity0
m---------qtdatavis3d0
m---------qtdeclarative0
m---------qtdoc0
m---------qtenginio0
m---------qtgamepad0
m---------qtgraphicaleffects0
m---------qtimageformats0
m---------qtlocation0
m---------qtmacextras0
m---------qtmultimedia0
m---------qtnetworkauth0
m---------qtpurchasing0
m---------qtquickcontrols0
m---------qtquickcontrols20
m---------qtremoteobjects0
m---------qtscript0
m---------qtscxml0
m---------qtsensors0
m---------qtserialbus0
m---------qtserialport0
m---------qtspeech0
m---------qtsvg0
m---------qttools0
m---------qttranslations0
m---------qtvirtualkeyboard0
m---------qtwayland0
m---------qtwebchannel0
m---------qtwebengine0
m---------qtwebglplugin0
m---------qtwebsockets0
m---------qtwebview0
m---------qtwinextras0
m---------qtx11extras0
m---------qtxmlpatterns0
42 files changed, 42 insertions, 48 deletions
diff --git a/.gitmodules b/.gitmodules
index 565896cc..4c92602b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,66 +1,66 @@
[submodule "qtbase"]
path = qtbase
url = ../qtbase.git
- branch = 5.11
+ branch = dev
status = essential
[submodule "qtsvg"]
depends = qtbase
path = qtsvg
url = ../qtsvg.git
- branch = 5.11
+ branch = dev
status = addon
[submodule "qtdeclarative"]
depends = qtbase
recommends = qtsvg qtxmlpatterns
path = qtdeclarative
url = ../qtdeclarative.git
- branch = 5.11
+ branch = dev
status = essential
[submodule "qtactiveqt"]
depends = qtbase
path = qtactiveqt
url = ../qtactiveqt.git
- branch = 5.11
+ branch = dev
status = addon
[submodule "qtscript"]
depends = qtbase
recommends = qttools
path = qtscript
url = ../qtscript.git
- branch = 5.11
+ branch = dev
status = deprecated
[submodule "qtmultimedia"]
depends = qtbase
recommends = qtdeclarative
path = qtmultimedia
url = ../qtmultimedia.git
- branch = 5.11
+ branch = dev
status = essential
[submodule "qttools"]
depends = qtbase
recommends = qtdeclarative qtactiveqt
path = qttools
url = ../qttools.git
- branch = 5.11
+ branch = dev
status = essential
[submodule "qtxmlpatterns"]
depends = qtbase
path = qtxmlpatterns
url = ../qtxmlpatterns.git
- branch = 5.11
+ branch = dev
status = addon
[submodule "qttranslations"]
depends = qttools
path = qttranslations
url = ../qttranslations.git
- branch = 5.11
+ branch = dev
status = essential
priority = 30
[submodule "qtdoc"]
depends = qtdeclarative
path = qtdoc
url = ../qtdoc.git
- branch = 5.11
+ branch = dev
status = essential
priority = 40
[submodule "qtrepotools"]
@@ -81,14 +81,14 @@
recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
path = qtlocation
url = ../qtlocation.git
- branch = 5.11
+ branch = dev
status = addon
[submodule "qtsensors"]
depends = qtbase
recommends = qtdeclarative
path = qtsensors
url = ../qtsensors.git
- branch = 5.11
+ branch = dev
status = addon
[submodule "qtsystems"]
depends = qtbase
@@ -121,27 +121,27 @@
recommends = qtdeclarative qtandroidextras
path = qtconnectivity
url = ../qtconnectivity.git
- branch = 5.11
+ branch = dev
status = addon
[submodule "qtwayland"]
depends = qtbase
recommends = qtdeclarative
path = qtwayland
url = ../qtwayland.git
- branch = 5.11
+ branch = dev
status = addon
[submodule "qt3d"]
depends = qtbase
recommends = qtdeclarative qtimageformats qtgamepad
path = qt3d
url = ../qt3d.git
- branch = 5.11
+ branch = dev
status = addon
[submodule "qtimageformats"]
depends = qtbase
path = qtimageformats
url = ../qtimageformats.git
- branch = 5.11
+ branch = dev
status = addon
[submodule "qtquick1"]
depends = qtscript
@@ -154,165 +154,159 @@
depends = qtdeclarative
path = qtgraphicaleffects
url = ../qtgraphicaleffects.git
- branch = 5.11
+ branch = dev
status = addon
[submodule "qtquickcontrols"]
depends = qtdeclarative
recommends = qtgraphicaleffects
path = qtquickcontrols
url = ../qtquickcontrols.git
- branch = 5.11
- status = essential
+ branch = dev
+ status = addon
[submodule "qtserialbus"]
depends = qtserialport
path = qtserialbus
url = ../qtserialbus.git
- branch = 5.11
+ branch = dev
status = addon
[submodule "qtserialport"]
depends = qtbase
path = qtserialport
url = ../qtserialport.git
- branch = 5.11
+ branch = dev
status = addon
[submodule "qtx11extras"]
depends = qtbase
path = qtx11extras
url = ../qtx11extras.git
- branch = 5.11
+ branch = dev
status = addon
[submodule "qtmacextras"]
depends = qtbase
path = qtmacextras
url = ../qtmacextras.git
- branch = 5.11
+ branch = dev
status = addon
[submodule "qtwinextras"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtwinextras
url = ../qtwinextras.git
- branch = 5.11
+ branch = dev
status = addon
[submodule "qtandroidextras"]
depends = qtbase
path = qtandroidextras
url = ../qtandroidextras.git
- branch = 5.11
- status = addon
-[submodule "qtenginio"]
- depends = qtdeclarative
- path = qtenginio
- url = ../qtenginio.git
branch = dev
- status = ignore
+ status = addon
[submodule "qtwebsockets"]
depends = qtbase
recommends = qtdeclarative
path = qtwebsockets
url = ../qtwebsockets.git
- branch = 5.11
+ branch = dev
status = addon
[submodule "qtwebchannel"]
depends = qtbase
recommends = qtdeclarative qtwebsockets
path = qtwebchannel
url = ../qtwebchannel.git
- branch = 5.11
+ branch = dev
status = addon
[submodule "qtwebengine"]
depends = qtquickcontrols qtwebchannel
recommends = qtlocation qttools
path = qtwebengine
url = ../qtwebengine.git
- branch = 5.11
+ branch = dev
status = addon
priority = 10
[submodule "qtcanvas3d"]
depends = qtdeclarative
path = qtcanvas3d
url = ../qtcanvas3d.git
- branch = 5.11
+ branch = dev
status = addon
[submodule "qtwebview"]
depends = qtdeclarative
recommends = qtwebengine
path = qtwebview
url = ../qtwebview.git
- branch = 5.11
+ branch = dev
status = addon
[submodule "qtquickcontrols2"]
depends = qtgraphicaleffects
recommends = qtimageformats
path = qtquickcontrols2
url = ../qtquickcontrols2.git
- branch = 5.11
- status = addon
+ branch = dev
+ status = essential
[submodule "qtpurchasing"]
depends = qtbase
recommends = qtdeclarative qtandroidextras
path = qtpurchasing
url = ../qtpurchasing.git
- branch = 5.11
+ branch = dev
status = addon
[submodule "qtcharts"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtcharts
url = ../qtcharts.git
- branch = 5.11
+ branch = dev
status = addon
[submodule "qtdatavis3d"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtdatavis3d
url = ../qtdatavis3d.git
- branch = 5.11
+ branch = dev
status = addon
[submodule "qtvirtualkeyboard"]
depends = qtbase qtdeclarative qtsvg
recommends = qtmultimedia qtquickcontrols
path = qtvirtualkeyboard
url = ../qtvirtualkeyboard.git
- branch = 5.11
+ branch = dev
status = addon
[submodule "qtgamepad"]
depends = qtbase
recommends = qtdeclarative
path = qtgamepad
url = ../qtgamepad.git
- branch = 5.11
+ branch = dev
status = addon
[submodule "qtscxml"]
depends = qtbase qtdeclarative
path = qtscxml
url = ../qtscxml.git
- branch = 5.11
+ branch = dev
status = addon
[submodule "qtspeech"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtspeech
url = ../qtspeech.git
- branch = 5.11
+ branch = dev
status = addon
[submodule "qtnetworkauth"]
depends = qtbase
path = qtnetworkauth
url = ../qtnetworkauth.git
- branch = 5.11
+ branch = dev
status = addon
[submodule "qtremoteobjects"]
depends = qtbase
recommends = qtdeclarative
path = qtremoteobjects
url = ../qtremoteobjects.git
- branch = 5.11
+ branch = dev
status = preview
[submodule "qtwebglplugin"]
depends = qtbase qtwebsockets
recommends = qtdeclarative
path = qtwebglplugin
url = ../qtwebglplugin.git
- branch = 5.11
+ branch = dev
status = preview
diff --git a/qt3d b/qt3d
-Subproject 2831c495233338403b31348393e785055700541
+Subproject cffde2a8aec5192b188c6d130cee270e763ccfc
diff --git a/qtactiveqt b/qtactiveqt
-Subproject cce62153d5394030d3fe74222e884d163247599
+Subproject a999bcc4d5c96ba69871d75bccaeb827bf67fdf
diff --git a/qtandroidextras b/qtandroidextras
-Subproject b36bf0b3eaa026e22a87865e106f54be6b52081
+Subproject 15797fb82085f1ad585368371b5d3c06b497ece
diff --git a/qtbase b/qtbase
-Subproject 9fdbd9dce917e90f0e644bedd8dca183f88304d
+Subproject 194a40449039a1e1dad2f370255698172bf5e7f
diff --git a/qtcanvas3d b/qtcanvas3d
-Subproject ff771b7d57eb3654f6321eb105129a594ec2841
+Subproject df0baaa6c58c725617edf131e3ad849efe2acc5
diff --git a/qtcharts b/qtcharts
-Subproject 1448df4988763d163b6753f9afddbec7999aedd
+Subproject 8b4ad5a108b53e6964815856b37cf004099ce50
diff --git a/qtconnectivity b/qtconnectivity
-Subproject dc435c6ce0a6ecae776dc0dd032016453a0b4b5
+Subproject 32e5af2f9322e25ed4e9a61036f48262b8f56ee
diff --git a/qtdatavis3d b/qtdatavis3d
-Subproject 6c253768e2fb6c0892215f3d93f36be7cece637
+Subproject 08de2bbd637de1ddfc5806d2dafabc56f076466
diff --git a/qtdeclarative b/qtdeclarative
-Subproject 8e98b175fa9fc896b0372ec814ee6600116a027
+Subproject 913dc3f4f2be7c2c23237bcb9bffb3192cb10d6
diff --git a/qtdoc b/qtdoc
-Subproject e2a103e0904b6d9a29fcf8e0d92560941265e7d
+Subproject 8c3496d734b3a6fd5b47bce863b0f2af5ddaab8
diff --git a/qtenginio b/qtenginio
deleted file mode 160000
-Subproject b0ad5907f480307853f7ac951bacfaa61dcbd94
diff --git a/qtgamepad b/qtgamepad
-Subproject 313f221381507eee36c8e3bd0069b3e7962da14
+Subproject ca6786a6cc9dd92f486dcca449c21ff529813b9
diff --git a/qtgraphicaleffects b/qtgraphicaleffects
-Subproject df80153bf07b08e5d2ae8ba18f85a9ec15dbaef
+Subproject 9bc6541cf7eda5518dd6ba8cd4c6df621a8002a
diff --git a/qtimageformats b/qtimageformats
-Subproject b83a0a9460432abb82218da247710a1aaf32133
+Subproject 4677c8927b24da8121b737856b3259914bcf8bb
diff --git a/qtlocation b/qtlocation
-Subproject d44838125389720e4352dd51ad1da02f4cb58dc
+Subproject d5b31c5b61e43546d5e8bc3637acf3f7cc4f14d
diff --git a/qtmacextras b/qtmacextras
-Subproject fe8be8f48cf384a2f1b0f7c03a83aaa81680151
+Subproject 4094fa4d0862acf8e5b114c9956362c8c84b78e
diff --git a/qtmultimedia b/qtmultimedia
-Subproject 8aaf91f29933bf652ef6dc0215dea1f278b1f85
+Subproject 46518fa76c83de9a3a9edc870539a9e8b7eaef9
diff --git a/qtnetworkauth b/qtnetworkauth
-Subproject 060c067960547cc2c129110017b6ccf020e6be6
+Subproject 19359608b5796d4351d6d29215753f456c8d5fa
diff --git a/qtpurchasing b/qtpurchasing
-Subproject 02246cd68ca14345d95cbd8893fd24ff60faa73
+Subproject acafa688e2a11ae60f60a893ea454494eb61c07
diff --git a/qtquickcontrols b/qtquickcontrols
-Subproject 0689a8256c0a21087c01fff3998fd3b606a5ac4
+Subproject ae842623ea1aca15bab2a245d2add779aa21937
diff --git a/qtquickcontrols2 b/qtquickcontrols2
-Subproject bc93333958e469e2bd79319befb23328a9de38a
+Subproject 5df2972e560dab4a1778444dc1dbe0c95c86be2
diff --git a/qtremoteobjects b/qtremoteobjects
-Subproject 7fe4bc5c19f519b3adf7209a37e3d8e5cc1e214
+Subproject 4b9cc97edd48b0508bf00afc7ec767249dd9b8f
diff --git a/qtscript b/qtscript
-Subproject c2657d346455a5a7821fbfbe3b1107d7cf9b094
+Subproject 0d3b268f3880dea9555601fbd4d559201c239b7
diff --git a/qtscxml b/qtscxml
-Subproject 67d48807b44735a2385b88db7ada01f7cd7eacf
+Subproject 54dc1cebd3f78d2b2b8d8d6d486035d36440576
diff --git a/qtsensors b/qtsensors
-Subproject f39a9e10671c0ba71c656e19101a53670b68962
+Subproject 84c64cf4188d51a6140ebd5560e3431cd5b5514
diff --git a/qtserialbus b/qtserialbus
-Subproject fb561e9aa52d24b0156dc2c3987216954ad5210
+Subproject 1343e05db51e156ba315d2068c4ba2456443b3a
diff --git a/qtserialport b/qtserialport
-Subproject b5f0519e8e6f8f125f711d61832072649d841df
+Subproject 8d3cfb4f6ed698c48577f1afac29cbca04b9124
diff --git a/qtspeech b/qtspeech
-Subproject da77ce9802200cc6dd47268172f60a60bd1310d
+Subproject f6947cc508d85067fb4cfba012550eb0d0cc36c
diff --git a/qtsvg b/qtsvg
-Subproject 1fd6226d52b8d3d201b117902ff1ecd84cc1a1e
+Subproject 59ee4adfb0751f250c11301b2e0cef2de08cfa5
diff --git a/qttools b/qttools
-Subproject 36c5496ac198891eea52e5a2bb779d8ccda93e6
+Subproject 73410de589cdb59a095feab9ab531c59dfa976e
diff --git a/qttranslations b/qttranslations
-Subproject 0bf644a075634ca49ee28c0f42566f1012506f3
+Subproject e2ab66653d0c8ae59868ff5bc2a3a44d1b61cfd
diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard
-Subproject 72f846f7b5ce0495d64af210e13f41690eff820
+Subproject 788dd808897f9d9e36763b4b668bc51cd9926cc
diff --git a/qtwayland b/qtwayland
-Subproject 51472970ce519fb39f492238b879d67ad9505f2
+Subproject 9db98c7e0a2656988d5c549f0618b2ba882f1fc
diff --git a/qtwebchannel b/qtwebchannel
-Subproject 01241eb3704af785e8d98fb2f6e223ca62a6417
+Subproject 5e581099bca3bf014c84fa1cc8b56dd6381b507
diff --git a/qtwebengine b/qtwebengine
-Subproject ff0a83a6c3e64772276cb71cba0392d1e89b037
+Subproject 911c676aa66db46176cfc8da19555d928ce0bd5
diff --git a/qtwebglplugin b/qtwebglplugin
-Subproject 8bbe7450759417082efce6ff57e8f0e490a247f
+Subproject 730cf537086f44ca84fb615e6221a643a1227c4
diff --git a/qtwebsockets b/qtwebsockets
-Subproject 416ca205ed89d5edf8cc0e3bb32b404b38f9f2e
+Subproject a0f1964e9f304523f01fde3c5583e382b7a3cb7
diff --git a/qtwebview b/qtwebview
-Subproject bb7dda99936b97cc262f07b25fcb500f8a552c8
+Subproject bad392cc1954faf3b7c16aa9dfa72ca5d6b2021
diff --git a/qtwinextras b/qtwinextras
-Subproject 323fdf483f0021b7b3208cf2d35c0cb52248880
+Subproject c0913e0b2a0e4cac7e7cc779b7ef3b78ba9d17c
diff --git a/qtx11extras b/qtx11extras
-Subproject d80236f50559f4fe785fba598a03aaa7f05d37a
+Subproject c6602af186fa87848954dd653022c1f879a8ae7
diff --git a/qtxmlpatterns b/qtxmlpatterns
-Subproject 1a254ab116f63b8188b9bc12cdd19e6d5696c3f
+Subproject c515a2cab29c0c55d64a509850214869acdbb40