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---------qtdocgallery0
m---------qtenginio0
m---------qtfeedback0
m---------qtgamepad0
m---------qtgraphicaleffects0
m---------qtimageformats0
m---------qtlocation0
m---------qtmacextras0
m---------qtmultimedia0
m---------qtpim0
m---------qtpurchasing0
m---------qtquick10
m---------qtquickcontrols0
m---------qtquickcontrols20
m---------qtscript0
m---------qtscxml0
m---------qtsensors0
m---------qtserialbus0
m---------qtserialport0
m---------qtspeech0
m---------qtsvg0
m---------qtsystems0
m---------qttools0
m---------qttranslations0
m---------qtvirtualkeyboard0
m---------qtwayland0
m---------qtwebchannel0
m---------qtwebengine0
m---------qtwebkit0
m---------qtwebkit-examples0
m---------qtwebsockets0
m---------qtwebview0
m---------qtwinextras0
m---------qtx11extras0
m---------qtxmlpatterns0
46 files changed, 42 insertions, 42 deletions
diff --git a/.gitmodules b/.gitmodules
index b88ba6a4..977a8947 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,66 +1,66 @@
[submodule "qtbase"]
path = qtbase
url = ../qtbase.git
- branch = 5.7
+ branch = dev
status = essential
[submodule "qtsvg"]
depends = qtbase
path = qtsvg
url = ../qtsvg.git
- branch = 5.7
+ branch = dev
status = addon
[submodule "qtdeclarative"]
depends = qtbase
recommends = qtsvg qtxmlpatterns
path = qtdeclarative
url = ../qtdeclarative.git
- branch = 5.7
+ branch = dev
status = essential
[submodule "qtactiveqt"]
depends = qtbase
path = qtactiveqt
url = ../qtactiveqt.git
- branch = 5.7
+ branch = dev
status = addon
[submodule "qtscript"]
depends = qtbase
recommends = qttools
path = qtscript
url = ../qtscript.git
- branch = 5.7
+ branch = dev
status = deprecated
[submodule "qtmultimedia"]
depends = qtbase
recommends = qtdeclarative
path = qtmultimedia
url = ../qtmultimedia.git
- branch = 5.7
+ branch = dev
status = essential
[submodule "qttools"]
depends = qtbase
recommends = qtdeclarative qtactiveqt qtwebkit
path = qttools
url = ../qttools.git
- branch = 5.7
+ branch = dev
status = essential
[submodule "qtxmlpatterns"]
depends = qtbase
path = qtxmlpatterns
url = ../qtxmlpatterns.git
- branch = 5.7
+ branch = dev
status = addon
[submodule "qttranslations"]
depends = qttools
path = qttranslations
url = ../qttranslations.git
- branch = 5.7
+ branch = dev
status = essential
priority = 30
[submodule "qtdoc"]
depends = qtdeclarative
path = qtdoc
url = ../qtdoc.git
- branch = 5.7
+ branch = dev
status = essential
priority = 40
[submodule "qtrepotools"]
@@ -74,7 +74,7 @@
recommends = qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel qtxmlpatterns
path = qtwebkit
url = ../qtwebkit.git
- branch = 5.7
+ branch = dev
status = obsolete
project = WebKit.pro
priority = 20
@@ -82,7 +82,7 @@
depends = qtwebkit qttools
path = qtwebkit-examples
url = ../qtwebkit-examples.git
- branch = 5.7
+ branch = dev
status = obsolete
[submodule "qtqa"]
depends = qtbase
@@ -96,21 +96,21 @@
recommends = qtdeclarative qtquickcontrols qtserialport qtsystems
path = qtlocation
url = ../qtlocation.git
- branch = 5.7
+ branch = dev
status = addon
[submodule "qtsensors"]
depends = qtbase
recommends = qtdeclarative
path = qtsensors
url = ../qtsensors.git
- branch = 5.7
+ branch = dev
status = addon
[submodule "qtsystems"]
depends = qtbase
recommends = qtdeclarative
path = qtsystems
url = ../qtsystems.git
- branch = 5.7
+ branch = dev
status = ignore
[submodule "qtfeedback"]
depends = qtdeclarative
@@ -129,179 +129,179 @@
depends = qtdeclarative
path = qtpim
url = ../qtpim.git
- branch = 5.7
+ branch = dev
status = ignore
[submodule "qtconnectivity"]
depends = qtbase
recommends = qtdeclarative qtandroidextras
path = qtconnectivity
url = ../qtconnectivity.git
- branch = 5.7
+ branch = dev
status = addon
[submodule "qtwayland"]
depends = qtbase
recommends = qtdeclarative
path = qtwayland
url = ../qtwayland.git
- branch = 5.7
+ branch = dev
status = addon
[submodule "qt3d"]
depends = qtdeclarative qtimageformats
recommends = qtgamepad
path = qt3d
url = ../qt3d.git
- branch = 5.7
+ branch = dev
status = addon
[submodule "qtimageformats"]
depends = qtbase
path = qtimageformats
url = ../qtimageformats.git
- branch = 5.7
+ branch = dev
status = addon
[submodule "qtquick1"]
depends = qtscript
recommends = qtsvg qtxmlpatterns
path = qtquick1
url = ../qtquick1.git
- branch = 5.7
+ branch = dev
status = ignore
[submodule "qtgraphicaleffects"]
depends = qtdeclarative
path = qtgraphicaleffects
url = ../qtgraphicaleffects.git
- branch = 5.7
+ branch = dev
status = addon
[submodule "qtquickcontrols"]
depends = qtdeclarative
recommends = qtgraphicaleffects
path = qtquickcontrols
url = ../qtquickcontrols.git
- branch = 5.7
+ branch = dev
status = essential
[submodule "qtserialbus"]
depends = qtserialport
path = qtserialbus
url = ../qtserialbus.git
- branch = 5.7
+ branch = dev
status = preview
[submodule "qtserialport"]
depends = qtbase
path = qtserialport
url = ../qtserialport.git
- branch = 5.7
+ branch = dev
status = addon
[submodule "qtx11extras"]
depends = qtbase
path = qtx11extras
url = ../qtx11extras.git
- branch = 5.7
+ branch = dev
status = addon
[submodule "qtmacextras"]
depends = qtbase
path = qtmacextras
url = ../qtmacextras.git
- branch = 5.7
+ branch = dev
status = addon
[submodule "qtwinextras"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtwinextras
url = ../qtwinextras.git
- branch = 5.7
+ branch = dev
status = addon
[submodule "qtandroidextras"]
depends = qtbase
path = qtandroidextras
url = ../qtandroidextras.git
- branch = 5.7
+ branch = dev
status = addon
[submodule "qtenginio"]
depends = qtdeclarative
path = qtenginio
url = ../qtenginio.git
- branch = 5.7
+ branch = dev
status = ignore
[submodule "qtwebsockets"]
depends = qtbase
recommends = qtdeclarative
path = qtwebsockets
url = ../qtwebsockets.git
- branch = 5.7
+ branch = dev
status = addon
[submodule "qtwebchannel"]
depends = qtbase
recommends = qtdeclarative qtwebsockets
path = qtwebchannel
url = ../qtwebchannel.git
- branch = 5.7
+ branch = dev
status = addon
[submodule "qtwebengine"]
depends = qtquickcontrols qtwebchannel
recommends = qtlocation
path = qtwebengine
url = ../qtwebengine.git
- branch = 5.7
+ branch = dev
status = addon
priority = 10
[submodule "qtcanvas3d"]
depends = qtdeclarative
path = qtcanvas3d
url = ../qtcanvas3d.git
- branch = 5.7
+ branch = dev
status = addon
[submodule "qtwebview"]
depends = qtdeclarative
recommends = qtwebengine
path = qtwebview
url = ../qtwebview.git
- branch = 5.7
+ branch = dev
status = addon
[submodule "qtquickcontrols2"]
depends = qtgraphicaleffects
path = qtquickcontrols2
url = ../qtquickcontrols2.git
- branch = 5.7
+ branch = dev
status = addon
[submodule "qtpurchasing"]
depends = qtbase
recommends = qtdeclarative
path = qtpurchasing
url = ../qtpurchasing.git
- branch = 5.7
+ branch = dev
status = addon
[submodule "qtcharts"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtcharts
url = ../qtcharts.git
- branch = 5.7
+ branch = dev
status = addon
[submodule "qtdatavis3d"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtdatavis3d
url = ../qtdatavis3d.git
- branch = 5.7
+ branch = dev
status = addon
[submodule "qtvirtualkeyboard"]
depends = qtbase qtdeclarative qtsvg
recommends = qtmultimedia qtquickcontrols
path = qtvirtualkeyboard
url = ../qtvirtualkeyboard.git
- branch = 5.7
+ branch = dev
status = addon
[submodule "qtgamepad"]
depends = qtbase
recommends = qtdeclarative
path = qtgamepad
url = ../qtgamepad
- branch = 5.7
+ branch = dev
status = preview
[submodule "qtscxml"]
depends = qtbase qtdeclarative
path = qtscxml
url = ../qtscxml
- branch = 5.7
+ branch = dev
status = preview
[submodule "qtspeech"]
depends = qtbase
diff --git a/qt3d b/qt3d
-Subproject db3baec236841f9390e9450772838cb7ba87806
+Subproject 6ebef79d390c79cd5ed792b96faa46d60737d36
diff --git a/qtactiveqt b/qtactiveqt
-Subproject 5508cd19d17c2b2a94aef94be2b4dcdbb29377e
+Subproject 45cd9f66f42c595ff429475170b6e623669363a
diff --git a/qtandroidextras b/qtandroidextras
-Subproject 2622247a0c68a785a794033957e88224063e9c4
+Subproject c944c05ca4e4d42b6b11721ddc763f1525d6fcf
diff --git a/qtbase b/qtbase
-Subproject dbfd7f304c4d91096e104ec2383d92a37502d83
+Subproject 955b2bdfc0cb1d707f8914be230e5e00c548b6a
diff --git a/qtcanvas3d b/qtcanvas3d
-Subproject 269b1d5699f6c95d46553e7ee547f1c4b7545e6
+Subproject 8ba6dec8b2adf79826d31ae00c048564025e86c
diff --git a/qtcharts b/qtcharts
-Subproject c121fb4ad00bc9617a011e040ef5ed695610a50
+Subproject 2817f58b59837689717635d3213d169307f4baa
diff --git a/qtconnectivity b/qtconnectivity
-Subproject dc1e5850237660df4c64c5ed29e5f7824be6ce8
+Subproject 1e31c7028208bd267dfd513b036b6a7a7811822
diff --git a/qtdatavis3d b/qtdatavis3d
-Subproject 2523056490c3f7a35d176deb583ba46899fe260
+Subproject 43c0bfb2af436f6b27cdccb156ecac1d1f3711d
diff --git a/qtdeclarative b/qtdeclarative
-Subproject 6839f03051d2950e4721cbb5ee88fa7b0710958
+Subproject 234e762265f0b538e65d610751b8488cb596824
diff --git a/qtdoc b/qtdoc
-Subproject a684f23ecb5e99ba2ac73b0a412ae8d1f29b4f2
+Subproject effeb8fde1c5211fee0258116ffab98cfecb54f
diff --git a/qtdocgallery b/qtdocgallery
-Subproject 2da36eb615f6f8f06a456d65c45547937b47beb
+Subproject e36e6f0abd45c2794c70c31eb10c5263e7e7a29
diff --git a/qtenginio b/qtenginio
-Subproject 15090ec53621211616c4136ab37e0332c3ae709
+Subproject b0ad5907f480307853f7ac951bacfaa61dcbd94
diff --git a/qtfeedback b/qtfeedback
-Subproject 28ca62414901502189ea28ef2efd55138618761
+Subproject 9ac8d8c272fc93416016e094fc6b97226a40008
diff --git a/qtgamepad b/qtgamepad
-Subproject 42dbf4712ed9815b457ec80a2ed56de685fb2b6
+Subproject 914f113067fc770b93b27df17f5aa81a7ba7bad
diff --git a/qtgraphicaleffects b/qtgraphicaleffects
-Subproject f536e36e3188903404fac78064ea7872dd8cc0d
+Subproject 8b5cb6185a014eb65150bef11aebdecb6a723ae
diff --git a/qtimageformats b/qtimageformats
-Subproject 167f91bebe2ee53fcd13d843dc9e0aad80b92d8
+Subproject fd61bbad4be0b9e839f882f9681f0732d2bbce3
diff --git a/qtlocation b/qtlocation
-Subproject 19642842cea91a4588828362eba023c5da5ab57
+Subproject 6f34c2ac75bdbfb679b5f4767006ad6a373cabb
diff --git a/qtmacextras b/qtmacextras
-Subproject f3d6e8eed740aff58891827e0061d213a7e512c
+Subproject e0e5a57430af761192b98292fab73284d351e4f
diff --git a/qtmultimedia b/qtmultimedia
-Subproject 29a46aa4ac38bf9faedbaca6d1c191d38d2db07
+Subproject 268277552bd65119a72c75c9eb792cd0a70859b
diff --git a/qtpim b/qtpim
-Subproject de4cfc6b53b426799a035fefe81db9d49d3d03a
+Subproject 02efef5ee63bf2407526f81fd6b68f5a59ac1de
diff --git a/qtpurchasing b/qtpurchasing
-Subproject dc6d9e0ef119d2d4337c6366669220443e553e6
+Subproject 82dcabc583242caa8fe4291f6e34e5380ff4d79
diff --git a/qtquick1 b/qtquick1
-Subproject 26229cfa0b729313893af5674d604e8692dbb94
+Subproject 92c847e56d94c9032f3fa83922742e455233e4f
diff --git a/qtquickcontrols b/qtquickcontrols
-Subproject 22fab1502f562bccb3c16dde0288aa867e3b094
+Subproject dc1d95819365202e2745faffe31e13d928742c4
diff --git a/qtquickcontrols2 b/qtquickcontrols2
-Subproject b63d182dc2ab737a814bdee06f20907bec9c26e
+Subproject e9855d8ac8afed5371330f4f83f7b7dd51d9026
diff --git a/qtscript b/qtscript
-Subproject 52873703412bce5d295a1351d32b0f72fb4bedd
+Subproject 059fc10f8f70a65265a27c354322099806d23d7
diff --git a/qtscxml b/qtscxml
-Subproject a3bfb9e792e4a8dd5f16a4b51d45c3af0eaae80
+Subproject 16348dfb793da0601ddd1bfae4da4ed2eca74e2
diff --git a/qtsensors b/qtsensors
-Subproject beac0b2e3ea4b292f0473c00bcf68d75360f89e
+Subproject b421290b67507cfe125db206f378fc1b38eaae4
diff --git a/qtserialbus b/qtserialbus
-Subproject 398eda8be9eb3415ca44cc35dad3422311d8e22
+Subproject e62cf39e68055f6a39dfab23ecbdb33f9e5ffc7
diff --git a/qtserialport b/qtserialport
-Subproject 10967b1443720116744ecfc42fe442681d149c5
+Subproject 8fa108de666e815053c6e586f1efabc592ae20a
diff --git a/qtspeech b/qtspeech
-Subproject ca8768b90c07bff5804b1fbb704041a4472f65e
+Subproject aa24a101e89871a1df056952466ca774b30d1ef
diff --git a/qtsvg b/qtsvg
-Subproject 55825068ab0e3102bf5f8843c0cccab1ff120ae
+Subproject 29cc2a47b9548e1002e981b43eec10fbf8af979
diff --git a/qtsystems b/qtsystems
-Subproject cc2077700bd5503d1fcf53aef83cbb76975e745
+Subproject 434af789f0d56ca7a521ca2d9ec8cf3b1057fd3
diff --git a/qttools b/qttools
-Subproject cb72077e562a5a53e52f7ac94b0c3c26320c624
+Subproject 517d8268eb3b96fa7e43ef406c9d1999614418c
diff --git a/qttranslations b/qttranslations
-Subproject 38d6c3fe848487970640068ec12fc0c87a2938e
+Subproject 154f6a90b0fe0726138de8aba1dc23bea0d4523
diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard
-Subproject ad1da1a8c3be6ec804f3965b47d0762654f8173
+Subproject f8ec4e6a1b1356700c165ee703465fe2bbb827b
diff --git a/qtwayland b/qtwayland
-Subproject 19cdda76e8e1803c3c36252088e2f8d756e7cbe
+Subproject 8bd79c7d37bc5dc72e9fffb43e01bd7ddc93b94
diff --git a/qtwebchannel b/qtwebchannel
-Subproject d342edcc22d3c9c0299e86805d93e7031507345
+Subproject a5d51e11b76d8f6a6276f7e89bf0ccbc2985d47
diff --git a/qtwebengine b/qtwebengine
-Subproject 801356387748f237b7dc24f9772774573fd83ef
+Subproject 179463fd2b17343dae291ab6f7617311bcfbdb7
diff --git a/qtwebkit b/qtwebkit
-Subproject d9ca6bcb08d9560e91a1ca1fe4542c26791b26c
+Subproject ab6df191029eeeb0b0f16f127d553265659f739
diff --git a/qtwebkit-examples b/qtwebkit-examples
-Subproject 1ac4ee240214a0e36b504fa1bcbc0c716d50620
+Subproject 1a839b50564782feac2e5dd439686c2a0ed7d98
diff --git a/qtwebsockets b/qtwebsockets
-Subproject 38d830d00fc2f8c196d736094448e55623e4b35
+Subproject 32c3d9bb5a8825296cdfc92ffeeb44f74efbb63
diff --git a/qtwebview b/qtwebview
-Subproject 08cb6659a4bfd441760c26ab7f405c439c7d6ca
+Subproject c4031710944db746bc5787120ec0bccb2e71b96
diff --git a/qtwinextras b/qtwinextras
-Subproject 93a998f5ef31f7d9f8dd72909c4342db84cc1b5
+Subproject 11c1390b44cc0398ae8739eb2e7a440140fa617
diff --git a/qtx11extras b/qtx11extras
-Subproject 30b0e73404e7638fdf802990e81b98143f45c34
+Subproject 643447cca3703f3473e0d21bf18e20fa382bc07
diff --git a/qtxmlpatterns b/qtxmlpatterns
-Subproject 30a4041893c8132040cd982c9ca120434580175
+Subproject 33b456b7868f05817a4da898ff01de4552a2898