From 1fcdb6cafcf7621fdea84e28a95934a4a04ea1b7 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 22 Jan 2016 10:25:06 +0100 Subject: [PATCH 01/77] Updated submodules. Change-Id: I88b34da37a589451ae32c6f736f4dc863715b339 Reviewed-by: Simon Hausmann --- qt3d | 2 +- qtbase | 2 +- qtmultimedia | 2 +- qtquickcontrols2 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qt3d b/qt3d index ba467a2c..44c743c9 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit ba467a2c4e44df7934792dfacaa8135c77a010c1 +Subproject commit 44c743c90cf51eddbf5b0bb3cf957c58fa0ef94f diff --git a/qtbase b/qtbase index 26379d03..7dceb227 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 26379d0320637b11519a2f161fb458eb9360ed88 +Subproject commit 7dceb227485e4ebd240b9820b599faa4d2a24e93 diff --git a/qtmultimedia b/qtmultimedia index 02b8c752..365e05ba 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 02b8c7527a88d1cfaed296b856fce63fd62a6c9e +Subproject commit 365e05bad8c4a42a449eeef257a16c6f8faca318 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index e8837674..0cf2f3f6 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit e8837674931b7f59c154083614eb182b121767f0 +Subproject commit 0cf2f3f63472540e45f08e6c61d1662a5ec3f218 From f5ba19c3f053990480bc958dd585a7ed5e5874ed Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 25 Jan 2016 11:38:54 +0100 Subject: [PATCH 02/77] Adjust submodule branches Change-Id: Id78b6c131063a8d25616282cd3b76815323e8048 --- .gitmodules | 60 ++++++++++++++++++++++++++--------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/.gitmodules b/.gitmodules index 49c27df9..eb9b2a89 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,66 +1,66 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.6 + branch = 5.6.0 initrepo = true [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = 5.6 + branch = 5.6.0 initrepo = true [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg qtxmlpatterns path = qtdeclarative url = ../qtdeclarative.git - branch = 5.6 + branch = 5.6.0 initrepo = true [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = 5.6 + branch = 5.6.0 initrepo = true [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = 5.6 + branch = 5.6.0 initrepo = true [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = 5.6 + branch = 5.6.0 initrepo = true [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt qtwebkit path = qttools url = ../qttools.git - branch = 5.6 + branch = 5.6.0 initrepo = true [submodule "qtxmlpatterns"] depends = qtbase path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.6 + branch = 5.6.0 initrepo = true [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = 5.6 + branch = 5.6.0 initrepo = true priority = 30 [submodule "qtdoc"] depends = qtdeclarative path = qtdoc url = ../qtdoc.git - branch = 5.6 + branch = 5.6.0 initrepo = true priority = 40 [submodule "qtrepotools"] @@ -94,14 +94,14 @@ recommends = qtdeclarative qtquickcontrols qtserialport qtsystems path = qtlocation url = ../qtlocation.git - branch = 5.6 + branch = 5.6.0 initrepo = true [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = 5.6 + branch = 5.6.0 initrepo = true [submodule "qtsystems"] depends = qtbase @@ -130,26 +130,26 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = 5.6 + branch = 5.6.0 initrepo = true [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = 5.6 + branch = 5.6.0 initrepo = true [submodule "qt3d"] depends = qtdeclarative qtimageformats path = qt3d url = ../qt3d.git - branch = 5.6 + branch = 5.6.0 initrepo = true [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = 5.6 + branch = 5.6.0 initrepo = true [submodule "qtquick1"] depends = qtscript @@ -161,14 +161,14 @@ depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.6 + branch = 5.6.0 initrepo = true [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.6 + branch = 5.6.0 initrepo = true [submodule "qtserialbus"] depends = qtserialport @@ -179,79 +179,79 @@ depends = qtbase path = qtserialport url = ../qtserialport.git - branch = 5.6 + branch = 5.6.0 initrepo = true [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = 5.6 + branch = 5.6.0 initrepo = true [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = 5.6 + branch = 5.6.0 initrepo = true [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = 5.6 + branch = 5.6.0 initrepo = true [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = 5.6 + branch = 5.6.0 initrepo = true [submodule "qtenginio"] depends = qtdeclarative path = qtenginio url = ../qtenginio.git - branch = 5.6 + branch = 1.6.0 initrepo = true [submodule "qtwebsockets"] depends = qtbase recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = 5.6 + branch = 5.6.0 initrepo = true [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = 5.6 + branch = 5.6.0 initrepo = true [submodule "qtwebengine"] depends = qtquickcontrols qtwebchannel recommends = qtlocation path = qtwebengine url = ../qtwebengine.git - branch = 5.6 + branch = 5.6.0 initrepo = true priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative path = qtcanvas3d url = ../qtcanvas3d.git - branch = 5.6 + branch = 5.6.0 initrepo = true [submodule "qtwebview"] depends = qtdeclarative recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = 5.6 + branch = 5.6.0 initrepo = true [submodule "qtquickcontrols2"] depends = qtquickcontrols path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = 5.6 + branch = 5.6.0 initrepo = true [submodule "qtpurchasing"] depends = qtbase From 3de19487d90a8035c78af4668a953d7330845705 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 27 Jan 2016 14:45:35 +0100 Subject: [PATCH 03/77] replace 'initrepo' with more fine-grained 'status' instead of a simple bool, we now have five states: preview, active, addon, obsolete, and ignore (the default). the default includes the first three. the CI system is expected to use --module-subset=all,-ignore to include everything that is expected to build (in some configurations). Change-Id: Ifb43412054a8e42db0425f24f8e53acfce363caa Reviewed-by: Simon Hausmann --- .gitmodules | 73 +++++++++++++++++++++++++++---------------------- init-repository | 43 ++++++++++++++++++++++++----- 2 files changed, 77 insertions(+), 39 deletions(-) diff --git a/.gitmodules b/.gitmodules index eb9b2a89..4e2087b7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,72 +2,72 @@ path = qtbase url = ../qtbase.git branch = 5.6.0 - initrepo = true + status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git branch = 5.6.0 - initrepo = true + status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg qtxmlpatterns path = qtdeclarative url = ../qtdeclarative.git branch = 5.6.0 - initrepo = true + status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git branch = 5.6.0 - initrepo = true + status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git branch = 5.6.0 - initrepo = true + status = addon [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git branch = 5.6.0 - initrepo = true + status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt qtwebkit path = qttools url = ../qttools.git branch = 5.6.0 - initrepo = true + status = essential [submodule "qtxmlpatterns"] depends = qtbase path = qtxmlpatterns url = ../qtxmlpatterns.git branch = 5.6.0 - initrepo = true + status = addon [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git branch = 5.6.0 - initrepo = true + status = essential priority = 30 [submodule "qtdoc"] depends = qtdeclarative path = qtdoc url = ../qtdoc.git branch = 5.6.0 - initrepo = true + status = essential priority = 40 [submodule "qtrepotools"] path = qtrepotools url = ../qtrepotools.git branch = master - initrepo = true + status = essential qt = false [submodule "qtwebkit"] depends = qtbase @@ -75,6 +75,7 @@ path = qtwebkit url = ../qtwebkit.git branch = 5.6 + status = obsolete project = WebKit.pro priority = 20 [submodule "qtwebkit-examples"] @@ -82,12 +83,13 @@ path = qtwebkit-examples url = ../qtwebkit-examples.git branch = 5.6 + status = obsolete [submodule "qtqa"] depends = qtbase path = qtqa url = ../qtqa.git branch = master - initrepo = true + status = essential priority = 50 [submodule "qtlocation"] depends = qtbase @@ -95,167 +97,174 @@ path = qtlocation url = ../qtlocation.git branch = 5.6.0 - initrepo = true + status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git branch = 5.6.0 - initrepo = true + status = addon [submodule "qtsystems"] depends = qtbase recommends = qtdeclarative path = qtsystems url = ../qtsystems.git branch = dev + status = ignore [submodule "qtfeedback"] depends = qtdeclarative recommends = qtmultimedia path = qtfeedback url = ../qtfeedback.git branch = master + status = ignore [submodule "qtdocgallery"] depends = qtdeclarative path = qtdocgallery url = ../qtdocgallery.git branch = master + status = ignore [submodule "qtpim"] depends = qtdeclarative path = qtpim url = ../qtpim.git branch = dev + status = ignore [submodule "qtconnectivity"] depends = qtbase recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git branch = 5.6.0 - initrepo = true + status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git branch = 5.6.0 - initrepo = true + status = preview [submodule "qt3d"] depends = qtdeclarative qtimageformats path = qt3d url = ../qt3d.git branch = 5.6.0 - initrepo = true + status = preview [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git branch = 5.6.0 - initrepo = true + status = addon [submodule "qtquick1"] depends = qtscript recommends = qtsvg qtxmlpatterns path = qtquick1 url = ../qtquick1.git branch = 5.6 + status = obsolete [submodule "qtgraphicaleffects"] depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git branch = 5.6.0 - initrepo = true + status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git branch = 5.6.0 - initrepo = true + status = essential [submodule "qtserialbus"] depends = qtserialport path = qtserialbus url = ../qtserialbus.git branch = 5.6 + status = preview [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git branch = 5.6.0 - initrepo = true + status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git branch = 5.6.0 - initrepo = true + status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git branch = 5.6.0 - initrepo = true + status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git branch = 5.6.0 - initrepo = true + status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git branch = 5.6.0 - initrepo = true + status = addon [submodule "qtenginio"] depends = qtdeclarative path = qtenginio url = ../qtenginio.git branch = 1.6.0 - initrepo = true + status = obsolete [submodule "qtwebsockets"] depends = qtbase recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git branch = 5.6.0 - initrepo = true + status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git branch = 5.6.0 - initrepo = true + status = addon [submodule "qtwebengine"] depends = qtquickcontrols qtwebchannel recommends = qtlocation path = qtwebengine url = ../qtwebengine.git branch = 5.6.0 - initrepo = true + status = addon priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative path = qtcanvas3d url = ../qtcanvas3d.git branch = 5.6.0 - initrepo = true + status = addon [submodule "qtwebview"] depends = qtdeclarative recommends = qtwebengine path = qtwebview url = ../qtwebview.git branch = 5.6.0 - initrepo = true + status = addon [submodule "qtquickcontrols2"] depends = qtquickcontrols path = qtquickcontrols2 url = ../qtquickcontrols2.git branch = 5.6.0 - initrepo = true + status = preview [submodule "qtpurchasing"] depends = qtbase recommends = qtdeclarative path = qtpurchasing url = ../qtpurchasing.git branch = 5.6 + status = ignore diff --git a/init-repository b/init-repository index f0407f63..966e0c16 100755 --- a/init-repository +++ b/init-repository @@ -71,9 +71,12 @@ Options: --module-subset=,... Only initialize the specified subset of modules given as the argument. Specified modules must already exist in .gitmodules. The - string "all" results in cloning all known modules. The default is - the set of maintained modules. Module names may be prefixed with a - dash to exclude them from a bigger set. + string "all" results in cloning all known modules. The strings + "essential", "addon", "preview", "obsolete", and "ignore" refer to + classes of modules; "default" maps to "essential,addon,preview", + which corresponds with the set of maintained modules and is also + the default set. Module names may be prefixed with a dash to + exclude them from a bigger set, e.g. "all,-ignore". --no-update Skip the `git submodule update' command. @@ -234,6 +237,7 @@ sub parse_arguments # Replace any double trailing slashes from end of mirror $self->{'mirror-url'} =~ s{//+$}{/}; + $self->{'module-subset'} =~ s/\bdefault\b/preview,essential,addon/; $self->{'module-subset'} = [ split(/,/, $self->{'module-subset'}) ]; return; @@ -272,6 +276,13 @@ sub git_submodule_init return; } +use constant { + STS_PREVIEW => 1, + STS_ESSENTIAL => 2, + STS_ADDON => 3, + STS_OBSOLETE => 4 +}; + sub git_clone_all_submodules { my ($self, $my_repo_base, $co_branch, @subset) = @_; @@ -296,8 +307,20 @@ sub git_clone_all_submodules $subbases{$mod} = $base; } elsif ($2 eq "update") { push @subset, '-'.$1 if ($3 eq 'none'); - } elsif ($2 eq "initrepo") { - $subinits{$1} = ($3 eq "yes" or $3 eq "true"); + } elsif ($2 eq "status") { + if ($3 eq "preview") { + $subinits{$1} = STS_PREVIEW; + } elsif ($3 eq "essential") { + $subinits{$1} = STS_ESSENTIAL; + } elsif ($3 eq "addon") { + $subinits{$1} = STS_ADDON; + } elsif ($3 eq "obsolete") { + $subinits{$1} = STS_OBSOLETE; + } elsif ($3 eq "ignore") { + delete $subinits{$1}; + } else { + die("Invalid subrepo status '$3' for '$1'.\n"); + } } } @@ -305,8 +328,14 @@ sub git_clone_all_submodules foreach my $mod (@subset) { if ($mod eq "all") { map { $include{$_} = 1; } keys %subbases; - } elsif ($mod eq "default") { - map { $include{$_} = 1; } grep { $subinits{$_} } keys %subbases; + } elsif ($mod eq "essential") { + map { $include{$_} = 1; } grep { ($subinits{$_} || 0) eq STS_ESSENTIAL } keys %subbases; + } elsif ($mod eq "addon") { + map { $include{$_} = 1; } grep { ($subinits{$_} || 0) eq STS_ADDON } keys %subbases; + } elsif ($mod eq "preview") { + map { $include{$_} = 1; } grep { ($subinits{$_} || 0) eq STS_PREVIEW } keys %subbases; + } elsif ($mod eq "obsolete") { + map { $include{$_} = 1; } grep { ($subinits{$_} || 0) eq STS_OBSOLETE } keys %subbases; } elsif ($mod =~ s/^-//) { delete $include{$mod}; } else { From d1d52b5c1e40bdc94431ab303fa6368b12fe4f53 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 27 Jan 2016 15:42:46 +0100 Subject: [PATCH 04/77] properly complain about invalid entries in --module-subset Change-Id: I13ec7a6acdc8a47efea14bfabf0413d8a3570870 Reviewed-by: Simon Hausmann --- init-repository | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/init-repository b/init-repository index 966e0c16..ae3f0495 100755 --- a/init-repository +++ b/init-repository @@ -337,8 +337,12 @@ sub git_clone_all_submodules } elsif ($mod eq "obsolete") { map { $include{$_} = 1; } grep { ($subinits{$_} || 0) eq STS_OBSOLETE } keys %subbases; } elsif ($mod =~ s/^-//) { + print "Warning: excluding non-existent module '$mod'.\n" + if (!defined($subdirs{$mod})); delete $include{$mod}; } else { + die("Error: module subset names non-existent '$mod'.\n") + if (!defined($subdirs{$mod})); $include{$mod} = 1; } } From b680c074d1fc31e453ff3ec343ba8427fd2332ee Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 3 Feb 2016 17:16:42 +0100 Subject: [PATCH 05/77] Updated submodules. Change-Id: Ic407bd126cc4c0a557ec7769d41394aa68c0cbee Reviewed-by: Jani Heikkinen --- qt3d | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtqa | 2 +- qtquick1 | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtrepotools | 2 +- qtscript | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qttools | 2 +- qttranslations | 2 +- qtwebengine | 2 +- qtwebkit | 2 +- qtwinextras | 2 +- qtxmlpatterns | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/qt3d b/qt3d index 44c743c9..910065ad 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 44c743c90cf51eddbf5b0bb3cf957c58fa0ef94f +Subproject commit 910065ad7585cbef7f49356de0c1434c791a9263 diff --git a/qtactiveqt b/qtactiveqt index 7a8395dc..ffa6ba6d 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 7a8395dc18a14a4ed356bd69ada5fbf9721ba5fe +Subproject commit ffa6ba6d81bc79769b5d7c14b3c11f5fb644e3b5 diff --git a/qtbase b/qtbase index 7dceb227..38e602d0 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 7dceb227485e4ebd240b9820b599faa4d2a24e93 +Subproject commit 38e602d0f2e4c292296d603fda22b366d8879daf diff --git a/qtcanvas3d b/qtcanvas3d index 30ae03d2..f669d170 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 30ae03d289dd967edfea5e164be677085dc45e84 +Subproject commit f669d1708c1009adc7d82d42bf550e0d971e827f diff --git a/qtconnectivity b/qtconnectivity index 46d72709..c2b7f094 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 46d727097c986e6c359291b9ad08ebe1b1b271f0 +Subproject commit c2b7f094e798d15a9231966a1df897ea124cb745 diff --git a/qtdeclarative b/qtdeclarative index 872a0547..d444d21a 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 872a05475721ad771bd347d1526035e6e7479d30 +Subproject commit d444d21a517c45c0fda0bdf955cbda61e0088be6 diff --git a/qtdoc b/qtdoc index e5b6397c..e54612bb 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit e5b6397c4af2189be82b0602059be88381cafffd +Subproject commit e54612bb30a58fc60e6aa8174ed1d77d612b382e diff --git a/qtimageformats b/qtimageformats index d7e294de..0bd46d58 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit d7e294ded23240d62f662579eeed733e6b981d60 +Subproject commit 0bd46d5861fa7b48c87cd3a734d00671df929869 diff --git a/qtlocation b/qtlocation index a41bd807..574433e0 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit a41bd80784a01050dfb6b888cd90505259471f4f +Subproject commit 574433e01b2f747ee5585f97c77b4ad1783213f3 diff --git a/qtqa b/qtqa index de8520af..e5bbdb21 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit de8520af69fcc9a83d44828b8b01ea7c2cc2ed41 +Subproject commit e5bbdb21629ee613925a90eaceb07207da21e5a3 diff --git a/qtquick1 b/qtquick1 index a669c33d..b0382acf 160000 --- a/qtquick1 +++ b/qtquick1 @@ -1 +1 @@ -Subproject commit a669c33d9c6f42a29d31f493a888ec4fef29bcd8 +Subproject commit b0382acf65dbc0debcb7cf956ba954117a682d90 diff --git a/qtquickcontrols b/qtquickcontrols index 148faf62..144bc5ce 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 148faf6278186986d1ca6afcdea0c361bcbf199e +Subproject commit 144bc5cedd9af5e62fe7210bac7df2c19d20c41b diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 0cf2f3f6..7fc567ed 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 0cf2f3f63472540e45f08e6c61d1662a5ec3f218 +Subproject commit 7fc567eda8a187e365f4c29c6e8f08440bf31218 diff --git a/qtrepotools b/qtrepotools index 0b050777..bbd7a798 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 0b050777c276010eda68ecdbb3cd5024c846225e +Subproject commit bbd7a798279cf60376e94c82fc900495e764a068 diff --git a/qtscript b/qtscript index 94307729..a70f6a1b 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 94307729ed362dde428582603234ad2ec964d4c4 +Subproject commit a70f6a1b9599931fccd13b15a1700e61137f7e72 diff --git a/qtsensors b/qtsensors index e9e4d351..ad52d307 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit e9e4d351df2167a2326608c170131222bef7fff7 +Subproject commit ad52d307cbff44b77bf7d4fa923377b72bb04374 diff --git a/qtserialbus b/qtserialbus index 11661526..e2c26722 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 11661526113009079c22ed18701c17543c62c25c +Subproject commit e2c26722fad7ce4b034682ca697abfe4743ef19a diff --git a/qttools b/qttools index 2b8b1192..ab47de29 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 2b8b119290d7b453cd1c5ef8ee62bf653eaffbb0 +Subproject commit ab47de291a0b0111d0ef956dc4c4599e2066602d diff --git a/qttranslations b/qttranslations index 2d9a8c83..41d21229 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 2d9a8c83893be4abde136ec87fc3db220ce8a0a5 +Subproject commit 41d212290c3822b8eef151785d89ac5f5b246bde diff --git a/qtwebengine b/qtwebengine index 52d9eeab..ca731a74 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 52d9eeab53b5cfd92c15c9a25894991f84cd827e +Subproject commit ca731a7446f0485886a04474415a21d2f64e3f8b diff --git a/qtwebkit b/qtwebkit index 62dd2add..629e1017 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 62dd2add32c7c4d5d409d457c818ac88c952e7f6 +Subproject commit 629e101715f3e5b58a3b0ee54295af4d957d7e78 diff --git a/qtwinextras b/qtwinextras index 7167af38..b53d3a1e 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 7167af382ff3ada668462ad6e7df7b6643609fc5 +Subproject commit b53d3a1e1439f4af908094dc82ba27c9b82d07cd diff --git a/qtxmlpatterns b/qtxmlpatterns index 640b381a..de2dadb8 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 640b381a2bf72b32e6a98adc366e5f56140a5597 +Subproject commit de2dadb8af67f9d425c3a8d2353a7d5b07588915 From 3cfe8712ae4730e871fb6c1278f1b2bbc61c1c1b Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 27 Jan 2016 16:03:59 +0100 Subject: [PATCH 06/77] fix branches of some modules MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit all repos which are released (whichever way) need release branches. and vice versa. also, it needs to be the *right* release branch. Task-number: QTBUG-50695 Change-Id: Id7b5d106d2d9bdf70e9d5276e205a3c7ea827144 Reviewed-by: Jędrzej Nowacki Reviewed-by: Robert Loehning Reviewed-by: Simon Hausmann --- .gitmodules | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitmodules b/.gitmodules index 4e2087b7..6f4cf63c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -74,7 +74,7 @@ recommends = qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel qtxmlpatterns path = qtwebkit url = ../qtwebkit.git - branch = 5.6 + branch = 5.6.0 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.6.0 status = obsolete [submodule "qtqa"] depends = qtbase @@ -162,7 +162,7 @@ recommends = qtsvg qtxmlpatterns path = qtquick1 url = ../qtquick1.git - branch = 5.6 + branch = 5.6.0 status = obsolete [submodule "qtgraphicaleffects"] depends = qtdeclarative @@ -181,7 +181,7 @@ depends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 5.6 + branch = 5.6.0 status = preview [submodule "qtserialport"] depends = qtbase @@ -218,7 +218,7 @@ depends = qtdeclarative path = qtenginio url = ../qtenginio.git - branch = 1.6.0 + branch = 5.6.0 status = obsolete [submodule "qtwebsockets"] depends = qtbase @@ -266,5 +266,5 @@ recommends = qtdeclarative path = qtpurchasing url = ../qtpurchasing.git - branch = 5.6 + branch = dev status = ignore From 37c75a23e8d17893ec9c1bf2a4615ea3876f4204 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 10 Feb 2016 21:24:55 +0200 Subject: [PATCH 07/77] Updated submodules. Change-Id: I8740e98ba27c1f554366a5183c6972207f0b0061 Reviewed-by: Frederik Gladhorn --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtquick1 | 2 +- qtquickcontrols | 2 +- qttools | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebkit | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/qt3d b/qt3d index 910065ad..190795b1 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 910065ad7585cbef7f49356de0c1434c791a9263 +Subproject commit 190795b1f884620ba8b31d3998ac97107d4f4eb7 diff --git a/qtbase b/qtbase index 38e602d0..8c2b4266 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 38e602d0f2e4c292296d603fda22b366d8879daf +Subproject commit 8c2b4266002736da499d169a0da187e5cdc5381a diff --git a/qtconnectivity b/qtconnectivity index c2b7f094..8b550f0a 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit c2b7f094e798d15a9231966a1df897ea124cb745 +Subproject commit 8b550f0a7508ed413cded71a20485e61010b0aa3 diff --git a/qtdeclarative b/qtdeclarative index d444d21a..19dffeed 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit d444d21a517c45c0fda0bdf955cbda61e0088be6 +Subproject commit 19dffeed2e677cf03b6e122c7a15f355ebe413c8 diff --git a/qtdoc b/qtdoc index e54612bb..2479b039 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit e54612bb30a58fc60e6aa8174ed1d77d612b382e +Subproject commit 2479b039d195477fa2e24fde44ab1ff4a9758330 diff --git a/qtlocation b/qtlocation index 574433e0..a2b6581e 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 574433e01b2f747ee5585f97c77b4ad1783213f3 +Subproject commit a2b6581e5a865ec1a3a7006b668e36c64d2f7ef5 diff --git a/qtmultimedia b/qtmultimedia index 365e05ba..d633c02c 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 365e05bad8c4a42a449eeef257a16c6f8faca318 +Subproject commit d633c02ce21b4b5aa9d9877c9424fcc0f363aa6b diff --git a/qtquick1 b/qtquick1 index b0382acf..dcc5e5c0 160000 --- a/qtquick1 +++ b/qtquick1 @@ -1 +1 @@ -Subproject commit b0382acf65dbc0debcb7cf956ba954117a682d90 +Subproject commit dcc5e5c01c28b227f0e5e5e4976a9d26e8a45295 diff --git a/qtquickcontrols b/qtquickcontrols index 144bc5ce..fc9c57cf 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 144bc5cedd9af5e62fe7210bac7df2c19d20c41b +Subproject commit fc9c57cf8b66bafbcaa6957bb22293047aa3d9df diff --git a/qttools b/qttools index ab47de29..eb59d808 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit ab47de291a0b0111d0ef956dc4c4599e2066602d +Subproject commit eb59d8084af321d05b4ebdfb2c1e051dfdca0b62 diff --git a/qtwebchannel b/qtwebchannel index eaebf63c..92d903d9 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit eaebf63c17964d449b75b7d2d6af3d0efaee5ed9 +Subproject commit 92d903d92b430222cd3f89eab08d61d947e5abea diff --git a/qtwebengine b/qtwebengine index ca731a74..87cc80fd 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit ca731a7446f0485886a04474415a21d2f64e3f8b +Subproject commit 87cc80fd8182b24ff42f0f5458cb82f139730536 diff --git a/qtwebkit b/qtwebkit index 629e1017..be8e169b 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 629e101715f3e5b58a3b0ee54295af4d957d7e78 +Subproject commit be8e169ba38c84562194906047d0da04bf3ae91a From 81523d838c3e1bcbab9997bfb6fe78141bc523dd Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 12 Feb 2016 17:37:29 +0100 Subject: [PATCH 08/77] Adjust submodule branches Change-Id: I3484da8952951d818e9f584bf9b57e9bb9b1e430 --- .gitmodules | 84 ++++++++++++++++++++++++++--------------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/.gitmodules b/.gitmodules index d721c699..8a9cd4f4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,66 +1,66 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = dev + branch = 5.7 initrepo = true [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = dev + branch = 5.7 initrepo = true [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg qtxmlpatterns path = qtdeclarative url = ../qtdeclarative.git - branch = dev + branch = 5.7 initrepo = true [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = dev + branch = 5.7 initrepo = true [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = dev + branch = 5.7 initrepo = true [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = dev + branch = 5.7 initrepo = true [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt qtwebkit path = qttools url = ../qttools.git - branch = dev + branch = 5.7 initrepo = true [submodule "qtxmlpatterns"] depends = qtbase path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = dev + branch = 5.7 initrepo = true [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = dev + branch = 5.7 initrepo = true priority = 30 [submodule "qtdoc"] depends = qtdeclarative path = qtdoc url = ../qtdoc.git - branch = dev + branch = 5.7 initrepo = true priority = 40 [submodule "qtrepotools"] @@ -74,14 +74,14 @@ recommends = qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel qtxmlpatterns path = qtwebkit url = ../qtwebkit.git - branch = dev + branch = 5.7 project = WebKit.pro priority = 20 [submodule "qtwebkit-examples"] depends = qtwebkit qttools path = qtwebkit-examples url = ../qtwebkit-examples.git - branch = dev + branch = 5.7 [submodule "qtqa"] depends = qtbase path = qtqa @@ -94,21 +94,21 @@ recommends = qtdeclarative qtquickcontrols qtserialport qtsystems path = qtlocation url = ../qtlocation.git - branch = dev + branch = 5.7 initrepo = true [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = dev + branch = 5.7 initrepo = true [submodule "qtsystems"] depends = qtbase recommends = qtdeclarative path = qtsystems url = ../qtsystems.git - branch = dev + branch = 5.7 [submodule "qtfeedback"] depends = qtdeclarative recommends = qtmultimedia @@ -124,175 +124,175 @@ depends = qtdeclarative path = qtpim url = ../qtpim.git - branch = dev + branch = 5.7 [submodule "qtconnectivity"] depends = qtbase recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = dev + branch = 5.7 initrepo = true [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = dev + branch = 5.7 initrepo = true [submodule "qt3d"] depends = qtdeclarative qtimageformats path = qt3d url = ../qt3d.git - branch = dev + branch = 5.7 initrepo = true [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = dev + branch = 5.7 initrepo = true [submodule "qtquick1"] depends = qtscript recommends = qtsvg qtxmlpatterns path = qtquick1 url = ../qtquick1.git - branch = dev + branch = 5.7 [submodule "qtgraphicaleffects"] depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = dev + branch = 5.7 initrepo = true [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = dev + branch = 5.7 initrepo = true [submodule "qtserialbus"] depends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = dev + branch = 5.7 [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = dev + branch = 5.7 initrepo = true [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = dev + branch = 5.7 initrepo = true [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = dev + branch = 5.7 initrepo = true [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = dev + branch = 5.7 initrepo = true [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = dev + branch = 5.7 initrepo = true [submodule "qtenginio"] depends = qtdeclarative path = qtenginio url = ../qtenginio.git - branch = dev + branch = 5.7 initrepo = true [submodule "qtwebsockets"] depends = qtbase recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = dev + branch = 5.7 initrepo = true [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = dev + branch = 5.7 initrepo = true [submodule "qtwebengine"] depends = qtquickcontrols qtwebchannel recommends = qtlocation path = qtwebengine url = ../qtwebengine.git - branch = dev + branch = 5.7 initrepo = true priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative path = qtcanvas3d url = ../qtcanvas3d.git - branch = dev + branch = 5.7 initrepo = true [submodule "qtwebview"] depends = qtdeclarative recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = dev + branch = 5.7 initrepo = true [submodule "qtquickcontrols2"] depends = qtquickcontrols path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = dev + branch = 5.7 initrepo = true [submodule "qtpurchasing"] depends = qtbase recommends = qtdeclarative path = qtpurchasing url = ../qtpurchasing.git - branch = dev + branch = 5.7 initrepo = true [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = dev + branch = 5.7 initrepo = true [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = dev + branch = 5.7 initrepo = true [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = dev + branch = 5.7 initrepo = true [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad - branch = dev + branch = 5.7 initrepo = true [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml - branch = dev + branch = 5.7 initrepo = true [submodule "qtspeech"] depends = qtbase From 3fa8726fa7a0feb61e5f6f53c2fcc8f4a44767f2 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 15 Feb 2016 07:48:35 +0200 Subject: [PATCH 09/77] Updated submodules. Change-Id: I5861620b6214dc5ff124672ce21dd4dd5b25ce85 Reviewed-by: Jani Heikkinen --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtquickcontrols2 | 2 +- qtscxml | 2 +- qtwayland | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qt3d b/qt3d index 7e6ef1f1..65d319a4 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 7e6ef1f1510b58a27a6a25b63f3678366da3668e +Subproject commit 65d319a493400d4400960e678507f5d37e28a234 diff --git a/qtbase b/qtbase index 9e8c84aa..b725f4e1 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 9e8c84aa14ee26c04ab04ff28f0bab22e04887d6 +Subproject commit b725f4e144006daac3a13e986e883a928736f6a9 diff --git a/qtconnectivity b/qtconnectivity index 40a91836..fa2389dd 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 40a91836221740cf9391ccfd36b92c368db59a8f +Subproject commit fa2389dd0a6df58d73d221654db36ff791b96e43 diff --git a/qtdeclarative b/qtdeclarative index 6c152bf2..20a51e87 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 6c152bf27f94f01b2942b02e370df4fa01e0d40f +Subproject commit 20a51e87fd15b8a6c1503b905399f7befe31114b diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 13f7c9fe..f787a035 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 13f7c9feb35850f09a29b45fa8c0b1ddad97421a +Subproject commit f787a0353a347aa096d154b7d93c7890f0cd060a diff --git a/qtscxml b/qtscxml index 095f3203..cfd8ecf8 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 095f32036aa31d8cc05e9c608858ec0fd57d23fb +Subproject commit cfd8ecf898e12ec140c93339fe4faf63e16e2461 diff --git a/qtwayland b/qtwayland index b4f3f890..74b1ec47 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit b4f3f890475b50fac20c0d542a584dfdab4888a7 +Subproject commit 74b1ec474d1d48242893dcaf58b8a35f155f3fc3 From 6efabf6dfe7a83ab57ee587fe504b5033359653f Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 13 Feb 2016 01:42:41 +0200 Subject: [PATCH 10/77] Updated submodules. Change-Id: I444b4f3ddbb851d94abda55e2e2dfcfee3921d94 Reviewed-by: Frederik Gladhorn --- qtcanvas3d | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtserialport | 2 +- qtwebengine | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qtcanvas3d b/qtcanvas3d index f669d170..5a17c4ca 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit f669d1708c1009adc7d82d42bf550e0d971e827f +Subproject commit 5a17c4ca0552c9f4e6b5646f0cee2b21a55c3d18 diff --git a/qtdoc b/qtdoc index 2479b039..05135158 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 2479b039d195477fa2e24fde44ab1ff4a9758330 +Subproject commit 051351581f29bc375aeb8d51bc624b21a39b59d9 diff --git a/qtlocation b/qtlocation index a2b6581e..526f4593 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit a2b6581e5a865ec1a3a7006b668e36c64d2f7ef5 +Subproject commit 526f459330d9bb5238479523f45aaa4caa958f77 diff --git a/qtserialport b/qtserialport index 6dda140a..6ba354a0 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 6dda140ada3d7c683537b069bf1512275a190884 +Subproject commit 6ba354a0ec3bd3064d072cf170fe9f60f9ae3389 diff --git a/qtwebengine b/qtwebengine index 87cc80fd..f3330812 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 87cc80fd8182b24ff42f0f5458cb82f139730536 +Subproject commit f3330812f8b15dabd5628ac9e40178f20180d8cf From 6bdec75429ee51b5de708751d86162d451e4ca53 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 16 Feb 2016 11:15:41 +0200 Subject: [PATCH 11/77] Updated submodules. Change-Id: I6ad2f0dfbfb78f8f4d9c20f81a84803472a4b31c Reviewed-by: Jani Heikkinen --- qtbase | 2 +- qtdoc | 2 +- qtmultimedia | 2 +- qtrepotools | 2 +- qtserialbus | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qtbase b/qtbase index 8c2b4266..e7bf0edf 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 8c2b4266002736da499d169a0da187e5cdc5381a +Subproject commit e7bf0edfd49de9a4d8285fbe8d878f8fda910e6d diff --git a/qtdoc b/qtdoc index 05135158..ff2ff1e3 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 051351581f29bc375aeb8d51bc624b21a39b59d9 +Subproject commit ff2ff1e321066504a67b02990ee9b4e8ad545e3b diff --git a/qtmultimedia b/qtmultimedia index d633c02c..241444ea 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit d633c02ce21b4b5aa9d9877c9424fcc0f363aa6b +Subproject commit 241444eab724ba0cb4fa142c5ccb02243b6f2dc2 diff --git a/qtrepotools b/qtrepotools index bbd7a798..ae405002 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit bbd7a798279cf60376e94c82fc900495e764a068 +Subproject commit ae40500269059a24caaf390ebbc45de458960657 diff --git a/qtserialbus b/qtserialbus index e2c26722..c3f26350 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit e2c26722fad7ce4b034682ca697abfe4743ef19a +Subproject commit c3f263509b64814ba12dbb627897de00b05230bc diff --git a/qtwebengine b/qtwebengine index f3330812..bc2b0d81 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit f3330812f8b15dabd5628ac9e40178f20180d8cf +Subproject commit bc2b0d81a8eff28852c9916a4768f05638d5d4cd diff --git a/qtwebsockets b/qtwebsockets index 469f7485..88946bbe 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 469f748515b65cd4c9bec8794ec37ca6cf5df026 +Subproject commit 88946bbe209cb6148b4a3284077bb9a06c7bc1ef From c2549708e50a85a9d764a160cd10bda78fe4c2c2 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 17 Feb 2016 12:57:12 +0100 Subject: [PATCH 12/77] Updated submodules. Change-Id: I020482ae1107cdd56fad485007622cb4b62b8032 Reviewed-by: Simon Hausmann --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtenginio | 2 +- qtfeedback | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtpim | 2 +- qtpurchasing | 2 +- qtqa | 2 +- qtquick1 | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtrepotools | 2 +- qtscript | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtsvg | 2 +- qtsystems | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebkit | 2 +- qtwebkit-examples | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 40 files changed, 40 insertions(+), 40 deletions(-) diff --git a/qt3d b/qt3d index 44c743c9..149ce21d 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 44c743c90cf51eddbf5b0bb3cf957c58fa0ef94f +Subproject commit 149ce21d47df023f1638620efd940404ae36465e diff --git a/qtactiveqt b/qtactiveqt index 7a8395dc..450651e8 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 7a8395dc18a14a4ed356bd69ada5fbf9721ba5fe +Subproject commit 450651e8155bbdec44253a9c282ec385257b2f8a diff --git a/qtandroidextras b/qtandroidextras index 3dee82ad..c826d6ab 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 3dee82ad4b3f5c8976bbc245b9d5753a50a2a1cf +Subproject commit c826d6ab7f3058857de883eb605abdb399772c01 diff --git a/qtbase b/qtbase index 7dceb227..42b39f98 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 7dceb227485e4ebd240b9820b599faa4d2a24e93 +Subproject commit 42b39f9827b8410077b0330cab41f20feeabf678 diff --git a/qtcanvas3d b/qtcanvas3d index 30ae03d2..d367ac81 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 30ae03d289dd967edfea5e164be677085dc45e84 +Subproject commit d367ac81d5ef77f02434274524477dc0e5c2b4a4 diff --git a/qtconnectivity b/qtconnectivity index 46d72709..c8745896 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 46d727097c986e6c359291b9ad08ebe1b1b271f0 +Subproject commit c87458961f29064ab69a308526b0243debcdf1f7 diff --git a/qtdeclarative b/qtdeclarative index 872a0547..ece8d595 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 872a05475721ad771bd347d1526035e6e7479d30 +Subproject commit ece8d59598fa1f8783d054ce2218b2b462cb93ee diff --git a/qtdoc b/qtdoc index e5b6397c..5ae0440b 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit e5b6397c4af2189be82b0602059be88381cafffd +Subproject commit 5ae0440b02b2365ade05f7c287e5c615e5dfdf78 diff --git a/qtenginio b/qtenginio index 2a19257a..60a13510 160000 --- a/qtenginio +++ b/qtenginio @@ -1 +1 @@ -Subproject commit 2a19257a5eef7a25a05d5cf7ea69ecc4184226f3 +Subproject commit 60a135102aaa37d0d817883e4d6aed456372709d diff --git a/qtfeedback b/qtfeedback index 862de791..28ca6241 160000 --- a/qtfeedback +++ b/qtfeedback @@ -1 +1 @@ -Subproject commit 862de791d785797a561204c78490f31a318a9360 +Subproject commit 28ca62414901502189ea28ef2efd551386187619 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 2f0e5e72..24f3fd69 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 2f0e5e726d76b8ad5a0e9b07aeb57006490e18b4 +Subproject commit 24f3fd69a2e953619c48b4a632262ce8419fee40 diff --git a/qtimageformats b/qtimageformats index d7e294de..eaeeacd1 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit d7e294ded23240d62f662579eeed733e6b981d60 +Subproject commit eaeeacd1d0efdf1e65c1742240b2a8d5219d5b94 diff --git a/qtlocation b/qtlocation index a41bd807..5cb6d1ba 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit a41bd80784a01050dfb6b888cd90505259471f4f +Subproject commit 5cb6d1bac19bf779afbbd22bbe723e43aa86c1b7 diff --git a/qtmacextras b/qtmacextras index d8ebb7ee..fc3413ec 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit d8ebb7eeea7e6b19763f248d1e04e8a22b91bad5 +Subproject commit fc3413ec7639969cd66ccc17931a8eec4b89216b diff --git a/qtmultimedia b/qtmultimedia index 365e05ba..dd7c19ea 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 365e05bad8c4a42a449eeef257a16c6f8faca318 +Subproject commit dd7c19ea9d6be922faca57013b06b0f2b0787169 diff --git a/qtpim b/qtpim index fa74ad6e..de4cfc6b 160000 --- a/qtpim +++ b/qtpim @@ -1 +1 @@ -Subproject commit fa74ad6eda129af79416c54e42b6e4326e8c954b +Subproject commit de4cfc6b53b426799a035fefe81db9d49d3d03ab diff --git a/qtpurchasing b/qtpurchasing index 951d75d7..b5c6c76f 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 951d75d744ab66665b41d533ce3d38df07c04005 +Subproject commit b5c6c76fac771326064295368a53cbdaf2bf0f70 diff --git a/qtqa b/qtqa index de8520af..e5bbdb21 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit de8520af69fcc9a83d44828b8b01ea7c2cc2ed41 +Subproject commit e5bbdb21629ee613925a90eaceb07207da21e5a3 diff --git a/qtquick1 b/qtquick1 index a669c33d..87f2415a 160000 --- a/qtquick1 +++ b/qtquick1 @@ -1 +1 @@ -Subproject commit a669c33d9c6f42a29d31f493a888ec4fef29bcd8 +Subproject commit 87f2415adf34da08e6cd58f5da6f6a7d0d9cf141 diff --git a/qtquickcontrols b/qtquickcontrols index 148faf62..d600966e 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 148faf6278186986d1ca6afcdea0c361bcbf199e +Subproject commit d600966e0aef236649b7a35520742f086f91cc07 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 0cf2f3f6..67169ffa 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 0cf2f3f63472540e45f08e6c61d1662a5ec3f218 +Subproject commit 67169ffa7dbf9e83e0fea35930457dc7792ef05d diff --git a/qtrepotools b/qtrepotools index 0b050777..ae405002 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 0b050777c276010eda68ecdbb3cd5024c846225e +Subproject commit ae40500269059a24caaf390ebbc45de458960657 diff --git a/qtscript b/qtscript index 94307729..525c18f7 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 94307729ed362dde428582603234ad2ec964d4c4 +Subproject commit 525c18f7780a39474e71790d54cf90de29bc1fd6 diff --git a/qtsensors b/qtsensors index e9e4d351..fbaca62c 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit e9e4d351df2167a2326608c170131222bef7fff7 +Subproject commit fbaca62cd0a7309f04bf82101c8e20dbbf423192 diff --git a/qtserialbus b/qtserialbus index 11661526..7e68b954 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 11661526113009079c22ed18701c17543c62c25c +Subproject commit 7e68b9549caaaae31a0647998ed7aa3ea2136957 diff --git a/qtserialport b/qtserialport index 6dda140a..f4303a4d 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 6dda140ada3d7c683537b069bf1512275a190884 +Subproject commit f4303a4d71b770ce4d990ff52efc6bedfb1020e5 diff --git a/qtsvg b/qtsvg index 38777ea7..a9ac71a4 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 38777ea7451d55e9c3d32d88d46063016013f60c +Subproject commit a9ac71a443260de66f720f0184646847b03fcb46 diff --git a/qtsystems b/qtsystems index 37b614ab..cc207770 160000 --- a/qtsystems +++ b/qtsystems @@ -1 +1 @@ -Subproject commit 37b614abbfb35d06a57e5b0824249c3abd5640e3 +Subproject commit cc2077700bd5503d1fcf53aef83cbb76975e745a diff --git a/qttools b/qttools index 2b8b1192..98eebb2d 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 2b8b119290d7b453cd1c5ef8ee62bf653eaffbb0 +Subproject commit 98eebb2dc1830b262d72e748817aee25e54d0d35 diff --git a/qttranslations b/qttranslations index 2d9a8c83..ce85e4ee 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 2d9a8c83893be4abde136ec87fc3db220ce8a0a5 +Subproject commit ce85e4ee4ee22e5dea3b44707a27dab44319708e diff --git a/qtwayland b/qtwayland index baec8be7..bebe9bef 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit baec8be7294a176620253dbbc1b2938cf96c8360 +Subproject commit bebe9beff3e9874498474cec32634cf281ddc453 diff --git a/qtwebchannel b/qtwebchannel index eaebf63c..e777ff1f 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit eaebf63c17964d449b75b7d2d6af3d0efaee5ed9 +Subproject commit e777ff1f88e58c1b47044ac83aafa8ccafa3840f diff --git a/qtwebengine b/qtwebengine index 52d9eeab..532548f7 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 52d9eeab53b5cfd92c15c9a25894991f84cd827e +Subproject commit 532548f7cfff68d89fdf2e592862e72f3ad55810 diff --git a/qtwebkit b/qtwebkit index 62dd2add..5cd506a8 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 62dd2add32c7c4d5d409d457c818ac88c952e7f6 +Subproject commit 5cd506a8e1bcad3d0b414827db51b907e9f4a94b diff --git a/qtwebkit-examples b/qtwebkit-examples index 7988aecd..1b9a0fc9 160000 --- a/qtwebkit-examples +++ b/qtwebkit-examples @@ -1 +1 @@ -Subproject commit 7988aecdbcb07f3a214c2c804a39db3fc5617844 +Subproject commit 1b9a0fc9d1ded4f4f11b04eb0bb7d1de82d6eb34 diff --git a/qtwebsockets b/qtwebsockets index 469f7485..2d8c94cf 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 469f748515b65cd4c9bec8794ec37ca6cf5df026 +Subproject commit 2d8c94cf11097b61689757f8a0162bb7dd9d7d0b diff --git a/qtwebview b/qtwebview index 134974f6..bad80f37 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 134974f6457c828ebeef2288b57804164cb4e147 +Subproject commit bad80f375645b758770d01ba65947981cc062715 diff --git a/qtwinextras b/qtwinextras index 7167af38..cffeddfa 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 7167af382ff3ada668462ad6e7df7b6643609fc5 +Subproject commit cffeddfab1467561ec7a2df7ccbe6c634cdf89a6 diff --git a/qtx11extras b/qtx11extras index d64ee96f..5df9fa8f 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit d64ee96f0df4d3baa6959b8552bc59d53cb0b451 +Subproject commit 5df9fa8f3a7209c067a5d5068776b9aa52273d3b diff --git a/qtxmlpatterns b/qtxmlpatterns index 640b381a..a8d103a0 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 640b381a2bf72b32e6a98adc366e5f56140a5597 +Subproject commit a8d103a05bc195dd045779f3aebdf67bd0140df1 From fdf1b3cc8df45afbf620155ae1bf2f277a56db22 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 8 Feb 2016 17:54:06 +0100 Subject: [PATCH 13/77] rework hook installation the primary purpose of this change is making it work with new-style submodules (1.7+) and git-worktree (2.5+). this means resolving '.git' and 'commondir' files. we avoid calling git commands, because a) it's slow on windows, b) some of them are unavailable in older git versions and it's tedious to deal with that and c) their output is not necessarily optimal (not always absolute paths). we also don't use relative paths for the hook locations any more, as that's too tedious to deal with. Change-Id: Ie341e748e56d6bef40856e4a49ac368850028d83 Reviewed-by: Simon Hausmann --- init-repository | 49 ++++++++++++++++++++++++++++++++++--------------- 1 file changed, 34 insertions(+), 15 deletions(-) diff --git a/init-repository b/init-repository index ae3f0495..b941646b 100755 --- a/init-repository +++ b/init-repository @@ -156,7 +156,10 @@ EOF use Carp qw( confess ); use English qw( -no_match_vars ); use Getopt::Long qw( GetOptions ); -use Cwd qw( getcwd ); +use Cwd qw( getcwd abs_path ); + +my $script_path = abs_path($0); +$script_path =~ s,[/\\][^/\\]+$,,; my $GERRIT_SSH_BASE = 'ssh://@USER@codereview.qt-project.org@PORT@/'; @@ -516,11 +519,16 @@ sub ensure_link return if (!$self->{'force-hooks'} and -f $tgt); unlink($tgt); # In case we have a dead symlink or pre-existing hook print "Aliasing $src\n as $tgt ...\n" if (!$self->{quiet}); - return if eval { symlink($src, $tgt) }; + if ($^O ne "msys" && $^O ne "MSWin32") { + return if eval { symlink($src, $tgt) }; + } # Windows doesn't do (proper) symlinks. As the post_commit script needs # them to locate itself, we write a forwarding script instead. open SCRIPT, ">".$tgt or die "Cannot create forwarding script $tgt: $!\n"; - print SCRIPT "#!/bin/sh\nexec `dirname \$0`/$src \"\$\@\"\n"; + # Make the path palatable for MSYS. + $src =~ s,\\,/,g; + $src =~ s,^(.):/,/$1/,g; + print SCRIPT "#!/bin/sh\nexec $src \"\$\@\"\n"; close SCRIPT; } @@ -528,19 +536,30 @@ sub git_install_hooks { my ($self) = @_; - return if (!-d 'qtrepotools/git-hooks'); + my $hooks = $script_path.'/qtrepotools/git-hooks'; + return if (!-d $hooks); - # Force C locale as git submodule returns the localized string "Entering" - local $ENV{LC_ALL} = 'C'; - chomp(my @modules = `git submodule foreach :`); - push @modules, ""; - for my $module (@modules) { - $module =~ s,^Entering \'([^\']+)\'$,$1/,; - my $rel = $module; - $rel =~ s,[^/]+,..,g; - $rel .= "../../qtrepotools/git-hooks/"; - $self->ensure_link($rel.'gerrit_commit_msg_hook', $module.'.git/hooks/commit-msg'); - $self->ensure_link($rel.'git_post_commit_hook', $module.'.git/hooks/post-commit'); + my @configresult = qx(git config --list --local); + foreach my $line (@configresult) { + next if ($line !~ /submodule\.([^.=]+)\.url=/); + my $module = $1.'/.git'; + if (!-d $module) { + open GITD, $module or die "Cannot open $module: $!\n"; + my $gd = ; + close GITD; + chomp($gd); + $gd =~ s/^gitdir: // or die "Malformed .git file $module\n"; + $module = $gd; # We expect it to be always absolute. + if (open COMD, $module.'/commondir') { + my $cd = ; + chomp($cd); + $module .= '/'.$cd; + $module = abs_path($module); + close COMD; + } + } + $self->ensure_link($hooks.'/gerrit_commit_msg_hook', $module.'/hooks/commit-msg'); + $self->ensure_link($hooks.'/git_post_commit_hook', $module.'/hooks/post-commit'); } } From fb1345171a581298d5913e049f828ea20a8fe13f Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 18 Feb 2016 17:02:57 +0200 Subject: [PATCH 14/77] Updated submodules. Change-Id: Ife7e51372a57f53efefc1fe0c8c805442908d8d9 Reviewed-by: Jani Heikkinen --- qtbase | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtbase b/qtbase index e7bf0edf..719623a1 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit e7bf0edfd49de9a4d8285fbe8d878f8fda910e6d +Subproject commit 719623a11d57da6a56d069a5ca8161531a37776b diff --git a/qtsensors b/qtsensors index ad52d307..7197e7f4 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit ad52d307cbff44b77bf7d4fa923377b72bb04374 +Subproject commit 7197e7f4b385315cb241043495cbfad58deb911a diff --git a/qtserialbus b/qtserialbus index c3f26350..eded6c6c 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit c3f263509b64814ba12dbb627897de00b05230bc +Subproject commit eded6c6c20075628d526541dae94356d3d51965d diff --git a/qtserialport b/qtserialport index 6ba354a0..03d492e4 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 6ba354a0ec3bd3064d072cf170fe9f60f9ae3389 +Subproject commit 03d492e49e74eefa1c83e37e833d862f4b9f1e45 From 18e84e7c06cab6158040346e6c7229eb92333026 Mon Sep 17 00:00:00 2001 From: BogDan Vatra Date: Mon, 22 Feb 2016 14:05:04 +0200 Subject: [PATCH 15/77] Enable QtGamepad usage in Qt3D If Qt3D finds QtGamepad, it will use it to build gamepad support. Change-Id: Ifbc40e5e04a6030d25c2d429878d4fb3a3dd11a6 Reviewed-by: Oswald Buddenhagen --- .gitmodules | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitmodules b/.gitmodules index 8a9cd4f4..295b8304 100644 --- a/.gitmodules +++ b/.gitmodules @@ -141,6 +141,7 @@ initrepo = true [submodule "qt3d"] depends = qtdeclarative qtimageformats + recommends = qtgamepad path = qt3d url = ../qt3d.git branch = 5.7 From 211080722e97bd41092c76de265b9f7ba7a0f02b Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 23 Feb 2016 20:47:26 +0100 Subject: [PATCH 16/77] Updated submodules. Change-Id: I633ba6875269578aae2f9d28062d3fa78924a5fc Reviewed-by: Simon Hausmann --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtrepotools | 2 +- qtscript | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtsvg | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebkit | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtxmlpatterns | 2 +- 34 files changed, 34 insertions(+), 34 deletions(-) diff --git a/qt3d b/qt3d index 65d319a4..a222ae07 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 65d319a493400d4400960e678507f5d37e28a234 +Subproject commit a222ae078beca745201ae1e4e3e9b24060bb3791 diff --git a/qtactiveqt b/qtactiveqt index 307cd0ed..05808fb8 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 307cd0ed678b37395f02bfb11fd58f8d000da6af +Subproject commit 05808fb8b011c760a2af6dd520b781447db4a0ba diff --git a/qtandroidextras b/qtandroidextras index f0fefa87..e057ce32 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit f0fefa8766cb3cec38f39c31bb01860bea88dcbc +Subproject commit e057ce322bae9fba6b9ac6864162aba48b8e7407 diff --git a/qtbase b/qtbase index b725f4e1..950bb718 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit b725f4e144006daac3a13e986e883a928736f6a9 +Subproject commit 950bb7185c320ca9fe776bf0dc2a9589bf193a0d diff --git a/qtcanvas3d b/qtcanvas3d index 691d62dc..be7e1d54 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 691d62dcd6c028e509ebb5241bb0a184faf3a5fc +Subproject commit be7e1d548ae150acb60e1716c9dfd4edd1fa4367 diff --git a/qtcharts b/qtcharts index 47032ec1..bbf52870 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 47032ec192b32a24825edd7639dc964d795a0a27 +Subproject commit bbf52870f4e335c0d169907d4398a12cb41ca3a1 diff --git a/qtconnectivity b/qtconnectivity index fa2389dd..11a05be5 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit fa2389dd0a6df58d73d221654db36ff791b96e43 +Subproject commit 11a05be5d7161bac0759832e1310b78e3374de11 diff --git a/qtdeclarative b/qtdeclarative index 20a51e87..4e7f570f 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 20a51e87fd15b8a6c1503b905399f7befe31114b +Subproject commit 4e7f570f921671c627040537b4dd8cdb77bda3d1 diff --git a/qtdoc b/qtdoc index 75890b9c..8e70fd1d 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 75890b9c863e15a502556589a469f71183480b24 +Subproject commit 8e70fd1d9e535ef73100a7102183184f7671caeb diff --git a/qtgamepad b/qtgamepad index 632a77b9..492df3d6 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 632a77b9cf719e69dc122d44a9bb9b17db81f4e3 +Subproject commit 492df3d63ccb21374c7eddd9666e74a378a06904 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 7764833e..74d92ef8 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 7764833edf8f7ca8a53b4ea18688051ea010b70c +Subproject commit 74d92ef80f5e13f2e10a592e0389a10bbeab189e diff --git a/qtimageformats b/qtimageformats index 14f86268..cb800de1 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 14f86268e7f149a3c881203227321c3fd085e4d9 +Subproject commit cb800de1f42aaacdeb423d30adbcbf8975e32f2f diff --git a/qtlocation b/qtlocation index 48651de4..a6ce8010 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 48651de4a7a11b7bd348487df6eb68f258ed3c6a +Subproject commit a6ce801018a4254efeab000efa2457317270939b diff --git a/qtmacextras b/qtmacextras index f34f1017..311be633 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit f34f10177c404a4ef757f6b2bdcfd0814ff28f06 +Subproject commit 311be633d25f1f43c404cb5a2f2f2c3896c040bc diff --git a/qtmultimedia b/qtmultimedia index 7610f6e9..9500aadc 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 7610f6e9ba8b92df6d18b94fcec982064dffacbd +Subproject commit 9500aadc219481d89d32e5c2a2de10b0740c50de diff --git a/qtqa b/qtqa index e5bbdb21..7039aa66 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit e5bbdb21629ee613925a90eaceb07207da21e5a3 +Subproject commit 7039aa66a15dc0903656c343241ec6cdae70e697 diff --git a/qtquickcontrols b/qtquickcontrols index 571a44a4..1d61e005 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 571a44a4dde8f047773f4e91a4a6941cb4cdf212 +Subproject commit 1d61e0052b6a94546f264c3a37a19db09003d7c8 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index f787a035..256779a8 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit f787a0353a347aa096d154b7d93c7890f0cd060a +Subproject commit 256779a8e2eb3a012bd13a7fcf4294a18f0cd07f diff --git a/qtrepotools b/qtrepotools index bbd7a798..ae405002 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit bbd7a798279cf60376e94c82fc900495e764a068 +Subproject commit ae40500269059a24caaf390ebbc45de458960657 diff --git a/qtscript b/qtscript index d80f57f6..0af88dc9 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit d80f57f60f39bb98948e22e94036104ddabd5e2b +Subproject commit 0af88dc973d3410cdd905265ce935916693b2d44 diff --git a/qtscxml b/qtscxml index cfd8ecf8..07596b78 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit cfd8ecf898e12ec140c93339fe4faf63e16e2461 +Subproject commit 07596b78bcf9c770058c207294696e55ee2f1315 diff --git a/qtsensors b/qtsensors index 5e8d2b4e..5cf1a2f7 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 5e8d2b4e266916761a26905f0930add305c308cf +Subproject commit 5cf1a2f7f4ac4e71b085ef53ff5a05c4676f7ce2 diff --git a/qtserialbus b/qtserialbus index ed6ec90c..246c93df 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit ed6ec90cb81cdd66738627f264e928da3857d1fd +Subproject commit 246c93df987e3ee49ba18a3d50cc9d96d35b9672 diff --git a/qtserialport b/qtserialport index e5c93da5..5bee9d9f 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit e5c93da50f3b05d312f0e3dec50baf9fcbd5ffdc +Subproject commit 5bee9d9f0f8cf5415ad9337aed88bccac3c15ce1 diff --git a/qtsvg b/qtsvg index b50d20b7..4ef60892 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit b50d20b7057fcd808525921e56d25f75140c79cd +Subproject commit 4ef60892ce9e8dea75a31b0be7895ebf473346a9 diff --git a/qttools b/qttools index 36aa99b2..852f4e4c 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 36aa99b22465e10d44c1461021b93d60bc6aeead +Subproject commit 852f4e4cf87d7db0eaa87384b1589e151f76e6cd diff --git a/qtwayland b/qtwayland index 74b1ec47..dd24398c 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 74b1ec474d1d48242893dcaf58b8a35f155f3fc3 +Subproject commit dd24398ce7323872413b8a21fc9ae192ff4c9f02 diff --git a/qtwebchannel b/qtwebchannel index 9507cdc3..a9bad172 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 9507cdc31ff6778cba77764bb0991e538c493a9e +Subproject commit a9bad172f62fe1dda280df5477a8b7c1bd57690d diff --git a/qtwebengine b/qtwebengine index 835b2405..a46caa17 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 835b24055cfbc953fd4c844d264e7fbc8550d575 +Subproject commit a46caa17c285d07a8b9d3835d8de4f85fcf9a940 diff --git a/qtwebkit b/qtwebkit index e9b369b1..2e851792 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit e9b369b16f5b6070d11888474f1b652db6f4b4e2 +Subproject commit 2e8517924b70a778463e463873eb3d8d0b623eed diff --git a/qtwebsockets b/qtwebsockets index e821221d..ac26702b 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit e821221d4bbeab3715702e4265670f58290676d6 +Subproject commit ac26702bc0aae107706843f78780c0c2451fbacd diff --git a/qtwebview b/qtwebview index 550bf471..cafb5c37 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 550bf471b01b95098a376ec8534e0646f3f0c71f +Subproject commit cafb5c371ff31c5d55617c7e4013215415cee214 diff --git a/qtwinextras b/qtwinextras index 4372bfab..acddf902 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 4372bfab4247fe4468ad4d38071ff1c4b920585c +Subproject commit acddf902facb16b40d3f9c0ccd28fcdbc49c87dc diff --git a/qtxmlpatterns b/qtxmlpatterns index 1f4c37ad..b24bd0e8 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 1f4c37adfacadec463884f4c22850c74a0c5893f +Subproject commit b24bd0e87891d9f61e0121cbdcbbe0797863f316 From e785abbec14a1ecb31bb3e96c9b409241e8d3bec Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 25 Feb 2016 16:59:50 +0100 Subject: [PATCH 17/77] Updated submodules. Change-Id: Id60487a24eb193207d4d8837a91cef1abc19f97f Reviewed-by: Simon Hausmann --- qt3d | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtscxml | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/qt3d b/qt3d index a222ae07..d95ef5a3 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit a222ae078beca745201ae1e4e3e9b24060bb3791 +Subproject commit d95ef5a39732d4f84aa7c779931f849f4b821ed6 diff --git a/qtandroidextras b/qtandroidextras index e057ce32..efc8d310 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit e057ce322bae9fba6b9ac6864162aba48b8e7407 +Subproject commit efc8d3101b8f42e9e29043bae1139505fd3eea38 diff --git a/qtbase b/qtbase index 950bb718..26961e32 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 950bb7185c320ca9fe776bf0dc2a9589bf193a0d +Subproject commit 26961e32f34c06f083fe441c23be6874f03446a3 diff --git a/qtconnectivity b/qtconnectivity index 11a05be5..5237ff0c 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 11a05be5d7161bac0759832e1310b78e3374de11 +Subproject commit 5237ff0cb86a713845019ffd98d6066af00f71f7 diff --git a/qtdeclarative b/qtdeclarative index 4e7f570f..fb2710a7 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 4e7f570f921671c627040537b4dd8cdb77bda3d1 +Subproject commit fb2710a7f182ffb910f6b121e8bc125a4f61dcdf diff --git a/qtqa b/qtqa index 7039aa66..d96ecf47 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 7039aa66a15dc0903656c343241ec6cdae70e697 +Subproject commit d96ecf4751140252f7c4afbfcfdd78b5ad3486f0 diff --git a/qtquickcontrols b/qtquickcontrols index 1d61e005..68abe816 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 1d61e0052b6a94546f264c3a37a19db09003d7c8 +Subproject commit 68abe8164943e50f3bac4260a6985c795f5abe3e diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 256779a8..718f6def 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 256779a8e2eb3a012bd13a7fcf4294a18f0cd07f +Subproject commit 718f6def0b2c4d84bdc8ebdc9633697885747feb diff --git a/qtscxml b/qtscxml index 07596b78..f8f1ddfd 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 07596b78bcf9c770058c207294696e55ee2f1315 +Subproject commit f8f1ddfd1258d224afea6c9774e60f76e294032e diff --git a/qtwayland b/qtwayland index dd24398c..1edfb665 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit dd24398ce7323872413b8a21fc9ae192ff4c9f02 +Subproject commit 1edfb6651b4433fe0b0681eb40f1472757640dda diff --git a/qtwebengine b/qtwebengine index a46caa17..66e01f28 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit a46caa17c285d07a8b9d3835d8de4f85fcf9a940 +Subproject commit 66e01f2866479fe9f27f663ddcdc32fefb52e193 From e6076450e13a59b639784cbfaa27d306a8b023ae Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 26 Feb 2016 14:55:04 +0200 Subject: [PATCH 18/77] Updated submodules. Change-Id: I3459d79f2daa9d681759f0cb7b8c841aeae7179a Reviewed-by: Jani Heikkinen --- qtandroidextras | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgraphicaleffects | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qttools | 2 +- qtwebengine | 2 +- qtwebview | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/qtandroidextras b/qtandroidextras index 3dee82ad..c2ca28ad 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 3dee82ad4b3f5c8976bbc245b9d5753a50a2a1cf +Subproject commit c2ca28adc0e821427072d86cbb4fbc27a39d1302 diff --git a/qtbase b/qtbase index 719623a1..38944d66 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 719623a11d57da6a56d069a5ca8161531a37776b +Subproject commit 38944d662eda76ecc57cb1fd61da42775fa52f6f diff --git a/qtdeclarative b/qtdeclarative index 19dffeed..dc558b69 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 19dffeed2e677cf03b6e122c7a15f355ebe413c8 +Subproject commit dc558b69f083c89aa8c02952e5f167405939a61a diff --git a/qtdoc b/qtdoc index ff2ff1e3..2ed0ac4b 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit ff2ff1e321066504a67b02990ee9b4e8ad545e3b +Subproject commit 2ed0ac4bbb4d3bfe884f946eac89f71c44f3d27d diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 2f0e5e72..4b8e9a34 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 2f0e5e726d76b8ad5a0e9b07aeb57006490e18b4 +Subproject commit 4b8e9a348ca379b203c26ff14dd236267dd60646 diff --git a/qtmultimedia b/qtmultimedia index 241444ea..9985224a 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 241444eab724ba0cb4fa142c5ccb02243b6f2dc2 +Subproject commit 9985224a89b830dc182b428f491b6187d6f0e1ba diff --git a/qtqa b/qtqa index e5bbdb21..66f33fec 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit e5bbdb21629ee613925a90eaceb07207da21e5a3 +Subproject commit 66f33fecc3b4a2896a4f33a3a7f06fb5cdd36dc8 diff --git a/qtquickcontrols b/qtquickcontrols index fc9c57cf..85c2d2cc 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit fc9c57cf8b66bafbcaa6957bb22293047aa3d9df +Subproject commit 85c2d2cce4c7d49bc425ccd0be2bbd9841b7e79b diff --git a/qttools b/qttools index eb59d808..9904992d 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit eb59d8084af321d05b4ebdfb2c1e051dfdca0b62 +Subproject commit 9904992dc4eb9a5958fcfbac238374ff38498143 diff --git a/qtwebengine b/qtwebengine index bc2b0d81..ae99405b 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit bc2b0d81a8eff28852c9916a4768f05638d5d4cd +Subproject commit ae99405b472babf07b21040444efbdee55a387e9 diff --git a/qtwebview b/qtwebview index 134974f6..472d6de6 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 134974f6457c828ebeef2288b57804164cb4e147 +Subproject commit 472d6de6668bb51bebe86b5a5f7d25466f97c3f4 From 534d63e65263fbe25c18cba44e4397627e0e8aa3 Mon Sep 17 00:00:00 2001 From: BogDan Vatra Date: Sat, 27 Feb 2016 19:13:34 +0200 Subject: [PATCH 19/77] QQC2 doesn't depend on QQC1 QQC2 depends on qtgraphicaleffects. Change-Id: I6cc53d46cf9f4a140dff570801f13556da0d3961 Reviewed-by: J-P Nurmi --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index 32dbb3ed..cf3d5a67 100644 --- a/.gitmodules +++ b/.gitmodules @@ -257,7 +257,7 @@ branch = 5.7 status = addon [submodule "qtquickcontrols2"] - depends = qtquickcontrols + depends = qtgraphicaleffects path = qtquickcontrols2 url = ../qtquickcontrols2.git branch = 5.7 From d74af1270a8f00dece6253483ce44c62f1ace7cb Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 2 Mar 2016 14:30:34 +0100 Subject: [PATCH 20/77] Updated submodules. Change-Id: I49c2a3948ba6c7e8a12f1077b96ddbde1453f67e Reviewed-by: Simon Hausmann --- qtbase | 2 +- qtqa | 2 +- qtwebkit | 2 +- qtwebview | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtbase b/qtbase index 38944d66..3bcc3037 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 38944d662eda76ecc57cb1fd61da42775fa52f6f +Subproject commit 3bcc303711ed930a96c98a500e9f0aa5ff403da5 diff --git a/qtqa b/qtqa index 66f33fec..683f523b 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 66f33fecc3b4a2896a4f33a3a7f06fb5cdd36dc8 +Subproject commit 683f523bcc524e6f78e5a3d1d3c15e2d858bac8e diff --git a/qtwebkit b/qtwebkit index be8e169b..81f43efb 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit be8e169ba38c84562194906047d0da04bf3ae91a +Subproject commit 81f43efbb2112b693b21d8f95cd627e9fd1032b9 diff --git a/qtwebview b/qtwebview index 472d6de6..847f8c40 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 472d6de6668bb51bebe86b5a5f7d25466f97c3f4 +Subproject commit 847f8c40c1f124f3021d78644562b359540e26d4 From 53b920dc691bcd318dc727079560e2467da107e0 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 3 Mar 2016 07:22:06 +0200 Subject: [PATCH 21/77] Updated submodules. Change-Id: I94c3646dc3309f71f577c6f41241cb2570d0c598 Reviewed-by: Jani Heikkinen --- qt3d | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtlocation | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtrepotools | 2 +- qtserialbus | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtwinextras | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/qt3d b/qt3d index d95ef5a3..6e2b2e41 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit d95ef5a39732d4f84aa7c779931f849f4b821ed6 +Subproject commit 6e2b2e4177bc763dc3f20dff550741e74b727677 diff --git a/qtbase b/qtbase index 26961e32..3ec093a7 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 26961e32f34c06f083fe441c23be6874f03446a3 +Subproject commit 3ec093a758ca0250e402176c1a7ee1f53324975a diff --git a/qtcanvas3d b/qtcanvas3d index be7e1d54..085aec4c 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit be7e1d548ae150acb60e1716c9dfd4edd1fa4367 +Subproject commit 085aec4c8836c01368cc2926f32952e871699a44 diff --git a/qtdeclarative b/qtdeclarative index fb2710a7..ba149148 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit fb2710a7f182ffb910f6b121e8bc125a4f61dcdf +Subproject commit ba1491488e02dfb4de734b4f2755c4899db0a815 diff --git a/qtdoc b/qtdoc index 8e70fd1d..2c6ca6c1 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 8e70fd1d9e535ef73100a7102183184f7671caeb +Subproject commit 2c6ca6c156268c7b3e6505117aeedcf4ead61200 diff --git a/qtgamepad b/qtgamepad index 492df3d6..79f6da1b 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 492df3d63ccb21374c7eddd9666e74a378a06904 +Subproject commit 79f6da1b90c2a1a0a39084b7ab79f1dedc5caa25 diff --git a/qtlocation b/qtlocation index a6ce8010..820f7928 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit a6ce801018a4254efeab000efa2457317270939b +Subproject commit 820f79284248e5fcc9910282055e67f07c918559 diff --git a/qtqa b/qtqa index d96ecf47..683f523b 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit d96ecf4751140252f7c4afbfcfdd78b5ad3486f0 +Subproject commit 683f523bcc524e6f78e5a3d1d3c15e2d858bac8e diff --git a/qtquickcontrols b/qtquickcontrols index 68abe816..6e96c1d6 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 68abe8164943e50f3bac4260a6985c795f5abe3e +Subproject commit 6e96c1d6ea3c101f418c3ec95d49999f836ef60c diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 718f6def..92d3f43b 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 718f6def0b2c4d84bdc8ebdc9633697885747feb +Subproject commit 92d3f43b400c2d4957b7f062c745172eee576c76 diff --git a/qtrepotools b/qtrepotools index ae405002..333ca78f 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit ae40500269059a24caaf390ebbc45de458960657 +Subproject commit 333ca78f192d129e600889dc2b0381cd829b00fb diff --git a/qtserialbus b/qtserialbus index 246c93df..78577b4d 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 246c93df987e3ee49ba18a3d50cc9d96d35b9672 +Subproject commit 78577b4de46555ef03c2bad0a898d73b7782f772 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 7207078b..f610c628 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 7207078b83c79cba7e6cec3967bf9308b9267ffb +Subproject commit f610c62841fdfca4a155377b7f0fbbc60b100c3c diff --git a/qtwayland b/qtwayland index 1edfb665..638125ed 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 1edfb6651b4433fe0b0681eb40f1472757640dda +Subproject commit 638125ed783c89fdebba481ac071f8042328fa4b diff --git a/qtwebengine b/qtwebengine index 66e01f28..7a7fb32e 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 66e01f2866479fe9f27f663ddcdc32fefb52e193 +Subproject commit 7a7fb32e7ce3daeabb014c29a1808dbaa0ab29ea diff --git a/qtwebsockets b/qtwebsockets index ac26702b..c00241ac 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit ac26702bc0aae107706843f78780c0c2451fbacd +Subproject commit c00241ac0389cc4ee03252030e6de1257a9b50fd diff --git a/qtwinextras b/qtwinextras index acddf902..e5b35c47 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit acddf902facb16b40d3f9c0ccd28fcdbc49c87dc +Subproject commit e5b35c47f3bbb23800a50cfc1c34c9a99b2c6d7b From 5e158312719dc5f0aeae990c52b093eb2915b4be Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 3 Mar 2016 23:37:35 +0200 Subject: [PATCH 22/77] Updated submodules. Change-Id: Id993273e16fbbffd43d958419ab103a857fd1346 Reviewed-by: Jani Heikkinen --- qt3d | 2 +- qtbase | 2 +- qtlocation | 2 +- qtrepotools | 2 +- qtserialbus | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qt3d b/qt3d index 190795b1..7a208d76 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 190795b1f884620ba8b31d3998ac97107d4f4eb7 +Subproject commit 7a208d76ed96bb506899becfe680df06f95451c7 diff --git a/qtbase b/qtbase index 3bcc3037..d0cdc7ad 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 3bcc303711ed930a96c98a500e9f0aa5ff403da5 +Subproject commit d0cdc7ad1e2728caf363abf328b2ad81f2ed5a5b diff --git a/qtlocation b/qtlocation index 526f4593..ca4bce55 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 526f459330d9bb5238479523f45aaa4caa958f77 +Subproject commit ca4bce553d03a64fa119650990083267ea9c8d31 diff --git a/qtrepotools b/qtrepotools index ae405002..333ca78f 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit ae40500269059a24caaf390ebbc45de458960657 +Subproject commit 333ca78f192d129e600889dc2b0381cd829b00fb diff --git a/qtserialbus b/qtserialbus index eded6c6c..48f32572 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit eded6c6c20075628d526541dae94356d3d51965d +Subproject commit 48f32572590e45a57573944c0822855819d138df diff --git a/qtwayland b/qtwayland index baec8be7..29b8bd8b 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit baec8be7294a176620253dbbc1b2938cf96c8360 +Subproject commit 29b8bd8b1117589341110502fe516bf22c920747 diff --git a/qtwebengine b/qtwebengine index ae99405b..5c4ae298 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit ae99405b472babf07b21040444efbdee55a387e9 +Subproject commit 5c4ae298b0a3d75c4c5ea8aef0595914ab25607f From 84a1676ed6566d548f2cce35ced9c0524f41c349 Mon Sep 17 00:00:00 2001 From: Iikka Eklund Date: Fri, 4 Mar 2016 10:11:25 +0200 Subject: [PATCH 23/77] Update .gitmodules for automated release src package creation Introduce new "deprecated" value for status attribute. We have two flavors of big source packages we need to produce: qt-everywhere-* which needs to include: - essential - addon - preview - deprecated (e.g. qtscript and qtenginio for Qt5.6 release) Installer only specific source package: - essential - addon The rest (deprecated, preview, ...) need to be shown as split src packages in the installer. The above leads to the following changes: qtscript: addon -> deprecated Needs to be part of big src packages but excluded from installer specific big source package. qtenginio: obsolete -> deprecated We can't exclude this module from qt-everywhere src packages. qtwayland: preview -> addon Needs to be part of installer specific big src package and the module status is not preview anymore. Change-Id: I52e10629bf81860f56ebc4ce9d395e0ca54c4264 Reviewed-by: Oswald Buddenhagen Reviewed-by: Simon Hausmann --- .gitmodules | 6 +++--- init-repository | 20 +++++++++++++------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/.gitmodules b/.gitmodules index 6f4cf63c..7b606d91 100644 --- a/.gitmodules +++ b/.gitmodules @@ -28,7 +28,7 @@ path = qtscript url = ../qtscript.git branch = 5.6.0 - status = addon + status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative @@ -144,7 +144,7 @@ path = qtwayland url = ../qtwayland.git branch = 5.6.0 - status = preview + status = addon [submodule "qt3d"] depends = qtdeclarative qtimageformats path = qt3d @@ -219,7 +219,7 @@ path = qtenginio url = ../qtenginio.git branch = 5.6.0 - status = obsolete + status = deprecated [submodule "qtwebsockets"] depends = qtbase recommends = qtdeclarative diff --git a/init-repository b/init-repository index ae3f0495..cf9487a2 100755 --- a/init-repository +++ b/init-repository @@ -72,11 +72,12 @@ Options: Only initialize the specified subset of modules given as the argument. Specified modules must already exist in .gitmodules. The string "all" results in cloning all known modules. The strings - "essential", "addon", "preview", "obsolete", and "ignore" refer to - classes of modules; "default" maps to "essential,addon,preview", - which corresponds with the set of maintained modules and is also - the default set. Module names may be prefixed with a dash to - exclude them from a bigger set, e.g. "all,-ignore". + "essential", "addon", "preview", "deprecated", "obsolete", and + "ignore" refer to classes of modules; "default" maps to + "essential,addon,preview,deprecated", which corresponds with the + set of maintained modules and is also the default set. Module + names may be prefixed with a dash to exclude them from a bigger + set, e.g. "all,-ignore". --no-update Skip the `git submodule update' command. @@ -237,7 +238,7 @@ sub parse_arguments # Replace any double trailing slashes from end of mirror $self->{'mirror-url'} =~ s{//+$}{/}; - $self->{'module-subset'} =~ s/\bdefault\b/preview,essential,addon/; + $self->{'module-subset'} =~ s/\bdefault\b/preview,essential,addon,deprecated/; $self->{'module-subset'} = [ split(/,/, $self->{'module-subset'}) ]; return; @@ -280,7 +281,8 @@ use constant { STS_PREVIEW => 1, STS_ESSENTIAL => 2, STS_ADDON => 3, - STS_OBSOLETE => 4 + STS_DEPRECATED => 4, + STS_OBSOLETE => 5 }; sub git_clone_all_submodules @@ -314,6 +316,8 @@ sub git_clone_all_submodules $subinits{$1} = STS_ESSENTIAL; } elsif ($3 eq "addon") { $subinits{$1} = STS_ADDON; + } elsif ($3 eq "deprecated") { + $subinits{$1} = STS_DEPRECATED; } elsif ($3 eq "obsolete") { $subinits{$1} = STS_OBSOLETE; } elsif ($3 eq "ignore") { @@ -334,6 +338,8 @@ sub git_clone_all_submodules map { $include{$_} = 1; } grep { ($subinits{$_} || 0) eq STS_ADDON } keys %subbases; } elsif ($mod eq "preview") { map { $include{$_} = 1; } grep { ($subinits{$_} || 0) eq STS_PREVIEW } keys %subbases; + } elsif ($mod eq "deprecated") { + map { $include{$_} = 1; } 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/^-//) { From 20dcf55e7d9529d0db9c766b18c8335d05a6996e Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 8 Mar 2016 09:51:13 +0200 Subject: [PATCH 24/77] Updated submodules. Change-Id: I5622046dbc1f8eee0cda929627fb8873d525b02a Reviewed-by: Simon Hausmann --- qt3d | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtgamepad | 2 +- qtlocation | 2 +- qtquickcontrols2 | 2 +- qtscxml | 2 +- qtserialbus | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qt3d b/qt3d index 6e2b2e41..8e8c5152 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 6e2b2e4177bc763dc3f20dff550741e74b727677 +Subproject commit 8e8c51526ef4a088e9dc486ae79c7215e47e22c4 diff --git a/qtbase b/qtbase index 3ec093a7..f9303284 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 3ec093a758ca0250e402176c1a7ee1f53324975a +Subproject commit f93032848e6b090b671d0035557a32bed65d2b4e diff --git a/qtcanvas3d b/qtcanvas3d index 085aec4c..4f4eda51 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 085aec4c8836c01368cc2926f32952e871699a44 +Subproject commit 4f4eda51954b7983016e6a062d3db77a68c2ad67 diff --git a/qtconnectivity b/qtconnectivity index 5237ff0c..5aad7c5d 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 5237ff0cb86a713845019ffd98d6066af00f71f7 +Subproject commit 5aad7c5de78c4768ee5c731f4a1dc686dbc3abd5 diff --git a/qtdeclarative b/qtdeclarative index ba149148..922e9d6b 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit ba1491488e02dfb4de734b4f2755c4899db0a815 +Subproject commit 922e9d6b0c7ae1acdae4986e8000ad9a693b7469 diff --git a/qtgamepad b/qtgamepad index 79f6da1b..b3e8bd55 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 79f6da1b90c2a1a0a39084b7ab79f1dedc5caa25 +Subproject commit b3e8bd55289d54bd21b4f16c6b997d805bba816e diff --git a/qtlocation b/qtlocation index 820f7928..d21ed648 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 820f79284248e5fcc9910282055e67f07c918559 +Subproject commit d21ed648f2958efaab9a041b2cd2607f4676be59 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 92d3f43b..d579c1c8 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 92d3f43b400c2d4957b7f062c745172eee576c76 +Subproject commit d579c1c8aef5b497801d0484461182ed04fe4aa0 diff --git a/qtscxml b/qtscxml index f8f1ddfd..93c5a3fd 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit f8f1ddfd1258d224afea6c9774e60f76e294032e +Subproject commit 93c5a3fd4789604bdd6c580dc3f70fbdba91b989 diff --git a/qtserialbus b/qtserialbus index 78577b4d..e34bad9e 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 78577b4de46555ef03c2bad0a898d73b7782f772 +Subproject commit e34bad9e5c44f0909019d06aa496ef91df3114b2 diff --git a/qtwayland b/qtwayland index 638125ed..95ed69bd 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 638125ed783c89fdebba481ac071f8042328fa4b +Subproject commit 95ed69bd08f424b80524414fbc0456f315353cf5 diff --git a/qtwebengine b/qtwebengine index 7a7fb32e..56714be7 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 7a7fb32e7ce3daeabb014c29a1808dbaa0ab29ea +Subproject commit 56714be7d05afb94c63b658a4fdb2bedd1bee645 From d9beab9abdc3626cbf32e48b6f637584978b5906 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 25 Mar 2016 07:52:52 +0100 Subject: [PATCH 25/77] Updated submodules. Change-Id: Ie0c625f6a48fe8d05150bd12f4d92beb2a359ec7 Reviewed-by: Simon Hausmann --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtenginio | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtpurchasing | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtscript | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 34 files changed, 34 insertions(+), 34 deletions(-) diff --git a/qt3d b/qt3d index 8e8c5152..a1470b6b 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 8e8c51526ef4a088e9dc486ae79c7215e47e22c4 +Subproject commit a1470b6b380a4612264956b1e09484c6752da20e diff --git a/qtactiveqt b/qtactiveqt index 05808fb8..7477c861 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 05808fb8b011c760a2af6dd520b781447db4a0ba +Subproject commit 7477c86107ac0f5d344b380b38118c3a90f994a7 diff --git a/qtandroidextras b/qtandroidextras index efc8d310..80d6ea6c 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit efc8d3101b8f42e9e29043bae1139505fd3eea38 +Subproject commit 80d6ea6cac5ece4e3053ec19810abceb77feb4da diff --git a/qtbase b/qtbase index f9303284..487844fc 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit f93032848e6b090b671d0035557a32bed65d2b4e +Subproject commit 487844fc62bdf048224d6fc3b7eaae6347d4457b diff --git a/qtconnectivity b/qtconnectivity index 5aad7c5d..f8857127 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 5aad7c5de78c4768ee5c731f4a1dc686dbc3abd5 +Subproject commit f8857127320f513e9ec2132bc4af5c470362f37a diff --git a/qtdeclarative b/qtdeclarative index 922e9d6b..37547a91 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 922e9d6b0c7ae1acdae4986e8000ad9a693b7469 +Subproject commit 37547a91b10da7559ee03f9fe2c23f8f22cc1c27 diff --git a/qtdoc b/qtdoc index 2c6ca6c1..652a2da6 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 2c6ca6c156268c7b3e6505117aeedcf4ead61200 +Subproject commit 652a2da66628637f935546d5079d1f170c70df39 diff --git a/qtenginio b/qtenginio index f253f76a..0f6e294f 160000 --- a/qtenginio +++ b/qtenginio @@ -1 +1 @@ -Subproject commit f253f76aca4eb82a6df11c00a25c178e16253c9d +Subproject commit 0f6e294fb8534f677a5ec75113679cfe24f559c1 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 74d92ef8..f086de0f 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 74d92ef80f5e13f2e10a592e0389a10bbeab189e +Subproject commit f086de0f3a67698b8066576a423298aadf566e13 diff --git a/qtimageformats b/qtimageformats index cb800de1..2d593672 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit cb800de1f42aaacdeb423d30adbcbf8975e32f2f +Subproject commit 2d59367241aafbfe6acb30202f64e30697028bd9 diff --git a/qtlocation b/qtlocation index d21ed648..e176f25d 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit d21ed648f2958efaab9a041b2cd2607f4676be59 +Subproject commit e176f25daeb3d80af1fd701000fda065064227e1 diff --git a/qtmacextras b/qtmacextras index 311be633..5b5b33e4 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 311be633d25f1f43c404cb5a2f2f2c3896c040bc +Subproject commit 5b5b33e4eb871d31e6a74bde06a02be9239cc165 diff --git a/qtmultimedia b/qtmultimedia index 9500aadc..caf0cbca 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 9500aadc219481d89d32e5c2a2de10b0740c50de +Subproject commit caf0cbca71231dbb6403108ba41d2117d3ce6c6d diff --git a/qtpurchasing b/qtpurchasing index 5afeb360..e0e37189 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 5afeb3606e0fff089e2c088265ff2013cfd97c1e +Subproject commit e0e3718989387317e6ea04ecd29a2ed127fb2921 diff --git a/qtqa b/qtqa index 683f523b..7c7310a7 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 683f523bcc524e6f78e5a3d1d3c15e2d858bac8e +Subproject commit 7c7310a7e6b35591e64e6c978a179b5846296ee8 diff --git a/qtquickcontrols b/qtquickcontrols index 6e96c1d6..c2411868 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 6e96c1d6ea3c101f418c3ec95d49999f836ef60c +Subproject commit c24118685d6eb4cacf5f6af96215ba89ecc28604 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index d579c1c8..5f9cbe02 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit d579c1c8aef5b497801d0484461182ed04fe4aa0 +Subproject commit 5f9cbe0253e27c3e559ab3dc0310775aba8a0621 diff --git a/qtscript b/qtscript index 0af88dc9..a775b9da 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 0af88dc973d3410cdd905265ce935916693b2d44 +Subproject commit a775b9da4794f1f248b63a4a58ee6ad6885f0622 diff --git a/qtscxml b/qtscxml index 93c5a3fd..ef0cdf17 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 93c5a3fd4789604bdd6c580dc3f70fbdba91b989 +Subproject commit ef0cdf17ca62da3cf8d37a31dba20fde9dd3b020 diff --git a/qtsensors b/qtsensors index 5cf1a2f7..f8e25627 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 5cf1a2f7f4ac4e71b085ef53ff5a05c4676f7ce2 +Subproject commit f8e256271f919c36c8d97eae27b1d11678294e70 diff --git a/qtserialbus b/qtserialbus index e34bad9e..f94520d6 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit e34bad9e5c44f0909019d06aa496ef91df3114b2 +Subproject commit f94520d69da7701d0e82fccbe06b16e6c022bc23 diff --git a/qtserialport b/qtserialport index 5bee9d9f..f8449352 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 5bee9d9f0f8cf5415ad9337aed88bccac3c15ce1 +Subproject commit f8449352c9af0ee8055c6a85981e092e9d109b9d diff --git a/qtsvg b/qtsvg index 4ef60892..95e0d10d 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 4ef60892ce9e8dea75a31b0be7895ebf473346a9 +Subproject commit 95e0d10ddd18b15ba12886d1ec3c5c9c3e06bd55 diff --git a/qttools b/qttools index 852f4e4c..f29f0a48 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 852f4e4cf87d7db0eaa87384b1589e151f76e6cd +Subproject commit f29f0a4855eefba944e2dd99e0d6d992b9ebbb1c diff --git a/qttranslations b/qttranslations index 510ee7f0..745f8d53 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 510ee7f04035dc64d43be29716d6d8079a8d908a +Subproject commit 745f8d5329d0d6d98a8577a254d2ee3e7174634e diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index f610c628..84881cfc 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit f610c62841fdfca4a155377b7f0fbbc60b100c3c +Subproject commit 84881cfc58a462189dfeff60c6d6f5717bc4b6b5 diff --git a/qtwayland b/qtwayland index 95ed69bd..d87d8b8a 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 95ed69bd08f424b80524414fbc0456f315353cf5 +Subproject commit d87d8b8afdd377e17a98b4d0f51c4bb0aaec25c2 diff --git a/qtwebchannel b/qtwebchannel index a9bad172..a2c3b32d 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit a9bad172f62fe1dda280df5477a8b7c1bd57690d +Subproject commit a2c3b32d08ed24279609a8c01b09c1147a9ff6b9 diff --git a/qtwebengine b/qtwebengine index 56714be7..7a49313c 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 56714be7d05afb94c63b658a4fdb2bedd1bee645 +Subproject commit 7a49313c84ccd4779e396b7bc8341a331d90f96f diff --git a/qtwebsockets b/qtwebsockets index c00241ac..c6d19a89 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit c00241ac0389cc4ee03252030e6de1257a9b50fd +Subproject commit c6d19a89046763f680d7f67c6f9989b4f51fc71e diff --git a/qtwebview b/qtwebview index cafb5c37..a0fd6472 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit cafb5c371ff31c5d55617c7e4013215415cee214 +Subproject commit a0fd64727bb98b815b318cc537954b3d0d1651bb diff --git a/qtwinextras b/qtwinextras index e5b35c47..91524134 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit e5b35c47f3bbb23800a50cfc1c34c9a99b2c6d7b +Subproject commit 91524134d4884beb9ee2695e9de27b211068d973 diff --git a/qtx11extras b/qtx11extras index 5df6e708..b414120c 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 5df6e708b64e22f98a053145011b6da917257174 +Subproject commit b414120c60ef8c3cc2aad7dca41092647d741a36 diff --git a/qtxmlpatterns b/qtxmlpatterns index b24bd0e8..20e5ddeb 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit b24bd0e87891d9f61e0121cbdcbbe0797863f316 +Subproject commit 20e5ddeba66121e59058fbe00896e25b5f82ed44 From f05fece2f774137a08a1578ed2499f4890aee799 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 25 Mar 2016 07:54:55 +0100 Subject: [PATCH 26/77] Updated submodules. Change-Id: I85bb46a7180a32c1808574d0a54c51703d4cee12 Reviewed-by: Simon Hausmann --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtenginio | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquick1 | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtrepotools | 2 +- qtscript | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebkit | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 34 files changed, 34 insertions(+), 34 deletions(-) diff --git a/qt3d b/qt3d index 149ce21d..d4553c08 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 149ce21d47df023f1638620efd940404ae36465e +Subproject commit d4553c08097a2bc632be57c085105b4f4ff0c542 diff --git a/qtactiveqt b/qtactiveqt index 450651e8..a4b8485c 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 450651e8155bbdec44253a9c282ec385257b2f8a +Subproject commit a4b8485cd38a9c33cdcf1b97633fa65b7230643b diff --git a/qtandroidextras b/qtandroidextras index c826d6ab..0a169730 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit c826d6ab7f3058857de883eb605abdb399772c01 +Subproject commit 0a1697302c15c0911bd2c78da3cd47a4006fe5f8 diff --git a/qtbase b/qtbase index 42b39f98..2e385b3d 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 42b39f9827b8410077b0330cab41f20feeabf678 +Subproject commit 2e385b3d74ffbcad820b36b717f9215cc7b86720 diff --git a/qtconnectivity b/qtconnectivity index c8745896..80b6557b 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit c87458961f29064ab69a308526b0243debcdf1f7 +Subproject commit 80b6557be3a23a5118ddf8c4b68bc28b66f52b49 diff --git a/qtdeclarative b/qtdeclarative index ece8d595..7d8c9415 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit ece8d59598fa1f8783d054ce2218b2b462cb93ee +Subproject commit 7d8c941574114ff0ce3f12793bc9c9356577fc0e diff --git a/qtdoc b/qtdoc index 5ae0440b..0d69406c 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 5ae0440b02b2365ade05f7c287e5c615e5dfdf78 +Subproject commit 0d69406c73baae0005f19bd38bde913d270080e2 diff --git a/qtenginio b/qtenginio index 60a13510..a6434420 160000 --- a/qtenginio +++ b/qtenginio @@ -1 +1 @@ -Subproject commit 60a135102aaa37d0d817883e4d6aed456372709d +Subproject commit a6434420574f775d3afa6e8912eb2ede8429db90 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 24f3fd69..6523d7c4 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 24f3fd69a2e953619c48b4a632262ce8419fee40 +Subproject commit 6523d7c4843e1d4176035c46e1514c39bdcfc3bf diff --git a/qtimageformats b/qtimageformats index eaeeacd1..bf5b4987 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit eaeeacd1d0efdf1e65c1742240b2a8d5219d5b94 +Subproject commit bf5b49878d75d316f31225f76152e8381a3d5f0f diff --git a/qtlocation b/qtlocation index 5cb6d1ba..f40e92b1 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 5cb6d1bac19bf779afbbd22bbe723e43aa86c1b7 +Subproject commit f40e92b147560be15e0f53dfd7f6b2d698c00fb9 diff --git a/qtmacextras b/qtmacextras index fc3413ec..15fb52a9 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit fc3413ec7639969cd66ccc17931a8eec4b89216b +Subproject commit 15fb52a91240efa495d8a4cdca533bfc4615fbbd diff --git a/qtmultimedia b/qtmultimedia index dd7c19ea..15c42ebc 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit dd7c19ea9d6be922faca57013b06b0f2b0787169 +Subproject commit 15c42ebccb45fcfd2d7d0c6a52af1f81eb1eb706 diff --git a/qtqa b/qtqa index e5bbdb21..7c7310a7 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit e5bbdb21629ee613925a90eaceb07207da21e5a3 +Subproject commit 7c7310a7e6b35591e64e6c978a179b5846296ee8 diff --git a/qtquick1 b/qtquick1 index 87f2415a..bf4efac4 160000 --- a/qtquick1 +++ b/qtquick1 @@ -1 +1 @@ -Subproject commit 87f2415adf34da08e6cd58f5da6f6a7d0d9cf141 +Subproject commit bf4efac4ed2f3b1ff11fd1361506dec3c2a8726c diff --git a/qtquickcontrols b/qtquickcontrols index d600966e..ba2c5d40 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit d600966e0aef236649b7a35520742f086f91cc07 +Subproject commit ba2c5d40c53d5a268022931c978534563aeff802 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 67169ffa..c59c43bb 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 67169ffa7dbf9e83e0fea35930457dc7792ef05d +Subproject commit c59c43bbc44026a508746b1de2505f6185bd0310 diff --git a/qtrepotools b/qtrepotools index ae405002..333ca78f 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit ae40500269059a24caaf390ebbc45de458960657 +Subproject commit 333ca78f192d129e600889dc2b0381cd829b00fb diff --git a/qtscript b/qtscript index 525c18f7..c2210390 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 525c18f7780a39474e71790d54cf90de29bc1fd6 +Subproject commit c22103904bfabc38edab7ac538f30fe74cecd3f0 diff --git a/qtsensors b/qtsensors index fbaca62c..0b00ee6f 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit fbaca62cd0a7309f04bf82101c8e20dbbf423192 +Subproject commit 0b00ee6f6c311a7f5c0b4f2441dad97a454d172e diff --git a/qtserialbus b/qtserialbus index 7e68b954..04b75569 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 7e68b9549caaaae31a0647998ed7aa3ea2136957 +Subproject commit 04b75569f36eec14662505a08bf8c1d565cb10fe diff --git a/qtserialport b/qtserialport index f4303a4d..9a70ee23 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit f4303a4d71b770ce4d990ff52efc6bedfb1020e5 +Subproject commit 9a70ee2389d3302f6a4262325f8a76e4d867b478 diff --git a/qtsvg b/qtsvg index a9ac71a4..b7228367 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit a9ac71a443260de66f720f0184646847b03fcb46 +Subproject commit b722836765dccca04683939d0d4f72a9e2585d88 diff --git a/qttools b/qttools index 98eebb2d..44050281 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 98eebb2dc1830b262d72e748817aee25e54d0d35 +Subproject commit 440502811b7b9749d621d20d18cfd569fceeb5c0 diff --git a/qttranslations b/qttranslations index ce85e4ee..cbef985e 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit ce85e4ee4ee22e5dea3b44707a27dab44319708e +Subproject commit cbef985e3c3e9af2d124d40959fc674b3b8aa33f diff --git a/qtwayland b/qtwayland index bebe9bef..3fcb7799 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit bebe9beff3e9874498474cec32634cf281ddc453 +Subproject commit 3fcb77996b3e6c076d50db9ccf9da3aefd24f159 diff --git a/qtwebchannel b/qtwebchannel index e777ff1f..64a106da 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit e777ff1f88e58c1b47044ac83aafa8ccafa3840f +Subproject commit 64a106da72796377bbff5cce0ecc5a379b105498 diff --git a/qtwebengine b/qtwebengine index 532548f7..963f90b7 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 532548f7cfff68d89fdf2e592862e72f3ad55810 +Subproject commit 963f90b7a07236d81d7bb65798c641556501ab10 diff --git a/qtwebkit b/qtwebkit index 5cd506a8..7205faf1 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 5cd506a8e1bcad3d0b414827db51b907e9f4a94b +Subproject commit 7205faf1a546a690f68176989100109e9a3335b7 diff --git a/qtwebsockets b/qtwebsockets index 2d8c94cf..3b128f9b 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 2d8c94cf11097b61689757f8a0162bb7dd9d7d0b +Subproject commit 3b128f9b45f4fafc305ff0c89cfc2cb665c856d5 diff --git a/qtwebview b/qtwebview index bad80f37..29988395 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit bad80f375645b758770d01ba65947981cc062715 +Subproject commit 299883956859a3eea1f2637a781adfec45c4b3c8 diff --git a/qtwinextras b/qtwinextras index cffeddfa..f132bf09 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit cffeddfab1467561ec7a2df7ccbe6c634cdf89a6 +Subproject commit f132bf0938c13745d4e6f7dd9c65db577d94187c diff --git a/qtx11extras b/qtx11extras index 5df9fa8f..f27489d6 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 5df9fa8f3a7209c067a5d5068776b9aa52273d3b +Subproject commit f27489d66cc6d8263130451c26c7e4ae40acc6b4 diff --git a/qtxmlpatterns b/qtxmlpatterns index a8d103a0..7a8d395a 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit a8d103a05bc195dd045779f3aebdf67bd0140df1 +Subproject commit 7a8d395a3b1eb5f24aa96509666326bad4218c14 From a550ad21bf4aadbb43763b63bab4513c40dc8b0d Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 4 Apr 2016 07:29:26 +0300 Subject: [PATCH 27/77] Updated submodules. Change-Id: I1c0bcd2c582276c04e44e88169807cc7cf5b43c3 Reviewed-by: Jani Heikkinen --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtmultimedia | 2 +- qtquickcontrols2 | 2 +- qtscxml | 2 +- qtserialbus | 2 +- qtsvg | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/qt3d b/qt3d index a1470b6b..a21a4e03 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit a1470b6b380a4612264956b1e09484c6752da20e +Subproject commit a21a4e0391b81307d96364db7af3b8bd343d773f diff --git a/qtbase b/qtbase index 487844fc..36bc2477 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 487844fc62bdf048224d6fc3b7eaae6347d4457b +Subproject commit 36bc2477753d19a14c587b97d4ec4f263e9e16c0 diff --git a/qtdeclarative b/qtdeclarative index 37547a91..f5afec25 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 37547a91b10da7559ee03f9fe2c23f8f22cc1c27 +Subproject commit f5afec250cc63ba3a7b1cc78f51d5eb0031dd478 diff --git a/qtdoc b/qtdoc index 652a2da6..7f969b2f 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 652a2da66628637f935546d5079d1f170c70df39 +Subproject commit 7f969b2f4f8cc8d5e9b29c61395e1cde0885ed96 diff --git a/qtmultimedia b/qtmultimedia index caf0cbca..0d836627 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit caf0cbca71231dbb6403108ba41d2117d3ce6c6d +Subproject commit 0d8366273dcb9af5dae641c7efbc6db878942422 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 5f9cbe02..78ec7b84 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 5f9cbe0253e27c3e559ab3dc0310775aba8a0621 +Subproject commit 78ec7b84abd5f499c83b0b2076fb47617a2ebbb7 diff --git a/qtscxml b/qtscxml index ef0cdf17..a7fbb4cb 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit ef0cdf17ca62da3cf8d37a31dba20fde9dd3b020 +Subproject commit a7fbb4cb25be73bed55977de208d7650c90fa8ee diff --git a/qtserialbus b/qtserialbus index f94520d6..ee4c1b91 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit f94520d69da7701d0e82fccbe06b16e6c022bc23 +Subproject commit ee4c1b91def347f8f16395585b46e20aebdb2f7b diff --git a/qtsvg b/qtsvg index 95e0d10d..8c23084b 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 95e0d10ddd18b15ba12886d1ec3c5c9c3e06bd55 +Subproject commit 8c23084b207baed7cf58c17e475baa34b889ead2 diff --git a/qtwayland b/qtwayland index d87d8b8a..01daa660 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit d87d8b8afdd377e17a98b4d0f51c4bb0aaec25c2 +Subproject commit 01daa660d04e8960961988da6191e80c05a84d58 diff --git a/qtwebengine b/qtwebengine index 7a49313c..1d8efc0b 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 7a49313c84ccd4779e396b7bc8341a331d90f96f +Subproject commit 1d8efc0b6c26baf4fdf5a7a9a136bf3f7bb8c0f2 From e80d89059ce16f376fbaeb934a1cd3b54bcbc6bb Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 4 Apr 2016 09:52:45 +0300 Subject: [PATCH 28/77] Updated submodules. Change-Id: I983429d487f7667c36553d24037639abee660b42 Reviewed-by: Jani Heikkinen --- qt3d | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtmultimedia | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtscript | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebkit | 2 +- qtwinextras | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/qt3d b/qt3d index d4553c08..9c67288e 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit d4553c08097a2bc632be57c085105b4f4ff0c542 +Subproject commit 9c67288ea4791fee5e28d1b4f2981c232b95c9d0 diff --git a/qtandroidextras b/qtandroidextras index 0a169730..d08a073f 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 0a1697302c15c0911bd2c78da3cd47a4006fe5f8 +Subproject commit d08a073fffabb1e8629145b1b2114314ef01dcff diff --git a/qtbase b/qtbase index 2e385b3d..8ce657d0 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 2e385b3d74ffbcad820b36b717f9215cc7b86720 +Subproject commit 8ce657d0279566ef327af1b88339534041ddc012 diff --git a/qtcanvas3d b/qtcanvas3d index d367ac81..791ddce7 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit d367ac81d5ef77f02434274524477dc0e5c2b4a4 +Subproject commit 791ddce7d41b126ba4744a6701597f49dbf99f3b diff --git a/qtdeclarative b/qtdeclarative index 7d8c9415..d438b4f4 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 7d8c941574114ff0ce3f12793bc9c9356577fc0e +Subproject commit d438b4f4b93d04a841edf031359e26af617d889d diff --git a/qtdoc b/qtdoc index 0d69406c..39ea341d 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 0d69406c73baae0005f19bd38bde913d270080e2 +Subproject commit 39ea341d0e5466b7a7b46c7d3ce32ea69e686f68 diff --git a/qtmultimedia b/qtmultimedia index 15c42ebc..3fb3231a 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 15c42ebccb45fcfd2d7d0c6a52af1f81eb1eb706 +Subproject commit 3fb3231a9e22dcb780d5b31ec57896429d40b0e5 diff --git a/qtquickcontrols b/qtquickcontrols index ba2c5d40..b1d29faf 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit ba2c5d40c53d5a268022931c978534563aeff802 +Subproject commit b1d29faf96ee6323bf2dad054291fd7c30a30c05 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index c59c43bb..bed6b3d6 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit c59c43bbc44026a508746b1de2505f6185bd0310 +Subproject commit bed6b3d633d83302a8e2167845db4b36e6847f0b diff --git a/qtscript b/qtscript index c2210390..b16873af 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit c22103904bfabc38edab7ac538f30fe74cecd3f0 +Subproject commit b16873afea798d08799d7a0b255b8d200337f35b diff --git a/qttools b/qttools index 44050281..aec1d10c 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 440502811b7b9749d621d20d18cfd569fceeb5c0 +Subproject commit aec1d10c66a676781c767099e81871faa040162f diff --git a/qtwayland b/qtwayland index 3fcb7799..b94be414 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 3fcb77996b3e6c076d50db9ccf9da3aefd24f159 +Subproject commit b94be41409a6dfa58d8b3ae8413c6930e76fc040 diff --git a/qtwebengine b/qtwebengine index 963f90b7..4ed08bb0 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 963f90b7a07236d81d7bb65798c641556501ab10 +Subproject commit 4ed08bb0a8195746c333dabbdb9da3400d174296 diff --git a/qtwebkit b/qtwebkit index 7205faf1..3b4c8503 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 7205faf1a546a690f68176989100109e9a3335b7 +Subproject commit 3b4c850361abbc2aae556dbf99c8e4c8086ae569 diff --git a/qtwinextras b/qtwinextras index f132bf09..e7d198e8 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit f132bf0938c13745d4e6f7dd9c65db577d94187c +Subproject commit e7d198e87396eb160fa9b1163eb73af152e70da2 From 7251401281436755426f66cd5a84767c8eb74e5a Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Thu, 7 Apr 2016 14:53:53 +0300 Subject: [PATCH 29/77] Update 5.7 module status In Qt 5.7 enginio is obsolete and Qt3D addon, not TP anymore Change-Id: I019f76162cfcc853b542695245a983f151f1b072 Reviewed-by: Iikka Eklund Reviewed-by: Oswald Buddenhagen Reviewed-by: Sean Harmer Reviewed-by: Liang Qi --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 49b048ed..adc5d98c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -151,7 +151,7 @@ path = qt3d url = ../qt3d.git branch = 5.7 - status = preview + status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats @@ -220,7 +220,7 @@ path = qtenginio url = ../qtenginio.git branch = 5.7 - status = deprecated + status = obsolete [submodule "qtwebsockets"] depends = qtbase recommends = qtdeclarative From 273e5b82cf0eb05018bc62805d57ab8e4ca458e4 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 11 Apr 2016 07:34:38 +0300 Subject: [PATCH 30/77] Updated submodules. Change-Id: Idc9529f02cc9a5ad4cd300a745b559fea9c94ed4 Reviewed-by: Jani Heikkinen --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtpurchasing | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtrepotools | 2 +- qtscript | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtsvg | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtxmlpatterns | 2 +- 33 files changed, 33 insertions(+), 33 deletions(-) diff --git a/qt3d b/qt3d index a21a4e03..1c5e9f00 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit a21a4e0391b81307d96364db7af3b8bd343d773f +Subproject commit 1c5e9f004ca67201900e7dd2581f3f25bbe74176 diff --git a/qtactiveqt b/qtactiveqt index 7477c861..b5440b50 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 7477c86107ac0f5d344b380b38118c3a90f994a7 +Subproject commit b5440b50f23982e7459a66b46ad41f176f67e308 diff --git a/qtandroidextras b/qtandroidextras index 80d6ea6c..368b0bbf 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 80d6ea6cac5ece4e3053ec19810abceb77feb4da +Subproject commit 368b0bbf2b2854547cfafa7092361f09dd157fb1 diff --git a/qtbase b/qtbase index 36bc2477..b9d386f2 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 36bc2477753d19a14c587b97d4ec4f263e9e16c0 +Subproject commit b9d386f2ccd69c7f6a766a6d90a6024eeb48e90a diff --git a/qtcanvas3d b/qtcanvas3d index 4f4eda51..32404e27 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 4f4eda51954b7983016e6a062d3db77a68c2ad67 +Subproject commit 32404e27101c5ec81b4ab965faf38263429bbc5a diff --git a/qtcharts b/qtcharts index bbf52870..97bb01ce 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit bbf52870f4e335c0d169907d4398a12cb41ca3a1 +Subproject commit 97bb01ce5d85ac94ed019f0abd7a08917ae4f80a diff --git a/qtconnectivity b/qtconnectivity index f8857127..f8759f68 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit f8857127320f513e9ec2132bc4af5c470362f37a +Subproject commit f8759f683cfc433c432059e1160d2ab657baaec6 diff --git a/qtdatavis3d b/qtdatavis3d index 3fb7ce6a..84276347 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 3fb7ce6a29ca69237c777cc65a3831768e938782 +Subproject commit 8427634773505f73ce030cf68761c4719eb03e5c diff --git a/qtdeclarative b/qtdeclarative index f5afec25..dab3fa10 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit f5afec250cc63ba3a7b1cc78f51d5eb0031dd478 +Subproject commit dab3fa107fa7b4a82928b71748b857ff85180f1e diff --git a/qtdoc b/qtdoc index 7f969b2f..6c36de2e 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 7f969b2f4f8cc8d5e9b29c61395e1cde0885ed96 +Subproject commit 6c36de2e078acd5c69ee23c0f4f53ef628338da0 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index f086de0f..d85fd81f 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit f086de0f3a67698b8066576a423298aadf566e13 +Subproject commit d85fd81f338f9c6f2e95b92b2cb9ccd4f9889c6b diff --git a/qtimageformats b/qtimageformats index 2d593672..50e257de 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 2d59367241aafbfe6acb30202f64e30697028bd9 +Subproject commit 50e257de2642fc980d4e82fb99d455ca784f11bd diff --git a/qtlocation b/qtlocation index e176f25d..46bef1bf 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit e176f25daeb3d80af1fd701000fda065064227e1 +Subproject commit 46bef1bf9b00727832cad35440c554f26e7457b9 diff --git a/qtmacextras b/qtmacextras index 5b5b33e4..509c7b7f 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 5b5b33e4eb871d31e6a74bde06a02be9239cc165 +Subproject commit 509c7b7f7da2fd69444b7dba32f31db51ad40aa8 diff --git a/qtmultimedia b/qtmultimedia index 0d836627..d32aff3e 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 0d8366273dcb9af5dae641c7efbc6db878942422 +Subproject commit d32aff3e0453475c1a22d5e8c7a106df18c0ad10 diff --git a/qtpurchasing b/qtpurchasing index e0e37189..114352e1 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit e0e3718989387317e6ea04ecd29a2ed127fb2921 +Subproject commit 114352e123021488e14fa81aa154195cbe1ad509 diff --git a/qtqa b/qtqa index 7c7310a7..4704f79e 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 7c7310a7e6b35591e64e6c978a179b5846296ee8 +Subproject commit 4704f79e9be910d9859d2649aa6a060f58c05bf8 diff --git a/qtquickcontrols b/qtquickcontrols index c2411868..4b77b044 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit c24118685d6eb4cacf5f6af96215ba89ecc28604 +Subproject commit 4b77b044b3e0a27f9f7501e6a78121afc270619c diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 78ec7b84..7946ce46 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 78ec7b84abd5f499c83b0b2076fb47617a2ebbb7 +Subproject commit 7946ce46e5ec42b4a1510b9dc6a33a28d8febe4e diff --git a/qtrepotools b/qtrepotools index 333ca78f..7d46cc64 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 333ca78f192d129e600889dc2b0381cd829b00fb +Subproject commit 7d46cc64e159da36241aba6bde1b34c057202772 diff --git a/qtscript b/qtscript index a775b9da..b49bfdaa 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit a775b9da4794f1f248b63a4a58ee6ad6885f0622 +Subproject commit b49bfdaad11be1de632f907d43485a7ac701ddc5 diff --git a/qtscxml b/qtscxml index a7fbb4cb..bf3b9da0 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit a7fbb4cb25be73bed55977de208d7650c90fa8ee +Subproject commit bf3b9da0270b696617b463ed8bb802d78f748b11 diff --git a/qtsensors b/qtsensors index f8e25627..33d15b76 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit f8e256271f919c36c8d97eae27b1d11678294e70 +Subproject commit 33d15b76dfdb95da5970b8e0294bbb87ea1eb9a8 diff --git a/qtserialbus b/qtserialbus index ee4c1b91..1675a0d7 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit ee4c1b91def347f8f16395585b46e20aebdb2f7b +Subproject commit 1675a0d726e5c07c275c0981cc3deb5ffbcc6afc diff --git a/qtserialport b/qtserialport index f8449352..84feab67 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit f8449352c9af0ee8055c6a85981e092e9d109b9d +Subproject commit 84feab670cce8414ad54f4d19b46291c7fdb14cf diff --git a/qtsvg b/qtsvg index 8c23084b..612c3041 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 8c23084b207baed7cf58c17e475baa34b889ead2 +Subproject commit 612c3041475550837dee7149b9f5e9e4f55c17a0 diff --git a/qttools b/qttools index f29f0a48..d36d2c30 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit f29f0a4855eefba944e2dd99e0d6d992b9ebbb1c +Subproject commit d36d2c3026cae67c119384f47cb2680552c81aaf diff --git a/qtwayland b/qtwayland index 01daa660..f430e84e 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 01daa660d04e8960961988da6191e80c05a84d58 +Subproject commit f430e84e0642b5eec0b6069dadd8317d880932cc diff --git a/qtwebengine b/qtwebengine index 1d8efc0b..56ceccc4 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 1d8efc0b6c26baf4fdf5a7a9a136bf3f7bb8c0f2 +Subproject commit 56ceccc4d4ff395983c4a2fbbe12fe8cb591cfb5 diff --git a/qtwebsockets b/qtwebsockets index c6d19a89..00156d63 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit c6d19a89046763f680d7f67c6f9989b4f51fc71e +Subproject commit 00156d63eea2fb7681a8a00a3144392d6325e5cb diff --git a/qtwebview b/qtwebview index a0fd6472..94152499 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit a0fd64727bb98b815b318cc537954b3d0d1651bb +Subproject commit 9415249942b98768b8bc431fdb242ca1ac09cccc diff --git a/qtwinextras b/qtwinextras index 91524134..6d019d27 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 91524134d4884beb9ee2695e9de27b211068d973 +Subproject commit 6d019d276a4be4e1a20eaf41a16eca64007249f3 diff --git a/qtxmlpatterns b/qtxmlpatterns index 20e5ddeb..9661c2a2 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 20e5ddeba66121e59058fbe00896e25b5f82ed44 +Subproject commit 9661c2a29f4bacf77170eb6b3cf016fdb6631f82 From e23b244494a4fa2a5ed449cc32bbb06bb551f57e Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 13 Apr 2016 03:30:54 +0300 Subject: [PATCH 31/77] Updated submodules. Change-Id: I875e16060956af433e20acff4fbdcfb54d0d9923 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtgamepad | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtquickcontrols2 | 2 +- qtrepotools | 2 +- qtscxml | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/qt3d b/qt3d index 1c5e9f00..fae5232d 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 1c5e9f004ca67201900e7dd2581f3f25bbe74176 +Subproject commit fae5232d47844c49dc237757e874b1b261240cfe diff --git a/qtbase b/qtbase index b9d386f2..c327fb79 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit b9d386f2ccd69c7f6a766a6d90a6024eeb48e90a +Subproject commit c327fb79e1a50c825a945e97f2c66d07a1c6d225 diff --git a/qtdeclarative b/qtdeclarative index dab3fa10..70cb6829 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit dab3fa107fa7b4a82928b71748b857ff85180f1e +Subproject commit 70cb68298ae36e9c8f669182707ac97f8acb0681 diff --git a/qtgamepad b/qtgamepad index b3e8bd55..dee527d2 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit b3e8bd55289d54bd21b4f16c6b997d805bba816e +Subproject commit dee527d22731963096023c298f946ef8cd25a7cc diff --git a/qtimageformats b/qtimageformats index 50e257de..42b07b2d 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 50e257de2642fc980d4e82fb99d455ca784f11bd +Subproject commit 42b07b2ddf443d3eafd18e169f2e5ab5e36604a5 diff --git a/qtlocation b/qtlocation index 46bef1bf..bae9a0f5 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 46bef1bf9b00727832cad35440c554f26e7457b9 +Subproject commit bae9a0f52eb4c8faab2315dd45757c49544f682c diff --git a/qtmultimedia b/qtmultimedia index d32aff3e..7f286e09 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit d32aff3e0453475c1a22d5e8c7a106df18c0ad10 +Subproject commit 7f286e0965eb31f29c68b1c1e32d2653ae34014e diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 7946ce46..4ae3a828 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 7946ce46e5ec42b4a1510b9dc6a33a28d8febe4e +Subproject commit 4ae3a828ad972e24802ea711fc12e12883cc28be diff --git a/qtrepotools b/qtrepotools index 7d46cc64..49d25c47 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 7d46cc64e159da36241aba6bde1b34c057202772 +Subproject commit 49d25c47a5e5615269785d50e24593ec1f1abf48 diff --git a/qtscxml b/qtscxml index bf3b9da0..e1513d7f 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit bf3b9da0270b696617b463ed8bb802d78f748b11 +Subproject commit e1513d7f904f03617c38f14d65cdaa8afd4ff2b2 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 84881cfc..0df8022f 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 84881cfc58a462189dfeff60c6d6f5717bc4b6b5 +Subproject commit 0df8022f93001279d1ca9b76c0df8699bb9fe3fe diff --git a/qtwayland b/qtwayland index f430e84e..44f43958 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit f430e84e0642b5eec0b6069dadd8317d880932cc +Subproject commit 44f4395879ec9464c0a6dd3a7635fad05ad14118 diff --git a/qtwebengine b/qtwebengine index 56ceccc4..22a55030 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 56ceccc4d4ff395983c4a2fbbe12fe8cb591cfb5 +Subproject commit 22a550303618202135e58f5673e7b8935d578687 From a9752d68edaae7a44c3eb580f215e7960591f9ab Mon Sep 17 00:00:00 2001 From: Dominik Holland Date: Wed, 6 Apr 2016 14:08:54 +0200 Subject: [PATCH 32/77] Added qtdeclarative and qtmultimedia as optional dependencies for qtspeech Change-Id: I20602133a2156b162e99432f868e4925469c7ff5 Reviewed-by: Frederik Gladhorn --- .gitmodules | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitmodules b/.gitmodules index adc5d98c..c8f98870 100644 --- a/.gitmodules +++ b/.gitmodules @@ -305,6 +305,7 @@ status = preview [submodule "qtspeech"] depends = qtbase + recommends = qtdeclarative qtmultimedia path = qtspeech url = ../qtspeech branch = dev From 499c5390b37f5a7eba39c820910741c0c960d977 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 21 Apr 2016 01:00:42 +0300 Subject: [PATCH 33/77] Updated submodules. Change-Id: I72e29c8b66acba249f6a274e6428e00a9804b4dd Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtenginio | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquick1 | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtrepotools | 2 +- qtserialbus | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebkit | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtxmlpatterns | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/qt3d b/qt3d index 9c67288e..8fb8f65d 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 9c67288ea4791fee5e28d1b4f2981c232b95c9d0 +Subproject commit 8fb8f65da85e16a3f4d798d2175cec918d2c5afb diff --git a/qtbase b/qtbase index 8ce657d0..bbd1228b 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 8ce657d0279566ef327af1b88339534041ddc012 +Subproject commit bbd1228b17ee3f3a5483f88b0a581d6a60c41cad diff --git a/qtconnectivity b/qtconnectivity index 80b6557b..dedff12a 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 80b6557be3a23a5118ddf8c4b68bc28b66f52b49 +Subproject commit dedff12a896d51c469d2af82664b86a10f8fa7fe diff --git a/qtdeclarative b/qtdeclarative index d438b4f4..3b9d7ee1 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit d438b4f4b93d04a841edf031359e26af617d889d +Subproject commit 3b9d7ee10e2ae6565f0767219303d9a11d80f489 diff --git a/qtdoc b/qtdoc index 39ea341d..c99ffa60 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 39ea341d0e5466b7a7b46c7d3ce32ea69e686f68 +Subproject commit c99ffa6088ed1879ea74a978bae6350971ac9cbe diff --git a/qtenginio b/qtenginio index a6434420..cf717b99 160000 --- a/qtenginio +++ b/qtenginio @@ -1 +1 @@ -Subproject commit a6434420574f775d3afa6e8912eb2ede8429db90 +Subproject commit cf717b99fdb1b7221dd556bf3be32feba0ed8afe diff --git a/qtlocation b/qtlocation index f40e92b1..d1f66746 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit f40e92b147560be15e0f53dfd7f6b2d698c00fb9 +Subproject commit d1f66746ab0b77b4f3300cbeeaafe61d25d78e98 diff --git a/qtmultimedia b/qtmultimedia index 3fb3231a..2170a3b0 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 3fb3231a9e22dcb780d5b31ec57896429d40b0e5 +Subproject commit 2170a3b0fcda613daf76a337fa45cb97e0714cdf diff --git a/qtqa b/qtqa index 7c7310a7..4704f79e 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 7c7310a7e6b35591e64e6c978a179b5846296ee8 +Subproject commit 4704f79e9be910d9859d2649aa6a060f58c05bf8 diff --git a/qtquick1 b/qtquick1 index bf4efac4..563ce388 160000 --- a/qtquick1 +++ b/qtquick1 @@ -1 +1 @@ -Subproject commit bf4efac4ed2f3b1ff11fd1361506dec3c2a8726c +Subproject commit 563ce3888f3c04abcc96ba236b20c7a822bc88e2 diff --git a/qtquickcontrols b/qtquickcontrols index b1d29faf..01e52200 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit b1d29faf96ee6323bf2dad054291fd7c30a30c05 +Subproject commit 01e52200e2a76ec51c3bb9710617ac0c249a78bc diff --git a/qtquickcontrols2 b/qtquickcontrols2 index bed6b3d6..ac152bfc 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit bed6b3d633d83302a8e2167845db4b36e6847f0b +Subproject commit ac152bfcd37f94453e9705b57ca6520ad30bade0 diff --git a/qtrepotools b/qtrepotools index 333ca78f..0b1dba74 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 333ca78f192d129e600889dc2b0381cd829b00fb +Subproject commit 0b1dba7456f0e2cebf0d270bbaa4b04b4883c46e diff --git a/qtserialbus b/qtserialbus index 04b75569..7a05d8ed 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 04b75569f36eec14662505a08bf8c1d565cb10fe +Subproject commit 7a05d8ed0f123372b29662c84c16f04140de5b28 diff --git a/qtsvg b/qtsvg index b7228367..e02df9c0 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit b722836765dccca04683939d0d4f72a9e2585d88 +Subproject commit e02df9c098b4d304b34c0ff65806a0576e45ed1a diff --git a/qttools b/qttools index aec1d10c..e33532e0 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit aec1d10c66a676781c767099e81871faa040162f +Subproject commit e33532e048fa12ee32429ca83ee31aa8f065147d diff --git a/qttranslations b/qttranslations index cbef985e..13f1f2f1 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit cbef985e3c3e9af2d124d40959fc674b3b8aa33f +Subproject commit 13f1f2f12ddfc9b84535361d77a5f0f0ec8c3e0f diff --git a/qtwayland b/qtwayland index b94be414..26e27845 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit b94be41409a6dfa58d8b3ae8413c6930e76fc040 +Subproject commit 26e27845a43319d0ecad0c6392f05d1ed50da2a2 diff --git a/qtwebengine b/qtwebengine index 4ed08bb0..643aa579 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 4ed08bb0a8195746c333dabbdb9da3400d174296 +Subproject commit 643aa579fc94933eefa8eb20af6729e2140cf480 diff --git a/qtwebkit b/qtwebkit index 3b4c8503..71136c96 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 3b4c850361abbc2aae556dbf99c8e4c8086ae569 +Subproject commit 71136c9621103522e85654c8e144d5f1c961de1c diff --git a/qtwebsockets b/qtwebsockets index 3b128f9b..ba9306ec 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 3b128f9b45f4fafc305ff0c89cfc2cb665c856d5 +Subproject commit ba9306ec5a1271275d79b2f48ceb227f79352f33 diff --git a/qtwebview b/qtwebview index 29988395..87cc3318 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 299883956859a3eea1f2637a781adfec45c4b3c8 +Subproject commit 87cc3318cbd0aba2388e9c2623eb085b48db4e6c diff --git a/qtwinextras b/qtwinextras index e7d198e8..dbf43cd3 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit e7d198e87396eb160fa9b1163eb73af152e70da2 +Subproject commit dbf43cd34090cc66317ee5ffe5d12f874fe1576a diff --git a/qtxmlpatterns b/qtxmlpatterns index 7a8d395a..5e6acdb2 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 7a8d395a3b1eb5f24aa96509666326bad4218c14 +Subproject commit 5e6acdb2ea92add793835561e7a2d6b0ed8890f8 From 3df0a5837c523761911247ba19f203e79de90043 Mon Sep 17 00:00:00 2001 From: Iikka Eklund Date: Tue, 19 Apr 2016 15:05:09 +0300 Subject: [PATCH 34/77] Update qtquickcontrols2 status as "addon" for Qt 5.7 qtquickcontrols2 is not in preview state anymore for Qt 5.7. Change-Id: Ib9d3616e7605beabb9bb9f0b0cb1b79a8d499ebd Reviewed-by: J-P Nurmi Reviewed-by: Oswald Buddenhagen Reviewed-by: Jani Heikkinen --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index c8f98870..6c17f09f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -261,7 +261,7 @@ path = qtquickcontrols2 url = ../qtquickcontrols2.git branch = 5.7 - status = preview + status = addon [submodule "qtpurchasing"] depends = qtbase recommends = qtdeclarative From b7c2e9a846e85a951eb5b4b645e886770ce9c8c2 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 19 Apr 2016 15:55:48 +0300 Subject: [PATCH 35/77] Updated submodules. Change-Id: Id24e1017eee9828e7d6245f1241f241662cc48ef Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtcharts | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtrepotools | 2 +- qtscxml | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtxmlpatterns | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/qt3d b/qt3d index fae5232d..7c9331e9 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit fae5232d47844c49dc237757e874b1b261240cfe +Subproject commit 7c9331e953700e4c35e4bd3d51ebc49e4c3b0f80 diff --git a/qtbase b/qtbase index c327fb79..b3fcaea5 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit c327fb79e1a50c825a945e97f2c66d07a1c6d225 +Subproject commit b3fcaea5f2b97d3f562add97aee48cbb469c875a diff --git a/qtcharts b/qtcharts index 97bb01ce..023f3b1e 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 97bb01ce5d85ac94ed019f0abd7a08917ae4f80a +Subproject commit 023f3b1edeaa9b5f622ddb7781c82ca3468caeff diff --git a/qtdeclarative b/qtdeclarative index 70cb6829..9bb64062 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 70cb68298ae36e9c8f669182707ac97f8acb0681 +Subproject commit 9bb640625d1e929f8caac34fa0a0fedeef8687ca diff --git a/qtdoc b/qtdoc index 6c36de2e..61929742 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 6c36de2e078acd5c69ee23c0f4f53ef628338da0 +Subproject commit 619297421f5fd5f89768cc4161b4f3a7a5c3d575 diff --git a/qtlocation b/qtlocation index bae9a0f5..e41c3a9b 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit bae9a0f52eb4c8faab2315dd45757c49544f682c +Subproject commit e41c3a9b345536ccee0840ac6f049173aa6a0785 diff --git a/qtquickcontrols b/qtquickcontrols index 4b77b044..2ee6ef43 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 4b77b044b3e0a27f9f7501e6a78121afc270619c +Subproject commit 2ee6ef43d681746d07c1175738184715ce0d84e4 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 4ae3a828..e253427f 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 4ae3a828ad972e24802ea711fc12e12883cc28be +Subproject commit e253427f93248983d18055c5020094799a2c6b3b diff --git a/qtrepotools b/qtrepotools index 49d25c47..0b1dba74 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 49d25c47a5e5615269785d50e24593ec1f1abf48 +Subproject commit 0b1dba7456f0e2cebf0d270bbaa4b04b4883c46e diff --git a/qtscxml b/qtscxml index e1513d7f..7e885ef3 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit e1513d7f904f03617c38f14d65cdaa8afd4ff2b2 +Subproject commit 7e885ef3952830b9683d145aadc592c66cec180d diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 0df8022f..9c401c08 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 0df8022f93001279d1ca9b76c0df8699bb9fe3fe +Subproject commit 9c401c0881bc92491ef128ca9288d5b7c2c7a33c diff --git a/qtwayland b/qtwayland index 44f43958..15216555 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 44f4395879ec9464c0a6dd3a7635fad05ad14118 +Subproject commit 15216555593740029f3c25ee16dc4dc248a017b7 diff --git a/qtwebengine b/qtwebengine index 22a55030..7d172fcf 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 22a550303618202135e58f5673e7b8935d578687 +Subproject commit 7d172fcf39fa2a5d7d5202f20c599eb678f6cb58 diff --git a/qtxmlpatterns b/qtxmlpatterns index 9661c2a2..fb1dc19b 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 9661c2a29f4bacf77170eb6b3cf016fdb6631f82 +Subproject commit fb1dc19bf195c530b7f44d18cc927472b9866a46 From d61ac6c2f03695a7184c964b0cc092c24b829f24 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 25 Apr 2016 01:00:45 +0300 Subject: [PATCH 36/77] Updated submodules. Change-Id: I1586fb62199695f918f016ec9437810b0f9515e9 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtmultimedia | 2 +- qtquickcontrols | 2 +- qtserialbus | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebview | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qtbase b/qtbase index bbd1228b..072f5b51 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit bbd1228b17ee3f3a5483f88b0a581d6a60c41cad +Subproject commit 072f5b513e486e884ea7fa4a1cac9aedf3846374 diff --git a/qtdeclarative b/qtdeclarative index 3b9d7ee1..2e6f7f36 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 3b9d7ee10e2ae6565f0767219303d9a11d80f489 +Subproject commit 2e6f7f362e62c3285e7d395aca607502c8e8160e diff --git a/qtmultimedia b/qtmultimedia index 2170a3b0..7553a052 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 2170a3b0fcda613daf76a337fa45cb97e0714cdf +Subproject commit 7553a0521356d0b28bacb8c8d07a25e4ba26097e diff --git a/qtquickcontrols b/qtquickcontrols index 01e52200..26f7894d 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 01e52200e2a76ec51c3bb9710617ac0c249a78bc +Subproject commit 26f7894dae87ef2dd6cf596decf645d1c877c950 diff --git a/qtserialbus b/qtserialbus index 7a05d8ed..edf55f65 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 7a05d8ed0f123372b29662c84c16f04140de5b28 +Subproject commit edf55f657a46fe16bf80d63f523848bb9b71d9f3 diff --git a/qtwayland b/qtwayland index 26e27845..2e08d3af 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 26e27845a43319d0ecad0c6392f05d1ed50da2a2 +Subproject commit 2e08d3afc08ea305052d75a306dac381d3025134 diff --git a/qtwebengine b/qtwebengine index 643aa579..a3318c84 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 643aa579fc94933eefa8eb20af6729e2140cf480 +Subproject commit a3318c84b022282a5a4a2babc51d1e3ca634e25b diff --git a/qtwebview b/qtwebview index 87cc3318..b76a913c 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 87cc3318cbd0aba2388e9c2623eb085b48db4e6c +Subproject commit b76a913c948e61184dbfe6e540cfcdc7f9f11585 From 2aff3114237294c08dee8a90d403c1b98c64b079 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Mon, 25 Apr 2016 15:00:02 +0200 Subject: [PATCH 37/77] Add coin provisioning directory MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I76c5c5b7a1ca41758964923d3eb5c9e644f468be Reviewed-by: Jędrzej Nowacki Reviewed-by: Oswald Buddenhagen --- coin/README | 9 +++++++++ coin/provisioning/qtci-linux-RHEL-6.6-x86_64/odbc.sh | 4 ++++ 2 files changed, 13 insertions(+) create mode 100644 coin/README create mode 100644 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/odbc.sh diff --git a/coin/README b/coin/README new file mode 100644 index 00000000..891d7202 --- /dev/null +++ b/coin/README @@ -0,0 +1,9 @@ +Continuous Integration +====================== + +This directory contains files used by Qt's Continuous Integration system (Coin). + +provisioning +------------ +Contains scripts that apply to different test machines in order to run automatic tests on them. + diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/odbc.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/odbc.sh new file mode 100644 index 00000000..f6c90a75 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/odbc.sh @@ -0,0 +1,4 @@ +# provides: odbc devel packages on RHEL +# version: provided by default Linux distribution repository +# needed for configure -plugin-sql-odbc in qtbase +sudo yum install -y unixODBC-devel From 54f1bfd10c5149271531d40f1a3056dace5f420b Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Wed, 27 Apr 2016 14:52:15 +0200 Subject: [PATCH 38/77] Add script to install jom through powershell MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I3f12aa0dd54f99fafdffb53796e54e7b127c3c8c Reviewed-by: Jędrzej Nowacki --- coin/provisioning/common/helpers.ps1 | 31 +++++++++++++++++++ coin/provisioning/common/jom.ps1 | 7 +++++ coin/provisioning/qtci-windows-10-x86/jom.ps1 | 6 ++++ .../qtci-windows-10-x86_64/jom.ps1 | 6 ++++ coin/provisioning/qtci-windows-7-x86/jom.ps1 | 6 ++++ coin/provisioning/qtci-windows-8-x86/jom.ps1 | 6 ++++ .../qtci-windows-8-x86_64/jom.ps1 | 6 ++++ 7 files changed, 68 insertions(+) create mode 100644 coin/provisioning/common/helpers.ps1 create mode 100644 coin/provisioning/common/jom.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86/jom.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/jom.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86/jom.ps1 create mode 100644 coin/provisioning/qtci-windows-8-x86/jom.ps1 create mode 100644 coin/provisioning/qtci-windows-8-x86_64/jom.ps1 diff --git a/coin/provisioning/common/helpers.ps1 b/coin/provisioning/common/helpers.ps1 new file mode 100644 index 00000000..f517e94d --- /dev/null +++ b/coin/provisioning/common/helpers.ps1 @@ -0,0 +1,31 @@ +function Verify-Checksum +{ + Param ( + [string]$File=$(throw("You must specify a filename to get the checksum of.")), + [string]$Expected=$(throw("Checksum required")), + [ValidateSet("sha1","md5")][string]$Algorithm="sha1" + ) + $fs = new-object System.IO.FileStream $File, "Open" + $algo = [type]"System.Security.Cryptography.$Algorithm" + $crypto = $algo::Create() + $hash = [BitConverter]::ToString($crypto.ComputeHash($fs)).Replace("-", "") + $fs.Close() + if ($hash -ne $Expected) { + Write-Error "Checksum verification failed, got: '$hash' expected: '$Expected'" + } +} + +function Extract-Zip +{ + Param ( + [string]$Source, + [string]$Destination + ) + echo "Extracting '$Source' to '$Destination'..." + + New-Item -ItemType Directory -Force -Path $Destination + $shell = new-object -com shell.application + $zipfile = $shell.Namespace($Source) + $destinationFolder = $shell.Namespace($Destination) + $destinationFolder.CopyHere($zipfile.Items()) +} diff --git a/coin/provisioning/common/jom.ps1 b/coin/provisioning/common/jom.ps1 new file mode 100644 index 00000000..c233ee6e --- /dev/null +++ b/coin/provisioning/common/jom.ps1 @@ -0,0 +1,7 @@ +. "$PSScriptRoot\helpers.ps1" + +$zip = "c:\users\qt\downloads\jom_1_1_0.zip" + +Invoke-WebRequest -UseBasicParsing http://download.qt.io/official_releases/jom/jom_1_1_0.zip -OutFile $zip +Verify-Checksum $zip "C4149FE706B25738B4C4E54C73E180B9CAB55832" +Extract-Zip $zip C:\Utils\Jom diff --git a/coin/provisioning/qtci-windows-10-x86/jom.ps1 b/coin/provisioning/qtci-windows-10-x86/jom.ps1 new file mode 100644 index 00000000..360fad95 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/jom.ps1 @@ -0,0 +1,6 @@ +Set-ExecutionPolicy RemoteSigned -Force + +# install jom +. "$PSScriptRoot\..\common\jom.ps1" + +Set-ExecutionPolicy Restricted -Force diff --git a/coin/provisioning/qtci-windows-10-x86_64/jom.ps1 b/coin/provisioning/qtci-windows-10-x86_64/jom.ps1 new file mode 100644 index 00000000..360fad95 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/jom.ps1 @@ -0,0 +1,6 @@ +Set-ExecutionPolicy RemoteSigned -Force + +# install jom +. "$PSScriptRoot\..\common\jom.ps1" + +Set-ExecutionPolicy Restricted -Force diff --git a/coin/provisioning/qtci-windows-7-x86/jom.ps1 b/coin/provisioning/qtci-windows-7-x86/jom.ps1 new file mode 100644 index 00000000..360fad95 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/jom.ps1 @@ -0,0 +1,6 @@ +Set-ExecutionPolicy RemoteSigned -Force + +# install jom +. "$PSScriptRoot\..\common\jom.ps1" + +Set-ExecutionPolicy Restricted -Force diff --git a/coin/provisioning/qtci-windows-8-x86/jom.ps1 b/coin/provisioning/qtci-windows-8-x86/jom.ps1 new file mode 100644 index 00000000..360fad95 --- /dev/null +++ b/coin/provisioning/qtci-windows-8-x86/jom.ps1 @@ -0,0 +1,6 @@ +Set-ExecutionPolicy RemoteSigned -Force + +# install jom +. "$PSScriptRoot\..\common\jom.ps1" + +Set-ExecutionPolicy Restricted -Force diff --git a/coin/provisioning/qtci-windows-8-x86_64/jom.ps1 b/coin/provisioning/qtci-windows-8-x86_64/jom.ps1 new file mode 100644 index 00000000..360fad95 --- /dev/null +++ b/coin/provisioning/qtci-windows-8-x86_64/jom.ps1 @@ -0,0 +1,6 @@ +Set-ExecutionPolicy RemoteSigned -Force + +# install jom +. "$PSScriptRoot\..\common\jom.ps1" + +Set-ExecutionPolicy Restricted -Force From 3963056f63ecf76bf25e210dc170cdbe0dbc664c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= Date: Wed, 27 Apr 2016 15:21:34 +0200 Subject: [PATCH 39/77] Add script that install icu on RHEL 6.6 That is translation from coin-setup golang code to sh script Change-Id: Ic26d3877e56feb8b7f8e3ccd3405a044fb6afd8e Reviewed-by: Frederik Gladhorn --- .../qtci-linux-RHEL-6.6-x86_64/install_icu.sh | 70 +++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/install_icu.sh diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/install_icu.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/install_icu.sh new file mode 100644 index 00000000..02ddda3f --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/install_icu.sh @@ -0,0 +1,70 @@ +#!/bin/env bash + +############################################################################# +## +## Copyright (C) 2016 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the test suite of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +# This script installs the right ICU version + +set -e +icuVersion="56.1" +icuLocation="/usr/lib64" +sha1="f2eab775c04ce5f3bdae6c47d06b62158b5d6753" + +function Install7ZPackageFromURL { + url=$1 + expectedSha1=$2 + targetDirectory=$3 + + targetFile=`mktemp` || echo "Failed to create temporary file" + wget --tries=5 --waitretry=5 --output-document=$targetFile $url || echo "Failed to download '$url' multiple times" + echo "$expectedSha1 $targetFile" | sha1sum --check || echo "Failed to check sha1sum" + sudo /usr/local/bin/7z x -yo$targetDirectory $targetFile || echo "Failed to unzip $url archive" + rm $targetFile +} + +echo "Installing custom ICU $icuVersion $sha1 packages on RHEL to $icuLocation" + +baseBinaryPackageURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel6.6-x64.7z" +Install7ZPackageFromURL $baseBinaryPackageURL $sha1 "/usr/lib64" + +echo "Installing custom ICU devel packages on RHEL" + +sha1Dev="82f8b216371b848b8d36ecec7fe7b6e9b0dba0df" +develPackageURL="http://master.qt.io/development_releases/prebuilt/icu/prebuilt/$icuVersion/icu-linux-g++-Rhel6.6-x64-devel.7z" +tempDir=`mktemp -d` || echo "Failed to create temporary directory" +trap "sudo rm -fr $tempDir" EXIT +Install7ZPackageFromURL $develPackageURL $sha1Dev $tempDir +sudo cp -a $tempDir/lib/* /usr/lib64 +sudo cp -a $tempDir/* /usr/ + +sudo /sbin/ldconfig From 9b9801b7d49a1c9c01f45fa697812f91b392e091 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 5 May 2016 01:00:43 +0300 Subject: [PATCH 40/77] 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 From c41d854254dbee488c454ec512ac0dfba1c38903 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 20 Apr 2016 14:19:40 +0200 Subject: [PATCH 41/77] 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; } } From a1ec8795c67bb154195a774544b3614fdd729d3d Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 20 Apr 2016 14:21:25 +0200 Subject: [PATCH 42/77] 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 { From cef159accd25d8d189745e11a4959e943b9b70df Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Thu, 28 Apr 2016 13:13:16 +0200 Subject: [PATCH 43/77] Add script to install freeopcua on Ubuntu 14.04 Change-Id: Ia13362cf9aa17fbc0e85ac61b1f2897101903aaf Reviewed-by: Simon Hausmann --- .../freeopcua.sh | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/freeopcua.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/freeopcua.sh b/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/freeopcua.sh new file mode 100644 index 00000000..b14e94a6 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/freeopcua.sh @@ -0,0 +1,49 @@ +#!/bin/env bash + +############################################################################# +## +## Copyright (C) 2016 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the test suite of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +sudo apt-get update +sudo apt-get install -y libboost-dev libboost-thread-dev libboost-system-dev libboost-program-options-dev libboost-filesystem-dev libxml2-dev libboost-regex-dev + +TEMPDIR=$(mktemp --directory) || echo "Failed to create temporary directory" +trap "sudo rm -fr $TEMPDIR" EXIT +cd $TEMPDIR +git clone https://github.com/FreeOpcUa/freeopcua.git freeopcua +cd freeopcua +git checkout 57b6993d39b6761af773fa4fa37c3fbd39c764f1 +mkdir build +cd build +cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr/local .. +make +sudo make install From c07377e739ca43624640c7317a82d3d3d2be81c3 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 8 May 2016 01:00:42 +0300 Subject: [PATCH 44/77] 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 From 9812986913250f1f61d90f1e75a3192b11533829 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 11 May 2016 01:00:42 +0300 Subject: [PATCH 45/77] 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 From 868e545eb2402063b562383f944fb5b865022de2 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 11 May 2016 15:55:54 +0300 Subject: [PATCH 46/77] Updated submodules. Change-Id: Iac472068ce186e1e1a0a8a58c7050451171eee37 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtpurchasing | 2 +- qtqa | 2 +- qtquick1 | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtrepotools | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwinextras | 2 +- qtxmlpatterns | 2 +- 29 files changed, 29 insertions(+), 29 deletions(-) diff --git a/qt3d b/qt3d index 7c9331e9..faf56f50 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 7c9331e953700e4c35e4bd3d51ebc49e4c3b0f80 +Subproject commit faf56f50608f9391d2a73ed7c61bfdd9c2afab78 diff --git a/qtactiveqt b/qtactiveqt index b5440b50..73ee37be 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit b5440b50f23982e7459a66b46ad41f176f67e308 +Subproject commit 73ee37bebbf724a3ec01b30212ed31002a682083 diff --git a/qtbase b/qtbase index b3fcaea5..e64b2234 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit b3fcaea5f2b97d3f562add97aee48cbb469c875a +Subproject commit e64b2234e829cc47872225debcf80d6c06db18f0 diff --git a/qtcharts b/qtcharts index 023f3b1e..7bc9c012 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 023f3b1edeaa9b5f622ddb7781c82ca3468caeff +Subproject commit 7bc9c012efbb987790742ee8905965344be55ea7 diff --git a/qtconnectivity b/qtconnectivity index f8759f68..caded2ed 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit f8759f683cfc433c432059e1160d2ab657baaec6 +Subproject commit caded2edf69e8a60897653ace1e10b72199c7427 diff --git a/qtdatavis3d b/qtdatavis3d index 84276347..2f6074fd 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 8427634773505f73ce030cf68761c4719eb03e5c +Subproject commit 2f6074fde0ec050c77f881e0d2ce265fa93a0fcc diff --git a/qtdeclarative b/qtdeclarative index 9bb64062..531d00c1 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 9bb640625d1e929f8caac34fa0a0fedeef8687ca +Subproject commit 531d00c1909527cb1bc28f17197267ccde408b0c diff --git a/qtdoc b/qtdoc index 61929742..65397e8c 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 619297421f5fd5f89768cc4161b4f3a7a5c3d575 +Subproject commit 65397e8c9d7a30bd8a07bfa866ded1428532b840 diff --git a/qtgamepad b/qtgamepad index dee527d2..84b87c22 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit dee527d22731963096023c298f946ef8cd25a7cc +Subproject commit 84b87c222872eb6e49727d773177b7f5b86e9beb diff --git a/qtimageformats b/qtimageformats index 42b07b2d..68d9cfe5 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 42b07b2ddf443d3eafd18e169f2e5ab5e36604a5 +Subproject commit 68d9cfe5256c91510552c2b16d5efdb01e77ea57 diff --git a/qtlocation b/qtlocation index e41c3a9b..761331dd 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit e41c3a9b345536ccee0840ac6f049173aa6a0785 +Subproject commit 761331ddc841809a4bdc6ca2f2b84c148cb9b19a diff --git a/qtmultimedia b/qtmultimedia index 7f286e09..08e13bfc 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 7f286e0965eb31f29c68b1c1e32d2653ae34014e +Subproject commit 08e13bfcdb23eabfbc47bca7499b0b8aadce0ac7 diff --git a/qtpurchasing b/qtpurchasing index 114352e1..0afcd2ef 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 114352e123021488e14fa81aa154195cbe1ad509 +Subproject commit 0afcd2efe2c33bbbd5d9b1edc47b0fcccb6ce8c2 diff --git a/qtqa b/qtqa index 4704f79e..32893be6 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 4704f79e9be910d9859d2649aa6a060f58c05bf8 +Subproject commit 32893be6fa2c1068df16479979acf9b3ba7f6bcd diff --git a/qtquick1 b/qtquick1 index 5e3bd5cb..26229cfa 160000 --- a/qtquick1 +++ b/qtquick1 @@ -1 +1 @@ -Subproject commit 5e3bd5cb28e7af95b289a617ca2f7a8892498225 +Subproject commit 26229cfa0b729313893af5674d604e8692dbb946 diff --git a/qtquickcontrols b/qtquickcontrols index 2ee6ef43..c6713e21 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 2ee6ef43d681746d07c1175738184715ce0d84e4 +Subproject commit c6713e212ef0b97c45d6466b73220567e94a05f1 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index e253427f..8b2e819a 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit e253427f93248983d18055c5020094799a2c6b3b +Subproject commit 8b2e819ab2246d01eb564a52aa08bdf1d55c02c2 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/qtscxml b/qtscxml index 7e885ef3..bdbe7d94 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 7e885ef3952830b9683d145aadc592c66cec180d +Subproject commit bdbe7d947a65070b59ac24cf9f05247037863ef8 diff --git a/qtsensors b/qtsensors index 33d15b76..f32489e3 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 33d15b76dfdb95da5970b8e0294bbb87ea1eb9a8 +Subproject commit f32489e379805c51b28ae5d471491a649283fd8d diff --git a/qtserialbus b/qtserialbus index 1675a0d7..ad54496c 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 1675a0d726e5c07c275c0981cc3deb5ffbcc6afc +Subproject commit ad54496cce03077073660c5c440b0f45b7e46496 diff --git a/qtserialport b/qtserialport index 84feab67..a11fa1df 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 84feab670cce8414ad54f4d19b46291c7fdb14cf +Subproject commit a11fa1dfd529948da961d3d292926a15f9b7005b diff --git a/qttools b/qttools index d36d2c30..570f0f31 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit d36d2c3026cae67c119384f47cb2680552c81aaf +Subproject commit 570f0f314cbe4603db34d4967b6a7dd35d174eba diff --git a/qttranslations b/qttranslations index 745f8d53..c95337f7 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 745f8d5329d0d6d98a8577a254d2ee3e7174634e +Subproject commit c95337f7e974c75a88b96c168b6056a1642399bb diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 9c401c08..0c70872a 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 9c401c0881bc92491ef128ca9288d5b7c2c7a33c +Subproject commit 0c70872a81aab39465606ab37333caf55064482a diff --git a/qtwayland b/qtwayland index 15216555..c07dc0c5 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 15216555593740029f3c25ee16dc4dc248a017b7 +Subproject commit c07dc0c5cd138db2f222c6c58bc5778532cecf42 diff --git a/qtwebengine b/qtwebengine index 7d172fcf..023168cf 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 7d172fcf39fa2a5d7d5202f20c599eb678f6cb58 +Subproject commit 023168cf91dc7ac11ced1b6a60ca7aa248987810 diff --git a/qtwinextras b/qtwinextras index 6d019d27..8e816f25 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 6d019d276a4be4e1a20eaf41a16eca64007249f3 +Subproject commit 8e816f25034287bb3f89317a631075533914102b diff --git a/qtxmlpatterns b/qtxmlpatterns index fb1dc19b..9751d3d8 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit fb1dc19bf195c530b7f44d18cc927472b9866a46 +Subproject commit 9751d3d82eecb4f2c2a805783fbcce9ccd189fea From 23824d231b83de8ec6a8137f8b86f5960e2bfcb8 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 13 May 2016 13:28:52 +0200 Subject: [PATCH 47/77] Adjust submodule branches Change-Id: I3457cdb3ec2a645fb542039a62e6d107e1bbb812 --- .gitmodules | 80 ++++++++++++++++++++++++++--------------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/.gitmodules b/.gitmodules index 6c17f09f..bbf03024 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,66 +1,66 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.7 + branch = 5.7.0 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = 5.7 + branch = 5.7.0 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg qtxmlpatterns path = qtdeclarative url = ../qtdeclarative.git - branch = 5.7 + branch = 5.7.0 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = 5.7 + branch = 5.7.0 status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = 5.7 + branch = 5.7.0 status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = 5.7 + branch = 5.7.0 status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt qtwebkit path = qttools url = ../qttools.git - branch = 5.7 + branch = 5.7.0 status = essential [submodule "qtxmlpatterns"] depends = qtbase path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.7 + branch = 5.7.0 status = addon [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = 5.7 + branch = 5.7.0 status = essential priority = 30 [submodule "qtdoc"] depends = qtdeclarative path = qtdoc url = ../qtdoc.git - branch = 5.7 + branch = 5.7.0 status = essential priority = 40 [submodule "qtrepotools"] @@ -74,7 +74,7 @@ recommends = qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel qtxmlpatterns path = qtwebkit url = ../qtwebkit.git - branch = 5.7 + branch = 5.7.0 status = obsolete project = WebKit.pro priority = 20 @@ -82,7 +82,7 @@ depends = qtwebkit qttools path = qtwebkit-examples url = ../qtwebkit-examples.git - branch = 5.7 + branch = 5.7.0 status = obsolete [submodule "qtqa"] depends = qtbase @@ -96,14 +96,14 @@ recommends = qtdeclarative qtquickcontrols qtserialport qtsystems path = qtlocation url = ../qtlocation.git - branch = 5.7 + branch = 5.7.0 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = 5.7 + branch = 5.7.0 status = addon [submodule "qtsystems"] depends = qtbase @@ -136,172 +136,172 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = 5.7 + branch = 5.7.0 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = 5.7 + branch = 5.7.0 status = addon [submodule "qt3d"] depends = qtdeclarative qtimageformats recommends = qtgamepad path = qt3d url = ../qt3d.git - branch = 5.7 + branch = 5.7.0 status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = 5.7 + branch = 5.7.0 status = addon [submodule "qtquick1"] depends = qtscript recommends = qtsvg qtxmlpatterns path = qtquick1 url = ../qtquick1.git - branch = 5.7 + branch = 5.7.0 status = obsolete [submodule "qtgraphicaleffects"] depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.7 + branch = 5.7.0 status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.7 + branch = 5.7.0 status = essential [submodule "qtserialbus"] depends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 5.7 + branch = 5.7.0 status = preview [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = 5.7 + branch = 5.7.0 status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = 5.7 + branch = 5.7.0 status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = 5.7 + branch = 5.7.0 status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = 5.7 + branch = 5.7.0 status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = 5.7 + branch = 5.7.0 status = addon [submodule "qtenginio"] depends = qtdeclarative path = qtenginio url = ../qtenginio.git - branch = 5.7 + branch = 5.7.0 status = obsolete [submodule "qtwebsockets"] depends = qtbase recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = 5.7 + branch = 5.7.0 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = 5.7 + branch = 5.7.0 status = addon [submodule "qtwebengine"] depends = qtquickcontrols qtwebchannel recommends = qtlocation path = qtwebengine url = ../qtwebengine.git - branch = 5.7 + branch = 5.7.0 status = addon priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative path = qtcanvas3d url = ../qtcanvas3d.git - branch = 5.7 + branch = 5.7.0 status = addon [submodule "qtwebview"] depends = qtdeclarative recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = 5.7 + branch = 5.7.0 status = addon [submodule "qtquickcontrols2"] depends = qtgraphicaleffects path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = 5.7 + branch = 5.7.0 status = addon [submodule "qtpurchasing"] depends = qtbase recommends = qtdeclarative path = qtpurchasing url = ../qtpurchasing.git - branch = 5.7 + branch = 5.7.0 status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = 5.7 + branch = 5.7.0 status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = 5.7 + branch = 5.7.0 status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = 5.7 + branch = 5.7.0 status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad - branch = 5.7 + branch = 5.7.0 status = preview [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml - branch = 5.7 + branch = 5.7.0 status = preview [submodule "qtspeech"] depends = qtbase From 4ace6667f286e81eeac6e27dfbe5c38b01f80b7c Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 18 May 2016 20:35:54 +0300 Subject: [PATCH 48/77] Updated submodules. Change-Id: I32a473f951d4c00b98263d570ebadbd368fa78ce Reviewed-by: Jani Heikkinen --- qt3d | 2 +- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtquickcontrols2 | 2 +- qtscxml | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtx11extras | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/qt3d b/qt3d index faf56f50..585264cb 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit faf56f50608f9391d2a73ed7c61bfdd9c2afab78 +Subproject commit 585264cb776366aef8adf4b7d7abce8e7eea4bdf diff --git a/qtbase b/qtbase index e64b2234..e6cc1d78 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit e64b2234e829cc47872225debcf80d6c06db18f0 +Subproject commit e6cc1d788dddda2998a9f941664ede928ce1e212 diff --git a/qtcharts b/qtcharts index 7bc9c012..8a781841 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 7bc9c012efbb987790742ee8905965344be55ea7 +Subproject commit 8a781841812a42ed728a76c0dcdcaa6196eac44e diff --git a/qtconnectivity b/qtconnectivity index caded2ed..0690d480 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit caded2edf69e8a60897653ace1e10b72199c7427 +Subproject commit 0690d4801ca5ee92d5e7511d48d95786212d5fb3 diff --git a/qtdeclarative b/qtdeclarative index 531d00c1..b9e4a4df 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 531d00c1909527cb1bc28f17197267ccde408b0c +Subproject commit b9e4a4df577959579b2322fb6077bde82d9ffce3 diff --git a/qtdoc b/qtdoc index 65397e8c..52554608 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 65397e8c9d7a30bd8a07bfa866ded1428532b840 +Subproject commit 525546087f2933d110dbb62785789a853ae29552 diff --git a/qtlocation b/qtlocation index 761331dd..1ca6bf3b 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 761331ddc841809a4bdc6ca2f2b84c148cb9b19a +Subproject commit 1ca6bf3bdef8c95e12a5ee93ed69e4983a1df017 diff --git a/qtmultimedia b/qtmultimedia index 08e13bfc..47e583a6 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 08e13bfcdb23eabfbc47bca7499b0b8aadce0ac7 +Subproject commit 47e583a6b82a6b678f2ca2a621176ad40eeab95d diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 8b2e819a..82c422b5 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 8b2e819ab2246d01eb564a52aa08bdf1d55c02c2 +Subproject commit 82c422b5b1c81f0572fdb2be1efba900200680d8 diff --git a/qtscxml b/qtscxml index bdbe7d94..b5a179fb 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit bdbe7d947a65070b59ac24cf9f05247037863ef8 +Subproject commit b5a179fba6f08e29f777cf10d0972d60b61637ad diff --git a/qtserialbus b/qtserialbus index ad54496c..e03b8930 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit ad54496cce03077073660c5c440b0f45b7e46496 +Subproject commit e03b8930eab783de3da0e10e1e3ef6bc37135021 diff --git a/qtserialport b/qtserialport index a11fa1df..2ac9c0c0 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit a11fa1dfd529948da961d3d292926a15f9b7005b +Subproject commit 2ac9c0c0e6210f73884bbe2bcb3d8269519003a8 diff --git a/qttools b/qttools index 570f0f31..6ef8d674 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 570f0f314cbe4603db34d4967b6a7dd35d174eba +Subproject commit 6ef8d67413511f07abb4f71593ed6d8567f61ca8 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 0c70872a..f58add00 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 0c70872a81aab39465606ab37333caf55064482a +Subproject commit f58add00ffa5dd5b3fd7bc31bf3cacc452cb8e5c diff --git a/qtwayland b/qtwayland index c07dc0c5..c7832b0a 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit c07dc0c5cd138db2f222c6c58bc5778532cecf42 +Subproject commit c7832b0a1d4e5e095e56315c43145bb8964f7030 diff --git a/qtwebchannel b/qtwebchannel index a2c3b32d..b025372d 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit a2c3b32d08ed24279609a8c01b09c1147a9ff6b9 +Subproject commit b025372d8b59b0080e1aa1d43b28da2c5544d30c diff --git a/qtwebengine b/qtwebengine index 023168cf..afb2f518 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 023168cf91dc7ac11ced1b6a60ca7aa248987810 +Subproject commit afb2f518e6520091ce1b414600aceb41b58db761 diff --git a/qtx11extras b/qtx11extras index b414120c..35c775cf 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit b414120c60ef8c3cc2aad7dca41092647d741a36 +Subproject commit 35c775cfe7a370f48ae5d4de0c7840993c126769 From e50f5b915017882abcd287d53b794b9c3ed16f42 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 21 May 2016 01:00:40 +0300 Subject: [PATCH 49/77] Updated submodules. Change-Id: I9b4f1c3daedf21ab201027d5793aa162710c84af Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtenginio | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 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 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 34 files changed, 34 insertions(+), 34 deletions(-) diff --git a/qt3d b/qt3d index 38baf18d..0384f298 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 38baf18df4c572ef36dc203ea9172f3e7b44e06d +Subproject commit 0384f29809186e6a45b13760c9dbb2f8cd3bf251 diff --git a/qtactiveqt b/qtactiveqt index a4b8485c..ceb1b32e 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit a4b8485cd38a9c33cdcf1b97633fa65b7230643b +Subproject commit ceb1b32e0dba6d3826333f83e10eba50565dfe32 diff --git a/qtandroidextras b/qtandroidextras index c6671096..827e255b 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit c6671096efe8c07d55cbf32b892a24ceea8d5bd2 +Subproject commit 827e255b6f380af2ec303f446c8cd8af33dfa8b0 diff --git a/qtbase b/qtbase index ce37467a..1acb29c3 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit ce37467acf34edf1380f896a0942b616dc4cbead +Subproject commit 1acb29c3dd53fe675c71b05a5364e5b77ec0fe2a diff --git a/qtcanvas3d b/qtcanvas3d index ab58e494..32ce46cb 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit ab58e494db8a6506dd254a6ce961743dc10c4bc8 +Subproject commit 32ce46cb702f95860ad404e5a966589f91c105c7 diff --git a/qtconnectivity b/qtconnectivity index 54c9cd9e..2cdc2938 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 54c9cd9e28bc6f0a2fa5118cfdbe922d71db6623 +Subproject commit 2cdc2938b44448b8d07cc229282d26d3bca3ee91 diff --git a/qtdeclarative b/qtdeclarative index 48492b2e..a82094b6 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 48492b2ee5d2f9ad178982f4c16e895b3083d8df +Subproject commit a82094b63b8993630c37f7a71dac19d3f96b2804 diff --git a/qtdoc b/qtdoc index 0f77b33d..f2e8c350 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 0f77b33d55d2f0467de00640774b179f8fa3ef69 +Subproject commit f2e8c350ddf42df035ad9ff22e05b627c072f272 diff --git a/qtenginio b/qtenginio index 65f5956b..5bddee78 160000 --- a/qtenginio +++ b/qtenginio @@ -1 +1 @@ -Subproject commit 65f5956b1cc00c58c964d43af16165e59a6f4e02 +Subproject commit 5bddee78c2fe009610c982615d1d202399e464e8 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 83a50c08..35179f6b 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 83a50c0801440324101ad8eff775380a43a564c4 +Subproject commit 35179f6b3116f1cee4586faa7c4f751e6d2e00af diff --git a/qtimageformats b/qtimageformats index bf5b4987..6415dae7 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit bf5b49878d75d316f31225f76152e8381a3d5f0f +Subproject commit 6415dae76eb8586f6e520961a76996df2425476d diff --git a/qtlocation b/qtlocation index 5dcd3d85..59a419ad 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 5dcd3d8526c7b8c7ac59a743f82130008d254d14 +Subproject commit 59a419adbdb02eaa19c0a716a79ba78b8ff465e6 diff --git a/qtmacextras b/qtmacextras index 5af27ed4..ae58e100 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 5af27ed4ed16f823adf609e9790c864c55ed4ee9 +Subproject commit ae58e100d3df71772db4f2f938d0a2ddc8a0873f diff --git a/qtmultimedia b/qtmultimedia index 15951e67..d44a327d 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 15951e672eaf38537c82043b0b9b14088facbd19 +Subproject commit d44a327da4a956f62cc0d51095fa4c1d62e130d3 diff --git a/qtquick1 b/qtquick1 index dbc9131e..212653fe 160000 --- a/qtquick1 +++ b/qtquick1 @@ -1 +1 @@ -Subproject commit dbc9131ebb300e715d5ebd815dc3ef9aa77ebf56 +Subproject commit 212653fea189ad1f5203fe2b5c12caba6f13c72a diff --git a/qtquickcontrols b/qtquickcontrols index 0e00f9fa..7e33119c 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 0e00f9fa1cbdbdd2128f2ca31172d88f701ecb59 +Subproject commit 7e33119c487b6ce7ee1b7e8fc7b9b862adba1c91 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 835c1c26..f3212709 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 835c1c26ef220cf084a7f066df748182229a4fd6 +Subproject commit f3212709f2cb19f61f09ba551934101800586d1a diff --git a/qtscript b/qtscript index fc9407af..95333d80 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit fc9407affb74bbfa9d396fef32f319b6baa8471f +Subproject commit 95333d804470dac6d529fc68d5dc5bfb7fa30ffe diff --git a/qtsensors b/qtsensors index 127ac081..61891995 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 127ac0810f042999a13db18e68b43be9ab85e708 +Subproject commit 6189199557a2b8eb981f37e6370b47c25b224b4e diff --git a/qtserialbus b/qtserialbus index b8d5c1f1..d1ed290d 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit b8d5c1f1dff57da6927470543e5d004c237846ac +Subproject commit d1ed290dca79e546986807b492a9aa4b0b1cc55a diff --git a/qtserialport b/qtserialport index 8a30a60a..9c9255ed 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 8a30a60a03af3979de8988209f8f77638713c30d +Subproject commit 9c9255eda50af191636ff9f18df35567c307dd8c diff --git a/qtsvg b/qtsvg index cf25ebcf..0eeaceca 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit cf25ebcf482ada36f5b5e0bb983a01cf2ab42f46 +Subproject commit 0eeaceca600ce63711387d4e3375c7a50239802d diff --git a/qttools b/qttools index 38fc6ad3..dee2a188 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 38fc6ad3e789c69dd09b0c494ead107d6da10807 +Subproject commit dee2a1883a9371a3aea647d508be7c758b076e8d diff --git a/qttranslations b/qttranslations index efa6513b..dbe53f81 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit efa6513bbf2515fbe6ab7b365e9597a8900ae279 +Subproject commit dbe53f818a3d88fcd9adc61448eba4890b33f264 diff --git a/qtwayland b/qtwayland index 92038729..d9132f07 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 920387296abcead6fea2d801fb2f57c185657c47 +Subproject commit d9132f078bb168a9a013b97493c219596cc8c6b2 diff --git a/qtwebchannel b/qtwebchannel index bd0f9334..39692e39 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit bd0f933457227c615c5f11aacd471e58b88678e8 +Subproject commit 39692e398ef847a1d6482419a617452cb1e5ae0d diff --git a/qtwebengine b/qtwebengine index b052dcaf..ad8bc457 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit b052dcaf308d761fa8df39a09f0296b808c928b5 +Subproject commit ad8bc45732eeb2efa6e885d564c10761e7154889 diff --git a/qtwebkit b/qtwebkit index a750b262..f1b22ccf 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit a750b262b856178eee47d546944bd095662dccf7 +Subproject commit f1b22ccfb78cc9d18d707e6d6a24a5951c60ffa5 diff --git a/qtwebkit-examples b/qtwebkit-examples index 2050389a..e66c201c 160000 --- a/qtwebkit-examples +++ b/qtwebkit-examples @@ -1 +1 @@ -Subproject commit 2050389a34ac7a28d2ee8b62cc1a87bc471fe89e +Subproject commit e66c201cea9b2b4cd376e7be118da43cdc22198e diff --git a/qtwebsockets b/qtwebsockets index edc358b2..9d28979b 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit edc358b213b192e8cdc925a4ae1f176c287d6eea +Subproject commit 9d28979b204313b4db1ce8e9f367204a65be9c64 diff --git a/qtwebview b/qtwebview index b76a913c..2a91ed5d 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit b76a913c948e61184dbfe6e540cfcdc7f9f11585 +Subproject commit 2a91ed5d421793e6b10b9bbb4b70676c47b4030b diff --git a/qtwinextras b/qtwinextras index 9463d251..3dd2b06d 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 9463d25167fe1e2fc47180331827cbad2a805f67 +Subproject commit 3dd2b06debd316e3656d433686642ffb64951c37 diff --git a/qtx11extras b/qtx11extras index f27489d6..36ae961b 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit f27489d66cc6d8263130451c26c7e4ae40acc6b4 +Subproject commit 36ae961b08420f14d7ad52ee5dc23ea456accfd9 diff --git a/qtxmlpatterns b/qtxmlpatterns index fcb22201..54eb58fb 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit fcb22201726669f52f98528d9a15f8cdbb126b48 +Subproject commit 54eb58fb95c4cc33bc46cece8ab9bf4f5e5fb125 From 9443890d60388f27f04b5a87013ca76f9afcc225 Mon Sep 17 00:00:00 2001 From: Ilia Kirianovskii Date: Thu, 12 May 2016 10:04:57 +0300 Subject: [PATCH 50/77] Fix git_install_hooks for relative gitdir Previously we expected gitdir to be always absolute. This patch fixes git_install_hooks in case of relative gitdir. Change-Id: Ia0883af18229703aaa22c62fd2181ed56d9f2fce Reviewed-by: Oswald Buddenhagen --- init-repository | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/init-repository b/init-repository index 2580b0f6..954237d0 100755 --- a/init-repository +++ b/init-repository @@ -155,9 +155,10 @@ EOF } use Carp qw( confess ); -use English qw( -no_match_vars ); -use Getopt::Long qw( GetOptions ); use Cwd qw( getcwd abs_path ); +use English qw( -no_match_vars ); +use File::Spec::Functions qw ( rel2abs ); +use Getopt::Long qw( GetOptions ); my $script_path = abs_path($0); $script_path =~ s,[/\\][^/\\]+$,,; @@ -558,24 +559,25 @@ sub git_install_hooks my @configresult = qx(git config --list --local); foreach my $line (@configresult) { next if ($line !~ /submodule\.([^.=]+)\.url=/); - my $module = $1.'/.git'; - if (!-d $module) { - open GITD, $module or die "Cannot open $module: $!\n"; + my $module = $1; + my $module_gitdir = $module.'/.git'; + if (!-d $module_gitdir) { + open GITD, $module_gitdir or die "Cannot open $module: $!\n"; my $gd = ; close GITD; chomp($gd); - $gd =~ s/^gitdir: // or die "Malformed .git file $module\n"; - $module = $gd; # We expect it to be always absolute. - if (open COMD, $module.'/commondir') { + $gd =~ s/^gitdir: // or die "Malformed .git file $module_gitdir\n"; + $module_gitdir = rel2abs($gd, $module); + if (open COMD, $module_gitdir.'/commondir') { my $cd = ; chomp($cd); - $module .= '/'.$cd; - $module = abs_path($module); + $module_gitdir .= '/'.$cd; + $module_gitdir = abs_path($module_gitdir); close COMD; } } - $self->ensure_link($hooks.'/gerrit_commit_msg_hook', $module.'/hooks/commit-msg'); - $self->ensure_link($hooks.'/git_post_commit_hook', $module.'/hooks/post-commit'); + $self->ensure_link($hooks.'/gerrit_commit_msg_hook', $module_gitdir.'/hooks/commit-msg'); + $self->ensure_link($hooks.'/git_post_commit_hook', $module_gitdir.'/hooks/post-commit'); } } From 30f22b8351c819ac911553f596299c7d3c566b25 Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Thu, 12 May 2016 15:00:17 +0300 Subject: [PATCH 51/77] Set qtquick and enginio to ignored state It was agreed at the Qt Contributor Summit 2015 that QtQuick1 will be removed completely from the packages and not even compiled during qt5.git integration. Enginio is also removed from 5.7.0 so ignoring it as well Change-Id: I80ac88d28f811fbf731e33d4d4353a249ad6d29a Reviewed-by: Simon Hausmann --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index bbf03024..41a30a5e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -164,7 +164,7 @@ path = qtquick1 url = ../qtquick1.git branch = 5.7.0 - status = obsolete + status = ignored [submodule "qtgraphicaleffects"] depends = qtdeclarative path = qtgraphicaleffects @@ -220,7 +220,7 @@ path = qtenginio url = ../qtenginio.git branch = 5.7.0 - status = obsolete + status = ignored [submodule "qtwebsockets"] depends = qtbase recommends = qtdeclarative From ad474f110ff3ca3d72252cbe5c26a09f6aaf8837 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 25 May 2016 08:35:17 +0200 Subject: [PATCH 52/77] Fix status of qtquick1 and enginio The right term is "ignore" in order to ignore the module, not "ignored". Change-Id: Idd4a887834fc98fffb2b9e8385308aa676ba3adf Reviewed-by: Jani Heikkinen Reviewed-by: Oswald Buddenhagen --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 41a30a5e..d2a760d7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -164,7 +164,7 @@ path = qtquick1 url = ../qtquick1.git branch = 5.7.0 - status = ignored + status = ignore [submodule "qtgraphicaleffects"] depends = qtdeclarative path = qtgraphicaleffects @@ -220,7 +220,7 @@ path = qtenginio url = ../qtenginio.git branch = 5.7.0 - status = ignored + status = ignore [submodule "qtwebsockets"] depends = qtbase recommends = qtdeclarative From 0c66994ae9dd0deadcce29cceb7f38d93ad20a39 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 28 May 2016 00:35:51 +0300 Subject: [PATCH 53/77] Updated submodules. Change-Id: Ia44a5bc2e6e42cd00524dc82c01d5f59726475f3 Reviewed-by: Qt Submodule Update Bot Reviewed-by: Frederik Gladhorn --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtpurchasing | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtscript | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebkit | 2 +- qtwebsockets | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 36 files changed, 36 insertions(+), 36 deletions(-) diff --git a/qt3d b/qt3d index faf56f50..57e1fdbd 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit faf56f50608f9391d2a73ed7c61bfdd9c2afab78 +Subproject commit 57e1fdbd3f8eadfaeac606cb066d42dc779fc200 diff --git a/qtactiveqt b/qtactiveqt index 73ee37be..44794751 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 73ee37bebbf724a3ec01b30212ed31002a682083 +Subproject commit 447947515df2cf727f14f5a1fdd4685ee8201e2f diff --git a/qtandroidextras b/qtandroidextras index 368b0bbf..a8ba9a22 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 368b0bbf2b2854547cfafa7092361f09dd157fb1 +Subproject commit a8ba9a22e94058b5e24074f17d550da17454ddfe diff --git a/qtbase b/qtbase index e64b2234..5c2ff22b 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit e64b2234e829cc47872225debcf80d6c06db18f0 +Subproject commit 5c2ff22ba117f295718c529198ab42ee4646d90c diff --git a/qtcanvas3d b/qtcanvas3d index 32404e27..607b8228 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 32404e27101c5ec81b4ab965faf38263429bbc5a +Subproject commit 607b82287c70a2db4d35ee5ab0bef89117468b2b diff --git a/qtcharts b/qtcharts index 7bc9c012..0464d42b 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 7bc9c012efbb987790742ee8905965344be55ea7 +Subproject commit 0464d42b101eaf60c62be751785009d09065f2cf diff --git a/qtconnectivity b/qtconnectivity index caded2ed..241ef04a 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit caded2edf69e8a60897653ace1e10b72199c7427 +Subproject commit 241ef04afe45967a736802d4f4ce89d79e4b6d1b diff --git a/qtdatavis3d b/qtdatavis3d index 2f6074fd..02af08a7 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 2f6074fde0ec050c77f881e0d2ce265fa93a0fcc +Subproject commit 02af08a705ada1ca2dac839a026a816a8e70def5 diff --git a/qtdeclarative b/qtdeclarative index 531d00c1..2d70b4b5 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 531d00c1909527cb1bc28f17197267ccde408b0c +Subproject commit 2d70b4b5c38263e866d9b317a576c952d3501874 diff --git a/qtdoc b/qtdoc index 65397e8c..79097b48 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 65397e8c9d7a30bd8a07bfa866ded1428532b840 +Subproject commit 79097b48c2f2bd01e51c8953921f0b4f1f52fa6b diff --git a/qtgamepad b/qtgamepad index 84b87c22..eaf8a980 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 84b87c222872eb6e49727d773177b7f5b86e9beb +Subproject commit eaf8a9800e81a446e9badaa32be459d0a54ec9b5 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index d85fd81f..f38c435b 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit d85fd81f338f9c6f2e95b92b2cb9ccd4f9889c6b +Subproject commit f38c435b37f7ec1dae4718da9929a9727af5e592 diff --git a/qtimageformats b/qtimageformats index 68d9cfe5..9cbca026 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 68d9cfe5256c91510552c2b16d5efdb01e77ea57 +Subproject commit 9cbca0266d7482a7d3d198acfa9f3a2661d435f3 diff --git a/qtlocation b/qtlocation index 761331dd..d1b708cd 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 761331ddc841809a4bdc6ca2f2b84c148cb9b19a +Subproject commit d1b708cde9428928b9f5c59c099f2deb584efd5f diff --git a/qtmacextras b/qtmacextras index 509c7b7f..8acd1bb2 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 509c7b7f7da2fd69444b7dba32f31db51ad40aa8 +Subproject commit 8acd1bb2d802296a37b6394ffe4e7adc5112db2b diff --git a/qtmultimedia b/qtmultimedia index 08e13bfc..f2b9fb77 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 08e13bfcdb23eabfbc47bca7499b0b8aadce0ac7 +Subproject commit f2b9fb776b78fc10424c0325ab4316a45360130e diff --git a/qtpurchasing b/qtpurchasing index 0afcd2ef..60af17f3 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 0afcd2efe2c33bbbd5d9b1edc47b0fcccb6ce8c2 +Subproject commit 60af17f3ab8c9142dcfb5ece7f9cc904bb6797ab diff --git a/qtquickcontrols b/qtquickcontrols index c6713e21..b5a8306b 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit c6713e212ef0b97c45d6466b73220567e94a05f1 +Subproject commit b5a8306bf6d4949066872ac2afc8d0a01f716bd7 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 8b2e819a..8bce6c1d 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 8b2e819ab2246d01eb564a52aa08bdf1d55c02c2 +Subproject commit 8bce6c1dd0e57959f9a337ec999fa96953c3487f diff --git a/qtscript b/qtscript index b49bfdaa..e2e7b57a 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit b49bfdaad11be1de632f907d43485a7ac701ddc5 +Subproject commit e2e7b57a5d3f3fe870756f4cdcf104b7090c3526 diff --git a/qtscxml b/qtscxml index bdbe7d94..7463654c 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit bdbe7d947a65070b59ac24cf9f05247037863ef8 +Subproject commit 7463654cd7ab7803c650e439827b48be60fe3c64 diff --git a/qtsensors b/qtsensors index f32489e3..7deae40b 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit f32489e379805c51b28ae5d471491a649283fd8d +Subproject commit 7deae40b87e1637d55de8d111e99f4da1d5584d4 diff --git a/qtserialbus b/qtserialbus index ad54496c..f9201ca7 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit ad54496cce03077073660c5c440b0f45b7e46496 +Subproject commit f9201ca7bad9220149fb39b89914e83a4a14dffc diff --git a/qtserialport b/qtserialport index a11fa1df..0a631301 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit a11fa1dfd529948da961d3d292926a15f9b7005b +Subproject commit 0a6313018cbd4c78b1e959236bd96c62d5d59c1c diff --git a/qtsvg b/qtsvg index 612c3041..b231d9f4 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 612c3041475550837dee7149b9f5e9e4f55c17a0 +Subproject commit b231d9f41903f8514a2d91844f4515055307af3a diff --git a/qttools b/qttools index 570f0f31..1d0a02f8 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 570f0f314cbe4603db34d4967b6a7dd35d174eba +Subproject commit 1d0a02f8a227286dbc383f890a1fd61e9139c223 diff --git a/qttranslations b/qttranslations index c95337f7..8ac63b28 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit c95337f7e974c75a88b96c168b6056a1642399bb +Subproject commit 8ac63b28c45eace2f9b935b48257f97e0d07a9ca diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 0c70872a..fe5de01d 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 0c70872a81aab39465606ab37333caf55064482a +Subproject commit fe5de01d24f4e61c90a5041d3b8ab19188902023 diff --git a/qtwayland b/qtwayland index c07dc0c5..2a593a98 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit c07dc0c5cd138db2f222c6c58bc5778532cecf42 +Subproject commit 2a593a98fd2d58f942e9171f3d5b0c851fefe4aa diff --git a/qtwebchannel b/qtwebchannel index a2c3b32d..4fda82b6 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit a2c3b32d08ed24279609a8c01b09c1147a9ff6b9 +Subproject commit 4fda82b66e17cc03e6b08f1afd135069cfef09b7 diff --git a/qtwebengine b/qtwebengine index 023168cf..96df2461 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 023168cf91dc7ac11ced1b6a60ca7aa248987810 +Subproject commit 96df24618fbbc0e06a24e93b7e9aefb0f923f4af diff --git a/qtwebkit b/qtwebkit index 2e851792..01fa9be5 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 2e8517924b70a778463e463873eb3d8d0b623eed +Subproject commit 01fa9be55572ddb3f69befc68475ed09241eabdf diff --git a/qtwebsockets b/qtwebsockets index 00156d63..cd80c041 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 00156d63eea2fb7681a8a00a3144392d6325e5cb +Subproject commit cd80c041220df2875297622a0012933412730e9d diff --git a/qtwinextras b/qtwinextras index 8e816f25..e2f08aaa 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 8e816f25034287bb3f89317a631075533914102b +Subproject commit e2f08aaacb571c1287217b09acf66518ff924dc4 diff --git a/qtx11extras b/qtx11extras index b414120c..ee7eb793 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit b414120c60ef8c3cc2aad7dca41092647d741a36 +Subproject commit ee7eb793b666c99f171452dc1accd7955cdf5a6c diff --git a/qtxmlpatterns b/qtxmlpatterns index 9751d3d8..4ca909e7 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 9751d3d82eecb4f2c2a805783fbcce9ccd189fea +Subproject commit 4ca909e7daef701882755487008c9e4f0b978dbc From 4e02d96116fac5208a9ce1176300fe65252cf5ff Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 29 May 2016 10:52:07 +0300 Subject: [PATCH 54/77] Updated submodules. Change-Id: I89a5dc174641a9e4fc7c99e31794c92575179c49 Reviewed-by: Jani Heikkinen --- qt3d | 2 +- qtquickcontrols2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qt3d b/qt3d index 57e1fdbd..7f83c2b3 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 57e1fdbd3f8eadfaeac606cb066d42dc779fc200 +Subproject commit 7f83c2b364291ace6ff9180512787ce69e5999cc diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 8bce6c1d..1736925a 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 8bce6c1dd0e57959f9a337ec999fa96953c3487f +Subproject commit 1736925ad72808ecf461a803197dd7ad0ce2994b From e96f60a22861a80dd582f35e5df6d039f45ae09b Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 30 May 2016 13:06:48 +0300 Subject: [PATCH 55/77] Updated submodules. Change-Id: I5093e1ed41b58628b9a67e3bc8c9ed737c9e5523 Reviewed-by: Frederik Gladhorn --- qt3d | 2 +- qtvirtualkeyboard | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qt3d b/qt3d index 7f83c2b3..fb07d54e 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 7f83c2b364291ace6ff9180512787ce69e5999cc +Subproject commit fb07d54eb4ea70faee73fb0a6fef2c672d5ba478 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index fe5de01d..945afc07 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit fe5de01d24f4e61c90a5041d3b8ab19188902023 +Subproject commit 945afc072330db82418e0bf628cc66b756a7f78d From 82873b1b1ef8c8c2aa7d956d247aa7e49f57d8e4 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 28 May 2016 01:00:42 +0300 Subject: [PATCH 56/77] Updated submodules. Change-Id: Iec0cece6ec1ca471593c4acd32595b59dc64a651 Reviewed-by: Qt Submodule Update Bot --- qtactiveqt | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtenginio | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtscript | 2 +- qtserialbus | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebkit | 2 +- qtwebkit-examples | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtxmlpatterns | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index ceb1b32e..58930c21 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit ceb1b32e0dba6d3826333f83e10eba50565dfe32 +Subproject commit 58930c21bd9bd1bb81f35305a4b1b6115a1f69ec diff --git a/qtbase b/qtbase index 1acb29c3..0e70d35f 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 1acb29c3dd53fe675c71b05a5364e5b77ec0fe2a +Subproject commit 0e70d35f151c52a8821be987e4cd1aef3d40b010 diff --git a/qtcanvas3d b/qtcanvas3d index 32ce46cb..1a19a68e 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 32ce46cb702f95860ad404e5a966589f91c105c7 +Subproject commit 1a19a68e76205650b55fea48477deb95bf328412 diff --git a/qtconnectivity b/qtconnectivity index 2cdc2938..a084e216 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 2cdc2938b44448b8d07cc229282d26d3bca3ee91 +Subproject commit a084e2160a345162681af984d9c265f619be7124 diff --git a/qtdeclarative b/qtdeclarative index a82094b6..dbf7efde 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit a82094b63b8993630c37f7a71dac19d3f96b2804 +Subproject commit dbf7efde1e04ac0ff445f64438078d87eb035b68 diff --git a/qtenginio b/qtenginio index 5bddee78..d5aec181 160000 --- a/qtenginio +++ b/qtenginio @@ -1 +1 @@ -Subproject commit 5bddee78c2fe009610c982615d1d202399e464e8 +Subproject commit d5aec18177acc122b0b7c39a90fbb09d388a01b3 diff --git a/qtlocation b/qtlocation index 59a419ad..f8977758 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 59a419adbdb02eaa19c0a716a79ba78b8ff465e6 +Subproject commit f897775850dfbe0e668e9c8b428537e8bb096c01 diff --git a/qtmultimedia b/qtmultimedia index d44a327d..6d5f3756 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit d44a327da4a956f62cc0d51095fa4c1d62e130d3 +Subproject commit 6d5f375644624b977b168928ae09227a9d28547f diff --git a/qtscript b/qtscript index 95333d80..76b5b0c3 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 95333d804470dac6d529fc68d5dc5bfb7fa30ffe +Subproject commit 76b5b0c3598a595c61f0cb274b392feeaf3e8dc3 diff --git a/qtserialbus b/qtserialbus index d1ed290d..c8667971 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit d1ed290dca79e546986807b492a9aa4b0b1cc55a +Subproject commit c8667971dea7c38862bd3bf190269072e8c2fe6d diff --git a/qtsvg b/qtsvg index 0eeaceca..600ae02b 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 0eeaceca600ce63711387d4e3375c7a50239802d +Subproject commit 600ae02bce34b5cd56c1ddc99553bf661ae96b1a diff --git a/qttools b/qttools index dee2a188..ec575c44 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit dee2a1883a9371a3aea647d508be7c758b076e8d +Subproject commit ec575c44637744413b106388cd0ed1d399fc7871 diff --git a/qttranslations b/qttranslations index dbe53f81..674d2ca9 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit dbe53f818a3d88fcd9adc61448eba4890b33f264 +Subproject commit 674d2ca9f7c51f3621c9e2b36c9f02528dd23d40 diff --git a/qtwebchannel b/qtwebchannel index 39692e39..bec50124 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 39692e398ef847a1d6482419a617452cb1e5ae0d +Subproject commit bec50124b893c4632829d9806f49f64c4debf936 diff --git a/qtwebengine b/qtwebengine index ad8bc457..f5315653 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit ad8bc45732eeb2efa6e885d564c10761e7154889 +Subproject commit f531565348e550bc2e03917874009331556f0d66 diff --git a/qtwebkit b/qtwebkit index f1b22ccf..da5f9d78 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit f1b22ccfb78cc9d18d707e6d6a24a5951c60ffa5 +Subproject commit da5f9d788f96340a44083ed4e28cdf6ea0a393f0 diff --git a/qtwebkit-examples b/qtwebkit-examples index e66c201c..2a143bf8 160000 --- a/qtwebkit-examples +++ b/qtwebkit-examples @@ -1 +1 @@ -Subproject commit e66c201cea9b2b4cd376e7be118da43cdc22198e +Subproject commit 2a143bf81b2ffb3bd7a5f47cf719e6ed347bf383 diff --git a/qtwebsockets b/qtwebsockets index 9d28979b..10cad9ec 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 9d28979b204313b4db1ce8e9f367204a65be9c64 +Subproject commit 10cad9ece2cb380e26e03a1c03b900f8e3b4c801 diff --git a/qtwebview b/qtwebview index 2a91ed5d..a92d9644 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 2a91ed5d421793e6b10b9bbb4b70676c47b4030b +Subproject commit a92d964417bf1b4d5de720bae1157f2c9a870173 diff --git a/qtxmlpatterns b/qtxmlpatterns index 54eb58fb..64e5f2be 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 54eb58fb95c4cc33bc46cece8ab9bf4f5e5fb125 +Subproject commit 64e5f2be2ba63aa1ed04291dc529f2b8edee9a0b From 2be9656332f86450dd198023944590b267bab1b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= Date: Fri, 27 May 2016 15:07:53 +0200 Subject: [PATCH 57/77] Coin provisioning: overwrite files while unzipping Change-Id: I5cf59322f5a34cffe9fe8668755800bccb8cc13a Reviewed-by: Frederik Gladhorn --- coin/provisioning/common/helpers.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/provisioning/common/helpers.ps1 b/coin/provisioning/common/helpers.ps1 index f517e94d..d7b957f3 100644 --- a/coin/provisioning/common/helpers.ps1 +++ b/coin/provisioning/common/helpers.ps1 @@ -27,5 +27,5 @@ function Extract-Zip $shell = new-object -com shell.application $zipfile = $shell.Namespace($Source) $destinationFolder = $shell.Namespace($Destination) - $destinationFolder.CopyHere($zipfile.Items()) + $destinationFolder.CopyHere($zipfile.Items(), 16) } From a97874523f996ccf5b7a297f2489d89b630034d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= Date: Thu, 26 May 2016 14:40:35 +0200 Subject: [PATCH 58/77] Export CI_ICU_PATH variables on all windows templates That is needed to change provisioning way in Coin, as currently it depends on variables hard-coded in Coin agent. Change-Id: I15068bec57dd9d67be05ef753d566b456fb8a2fc Reviewed-by: Frederik Gladhorn --- coin/provisioning/common/icu.ps1 | 9 +++++++++ coin/provisioning/qtci-windows-10-x86/icu.ps1 | 6 ++++++ coin/provisioning/qtci-windows-10-x86_64/icu.ps1 | 6 ++++++ coin/provisioning/qtci-windows-7-x86/icu.ps1 | 6 ++++++ coin/provisioning/qtci-windows-8-x86/icu.ps1 | 6 ++++++ coin/provisioning/qtci-windows-8-x86_64/icu.ps1 | 6 ++++++ 6 files changed, 39 insertions(+) create mode 100644 coin/provisioning/common/icu.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86/icu.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/icu.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86/icu.ps1 create mode 100644 coin/provisioning/qtci-windows-8-x86/icu.ps1 create mode 100644 coin/provisioning/qtci-windows-8-x86_64/icu.ps1 diff --git a/coin/provisioning/common/icu.ps1 b/coin/provisioning/common/icu.ps1 new file mode 100644 index 00000000..4be185e5 --- /dev/null +++ b/coin/provisioning/common/icu.ps1 @@ -0,0 +1,9 @@ +# ICU is already pre-installed on Windows machines, it would be nice to have +# the installation script, but for now let's just export the right variables + +# FIXME: do we really want to have it per MSVC version? What about MSVC2015? +[Environment]::SetEnvironmentVariable("CI_ICU_PATH_MSVC2012", "C:\\Utils\\icu_53_1_msvc_2012_64_devel\\icu53_1", "Machine") +[Environment]::SetEnvironmentVariable("CI_ICU_PATH_MSVC2013", "C:\\Utils\\icu_53_1_msvc_2013_64_devel\\icu53_1", "Machine") + +# FIXME: do we really want to use the 4.8.2 ICU build? +[Environment]::SetEnvironmentVariable("CI_ICU_PATH_Mingw49", "C:\Utils\icu_53_1_Mingw_builds_4_8_2_posix_seh_64_devel\icu53_1", "Machine") diff --git a/coin/provisioning/qtci-windows-10-x86/icu.ps1 b/coin/provisioning/qtci-windows-10-x86/icu.ps1 new file mode 100644 index 00000000..7756bd0f --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/icu.ps1 @@ -0,0 +1,6 @@ +Set-ExecutionPolicy RemoteSigned -Force + +# install jom +. "$PSScriptRoot\..\common\icu.ps1" + +Set-ExecutionPolicy Restricted -Force diff --git a/coin/provisioning/qtci-windows-10-x86_64/icu.ps1 b/coin/provisioning/qtci-windows-10-x86_64/icu.ps1 new file mode 100644 index 00000000..7756bd0f --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/icu.ps1 @@ -0,0 +1,6 @@ +Set-ExecutionPolicy RemoteSigned -Force + +# install jom +. "$PSScriptRoot\..\common\icu.ps1" + +Set-ExecutionPolicy Restricted -Force diff --git a/coin/provisioning/qtci-windows-7-x86/icu.ps1 b/coin/provisioning/qtci-windows-7-x86/icu.ps1 new file mode 100644 index 00000000..7756bd0f --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/icu.ps1 @@ -0,0 +1,6 @@ +Set-ExecutionPolicy RemoteSigned -Force + +# install jom +. "$PSScriptRoot\..\common\icu.ps1" + +Set-ExecutionPolicy Restricted -Force diff --git a/coin/provisioning/qtci-windows-8-x86/icu.ps1 b/coin/provisioning/qtci-windows-8-x86/icu.ps1 new file mode 100644 index 00000000..7756bd0f --- /dev/null +++ b/coin/provisioning/qtci-windows-8-x86/icu.ps1 @@ -0,0 +1,6 @@ +Set-ExecutionPolicy RemoteSigned -Force + +# install jom +. "$PSScriptRoot\..\common\icu.ps1" + +Set-ExecutionPolicy Restricted -Force diff --git a/coin/provisioning/qtci-windows-8-x86_64/icu.ps1 b/coin/provisioning/qtci-windows-8-x86_64/icu.ps1 new file mode 100644 index 00000000..7756bd0f --- /dev/null +++ b/coin/provisioning/qtci-windows-8-x86_64/icu.ps1 @@ -0,0 +1,6 @@ +Set-ExecutionPolicy RemoteSigned -Force + +# install jom +. "$PSScriptRoot\..\common\icu.ps1" + +Set-ExecutionPolicy Restricted -Force From 928c4913977ad4ff99d51105cfa7f20baa3ce6c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C4=99drzej=20Nowacki?= Date: Thu, 26 May 2016 14:29:30 +0200 Subject: [PATCH 59/77] Export CI_JOM_PATH variable on all templates with jom That is needed to change provisioning way in Coin, as currently it depends on variables hard-coded in Coin agent. Change-Id: I0bc5c76717e994824b85a4353a7218db4b648344 Reviewed-by: Frederik Gladhorn --- coin/provisioning/common/jom.ps1 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/coin/provisioning/common/jom.ps1 b/coin/provisioning/common/jom.ps1 index c233ee6e..ef012b64 100644 --- a/coin/provisioning/common/jom.ps1 +++ b/coin/provisioning/common/jom.ps1 @@ -5,3 +5,5 @@ $zip = "c:\users\qt\downloads\jom_1_1_0.zip" Invoke-WebRequest -UseBasicParsing http://download.qt.io/official_releases/jom/jom_1_1_0.zip -OutFile $zip Verify-Checksum $zip "C4149FE706B25738B4C4E54C73E180B9CAB55832" Extract-Zip $zip C:\Utils\Jom + +[Environment]::SetEnvironmentVariable("CI_JOM_PATH", "C:\Utils\Jom", "Machine") From 3529d894ba505444c9e160bba1ef0595892ec712 Mon Sep 17 00:00:00 2001 From: Erik Verbruggen Date: Tue, 31 May 2016 14:14:59 +0200 Subject: [PATCH 60/77] OSX: Switch crash reporting to server mode. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Meaning: to unattended use, so no crash dialogs will pop up. In a later change we can suppress QTest from generating stack traces when this setting is *not* in server mode (meaning: the OS will take care of the stack traces). Change-Id: Idee9311f866228cd35ecb07889f1c19424981221 Reviewed-by: Simon Hausmann Reviewed-by: Jędrzej Nowacki Reviewed-by: Frederik Gladhorn --- coin/provisioning/qtci-osx-10.10/crashreporter.sh | 2 ++ coin/provisioning/qtci-osx-10.11/crashreporter.sh | 2 ++ coin/provisioning/qtci-osx-10.8/crashreporter.sh | 2 ++ coin/provisioning/qtci-osx-10.9/crashreporter.sh | 2 ++ 4 files changed, 8 insertions(+) create mode 100644 coin/provisioning/qtci-osx-10.10/crashreporter.sh create mode 100644 coin/provisioning/qtci-osx-10.11/crashreporter.sh create mode 100644 coin/provisioning/qtci-osx-10.8/crashreporter.sh create mode 100644 coin/provisioning/qtci-osx-10.9/crashreporter.sh diff --git a/coin/provisioning/qtci-osx-10.10/crashreporter.sh b/coin/provisioning/qtci-osx-10.10/crashreporter.sh new file mode 100644 index 00000000..ba8dbdd3 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.10/crashreporter.sh @@ -0,0 +1,2 @@ +#!/bin/sh +defaults write com.apple.CrashReporter DialogType server diff --git a/coin/provisioning/qtci-osx-10.11/crashreporter.sh b/coin/provisioning/qtci-osx-10.11/crashreporter.sh new file mode 100644 index 00000000..ba8dbdd3 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.11/crashreporter.sh @@ -0,0 +1,2 @@ +#!/bin/sh +defaults write com.apple.CrashReporter DialogType server diff --git a/coin/provisioning/qtci-osx-10.8/crashreporter.sh b/coin/provisioning/qtci-osx-10.8/crashreporter.sh new file mode 100644 index 00000000..ba8dbdd3 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.8/crashreporter.sh @@ -0,0 +1,2 @@ +#!/bin/sh +defaults write com.apple.CrashReporter DialogType server diff --git a/coin/provisioning/qtci-osx-10.9/crashreporter.sh b/coin/provisioning/qtci-osx-10.9/crashreporter.sh new file mode 100644 index 00000000..ba8dbdd3 --- /dev/null +++ b/coin/provisioning/qtci-osx-10.9/crashreporter.sh @@ -0,0 +1,2 @@ +#!/bin/sh +defaults write com.apple.CrashReporter DialogType server From 801066c40d55c36a36527034d020f6c576692280 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 3 Jun 2016 09:11:53 +0300 Subject: [PATCH 61/77] Updated submodules. Change-Id: If3be9830f7bdbb5508e3b3a962afcc7402b433b2 Reviewed-by: Jani Heikkinen --- qt3d | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtmultimedia | 2 +- qtquickcontrols2 | 2 +- qtscxml | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebview | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/qt3d b/qt3d index fb07d54e..a398469e 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit fb07d54eb4ea70faee73fb0a6fef2c672d5ba478 +Subproject commit a398469e66e3a953097857c60655c41bf291a06b diff --git a/qtconnectivity b/qtconnectivity index 241ef04a..23a207fb 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 241ef04afe45967a736802d4f4ce89d79e4b6d1b +Subproject commit 23a207fb56bf21aeb598ddd914159333f28f8a00 diff --git a/qtdatavis3d b/qtdatavis3d index 02af08a7..57832c49 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 02af08a705ada1ca2dac839a026a816a8e70def5 +Subproject commit 57832c490a6f34f6ede7caa864dde20abda94358 diff --git a/qtdoc b/qtdoc index 79097b48..9bd687f3 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 79097b48c2f2bd01e51c8953921f0b4f1f52fa6b +Subproject commit 9bd687f3df2ccd28f8d1b33a55db447cae25b345 diff --git a/qtgamepad b/qtgamepad index eaf8a980..ed3dc282 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit eaf8a9800e81a446e9badaa32be459d0a54ec9b5 +Subproject commit ed3dc28209f12a58235ec36f43fa7e5b896bf784 diff --git a/qtmultimedia b/qtmultimedia index f2b9fb77..48086a75 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit f2b9fb776b78fc10424c0325ab4316a45360130e +Subproject commit 48086a7573268774fab346d6fde0c9137ba1bf4e diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 1736925a..6b0fc95d 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 1736925ad72808ecf461a803197dd7ad0ce2994b +Subproject commit 6b0fc95d094258d968b57f48c03f10be2fe8ac26 diff --git a/qtscxml b/qtscxml index 7463654c..05e64103 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 7463654cd7ab7803c650e439827b48be60fe3c64 +Subproject commit 05e6410385dba359566155ed1b6889506eeebe0e diff --git a/qttools b/qttools index 1d0a02f8..5716e18a 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 1d0a02f8a227286dbc383f890a1fd61e9139c223 +Subproject commit 5716e18a8f63593e8e64fce0b44d714fddfe7298 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 945afc07..fd18b3e7 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 945afc072330db82418e0bf628cc66b756a7f78d +Subproject commit fd18b3e7b781680033b8dfed9476b0fc4a06dcc7 diff --git a/qtwayland b/qtwayland index 2a593a98..0918ffa9 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 2a593a98fd2d58f942e9171f3d5b0c851fefe4aa +Subproject commit 0918ffa9f32a6ff59f101ffd80c2325f2fbd0e6d diff --git a/qtwebchannel b/qtwebchannel index 4fda82b6..18d8ca18 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 4fda82b66e17cc03e6b08f1afd135069cfef09b7 +Subproject commit 18d8ca185819d6d81a9f21858ff2d60bf6fd05f8 diff --git a/qtwebview b/qtwebview index 94152499..244f875f 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 9415249942b98768b8bc431fdb242ca1ac09cccc +Subproject commit 244f875fa6068d2d42ba3ed07cff3fc314eb9fbb From 51cf8dcf3b991104eca2e8ef45ba5cc3c35ccfd6 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 5 Jun 2016 01:00:46 +0300 Subject: [PATCH 62/77] Updated submodules. Change-Id: Iec9d13ae71c8660baec5ca6cfee57aeee3b33922 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtquickcontrols2 | 2 +- qtscript | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtsvg | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebview | 2 +- qtxmlpatterns | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/qtbase b/qtbase index 0e70d35f..fd709786 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 0e70d35f151c52a8821be987e4cd1aef3d40b010 +Subproject commit fd70978693bd92761e9989bc1c76bf83c1e8c987 diff --git a/qtconnectivity b/qtconnectivity index a084e216..c347a374 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit a084e2160a345162681af984d9c265f619be7124 +Subproject commit c347a3748af663da9e8e6ce5e233248b80217f96 diff --git a/qtdeclarative b/qtdeclarative index dbf7efde..6d63e3ba 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit dbf7efde1e04ac0ff445f64438078d87eb035b68 +Subproject commit 6d63e3ba09954ce7b56b4b24432bd036e636b164 diff --git a/qtdoc b/qtdoc index f2e8c350..d167afbe 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit f2e8c350ddf42df035ad9ff22e05b627c072f272 +Subproject commit d167afbe0ec394b28618a8af44eada7c7849c7c5 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 35179f6b..b73cf345 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 35179f6b3116f1cee4586faa7c4f751e6d2e00af +Subproject commit b73cf34563419852cbe01ffee3b57f5e21cc81e7 diff --git a/qtimageformats b/qtimageformats index 6415dae7..b144bfbc 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 6415dae76eb8586f6e520961a76996df2425476d +Subproject commit b144bfbc30a80da9357ab528d905a4bd5935d659 diff --git a/qtlocation b/qtlocation index f8977758..07b9d583 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit f897775850dfbe0e668e9c8b428537e8bb096c01 +Subproject commit 07b9d583273b8e3aa5712eac9d06b74ddb927db3 diff --git a/qtmultimedia b/qtmultimedia index 6d5f3756..b3af8f65 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 6d5f375644624b977b168928ae09227a9d28547f +Subproject commit b3af8f65fcaef66504f5640ccaa2972e17af1af0 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index f3212709..1583f8b2 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit f3212709f2cb19f61f09ba551934101800586d1a +Subproject commit 1583f8b2ee56726f7920524b85636bb831c2f0d0 diff --git a/qtscript b/qtscript index 76b5b0c3..4c8efb40 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 76b5b0c3598a595c61f0cb274b392feeaf3e8dc3 +Subproject commit 4c8efb407fa9ebfe3e1923970140cfe270fda75d diff --git a/qtsensors b/qtsensors index 61891995..79d3d49c 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 6189199557a2b8eb981f37e6370b47c25b224b4e +Subproject commit 79d3d49c4c4bf1d07f377d24d8c6e571abe80355 diff --git a/qtserialbus b/qtserialbus index c8667971..40be986e 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit c8667971dea7c38862bd3bf190269072e8c2fe6d +Subproject commit 40be986e18f244126f934c3bb0351ecb062a2060 diff --git a/qtsvg b/qtsvg index 600ae02b..415572bb 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 600ae02bce34b5cd56c1ddc99553bf661ae96b1a +Subproject commit 415572bb872af5d30943ab396d1f89de918ca54b diff --git a/qttools b/qttools index ec575c44..5bbd37f8 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit ec575c44637744413b106388cd0ed1d399fc7871 +Subproject commit 5bbd37f8d8ac1c4e9b13cb939370f5c617a4ec68 diff --git a/qtwayland b/qtwayland index d9132f07..d9cef40e 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit d9132f078bb168a9a013b97493c219596cc8c6b2 +Subproject commit d9cef40ea3948e5d74120fb07909332503dc485b diff --git a/qtwebchannel b/qtwebchannel index bec50124..224742f0 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit bec50124b893c4632829d9806f49f64c4debf936 +Subproject commit 224742f0e2e882bce21047622d4c351803b9d486 diff --git a/qtwebengine b/qtwebengine index f5315653..bfcbdc3a 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit f531565348e550bc2e03917874009331556f0d66 +Subproject commit bfcbdc3ab42880dc37ffa7174af96928ccf25f03 diff --git a/qtwebview b/qtwebview index a92d9644..70cc7914 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit a92d964417bf1b4d5de720bae1157f2c9a870173 +Subproject commit 70cc791481204708df6a926a0a65155be2afaf7a diff --git a/qtxmlpatterns b/qtxmlpatterns index 64e5f2be..e8beed4a 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 64e5f2be2ba63aa1ed04291dc529f2b8edee9a0b +Subproject commit e8beed4a4491ce0d9d53bb82eb037211b29f58c1 From 6a4d5e4bc80ffbe4c8b4ff067f9b81fc8365b526 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 6 Jun 2016 07:39:30 +0300 Subject: [PATCH 63/77] Updated submodules. Change-Id: Ia6457dbccce18d960274b0a1774c3d646dfbc6b9 Reviewed-by: Jani Heikkinen --- qt3d | 2 +- qtbase | 2 +- qtgamepad | 2 +- qtvirtualkeyboard | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qt3d b/qt3d index a398469e..8bf76e51 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit a398469e66e3a953097857c60655c41bf291a06b +Subproject commit 8bf76e51119aa49e745b078ceed3ffa67a89aea1 diff --git a/qtbase b/qtbase index 5c2ff22b..6a75daa9 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 5c2ff22ba117f295718c529198ab42ee4646d90c +Subproject commit 6a75daa99feb0a0c599ef51d26718ea60fd4d0da diff --git a/qtgamepad b/qtgamepad index ed3dc282..0295c81f 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit ed3dc28209f12a58235ec36f43fa7e5b896bf784 +Subproject commit 0295c81fdfd0a14e5c427c397b0b9e005ba86f9b diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index fd18b3e7..5e45faaf 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit fd18b3e7b781680033b8dfed9476b0fc4a06dcc7 +Subproject commit 5e45faaf050752b18037ea518cd0b6909a9cc3ed From 4f64747383aad254bf9101373f2f8644b92b9157 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 10 Jun 2016 17:08:51 +0300 Subject: [PATCH 64/77] Updated submodules. Change-Id: If1195243a052f8cd20079345dbc7b2783e7bf459 Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtenginio | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtpurchasing | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtscript | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebkit | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 38 files changed, 38 insertions(+), 38 deletions(-) diff --git a/qt3d b/qt3d index 585264cb..b816bbac 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 585264cb776366aef8adf4b7d7abce8e7eea4bdf +Subproject commit b816bbac412811ad9bd1999640509883a3bdf6d7 diff --git a/qtactiveqt b/qtactiveqt index 73ee37be..44794751 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 73ee37bebbf724a3ec01b30212ed31002a682083 +Subproject commit 447947515df2cf727f14f5a1fdd4685ee8201e2f diff --git a/qtandroidextras b/qtandroidextras index 368b0bbf..a8ba9a22 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 368b0bbf2b2854547cfafa7092361f09dd157fb1 +Subproject commit a8ba9a22e94058b5e24074f17d550da17454ddfe diff --git a/qtbase b/qtbase index e6cc1d78..d2c6294b 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit e6cc1d788dddda2998a9f941664ede928ce1e212 +Subproject commit d2c6294bd5cc3c2e61aaa0c83bfd74941ced150e diff --git a/qtcanvas3d b/qtcanvas3d index 32404e27..2c76b37d 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 32404e27101c5ec81b4ab965faf38263429bbc5a +Subproject commit 2c76b37d553ae1cdb8a75cb6ead32b64ab2821db diff --git a/qtcharts b/qtcharts index 8a781841..0464d42b 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 8a781841812a42ed728a76c0dcdcaa6196eac44e +Subproject commit 0464d42b101eaf60c62be751785009d09065f2cf diff --git a/qtconnectivity b/qtconnectivity index 0690d480..6d9a7006 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 0690d4801ca5ee92d5e7511d48d95786212d5fb3 +Subproject commit 6d9a7006e81fc9ef6140bfc62696d1b270aaae08 diff --git a/qtdatavis3d b/qtdatavis3d index 2f6074fd..02af08a7 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 2f6074fde0ec050c77f881e0d2ce265fa93a0fcc +Subproject commit 02af08a705ada1ca2dac839a026a816a8e70def5 diff --git a/qtdeclarative b/qtdeclarative index b9e4a4df..0932a599 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit b9e4a4df577959579b2322fb6077bde82d9ffce3 +Subproject commit 0932a59971f606f07b41da19f3974d51b7008180 diff --git a/qtdoc b/qtdoc index 52554608..d08ebbbd 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 525546087f2933d110dbb62785789a853ae29552 +Subproject commit d08ebbbdffbb93cc7b5ec7ee09906c88afc89a02 diff --git a/qtenginio b/qtenginio index 0f6e294f..15090ec5 160000 --- a/qtenginio +++ b/qtenginio @@ -1 +1 @@ -Subproject commit 0f6e294fb8534f677a5ec75113679cfe24f559c1 +Subproject commit 15090ec53621211616c4136ab37e0332c3ae709a diff --git a/qtgamepad b/qtgamepad index 84b87c22..eaf8a980 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 84b87c222872eb6e49727d773177b7f5b86e9beb +Subproject commit eaf8a9800e81a446e9badaa32be459d0a54ec9b5 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index d85fd81f..1f43c743 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit d85fd81f338f9c6f2e95b92b2cb9ccd4f9889c6b +Subproject commit 1f43c7433ae7be13fc51f70b85e3b69fce84bc82 diff --git a/qtimageformats b/qtimageformats index 68d9cfe5..9cbca026 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 68d9cfe5256c91510552c2b16d5efdb01e77ea57 +Subproject commit 9cbca0266d7482a7d3d198acfa9f3a2661d435f3 diff --git a/qtlocation b/qtlocation index 1ca6bf3b..d90b2bff 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 1ca6bf3bdef8c95e12a5ee93ed69e4983a1df017 +Subproject commit d90b2bffd76bf74ab4b6e6c0c68a26f6830c8d6f diff --git a/qtmacextras b/qtmacextras index 509c7b7f..8acd1bb2 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 509c7b7f7da2fd69444b7dba32f31db51ad40aa8 +Subproject commit 8acd1bb2d802296a37b6394ffe4e7adc5112db2b diff --git a/qtmultimedia b/qtmultimedia index 47e583a6..62d9b69e 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 47e583a6b82a6b678f2ca2a621176ad40eeab95d +Subproject commit 62d9b69e4d9ee9f180e4ac07fb72e00a002d3c02 diff --git a/qtpurchasing b/qtpurchasing index 0afcd2ef..60af17f3 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 0afcd2efe2c33bbbd5d9b1edc47b0fcccb6ce8c2 +Subproject commit 60af17f3ab8c9142dcfb5ece7f9cc904bb6797ab diff --git a/qtquickcontrols b/qtquickcontrols index c6713e21..b5a8306b 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit c6713e212ef0b97c45d6466b73220567e94a05f1 +Subproject commit b5a8306bf6d4949066872ac2afc8d0a01f716bd7 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 82c422b5..8fd8024d 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 82c422b5b1c81f0572fdb2be1efba900200680d8 +Subproject commit 8fd8024d794a18aa3cab35ea9fcebd287d238e78 diff --git a/qtscript b/qtscript index b49bfdaa..e2e7b57a 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit b49bfdaad11be1de632f907d43485a7ac701ddc5 +Subproject commit e2e7b57a5d3f3fe870756f4cdcf104b7090c3526 diff --git a/qtscxml b/qtscxml index b5a179fb..7463654c 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit b5a179fba6f08e29f777cf10d0972d60b61637ad +Subproject commit 7463654cd7ab7803c650e439827b48be60fe3c64 diff --git a/qtsensors b/qtsensors index f32489e3..7deae40b 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit f32489e379805c51b28ae5d471491a649283fd8d +Subproject commit 7deae40b87e1637d55de8d111e99f4da1d5584d4 diff --git a/qtserialbus b/qtserialbus index e03b8930..e704a83b 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit e03b8930eab783de3da0e10e1e3ef6bc37135021 +Subproject commit e704a83b4a1a1eb69b62ee2cb029c549d99959ed diff --git a/qtserialport b/qtserialport index 2ac9c0c0..63ac6874 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 2ac9c0c0e6210f73884bbe2bcb3d8269519003a8 +Subproject commit 63ac6874eeea037b4b8b1a450a938999fb4f31b8 diff --git a/qtsvg b/qtsvg index 612c3041..b231d9f4 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 612c3041475550837dee7149b9f5e9e4f55c17a0 +Subproject commit b231d9f41903f8514a2d91844f4515055307af3a diff --git a/qttools b/qttools index 6ef8d674..9fd5c70f 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 6ef8d67413511f07abb4f71593ed6d8567f61ca8 +Subproject commit 9fd5c70f5a2e8157e3476a036522df1a52776b90 diff --git a/qttranslations b/qttranslations index c95337f7..8ac63b28 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit c95337f7e974c75a88b96c168b6056a1642399bb +Subproject commit 8ac63b28c45eace2f9b935b48257f97e0d07a9ca diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index f58add00..626e78c9 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit f58add00ffa5dd5b3fd7bc31bf3cacc452cb8e5c +Subproject commit 626e78c9660cff063e1f9370538b5a424631571c diff --git a/qtwayland b/qtwayland index c7832b0a..06e87701 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit c7832b0a1d4e5e095e56315c43145bb8964f7030 +Subproject commit 06e8770129d5c49bfb518b02b3ece6d529e0e4c3 diff --git a/qtwebchannel b/qtwebchannel index b025372d..4fda82b6 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit b025372d8b59b0080e1aa1d43b28da2c5544d30c +Subproject commit 4fda82b66e17cc03e6b08f1afd135069cfef09b7 diff --git a/qtwebengine b/qtwebengine index afb2f518..c4fc323d 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit afb2f518e6520091ce1b414600aceb41b58db761 +Subproject commit c4fc323d0771e24ae726065cdce9eafef2c09c41 diff --git a/qtwebkit b/qtwebkit index 2e851792..01fa9be5 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 2e8517924b70a778463e463873eb3d8d0b623eed +Subproject commit 01fa9be55572ddb3f69befc68475ed09241eabdf diff --git a/qtwebsockets b/qtwebsockets index 00156d63..cd80c041 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 00156d63eea2fb7681a8a00a3144392d6325e5cb +Subproject commit cd80c041220df2875297622a0012933412730e9d diff --git a/qtwebview b/qtwebview index 94152499..8618811a 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 9415249942b98768b8bc431fdb242ca1ac09cccc +Subproject commit 8618811a5220f5456f012179abc743e08120adf3 diff --git a/qtwinextras b/qtwinextras index 8e816f25..e2f08aaa 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 8e816f25034287bb3f89317a631075533914102b +Subproject commit e2f08aaacb571c1287217b09acf66518ff924dc4 diff --git a/qtx11extras b/qtx11extras index 35c775cf..ee7eb793 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 35c775cfe7a370f48ae5d4de0c7840993c126769 +Subproject commit ee7eb793b666c99f171452dc1accd7955cdf5a6c diff --git a/qtxmlpatterns b/qtxmlpatterns index 9751d3d8..4ca909e7 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 9751d3d82eecb4f2c2a805783fbcce9ccd189fea +Subproject commit 4ca909e7daef701882755487008c9e4f0b978dbc From 451f93e26b46cad8d77438606d0103c7c5005546 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 12 Jun 2016 01:00:40 +0300 Subject: [PATCH 65/77] Updated submodules. Change-Id: I5ad7c931f77a167ca4574fd20eb6fe783d95a297 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtquickcontrols | 2 +- qtsensors | 2 +- qtserialport | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebkit | 2 +- qtwebview | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/qt3d b/qt3d index 0384f298..fcea0310 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 0384f29809186e6a45b13760c9dbb2f8cd3bf251 +Subproject commit fcea0310a307a4adf36f382806b34ff1ee3eb913 diff --git a/qtandroidextras b/qtandroidextras index 827e255b..f512a085 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 827e255b6f380af2ec303f446c8cd8af33dfa8b0 +Subproject commit f512a085d360bbeea16188fd3cae421a29cf9b71 diff --git a/qtbase b/qtbase index fd709786..b465fe75 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit fd70978693bd92761e9989bc1c76bf83c1e8c987 +Subproject commit b465fe759695bb7e1de693c3d4d20acfd2c49779 diff --git a/qtconnectivity b/qtconnectivity index c347a374..7b4d1325 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit c347a3748af663da9e8e6ce5e233248b80217f96 +Subproject commit 7b4d1325ecf41ed76a5beca584702ccb5a9b5d6d diff --git a/qtdeclarative b/qtdeclarative index 6d63e3ba..4f94ddcf 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 6d63e3ba09954ce7b56b4b24432bd036e636b164 +Subproject commit 4f94ddcf295c59dec86c8570c19e3e7427d68b06 diff --git a/qtdoc b/qtdoc index d167afbe..36734169 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit d167afbe0ec394b28618a8af44eada7c7849c7c5 +Subproject commit 36734169ac134f6477077c5ec226d19f4dd59cb0 diff --git a/qtlocation b/qtlocation index 07b9d583..f1f876b3 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 07b9d583273b8e3aa5712eac9d06b74ddb927db3 +Subproject commit f1f876b353446ebb271d167482f5e0414f88e10f diff --git a/qtmultimedia b/qtmultimedia index b3af8f65..f5de1410 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit b3af8f65fcaef66504f5640ccaa2972e17af1af0 +Subproject commit f5de14107094080f15fad3beffb64ad95ff6c5e4 diff --git a/qtquickcontrols b/qtquickcontrols index 7e33119c..e888ebd3 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 7e33119c487b6ce7ee1b7e8fc7b9b862adba1c91 +Subproject commit e888ebd35bbaa236dd186b545400aaad0f2e14cf diff --git a/qtsensors b/qtsensors index 79d3d49c..5a562aa4 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 79d3d49c4c4bf1d07f377d24d8c6e571abe80355 +Subproject commit 5a562aa4a923f5585879a9875307aaf85054ed40 diff --git a/qtserialport b/qtserialport index 9c9255ed..1dd9d0f1 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 9c9255eda50af191636ff9f18df35567c307dd8c +Subproject commit 1dd9d0f15ef07d1d0c470c5c3e02948a120309a1 diff --git a/qttools b/qttools index 5bbd37f8..2c87670f 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 5bbd37f8d8ac1c4e9b13cb939370f5c617a4ec68 +Subproject commit 2c87670f4783b7d321bbe31c33d2545597e7bd43 diff --git a/qtwayland b/qtwayland index d9cef40e..53923434 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit d9cef40ea3948e5d74120fb07909332503dc485b +Subproject commit 5392343491e93952b520ad43d164dfbe1e550d58 diff --git a/qtwebengine b/qtwebengine index bfcbdc3a..d6e3ba85 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit bfcbdc3ab42880dc37ffa7174af96928ccf25f03 +Subproject commit d6e3ba85138a6147b9b34a1c3363b2d3b20ba284 diff --git a/qtwebkit b/qtwebkit index da5f9d78..5b3435cd 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit da5f9d788f96340a44083ed4e28cdf6ea0a393f0 +Subproject commit 5b3435cd1d8715ede24906e374a306ddc6c4dc32 diff --git a/qtwebview b/qtwebview index 70cc7914..cae464f9 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 70cc791481204708df6a926a0a65155be2afaf7a +Subproject commit cae464f969e5dcf92e74c92a799fbc6ddb498a63 From 70b3b029773c733043ce29672e981655ca4cad20 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 14 Jun 2016 01:00:41 +0300 Subject: [PATCH 66/77] Updated submodules. Change-Id: I8358eadfea5f3bf8ff8615d3c468201acd58f1b5 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtenginio | 2 +- qtmultimedia | 2 +- qtwebengine | 2 +- qtwebkit | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qtbase b/qtbase index b465fe75..e969e6d2 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit b465fe759695bb7e1de693c3d4d20acfd2c49779 +Subproject commit e969e6d2ca5636b87b3de963ebd8dac993275617 diff --git a/qtdeclarative b/qtdeclarative index 4f94ddcf..7f8dc9d0 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 4f94ddcf295c59dec86c8570c19e3e7427d68b06 +Subproject commit 7f8dc9d00c02e0e28cdea92cac8f8e4379bed68b diff --git a/qtenginio b/qtenginio index d5aec181..b74e1ca0 160000 --- a/qtenginio +++ b/qtenginio @@ -1 +1 @@ -Subproject commit d5aec18177acc122b0b7c39a90fbb09d388a01b3 +Subproject commit b74e1ca024540d45105df95e47b9c93b263f7b75 diff --git a/qtmultimedia b/qtmultimedia index f5de1410..af5e0d04 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit f5de14107094080f15fad3beffb64ad95ff6c5e4 +Subproject commit af5e0d04852e5efc1ebd9d099f3906bc66a62338 diff --git a/qtwebengine b/qtwebengine index d6e3ba85..9764fa47 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit d6e3ba85138a6147b9b34a1c3363b2d3b20ba284 +Subproject commit 9764fa47ee9b4f8ccf1c7cb0dc073bdc8a4f9c86 diff --git a/qtwebkit b/qtwebkit index 5b3435cd..28077218 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 5b3435cd1d8715ede24906e374a306ddc6c4dc32 +Subproject commit 28077218067438fef5cdc746feb45ca6d4e755d9 From 5778d17a6852516ab7522d5447573a04cd883996 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Tue, 14 Jun 2016 09:47:10 +0200 Subject: [PATCH 67/77] README: Remove platform specific build requirements The list is not up to date (e.g. ICU is not required on Windows anymore), and woefully incomplete. Better just link to the wiki/documentation. Task-number: QTBUG-54084 Change-Id: I6b22fc1c84d40b892503085cb023a7db25fd19c8 Reviewed-by: Simon Hausmann --- README | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/README b/README index ff169fe2..12969310 100644 --- a/README +++ b/README @@ -16,29 +16,6 @@ HOW TO BUILD QT5 please see section "Setting up your machine" on: http://wiki.qt.io/Get_The_Source - Optional requirements - --------------------- - - - OpenSSL for SSL sockets or HTTPS - - Wayland - - New dependencies in Qt 5 - ------------------------ - - Linux: On systems running X11, the XCB libraries are required for - the platform plugin to build. qtbase/src/plugins/platforms/xcb/README - lists the required packages. - - Qt 5 can make use of the ICU libraries providing Unicode and Globalization - support (see http://site.icu-project.org/). They are required for building - QtWebKit. - On Linux, they will be auto-detected. - On Windows, they need to be manually installed and the "include" and "lib" - folders of the ICU installation must be appended to the INCLUDE and LIB - environment variables after calling the Windows SDK setup script. - The "bin" folder of the ICU installation should be appended to the PATH - environment variable in order to for the DLLs to be found at run-time. - Licensing: ---------- From 9b6d296096aebfd37e332da1389e7bd40d2b6a54 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Tue, 14 Jun 2016 09:55:03 +0200 Subject: [PATCH 68/77] README: Do not take deprecated modules as an example Task-number: QTBUG-54084 Change-Id: I03c81822a05fb9a3bda975421228b460c2a00fe2 Reviewed-by: Simon Hausmann --- README | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README b/README index 12969310..7781f47b 100644 --- a/README +++ b/README @@ -87,11 +87,11 @@ HOW TO BUILD QT5 default in the build system. It is possible to build selected modules with their dependencies by doing - a `make module-'. For example, to build only qtscript and qtwebkit, - and the modules they depend on: + a `make module-'. For example, to build only qtdeclarative, + and the modules it depends on: ./configure -prefix $PWD/qtbase - make -j4 module-qtscript module-qtwebkit + make -j4 module-qtdeclarative This can save a lot of time if you are only interested in a subset of Qt5. From b3bc77fc73f0334d312aba1acc5093fd9bd03520 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 16 Jun 2016 01:01:49 +0300 Subject: [PATCH 69/77] Updated submodules. Change-Id: Ia573d0de926441bc63b4c3871e075eb342e294c9 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtmultimedia | 2 +- qtrepotools | 2 +- qtscript | 2 +- qtsensors | 2 +- qttools | 2 +- qttranslations | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebkit | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qtbase b/qtbase index e969e6d2..792947da 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit e969e6d2ca5636b87b3de963ebd8dac993275617 +Subproject commit 792947da7e366c30ce1ecf0a365de6cf113fc35e diff --git a/qtdeclarative b/qtdeclarative index 7f8dc9d0..5f92f784 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 7f8dc9d00c02e0e28cdea92cac8f8e4379bed68b +Subproject commit 5f92f784834f8648857fa6056ac0a93c96c60543 diff --git a/qtdoc b/qtdoc index 36734169..84113ad7 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 36734169ac134f6477077c5ec226d19f4dd59cb0 +Subproject commit 84113ad7dedcd8f88f00393d275dc7210a7c6801 diff --git a/qtmultimedia b/qtmultimedia index af5e0d04..32b8310e 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit af5e0d04852e5efc1ebd9d099f3906bc66a62338 +Subproject commit 32b8310e34890b83929f8b143dc9947f370994e3 diff --git a/qtrepotools b/qtrepotools index be3d47ae..d856dc5d 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit be3d47ae9560950de0908f0129703e9f7a8d68cd +Subproject commit d856dc5d249e75d6dac3c9a02373467ead12037d diff --git a/qtscript b/qtscript index 4c8efb40..d84da60d 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 4c8efb407fa9ebfe3e1923970140cfe270fda75d +Subproject commit d84da60d5f7f884ab0ad7737658f4a5936780799 diff --git a/qtsensors b/qtsensors index 5a562aa4..90eb1a41 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 5a562aa4a923f5585879a9875307aaf85054ed40 +Subproject commit 90eb1a41702bf748ac3f356d8ce04496f75ecb64 diff --git a/qttools b/qttools index 2c87670f..5b8f8c80 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 2c87670f4783b7d321bbe31c33d2545597e7bd43 +Subproject commit 5b8f8c801a958568772079b2f1b7b67bcdc81bc1 diff --git a/qttranslations b/qttranslations index 674d2ca9..d912e53b 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 674d2ca9f7c51f3621c9e2b36c9f02528dd23d40 +Subproject commit d912e53bc636b3d39a723d9d029761e404192afc diff --git a/qtwebchannel b/qtwebchannel index 224742f0..3be67a77 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 224742f0e2e882bce21047622d4c351803b9d486 +Subproject commit 3be67a7799aa1960d459548a43ddf54044f80ec1 diff --git a/qtwebengine b/qtwebengine index 9764fa47..6a658bb9 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 9764fa47ee9b4f8ccf1c7cb0dc073bdc8a4f9c86 +Subproject commit 6a658bb9779f995d9b06bf769f920773fd9b6b8a diff --git a/qtwebkit b/qtwebkit index 28077218..4afc1683 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 28077218067438fef5cdc746feb45ca6d4e755d9 +Subproject commit 4afc16838f72b94ac1c73da6a8b215bebce30037 From 8ddc3c1254149920b8ad9e691ea65c88fd149ee2 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Thu, 26 May 2016 17:36:07 +0200 Subject: [PATCH 70/77] Add script to patch QNX SDK headers for Qt atomics MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Applies http://www.qnx.com/download/feature.html?programid=27555 to the QNX SDK on our continuous integration machines. Change-Id: I6d24b5024b3e5981c30bbf9a26a1bb4dfaca4e80 Reviewed-by: Jędrzej Nowacki --- coin/provisioning/common/patch_qnx.ps1 | 51 +++++++++++++++ .../qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh | 64 +++++++++++++++++++ .../qtci-windows-7-x86/patch_qnx.ps1 | 1 + 3 files changed, 116 insertions(+) create mode 100644 coin/provisioning/common/patch_qnx.ps1 create mode 100644 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh create mode 100644 coin/provisioning/qtci-windows-7-x86/patch_qnx.ps1 diff --git a/coin/provisioning/common/patch_qnx.ps1 b/coin/provisioning/common/patch_qnx.ps1 new file mode 100644 index 00000000..2fca7b67 --- /dev/null +++ b/coin/provisioning/common/patch_qnx.ps1 @@ -0,0 +1,51 @@ +############################################################################# +## +## Copyright (C) 2016 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the test suite of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +# Patch QNX SDK due to issues in the standard library. +# The patches are available here: +# http://www.qnx.com/download/feature.html?programid=27555 +# A copy of the patch must be in the root of the Coin path in +# provisioning/qnx/patch-660-4367-RS6069_cpp-headers.zip + + +. "$PSScriptRoot\helpers.ps1" + +$zip = "c:\users\qt\downloads\patch-660-4367-RS6069_cpp-headers.zip" +$sha1 = "57A11FFE4434AD567B3C36F7B828DBB468A9E565" +$tempDir = "C:\temp\qnx_path" + +Invoke-WebRequest -UseBasicParsing http://${Env:COIN_WEBSERVER_ADDRESS}/coin/provisioning/qnx/patch-660-4367-RS6069_cpp-headers.zip -OutFile $zip +Verify-Checksum $zip $sha1 +Extract-Zip $zip $tempDir +Copy-Item $tempDir\patches\660-4367\target\* C:\qnx660\target\ -recurse -force +Remove-Item $tempDir -recurse diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh new file mode 100644 index 00000000..19993ecc --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/patch_qnx.sh @@ -0,0 +1,64 @@ +#!/bin/env bash + +############################################################################# +## +## Copyright (C) 2016 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the test suite of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +# Patch QNX SDK due to issues in the standard library. +# The patches are available here: +# http://www.qnx.com/download/feature.html?programid=27555 +# A copy of the patch must be in the root of the Coin path in +# provisioning/qnx/patch-660-4367-RS6069_cpp-headers.zip + +set -e +sha1="57a11ffe4434ad567b3c36f7b828dbb468a9e565" + +function InstallZipPackageFromURL { + url=$1 + expectedSha1=$2 + targetDirectory=$3 + + targetFile=`mktemp` || echo "Failed to create temporary file" + wget --tries=5 --waitretry=5 --output-document=$targetFile $url || echo "Failed to download '$url' multiple times" + echo "$expectedSha1 $targetFile" | sha1sum --check || echo "Failed to check sha1sum" + + tempDir=`mktemp -d` || echo "Failed to create temporary directory" + /usr/bin/unzip -o -d $tempDir $targetFile || echo "Failed to unzip $url archive" + trap "sudo rm -fr $targetFile $tempDir" EXIT + + sudo cp -rafv $tempDir/patches/660-4367/target/* /opt/qnx660/target/ +} + +echo "Patching QNX" + +baseBinaryPackageURL="http://${COIN_WEBSERVER_ADDRESS}/coin/provisioning/qnx/patch-660-4367-RS6069_cpp-headers.zip" +InstallZipPackageFromURL $baseBinaryPackageURL $sha1 "/opt/qnx660/target/" diff --git a/coin/provisioning/qtci-windows-7-x86/patch_qnx.ps1 b/coin/provisioning/qtci-windows-7-x86/patch_qnx.ps1 new file mode 100644 index 00000000..41210dcb --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/patch_qnx.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\patch_qnx.ps1" From 0536b1e9e4bf6f15a38fe9d3d8b76d8b3187b6aa Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Wed, 15 Jun 2016 18:24:18 +0200 Subject: [PATCH 71/77] Clean up Windows provisioning scripts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The execution policy is set by the CI. The command usually fails as it is in the scritps right now since it must be run as admin. Change-Id: Ie31cb7fc15720cc6d76646bf475b3d60a02014d8 Reviewed-by: Jędrzej Nowacki --- coin/README | 2 ++ coin/provisioning/qtci-windows-10-x86/icu.ps1 | 5 ----- coin/provisioning/qtci-windows-10-x86/jom.ps1 | 5 ----- coin/provisioning/qtci-windows-10-x86_64/icu.ps1 | 5 ----- coin/provisioning/qtci-windows-10-x86_64/jom.ps1 | 5 ----- coin/provisioning/qtci-windows-7-x86/icu.ps1 | 5 ----- coin/provisioning/qtci-windows-7-x86/jom.ps1 | 5 ----- coin/provisioning/qtci-windows-8-x86/icu.ps1 | 5 ----- coin/provisioning/qtci-windows-8-x86/jom.ps1 | 5 ----- coin/provisioning/qtci-windows-8-x86_64/icu.ps1 | 5 ----- coin/provisioning/qtci-windows-8-x86_64/jom.ps1 | 5 ----- 11 files changed, 2 insertions(+), 50 deletions(-) diff --git a/coin/README b/coin/README index 891d7202..2fb3fe2d 100644 --- a/coin/README +++ b/coin/README @@ -6,4 +6,6 @@ This directory contains files used by Qt's Continuous Integration system (Coin). provisioning ------------ Contains scripts that apply to different test machines in order to run automatic tests on them. +For Windows scripts, make sure that the machine has "Set-ExecutionPolicy RemoteSigned -Force" set. +(Run as admin in PowerShell) diff --git a/coin/provisioning/qtci-windows-10-x86/icu.ps1 b/coin/provisioning/qtci-windows-10-x86/icu.ps1 index 7756bd0f..325be36a 100644 --- a/coin/provisioning/qtci-windows-10-x86/icu.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/icu.ps1 @@ -1,6 +1 @@ -Set-ExecutionPolicy RemoteSigned -Force - -# install jom . "$PSScriptRoot\..\common\icu.ps1" - -Set-ExecutionPolicy Restricted -Force diff --git a/coin/provisioning/qtci-windows-10-x86/jom.ps1 b/coin/provisioning/qtci-windows-10-x86/jom.ps1 index 360fad95..842c65dd 100644 --- a/coin/provisioning/qtci-windows-10-x86/jom.ps1 +++ b/coin/provisioning/qtci-windows-10-x86/jom.ps1 @@ -1,6 +1 @@ -Set-ExecutionPolicy RemoteSigned -Force - -# install jom . "$PSScriptRoot\..\common\jom.ps1" - -Set-ExecutionPolicy Restricted -Force diff --git a/coin/provisioning/qtci-windows-10-x86_64/icu.ps1 b/coin/provisioning/qtci-windows-10-x86_64/icu.ps1 index 7756bd0f..325be36a 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/icu.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/icu.ps1 @@ -1,6 +1 @@ -Set-ExecutionPolicy RemoteSigned -Force - -# install jom . "$PSScriptRoot\..\common\icu.ps1" - -Set-ExecutionPolicy Restricted -Force diff --git a/coin/provisioning/qtci-windows-10-x86_64/jom.ps1 b/coin/provisioning/qtci-windows-10-x86_64/jom.ps1 index 360fad95..842c65dd 100644 --- a/coin/provisioning/qtci-windows-10-x86_64/jom.ps1 +++ b/coin/provisioning/qtci-windows-10-x86_64/jom.ps1 @@ -1,6 +1 @@ -Set-ExecutionPolicy RemoteSigned -Force - -# install jom . "$PSScriptRoot\..\common\jom.ps1" - -Set-ExecutionPolicy Restricted -Force diff --git a/coin/provisioning/qtci-windows-7-x86/icu.ps1 b/coin/provisioning/qtci-windows-7-x86/icu.ps1 index 7756bd0f..325be36a 100644 --- a/coin/provisioning/qtci-windows-7-x86/icu.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/icu.ps1 @@ -1,6 +1 @@ -Set-ExecutionPolicy RemoteSigned -Force - -# install jom . "$PSScriptRoot\..\common\icu.ps1" - -Set-ExecutionPolicy Restricted -Force diff --git a/coin/provisioning/qtci-windows-7-x86/jom.ps1 b/coin/provisioning/qtci-windows-7-x86/jom.ps1 index 360fad95..842c65dd 100644 --- a/coin/provisioning/qtci-windows-7-x86/jom.ps1 +++ b/coin/provisioning/qtci-windows-7-x86/jom.ps1 @@ -1,6 +1 @@ -Set-ExecutionPolicy RemoteSigned -Force - -# install jom . "$PSScriptRoot\..\common\jom.ps1" - -Set-ExecutionPolicy Restricted -Force diff --git a/coin/provisioning/qtci-windows-8-x86/icu.ps1 b/coin/provisioning/qtci-windows-8-x86/icu.ps1 index 7756bd0f..325be36a 100644 --- a/coin/provisioning/qtci-windows-8-x86/icu.ps1 +++ b/coin/provisioning/qtci-windows-8-x86/icu.ps1 @@ -1,6 +1 @@ -Set-ExecutionPolicy RemoteSigned -Force - -# install jom . "$PSScriptRoot\..\common\icu.ps1" - -Set-ExecutionPolicy Restricted -Force diff --git a/coin/provisioning/qtci-windows-8-x86/jom.ps1 b/coin/provisioning/qtci-windows-8-x86/jom.ps1 index 360fad95..842c65dd 100644 --- a/coin/provisioning/qtci-windows-8-x86/jom.ps1 +++ b/coin/provisioning/qtci-windows-8-x86/jom.ps1 @@ -1,6 +1 @@ -Set-ExecutionPolicy RemoteSigned -Force - -# install jom . "$PSScriptRoot\..\common\jom.ps1" - -Set-ExecutionPolicy Restricted -Force diff --git a/coin/provisioning/qtci-windows-8-x86_64/icu.ps1 b/coin/provisioning/qtci-windows-8-x86_64/icu.ps1 index 7756bd0f..325be36a 100644 --- a/coin/provisioning/qtci-windows-8-x86_64/icu.ps1 +++ b/coin/provisioning/qtci-windows-8-x86_64/icu.ps1 @@ -1,6 +1 @@ -Set-ExecutionPolicy RemoteSigned -Force - -# install jom . "$PSScriptRoot\..\common\icu.ps1" - -Set-ExecutionPolicy Restricted -Force diff --git a/coin/provisioning/qtci-windows-8-x86_64/jom.ps1 b/coin/provisioning/qtci-windows-8-x86_64/jom.ps1 index 360fad95..842c65dd 100644 --- a/coin/provisioning/qtci-windows-8-x86_64/jom.ps1 +++ b/coin/provisioning/qtci-windows-8-x86_64/jom.ps1 @@ -1,6 +1 @@ -Set-ExecutionPolicy RemoteSigned -Force - -# install jom . "$PSScriptRoot\..\common\jom.ps1" - -Set-ExecutionPolicy Restricted -Force From 6bed56a680175283d1b95529d6d2b93f05e43d73 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 17 Jun 2016 01:00:50 +0300 Subject: [PATCH 72/77] Updated submodules. Change-Id: I86dfc95bd06101ed826d139fd577ccfa662ad0b7 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtserialbus | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebkit | 2 +- qtwebsockets | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/qtbase b/qtbase index 792947da..5d31c983 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 792947da7e366c30ce1ecf0a365de6cf113fc35e +Subproject commit 5d31c9831da42ffb5f720b147d99be6d9eb93e30 diff --git a/qtconnectivity b/qtconnectivity index 7b4d1325..a8a1a97b 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 7b4d1325ecf41ed76a5beca584702ccb5a9b5d6d +Subproject commit a8a1a97b9a3f68245431a94ff670b91b340770b2 diff --git a/qtdeclarative b/qtdeclarative index 5f92f784..6358e136 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 5f92f784834f8648857fa6056ac0a93c96c60543 +Subproject commit 6358e1365539d2ea26ec20617b58c0fed11d647e diff --git a/qtmultimedia b/qtmultimedia index 32b8310e..6d48deed 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 32b8310e34890b83929f8b143dc9947f370994e3 +Subproject commit 6d48deed4889f0da3ed0499b051241ff3fe8f1b2 diff --git a/qtqa b/qtqa index 32893be6..aed1d474 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 32893be6fa2c1068df16479979acf9b3ba7f6bcd +Subproject commit aed1d474537fb5b9ea145729604277b2472e006e diff --git a/qtserialbus b/qtserialbus index 40be986e..b622b398 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 40be986e18f244126f934c3bb0351ecb062a2060 +Subproject commit b622b3985f5de1be8a41599b27ac9934888b82c3 diff --git a/qttools b/qttools index 5b8f8c80..fb20b263 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 5b8f8c801a958568772079b2f1b7b67bcdc81bc1 +Subproject commit fb20b2637368365b76ccfac30dcf8fdd38d0fd36 diff --git a/qtwayland b/qtwayland index 53923434..a76e98de 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 5392343491e93952b520ad43d164dfbe1e550d58 +Subproject commit a76e98dea9646dea2592e4699f13d9b4706c68f1 diff --git a/qtwebengine b/qtwebengine index 6a658bb9..528088cb 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 6a658bb9779f995d9b06bf769f920773fd9b6b8a +Subproject commit 528088cb61eaacb63e87ea8e06f59d1536e43799 diff --git a/qtwebkit b/qtwebkit index 4afc1683..09957b3f 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 4afc16838f72b94ac1c73da6a8b215bebce30037 +Subproject commit 09957b3f77fccf3dfacdc80afcb52d0668e5c0b2 diff --git a/qtwebsockets b/qtwebsockets index 10cad9ec..04f50e04 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 10cad9ece2cb380e26e03a1c03b900f8e3b4c801 +Subproject commit 04f50e048ff907885ac648782ef293d7aef66ace From 02df76bf07addb1d04af8f4be8e8de5b67fe6a5a Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 18 Jun 2016 01:00:48 +0300 Subject: [PATCH 73/77] Updated submodules. Change-Id: I3d25d26bebe88a542f794c29bcda413302432874 Reviewed-by: Qt Submodule Update Bot --- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtimageformats | 2 +- qtmacextras | 2 +- qtquickcontrols | 2 +- qtscript | 2 +- qtserialport | 2 +- qtsvg | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index 58930c21..6ce190d5 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 58930c21bd9bd1bb81f35305a4b1b6115a1f69ec +Subproject commit 6ce190d5b87a1702098f0f5351a0bd25339fe298 diff --git a/qtandroidextras b/qtandroidextras index f512a085..1c6a5524 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit f512a085d360bbeea16188fd3cae421a29cf9b71 +Subproject commit 1c6a55247646a7b34f9d3263e335dd2a34097eff diff --git a/qtbase b/qtbase index 5d31c983..ee2eed35 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 5d31c9831da42ffb5f720b147d99be6d9eb93e30 +Subproject commit ee2eed350f95285b65e3dd9647e5f366e16fd5a4 diff --git a/qtdeclarative b/qtdeclarative index 6358e136..1591d0e0 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 6358e1365539d2ea26ec20617b58c0fed11d647e +Subproject commit 1591d0e0f62a48d2ef45cc8af9b5d39158e169d5 diff --git a/qtdoc b/qtdoc index 84113ad7..4f7279fa 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 84113ad7dedcd8f88f00393d275dc7210a7c6801 +Subproject commit 4f7279fa715785c520af5e5be17527950c9c6e76 diff --git a/qtimageformats b/qtimageformats index b144bfbc..99f384ac 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit b144bfbc30a80da9357ab528d905a4bd5935d659 +Subproject commit 99f384ac2353df89a1522e47c96cae6a945749e1 diff --git a/qtmacextras b/qtmacextras index ae58e100..b8e24de4 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit ae58e100d3df71772db4f2f938d0a2ddc8a0873f +Subproject commit b8e24de4ba0876a3686cf5da5b1b6f47603c1bc7 diff --git a/qtquickcontrols b/qtquickcontrols index e888ebd3..85c29330 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit e888ebd35bbaa236dd186b545400aaad0f2e14cf +Subproject commit 85c29330678dc5d8e51b006f51cc39706ab1abab diff --git a/qtscript b/qtscript index d84da60d..e7db88eb 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit d84da60d5f7f884ab0ad7737658f4a5936780799 +Subproject commit e7db88eb5cc1b51dd27b5b614909c1f9670977d3 diff --git a/qtserialport b/qtserialport index 1dd9d0f1..9d758fb3 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 1dd9d0f15ef07d1d0c470c5c3e02948a120309a1 +Subproject commit 9d758fb370026cb531d98ba42e98a8d6fabe6c0a diff --git a/qtsvg b/qtsvg index 415572bb..da117cdd 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 415572bb872af5d30943ab396d1f89de918ca54b +Subproject commit da117cdd5a602ad6c77a41699fbea6f685f62931 diff --git a/qttools b/qttools index fb20b263..334db22f 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit fb20b2637368365b76ccfac30dcf8fdd38d0fd36 +Subproject commit 334db22f91dfac28e6bdb25e4ed04ec7e681f6a7 diff --git a/qtwayland b/qtwayland index a76e98de..34681773 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit a76e98dea9646dea2592e4699f13d9b4706c68f1 +Subproject commit 3468177305c158f82fa32c2c6047a97e63cfe104 diff --git a/qtwebengine b/qtwebengine index 528088cb..323f300f 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 528088cb61eaacb63e87ea8e06f59d1536e43799 +Subproject commit 323f300fd54d3fdb6f7a4565f305b631a27e76d5 diff --git a/qtwebview b/qtwebview index cae464f9..3d5bfc3e 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit cae464f969e5dcf92e74c92a799fbc6ddb498a63 +Subproject commit 3d5bfc3e0c938cdb7d72d7cead92578a82fefdc5 diff --git a/qtwinextras b/qtwinextras index 3dd2b06d..d7d7b878 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 3dd2b06debd316e3656d433686642ffb64951c37 +Subproject commit d7d7b8784334009f9929d8a4dd3124a9e40a5ce3 diff --git a/qtx11extras b/qtx11extras index 36ae961b..df10edcf 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 36ae961b08420f14d7ad52ee5dc23ea456accfd9 +Subproject commit df10edcfae328f397c99192b322268c9e96f6dab diff --git a/qtxmlpatterns b/qtxmlpatterns index e8beed4a..543fbe8f 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit e8beed4a4491ce0d9d53bb82eb037211b29f58c1 +Subproject commit 543fbe8f24ac9b534884d47787ee6cb3aad49150 From 0b10bd3657009ba96748f5647259992d36916345 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 20 Jun 2016 01:00:54 +0300 Subject: [PATCH 74/77] Updated submodules. Change-Id: Ia5d6e51574251dbd0e9f9cf3f41aac2de56471c4 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtcanvas3d | 2 +- qtdeclarative | 2 +- qtenginio | 2 +- qtgraphicaleffects | 2 +- qtlocation | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qt3d b/qt3d index fcea0310..d44aa5a1 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit fcea0310a307a4adf36f382806b34ff1ee3eb913 +Subproject commit d44aa5a1b285100aa1b656ccf34b69f154b965a3 diff --git a/qtcanvas3d b/qtcanvas3d index 1a19a68e..7919112b 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 1a19a68e76205650b55fea48477deb95bf328412 +Subproject commit 7919112bf8bb4e1e99c7e9b57310e95598363522 diff --git a/qtdeclarative b/qtdeclarative index 1591d0e0..09605619 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 1591d0e0f62a48d2ef45cc8af9b5d39158e169d5 +Subproject commit 0960561981b59cbd293aeb32e87dc8a7732fe521 diff --git a/qtenginio b/qtenginio index b74e1ca0..6c37300c 160000 --- a/qtenginio +++ b/qtenginio @@ -1 +1 @@ -Subproject commit b74e1ca024540d45105df95e47b9c93b263f7b75 +Subproject commit 6c37300c667e3049178f049a5b86e7ea955c9671 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index b73cf345..0b68e91d 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit b73cf34563419852cbe01ffee3b57f5e21cc81e7 +Subproject commit 0b68e91d68902c4d05d0bb8aa045ae76c4e8c9b5 diff --git a/qtlocation b/qtlocation index f1f876b3..b2d1eb15 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit f1f876b353446ebb271d167482f5e0414f88e10f +Subproject commit b2d1eb15fcf3d4f1f1cd8821e80f0f530a0af9eb diff --git a/qtquickcontrols b/qtquickcontrols index 85c29330..fcaef8ea 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 85c29330678dc5d8e51b006f51cc39706ab1abab +Subproject commit fcaef8eaebde846ba9c26e23d13c9b2696a06ff4 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 1583f8b2..eed9b9dd 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 1583f8b2ee56726f7920524b85636bb831c2f0d0 +Subproject commit eed9b9dd83f0db9cbfe794072d8f5147e3d1234a From 49f1a7f0a61dfcb6a2b38f5f5c2ce4fdccc815e9 Mon Sep 17 00:00:00 2001 From: Sze Howe Koh Date: Wed, 15 Jun 2016 08:16:40 +0800 Subject: [PATCH 75/77] Expand license scope from "Qt GUI Toolkit" to "Qt Toolkit" See http://comments.gmane.org/gmane.comp.lib.qt.devel/25771 Change-Id: Iebda5d9a886f4c0f16fe4906cf6dc4c81f2c3c90 Reviewed-by: Lars Knoll --- LICENSE.GPLv2 | 2 +- LICENSE.GPLv3 | 2 +- LICENSE.LGPLv21 | 2 +- LICENSE.LGPLv3 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/LICENSE.GPLv2 b/LICENSE.GPLv2 index 6dbb032f..a4244777 100644 --- a/LICENSE.GPLv2 +++ b/LICENSE.GPLv2 @@ -3,7 +3,7 @@ The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd. Contact: http://www.qt.io/licensing/ - You may use, distribute and copy the Qt GUI Toolkit under the terms of + You may use, distribute and copy the Qt Toolkit under the terms of GNU General Public License version 2, which is displayed below. ------------------------------------------------------------------------- diff --git a/LICENSE.GPLv3 b/LICENSE.GPLv3 index 4e49b122..71c4ad49 100644 --- a/LICENSE.GPLv3 +++ b/LICENSE.GPLv3 @@ -3,7 +3,7 @@ The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd. Contact: http://www.qt.io/licensing/ - You may use, distribute and copy the Qt GUI Toolkit under the terms of + You may use, distribute and copy the Qt Toolkit under the terms of GNU Lesser General Public License version 3. That license references the General Public License version 3, that is displayed below. Other portions of the Qt Toolkit may be licensed directly under this license. diff --git a/LICENSE.LGPLv21 b/LICENSE.LGPLv21 index 6e184611..dfcab5e2 100644 --- a/LICENSE.LGPLv21 +++ b/LICENSE.LGPLv21 @@ -3,7 +3,7 @@ The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd. Contact: http://www.qt.io/licensing/ - You may use, distribute and copy the Qt GUI Toolkit under the terms of + You may use, distribute and copy the Qt Toolkit under the terms of GNU Lesser General Public License version 2.1, which is displayed below. ------------------------------------------------------------------------- diff --git a/LICENSE.LGPLv3 b/LICENSE.LGPLv3 index 4d67bac0..6bf924cd 100644 --- a/LICENSE.LGPLv3 +++ b/LICENSE.LGPLv3 @@ -3,7 +3,7 @@ The Qt Toolkit is Copyright (C) 2015 The Qt Company Ltd. Contact: http://www.qt.io/licensing/ - You may use, distribute and copy the Qt GUI Toolkit under the terms of + You may use, distribute and copy the Qt Toolkit under the terms of GNU Lesser General Public License version 3, which is displayed below. This license makes reference to the version 3 of the GNU General Public License, which you can find in the LICENSE.GPLv3 file. From e06238e99624e677888372f09a66ef04c9f8ca6e Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 21 Jun 2016 02:30:49 +0300 Subject: [PATCH 76/77] Updated submodules. Change-Id: I5a29cb5e04135debd8e7293594eb540e6acd23dd Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialport | 2 +- qtsvg | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebkit | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 31 files changed, 31 insertions(+), 31 deletions(-) diff --git a/qt3d b/qt3d index b816bbac..39a4b9ba 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit b816bbac412811ad9bd1999640509883a3bdf6d7 +Subproject commit 39a4b9ba5818f84e7ab8ba01d43bf8c5abb9fcf9 diff --git a/qtactiveqt b/qtactiveqt index 44794751..878c3ec6 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 447947515df2cf727f14f5a1fdd4685ee8201e2f +Subproject commit 878c3ec6bcaf1219bd1e5ef301bb682f175204d2 diff --git a/qtandroidextras b/qtandroidextras index a8ba9a22..2442b7b5 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit a8ba9a22e94058b5e24074f17d550da17454ddfe +Subproject commit 2442b7b50cd57325139fff39254d4d0839eb7bd7 diff --git a/qtbase b/qtbase index d2c6294b..5f0ec730 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit d2c6294bd5cc3c2e61aaa0c83bfd74941ced150e +Subproject commit 5f0ec7305e4310123ddeb98d3523087e3c560d9c diff --git a/qtcanvas3d b/qtcanvas3d index 2c76b37d..6f8910da 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 2c76b37d553ae1cdb8a75cb6ead32b64ab2821db +Subproject commit 6f8910dab3238e4db91f493d8f49a26c9e8d1fcb diff --git a/qtconnectivity b/qtconnectivity index 6d9a7006..7d4f6cab 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 6d9a7006e81fc9ef6140bfc62696d1b270aaae08 +Subproject commit 7d4f6cab9fc5c8a8061b13e9b15bacf17e7e7b4c diff --git a/qtdatavis3d b/qtdatavis3d index 02af08a7..d6a8da66 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 02af08a705ada1ca2dac839a026a816a8e70def5 +Subproject commit d6a8da66dc3c141621c9be4b7509a6e43c60e15c diff --git a/qtdeclarative b/qtdeclarative index 0932a599..cb6c208c 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 0932a59971f606f07b41da19f3974d51b7008180 +Subproject commit cb6c208c77e2e3c8b6d5957fae73f0326eee4296 diff --git a/qtdoc b/qtdoc index d08ebbbd..0338ef5d 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit d08ebbbdffbb93cc7b5ec7ee09906c88afc89a02 +Subproject commit 0338ef5d91fd9531b7b9b697a36e96045070ceb4 diff --git a/qtgamepad b/qtgamepad index eaf8a980..b1c4135b 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit eaf8a9800e81a446e9badaa32be459d0a54ec9b5 +Subproject commit b1c4135bfe16192376b2386e5bb1d7a0947a3061 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 1f43c743..d3023be0 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 1f43c7433ae7be13fc51f70b85e3b69fce84bc82 +Subproject commit d3023be0d839440ac046adf2af75d9e4306dd5ef diff --git a/qtimageformats b/qtimageformats index 9cbca026..d4401c9f 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 9cbca0266d7482a7d3d198acfa9f3a2661d435f3 +Subproject commit d4401c9f519dfe82c38fe9ded674e454655f1866 diff --git a/qtlocation b/qtlocation index d90b2bff..3575f84b 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit d90b2bffd76bf74ab4b6e6c0c68a26f6830c8d6f +Subproject commit 3575f84b21486e4f3589a0cfce068b9d0f112d53 diff --git a/qtmacextras b/qtmacextras index 8acd1bb2..5e7acf55 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 8acd1bb2d802296a37b6394ffe4e7adc5112db2b +Subproject commit 5e7acf550588e17a1cef82c70c9a0c31273a6f82 diff --git a/qtmultimedia b/qtmultimedia index 62d9b69e..f7a93757 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 62d9b69e4d9ee9f180e4ac07fb72e00a002d3c02 +Subproject commit f7a93757c709e8b2902bc4707752edb8649d009c diff --git a/qtquickcontrols b/qtquickcontrols index b5a8306b..97e13b5f 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit b5a8306bf6d4949066872ac2afc8d0a01f716bd7 +Subproject commit 97e13b5f1b8b4e64b1ec8a503036afbd4f408148 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 8fd8024d..c75ca309 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 8fd8024d794a18aa3cab35ea9fcebd287d238e78 +Subproject commit c75ca309916ae1fec31ab37f25a7ddf9ea3c150a diff --git a/qtscxml b/qtscxml index 7463654c..104587a3 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 7463654cd7ab7803c650e439827b48be60fe3c64 +Subproject commit 104587a30d0b97539a7e65a775c91f2c17fbb35d diff --git a/qtsensors b/qtsensors index 7deae40b..d6d4d364 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 7deae40b87e1637d55de8d111e99f4da1d5584d4 +Subproject commit d6d4d364420e8c57a53f25ccb6eae13f86244c80 diff --git a/qtserialport b/qtserialport index 63ac6874..118cc17c 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 63ac6874eeea037b4b8b1a450a938999fb4f31b8 +Subproject commit 118cc17c8637bd0b63b8ebda74624126c2cf5cd2 diff --git a/qtsvg b/qtsvg index b231d9f4..64ca369c 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit b231d9f41903f8514a2d91844f4515055307af3a +Subproject commit 64ca369c7e3d61f0416bc1fd6a102f0c62924433 diff --git a/qttools b/qttools index 9fd5c70f..a4dda9d1 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 9fd5c70f5a2e8157e3476a036522df1a52776b90 +Subproject commit a4dda9d1ac4223907a434901714f8d68f04bc466 diff --git a/qtwayland b/qtwayland index 06e87701..8b3626b9 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 06e8770129d5c49bfb518b02b3ece6d529e0e4c3 +Subproject commit 8b3626b9a48fcf303cd7a20aede9a1577311a684 diff --git a/qtwebchannel b/qtwebchannel index 4fda82b6..b84f22a3 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 4fda82b66e17cc03e6b08f1afd135069cfef09b7 +Subproject commit b84f22a3249aa1af46b17e33ac030abb077251bf diff --git a/qtwebengine b/qtwebengine index c4fc323d..7b61d27d 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit c4fc323d0771e24ae726065cdce9eafef2c09c41 +Subproject commit 7b61d27d51371cca3a4eabf5bb24b0a7509750cc diff --git a/qtwebkit b/qtwebkit index 01fa9be5..76e2732f 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 01fa9be55572ddb3f69befc68475ed09241eabdf +Subproject commit 76e2732f013732461c09a1d6c6b4c77fcab1c0d0 diff --git a/qtwebsockets b/qtwebsockets index cd80c041..8d17ddfc 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit cd80c041220df2875297622a0012933412730e9d +Subproject commit 8d17ddfc2f62df56ac067bd0f9736c6e8d37aa97 diff --git a/qtwebview b/qtwebview index 8618811a..3503ed35 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 8618811a5220f5456f012179abc743e08120adf3 +Subproject commit 3503ed35e47c1ec7491219f96a4a7fcd5568390f diff --git a/qtwinextras b/qtwinextras index e2f08aaa..60991e9c 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit e2f08aaacb571c1287217b09acf66518ff924dc4 +Subproject commit 60991e9ce3387b56c18cec47d30a461fbef40f3d diff --git a/qtx11extras b/qtx11extras index ee7eb793..bae8bfc7 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit ee7eb793b666c99f171452dc1accd7955cdf5a6c +Subproject commit bae8bfc7a811af2bf51b227cbf8467e50a2a149a diff --git a/qtxmlpatterns b/qtxmlpatterns index 4ca909e7..16c62550 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 4ca909e7daef701882755487008c9e4f0b978dbc +Subproject commit 16c62550ca5a189f4610d3246d252060ab7be129 From 3727ce11ac47a515d0d996220ca4de9adf67b26d Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 23 Jun 2016 15:02:47 +0300 Subject: [PATCH 77/77] Updated submodules. Change-Id: Icb8aad2382e3106db016485d404d7e8afc987399 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtquickcontrols | 2 +- qtrepotools | 2 +- qtserialport | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/qt3d b/qt3d index 39a4b9ba..5775579e 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 39a4b9ba5818f84e7ab8ba01d43bf8c5abb9fcf9 +Subproject commit 5775579e74b66185e77cfc30b0af8cc94a9141cb diff --git a/qtbase b/qtbase index 5f0ec730..5cfb80a2 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 5f0ec7305e4310123ddeb98d3523087e3c560d9c +Subproject commit 5cfb80a28ef6bf6820c970a6c355e6879021e46e diff --git a/qtdeclarative b/qtdeclarative index cb6c208c..b90f810f 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit cb6c208c77e2e3c8b6d5957fae73f0326eee4296 +Subproject commit b90f810ffa5a7f98b0ac58e5812bcdcd66d028bc diff --git a/qtlocation b/qtlocation index 3575f84b..83feab53 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 3575f84b21486e4f3589a0cfce068b9d0f112d53 +Subproject commit 83feab53cede063b11435c6f2fe58e3c933676eb diff --git a/qtquickcontrols b/qtquickcontrols index 97e13b5f..0c053c7e 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 97e13b5f1b8b4e64b1ec8a503036afbd4f408148 +Subproject commit 0c053c7ea7eab4011ac6ed32ed8d32ec40874a9f diff --git a/qtrepotools b/qtrepotools index d856dc5d..f4821540 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit d856dc5d249e75d6dac3c9a02373467ead12037d +Subproject commit f4821540b5a9aa53717d9d20f6cc0da545b59675 diff --git a/qtserialport b/qtserialport index 118cc17c..5939163c 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 118cc17c8637bd0b63b8ebda74624126c2cf5cd2 +Subproject commit 5939163c59f4df8a479913195ae5458614c0d1bc diff --git a/qttools b/qttools index a4dda9d1..f67b1a15 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit a4dda9d1ac4223907a434901714f8d68f04bc466 +Subproject commit f67b1a1586a6404c3e60caf454da2c76a5c3d9c8 diff --git a/qtwayland b/qtwayland index 8b3626b9..f8f20e62 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 8b3626b9a48fcf303cd7a20aede9a1577311a684 +Subproject commit f8f20e62ae31f818a4277e47cbe212a75a933e10 diff --git a/qtwebengine b/qtwebengine index 7b61d27d..56bea56b 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 7b61d27d51371cca3a4eabf5bb24b0a7509750cc +Subproject commit 56bea56b2d8fabc4b09d41531177a22d9297ce2c