diff options
| -rw-r--r-- | .gitmodules | 115 | ||||
| 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, 78 insertions, 37 deletions
diff --git a/.gitmodules b/.gitmodules index 743e2e8e..49b048ed 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,183 @@ 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 + branch = 5.7 status = preview [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 + branch = 5.7 status = deprecated [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 + branch = 5.7 status = preview [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 + path = qtspeech + url = ../qtspeech branch = dev status = ignore diff --git a/qt3d b/qt3d -Subproject 9c67288ea4791fee5e28d1b4f2981c232b95c9d +Subproject a21a4e0391b81307d96364db7af3b8bd343d773 diff --git a/qtactiveqt b/qtactiveqt -Subproject a4b8485cd38a9c33cdcf1b97633fa65b7230643 +Subproject 7477c86107ac0f5d344b380b38118c3a90f994a diff --git a/qtandroidextras b/qtandroidextras -Subproject d08a073fffabb1e8629145b1b2114314ef01dcf +Subproject 80d6ea6cac5ece4e3053ec19810abceb77feb4d diff --git a/qtbase b/qtbase -Subproject 8ce657d0279566ef327af1b88339534041ddc01 +Subproject 36bc2477753d19a14c587b97d4ec4f263e9e16c diff --git a/qtcanvas3d b/qtcanvas3d -Subproject 791ddce7d41b126ba4744a6701597f49dbf99f3 +Subproject 4f4eda51954b7983016e6a062d3db77a68c2ad6 diff --git a/qtcharts b/qtcharts new file mode 160000 +Subproject bbf52870f4e335c0d169907d4398a12cb41ca3a diff --git a/qtconnectivity b/qtconnectivity -Subproject 80b6557be3a23a5118ddf8c4b68bc28b66f52b4 +Subproject f8857127320f513e9ec2132bc4af5c470362f37 diff --git a/qtdatavis3d b/qtdatavis3d new file mode 160000 +Subproject 3fb7ce6a29ca69237c777cc65a3831768e93878 diff --git a/qtdeclarative b/qtdeclarative -Subproject d438b4f4b93d04a841edf031359e26af617d889 +Subproject f5afec250cc63ba3a7b1cc78f51d5eb0031dd47 diff --git a/qtdoc b/qtdoc -Subproject 39ea341d0e5466b7a7b46c7d3ce32ea69e686f6 +Subproject 7f969b2f4f8cc8d5e9b29c61395e1cde0885ed9 diff --git a/qtenginio b/qtenginio -Subproject a6434420574f775d3afa6e8912eb2ede8429db9 +Subproject 0f6e294fb8534f677a5ec75113679cfe24f559c diff --git a/qtgamepad b/qtgamepad new file mode 160000 +Subproject b3e8bd55289d54bd21b4f16c6b997d805bba816 diff --git a/qtgraphicaleffects b/qtgraphicaleffects -Subproject 6523d7c4843e1d4176035c46e1514c39bdcfc3b +Subproject f086de0f3a67698b8066576a423298aadf566e1 diff --git a/qtimageformats b/qtimageformats -Subproject bf5b49878d75d316f31225f76152e8381a3d5f0 +Subproject 2d59367241aafbfe6acb30202f64e30697028bd diff --git a/qtlocation b/qtlocation -Subproject f40e92b147560be15e0f53dfd7f6b2d698c00fb +Subproject e176f25daeb3d80af1fd701000fda065064227e diff --git a/qtmacextras b/qtmacextras -Subproject 15fb52a91240efa495d8a4cdca533bfc4615fbb +Subproject 5b5b33e4eb871d31e6a74bde06a02be9239cc16 diff --git a/qtmultimedia b/qtmultimedia -Subproject 3fb3231a9e22dcb780d5b31ec57896429d40b0e +Subproject 0d8366273dcb9af5dae641c7efbc6db87894242 diff --git a/qtpurchasing b/qtpurchasing -Subproject b5c6c76fac771326064295368a53cbdaf2bf0f7 +Subproject e0e3718989387317e6ea04ecd29a2ed127fb292 diff --git a/qtquick1 b/qtquick1 -Subproject bf4efac4ed2f3b1ff11fd1361506dec3c2a8726 +Subproject 5e3bd5cb28e7af95b289a617ca2f7a889249822 diff --git a/qtquickcontrols b/qtquickcontrols -Subproject b1d29faf96ee6323bf2dad054291fd7c30a30c0 +Subproject c24118685d6eb4cacf5f6af96215ba89ecc2860 diff --git a/qtquickcontrols2 b/qtquickcontrols2 -Subproject bed6b3d633d83302a8e2167845db4b36e6847f0 +Subproject 78ec7b84abd5f499c83b0b2076fb47617a2ebbb diff --git a/qtscript b/qtscript -Subproject b16873afea798d08799d7a0b255b8d200337f35 +Subproject a775b9da4794f1f248b63a4a58ee6ad6885f062 diff --git a/qtscxml b/qtscxml new file mode 160000 +Subproject a7fbb4cb25be73bed55977de208d7650c90fa8e diff --git a/qtsensors b/qtsensors -Subproject 0b00ee6f6c311a7f5c0b4f2441dad97a454d172 +Subproject f8e256271f919c36c8d97eae27b1d11678294e7 diff --git a/qtserialbus b/qtserialbus -Subproject 04b75569f36eec14662505a08bf8c1d565cb10f +Subproject ee4c1b91def347f8f16395585b46e20aebdb2f7 diff --git a/qtserialport b/qtserialport -Subproject 9a70ee2389d3302f6a4262325f8a76e4d867b47 +Subproject f8449352c9af0ee8055c6a85981e092e9d109b9 diff --git a/qtspeech b/qtspeech new file mode 160000 +Subproject ca8768b90c07bff5804b1fbb704041a4472f65e diff --git a/qtsvg b/qtsvg -Subproject b722836765dccca04683939d0d4f72a9e2585d8 +Subproject 8c23084b207baed7cf58c17e475baa34b889ead diff --git a/qttools b/qttools -Subproject aec1d10c66a676781c767099e81871faa040162 +Subproject f29f0a4855eefba944e2dd99e0d6d992b9ebbb1 diff --git a/qttranslations b/qttranslations -Subproject cbef985e3c3e9af2d124d40959fc674b3b8aa33 +Subproject 745f8d5329d0d6d98a8577a254d2ee3e7174634 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard new file mode 160000 +Subproject 84881cfc58a462189dfeff60c6d6f5717bc4b6b diff --git a/qtwayland b/qtwayland -Subproject b94be41409a6dfa58d8b3ae8413c6930e76fc04 +Subproject 01daa660d04e8960961988da6191e80c05a84d5 diff --git a/qtwebchannel b/qtwebchannel -Subproject 64a106da72796377bbff5cce0ecc5a379b10549 +Subproject a2c3b32d08ed24279609a8c01b09c1147a9ff6b diff --git a/qtwebengine b/qtwebengine -Subproject 4ed08bb0a8195746c333dabbdb9da3400d17429 +Subproject 1d8efc0b6c26baf4fdf5a7a9a136bf3f7bb8c0f diff --git a/qtwebkit b/qtwebkit -Subproject 3b4c850361abbc2aae556dbf99c8e4c8086ae56 +Subproject 2e8517924b70a778463e463873eb3d8d0b623ee diff --git a/qtwebkit-examples b/qtwebkit-examples -Subproject 1b9a0fc9d1ded4f4f11b04eb0bb7d1de82d6eb3 +Subproject f3f9e2a1b772b718335331a603a6bee748928e4 diff --git a/qtwebsockets b/qtwebsockets -Subproject 3b128f9b45f4fafc305ff0c89cfc2cb665c856d +Subproject c6d19a89046763f680d7f67c6f9989b4f51fc71 diff --git a/qtwebview b/qtwebview -Subproject 299883956859a3eea1f2637a781adfec45c4b3c +Subproject a0fd64727bb98b815b318cc537954b3d0d1651b diff --git a/qtwinextras b/qtwinextras -Subproject e7d198e87396eb160fa9b1163eb73af152e70da +Subproject 91524134d4884beb9ee2695e9de27b211068d97 diff --git a/qtx11extras b/qtx11extras -Subproject f27489d66cc6d8263130451c26c7e4ae40acc6b +Subproject b414120c60ef8c3cc2aad7dca41092647d741a3 diff --git a/qtxmlpatterns b/qtxmlpatterns -Subproject 7a8d395a3b1eb5f24aa96509666326bad4218c1 +Subproject 20e5ddeba66121e59058fbe00896e25b5f82ed4 |