aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitmodules80
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---------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---------qtwebkit0
m---------qtwebkit-examples0
m---------qtwebsockets0
m---------qtwebview0
m---------qtwinextras0
m---------qtx11extras0
m---------qtxmlpatterns0
42 files changed, 40 insertions, 40 deletions
diff --git a/.gitmodules b/.gitmodules
index f044480c..79aca023 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,66 +1,66 @@
[submodule "qtbase"]
path = qtbase
url = ../qtbase.git
- branch = 5.8
+ branch = dev
status = essential
[submodule "qtsvg"]
depends = qtbase
path = qtsvg
url = ../qtsvg.git
- branch = 5.8
+ branch = dev
status = addon
[submodule "qtdeclarative"]
depends = qtbase
recommends = qtsvg qtxmlpatterns
path = qtdeclarative
url = ../qtdeclarative.git
- branch = 5.8
+ branch = dev
status = essential
[submodule "qtactiveqt"]
depends = qtbase
path = qtactiveqt
url = ../qtactiveqt.git
- branch = 5.8
+ branch = dev
status = addon
[submodule "qtscript"]
depends = qtbase
recommends = qttools
path = qtscript
url = ../qtscript.git
- branch = 5.8
+ branch = dev
status = deprecated
[submodule "qtmultimedia"]
depends = qtbase
recommends = qtdeclarative
path = qtmultimedia
url = ../qtmultimedia.git
- branch = 5.8
+ branch = dev
status = essential
[submodule "qttools"]
depends = qtbase
recommends = qtdeclarative qtactiveqt qtwebkit
path = qttools
url = ../qttools.git
- branch = 5.8
+ branch = dev
status = essential
[submodule "qtxmlpatterns"]
depends = qtbase
path = qtxmlpatterns
url = ../qtxmlpatterns.git
- branch = 5.8
+ branch = dev
status = addon
[submodule "qttranslations"]
depends = qttools
path = qttranslations
url = ../qttranslations.git
- branch = 5.8
+ branch = dev
status = essential
priority = 30
[submodule "qtdoc"]
depends = qtdeclarative
path = qtdoc
url = ../qtdoc.git
- branch = 5.8
+ 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.8
+ 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.8
+ branch = dev
status = obsolete
[submodule "qtqa"]
depends = qtbase
@@ -96,14 +96,14 @@
recommends = qtdeclarative qtquickcontrols qtserialport
path = qtlocation
url = ../qtlocation.git
- branch = 5.8
+ branch = dev
status = addon
[submodule "qtsensors"]
depends = qtbase
recommends = qtdeclarative
path = qtsensors
url = ../qtsensors.git
- branch = 5.8
+ branch = dev
status = addon
[submodule "qtsystems"]
depends = qtbase
@@ -136,27 +136,27 @@
recommends = qtdeclarative qtandroidextras
path = qtconnectivity
url = ../qtconnectivity.git
- branch = 5.8
+ branch = dev
status = addon
[submodule "qtwayland"]
depends = qtbase
recommends = qtdeclarative
path = qtwayland
url = ../qtwayland.git
- branch = 5.8
+ branch = dev
status = addon
[submodule "qt3d"]
depends = qtdeclarative qtimageformats
recommends = qtgamepad
path = qt3d
url = ../qt3d.git
- branch = 5.8
+ branch = dev
status = addon
[submodule "qtimageformats"]
depends = qtbase
path = qtimageformats
url = ../qtimageformats.git
- branch = 5.8
+ branch = dev
status = addon
[submodule "qtquick1"]
depends = qtscript
@@ -169,51 +169,51 @@
depends = qtdeclarative
path = qtgraphicaleffects
url = ../qtgraphicaleffects.git
- branch = 5.8
+ branch = dev
status = addon
[submodule "qtquickcontrols"]
depends = qtdeclarative
recommends = qtgraphicaleffects
path = qtquickcontrols
url = ../qtquickcontrols.git
- branch = 5.8
+ branch = dev
status = essential
[submodule "qtserialbus"]
depends = qtserialport
path = qtserialbus
url = ../qtserialbus.git
- branch = 5.8
+ branch = dev
status = addon
[submodule "qtserialport"]
depends = qtbase
path = qtserialport
url = ../qtserialport.git
- branch = 5.8
+ branch = dev
status = addon
[submodule "qtx11extras"]
depends = qtbase
path = qtx11extras
url = ../qtx11extras.git
- branch = 5.8
+ branch = dev
status = addon
[submodule "qtmacextras"]
depends = qtbase
path = qtmacextras
url = ../qtmacextras.git
- branch = 5.8
+ branch = dev
status = addon
[submodule "qtwinextras"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtwinextras
url = ../qtwinextras.git
- branch = 5.8
+ branch = dev
status = addon
[submodule "qtandroidextras"]
depends = qtbase
path = qtandroidextras
url = ../qtandroidextras.git
- branch = 5.8
+ branch = dev
status = addon
[submodule "qtenginio"]
depends = qtdeclarative
@@ -226,94 +226,94 @@
recommends = qtdeclarative
path = qtwebsockets
url = ../qtwebsockets.git
- branch = 5.8
+ branch = dev
status = addon
[submodule "qtwebchannel"]
depends = qtbase
recommends = qtdeclarative qtwebsockets
path = qtwebchannel
url = ../qtwebchannel.git
- branch = 5.8
+ branch = dev
status = addon
[submodule "qtwebengine"]
depends = qtquickcontrols qtwebchannel
recommends = qtlocation
path = qtwebengine
url = ../qtwebengine.git
- branch = 5.8
+ branch = dev
status = addon
priority = 10
[submodule "qtcanvas3d"]
depends = qtdeclarative
path = qtcanvas3d
url = ../qtcanvas3d.git
- branch = 5.8
+ branch = dev
status = addon
[submodule "qtwebview"]
depends = qtdeclarative
recommends = qtwebengine
path = qtwebview
url = ../qtwebview.git
- branch = 5.8
+ branch = dev
status = addon
[submodule "qtquickcontrols2"]
depends = qtgraphicaleffects
path = qtquickcontrols2
url = ../qtquickcontrols2.git
- branch = 5.8
+ branch = dev
status = addon
[submodule "qtpurchasing"]
depends = qtbase qtandroidextras
recommends = qtdeclarative
path = qtpurchasing
url = ../qtpurchasing.git
- branch = 5.8
+ branch = dev
status = addon
[submodule "qtcharts"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtcharts
url = ../qtcharts.git
- branch = 5.8
+ branch = dev
status = addon
[submodule "qtdatavis3d"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtdatavis3d
url = ../qtdatavis3d.git
- branch = 5.8
+ branch = dev
status = addon
[submodule "qtvirtualkeyboard"]
depends = qtbase qtdeclarative qtsvg
recommends = qtmultimedia qtquickcontrols
path = qtvirtualkeyboard
url = ../qtvirtualkeyboard.git
- branch = 5.8
+ branch = dev
status = addon
[submodule "qtgamepad"]
depends = qtbase
recommends = qtdeclarative
path = qtgamepad
url = ../qtgamepad
- branch = 5.8
+ branch = dev
status = preview
[submodule "qtscxml"]
depends = qtbase qtdeclarative
path = qtscxml
url = ../qtscxml
- branch = 5.8
+ branch = dev
status = addon
[submodule "qtspeech"]
depends = qtbase
recommends = qtdeclarative qtmultimedia
path = qtspeech
url = ../qtspeech
- branch = 5.8
+ branch = dev
status = preview
[submodule "qtnetworkauth"]
depends = qtbase
recommends = qtwebview
path = qtnetworkauth
url = ../qtnetworkauth
- branch = 5.8
+ branch = dev
status = preview
diff --git a/qt3d b/qt3d
-Subproject 0e3d54f8d7f9be26687afebcc9f456e4cefc235
+Subproject 5476bc6b4b6a12c921da502c24c4e078b04dd3b
diff --git a/qtactiveqt b/qtactiveqt
-Subproject 21fa3e04b0febc0fa0a84d01eacd3831fd6628f
+Subproject 4111d888f74aff50b2fe22e90e33301a5c8b832
diff --git a/qtandroidextras b/qtandroidextras
-Subproject 8bd0a0e5215227c5e56966fead0987e306eaccb
+Subproject 9f8b2a6eb3930c52d414a7e84ca7d4600a9a47d
diff --git a/qtbase b/qtbase
-Subproject cd78457c6d33bdd7c01fbcd78e50bc99e9c9acc
+Subproject 6b7c1f5b82246146df0eb25950956307b64b094
diff --git a/qtcanvas3d b/qtcanvas3d
-Subproject 6c5121eab75e61f807c2df0f14988317f220b94
+Subproject ca5ed58518533976698471af214577af1f23e03
diff --git a/qtcharts b/qtcharts
-Subproject 6e224c11080feef2c6d7857d061a92e320e5089
+Subproject ced3a47d266938fd73a4b45f56cca4847cbb696
diff --git a/qtconnectivity b/qtconnectivity
-Subproject d6fd07c9260f5a1411f8e6468182f1096344b14
+Subproject b1992b66afb989419cabe7dbab42d6bea0d92c0
diff --git a/qtdatavis3d b/qtdatavis3d
-Subproject 96086b01a3e732cfb58cfd6e15a8dfc53550eb1
+Subproject bba7b9aced07a5183b3ba53c4c4cbccee471a69
diff --git a/qtdeclarative b/qtdeclarative
-Subproject 765f3afccb34b16c249c609d788374320cfbd25
+Subproject 65c7ddd9dd0c86bb532b6a2ad979141a8f24dfe
diff --git a/qtdoc b/qtdoc
-Subproject 334cb51e0d499cd2c60720744365681aaa37067
+Subproject 46776d67892e13c4db5c43be3721b2ae4445141
diff --git a/qtgamepad b/qtgamepad
-Subproject 5a149c75d71e5d50e941d773a3ef17e1372de10
+Subproject 5ded52c26f0a077f89df9342f8d7a570976a764
diff --git a/qtgraphicaleffects b/qtgraphicaleffects
-Subproject 8b5cb6185a014eb65150bef11aebdecb6a723ae
+Subproject 574f6c73a967ec9ec497534e35f442ef327c25b
diff --git a/qtimageformats b/qtimageformats
-Subproject 7795bb6c194692abbca31a9734c83a78362c806
+Subproject 9151e20dd2db7d96df9ef43900668bc814c7305
diff --git a/qtlocation b/qtlocation
-Subproject 408df3618681e668d6e330cbce1ebe524310760
+Subproject a12b4383be3155c98322ce746551217eb7ce50a
diff --git a/qtmacextras b/qtmacextras
-Subproject 57b5739923a741aa4317c11c5e86c911cc25f79
+Subproject f4ab6555e4f0db7dde3bc52feea0a5b13c29415
diff --git a/qtmultimedia b/qtmultimedia
-Subproject 08048b0ade60bdfb8e084b08345901b00f968e7
+Subproject 2d1c728c4c4522d0e405da514b6ce1a3580239f
diff --git a/qtnetworkauth b/qtnetworkauth
-Subproject ab389a568e0c088d4e5ced024ec2782439d8b2f
+Subproject 75855e9bfbaad72a2b8c3ff3107661abce9e67a
diff --git a/qtpurchasing b/qtpurchasing
-Subproject 9aa3e78fd1cc5ceceea6ccc647a04707c9260c2
+Subproject f1ec5772956fa27ec922516bcdf7f8a642fda3f
diff --git a/qtquickcontrols b/qtquickcontrols
-Subproject 3b093789b07c670e29d3275e26c4e7122db042a
+Subproject 271d1efc13d4534830e37fd12fa6202981da723
diff --git a/qtquickcontrols2 b/qtquickcontrols2
-Subproject 0e3636a4692c9cf89d994f3fe5c1c110b4c6ee6
+Subproject 320647bce7d968b5798dfc6946df555a548e3f8
diff --git a/qtrepotools b/qtrepotools
-Subproject eb645e912dca963645caed932b9adaf184df5f5
+Subproject 471da8d402b5d7b5cf3a1d95b29e06edfd14169
diff --git a/qtscript b/qtscript
-Subproject c2b958dcc02730e54bbaa271d21f88ccb5e6945
+Subproject 5c0e357028e378664190fc5e5ca0091e76b9cde
diff --git a/qtscxml b/qtscxml
-Subproject 9c9b556025d370bf70a60f46b1674a6c950fd49
+Subproject 56a8e427797a0bfc648e7a5f979bc9c6c40a309
diff --git a/qtsensors b/qtsensors
-Subproject df3374bd4bb8af1494f6a35b1102f15cfe9633e
+Subproject 3523afa703792fabc8bac3febe5541766bc1ccd
diff --git a/qtserialbus b/qtserialbus
-Subproject 0ce9c85d404f824e8df284f5f57345b2f903883
+Subproject b302c4e0c4458d51cb70ac3be03a14c561a976b
diff --git a/qtserialport b/qtserialport
-Subproject 0e79f14e56eb43abcb903d5ece41221f6032ef2
+Subproject 2edbb15471b92a7b9fb84db8aca0feeb8081b16
diff --git a/qtspeech b/qtspeech
-Subproject 59a279265f8f586f83b172c327af8865d426331
+Subproject 15e98bdbb4c0d065fcdeacd5ba6f6e8e69473e6
diff --git a/qtsvg b/qtsvg
-Subproject 5a00abdefd1c050aae8760dfc01ae5e3631077a
+Subproject 28caa8995d6872e665085f48f6efa770fc91220
diff --git a/qttools b/qttools
-Subproject ea6e06c59e901a5b1fc98bc82d15ba9b85e9faf
+Subproject 13946e382e7ab9418b4fe69a0b87a65d74c31bf
diff --git a/qttranslations b/qttranslations
-Subproject 64f3b105fb67d813512b287be6fdaec409d6d94
+Subproject 40e18a92fe3b704735a1fa1512f5b273dedf910
diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard
-Subproject 78fa7c11ea79067d819bbcbaa903086eae92901
+Subproject c9a252d2a16552143e83925040555df66a8841d
diff --git a/qtwayland b/qtwayland
-Subproject 8d437e79cdd41ede195ed1829d59b2b012b4d40
+Subproject 8c9e4e0a65016794152b3377cdf0898878ec4f0
diff --git a/qtwebchannel b/qtwebchannel
-Subproject bf66a8531e0ada3ade7e873bc3fae824237acd3
+Subproject 1cbc05a6568db5e0ff094f8e09723c607ade88a
diff --git a/qtwebengine b/qtwebengine
-Subproject 65c264f58969281392d4a4b42b35be9a352c7f7
+Subproject 7c79e0aeffd9ca557cfa6e9e66baec2b82137d0
diff --git a/qtwebkit b/qtwebkit
-Subproject 6c536617acb53b03be44bcb84767eb2bf35a16a
+Subproject a2120f40d275285dd78938ebe599c2574b87c37
diff --git a/qtwebkit-examples b/qtwebkit-examples
-Subproject 1a839b50564782feac2e5dd439686c2a0ed7d98
+Subproject c858361fb202c201f8c45e2072d913dc7f31ec8
diff --git a/qtwebsockets b/qtwebsockets
-Subproject ccb138548314a767a897496c74c04a261a39102
+Subproject 488aa3408604391ddcb1497a3193bc9a52af7e1
diff --git a/qtwebview b/qtwebview
-Subproject c275340496c36a0466dd66eba93031e89606c47
+Subproject 7584cdd53ccd5ca3ae2ee84b012b5819a6e1820
diff --git a/qtwinextras b/qtwinextras
-Subproject 13604e3fcc12a536d228f415ce65ca1c86b7015
+Subproject 8c562ab80ad9668670cfe17a08f16e46353b5a8
diff --git a/qtx11extras b/qtx11extras
-Subproject 0f91218091da69a81eb3e3336d1bdbe572a2190
+Subproject 1eb9325292586c356b6beb6d9056dfc0c4c2e50
diff --git a/qtxmlpatterns b/qtxmlpatterns
-Subproject 973105d9fb3372910255825e7395fb1156e24c0
+Subproject a7c672c05a29ee6894197c77063a307ea022a97