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---------qtqa0
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
43 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 42a27f1a9ce319393a8e10a5f91b336e69fe2eb
+Subproject 8970de505234e959f3ba240de05972b6a760707
diff --git a/qtactiveqt b/qtactiveqt
-Subproject c2fed2369b31a6775aa52473b86ca9e3e07ab70
+Subproject fa265153d074b432a09cf7bf964cc53c56f0c12
diff --git a/qtandroidextras b/qtandroidextras
-Subproject a2157a9dd2ee4ed3e998654595544dadaf129fe
+Subproject a8a1f02f664f2120d79037afdf5dd72c24532fb
diff --git a/qtbase b/qtbase
-Subproject 3d53cf976dc41d136c0508ec05fa757fcf27f71
+Subproject 32da9ae38969c2e4f01968401339433e7909eed
diff --git a/qtcanvas3d b/qtcanvas3d
-Subproject 80d7f92b9628076b681e509ddf8eae43cac550d
+Subproject 34d1b109d9561010bebf7d679cbe3b399f7c253
diff --git a/qtcharts b/qtcharts
-Subproject 27d2c7035b1812dc2bdf7f0e580a42c613199fd
+Subproject 907f67e203ff3776c2c0f7807369d392d3dded8
diff --git a/qtconnectivity b/qtconnectivity
-Subproject 0a97e6cd908995699793b8513d3c7ef8020c2e3
+Subproject b87affb8b2353af57ed5e736d82d67eb56ea123
diff --git a/qtdatavis3d b/qtdatavis3d
-Subproject be7e45ca259d70d5f2ef0d11460261146fc1df9
+Subproject 096a9307596b319f73b05ff3f4b19e1cff4ed4e
diff --git a/qtdeclarative b/qtdeclarative
-Subproject 6b310e5f9a53c366fbb8fb78bd7c343aad4e0cd
+Subproject 41edb3bd9f373a865d5698ac8c18bf341071eae
diff --git a/qtdoc b/qtdoc
-Subproject e99e9a0fa1dbaac63426404b1b04f4a9c67dbff
+Subproject 0debf79a3cebf7b7695c6c6c2bb9cbda24c68ea
diff --git a/qtgamepad b/qtgamepad
-Subproject 313f221381507eee36c8e3bd0069b3e7962da14
+Subproject 63eab52c3c7de8cd018f01957192f47222608f6
diff --git a/qtgraphicaleffects b/qtgraphicaleffects
-Subproject 3e28d47cea038ca64c2e14ff449cc183c51643c
+Subproject 01fd5f84a2a126d99ff883b0941756adbda42f8
diff --git a/qtimageformats b/qtimageformats
-Subproject f878323a82fa69fcaeb37b42e10ba28759157f4
+Subproject 0e11d7a35c12d5fd7ca85922c3427a76c586da3
diff --git a/qtlocation b/qtlocation
-Subproject a692e59631bb1e8e0d4c0de8d2d6e68ca1c6cb6
+Subproject ad7ae2cd37875c03b0187f5009f302a9c667a32
diff --git a/qtmacextras b/qtmacextras
-Subproject 5f9b1bca4af0bc7801d513a9424c70b47812cf1
+Subproject e2965529d6d57854f5275d02833fd309bce7d15
diff --git a/qtmultimedia b/qtmultimedia
-Subproject 306e8511602ac3c23778d6aef994269d17d3145
+Subproject 2422d893392d25a94323ea7faf88ae9e8527ce3
diff --git a/qtnetworkauth b/qtnetworkauth
-Subproject 886942094513d4b32c7ff7358ee5dd23e8e0d83
+Subproject a9667ae676f2633fd2d22b02d60b03ce1e025a0
diff --git a/qtpurchasing b/qtpurchasing
-Subproject 51b83b74bb3d0ed406e28f89cbde1441782b82b
+Subproject 09fa5e33d0b040f28d2e59f92dd129497112628
diff --git a/qtqa b/qtqa
-Subproject e3754bc547c44aac2713d6245543ee3df484af8
+Subproject 0d050f36dc74adc3a7e29b1d51ccf55027d9c52
diff --git a/qtquickcontrols b/qtquickcontrols
-Subproject 949884153ae14724c30f17c75656aa0c6f07255
+Subproject a01f770f1d64770f8a81a53b812d1e086916fff
diff --git a/qtquickcontrols2 b/qtquickcontrols2
-Subproject 923e7c26fde2bc42d04902441691b7f7667460a
+Subproject 0836a69bdf84c7f0d63ef081c838b98bb38de41
diff --git a/qtremoteobjects b/qtremoteobjects
-Subproject 93dc5555a7f815f4366886e3af57718c4c169fc
+Subproject 79397e0a588b95b80ae701b6c868350be80cb20
diff --git a/qtrepotools b/qtrepotools
-Subproject dfb5e10927531c56d69115df1a1a8ebb494065e
+Subproject c112252bc2e0e35dbdc946171673fbc867a5299
diff --git a/qtscript b/qtscript
-Subproject 781c745277f9b4faa87d341b10ec0ca46eb45a7
+Subproject 3db429e2ce2cbe48a4a558080aaf1d0b81b220e
diff --git a/qtscxml b/qtscxml
-Subproject 544f8c4ef7b77c5194605cba612fdde6fa02b06
+Subproject 011c9c90d5667588809618616637e2c910baeae
diff --git a/qtsensors b/qtsensors
-Subproject e8588efb2fbd4a31aa1e4349f03b2bc18e3c0e2
+Subproject 0d56d37702b0c91578331321a7ccc1eccf20d77
diff --git a/qtserialbus b/qtserialbus
-Subproject 21538dece0e38e0d4ab9bc6b4580687b40a411f
+Subproject 02b6c226df743724b64922d93f796abab8c8df5
diff --git a/qtserialport b/qtserialport
-Subproject ea1a95d3567f1264126bf34218a5532ffb5afc5
+Subproject d0643d4a350c08b8a63558b11c0d63d97b99d78
diff --git a/qtspeech b/qtspeech
-Subproject d8bd5329cd4000151051ed25cda005b3b51aec8
+Subproject 073923402b8742cff873364a47aff40a32bbd47
diff --git a/qtsvg b/qtsvg
-Subproject 1787f95f5727a20a4f0871736ad987fcfdf0f3c
+Subproject 1f5a2f92d5c08a2ddaf5bf1aec2c33316483d54
diff --git a/qttools b/qttools
-Subproject dc10d71b180a4ac55dcf62a03f627183ce611c3
+Subproject 3ac0e6a5a227bdb566bd496fb622903c13f7367
diff --git a/qttranslations b/qttranslations
-Subproject f1c17f060d09ea3d225803afa9f82fa22117cd3
+Subproject b5511f56a82c954d99f162ca88b4cf8b15e4c18
diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard
-Subproject c1bc35736503e5ceaee1991745eb5a43a013be4
+Subproject 5a3408bf0f358511d998dcdd3b5022cf2e5f781
diff --git a/qtwayland b/qtwayland
-Subproject e3bc3877d667bc6b16e9790c35e2819ce421bd8
+Subproject 1b179f06feeb7e125d2a62805d4bef950bd6d9f
diff --git a/qtwebchannel b/qtwebchannel
-Subproject 01241eb3704af785e8d98fb2f6e223ca62a6417
+Subproject f6e67e1aea75e4d13e0ba88a90ea0d99fbe402c
diff --git a/qtwebengine b/qtwebengine
-Subproject 1bda20527b2c880e3f88926605ea37f9b67de26
+Subproject ab3ff4420536188ea2eee30156ce6a07b1c4aa3
diff --git a/qtwebglplugin b/qtwebglplugin
-Subproject d73338df3809c8551f387c7192725683d52746d
+Subproject 9c5d04e62719b4ec6e1e990ac9b05ec5092f8c2
diff --git a/qtwebsockets b/qtwebsockets
-Subproject 8a549aca7b371722cbf012d85216e4560ef1cf3
+Subproject 2a782fb0aa66b18f06d68dbb78d4762f6d8ea7d
diff --git a/qtwebview b/qtwebview
-Subproject fa66026beafaf00aa549f71d6879320610d0e7e
+Subproject 191d6da2922e519d265af972409504e3fd08709
diff --git a/qtwinextras b/qtwinextras
-Subproject e484402ad1d9b6d3b89333585b1ead97e4d2163
+Subproject acad214f65a28e9e81cb1cd1be3b05c5ab814e0
diff --git a/qtx11extras b/qtx11extras
-Subproject d80236f50559f4fe785fba598a03aaa7f05d37a
+Subproject a8de09c5da8e2743cd1ebf30b1048ca3d0dded6
diff --git a/qtxmlpatterns b/qtxmlpatterns
-Subproject c892ceec1c301f12d5c276e12be0bee8fd7d4cb
+Subproject 3a54479199a36851055c939bf441a18214041d2