diff options
| -rw-r--r-- | .gitmodules | 79 | ||||
| -rwxr-xr-x | init-repository | 13 | ||||
| -rw-r--r-- | qt.pro | 7 | ||||
| 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--------- | qtquick1 | 0 | ||||
| m--------- | qtquickcontrols | 0 | ||||
| m--------- | qtquickcontrols2 | 0 | ||||
| m--------- | qtscript | 0 | ||||
| m--------- | qtsensors | 0 | ||||
| m--------- | qtserialbus | 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--------- | qtwebview | 0 | ||||
| m--------- | qtwinextras | 0 | ||||
| m--------- | qtx11extras | 0 | ||||
| m--------- | qtxmlpatterns | 0 |
39 files changed, 51 insertions, 48 deletions
diff --git a/.gitmodules b/.gitmodules index ef08ab13..b8fbe40d 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,13 +56,11 @@ [submodule "qtwebkit"] path = qtwebkit url = ../qtwebkit.git - branch = 5.5 - initrepo = true + branch = 5.6 [submodule "qtwebkit-examples"] path = qtwebkit-examples url = ../qtwebkit-examples.git - branch = 5.5 - initrepo = true + branch = 5.6 [submodule "qtqa"] path = qtqa url = ../qtqa.git @@ -71,12 +69,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 +95,98 @@ [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 - initrepo = true + branch = 5.6 [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 "qtserialbus"] + path = qtserialbus + url = ../qtserialbus.git + branch = 5.6 [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 = 5.6 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 +[submodule "qtwebview"] + path = qtwebview + url = ../qtwebview.git + branch = 5.6 + initrepo = true +[submodule "qtquickcontrols2"] + path = qtquickcontrols2 + url = ../qtquickcontrols2.git + branch = 5.6 initrepo = true diff --git a/init-repository b/init-repository index 46456e9d..91d27824 100755 --- a/init-repository +++ b/init-repository @@ -79,12 +79,6 @@ B<Module options:> =over -=item --no-webkit - -Skip webkit and webkit examples submodules. -It may be desirable to skip these modules due to the large size of the webkit -git repository. - =item --module-subset=<module1>,<module2>... Only initialize the specified subset of modules given as the argument. Specified @@ -239,7 +233,6 @@ sub parse_arguments 'ignore-submodules' => 0 , 'mirror-url' => "", 'update' => 1 , - 'webkit' => 1 , 'module-subset' => "default", ); @@ -254,7 +247,6 @@ sub parse_arguments 'mirror=s' => \$self->{qw{ mirror-url }}, 'quiet' => \$self->{qw{ quiet }}, 'update!' => \$self->{qw{ update }}, - 'webkit!' => \$self->{qw{ webkit }}, 'module-subset=s' => \$self->{qw{ module-subset }}, 'help|?' => sub { pod2usage(1); }, @@ -271,9 +263,6 @@ sub parse_arguments $self->{'mirror-url'} =~ s{//+$}{/}; $self->{'module-subset'} = [ split(/,/, $self->{'module-subset'}) ]; - if (!$self->{webkit}) { - push @{$self->{'module-subset'}}, "-qtwebkit", "-qtwebkit-examples"; - } return; } @@ -334,7 +323,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"); } @@ -58,6 +58,7 @@ ANDROID_EXTRAS = android: ANDROID_EXTRAS = qtandroidextras addModule(qtbase) +addModule(qtwebview, qtdeclarative, qtwebengine) addModule(qtandroidextras, qtbase) addModule(qtmacextras, qtbase) addModule(qtx11extras, qtbase) @@ -65,6 +66,7 @@ addModule(qtsvg, qtbase) addModule(qtxmlpatterns, qtbase) addModule(qtdeclarative, qtbase, qtsvg qtxmlpatterns) addModule(qtquickcontrols, qtdeclarative, qtgraphicaleffects) +addModule(qtquickcontrols2, qtquickcontrols) addModule(qtmultimedia, qtbase, qtdeclarative) addModule(qtwinextras, qtbase, qtdeclarative qtmultimedia) addModule(qtactiveqt, qtbase) @@ -84,12 +86,13 @@ addModule(qt3d, qtdeclarative qtimageformats) addModule(qtcanvas3d, qtdeclarative) addModule(qtgraphicaleffects, qtdeclarative) addModule(qtscript, qtbase, qttools) -addModule(qtquick1, qtscript, qtsvg qtxmlpatterns qtwebkit) +addModule(qtquick1, qtscript, qtsvg qtxmlpatterns) addModule(qtdocgallery, qtdeclarative) addModule(qtwayland, qtbase, qtdeclarative) +addModule(qtserialbus, qtbase) addModule(qtserialport, qtbase) addModule(qtenginio, qtdeclarative) -addModule(qtwebengine, qtquickcontrols qtwebchannel, qtwebkit qtlocation) +addModule(qtwebengine, qtquickcontrols qtwebchannel, qtlocation) addModule(qttranslations, qttools) addModule(qtdoc, qtdeclarative) addModule(qtqa, qtbase) diff --git a/qt3d b/qt3d -Subproject 0bcb6600db2a74ee8c8b51207d3ba15e4973aa9 +Subproject 379bab196e3ada14e755e6719e899b4b4952d9c diff --git a/qtactiveqt b/qtactiveqt -Subproject d906c70d1fdc5d81a05fc40ae106d09109e9579 +Subproject 860b25b96c19d997bbe3b8753cc948da52332d6 diff --git a/qtandroidextras b/qtandroidextras -Subproject 38b83c33f3955570627f0235fa920b2b54440bd +Subproject 2eb5decb8245a7e93c4901872d21306b34dc018 diff --git a/qtbase b/qtbase -Subproject fbd0e4489c936394a55f8084af2aab4ef245636 +Subproject e6a2ba708931d353bad4f399180d46116404aa2 diff --git a/qtcanvas3d b/qtcanvas3d -Subproject 8c6d82d4f6783daecf748c26c41f1f57fcdc5a7 +Subproject ab89f8496c140be6442db5fc0987aaaf16c4811 diff --git a/qtconnectivity b/qtconnectivity -Subproject 2b2d30a31bb43e87b83d88d6541f20ba16ff030 +Subproject ee5740d1e11dd84d3d80a357d3eb31eb63eee5a diff --git a/qtdeclarative b/qtdeclarative -Subproject 1ea17d70dcdbece5868a2d35417e0bfc66d6873 +Subproject 91a96d1de9c3d3f8d598ee8fbcf2d1868635ec4 diff --git a/qtdoc b/qtdoc -Subproject 60964b2be9b4a021e8b6d5b7e189b0c38e43434 +Subproject 80e30b828e772e47abd66eeb4b57f3ae345f262 diff --git a/qtenginio b/qtenginio -Subproject e32bcb7b714454f9167c4d49776a95c9a5799d7 +Subproject 11235f4776ce2ef9166ca4e71cf7c25bd1a5e4a diff --git a/qtgraphicaleffects b/qtgraphicaleffects -Subproject 9aa0edc6d13d20796feb1712883eddb7cd411ec +Subproject 9d71cd48bfc248419035dad811fcfbd317d9b54 diff --git a/qtimageformats b/qtimageformats -Subproject 5598cebd35157890af20fa824fc9f1c92340270 +Subproject ab1f3ee4c5fea333d5c0d3a6eb9eeda987763cc diff --git a/qtlocation b/qtlocation -Subproject d1c91515ef0ad4208c41a4052f92bfb817333ac +Subproject 79dc087b3dcc151c1571f7628f5b0e1d7bf9fc8 diff --git a/qtmacextras b/qtmacextras -Subproject 872bbed0a7f07d26f0e4a51f8034e90ae95fc4e +Subproject ee2e66abc45549b96e4b3ec47cbf693090ee751 diff --git a/qtmultimedia b/qtmultimedia -Subproject edc415be476c7ef59f00914b2a6dfc6896d7a34 +Subproject 8a5f74ddf2cf3106cf84f9d327b9782de9155e0 diff --git a/qtpim b/qtpim -Subproject 18e3d741c3526978cdacc88bc260d250918d208 +Subproject fa74ad6eda129af79416c54e42b6e4326e8c954 diff --git a/qtquick1 b/qtquick1 -Subproject 9a3807656e2d917acf271bb16f4e296136e52d1 +Subproject a669c33d9c6f42a29d31f493a888ec4fef29bcd diff --git a/qtquickcontrols b/qtquickcontrols -Subproject f770dbe9d38214a37e12adb591498dcd1ad0293 +Subproject 973474129baec084b582481ffbc8725b33ad320 diff --git a/qtquickcontrols2 b/qtquickcontrols2 new file mode 160000 +Subproject 0addfd5d586c7850c1e470f24c6364e6305dfa0 diff --git a/qtscript b/qtscript -Subproject 50446e4edb0360871309a5d72a9a873f45fb17b +Subproject 657822611315760a8b4599b36884f3c1b17ee1e diff --git a/qtsensors b/qtsensors -Subproject 330bd7142dc4ef5682db971306441e7f8852af4 +Subproject b925c6d82bdd0603edfa9ee160ed9aec704c743 diff --git a/qtserialbus b/qtserialbus new file mode 160000 +Subproject 11661526113009079c22ed18701c17543c62c25 diff --git a/qtserialport b/qtserialport -Subproject 381e11d264cbb116d37ee83a4be2ed504bffb71 +Subproject 14d8b2a3994adf8f2f94b065288980d5e61e0ba diff --git a/qtsvg b/qtsvg -Subproject 23f263b6aa48644f023df3d463215d98d73b939 +Subproject c533e6e0b320405185c57863957e6f1546a569e diff --git a/qtsystems b/qtsystems -Subproject 44f70d99a2ecd5f3f320650461f1d69142d11bc +Subproject 37b614abbfb35d06a57e5b0824249c3abd5640e diff --git a/qttools b/qttools -Subproject 3907230229b0f379169fdef38b96265f422d3e7 +Subproject 2360e764664722dcc868e7a32b451cbf51aa45d diff --git a/qttranslations b/qttranslations -Subproject 160672dab76f526d1035d48eacd83a51e146b5c +Subproject 1a1bf9d6cb78e39047d92c214b45404f8c0c424 diff --git a/qtwayland b/qtwayland -Subproject 3dc9cfdbd2771c28c770d432b99e571db43fe59 +Subproject 6169341cbbeebdd6deed7c012b2ba79e1f6d95f diff --git a/qtwebchannel b/qtwebchannel -Subproject 6a7de61bc15d0cde3a3c91c58f45ba10957aa39 +Subproject 7561e51004e94cff4fcf2b10acfd2d1ddb2a29a diff --git a/qtwebengine b/qtwebengine -Subproject 3f9c6206450b0c67a5dadfe0da023ec6be7d174 +Subproject 8fe1c75a0f04ebcc425136d1956f2a367f6b3c1 diff --git a/qtwebkit b/qtwebkit -Subproject 0d592678bad23a77f35c109253a0263664e6981 +Subproject 62dd2add32c7c4d5d409d457c818ac88c952e7f diff --git a/qtwebkit-examples b/qtwebkit-examples -Subproject df729f9f284df2d30db432de351e7e80360097c +Subproject 7988aecdbcb07f3a214c2c804a39db3fc561784 diff --git a/qtwebsockets b/qtwebsockets -Subproject a01c1455afecc2a98598a574f69ce682586357f +Subproject c5f63b60330c05a5b70d5f5f42565f32227f161 diff --git a/qtwebview b/qtwebview new file mode 160000 +Subproject 1b5a69309d2702b8339c9829f86ea685ca4ad90 diff --git a/qtwinextras b/qtwinextras -Subproject 8fe1236810ce0e36e1ac888b37883a114951222 +Subproject d6208094e75086bca4e9dadb4ba34b21c51e02d diff --git a/qtx11extras b/qtx11extras -Subproject e4f2f0a146a83fa3160687ca06e11430ff02c5a +Subproject d64ee96f0df4d3baa6959b8552bc59d53cb0b45 diff --git a/qtxmlpatterns b/qtxmlpatterns -Subproject eefb48c8568876527b1d85f00d34a45d62d8a6f +Subproject d7aff0febb4101084e9efb8e76cf4f5d7533c04 |