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 f3230e8d..16393b28 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 qtquickcontrols2 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 dcf35b5cc8a23fa01e6496694e944501e92ea42
+Subproject 0ba3824ac24cb435c095713e24250c87d184fd9
diff --git a/qtactiveqt b/qtactiveqt
-Subproject d79b396442753f71b8e498a991c7dd85538c750
+Subproject 493fc27bfe74517e2ac46dbfa8935183085be8c
diff --git a/qtandroidextras b/qtandroidextras
-Subproject f0561e640a488fa1870cacaae897133c7fdf636
+Subproject 7c7915a2e750327a862e1117b05b9ad40955644
diff --git a/qtbase b/qtbase
-Subproject 15fe60cfdada84ea519f08e905d59cc3fb6d20c
+Subproject e3ea95f81fa526b36f04e4052265b0554604889
diff --git a/qtcanvas3d b/qtcanvas3d
-Subproject ca69fc961724d3a31c90e29ce3a7618b94b7c21
+Subproject 88573c72949b4540ee1456375c64f6262c94a47
diff --git a/qtcharts b/qtcharts
-Subproject d7d8bb10b6d4413376624a85760df857096955c
+Subproject 9310c07aac07efcdeafe83ada1e235b0b99e19e
diff --git a/qtconnectivity b/qtconnectivity
-Subproject 51914eff36cb99823757bf2c970df46081351d3
+Subproject 3490bc836925f34608a876ba2e94a073c5b3879
diff --git a/qtdatavis3d b/qtdatavis3d
-Subproject 1a4d36afc821d745fe304f222e73d6c2fa249af
+Subproject 5adf257bebf2df7f54b92fb724cd547dc58a116
diff --git a/qtdeclarative b/qtdeclarative
-Subproject e2863c80fed06104eedfe83bce2737f2d24908a
+Subproject 12569460e765ea01935ab60e06b5a5acf770ebe
diff --git a/qtdoc b/qtdoc
-Subproject 64eaa17f22bce9804266f49a8e84ef1f041a061
+Subproject b54f39b5c54d14a8a6ae3cd57c35b68fca0894c
diff --git a/qtgamepad b/qtgamepad
-Subproject b8426f8cd14ba551f43fcf4f3cce4990c9ef047
+Subproject d0981a74998205016076604884244c95c9cd83a
diff --git a/qtgraphicaleffects b/qtgraphicaleffects
-Subproject 69bb8a63a5ff1a56629d58e4d03a3bee658c544
+Subproject d424a1d208f09431d62e1de391dfaa037742456
diff --git a/qtimageformats b/qtimageformats
-Subproject c7a6a451a5c277556e28dfb3b4b943719cdda7f
+Subproject 834bb773e36c974748f7ee947b4f07088ee6f5f
diff --git a/qtlocation b/qtlocation
-Subproject bd63a1c5144945c134674e2b253afe26673ca13
+Subproject 22090b374f1f6e53a28188f91cca8b860c85955
diff --git a/qtmacextras b/qtmacextras
-Subproject a26ed9570c95f2315a2fc0b0f58d2cfebe955a0
+Subproject 672d1d55a42306d74e638e78c7131d7405ffb6d
diff --git a/qtmultimedia b/qtmultimedia
-Subproject 6c3b0fdb5ceb9079241cb7136d756e9dba114cf
+Subproject 7d51214b609df7e5ec79b56f0c629e084cb886b
diff --git a/qtnetworkauth b/qtnetworkauth
-Subproject 8847f1e54d27c43ef744c39d28033e48764a254
+Subproject 027d979d57ea946ade2778a4be5dc160b786fb3
diff --git a/qtpurchasing b/qtpurchasing
-Subproject 9a492e0f47660b4a428fc1fc6dc0fd07b2b3b1b
+Subproject cf3693e2dc5dbaeb3c12ff2eacb760c27480e3b
diff --git a/qtquickcontrols b/qtquickcontrols
-Subproject b84d25b20ed316529ae2fa091c5d9e2fbf45e02
+Subproject 9a56985c91d16d7c42ba86f4b0a70f85973e061
diff --git a/qtquickcontrols2 b/qtquickcontrols2
-Subproject 9a8881bf3eca6d4589c056908fd3541c1a2a6eb
+Subproject 05359cd83e852b97d5e53386255ff655eff0f93
diff --git a/qtremoteobjects b/qtremoteobjects
-Subproject 4b65644d0f76773e9e2702d5737cc1c7fe9c64e
+Subproject cfbf8b72d4514258d4a51f88fee072ed1e8f9a3
diff --git a/qtscript b/qtscript
-Subproject adec1e10f6a54d78c3c1e8944263787931fffc9
+Subproject 65b09e7b416618a35e44154ccf68dc8b403181e
diff --git a/qtscxml b/qtscxml
-Subproject 06ee5829c54e1aafeb03d387a8f5d6377a7ed11
+Subproject 45e2a4826705c7489b77d28ae706474b9402262
diff --git a/qtsensors b/qtsensors
-Subproject 57465cedf68a98d6705191282007c7aae44c314
+Subproject 9a1b163e1fdd99a838c082805c687205b766da2
diff --git a/qtserialbus b/qtserialbus
-Subproject 71a31bf19bb0cce506638bc79ba96bc5e5da92f
+Subproject 66b58e22681b6d6db340a83017f927869dfd0ed
diff --git a/qtserialport b/qtserialport
-Subproject 5c6a433d6a6a4176082036ae94931467101a199
+Subproject 8d7f133ed22bbb10274e4a9f166bd9732522895
diff --git a/qtspeech b/qtspeech
-Subproject e4ec1fc2f7f2399547b66bc2cb51c33c17f1cd4
+Subproject 7f954d6bcdbedf8257be9128c96217c91370f0e
diff --git a/qtsvg b/qtsvg
-Subproject be428b21b777a04a1766adb880cb44e7b0b68e5
+Subproject 1aec05432bc596ececf78570b6ef035cfda1e5c
diff --git a/qttools b/qttools
-Subproject ef4e761c7519449ff9bb0d0b14bd50c03228a39
+Subproject d1ad2c353ebe35c40fe68af4783d08dc83d247b
diff --git a/qttranslations b/qttranslations
-Subproject 365bfb2ef769241e798b7c222a63ff68348d87c
+Subproject e51b921f6fa0fb64a8a7f4159024d1a2f187277
diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard
-Subproject 956a6a04a7a98be7c05320b504674260b432285
+Subproject f8a679a49242efce46fb3160cdd15b15008ba4d
diff --git a/qtwayland b/qtwayland
-Subproject 1e1785c8d2b077c34a8ca1d4f93e5a75b269eac
+Subproject 03ea62d4d7391db7beb6b987b7c965c7b5240d9
diff --git a/qtwebchannel b/qtwebchannel
-Subproject 4a95a4e603e1bfd8e365274a5888dcdbb6bb42e
+Subproject ed4be1f75314ddc004ea7c0d7c6af715252e4e5
diff --git a/qtwebengine b/qtwebengine
-Subproject 817c117cf89f15e1877107597c8daeff956fd1a
+Subproject 08eef49a53a9dda35b7a0efce04b5b298e4f320
diff --git a/qtwebkit b/qtwebkit
-Subproject 54110a075ed5eba337e3463d33ad45b538d9365
+Subproject 7e104c57a70fdf551bb3d22a5d637cdcbc69dbe
diff --git a/qtwebkit-examples b/qtwebkit-examples
-Subproject 822426abc77a74752b0ee0da4d0a1c106c4dac2
+Subproject 7efef7478b60f6aeb7babb0663234cf8dcb8a26
diff --git a/qtwebsockets b/qtwebsockets
-Subproject 91582c53c5c3b404169ce2a44d75ac810204351
+Subproject e5133f4f0bb7c01d7bd7fc499d8c148c03a5b50
diff --git a/qtwebview b/qtwebview
-Subproject f7f8f8f6c12b8617b4d9f89dd2aaaf241a1a6f8
+Subproject cd383f858ba63199c2a7b1a498d3da9d6b73121
diff --git a/qtwinextras b/qtwinextras
-Subproject 7be0ff7fe32ef01839de4ad0a8142ca05438b50
+Subproject 17585323dda73309a915baa93807ad5b8c5a5e7
diff --git a/qtx11extras b/qtx11extras
-Subproject 8c44529ed5269bc2130c27ba9733d262143424e
+Subproject de4c1f09a00884a959bf7f53d38c204d14064c2
diff --git a/qtxmlpatterns b/qtxmlpatterns
-Subproject 7c92929b7611d873df34434151fe28ae88daed4
+Subproject 141d12bd6d8c51bc92128654a084b36c6b74712