From 9b9801b7d49a1c9c01f45fa697812f91b392e091 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 5 May 2016 01:00:43 +0300 Subject: Updated submodules. Change-Id: I6230a59c886114184d74ad34651f04f0d296ade0 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtenginio | 2 +- qtgraphicaleffects | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquick1 | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtscript | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebkit | 2 +- qtwebkit-examples | 2 +- 27 files changed, 27 insertions(+), 27 deletions(-) diff --git a/qt3d b/qt3d index 8fb8f65d..36b6183b 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 8fb8f65da85e16a3f4d798d2175cec918d2c5afb +Subproject commit 36b6183bdf414a1363692c8f86e023ea305dcfba diff --git a/qtandroidextras b/qtandroidextras index d08a073f..c6671096 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit d08a073fffabb1e8629145b1b2114314ef01dcff +Subproject commit c6671096efe8c07d55cbf32b892a24ceea8d5bd2 diff --git a/qtbase b/qtbase index 072f5b51..f57d8f13 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 072f5b513e486e884ea7fa4a1cac9aedf3846374 +Subproject commit f57d8f1341587e6b2aa84b8404aa218432584206 diff --git a/qtconnectivity b/qtconnectivity index dedff12a..54c9cd9e 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit dedff12a896d51c469d2af82664b86a10f8fa7fe +Subproject commit 54c9cd9e28bc6f0a2fa5118cfdbe922d71db6623 diff --git a/qtdeclarative b/qtdeclarative index 2e6f7f36..9530a6a8 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 2e6f7f362e62c3285e7d395aca607502c8e8160e +Subproject commit 9530a6a8744e9eb2b4ed947b528ab7c51d8c360f diff --git a/qtdoc b/qtdoc index c99ffa60..f25c60fa 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit c99ffa6088ed1879ea74a978bae6350971ac9cbe +Subproject commit f25c60fa214a7603e83b55d282d0a6aa3d2cc7f0 diff --git a/qtenginio b/qtenginio index cf717b99..65f5956b 160000 --- a/qtenginio +++ b/qtenginio @@ -1 +1 @@ -Subproject commit cf717b99fdb1b7221dd556bf3be32feba0ed8afe +Subproject commit 65f5956b1cc00c58c964d43af16165e59a6f4e02 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 6523d7c4..83a50c08 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 6523d7c4843e1d4176035c46e1514c39bdcfc3bf +Subproject commit 83a50c0801440324101ad8eff775380a43a564c4 diff --git a/qtlocation b/qtlocation index d1f66746..e4d81901 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit d1f66746ab0b77b4f3300cbeeaafe61d25d78e98 +Subproject commit e4d81901b3dcbd6ce4a9ea4fc4bd32d75d9e0aef diff --git a/qtmacextras b/qtmacextras index 15fb52a9..5af27ed4 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 15fb52a91240efa495d8a4cdca533bfc4615fbbd +Subproject commit 5af27ed4ed16f823adf609e9790c864c55ed4ee9 diff --git a/qtmultimedia b/qtmultimedia index 7553a052..6f3e6a78 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 7553a0521356d0b28bacb8c8d07a25e4ba26097e +Subproject commit 6f3e6a78ca885096b8864638bfb64724c486e7d1 diff --git a/qtqa b/qtqa index 4704f79e..db34e6f8 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 4704f79e9be910d9859d2649aa6a060f58c05bf8 +Subproject commit db34e6f898728b1db16d136349698872e0149d2e diff --git a/qtquick1 b/qtquick1 index 563ce388..dbc9131e 160000 --- a/qtquick1 +++ b/qtquick1 @@ -1 +1 @@ -Subproject commit 563ce3888f3c04abcc96ba236b20c7a822bc88e2 +Subproject commit dbc9131ebb300e715d5ebd815dc3ef9aa77ebf56 diff --git a/qtquickcontrols b/qtquickcontrols index 26f7894d..f6cbeec9 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 26f7894dae87ef2dd6cf596decf645d1c877c950 +Subproject commit f6cbeec9c2ba867eddc103a8c197b3e091092def diff --git a/qtquickcontrols2 b/qtquickcontrols2 index ac152bfc..b7e022e3 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit ac152bfcd37f94453e9705b57ca6520ad30bade0 +Subproject commit b7e022e323e6064cff146268802bfc4af0fc6135 diff --git a/qtscript b/qtscript index b16873af..fc9407af 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit b16873afea798d08799d7a0b255b8d200337f35b +Subproject commit fc9407affb74bbfa9d396fef32f319b6baa8471f diff --git a/qtsensors b/qtsensors index 0b00ee6f..c77494fc 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 0b00ee6f6c311a7f5c0b4f2441dad97a454d172e +Subproject commit c77494fcf6f637069157d5607195755d687ea86a diff --git a/qtserialbus b/qtserialbus index edf55f65..b8d5c1f1 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit edf55f657a46fe16bf80d63f523848bb9b71d9f3 +Subproject commit b8d5c1f1dff57da6927470543e5d004c237846ac diff --git a/qtserialport b/qtserialport index 9a70ee23..8a30a60a 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 9a70ee2389d3302f6a4262325f8a76e4d867b478 +Subproject commit 8a30a60a03af3979de8988209f8f77638713c30d diff --git a/qtsvg b/qtsvg index e02df9c0..cf25ebcf 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit e02df9c098b4d304b34c0ff65806a0576e45ed1a +Subproject commit cf25ebcf482ada36f5b5e0bb983a01cf2ab42f46 diff --git a/qttools b/qttools index e33532e0..e126ccfa 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit e33532e048fa12ee32429ca83ee31aa8f065147d +Subproject commit e126ccfa0c8f06bd52f0175766dd5a5321d74325 diff --git a/qttranslations b/qttranslations index 13f1f2f1..f37d38d6 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 13f1f2f12ddfc9b84535361d77a5f0f0ec8c3e0f +Subproject commit f37d38d620b3c7ff7c3a01fc28e906263d9fa0fc diff --git a/qtwayland b/qtwayland index 2e08d3af..92038729 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 2e08d3afc08ea305052d75a306dac381d3025134 +Subproject commit 920387296abcead6fea2d801fb2f57c185657c47 diff --git a/qtwebchannel b/qtwebchannel index 64a106da..bd0f9334 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 64a106da72796377bbff5cce0ecc5a379b105498 +Subproject commit bd0f933457227c615c5f11aacd471e58b88678e8 diff --git a/qtwebengine b/qtwebengine index a3318c84..5dad8663 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit a3318c84b022282a5a4a2babc51d1e3ca634e25b +Subproject commit 5dad8663afdc46094094cf1cf7a723567dd61e0b diff --git a/qtwebkit b/qtwebkit index 71136c96..c1b8d4bf 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 71136c9621103522e85654c8e144d5f1c961de1c +Subproject commit c1b8d4bf2a36cd59e31758a9e6af872c17c4cfb8 diff --git a/qtwebkit-examples b/qtwebkit-examples index 1b9a0fc9..2050389a 160000 --- a/qtwebkit-examples +++ b/qtwebkit-examples @@ -1 +1 @@ -Subproject commit 1b9a0fc9d1ded4f4f11b04eb0bb7d1de82d6eb34 +Subproject commit 2050389a34ac7a28d2ee8b62cc1a87bc471fe89e -- cgit v1.2.3 From c41d854254dbee488c454ec512ac0dfba1c38903 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 20 Apr 2016 14:19:40 +0200 Subject: make it actually possible to exclude classes the doc - quite reasonably - claims that it is possible. Change-Id: I4668b3feafe721f1db4deb65848206d8197962c8 Reviewed-by: Simon Hausmann --- init-repository | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/init-repository b/init-repository index fd291252..a5773e66 100755 --- a/init-repository +++ b/init-repository @@ -333,26 +333,34 @@ sub git_clone_all_submodules my %include = (); foreach my $mod (@subset) { + my $del = ($mod =~ s/^-//); + my $fail = 0; + my @what; if ($mod eq "all") { - map { $include{$_} = 1; } keys %subbases; + @what = keys %subbases; } elsif ($mod eq "essential") { - map { $include{$_} = 1; } grep { ($subinits{$_} || 0) eq STS_ESSENTIAL } keys %subbases; + @what = grep { ($subinits{$_} || 0) eq STS_ESSENTIAL } keys %subbases; } elsif ($mod eq "addon") { - map { $include{$_} = 1; } grep { ($subinits{$_} || 0) eq STS_ADDON } keys %subbases; + @what = grep { ($subinits{$_} || 0) eq STS_ADDON } keys %subbases; } elsif ($mod eq "preview") { - map { $include{$_} = 1; } grep { ($subinits{$_} || 0) eq STS_PREVIEW } keys %subbases; + @what = grep { ($subinits{$_} || 0) eq STS_PREVIEW } keys %subbases; } elsif ($mod eq "deprecated") { - map { $include{$_} = 1; } grep { ($subinits{$_} || 0) eq STS_DEPRECATED } keys %subbases; + @what = grep { ($subinits{$_} || 0) eq STS_DEPRECATED } keys %subbases; } elsif ($mod eq "obsolete") { - map { $include{$_} = 1; } grep { ($subinits{$_} || 0) eq STS_OBSOLETE } keys %subbases; - } elsif ($mod =~ s/^-//) { + @what = grep { ($subinits{$_} || 0) eq STS_OBSOLETE } keys %subbases; + } elsif (defined($subdirs{$mod})) { + push @what, $mod; + } else { + $fail = 1; + } + if ($del) { print "Warning: excluding non-existent module '$mod'.\n" - if (!defined($subdirs{$mod})); - delete $include{$mod}; + if ($fail); + map { delete $include{$_} } @what; } else { die("Error: module subset names non-existent '$mod'.\n") - if (!defined($subdirs{$mod})); - $include{$mod} = 1; + if ($fail); + map { $include{$_} = 1; } @what; } } -- cgit v1.2.3 From a1ec8795c67bb154195a774544b3614fdd729d3d Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 20 Apr 2016 14:21:25 +0200 Subject: make it actually possible to specify 'ignore' as a class another thing the doc claims to be possible - also quite reasonably. Change-Id: I2220245b10f02a778345b6549e345b2486630ffd Reviewed-by: Simon Hausmann --- init-repository | 2 ++ 1 file changed, 2 insertions(+) diff --git a/init-repository b/init-repository index a5773e66..2580b0f6 100755 --- a/init-repository +++ b/init-repository @@ -348,6 +348,8 @@ sub git_clone_all_submodules @what = grep { ($subinits{$_} || 0) eq STS_DEPRECATED } keys %subbases; } elsif ($mod eq "obsolete") { @what = grep { ($subinits{$_} || 0) eq STS_OBSOLETE } keys %subbases; + } elsif ($mod eq "ignore") { + @what = grep { ($subinits{$_} || 0) eq 0 } keys %subbases; } elsif (defined($subdirs{$mod})) { push @what, $mod; } else { -- cgit v1.2.3 From c07377e739ca43624640c7317a82d3d3d2be81c3 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 8 May 2016 01:00:42 +0300 Subject: Updated submodules. Change-Id: I5ea896b0ec6b9837fda44eb7b7a61aa3c6e42db5 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtrepotools | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qtbase b/qtbase index f57d8f13..1c2210b7 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit f57d8f1341587e6b2aa84b8404aa218432584206 +Subproject commit 1c2210b7b1ecae021d46c8e5a3cb4a53986067c4 diff --git a/qtdeclarative b/qtdeclarative index 9530a6a8..4a86cbe2 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 9530a6a8744e9eb2b4ed947b528ab7c51d8c360f +Subproject commit 4a86cbe2ca426143bac4b533a1949a1e1514d65e diff --git a/qtquickcontrols b/qtquickcontrols index f6cbeec9..57a7bc73 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit f6cbeec9c2ba867eddc103a8c197b3e091092def +Subproject commit 57a7bc73545b137dccc098bc07aeaf9dd9bf8207 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index b7e022e3..835c1c26 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit b7e022e323e6064cff146268802bfc4af0fc6135 +Subproject commit 835c1c26ef220cf084a7f066df748182229a4fd6 diff --git a/qtrepotools b/qtrepotools index 0b1dba74..be3d47ae 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 0b1dba7456f0e2cebf0d270bbaa4b04b4883c46e +Subproject commit be3d47ae9560950de0908f0129703e9f7a8d68cd diff --git a/qtwebengine b/qtwebengine index 5dad8663..e3d94abf 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 5dad8663afdc46094094cf1cf7a723567dd61e0b +Subproject commit e3d94abf9356bb8ee6e402fb7b9813c96919faf2 diff --git a/qtwebsockets b/qtwebsockets index ba9306ec..edc358b2 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit ba9306ec5a1271275d79b2f48ceb227f79352f33 +Subproject commit edc358b213b192e8cdc925a4ae1f176c287d6eea -- cgit v1.2.3 From 9812986913250f1f61d90f1e75a3192b11533829 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 11 May 2016 01:00:42 +0300 Subject: Updated submodules. Change-Id: I092e0b94eb77397708ab6d196357ec6b3b141326 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtsensors | 2 +- qttools | 2 +- qttranslations | 2 +- qtwebengine | 2 +- qtwebkit | 2 +- qtwinextras | 2 +- qtxmlpatterns | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/qt3d b/qt3d index 36b6183b..38baf18d 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 36b6183bdf414a1363692c8f86e023ea305dcfba +Subproject commit 38baf18df4c572ef36dc203ea9172f3e7b44e06d diff --git a/qtbase b/qtbase index 1c2210b7..ce37467a 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 1c2210b7b1ecae021d46c8e5a3cb4a53986067c4 +Subproject commit ce37467acf34edf1380f896a0942b616dc4cbead diff --git a/qtcanvas3d b/qtcanvas3d index 791ddce7..ab58e494 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 791ddce7d41b126ba4744a6701597f49dbf99f3b +Subproject commit ab58e494db8a6506dd254a6ce961743dc10c4bc8 diff --git a/qtdeclarative b/qtdeclarative index 4a86cbe2..48492b2e 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 4a86cbe2ca426143bac4b533a1949a1e1514d65e +Subproject commit 48492b2ee5d2f9ad178982f4c16e895b3083d8df diff --git a/qtdoc b/qtdoc index f25c60fa..0f77b33d 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit f25c60fa214a7603e83b55d282d0a6aa3d2cc7f0 +Subproject commit 0f77b33d55d2f0467de00640774b179f8fa3ef69 diff --git a/qtlocation b/qtlocation index e4d81901..5dcd3d85 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit e4d81901b3dcbd6ce4a9ea4fc4bd32d75d9e0aef +Subproject commit 5dcd3d8526c7b8c7ac59a743f82130008d254d14 diff --git a/qtmultimedia b/qtmultimedia index 6f3e6a78..15951e67 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 6f3e6a78ca885096b8864638bfb64724c486e7d1 +Subproject commit 15951e672eaf38537c82043b0b9b14088facbd19 diff --git a/qtqa b/qtqa index db34e6f8..32893be6 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit db34e6f898728b1db16d136349698872e0149d2e +Subproject commit 32893be6fa2c1068df16479979acf9b3ba7f6bcd diff --git a/qtquickcontrols b/qtquickcontrols index 57a7bc73..0e00f9fa 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 57a7bc73545b137dccc098bc07aeaf9dd9bf8207 +Subproject commit 0e00f9fa1cbdbdd2128f2ca31172d88f701ecb59 diff --git a/qtsensors b/qtsensors index c77494fc..127ac081 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit c77494fcf6f637069157d5607195755d687ea86a +Subproject commit 127ac0810f042999a13db18e68b43be9ab85e708 diff --git a/qttools b/qttools index e126ccfa..38fc6ad3 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit e126ccfa0c8f06bd52f0175766dd5a5321d74325 +Subproject commit 38fc6ad3e789c69dd09b0c494ead107d6da10807 diff --git a/qttranslations b/qttranslations index f37d38d6..efa6513b 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit f37d38d620b3c7ff7c3a01fc28e906263d9fa0fc +Subproject commit efa6513bbf2515fbe6ab7b365e9597a8900ae279 diff --git a/qtwebengine b/qtwebengine index e3d94abf..b052dcaf 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit e3d94abf9356bb8ee6e402fb7b9813c96919faf2 +Subproject commit b052dcaf308d761fa8df39a09f0296b808c928b5 diff --git a/qtwebkit b/qtwebkit index c1b8d4bf..a750b262 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit c1b8d4bf2a36cd59e31758a9e6af872c17c4cfb8 +Subproject commit a750b262b856178eee47d546944bd095662dccf7 diff --git a/qtwinextras b/qtwinextras index dbf43cd3..9463d251 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit dbf43cd34090cc66317ee5ffe5d12f874fe1576a +Subproject commit 9463d25167fe1e2fc47180331827cbad2a805f67 diff --git a/qtxmlpatterns b/qtxmlpatterns index 5e6acdb2..fcb22201 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 5e6acdb2ea92add793835561e7a2d6b0ed8890f8 +Subproject commit fcb22201726669f52f98528d9a15f8cdbb126b48 -- cgit v1.2.3