aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitmodules82
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---------qtwebkit0
m---------qtwebkit-examples0
m---------qtwebsockets0
m---------qtwebview0
m---------qtwinextras0
m---------qtx11extras0
m---------qtxmlpatterns0
42 files changed, 41 insertions, 41 deletions
diff --git a/.gitmodules b/.gitmodules
index 05660dba..9fbe0308 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,66 +1,66 @@
[submodule "qtbase"]
path = qtbase
url = ../qtbase.git
- branch = 5.9
+ branch = dev
status = essential
[submodule "qtsvg"]
depends = qtbase
path = qtsvg
url = ../qtsvg.git
- branch = 5.9
+ branch = dev
status = addon
[submodule "qtdeclarative"]
depends = qtbase
recommends = qtsvg qtxmlpatterns
path = qtdeclarative
url = ../qtdeclarative.git
- branch = 5.9
+ branch = dev
status = essential
[submodule "qtactiveqt"]
depends = qtbase
path = qtactiveqt
url = ../qtactiveqt.git
- branch = 5.9
+ branch = dev
status = addon
[submodule "qtscript"]
depends = qtbase
recommends = qttools
path = qtscript
url = ../qtscript.git
- branch = 5.9
+ branch = dev
status = deprecated
[submodule "qtmultimedia"]
depends = qtbase
recommends = qtdeclarative
path = qtmultimedia
url = ../qtmultimedia.git
- branch = 5.9
+ branch = dev
status = essential
[submodule "qttools"]
depends = qtbase
recommends = qtdeclarative qtactiveqt qtwebkit
path = qttools
url = ../qttools.git
- branch = 5.9
+ branch = dev
status = essential
[submodule "qtxmlpatterns"]
depends = qtbase
path = qtxmlpatterns
url = ../qtxmlpatterns.git
- branch = 5.9
+ branch = dev
status = addon
[submodule "qttranslations"]
depends = qttools
path = qttranslations
url = ../qttranslations.git
- branch = 5.9
+ branch = dev
status = essential
priority = 30
[submodule "qtdoc"]
depends = qtdeclarative
path = qtdoc
url = ../qtdoc.git
- branch = 5.9
+ 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.9
+ 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.9
+ branch = dev
status = obsolete
[submodule "qtqa"]
depends = qtbase
@@ -96,14 +96,14 @@
recommends = qtdeclarative qtquickcontrols qtserialport
path = qtlocation
url = ../qtlocation.git
- branch = 5.9
+ branch = dev
status = addon
[submodule "qtsensors"]
depends = qtbase
recommends = qtdeclarative
path = qtsensors
url = ../qtsensors.git
- branch = 5.9
+ branch = dev
status = addon
[submodule "qtsystems"]
depends = qtbase
@@ -136,27 +136,27 @@
recommends = qtdeclarative qtandroidextras
path = qtconnectivity
url = ../qtconnectivity.git
- branch = 5.9
+ branch = dev
status = addon
[submodule "qtwayland"]
depends = qtbase
recommends = qtdeclarative
path = qtwayland
url = ../qtwayland.git
- branch = 5.9
+ branch = dev
status = addon
[submodule "qt3d"]
depends = qtdeclarative qtimageformats
recommends = qtgamepad
path = qt3d
url = ../qt3d.git
- branch = 5.9
+ branch = dev
status = addon
[submodule "qtimageformats"]
depends = qtbase
path = qtimageformats
url = ../qtimageformats.git
- branch = 5.9
+ branch = dev
status = addon
[submodule "qtquick1"]
depends = qtscript
@@ -169,51 +169,51 @@
depends = qtdeclarative
path = qtgraphicaleffects
url = ../qtgraphicaleffects.git
- branch = 5.9
+ branch = dev
status = addon
[submodule "qtquickcontrols"]
depends = qtdeclarative
recommends = qtgraphicaleffects
path = qtquickcontrols
url = ../qtquickcontrols.git
- branch = 5.9
+ branch = dev
status = essential
[submodule "qtserialbus"]
depends = qtserialport
path = qtserialbus
url = ../qtserialbus.git
- branch = 5.9
+ branch = dev
status = addon
[submodule "qtserialport"]
depends = qtbase
path = qtserialport
url = ../qtserialport.git
- branch = 5.9
+ branch = dev
status = addon
[submodule "qtx11extras"]
depends = qtbase
path = qtx11extras
url = ../qtx11extras.git
- branch = 5.9
+ branch = dev
status = addon
[submodule "qtmacextras"]
depends = qtbase
path = qtmacextras
url = ../qtmacextras.git
- branch = 5.9
+ branch = dev
status = addon
[submodule "qtwinextras"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtwinextras
url = ../qtwinextras.git
- branch = 5.9
+ branch = dev
status = addon
[submodule "qtandroidextras"]
depends = qtbase
path = qtandroidextras
url = ../qtandroidextras.git
- branch = 5.9
+ branch = dev
status = addon
[submodule "qtenginio"]
depends = qtdeclarative
@@ -226,100 +226,100 @@
recommends = qtdeclarative
path = qtwebsockets
url = ../qtwebsockets.git
- branch = 5.9
+ branch = dev
status = addon
[submodule "qtwebchannel"]
depends = qtbase
recommends = qtdeclarative qtwebsockets
path = qtwebchannel
url = ../qtwebchannel.git
- branch = 5.9
+ branch = dev
status = addon
[submodule "qtwebengine"]
depends = qtquickcontrols qtwebchannel
recommends = qtlocation qttools
path = qtwebengine
url = ../qtwebengine.git
- branch = 5.9
+ branch = dev
status = addon
priority = 10
[submodule "qtcanvas3d"]
depends = qtdeclarative
path = qtcanvas3d
url = ../qtcanvas3d.git
- branch = 5.9
+ branch = dev
status = addon
[submodule "qtwebview"]
depends = qtdeclarative
recommends = qtwebengine
path = qtwebview
url = ../qtwebview.git
- branch = 5.9
+ branch = dev
status = addon
[submodule "qtquickcontrols2"]
depends = qtgraphicaleffects
path = qtquickcontrols2
url = ../qtquickcontrols2.git
- branch = 5.9
+ branch = dev
status = addon
[submodule "qtpurchasing"]
depends = qtbase qtandroidextras
recommends = qtdeclarative
path = qtpurchasing
url = ../qtpurchasing.git
- branch = 5.9
+ branch = dev
status = addon
[submodule "qtcharts"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtcharts
url = ../qtcharts.git
- branch = 5.9
+ branch = dev
status = addon
[submodule "qtdatavis3d"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtdatavis3d
url = ../qtdatavis3d.git
- branch = 5.9
+ branch = dev
status = addon
[submodule "qtvirtualkeyboard"]
depends = qtbase qtdeclarative qtsvg
recommends = qtmultimedia qtquickcontrols
path = qtvirtualkeyboard
url = ../qtvirtualkeyboard.git
- branch = 5.9
+ branch = dev
status = addon
[submodule "qtgamepad"]
depends = qtbase
recommends = qtdeclarative
path = qtgamepad
url = ../qtgamepad
- branch = 5.9
+ branch = dev
status = addon
[submodule "qtscxml"]
depends = qtbase qtdeclarative
path = qtscxml
url = ../qtscxml
- branch = 5.9
+ branch = dev
status = addon
[submodule "qtspeech"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtspeech
url = ../qtspeech
- branch = 5.9
+ branch = dev
status = preview
[submodule "qtnetworkauth"]
depends = qtbase
recommends = qtwebview
path = qtnetworkauth
url = ../qtnetworkauth
- branch = 5.9
+ branch = dev
status = preview
[submodule "qtremoteobjects"]
depends = qtbase
path = qtremoteobjects
url = ../qtremoteobjects
- branch = 5.9
+ branch = dev
status = preview
diff --git a/qt3d b/qt3d
-Subproject ff6089aca0ec77c6304a04de268e6d27e97d6c3
+Subproject 94259717f42105fe85fbf2aa449cabcdca5d347
diff --git a/qtactiveqt b/qtactiveqt
-Subproject c0d93d408d4eafcaab06d455b8c3ce1e2c21f8d
+Subproject 493fc27bfe74517e2ac46dbfa8935183085be8c
diff --git a/qtandroidextras b/qtandroidextras
-Subproject 3f9e924417c13f2026fda503a1620f517370466
+Subproject d46f5be033912da14c0c4305657d9815e190dfe
diff --git a/qtbase b/qtbase
-Subproject 593a707ba35c22c0a1061dce745deceed8837f8
+Subproject 8d0b46c3ae506ee81d37755083708fbdee2a712
diff --git a/qtcanvas3d b/qtcanvas3d
-Subproject 3ac87eeb59dd7ec0351d76a05dd7cfa22a274e5
+Subproject 88573c72949b4540ee1456375c64f6262c94a47
diff --git a/qtcharts b/qtcharts
-Subproject e0ba5ac91dbb1fe3611118239c00ea8d748e567
+Subproject 9310c07aac07efcdeafe83ada1e235b0b99e19e
diff --git a/qtconnectivity b/qtconnectivity
-Subproject 402cbe22407133a38e319af7af676e68708c577
+Subproject 3490bc836925f34608a876ba2e94a073c5b3879
diff --git a/qtdatavis3d b/qtdatavis3d
-Subproject fc946bae2969cacb3ffa822ab033231ea1185b2
+Subproject 5adf257bebf2df7f54b92fb724cd547dc58a116
diff --git a/qtdeclarative b/qtdeclarative
-Subproject 71a2dbed467be0041b6793dda868655b2632e83
+Subproject afec9016d0fd51345ea93a1bbadb99b5c3fdf62
diff --git a/qtdoc b/qtdoc
-Subproject 7c7607b2f26548734a05b8d6fb74ce0a6fa664e
+Subproject b54f39b5c54d14a8a6ae3cd57c35b68fca0894c
diff --git a/qtgamepad b/qtgamepad
-Subproject fdce0bd433f4a219a371db4091b18cc48209b04
+Subproject d0981a74998205016076604884244c95c9cd83a
diff --git a/qtgraphicaleffects b/qtgraphicaleffects
-Subproject a3a229bd2ace8fc4f874304e60cf1cb74f294d7
+Subproject d424a1d208f09431d62e1de391dfaa037742456
diff --git a/qtimageformats b/qtimageformats
-Subproject d2306d74850986692c02b70df0d7a6a6e933d0d
+Subproject 834bb773e36c974748f7ee947b4f07088ee6f5f
diff --git a/qtlocation b/qtlocation
-Subproject e463bf8f4ae1eb94b4f91cb6ebca4b198e86bcc
+Subproject 1e9250c34bf841fe01a5b3c609d9093cb791840
diff --git a/qtmacextras b/qtmacextras
-Subproject a931d0799b46123422582635b79d217eee0ae6b
+Subproject 672d1d55a42306d74e638e78c7131d7405ffb6d
diff --git a/qtmultimedia b/qtmultimedia
-Subproject ed8f90d0e47bd4ade7be3852627395ac66ba32e
+Subproject e26e0edd0c3a0e6120008c8a146d8514163930c
diff --git a/qtnetworkauth b/qtnetworkauth
-Subproject 279adce9bb578749161899bfe82cfb6c8b9b6f0
+Subproject 027d979d57ea946ade2778a4be5dc160b786fb3
diff --git a/qtpurchasing b/qtpurchasing
-Subproject 00c6b792a95d72a4deb2bb89d0ba8cbb5268199
+Subproject cf3693e2dc5dbaeb3c12ff2eacb760c27480e3b
diff --git a/qtquickcontrols b/qtquickcontrols
-Subproject ba81daa6f58992f0724f0a43590fae3453d3948
+Subproject 43d417b127215f53cb01ac14a558fec705fbf4a
diff --git a/qtquickcontrols2 b/qtquickcontrols2
-Subproject eb082fe715e23f55d24b3cf7528857167831f57
+Subproject 91d1fc42d37501555fea3674b93f5fd81401b51
diff --git a/qtremoteobjects b/qtremoteobjects
-Subproject 2c7268a3360d8174c34b037564a721971ec6767
+Subproject 570ab25a1302fbd61d0d2f32da1ea8603852e3b
diff --git a/qtscript b/qtscript
-Subproject 61d135d1c0ae52a756cf62144210fa73c9ea552
+Subproject e6112cffa4597e6b8f8fa6c9ea86a900baa9895
diff --git a/qtscxml b/qtscxml
-Subproject 63904309552bc6dd39fcfda086b81c1b9bee0a0
+Subproject 45e2a4826705c7489b77d28ae706474b9402262
diff --git a/qtsensors b/qtsensors
-Subproject 5863c695ee8eef2976026dea876e37b8978d0c7
+Subproject bd1e063980355c82bb20af81a826a2860248ce6
diff --git a/qtserialbus b/qtserialbus
-Subproject 38703176f77ededf1b44946a6c38d6998c5e679
+Subproject 66b58e22681b6d6db340a83017f927869dfd0ed
diff --git a/qtserialport b/qtserialport
-Subproject 1340fedecd841765485beffa7c93320c96f21cd
+Subproject 8d7f133ed22bbb10274e4a9f166bd9732522895
diff --git a/qtspeech b/qtspeech
-Subproject 5135fefe90b7a5ff9bebe012ed4f1688fe096f9
+Subproject 7f954d6bcdbedf8257be9128c96217c91370f0e
diff --git a/qtsvg b/qtsvg
-Subproject 7cc50e972b7fa546f7cedff2ef19db20af9e36a
+Subproject 1aec05432bc596ececf78570b6ef035cfda1e5c
diff --git a/qttools b/qttools
-Subproject ce8ad09e69d5732787312c362464a3ce0c5fa58
+Subproject d7cbabad13d9c8907c87dcd994f42be14c36345
diff --git a/qttranslations b/qttranslations
-Subproject 365bfb2ef769241e798b7c222a63ff68348d87c
+Subproject e51b921f6fa0fb64a8a7f4159024d1a2f187277
diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard
-Subproject 18f37cf7410beb698855a38a1af458d51d64e3f
+Subproject f8a679a49242efce46fb3160cdd15b15008ba4d
diff --git a/qtwayland b/qtwayland
-Subproject a259232f3a661b8916497b056cb3d50c396c3d9
+Subproject 792a7251dcf3e2783dc94e72a4ff9042671b9ee
diff --git a/qtwebchannel b/qtwebchannel
-Subproject 196097bfc84d297199ea591fc19e714c88796e8
+Subproject ed4be1f75314ddc004ea7c0d7c6af715252e4e5
diff --git a/qtwebengine b/qtwebengine
-Subproject 352115e2aeb8ba8c2bf4897f40b9e26555b7c80
+Subproject 08eef49a53a9dda35b7a0efce04b5b298e4f320
diff --git a/qtwebkit b/qtwebkit
-Subproject 0b30e4490f7500ade1868fb33cea8705418c90b
+Subproject 7e104c57a70fdf551bb3d22a5d637cdcbc69dbe
diff --git a/qtwebkit-examples b/qtwebkit-examples
-Subproject c858361fb202c201f8c45e2072d913dc7f31ec8
+Subproject 7efef7478b60f6aeb7babb0663234cf8dcb8a26
diff --git a/qtwebsockets b/qtwebsockets
-Subproject 1af97a5f04d4d7d0dbf9954397e2374a791d717
+Subproject e5133f4f0bb7c01d7bd7fc499d8c148c03a5b50
diff --git a/qtwebview b/qtwebview
-Subproject 0218b63446186b659333bd3cbfd6f69ed172299
+Subproject cd383f858ba63199c2a7b1a498d3da9d6b73121
diff --git a/qtwinextras b/qtwinextras
-Subproject c5159ecfc36bc0f9bff45de78accd104b963706
+Subproject 17585323dda73309a915baa93807ad5b8c5a5e7
diff --git a/qtx11extras b/qtx11extras
-Subproject 5ecce026f65b2fb320379e49e70f772ad2bbba6
+Subproject de4c1f09a00884a959bf7f53d38c204d14064c2
diff --git a/qtxmlpatterns b/qtxmlpatterns
-Subproject a5b1e6e35e32719647c7f9b3de3953838d40d80
+Subproject 141d12bd6d8c51bc92128654a084b36c6b74712