diff options
| -rw-r--r-- | .gitmodules | 62 | ||||
| -rwxr-xr-x | init-repository | 2 | ||||
| m--------- | qt3d | 0 | ||||
| m--------- | qtactiveqt | 0 | ||||
| m--------- | qtandroidextras | 0 | ||||
| m--------- | qtbase | 0 | ||||
| m--------- | qtcanvas3d | 0 | ||||
| m--------- | qtconnectivity | 0 | ||||
| m--------- | qtdeclarative | 0 | ||||
| m--------- | qtdoc | 0 | ||||
| m--------- | qtenginio | 0 | ||||
| m--------- | qtgraphicaleffects | 0 | ||||
| m--------- | qtimageformats | 0 | ||||
| m--------- | qtlocation | 0 | ||||
| m--------- | qtmacextras | 0 | ||||
| m--------- | qtmultimedia | 0 | ||||
| m--------- | qtpim | 0 | ||||
| m--------- | qtqa | 0 | ||||
| m--------- | qtquick1 | 0 | ||||
| m--------- | qtquickcontrols | 0 | ||||
| m--------- | qtrepotools | 0 | ||||
| m--------- | qtscript | 0 | ||||
| m--------- | qtsensors | 0 | ||||
| m--------- | qtserialport | 0 | ||||
| m--------- | qtsvg | 0 | ||||
| m--------- | qtsystems | 0 | ||||
| m--------- | qttools | 0 | ||||
| m--------- | qttranslations | 0 | ||||
| m--------- | qtwayland | 0 | ||||
| m--------- | qtwebchannel | 0 | ||||
| m--------- | qtwebengine | 0 | ||||
| m--------- | qtwebkit | 0 | ||||
| m--------- | qtwebkit-examples | 0 | ||||
| m--------- | qtwebsockets | 0 | ||||
| m--------- | qtwinextras | 0 | ||||
| m--------- | qtx11extras | 0 | ||||
| m--------- | qtxmlpatterns | 0 |
37 files changed, 32 insertions, 32 deletions
diff --git a/.gitmodules b/.gitmodules index ef08ab13..04777bee 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,52 +1,52 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.5 + branch = 5.6 initrepo = true [submodule "qtsvg"] path = qtsvg url = ../qtsvg.git - branch = 5.5 + branch = 5.6 initrepo = true [submodule "qtdeclarative"] path = qtdeclarative url = ../qtdeclarative.git - branch = 5.5 + branch = 5.6 initrepo = true [submodule "qtactiveqt"] path = qtactiveqt url = ../qtactiveqt.git - branch = 5.5 + branch = 5.6 initrepo = true [submodule "qtscript"] path = qtscript url = ../qtscript.git - branch = 5.5 + branch = 5.6 initrepo = true [submodule "qtmultimedia"] path = qtmultimedia url = ../qtmultimedia.git - branch = 5.5 + branch = 5.6 initrepo = true [submodule "qttools"] path = qttools url = ../qttools.git - branch = 5.5 + branch = 5.6 initrepo = true [submodule "qtxmlpatterns"] path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.5 + branch = 5.6 initrepo = true [submodule "qttranslations"] path = qttranslations url = ../qttranslations.git - branch = 5.5 + branch = 5.6 initrepo = true [submodule "qtdoc"] path = qtdoc url = ../qtdoc.git - branch = 5.5 + branch = 5.6 initrepo = true [submodule "qtrepotools"] path = qtrepotools @@ -56,12 +56,12 @@ [submodule "qtwebkit"] path = qtwebkit url = ../qtwebkit.git - branch = 5.5 + branch = 5.6 initrepo = true [submodule "qtwebkit-examples"] path = qtwebkit-examples url = ../qtwebkit-examples.git - branch = 5.5 + branch = 5.6 initrepo = true [submodule "qtqa"] path = qtqa @@ -71,12 +71,12 @@ [submodule "qtlocation"] path = qtlocation url = ../qtlocation.git - branch = 5.5 + branch = 5.6 initrepo = true [submodule "qtsensors"] path = qtsensors url = ../qtsensors.git - branch = 5.5 + branch = 5.6 initrepo = true [submodule "qtsystems"] path = qtsystems @@ -97,85 +97,85 @@ [submodule "qtconnectivity"] path = qtconnectivity url = ../qtconnectivity.git - branch = 5.5 + branch = 5.6 initrepo = true [submodule "qtwayland"] path = qtwayland url = ../qtwayland.git - branch = 5.5 + branch = 5.6 initrepo = true [submodule "qt3d"] path = qt3d url = ../qt3d.git - branch = 5.5 + branch = 5.6 initrepo = true [submodule "qtimageformats"] path = qtimageformats url = ../qtimageformats.git - branch = 5.5 + branch = 5.6 initrepo = true [submodule "qtquick1"] path = qtquick1 url = ../qtquick1.git - branch = 5.5 + branch = 5.6 initrepo = true [submodule "qtgraphicaleffects"] path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.5 + branch = 5.6 initrepo = true [submodule "qtquickcontrols"] path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.5 + branch = 5.6 initrepo = true [submodule "qtserialport"] path = qtserialport url = ../qtserialport.git - branch = 5.5 + branch = 5.6 initrepo = true [submodule "qtx11extras"] path = qtx11extras url = ../qtx11extras.git - branch = 5.5 + branch = 5.6 initrepo = true [submodule "qtmacextras"] path = qtmacextras url = ../qtmacextras.git - branch = 5.5 + branch = 5.6 initrepo = true [submodule "qtwinextras"] path = qtwinextras url = ../qtwinextras.git - branch = 5.5 + branch = 5.6 initrepo = true [submodule "qtandroidextras"] path = qtandroidextras url = ../qtandroidextras.git - branch = 5.5 + branch = 5.6 initrepo = true [submodule "qtenginio"] path = qtenginio url = ../qtenginio.git - branch = 1.2 + branch = 1.3 initrepo = true [submodule "qtwebsockets"] path = qtwebsockets url = ../qtwebsockets.git - branch = 5.5 + branch = 5.6 initrepo = true [submodule "qtwebchannel"] path = qtwebchannel url = ../qtwebchannel.git - branch = 5.5 + branch = 5.6 initrepo = true [submodule "qtwebengine"] path = qtwebengine url = ../qtwebengine.git - branch = 5.5 + branch = 5.6 initrepo = true [submodule "qtcanvas3d"] path = qtcanvas3d url = ../qtcanvas3d.git - branch = 5.5 + branch = 5.6 initrepo = true diff --git a/init-repository b/init-repository index 46456e9d..e80c7dca 100755 --- a/init-repository +++ b/init-repository @@ -334,7 +334,7 @@ sub git_clone_all_submodules while ($base =~ s,/(?!\.\./)[^/]+/\.\./,/,g) {} $subbases{$mod} = $base; } elsif ($2 eq "update") { - push @subset, '-'.$1 if ($3 eq 'ignore'); + push @subset, '-'.$1 if ($3 eq 'none'); } elsif ($2 eq "initrepo") { $subinits{$1} = ($3 eq "yes" or $3 eq "true"); } diff --git a/qt3d b/qt3d -Subproject 7b2315c6fd149b49be9553bafa7a3ff6d3b3ac3 +Subproject b6c0e90171fcddbd71bbdb84aca0b2c0b87149e diff --git a/qtactiveqt b/qtactiveqt -Subproject d906c70d1fdc5d81a05fc40ae106d09109e9579 +Subproject 2f0de14dc8fa529ef61c8599ec927e440e25b46 diff --git a/qtandroidextras b/qtandroidextras -Subproject 38b83c33f3955570627f0235fa920b2b54440bd +Subproject 77c5d38325e35660be86e0bde3c18a7e2180ccf diff --git a/qtbase b/qtbase -Subproject bc32c0ebc0bc00db84ca2f28eb16ab2e5b53a1b +Subproject 4672e319e6dd0fbaa986e056e52dbb06d78fcfa diff --git a/qtcanvas3d b/qtcanvas3d -Subproject 8c6d82d4f6783daecf748c26c41f1f57fcdc5a7 +Subproject 49cc7bac43256047a4f725c77704f0e91b24b23 diff --git a/qtconnectivity b/qtconnectivity -Subproject 7ed64c596c53d6b9081ddd8258adb091b761390 +Subproject 03dec8534776881d6a0f03f3e468efe5e805de6 diff --git a/qtdeclarative b/qtdeclarative -Subproject 9459256cde79f2e40db3514b6925923a209bbf5 +Subproject 90a5644c28df32016477a86f6dbff67d8ec74ea diff --git a/qtdoc b/qtdoc -Subproject eec147922fa39947afed06cd393c0e0b98d8c12 +Subproject 6b4b800eae17347482deff41f042bc03be0d33b diff --git a/qtenginio b/qtenginio -Subproject e32bcb7b714454f9167c4d49776a95c9a5799d7 +Subproject 410f6f0b3d70c4caa0a82d4d36eb02df3e2d628 diff --git a/qtgraphicaleffects b/qtgraphicaleffects -Subproject 9aa0edc6d13d20796feb1712883eddb7cd411ec +Subproject e76754d8f53e12140898473fb0d1aa43c105150 diff --git a/qtimageformats b/qtimageformats -Subproject 5598cebd35157890af20fa824fc9f1c92340270 +Subproject bf55e7dc0dcbe75a78d6a9c8a932ebbe75c8f7b diff --git a/qtlocation b/qtlocation -Subproject d1c91515ef0ad4208c41a4052f92bfb817333ac +Subproject 43bea1bbadec470202cb27d9db5cc202b9514f9 diff --git a/qtmacextras b/qtmacextras -Subproject 872bbed0a7f07d26f0e4a51f8034e90ae95fc4e +Subproject 0be11fe84b46dc189cfa642eece3b06dc1eb215 diff --git a/qtmultimedia b/qtmultimedia -Subproject 008d20e0ece4c6dac148915b998a0005657d73a +Subproject 4ba25e692a848b6a4756aaf9597293f7bc5b363 diff --git a/qtpim b/qtpim -Subproject 18e3d741c3526978cdacc88bc260d250918d208 +Subproject fa74ad6eda129af79416c54e42b6e4326e8c954 diff --git a/qtqa b/qtqa -Subproject aa2531cefceb168cbbbfc760bac1a9c4b04298a +Subproject 31235fa2d0aa1ab5bf57bfdb18d028bc0131d73 diff --git a/qtquick1 b/qtquick1 -Subproject 9a3807656e2d917acf271bb16f4e296136e52d1 +Subproject a669c33d9c6f42a29d31f493a888ec4fef29bcd diff --git a/qtquickcontrols b/qtquickcontrols -Subproject ed6330af2f6ba5ad9c71b9db82603fe0ff7f053 +Subproject b67921267c7ab4faea0e21e98573974ef82634a diff --git a/qtrepotools b/qtrepotools -Subproject 045b138f69f49f5b30aadbf74a2d218d315d15c +Subproject c8acb565e8adc8ae0874b7fb32340f9db1787a0 diff --git a/qtscript b/qtscript -Subproject 50446e4edb0360871309a5d72a9a873f45fb17b +Subproject c7adc518ca890f3393843785d0d814a6d164399 diff --git a/qtsensors b/qtsensors -Subproject 330bd7142dc4ef5682db971306441e7f8852af4 +Subproject 74963930da7984f170da515fa5022db6a7fa583 diff --git a/qtserialport b/qtserialport -Subproject c63af1a307bdde0ba12906550aa7167d8c3be00 +Subproject eb0dd8763c235b027bea91d5ec7fd82f06cacba diff --git a/qtsvg b/qtsvg -Subproject 23f263b6aa48644f023df3d463215d98d73b939 +Subproject caf00c9e340dac6a525c61927c62c5f9a928812 diff --git a/qtsystems b/qtsystems -Subproject 44f70d99a2ecd5f3f320650461f1d69142d11bc +Subproject 37b614abbfb35d06a57e5b0824249c3abd5640e diff --git a/qttools b/qttools -Subproject 1d7b5b2e1c798335e20c7fc269e8f8238505eba +Subproject 4b7438e7dfea75d881c0412ef34c08382361625 diff --git a/qttranslations b/qttranslations -Subproject 160672dab76f526d1035d48eacd83a51e146b5c +Subproject e256394f698f207592844b97a62a4ee6f4bf82a diff --git a/qtwayland b/qtwayland -Subproject 46e904275ef6b53d94f4b646d7262aaa0706f88 +Subproject ab3b7de2405f92cd01efb8a7717a4924c7630d5 diff --git a/qtwebchannel b/qtwebchannel -Subproject 6a7de61bc15d0cde3a3c91c58f45ba10957aa39 +Subproject 81449c0c804735b71ba2f225005482c7c0123da diff --git a/qtwebengine b/qtwebengine -Subproject ee21737f780b5e0666c0406220fecddcf957fe8 +Subproject 088aaa64eb9a6efad107383749985b2b462fa36 diff --git a/qtwebkit b/qtwebkit -Subproject c117978bb8781134f74dfd0313c00476d3df636 +Subproject b0aba679de5a699ec35c569971fae9d6afa684d diff --git a/qtwebkit-examples b/qtwebkit-examples -Subproject df729f9f284df2d30db432de351e7e80360097c +Subproject 27a822a088991c2d92a4b31f86c86dc6692fa05 diff --git a/qtwebsockets b/qtwebsockets -Subproject a01c1455afecc2a98598a574f69ce682586357f +Subproject 8073e6dc16470c0723cc30c74a2af7fb315733d diff --git a/qtwinextras b/qtwinextras -Subproject 8fe1236810ce0e36e1ac888b37883a114951222 +Subproject 0f95e8d6d58592e2d98930bb6f097cf3bad2607 diff --git a/qtx11extras b/qtx11extras -Subproject e4f2f0a146a83fa3160687ca06e11430ff02c5a +Subproject 85654ad96a6ae1556292ae31392f296e90e2515 diff --git a/qtxmlpatterns b/qtxmlpatterns -Subproject eefb48c8568876527b1d85f00d34a45d62d8a6f +Subproject bde71a7f9e8d2c64a8cbf703da01b6241b90137 |