summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitmodules84
m---------qt3d0
m---------qtactiveqt0
m---------qtandroidextras0
m---------qtbase0
m---------qtcanvas3d0
m---------qtcharts0
m---------qtconnectivity0
m---------qtdatavis3d0
m---------qtdeclarative0
m---------qtdoc0
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
41 files changed, 42 insertions, 42 deletions
diff --git a/.gitmodules b/.gitmodules
index 565896cc..26c3e3d8 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,51 +154,51 @@
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
+ branch = dev
status = addon
[submodule "qtenginio"]
depends = qtdeclarative
@@ -211,108 +211,108 @@
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 4f7726155f586ae3aef0b111ae25eacaab91afe
+Subproject 3fb6aea8f1250e58a9e85c136e224a150693306
diff --git a/qtactiveqt b/qtactiveqt
-Subproject c095e6ad6f5dbf7bb7082ab822aaa114f83ccc4
+Subproject 7b76f56c8a370264c570bd9305e17aeccde5b2a
diff --git a/qtandroidextras b/qtandroidextras
-Subproject a2157a9dd2ee4ed3e998654595544dadaf129fe
+Subproject 7550365abc00bf994ae4c0ac93d4209541034dc
diff --git a/qtbase b/qtbase
-Subproject 3b85d53913741660473dbc242a48c2ee65d5142
+Subproject b2035d38e8dfdfe2ba8da96df5c1174f01dfbb5
diff --git a/qtcanvas3d b/qtcanvas3d
-Subproject ff771b7d57eb3654f6321eb105129a594ec2841
+Subproject df0baaa6c58c725617edf131e3ad849efe2acc5
diff --git a/qtcharts b/qtcharts
-Subproject f61c26916edf9944ed1dd465f031620a80e9859
+Subproject 9b345c9af04a93b723dea0570ede37d8b5d4456
diff --git a/qtconnectivity b/qtconnectivity
-Subproject 96afc728c508708da7a5fa16266dcafafcb60d0
+Subproject d0b7c165ced02f20f0da3b66854f4bec7b192e6
diff --git a/qtdatavis3d b/qtdatavis3d
-Subproject 6c253768e2fb6c0892215f3d93f36be7cece637
+Subproject da3c5925d546282e99f13b450a674c7024fde9e
diff --git a/qtdeclarative b/qtdeclarative
-Subproject 51b73e0bb68812d78315af032546750d04656c0
+Subproject f257be627cc9de4fdec430e2fe8f6ac3b682707
diff --git a/qtdoc b/qtdoc
-Subproject ba5445a949facd89472f2a54fb88dc57b118786
+Subproject 04266a075e7202d36e5832f0e226e931f94a5bc
diff --git a/qtgamepad b/qtgamepad
-Subproject 313f221381507eee36c8e3bd0069b3e7962da14
+Subproject ac1910ab4b54c4b4ef012d3373ed66ac7ea77f0
diff --git a/qtgraphicaleffects b/qtgraphicaleffects
-Subproject 3e28d47cea038ca64c2e14ff449cc183c51643c
+Subproject ee9ac263dbad736baed16e34dd0b35426925695
diff --git a/qtimageformats b/qtimageformats
-Subproject 4e10f35483db6d3396fe54dcf3d895d7850f833
+Subproject 7a9b7172693e8fd90bb601d73506619b64a6899
diff --git a/qtlocation b/qtlocation
-Subproject 886776c496d8902b56d47f7e5253d2e3a540b1f
+Subproject 5457317c0ffbbb7e0c285a6899709be78f693b8
diff --git a/qtmacextras b/qtmacextras
-Subproject 5f9b1bca4af0bc7801d513a9424c70b47812cf1
+Subproject 1eb21a6679d88ae478b7e5b770e7b9c3d0c5851
diff --git a/qtmultimedia b/qtmultimedia
-Subproject c96b95e50e71dfae82de5b822e7ab758787acd4
+Subproject c255094bf5ee6f4b84c075ccbe84d01dd68020a
diff --git a/qtnetworkauth b/qtnetworkauth
-Subproject 0d845e00a000f376101165ec9a5c9096030db25
+Subproject 32912fdcf35bc9f9e14a65d9e8019798fb7bb31
diff --git a/qtpurchasing b/qtpurchasing
-Subproject 02246cd68ca14345d95cbd8893fd24ff60faa73
+Subproject 54e7db56ff44c9895c884174168aade909b56e8
diff --git a/qtquickcontrols b/qtquickcontrols
-Subproject 654de8242411dae548795f9b17648608f8a8c28
+Subproject 4cda4427b6a2e07dd406362cf7b643b971706b2
diff --git a/qtquickcontrols2 b/qtquickcontrols2
-Subproject cfe00c40127dbe5790e04cd9f810bcc98fee13e
+Subproject 71d1dfd899552c12d253282f97fd62adac182c0
diff --git a/qtremoteobjects b/qtremoteobjects
-Subproject 67ac9631dbb26394e6b9981494a0aaf6124284a
+Subproject a9b36ba519fd5a7ebf78d7e5880ccd8b4694559
diff --git a/qtscript b/qtscript
-Subproject 781c745277f9b4faa87d341b10ec0ca46eb45a7
+Subproject fb7fdcbdff7a92d7770b648fa2989327cc103ed
diff --git a/qtscxml b/qtscxml
-Subproject 67d48807b44735a2385b88db7ada01f7cd7eacf
+Subproject 011c9c90d5667588809618616637e2c910baeae
diff --git a/qtsensors b/qtsensors
-Subproject 29f2041f4da53815491affbf19ec008820c76e2
+Subproject 67c3c7e5f59fcc943b5e420af484faced995ebc
diff --git a/qtserialbus b/qtserialbus
-Subproject fb561e9aa52d24b0156dc2c3987216954ad5210
+Subproject 194f3726987aae32930ae02db9f00a1590fffe2
diff --git a/qtserialport b/qtserialport
-Subproject 0c988e14a90f3e1579365dc3dc99fbdd02ac3d4
+Subproject 4eb1ba5918e5e8e70a1f7ba9e731d2572f37d34
diff --git a/qtspeech b/qtspeech
-Subproject d8bd5329cd4000151051ed25cda005b3b51aec8
+Subproject f6947cc508d85067fb4cfba012550eb0d0cc36c
diff --git a/qtsvg b/qtsvg
-Subproject 1787f95f5727a20a4f0871736ad987fcfdf0f3c
+Subproject 7d49d4e9841a61997384dd149a72d749ff0729e
diff --git a/qttools b/qttools
-Subproject 03923b27ebf982629d2dd936b8597964cc464bf
+Subproject da9b8b60848afad84e4a9a8452480a88ab948bb
diff --git a/qttranslations b/qttranslations
-Subproject 446f2f8e444362b393efe57904e178a20346e88
+Subproject e2ab66653d0c8ae59868ff5bc2a3a44d1b61cfd
diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard
-Subproject a94870b1583857ee5a485ce68369373efb3a9fd
+Subproject a25130366786348d6f396c66e2d423d1171f493
diff --git a/qtwayland b/qtwayland
-Subproject 6218661c89a5f9ee36785d187018b98855d7bab
+Subproject e3fa740d20b31270c09c258215f7d91d94da0ce
diff --git a/qtwebchannel b/qtwebchannel
-Subproject 01241eb3704af785e8d98fb2f6e223ca62a6417
+Subproject 5e581099bca3bf014c84fa1cc8b56dd6381b507
diff --git a/qtwebengine b/qtwebengine
-Subproject 1478dd7470c1215daf8cee2e2082d0c30ebb9ab
+Subproject 1e67c557b774f42ae749ea7a4bef2b3d4018009
diff --git a/qtwebglplugin b/qtwebglplugin
-Subproject 7bbbe5a86779fd1ff55b07dbda433779f4aff6a
+Subproject 9c5d04e62719b4ec6e1e990ac9b05ec5092f8c2
diff --git a/qtwebsockets b/qtwebsockets
-Subproject 34ce4b65ba35a487bdb8afa5e59b57cfa3f9b0e
+Subproject 4f0346907cd1e3c6e37dd0eb7ef99434a0e2158
diff --git a/qtwebview b/qtwebview
-Subproject bb7dda99936b97cc262f07b25fcb500f8a552c8
+Subproject a68a8d0535d4951f6156bc2597bc4281d46fd6f
diff --git a/qtwinextras b/qtwinextras
-Subproject e484402ad1d9b6d3b89333585b1ead97e4d2163
+Subproject 020e259d79cd8d05c83901061e2bb6d24e9d847
diff --git a/qtx11extras b/qtx11extras
-Subproject d80236f50559f4fe785fba598a03aaa7f05d37a
+Subproject c6602af186fa87848954dd653022c1f879a8ae7
diff --git a/qtxmlpatterns b/qtxmlpatterns
-Subproject 3bada53c09f226398bcdeddfd633fd6df7c42ff
+Subproject 3b8801e7034e6b69053c377e1f13129a515f7e5