aboutsummaryrefslogtreecommitdiffstats
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---------qtrepotools0
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, 42 deletions
diff --git a/.gitmodules b/.gitmodules
index ce89d72b..f1a6f8e8 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 qtandroidextras
recommends = qtdeclarative
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 d6f62cc4ca72ee97711b47425fbcda988a8de83
+Subproject 4f22acfb8c3a22f5bdb30d202dedc5c1d3fa5cf
diff --git a/qtactiveqt b/qtactiveqt
-Subproject c2fed2369b31a6775aa52473b86ca9e3e07ab70
+Subproject 335fab5d1038721413ada794c2fcf760020137b
diff --git a/qtandroidextras b/qtandroidextras
-Subproject a2157a9dd2ee4ed3e998654595544dadaf129fe
+Subproject 7550365abc00bf994ae4c0ac93d4209541034dc
diff --git a/qtbase b/qtbase
-Subproject 8edc08ef78202f42f373efc6f0814744b01eac9
+Subproject 2776d663aa1b7788917b3d3d0bd2817e1c72a94
diff --git a/qtcanvas3d b/qtcanvas3d
-Subproject 80d7f92b9628076b681e509ddf8eae43cac550d
+Subproject 11dd5b60b278dacd630aed523fc4fcbc7fe2ffc
diff --git a/qtcharts b/qtcharts
-Subproject 27d2c7035b1812dc2bdf7f0e580a42c613199fd
+Subproject 4488348a357494afb0b805c9aec8a5eb7e4ee0b
diff --git a/qtconnectivity b/qtconnectivity
-Subproject 24a07f0a94a0ac036866c18ef415f06dd1fb8bb
+Subproject 8cdd3ed68bacfccfdbe719ef03f9f57ff3aa48e
diff --git a/qtdatavis3d b/qtdatavis3d
-Subproject 8a053119642986f8163b749c3c4f6a81a664509
+Subproject 191ace1edd7ce3b50a5b24a0536282c1e984c23
diff --git a/qtdeclarative b/qtdeclarative
-Subproject b1243b8c9ea0add1b7548428c8b0fcb8ee3ac71
+Subproject 9477ba4e423276fe70e507ddbcc6e087def9f0e
diff --git a/qtdoc b/qtdoc
-Subproject e99e9a0fa1dbaac63426404b1b04f4a9c67dbff
+Subproject 8470d253dbb2972f1d67b5781723944def09d1b
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 f878323a82fa69fcaeb37b42e10ba28759157f4
+Subproject 0a991262d13d2f4556b0007993f7e3d4755c51c
diff --git a/qtlocation b/qtlocation
-Subproject f93c464f7b0f2b3223a4d17cb52f6b5f4a6b000
+Subproject f88ee640ad69f3d77a790225f6e8c3e12437b49
diff --git a/qtmacextras b/qtmacextras
-Subproject 5f9b1bca4af0bc7801d513a9424c70b47812cf1
+Subproject 1eb21a6679d88ae478b7e5b770e7b9c3d0c5851
diff --git a/qtmultimedia b/qtmultimedia
-Subproject 306e8511602ac3c23778d6aef994269d17d3145
+Subproject 2845e10810a50d6cba4f19a27cfefac10b06929
diff --git a/qtnetworkauth b/qtnetworkauth
-Subproject 886942094513d4b32c7ff7358ee5dd23e8e0d83
+Subproject a9667ae676f2633fd2d22b02d60b03ce1e025a0
diff --git a/qtpurchasing b/qtpurchasing
-Subproject 51b83b74bb3d0ed406e28f89cbde1441782b82b
+Subproject f035b07cb66a5e874312e85f72b0501fbfa6215
diff --git a/qtquickcontrols b/qtquickcontrols
-Subproject 710058343297bba7cc44fa2369b7cec742f34cb
+Subproject 7d11f3c452d1d864caab54375a8ed17c0c607a2
diff --git a/qtquickcontrols2 b/qtquickcontrols2
-Subproject a8766caf09132bc08b7bc7eb3200607e2175d89
+Subproject 7dbe1348cc7270a28026b012610f5a2bbe7ae42
diff --git a/qtremoteobjects b/qtremoteobjects
-Subproject ec564258e7f990e698cffa181f6e75cb359fa57
+Subproject 79397e0a588b95b80ae701b6c868350be80cb20
diff --git a/qtrepotools b/qtrepotools
-Subproject dfb5e10927531c56d69115df1a1a8ebb494065e
+Subproject 5655cafd10c3247715cdaf99d857f25af2a4be1
diff --git a/qtscript b/qtscript
-Subproject 781c745277f9b4faa87d341b10ec0ca46eb45a7
+Subproject 35160ca46b46fe2c81a0400c455a9c500f14a15
diff --git a/qtscxml b/qtscxml
-Subproject 544f8c4ef7b77c5194605cba612fdde6fa02b06
+Subproject 011c9c90d5667588809618616637e2c910baeae
diff --git a/qtsensors b/qtsensors
-Subproject e8588efb2fbd4a31aa1e4349f03b2bc18e3c0e2
+Subproject c08e6e8d470ccbf6be845e7b6ce72158812ba62
diff --git a/qtserialbus b/qtserialbus
-Subproject 21538dece0e38e0d4ab9bc6b4580687b40a411f
+Subproject e0e89f0719497d43fcbd14a2c8d17bcaaf595a7
diff --git a/qtserialport b/qtserialport
-Subproject ea1a95d3567f1264126bf34218a5532ffb5afc5
+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 5f00c4762b0aaa15c700b896398e3f94a85769b
+Subproject 07bc7c02f958fa434a7b0e6db91da0b919ba049
diff --git a/qttranslations b/qttranslations
-Subproject f1c17f060d09ea3d225803afa9f82fa22117cd3
+Subproject e2ab66653d0c8ae59868ff5bc2a3a44d1b61cfd
diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard
-Subproject 7683c588600fb23f774cbdbb4aacb4dd44d073e
+Subproject dd0f312f04475da6a6d5f72a6af255c94181a6f
diff --git a/qtwayland b/qtwayland
-Subproject c5b6bec872b2f22ec7b8d749d5f72b5ed0c4ddd
+Subproject 32afae8fc7deef5e2f75218f7aae7e3f97bf2ab
diff --git a/qtwebchannel b/qtwebchannel
-Subproject 01241eb3704af785e8d98fb2f6e223ca62a6417
+Subproject 5e581099bca3bf014c84fa1cc8b56dd6381b507
diff --git a/qtwebengine b/qtwebengine
-Subproject 29a9f9d6e4ad9ffee62d3633edb17c1be335203
+Subproject d8e89fff35e5abfa429173c2bf4affdb2571ab1
diff --git a/qtwebglplugin b/qtwebglplugin
-Subproject a4e460a01f1962317093a5fb2170c869aead954
+Subproject 9c5d04e62719b4ec6e1e990ac9b05ec5092f8c2
diff --git a/qtwebsockets b/qtwebsockets
-Subproject 8a549aca7b371722cbf012d85216e4560ef1cf3
+Subproject fb4c1db2701b8dd921cf799a1d8286515b6ba4b
diff --git a/qtwebview b/qtwebview
-Subproject a499bd8b96715912948fbfe1ae435dc325c9d17
+Subproject 5b434773e7878e32d8461f424e7c794b1783035
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 bba31cef71694feba0248a37edc1c843a9405ce
+Subproject 97e2c53de2dc08c191e679c7ac3c7b1a4499fbf