diff options
| -rw-r--r-- | .gitmodules | 122 | ||||
| m--------- | qt3d | 0 | ||||
| m--------- | qtactiveqt | 0 | ||||
| m--------- | qtandroidextras | 0 | ||||
| m--------- | qtbase | 0 | ||||
| m--------- | qtcanvas3d | 0 | ||||
| m--------- | qtcharts | 0 | ||||
| m--------- | qtconnectivity | 0 | ||||
| m--------- | qtdatavis3d | 0 | ||||
| m--------- | qtdeclarative | 0 | ||||
| m--------- | qtdoc | 0 | ||||
| m--------- | qtenginio | 0 | ||||
| m--------- | qtgamepad | 0 | ||||
| m--------- | qtgraphicaleffects | 0 | ||||
| m--------- | qtimageformats | 0 | ||||
| m--------- | qtlocation | 0 | ||||
| m--------- | qtmacextras | 0 | ||||
| m--------- | qtmultimedia | 0 | ||||
| m--------- | qtpurchasing | 0 | ||||
| m--------- | qtquick1 | 0 | ||||
| m--------- | qtquickcontrols | 0 | ||||
| m--------- | qtquickcontrols2 | 0 | ||||
| m--------- | qtscript | 0 | ||||
| m--------- | qtscxml | 0 | ||||
| m--------- | qtsensors | 0 | ||||
| m--------- | qtserialbus | 0 | ||||
| m--------- | qtserialport | 0 | ||||
| m--------- | qtspeech | 0 | ||||
| m--------- | qtsvg | 0 | ||||
| m--------- | qttools | 0 | ||||
| m--------- | qttranslations | 0 | ||||
| m--------- | qtvirtualkeyboard | 0 | ||||
| m--------- | qtwayland | 0 | ||||
| m--------- | qtwebchannel | 0 | ||||
| m--------- | qtwebengine | 0 | ||||
| m--------- | qtwebkit | 0 | ||||
| m--------- | qtwebkit-examples | 0 | ||||
| m--------- | qtwebsockets | 0 | ||||
| m--------- | qtwebview | 0 | ||||
| m--------- | qtwinextras | 0 | ||||
| m--------- | qtx11extras | 0 | ||||
| m--------- | qtxmlpatterns | 0 |
42 files changed, 82 insertions, 40 deletions
diff --git a/.gitmodules b/.gitmodules index 743e2e8e..6c17f09f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,66 +1,66 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.6 + branch = 5.7 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = 5.6 + branch = 5.7 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg qtxmlpatterns path = qtdeclarative url = ../qtdeclarative.git - branch = 5.6 + branch = 5.7 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = 5.6 + branch = 5.7 status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = 5.6 + branch = 5.7 status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = 5.6 + branch = 5.7 status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt qtwebkit path = qttools url = ../qttools.git - branch = 5.6 + branch = 5.7 status = essential [submodule "qtxmlpatterns"] depends = qtbase path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.6 + branch = 5.7 status = addon [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = 5.6 + branch = 5.7 status = essential priority = 30 [submodule "qtdoc"] depends = qtdeclarative path = qtdoc url = ../qtdoc.git - branch = 5.6 + branch = 5.7 status = essential priority = 40 [submodule "qtrepotools"] @@ -74,7 +74,7 @@ recommends = qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel qtxmlpatterns path = qtwebkit url = ../qtwebkit.git - branch = 5.6 + branch = 5.7 status = obsolete project = WebKit.pro priority = 20 @@ -82,7 +82,7 @@ depends = qtwebkit qttools path = qtwebkit-examples url = ../qtwebkit-examples.git - branch = 5.6 + branch = 5.7 status = obsolete [submodule "qtqa"] depends = qtbase @@ -96,21 +96,21 @@ recommends = qtdeclarative qtquickcontrols qtserialport qtsystems path = qtlocation url = ../qtlocation.git - branch = 5.6 + branch = 5.7 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = 5.6 + branch = 5.7 status = addon [submodule "qtsystems"] depends = qtbase recommends = qtdeclarative path = qtsystems url = ../qtsystems.git - branch = dev + branch = 5.7 status = ignore [submodule "qtfeedback"] depends = qtdeclarative @@ -129,142 +129,184 @@ depends = qtdeclarative path = qtpim url = ../qtpim.git - branch = dev + branch = 5.7 status = ignore [submodule "qtconnectivity"] depends = qtbase recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = 5.6 + branch = 5.7 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = 5.6 + branch = 5.7 status = addon [submodule "qt3d"] depends = qtdeclarative qtimageformats + recommends = qtgamepad path = qt3d url = ../qt3d.git - branch = 5.6 - status = preview + branch = 5.7 + status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = 5.6 + branch = 5.7 status = addon [submodule "qtquick1"] depends = qtscript recommends = qtsvg qtxmlpatterns path = qtquick1 url = ../qtquick1.git - branch = 5.6 + branch = 5.7 status = obsolete [submodule "qtgraphicaleffects"] depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.6 + branch = 5.7 status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.6 + branch = 5.7 status = essential [submodule "qtserialbus"] depends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 5.6 + branch = 5.7 status = preview [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = 5.6 + branch = 5.7 status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = 5.6 + branch = 5.7 status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = 5.6 + branch = 5.7 status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = 5.6 + branch = 5.7 status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = 5.6 + branch = 5.7 status = addon [submodule "qtenginio"] depends = qtdeclarative path = qtenginio url = ../qtenginio.git - branch = 5.6 - status = deprecated + branch = 5.7 + status = obsolete [submodule "qtwebsockets"] depends = qtbase recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = 5.6 + branch = 5.7 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = 5.6 + branch = 5.7 status = addon [submodule "qtwebengine"] depends = qtquickcontrols qtwebchannel recommends = qtlocation path = qtwebengine url = ../qtwebengine.git - branch = 5.6 + branch = 5.7 status = addon priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative path = qtcanvas3d url = ../qtcanvas3d.git - branch = 5.6 + branch = 5.7 status = addon [submodule "qtwebview"] depends = qtdeclarative recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = 5.6 + branch = 5.7 status = addon [submodule "qtquickcontrols2"] - depends = qtquickcontrols + depends = qtgraphicaleffects path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = 5.6 - status = preview + branch = 5.7 + status = addon [submodule "qtpurchasing"] depends = qtbase recommends = qtdeclarative path = qtpurchasing url = ../qtpurchasing.git + branch = 5.7 + status = addon +[submodule "qtcharts"] + depends = qtbase + recommends = qtdeclarative qtmultimedia + path = qtcharts + url = ../qtcharts.git + branch = 5.7 + status = addon +[submodule "qtdatavis3d"] + depends = qtbase + recommends = qtdeclarative qtmultimedia + path = qtdatavis3d + url = ../qtdatavis3d.git + branch = 5.7 + status = addon +[submodule "qtvirtualkeyboard"] + depends = qtbase qtdeclarative qtsvg + recommends = qtmultimedia qtquickcontrols + path = qtvirtualkeyboard + url = ../qtvirtualkeyboard.git + branch = 5.7 + status = addon +[submodule "qtgamepad"] + depends = qtbase + recommends = qtdeclarative + path = qtgamepad + url = ../qtgamepad + branch = 5.7 + status = preview +[submodule "qtscxml"] + depends = qtbase qtdeclarative + path = qtscxml + url = ../qtscxml + branch = 5.7 + status = preview +[submodule "qtspeech"] + depends = qtbase + recommends = qtdeclarative qtmultimedia + path = qtspeech + url = ../qtspeech branch = dev status = ignore diff --git a/qt3d b/qt3d -Subproject 8fb8f65da85e16a3f4d798d2175cec918d2c5af +Subproject 7c9331e953700e4c35e4bd3d51ebc49e4c3b0f8 diff --git a/qtactiveqt b/qtactiveqt -Subproject a4b8485cd38a9c33cdcf1b97633fa65b7230643 +Subproject b5440b50f23982e7459a66b46ad41f176f67e30 diff --git a/qtandroidextras b/qtandroidextras -Subproject d08a073fffabb1e8629145b1b2114314ef01dcf +Subproject 368b0bbf2b2854547cfafa7092361f09dd157fb diff --git a/qtbase b/qtbase -Subproject 072f5b513e486e884ea7fa4a1cac9aedf384637 +Subproject b3fcaea5f2b97d3f562add97aee48cbb469c875 diff --git a/qtcanvas3d b/qtcanvas3d -Subproject 791ddce7d41b126ba4744a6701597f49dbf99f3 +Subproject 32404e27101c5ec81b4ab965faf38263429bbc5 diff --git a/qtcharts b/qtcharts new file mode 160000 +Subproject 023f3b1edeaa9b5f622ddb7781c82ca3468caef diff --git a/qtconnectivity b/qtconnectivity -Subproject dedff12a896d51c469d2af82664b86a10f8fa7f +Subproject f8759f683cfc433c432059e1160d2ab657baaec diff --git a/qtdatavis3d b/qtdatavis3d new file mode 160000 +Subproject 8427634773505f73ce030cf68761c4719eb03e5 diff --git a/qtdeclarative b/qtdeclarative -Subproject 2e6f7f362e62c3285e7d395aca607502c8e8160 +Subproject 9bb640625d1e929f8caac34fa0a0fedeef8687c diff --git a/qtdoc b/qtdoc -Subproject c99ffa6088ed1879ea74a978bae6350971ac9cb +Subproject 619297421f5fd5f89768cc4161b4f3a7a5c3d57 diff --git a/qtenginio b/qtenginio -Subproject cf717b99fdb1b7221dd556bf3be32feba0ed8af +Subproject 0f6e294fb8534f677a5ec75113679cfe24f559c diff --git a/qtgamepad b/qtgamepad new file mode 160000 +Subproject dee527d22731963096023c298f946ef8cd25a7c diff --git a/qtgraphicaleffects b/qtgraphicaleffects -Subproject 6523d7c4843e1d4176035c46e1514c39bdcfc3b +Subproject d85fd81f338f9c6f2e95b92b2cb9ccd4f9889c6 diff --git a/qtimageformats b/qtimageformats -Subproject bf5b49878d75d316f31225f76152e8381a3d5f0 +Subproject 42b07b2ddf443d3eafd18e169f2e5ab5e36604a diff --git a/qtlocation b/qtlocation -Subproject d1f66746ab0b77b4f3300cbeeaafe61d25d78e9 +Subproject e41c3a9b345536ccee0840ac6f049173aa6a078 diff --git a/qtmacextras b/qtmacextras -Subproject 15fb52a91240efa495d8a4cdca533bfc4615fbb +Subproject 509c7b7f7da2fd69444b7dba32f31db51ad40aa diff --git a/qtmultimedia b/qtmultimedia -Subproject 7553a0521356d0b28bacb8c8d07a25e4ba26097 +Subproject 7f286e0965eb31f29c68b1c1e32d2653ae34014 diff --git a/qtpurchasing b/qtpurchasing -Subproject b5c6c76fac771326064295368a53cbdaf2bf0f7 +Subproject 114352e123021488e14fa81aa154195cbe1ad50 diff --git a/qtquick1 b/qtquick1 -Subproject 563ce3888f3c04abcc96ba236b20c7a822bc88e +Subproject 5e3bd5cb28e7af95b289a617ca2f7a889249822 diff --git a/qtquickcontrols b/qtquickcontrols -Subproject 26f7894dae87ef2dd6cf596decf645d1c877c95 +Subproject 2ee6ef43d681746d07c1175738184715ce0d84e diff --git a/qtquickcontrols2 b/qtquickcontrols2 -Subproject ac152bfcd37f94453e9705b57ca6520ad30bade +Subproject e253427f93248983d18055c5020094799a2c6b3 diff --git a/qtscript b/qtscript -Subproject b16873afea798d08799d7a0b255b8d200337f35 +Subproject b49bfdaad11be1de632f907d43485a7ac701ddc diff --git a/qtscxml b/qtscxml new file mode 160000 +Subproject 7e885ef3952830b9683d145aadc592c66cec180 diff --git a/qtsensors b/qtsensors -Subproject 0b00ee6f6c311a7f5c0b4f2441dad97a454d172 +Subproject 33d15b76dfdb95da5970b8e0294bbb87ea1eb9a diff --git a/qtserialbus b/qtserialbus -Subproject edf55f657a46fe16bf80d63f523848bb9b71d9f +Subproject 1675a0d726e5c07c275c0981cc3deb5ffbcc6af diff --git a/qtserialport b/qtserialport -Subproject 9a70ee2389d3302f6a4262325f8a76e4d867b47 +Subproject 84feab670cce8414ad54f4d19b46291c7fdb14c diff --git a/qtspeech b/qtspeech new file mode 160000 +Subproject ca8768b90c07bff5804b1fbb704041a4472f65e diff --git a/qtsvg b/qtsvg -Subproject e02df9c098b4d304b34c0ff65806a0576e45ed1 +Subproject 612c3041475550837dee7149b9f5e9e4f55c17a diff --git a/qttools b/qttools -Subproject e33532e048fa12ee32429ca83ee31aa8f065147 +Subproject d36d2c3026cae67c119384f47cb2680552c81aa diff --git a/qttranslations b/qttranslations -Subproject 13f1f2f12ddfc9b84535361d77a5f0f0ec8c3e0 +Subproject 745f8d5329d0d6d98a8577a254d2ee3e7174634 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard new file mode 160000 +Subproject 9c401c0881bc92491ef128ca9288d5b7c2c7a33 diff --git a/qtwayland b/qtwayland -Subproject 2e08d3afc08ea305052d75a306dac381d302513 +Subproject 15216555593740029f3c25ee16dc4dc248a017b diff --git a/qtwebchannel b/qtwebchannel -Subproject 64a106da72796377bbff5cce0ecc5a379b10549 +Subproject a2c3b32d08ed24279609a8c01b09c1147a9ff6b diff --git a/qtwebengine b/qtwebengine -Subproject a3318c84b022282a5a4a2babc51d1e3ca634e25 +Subproject 7d172fcf39fa2a5d7d5202f20c599eb678f6cb5 diff --git a/qtwebkit b/qtwebkit -Subproject 71136c9621103522e85654c8e144d5f1c961de1 +Subproject 2e8517924b70a778463e463873eb3d8d0b623ee diff --git a/qtwebkit-examples b/qtwebkit-examples -Subproject 1b9a0fc9d1ded4f4f11b04eb0bb7d1de82d6eb3 +Subproject f3f9e2a1b772b718335331a603a6bee748928e4 diff --git a/qtwebsockets b/qtwebsockets -Subproject ba9306ec5a1271275d79b2f48ceb227f79352f3 +Subproject 00156d63eea2fb7681a8a00a3144392d6325e5c diff --git a/qtwebview b/qtwebview -Subproject b76a913c948e61184dbfe6e540cfcdc7f9f1158 +Subproject 9415249942b98768b8bc431fdb242ca1ac09ccc diff --git a/qtwinextras b/qtwinextras -Subproject dbf43cd34090cc66317ee5ffe5d12f874fe1576 +Subproject 6d019d276a4be4e1a20eaf41a16eca64007249f diff --git a/qtx11extras b/qtx11extras -Subproject f27489d66cc6d8263130451c26c7e4ae40acc6b +Subproject b414120c60ef8c3cc2aad7dca41092647d741a3 diff --git a/qtxmlpatterns b/qtxmlpatterns -Subproject 5e6acdb2ea92add793835561e7a2d6b0ed8890f +Subproject fb1dc19bf195c530b7f44d18cc927472b9866a4 |